From f17ab848cb756cad27489bf0c2746e5ead466658 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve <hugo@hugovil.com> Date: Thu, 7 Aug 2014 00:09:59 -0400 Subject: [PATCH] Integrate patches inside git repository --- config/packages-list | 2 - functions/main | 31 +- .../common/eglibc-2.15-r17386-fixes-1.patch | 107 + .../common/gcc-4.6.3-branch_update-2.patch | 14541 +++ .../linux-3.14.4-noperl-timeconst.patch | 254 + .../patches/common/mpfr-3.1.2-fixes-3.patch | 1280 + .../common/ncurses-5.9-bash_fix-1.patch | 21 + .../common/ncurses-5.9-branch_update-4.patch | 75926 ++++++++++++++++ ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 130 + stage0/patches/x86/gcc-4.6.3-specs-1.patch | 456 + .../x86_64/gcc-4.6.3-pure64_specs-1.patch | 515 + stage0/pkg/gcc | 19 - stage1/packages-update | 4 - stage1/patches/common/bash-4.2-fixes-9.patch | 1757 + .../common/bzip2-1.0.6-install_docs-1.patch | 42 + .../common/gcc-4.6.3-branch_update-2.patch | 14541 +++ .../linux-3.14.4-noperl-timeconst.patch | 1 + stage1/patches/common/make-3.82-fixes-1.patch | 331 + .../common/ncurses-5.9-bash_fix-1.patch | 1 + .../common/ncurses-5.9-branch_update-4.patch | 1 + ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 1 + .../sysvinit-2.88dsf-tools_updates-1.patch | 77 + stage1/patches/common/tar-1.26-man-1.patch | 2073 + .../texinfo-4.13a-new_compressors-1.patch | 68 + stage1/patches/x86/gcc-4.6.3-specs-1.patch | 1 + .../x86_64/gcc-4.6.3-pure64_specs-1.patch | 1 + stage1/pkg/gcc | 19 - .../patches/common/automake-1.14-test-1.patch | 66 + .../common/bc-1.06.95-memory_leak-1.patch | 41 + .../common/bzip2-1.0.6-install_docs-1.patch | 1 + .../common/dhcp-4.2.3-P2-iproute2-1.patch | 192 + .../common/dhcp-4.2.3-P2-missing_ipv6-1.patch | 48 + .../common/eglibc-2.15-r17386-fixes-1.patch | 107 + .../common/gcc-4.6.3-branch_update-2.patch | 1 + .../common/iana-etc-2.30-get_fix-1.patch | 27 + ...a-etc-2.30-numbers_update-20120610-2.patch | 37791 ++++++++ .../common/iproute2-3.3.0-libdir-1.patch | 53 + .../common/kbd-1.15.3-backspace-1.patch | 250 + .../common/kbd-1.15.3-es.po_fix-1.patch | 18 + .../common/kbd-1.15.3-upstream_fixes-1.patch | 66 + .../common/libffi-3.0.11-includedir-1.patch | 34 + stage2/patches/common/make-3.82-fixes-1.patch | 1 + .../patches/common/mpfr-3.1.2-fixes-3.patch | 1 + .../common/ncurses-5.9-bash_fix-1.patch | 1 + .../common/ncurses-5.9-branch_update-4.patch | 1 + .../perl-5.14.2-Configure_multilib-1.patch | 42 + .../patches/common/perl-5.14.2-libc-1.patch | 31 + .../common/perl-5.14.2-security_fix-1.patch | 22 + ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 1 + .../common/procps-3.2.8-fix_HZ_errors-1.patch | 54 + .../common/procps-3.2.8-ps_cgroup-1.patch | 81 + .../common/procps-3.2.8-watch_unicode-1.patch | 148 + .../common/readline-6.2-branch_update-3.patch | 157 + .../common/sysklogd-1.5-fix-udp-warning.patch | 59 + stage2/patches/common/tar-1.26-man-1.patch | 1 + .../texinfo-4.13a-new_compressors-1.patch | 68 + .../patches/x86_64/gcc-4.6.3-pure64-1.patch | 194 + stage2/pkg/gcc | 17 - .../common/alsa-plugins-1.0.25-ffmpeg-1.patch | 40 + .../common/alsa-utils-1.0.25-no_xmlto-1.patch | 431 + .../common/bind-9.9.1-P2-use_iproute2-1.patch | 40 + .../cdparanoia-III-10.2-gcc_fixes-1.patch | 586 + .../common/colordiff-1.0.10-inst-prefix.patch | 24 + .../common/cyrus-sasl-2.1.25-fixes-1.patch | 368 + .../docbook-utils-0.6.14-grep_fix-1.patch | 33 + .../common/faac-1.28-glibc_fixes-1.patch | 25 + stage3/patches/common/faad2-2.7-mp4ff-1.patch | 19 + .../iptables-1.4.15-missing-includes-1.patch | 82 + .../libart_lgpl-2.3.21-upstream_fixes-1.patch | 406 + .../common/libmad-0.15.1b-fixes-1.patch | 91 + .../patches/common/libmad-0.15.1b-gcc44.patch | 11 + stage3/patches/common/libpng-1.6.3-apng.patch | 1702 + .../common/libtheora-1.1.1-png16.patch | 22 + .../common/libtirpc-0.2.2-remove-nis-2.patch | 40 + ...sql-5.5.28-embedded_library_shared-1.patch | 51 + .../mysql-5.5.28-fix_client_only-1.patch | 23 + .../common/openjade-1.3.2-gcc_4.6-1.patch | 113 + .../common/openjade-1.3.2-perl-fix.patch | 22 + .../openssl-1.0.1c-fix_manpages-1.patch | 1920 + ...able_v19_20111121-audacity-portmixer.patch | 312 + .../common/sgml-common-0.6.3-manpage-1.patch | 14 + .../subversion-1.7.6-build_fixes-1.patch | 40 + ..._wrappers_7.6-shared_lib_plus_plus-1.patch | 1035 + .../common/xinetd-2.3.15-libtirpc-fixes.patch | 44 + .../common/MesaLib-8.0.4-add_xdemos-3.patch | 2248 + .../MesaLib-8.0.4-llvm-3.1-fixes-1.patch | 51 + ...-0.95.4-remove-inexistent-icons-path.patch | 24 + .../lesstif-0.95.2-testsuite_fix-1.patch | 251 + .../common/libXft-2.3.1-freetype_fix-1.patch | 30 + .../patches/common/llvm-3.1-fix-docdir.patch | 19 + .../patches/common/abiword-2.8.6-glib.patch | 104 + stage5/patches/common/agg-2.5-libtool.patch | 46 + .../bridge-utils-1.5-linux_3.8_fix-1.patch | 54 + .../cdrdao-1.2.3-missing-stat-include.patch | 17 + .../patches/common/celestia-1.6.1-fixes.patch | 48 + .../common/chordpack-0.8.2-perl-switch.patch | 17 + stage5/patches/common/cups-1.4.8-php54.patch | 22 + .../common/dvd+rw-tools-7.1-limits.patch | 16 + .../dvdfs-0.2-gcc44-missing-include.patch | 11 + .../common/firefox-22.0-system-cairo.patch | 43 + .../common/foo2zjs-hvlinux-hp1020.patch | 95 + .../common/gamin-0.1.10-glib-fix.patch | 54 + .../patches/common/gegl-0.2.0-ffmpeg2-1.patch | 55 + .../common/gnash-0.8.10-CVE-2012-1175-1.patch | 62 + .../common/gnome-media-2.32.0-no-docs.patch | 44293 +++++++++ .../common/gnumeric-1.10.17-disable-doc.patch | 22 + .../patches/common/goffice-0.8.17-pcre.patch | 12 + .../common/grip-3.4.0-appicon-fix.patch | 25 + .../common/gst-ffmpeg-0.10.13-gcc-4.7-1.patch | 59 + ...lugins-base-0.10.36-gcc_4_9_0_i686-1.patch | 37 + ...good-0.10.31-remove-deprecated-ioctl.patch | 27 + .../gst-plugins-good-0.10.31-v4l2.patch | 11 + ...plugins-ugly-0.10.19-libcdio_fixes-1.patch | 178 + .../patches/common/gtk+-2.24.12-no-docs.patch | 43 + ...-1.2.0-dont-use-deprecated-functions.patch | 77 + .../common/httpd-2.4.3-blfs_layout-1.patch | 281 + .../common/inkscape-0.48.3.1-gdk_pixbuf.patch | 84 + .../common/inkscape-0.48.3.1-libpng.patch | 42 + .../inkscape-0.48.3.1-poppler-0.20-1.patch | 650 + .../jasper-1.900.1-security_fixes-1.patch | 980 + .../common/keyutils-1.5.5-libdir-64.patch | 21 + .../patches/common/librsvg-2.36.3-cairo.patch | 12 + .../common/nspr-4.10-lfs-fixes-1.patch | 38 + .../common/nss-3.15.1-standalone-2.patch | 241 + .../common/pygobject-2.28.6-fixes-1.patch | 720 + .../common/sane-backends-1.0.22-v4l-1.patch | 47 + stage5/patches/common/splix-2.0.0-gcc45.patch | 24 + .../subversion-1.7.6-build_fixes-1.patch | 1 + .../common/webkit-1.8.3-no-gtkdoc.patch | 12 + .../common/xarchiver-0.5.2-xz-support.patch | 325 + 130 files changed, 210724 insertions(+), 73 deletions(-) create mode 100644 stage0/patches/common/eglibc-2.15-r17386-fixes-1.patch create mode 100644 stage0/patches/common/gcc-4.6.3-branch_update-2.patch create mode 100644 stage0/patches/common/linux-3.14.4-noperl-timeconst.patch create mode 100644 stage0/patches/common/mpfr-3.1.2-fixes-3.patch create mode 100644 stage0/patches/common/ncurses-5.9-bash_fix-1.patch create mode 100644 stage0/patches/common/ncurses-5.9-branch_update-4.patch create mode 100644 stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch create mode 100644 stage0/patches/x86/gcc-4.6.3-specs-1.patch create mode 100644 stage0/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch create mode 100644 stage1/patches/common/bash-4.2-fixes-9.patch create mode 100644 stage1/patches/common/bzip2-1.0.6-install_docs-1.patch create mode 100644 stage1/patches/common/gcc-4.6.3-branch_update-2.patch create mode 120000 stage1/patches/common/linux-3.14.4-noperl-timeconst.patch create mode 100644 stage1/patches/common/make-3.82-fixes-1.patch create mode 120000 stage1/patches/common/ncurses-5.9-bash_fix-1.patch create mode 120000 stage1/patches/common/ncurses-5.9-branch_update-4.patch create mode 120000 stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch create mode 100644 stage1/patches/common/sysvinit-2.88dsf-tools_updates-1.patch create mode 100644 stage1/patches/common/tar-1.26-man-1.patch create mode 100644 stage1/patches/common/texinfo-4.13a-new_compressors-1.patch create mode 120000 stage1/patches/x86/gcc-4.6.3-specs-1.patch create mode 120000 stage1/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch create mode 100644 stage2/patches/common/automake-1.14-test-1.patch create mode 100644 stage2/patches/common/bc-1.06.95-memory_leak-1.patch create mode 120000 stage2/patches/common/bzip2-1.0.6-install_docs-1.patch create mode 100644 stage2/patches/common/dhcp-4.2.3-P2-iproute2-1.patch create mode 100644 stage2/patches/common/dhcp-4.2.3-P2-missing_ipv6-1.patch create mode 100644 stage2/patches/common/eglibc-2.15-r17386-fixes-1.patch create mode 120000 stage2/patches/common/gcc-4.6.3-branch_update-2.patch create mode 100644 stage2/patches/common/iana-etc-2.30-get_fix-1.patch create mode 100644 stage2/patches/common/iana-etc-2.30-numbers_update-20120610-2.patch create mode 100644 stage2/patches/common/iproute2-3.3.0-libdir-1.patch create mode 100644 stage2/patches/common/kbd-1.15.3-backspace-1.patch create mode 100644 stage2/patches/common/kbd-1.15.3-es.po_fix-1.patch create mode 100644 stage2/patches/common/kbd-1.15.3-upstream_fixes-1.patch create mode 100644 stage2/patches/common/libffi-3.0.11-includedir-1.patch create mode 120000 stage2/patches/common/make-3.82-fixes-1.patch create mode 120000 stage2/patches/common/mpfr-3.1.2-fixes-3.patch create mode 120000 stage2/patches/common/ncurses-5.9-bash_fix-1.patch create mode 120000 stage2/patches/common/ncurses-5.9-branch_update-4.patch create mode 100644 stage2/patches/common/perl-5.14.2-Configure_multilib-1.patch create mode 100644 stage2/patches/common/perl-5.14.2-libc-1.patch create mode 100644 stage2/patches/common/perl-5.14.2-security_fix-1.patch create mode 120000 stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch create mode 100644 stage2/patches/common/procps-3.2.8-fix_HZ_errors-1.patch create mode 100644 stage2/patches/common/procps-3.2.8-ps_cgroup-1.patch create mode 100644 stage2/patches/common/procps-3.2.8-watch_unicode-1.patch create mode 100644 stage2/patches/common/readline-6.2-branch_update-3.patch create mode 100644 stage2/patches/common/sysklogd-1.5-fix-udp-warning.patch create mode 120000 stage2/patches/common/tar-1.26-man-1.patch create mode 100644 stage2/patches/common/texinfo-4.13a-new_compressors-1.patch create mode 100644 stage2/patches/x86_64/gcc-4.6.3-pure64-1.patch create mode 100644 stage3/patches/common/alsa-plugins-1.0.25-ffmpeg-1.patch create mode 100644 stage3/patches/common/alsa-utils-1.0.25-no_xmlto-1.patch create mode 100644 stage3/patches/common/bind-9.9.1-P2-use_iproute2-1.patch create mode 100644 stage3/patches/common/cdparanoia-III-10.2-gcc_fixes-1.patch create mode 100644 stage3/patches/common/colordiff-1.0.10-inst-prefix.patch create mode 100644 stage3/patches/common/cyrus-sasl-2.1.25-fixes-1.patch create mode 100644 stage3/patches/common/docbook-utils-0.6.14-grep_fix-1.patch create mode 100644 stage3/patches/common/faac-1.28-glibc_fixes-1.patch create mode 100644 stage3/patches/common/faad2-2.7-mp4ff-1.patch create mode 100644 stage3/patches/common/iptables-1.4.15-missing-includes-1.patch create mode 100644 stage3/patches/common/libart_lgpl-2.3.21-upstream_fixes-1.patch create mode 100644 stage3/patches/common/libmad-0.15.1b-fixes-1.patch create mode 100644 stage3/patches/common/libmad-0.15.1b-gcc44.patch create mode 100644 stage3/patches/common/libpng-1.6.3-apng.patch create mode 100644 stage3/patches/common/libtheora-1.1.1-png16.patch create mode 100644 stage3/patches/common/libtirpc-0.2.2-remove-nis-2.patch create mode 100644 stage3/patches/common/mysql-5.5.28-embedded_library_shared-1.patch create mode 100644 stage3/patches/common/mysql-5.5.28-fix_client_only-1.patch create mode 100644 stage3/patches/common/openjade-1.3.2-gcc_4.6-1.patch create mode 100644 stage3/patches/common/openjade-1.3.2-perl-fix.patch create mode 100644 stage3/patches/common/openssl-1.0.1c-fix_manpages-1.patch create mode 100644 stage3/patches/common/pa_stable_v19_20111121-audacity-portmixer.patch create mode 100644 stage3/patches/common/sgml-common-0.6.3-manpage-1.patch create mode 100644 stage3/patches/common/subversion-1.7.6-build_fixes-1.patch create mode 100644 stage3/patches/common/tcp_wrappers_7.6-shared_lib_plus_plus-1.patch create mode 100644 stage3/patches/common/xinetd-2.3.15-libtirpc-fixes.patch create mode 100644 stage4/patches/common/MesaLib-8.0.4-add_xdemos-3.patch create mode 100644 stage4/patches/common/MesaLib-8.0.4-llvm-3.1-fixes-1.patch create mode 100644 stage4/patches/common/WindowMaker-0.95.4-remove-inexistent-icons-path.patch create mode 100644 stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch create mode 100644 stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch create mode 100644 stage4/patches/common/llvm-3.1-fix-docdir.patch create mode 100644 stage5/patches/common/abiword-2.8.6-glib.patch create mode 100644 stage5/patches/common/agg-2.5-libtool.patch create mode 100644 stage5/patches/common/bridge-utils-1.5-linux_3.8_fix-1.patch create mode 100644 stage5/patches/common/cdrdao-1.2.3-missing-stat-include.patch create mode 100644 stage5/patches/common/celestia-1.6.1-fixes.patch create mode 100644 stage5/patches/common/chordpack-0.8.2-perl-switch.patch create mode 100644 stage5/patches/common/cups-1.4.8-php54.patch create mode 100644 stage5/patches/common/dvd+rw-tools-7.1-limits.patch create mode 100644 stage5/patches/common/dvdfs-0.2-gcc44-missing-include.patch create mode 100644 stage5/patches/common/firefox-22.0-system-cairo.patch create mode 100644 stage5/patches/common/foo2zjs-hvlinux-hp1020.patch create mode 100644 stage5/patches/common/gamin-0.1.10-glib-fix.patch create mode 100644 stage5/patches/common/gegl-0.2.0-ffmpeg2-1.patch create mode 100644 stage5/patches/common/gnash-0.8.10-CVE-2012-1175-1.patch create mode 100644 stage5/patches/common/gnome-media-2.32.0-no-docs.patch create mode 100644 stage5/patches/common/gnumeric-1.10.17-disable-doc.patch create mode 100644 stage5/patches/common/goffice-0.8.17-pcre.patch create mode 100644 stage5/patches/common/grip-3.4.0-appicon-fix.patch create mode 100644 stage5/patches/common/gst-ffmpeg-0.10.13-gcc-4.7-1.patch create mode 100644 stage5/patches/common/gst-plugins-base-0.10.36-gcc_4_9_0_i686-1.patch create mode 100644 stage5/patches/common/gst-plugins-good-0.10.31-remove-deprecated-ioctl.patch create mode 100644 stage5/patches/common/gst-plugins-good-0.10.31-v4l2.patch create mode 100644 stage5/patches/common/gst-plugins-ugly-0.10.19-libcdio_fixes-1.patch create mode 100644 stage5/patches/common/gtk+-2.24.12-no-docs.patch create mode 100644 stage5/patches/common/gtkglext-1.2.0-dont-use-deprecated-functions.patch create mode 100644 stage5/patches/common/httpd-2.4.3-blfs_layout-1.patch create mode 100644 stage5/patches/common/inkscape-0.48.3.1-gdk_pixbuf.patch create mode 100644 stage5/patches/common/inkscape-0.48.3.1-libpng.patch create mode 100644 stage5/patches/common/inkscape-0.48.3.1-poppler-0.20-1.patch create mode 100644 stage5/patches/common/jasper-1.900.1-security_fixes-1.patch create mode 100644 stage5/patches/common/keyutils-1.5.5-libdir-64.patch create mode 100644 stage5/patches/common/librsvg-2.36.3-cairo.patch create mode 100644 stage5/patches/common/nspr-4.10-lfs-fixes-1.patch create mode 100644 stage5/patches/common/nss-3.15.1-standalone-2.patch create mode 100644 stage5/patches/common/pygobject-2.28.6-fixes-1.patch create mode 100644 stage5/patches/common/sane-backends-1.0.22-v4l-1.patch create mode 100644 stage5/patches/common/splix-2.0.0-gcc45.patch create mode 120000 stage5/patches/common/subversion-1.7.6-build_fixes-1.patch create mode 100644 stage5/patches/common/webkit-1.8.3-no-gtkdoc.patch create mode 100644 stage5/patches/common/xarchiver-0.5.2-xz-support.patch diff --git a/config/packages-list b/config/packages-list index 3f80b2f..5d523ed 100644 --- a/config/packages-list +++ b/config/packages-list @@ -107,8 +107,6 @@ B43_FWCUTTER="b43-fwcutter-015" GAWK="gawk-4.1.0" GCC="gcc-4.6.3" -# Specify bug-fixing patches manually -#GCC_PATCHES="branch_update-1" GCONF="GConf-3.2.5" GDB="gdb-6.4" GDBM="gdbm-1.10" diff --git a/functions/main b/functions/main index 7c071db..2460314 100644 --- a/functions/main +++ b/functions/main @@ -147,6 +147,7 @@ init_log_file() test_presence_of_packages_directory export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}" + export LFS_PATCHES_DIR="${SCRDIR}/patches" export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE} export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log export LFS_TMP="${LFS}/tmp" @@ -585,15 +586,17 @@ hv_useradd() # Applying patch # First argument is the name of the patch # Second argument is the package name -# Third argument: optional target directory (default is $LFS_TMP) +# Third argument is the subdirectory inside the patches directory +# Fourth argument: optional target directory (default is $LFS_TMP) apply_patch() { local PATCH_FILE=${1} local PACKAGE=${2} + local PDIR=${3} local TARGET_DIR="" - if [ $# -eq 3 ]; then - TARGET_DIR=${3}/${PACKAGE} + if [ $# -eq 4 ]; then + TARGET_DIR=${4}/${PACKAGE} else TARGET_DIR=${LFS_TMP}/${PACKAGE} fi @@ -604,14 +607,14 @@ apply_patch() return ${EXIT_FAILURE} fi - if [ ! -f ${LFS_PKG_DIR}/${PATCH_FILE} ]; then + if [ ! -f ${PDIR}/${PATCH_FILE} ]; then echo echo "${FUNCNAME}(): patch file '${PATCH_FILE}' not found." return ${EXIT_FAILURE} fi echo "Applying patch: ${PATCH_FILE}" - patch -Np1 -d ${TARGET_DIR} -i ${LFS_PKG_DIR}/${PATCH_FILE} + patch -Np1 -d ${TARGET_DIR} -i ${PDIR}/${PATCH_FILE} } # Applying any patch(es) found for the current package. @@ -637,13 +640,17 @@ apply_patches() TARGET_DIR=${2} fi - # Checking if we can find at least one patch. - if ls ${LFS_PKG_DIR}/${1}-*.patch 1> /dev/null 2>&1; then - cd ${LFS_PKG_DIR} - for patch in ${1}-*.patch; do - apply_patch ${patch} ${PACKAGE} ${TARGET_DIR} - done - fi + for s in common ${HVL_TARGET}; do + pdir=${LFS_PATCHES_DIR}/${s} + if [ -d ${pdir} ]; then + if ls ${pdir}/${1}-*.patch 1> /dev/null 2>&1; then + cd ${pdir} + for patch in ${1}-*.patch; do + apply_patch ${patch} ${PACKAGE} ${pdir} ${TARGET_DIR} + done + fi + fi + done return $? } diff --git a/stage0/patches/common/eglibc-2.15-r17386-fixes-1.patch b/stage0/patches/common/eglibc-2.15-r17386-fixes-1.patch new file mode 100644 index 0000000..cb709c9 --- /dev/null +++ b/stage0/patches/common/eglibc-2.15-r17386-fixes-1.patch @@ -0,0 +1,107 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) +Date: 2012-02-16 +Initial Package Version: 2.15 +Origin: http://sourceware.org/ml/libc-alpha/2011-06/msg00010.html +Upstream Status: Submitted +Description: Fixes segfault with sound devices / output. + +diff -Naur eglibc-2_15.orig/elf/dl-close.c eglibc-2_15/elf/dl-close.c +--- eglibc-2_15.orig/elf/dl-close.c 2012-02-16 09:31:47.478224779 +0000 ++++ eglibc-2_15/elf/dl-close.c 2012-02-16 09:37:17.287098571 +0000 +@@ -119,17 +119,8 @@ + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)) +diff -Naur eglibc-2_15.orig/elf/dl-deps.c eglibc-2_15/elf/dl-deps.c +--- eglibc-2_15.orig/elf/dl-deps.c 2012-02-16 09:31:47.474224671 +0000 ++++ eglibc-2_15/elf/dl-deps.c 2012-02-16 09:39:54.791335897 +0000 +@@ -489,6 +489,8 @@ + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; ++ + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -689,6 +691,7 @@ + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -697,7 +700,7 @@ + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +diff -Naur eglibc-2_15.orig/elf/dl-libc.c eglibc-2_15/elf/dl-libc.c +--- eglibc-2_15.orig/elf/dl-libc.c 2012-02-16 09:31:47.478224779 +0000 ++++ eglibc-2_15/elf/dl-libc.c 2012-02-16 09:32:43.619735410 +0000 +@@ -284,6 +284,10 @@ + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff -Naur eglibc-2_15.orig/elf/rtld.c eglibc-2_15/elf/rtld.c +--- eglibc-2_15.orig/elf/rtld.c 2012-02-16 09:31:47.470224563 +0000 ++++ eglibc-2_15/elf/rtld.c 2012-02-16 09:35:01.611448263 +0000 +@@ -2277,6 +2277,7 @@ + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff -Naur eglibc-2_15.orig/include/link.h eglibc-2_15/include/link.h +--- eglibc-2_15.orig/include/link.h 2012-02-16 09:31:47.710231021 +0000 ++++ eglibc-2_15/include/link.h 2012-02-16 09:42:04.610828212 +0000 +@@ -192,6 +192,9 @@ + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/stage0/patches/common/gcc-4.6.3-branch_update-2.patch b/stage0/patches/common/gcc-4.6.3-branch_update-2.patch new file mode 100644 index 0000000..283a93e --- /dev/null +++ b/stage0/patches/common/gcc-4.6.3-branch_update-2.patch @@ -0,0 +1,14541 @@ +Submitted By: Jim Gifford (jim at cross-lfs dot org) +Date: 11-05-2012 +Initial Package Version: 4.6.3 +Origin: Upstream +Upstream Status: Applied +Description: This is a branch update for gcc-4.6.3, and should be + rechecked periodically. + +This patch was made from Revision # 193147. + +diff -Naur gcc-4.6.3.orig/boehm-gc/configure gcc-4.6.3/boehm-gc/configure +--- gcc-4.6.3.orig/boehm-gc/configure 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/boehm-gc/configure 2012-03-02 12:21:41.598223000 -0600 +@@ -15246,6 +15246,17 @@ + fi + done + ++for ac_func in pthread_get_stackaddr_np ++do : ++ ac_fn_c_check_func "$LINENO" "pthread_get_stackaddr_np" "ac_cv_func_pthread_get_stackaddr_np" ++if test "x$ac_cv_func_pthread_get_stackaddr_np" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PTHREAD_GET_STACKADDR_NP 1 ++_ACEOF ++ ++fi ++done ++ + LIBS="$oldLIBS" + + # Configuration of machine-dependent code +diff -Naur gcc-4.6.3.orig/boehm-gc/configure.ac gcc-4.6.3/boehm-gc/configure.ac +--- gcc-4.6.3.orig/boehm-gc/configure.ac 2011-02-02 07:53:56.000000000 -0600 ++++ gcc-4.6.3/boehm-gc/configure.ac 2012-03-02 12:21:41.598223000 -0600 +@@ -392,6 +392,7 @@ + oldLIBS="$LIBS" + LIBS="$LIBS $THREADLIBS" + AC_CHECK_FUNCS([pthread_getattr_np]) ++AC_CHECK_FUNCS([pthread_get_stackaddr_np]) + LIBS="$oldLIBS" + + # Configuration of machine-dependent code +diff -Naur gcc-4.6.3.orig/boehm-gc/include/gc_config.h.in gcc-4.6.3/boehm-gc/include/gc_config.h.in +--- gcc-4.6.3.orig/boehm-gc/include/gc_config.h.in 2009-08-22 08:22:20.000000000 -0500 ++++ gcc-4.6.3/boehm-gc/include/gc_config.h.in 2012-03-02 12:21:41.598223000 -0600 +@@ -87,6 +87,9 @@ + /* Define to 1 if you have the `pthread_getattr_np' function. */ + #undef HAVE_PTHREAD_GETATTR_NP + ++/* Define to 1 if you have the `pthread_get_stackaddr_np_np' function. */ ++#undef HAVE_PTHREAD_GET_STACKADDR_NP ++ + /* Define to 1 if you have the <stdint.h> header file. */ + #undef HAVE_STDINT_H + +diff -Naur gcc-4.6.3.orig/boehm-gc/include/private/gcconfig.h gcc-4.6.3/boehm-gc/include/private/gcconfig.h +--- gcc-4.6.3.orig/boehm-gc/include/private/gcconfig.h 2010-03-21 14:34:19.000000000 -0500 ++++ gcc-4.6.3/boehm-gc/include/private/gcconfig.h 2012-03-02 12:21:41.598223000 -0600 +@@ -1331,7 +1331,11 @@ + These aren't used when dyld support is enabled (it is by default) */ + # define DATASTART ((ptr_t) get_etext()) + # define DATAEND ((ptr_t) get_end()) +-# define STACKBOTTOM ((ptr_t) 0xc0000000) ++# ifdef HAVE_PTHREAD_GET_STACKADDR_NP ++# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) ++# else ++# define STACKBOTTOM ((ptr_t) 0xc0000000) ++# endif + # define USE_MMAP + # define USE_MMAP_ANON + # define USE_ASM_PUSH_REGS +@@ -2011,7 +2015,11 @@ + These aren't used when dyld support is enabled (it is by default) */ + # define DATASTART ((ptr_t) get_etext()) + # define DATAEND ((ptr_t) get_end()) +-# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) ++# ifdef HAVE_PTHREAD_GET_STACKADDR_NP ++# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) ++# else ++# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) ++# endif + # define USE_MMAP + # define USE_MMAP_ANON + # ifdef GC_DARWIN_THREADS +diff -Naur gcc-4.6.3.orig/gcc/ada/gcc-interface/decl.c gcc-4.6.3/gcc/ada/gcc-interface/decl.c +--- gcc-4.6.3.orig/gcc/ada/gcc-interface/decl.c 2012-01-21 09:01:48.000000000 -0600 ++++ gcc-4.6.3/gcc/ada/gcc-interface/decl.c 2012-05-26 05:44:06.390872000 -0500 +@@ -120,8 +120,8 @@ + /* The value of the qualifier. */ + tree qual; + +- /* The record associated with this variant. */ +- tree record; ++ /* The type of the variant after transformation. */ ++ tree new_type; + } variant_desc; + + DEF_VEC_O(variant_desc); +@@ -3157,11 +3157,16 @@ + { + tree old_variant = v->type; + tree new_variant = make_node (RECORD_TYPE); ++ tree suffix ++ = concat_name (DECL_NAME (gnu_variant_part), ++ IDENTIFIER_POINTER ++ (DECL_NAME (v->field))); + TYPE_NAME (new_variant) +- = DECL_NAME (TYPE_NAME (old_variant)); ++ = concat_name (TYPE_NAME (gnu_type), ++ IDENTIFIER_POINTER (suffix)); + copy_and_substitute_in_size (new_variant, old_variant, + gnu_subst_list); +- v->record = new_variant; ++ v->new_type = new_variant; + } + } + else +@@ -3265,7 +3270,7 @@ + if (selected_variant) + gnu_cont_type = gnu_type; + else +- gnu_cont_type = v->record; ++ gnu_cont_type = v->new_type; + } + else + /* The front-end may pass us "ghost" components if +@@ -7704,7 +7709,7 @@ + v->type = variant_type; + v->field = gnu_field; + v->qual = qual; +- v->record = NULL_TREE; ++ v->new_type = NULL_TREE; + + /* Recurse on the variant subpart of the variant, if any. */ + variant_subpart = get_variant_part (variant_type); +@@ -8457,7 +8462,9 @@ + + /* First create the type of the variant part from that of the old one. */ + new_union_type = make_node (QUAL_UNION_TYPE); +- TYPE_NAME (new_union_type) = DECL_NAME (TYPE_NAME (old_union_type)); ++ TYPE_NAME (new_union_type) ++ = concat_name (TYPE_NAME (record_type), ++ IDENTIFIER_POINTER (DECL_NAME (old_variant_part))); + + /* If the position of the variant part is constant, subtract it from the + size of the type of the parent to get the new size. This manual CSE +@@ -8491,7 +8498,7 @@ + continue; + + /* Retrieve the list of fields already added to the new variant. */ +- new_variant = v->record; ++ new_variant = v->new_type; + field_list = TYPE_FIELDS (new_variant); + + /* If the old variant had a variant subpart, we need to create a new +diff -Naur gcc-4.6.3.orig/gcc/cgraph.c gcc-4.6.3/gcc/cgraph.c +--- gcc-4.6.3.orig/gcc/cgraph.c 2011-06-06 12:16:35.000000000 -0500 ++++ gcc-4.6.3/gcc/cgraph.c 2012-03-25 04:39:32.217767000 -0500 +@@ -1700,19 +1700,27 @@ + free_nodes = node; + } + +-/* Remove the node from cgraph. */ ++/* Remove the node from cgraph and all inline clones inlined into it. ++ Skip however removal of FORBIDDEN_NODE and return true if it needs to be ++ removed. This allows to call the function from outer loop walking clone ++ tree. */ + +-void +-cgraph_remove_node_and_inline_clones (struct cgraph_node *node) ++bool ++cgraph_remove_node_and_inline_clones (struct cgraph_node *node, struct cgraph_node *forbidden_node) + { + struct cgraph_edge *e, *next; ++ bool found = false; ++ ++ if (node == forbidden_node) ++ return true; + for (e = node->callees; e; e = next) + { + next = e->next_callee; + if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ found |= cgraph_remove_node_and_inline_clones (e->callee, forbidden_node); + } + cgraph_remove_node (node); ++ return found; + } + + /* Notify finalize_compilation_unit that given node is reachable. */ +diff -Naur gcc-4.6.3.orig/gcc/cgraph.h gcc-4.6.3/gcc/cgraph.h +--- gcc-4.6.3.orig/gcc/cgraph.h 2011-03-04 12:49:23.000000000 -0600 ++++ gcc-4.6.3/gcc/cgraph.h 2012-03-25 04:39:32.217767000 -0500 +@@ -547,7 +547,7 @@ + void cgraph_insert_node_to_hashtable (struct cgraph_node *node); + void cgraph_remove_edge (struct cgraph_edge *); + void cgraph_remove_node (struct cgraph_node *); +-void cgraph_remove_node_and_inline_clones (struct cgraph_node *); ++bool cgraph_remove_node_and_inline_clones (struct cgraph_node *, struct cgraph_node *); + void cgraph_release_function_body (struct cgraph_node *); + void cgraph_node_remove_callees (struct cgraph_node *node); + struct cgraph_edge *cgraph_create_edge (struct cgraph_node *, +diff -Naur gcc-4.6.3.orig/gcc/cgraphunit.c gcc-4.6.3/gcc/cgraphunit.c +--- gcc-4.6.3.orig/gcc/cgraphunit.c 2011-03-11 07:27:26.000000000 -0600 ++++ gcc-4.6.3/gcc/cgraphunit.c 2012-03-25 04:39:32.217767000 -0500 +@@ -2157,8 +2157,19 @@ + first_clone->ipa_transforms_to_apply); + first_clone->ipa_transforms_to_apply = NULL; + ++ /* When doing recursive inlining, the clone may become unnecessary. ++ This is possible i.e. in the case when the recursive function is proved to be ++ non-throwing and the recursion happens only in the EH landing pad. ++ We can not remove the clone until we are done with saving the body. ++ Remove it now. */ ++ if (!first_clone->callers) ++ { ++ cgraph_remove_node_and_inline_clones (first_clone, NULL); ++ first_clone = NULL; ++ } + #ifdef ENABLE_CHECKING +- verify_cgraph_node (first_clone); ++ else ++ verify_cgraph_node (first_clone); + #endif + return first_clone; + } +diff -Naur gcc-4.6.3.orig/gcc/combine.c gcc-4.6.3/gcc/combine.c +--- gcc-4.6.3.orig/gcc/combine.c 2012-02-09 11:29:38.000000000 -0600 ++++ gcc-4.6.3/gcc/combine.c 2012-03-15 05:04:12.913641000 -0500 +@@ -1788,6 +1788,10 @@ + if (set == 0) + return 0; + ++ /* The simplification in expand_field_assignment may call back to ++ get_last_value, so set safe guard here. */ ++ subst_low_luid = DF_INSN_LUID (insn); ++ + set = expand_field_assignment (set); + src = SET_SRC (set), dest = SET_DEST (set); + +diff -Naur gcc-4.6.3.orig/gcc/config/alpha/alpha.c gcc-4.6.3/gcc/config/alpha/alpha.c +--- gcc-4.6.3.orig/gcc/config/alpha/alpha.c 2011-08-06 13:41:14.000000000 -0500 ++++ gcc-4.6.3/gcc/config/alpha/alpha.c 2012-08-09 16:49:40.880473000 -0500 +@@ -2469,7 +2469,7 @@ + { + case EQ: case LE: case LT: case LEU: case LTU: + case UNORDERED: +- /* We have these compares: */ ++ /* We have these compares. */ + cmp_code = code, branch_code = NE; + break; + +@@ -2706,13 +2706,15 @@ + switch (code) + { + case EQ: case LE: case LT: case LEU: case LTU: ++ case UNORDERED: + /* We have these compares. */ + cmp_code = code, code = NE; + break; + + case NE: +- /* This must be reversed. */ +- cmp_code = EQ, code = EQ; ++ case ORDERED: ++ /* These must be reversed. */ ++ cmp_code = reverse_condition (code), code = EQ; + break; + + case GE: case GT: case GEU: case GTU: +@@ -2732,6 +2734,14 @@ + gcc_unreachable (); + } + ++ if (cmp_mode == DImode) ++ { ++ if (!reg_or_0_operand (op0, DImode)) ++ op0 = force_reg (DImode, op0); ++ if (!reg_or_8bit_operand (op1, DImode)) ++ op1 = force_reg (DImode, op1); ++ } ++ + tem = gen_reg_rtx (cmp_mode); + emit_insn (gen_rtx_SET (VOIDmode, tem, + gen_rtx_fmt_ee (cmp_code, cmp_mode, +@@ -2743,6 +2753,14 @@ + local_fast_math = 1; + } + ++ if (cmp_mode == DImode) ++ { ++ if (!reg_or_0_operand (op0, DImode)) ++ op0 = force_reg (DImode, op0); ++ if (!reg_or_8bit_operand (op1, DImode)) ++ op1 = force_reg (DImode, op1); ++ } ++ + /* We may be able to use a conditional move directly. + This avoids emitting spurious compares. */ + if (signed_comparison_operator (cmp, VOIDmode) +@@ -2761,11 +2779,13 @@ + switch (code) + { + case EQ: case LE: case LT: case LEU: case LTU: ++ case UNORDERED: + /* We have these compares: */ + break; + + case NE: +- /* This must be reversed. */ ++ case ORDERED: ++ /* These must be reversed. */ + code = reverse_condition (code); + cmov_code = EQ; + break; +@@ -9628,18 +9648,19 @@ + } + } + +-/* Insert an unop between a noreturn function call and GP load. */ ++/* Insert an unop between sibcall or noreturn function call and GP load. */ + + static void +-alpha_pad_noreturn (void) ++alpha_pad_function_end (void) + { + rtx insn, next; + + for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) + { +- if (!CALL_P (insn) +- || !find_reg_note (insn, REG_NORETURN, NULL_RTX)) +- continue; ++ if (! (CALL_P (insn) ++ && (SIBLING_CALL_P (insn) ++ || find_reg_note (insn, REG_NORETURN, NULL_RTX)))) ++ continue; + + next = next_active_insn (insn); + +@@ -9660,8 +9681,28 @@ + static void + alpha_reorg (void) + { +- /* Workaround for a linker error that triggers when an +- exception handler immediatelly follows a noreturn function. ++ /* Workaround for a linker error that triggers when an exception ++ handler immediatelly follows a sibcall or a noreturn function. ++ ++In the sibcall case: ++ ++ The instruction stream from an object file: ++ ++ 1d8: 00 00 fb 6b jmp (t12) ++ 1dc: 00 00 ba 27 ldah gp,0(ra) ++ 1e0: 00 00 bd 23 lda gp,0(gp) ++ 1e4: 00 00 7d a7 ldq t12,0(gp) ++ 1e8: 00 40 5b 6b jsr ra,(t12),1ec <__funcZ+0x1ec> ++ ++ was converted in the final link pass to: ++ ++ 12003aa88: 67 fa ff c3 br 120039428 <...> ++ 12003aa8c: 00 00 fe 2f unop ++ 12003aa90: 00 00 fe 2f unop ++ 12003aa94: 48 83 7d a7 ldq t12,-31928(gp) ++ 12003aa98: 00 40 5b 6b jsr ra,(t12),12003aa9c <__func+0x1ec> ++ ++And in the noreturn case: + + The instruction stream from an object file: + +@@ -9681,11 +9722,11 @@ + + GP load instructions were wrongly cleared by the linker relaxation + pass. This workaround prevents removal of GP loads by inserting +- an unop instruction between a noreturn function call and ++ an unop instruction between a sibcall or noreturn function call and + exception handler prologue. */ + + if (current_function_has_exception_handlers ()) +- alpha_pad_noreturn (); ++ alpha_pad_function_end (); + + if (alpha_tp != ALPHA_TP_PROG || flag_exceptions) + alpha_handle_trap_shadows (); +diff -Naur gcc-4.6.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.6.3/gcc/config/alpha/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/alpha/linux-unwind.h 2011-12-21 06:22:48.000000000 -0600 ++++ gcc-4.6.3/gcc/config/alpha/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Alpha Linux. +- Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2011, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -49,7 +49,7 @@ + else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */ + { + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; +diff -Naur gcc-4.6.3.orig/gcc/config/arm/arm.c gcc-4.6.3/gcc/config/arm/arm.c +--- gcc-4.6.3.orig/gcc/config/arm/arm.c 2012-02-14 00:57:17.000000000 -0600 ++++ gcc-4.6.3/gcc/config/arm/arm.c 2012-09-05 05:54:08.480413000 -0500 +@@ -243,6 +243,7 @@ + static bool fa726te_sched_adjust_cost (rtx, rtx, rtx, int *); + static enum machine_mode arm_preferred_simd_mode (enum machine_mode); + static bool arm_class_likely_spilled_p (reg_class_t); ++static HOST_WIDE_INT arm_vector_alignment (const_tree type); + static bool arm_vector_alignment_reachable (const_tree type, bool is_packed); + static bool arm_builtin_support_vector_misalignment (enum machine_mode mode, + const_tree type, +@@ -579,6 +580,9 @@ + #undef TARGET_CLASS_LIKELY_SPILLED_P + #define TARGET_CLASS_LIKELY_SPILLED_P arm_class_likely_spilled_p + ++#undef TARGET_VECTOR_ALIGNMENT ++#define TARGET_VECTOR_ALIGNMENT arm_vector_alignment ++ + #undef TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE + #define TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE \ + arm_vector_alignment_reachable +@@ -2005,7 +2009,8 @@ + global_options_set.x_param_values); + + /* ARM EABI defaults to strict volatile bitfields. */ +- if (TARGET_AAPCS_BASED && flag_strict_volatile_bitfields < 0) ++ if (TARGET_AAPCS_BASED && flag_strict_volatile_bitfields < 0 ++ && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + /* Enable sw prefetching at -O3 for CPUS that have prefetch, and we have deemed +@@ -4692,6 +4697,18 @@ + return gen_rtx_REG (mode, pcum->nregs); + } + ++/* The AAPCS sets the maximum alignment of a vector to 64 bits. */ ++static HOST_WIDE_INT ++arm_vector_alignment (const_tree type) ++{ ++ HOST_WIDE_INT align = tree_low_cst (TYPE_SIZE (type), 0); ++ ++ if (TARGET_AAPCS_BASED) ++ align = MIN (align, 64); ++ ++ return align; ++} ++ + static unsigned int + arm_function_arg_boundary (enum machine_mode mode, const_tree type) + { +@@ -20427,7 +20444,7 @@ + unsigned long l_mask = live_regs_mask & (for_prologue ? 0x40ff : 0xff); + /* Then count how many other high registers will need to be pushed. */ + unsigned long high_regs_pushed = bit_count (live_regs_mask & 0x0f00); +- int n_free, reg_base; ++ int n_free, reg_base, size; + + if (!for_prologue && frame_pointer_needed) + amount = offsets->locals_base - offsets->saved_regs; +@@ -20466,7 +20483,8 @@ + n_free = 0; + if (!for_prologue) + { +- reg_base = arm_size_return_regs () / UNITS_PER_WORD; ++ size = arm_size_return_regs (); ++ reg_base = ARM_NUM_INTS (size); + live_regs_mask >>= reg_base; + } + +@@ -20520,8 +20538,7 @@ + if (extra_pop > 0) + { + unsigned long extra_mask = (1 << extra_pop) - 1; +- live_regs_mask |= extra_mask << ((size + UNITS_PER_WORD - 1) +- / UNITS_PER_WORD); ++ live_regs_mask |= extra_mask << ARM_NUM_INTS (size); + } + + /* The prolog may have pushed some high registers to use as +@@ -23422,8 +23439,11 @@ + } + } + +- arm_process_output_memory_barrier (emit, NULL); ++ /* Note: label is before barrier so that in cmp failure case we still get ++ a barrier to stop subsequent loads floating upwards past the ldrex ++ PR target/48126. */ + arm_output_asm_insn (emit, 1, operands, "%sLSYB%%=:", LOCAL_LABEL_PREFIX); ++ arm_process_output_memory_barrier (emit, NULL); + } + + static rtx +diff -Naur gcc-4.6.3.orig/gcc/config/arm/arm.h gcc-4.6.3/gcc/config/arm/arm.h +--- gcc-4.6.3.orig/gcc/config/arm/arm.h 2011-07-14 16:26:01.000000000 -0500 ++++ gcc-4.6.3/gcc/config/arm/arm.h 2012-06-19 07:30:17.615240000 -0500 +@@ -294,7 +294,8 @@ + #define TARGET_HAVE_DMB (arm_arch7) + + /* Nonzero if this chip implements a memory barrier via CP15. */ +-#define TARGET_HAVE_DMB_MCR (arm_arch6k && ! TARGET_HAVE_DMB) ++#define TARGET_HAVE_DMB_MCR (arm_arch6 && ! TARGET_HAVE_DMB \ ++ && ! TARGET_THUMB1) + + /* Nonzero if this chip implements a memory barrier instruction. */ + #define TARGET_HAVE_MEMORY_BARRIER (TARGET_HAVE_DMB || TARGET_HAVE_DMB_MCR) +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr.c gcc-4.6.3/gcc/config/avr/avr.c +--- gcc-4.6.3.orig/gcc/config/avr/avr.c 2012-01-12 11:23:32.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr.c 2012-09-04 04:21:20.968406000 -0500 +@@ -94,6 +94,7 @@ + static unsigned int avr_case_values_threshold (void); + static bool avr_frame_pointer_required_p (void); + static bool avr_can_eliminate (const int, const int); ++static bool avr_allocate_stack_slots_for_args (void); + static bool avr_class_likely_spilled_p (reg_class_t c); + static rtx avr_function_arg (CUMULATIVE_ARGS *, enum machine_mode, + const_tree, bool); +@@ -218,6 +219,9 @@ + #undef TARGET_CAN_ELIMINATE + #define TARGET_CAN_ELIMINATE avr_can_eliminate + ++#undef TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS ++#define TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS avr_allocate_stack_slots_for_args ++ + #undef TARGET_CLASS_LIKELY_SPILLED_P + #define TARGET_CLASS_LIKELY_SPILLED_P avr_class_likely_spilled_p + +@@ -446,6 +450,16 @@ + return count; + } + ++ ++/* Implement `TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS' */ ++ ++static bool ++avr_allocate_stack_slots_for_args (void) ++{ ++ return !cfun->machine->is_naked; ++} ++ ++ + /* Return true if register FROM can be eliminated via register TO. */ + + bool +@@ -1879,12 +1893,9 @@ + } + else if (test_hard_reg_class (STACK_REG, src)) + { +- *l = 2; +- return AVR_HAVE_8BIT_SP +- ? (AS2 (in,%A0,__SP_L__) CR_TAB +- AS1 (clr,%B0)) +- : (AS2 (in,%A0,__SP_L__) CR_TAB +- AS2 (in,%B0,__SP_H__)); ++ *l = 2; ++ return (AS2 (in,%A0,__SP_L__) CR_TAB ++ AS2 (in,%B0,__SP_H__)); + } + + if (AVR_HAVE_MOVW) +@@ -5177,10 +5188,9 @@ + + default_file_start (); + +- fputs ("__SREG__ = 0x3f\n", asm_out_file); +- if (!AVR_HAVE_8BIT_SP) +- fputs ("__SP_H__ = 0x3e\n", asm_out_file); +- fputs ("__SP_L__ = 0x3d\n", asm_out_file); ++ fputs ("__SREG__ = 0x3f\n" ++ "__SP_H__ = 0x3e\n" ++ "__SP_L__ = 0x3d\n", asm_out_file); + + fputs ("__tmp_reg__ = 0\n" + "__zero_reg__ = 1\n", asm_out_file); +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr-devices.c gcc-4.6.3/gcc/config/avr/avr-devices.c +--- gcc-4.6.3.orig/gcc/config/avr/avr-devices.c 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr-devices.c 2012-09-10 05:51:13.070478000 -0500 +@@ -211,7 +211,7 @@ + { "atmega128rfa1", ARCH_AVR51, "__AVR_ATmega128RFA1__", 0, 0x0200, "m128rfa1" }, + { "at90can128", ARCH_AVR51, "__AVR_AT90CAN128__", 0, 0x0100, "can128" }, + { "at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__", 0, 0x0100, "usb1286" }, +- { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1286" }, ++ { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1287" }, + /* 3-Byte PC. */ + { "avr6", ARCH_AVR6, NULL, 0, 0x0200, "m2561" }, + { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__", 0, 0x0200, "m2560" }, +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr.md gcc-4.6.3/gcc/config/avr/avr.md +--- gcc-4.6.3.orig/gcc/config/avr/avr.md 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr.md 2012-03-28 05:06:51.859458000 -0500 +@@ -299,7 +299,7 @@ + [(set (match_operand:HI 0 "stack_register_operand" "=q") + (unspec_volatile:HI [(match_operand:HI 1 "register_operand" "r")] + UNSPECV_WRITE_SP_IRQ_OFF))] +- "!AVR_HAVE_8BIT_SP" ++ "" + "out __SP_H__, %B1 + out __SP_L__, %A1" + [(set_attr "length" "2") +@@ -309,7 +309,7 @@ + [(set (match_operand:HI 0 "stack_register_operand" "=q") + (unspec_volatile:HI [(match_operand:HI 1 "register_operand" "r")] + UNSPECV_WRITE_SP_IRQ_ON))] +- "!AVR_HAVE_8BIT_SP" ++ "" + "cli + out __SP_H__, %B1 + sei +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr-stdint.h gcc-4.6.3/gcc/config/avr/avr-stdint.h +--- gcc-4.6.3.orig/gcc/config/avr/avr-stdint.h 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr-stdint.h 2012-06-04 04:53:04.873173000 -0500 +@@ -0,0 +1,66 @@ ++/* Definitions for <stdint.h> types on systems using newlib. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ ++This file is part of GCC. ++ ++GCC 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 3, or (at your option) ++any later version. ++ ++GCC 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 GCC; see the file COPYING3. If not see ++<http://www.gnu.org/licenses/>. */ ++ ++/* ++ The intention of this file is to supply definitions that work with ++ avr-gcc's -mint8 that sets int to an 8-bit type. ++ ++ This file is intended to yield the same results as newlib-stdint.h, ++ but there are some differences to newlib-stdint.h: ++ ++ - AVR is an 8-bit architecture that cannot access 16-bit values ++ atomically, this SIG_ATOMIC_TYPE is "char". ++ ++ - For the same reason, [u]int_fast8_t is defined as 8-bit type. ++ ++*/ ++ ++#define SIG_ATOMIC_TYPE "char" ++ ++#define INT8_TYPE "signed char" ++#define INT16_TYPE (INT_TYPE_SIZE == 16 ? "short int" : "long int") ++#define INT32_TYPE (INT_TYPE_SIZE == 16 ? "long int" : "long long int") ++#define INT64_TYPE (INT_TYPE_SIZE == 16 ? "long long int" : 0) ++#define UINT8_TYPE "unsigned char" ++#define UINT16_TYPE (INT_TYPE_SIZE == 16 ? "short unsigned int" : "long unsigned int") ++#define UINT32_TYPE (INT_TYPE_SIZE == 16 ? "long unsigned int" : "long long unsigned int") ++#define UINT64_TYPE (INT_TYPE_SIZE == 16 ? "long long unsigned int" : 0) ++ ++#define INT_LEAST8_TYPE INT8_TYPE ++#define INT_LEAST16_TYPE INT16_TYPE ++#define INT_LEAST32_TYPE INT32_TYPE ++#define INT_LEAST64_TYPE INT64_TYPE ++#define UINT_LEAST8_TYPE UINT8_TYPE ++#define UINT_LEAST16_TYPE UINT16_TYPE ++#define UINT_LEAST32_TYPE UINT32_TYPE ++#define UINT_LEAST64_TYPE UINT64_TYPE ++ ++#define INT_FAST8_TYPE INT8_TYPE ++#define INT_FAST16_TYPE (INT_TYPE_SIZE == 16 ? "int" : INT16_TYPE) ++#define INT_FAST32_TYPE INT32_TYPE ++#define INT_FAST64_TYPE INT64_TYPE ++#define UINT_FAST8_TYPE UINT8_TYPE ++#define UINT_FAST16_TYPE (INT_TYPE_SIZE == 16 ? "unsigned int" : UINT16_TYPE) ++#define UINT_FAST32_TYPE UINT32_TYPE ++#define UINT_FAST64_TYPE UINT64_TYPE ++ ++#define INTPTR_TYPE PTRDIFF_TYPE ++#ifndef UINTPTR_TYPE ++#define UINTPTR_TYPE SIZE_TYPE ++#endif +diff -Naur gcc-4.6.3.orig/gcc/config/avr/libgcc.S gcc-4.6.3/gcc/config/avr/libgcc.S +--- gcc-4.6.3.orig/gcc/config/avr/libgcc.S 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/libgcc.S 2012-03-28 05:06:51.859458000 -0500 +@@ -582,15 +582,6 @@ + push r17 + push r28 + push r29 +-#if defined (__AVR_HAVE_8BIT_SP__) +-;; FIXME: __AVR_HAVE_8BIT_SP__ is set on device level, not on core level +-;; so this lines are dead code. To make it work, devices without +-;; SP_H must get their own multilib(s), see PR51345. +- in r28,__SP_L__ +- sub r28,r26 +- clr r29 +- out __SP_L__,r28 +-#else + in r28,__SP_L__ + in r29,__SP_H__ + sub r28,r26 +@@ -600,7 +591,6 @@ + out __SP_H__,r29 + out __SREG__,__tmp_reg__ + out __SP_L__,r28 +-#endif + #if defined (__AVR_HAVE_EIJMP_EICALL__) + eijmp + #else +@@ -635,15 +625,6 @@ + ldd r16,Y+4 + ldd r17,Y+3 + ldd r26,Y+2 +-#if defined (__AVR_HAVE_8BIT_SP__) +-;; FIXME: __AVR_HAVE_8BIT_SP__ is set on device level, not on core level +-;; so this lines are dead code. To make it work, devices without +-;; SP_H must get their own multilib(s). +- ldd r29,Y+1 +- add r28,r30 +- out __SP_L__,r28 +- mov r28, r26 +-#else + ldd r27,Y+1 + add r28,r30 + adc r29,__zero_reg__ +@@ -654,7 +635,6 @@ + out __SP_L__,r28 + mov_l r28, r26 + mov_h r29, r27 +-#endif + ret + .endfunc + #endif /* defined (L_epilogue) */ +diff -Naur gcc-4.6.3.orig/gcc/config/bfin/linux-unwind.h gcc-4.6.3/gcc/config/bfin/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/bfin/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/bfin/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Blackfin. +- Copyright (C) 2007, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -48,10 +48,10 @@ + { + struct rt_sigframe { + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; + char retcode[8]; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + +diff -Naur gcc-4.6.3.orig/gcc/config/h8300/h8300.c gcc-4.6.3/gcc/config/h8300/h8300.c +--- gcc-4.6.3.orig/gcc/config/h8300/h8300.c 2010-12-01 07:46:36.000000000 -0600 ++++ gcc-4.6.3/gcc/config/h8300/h8300.c 2012-03-28 21:15:29.973365000 -0500 +@@ -416,7 +416,7 @@ + } + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + } + +diff -Naur gcc-4.6.3.orig/gcc/config/host-linux.c gcc-4.6.3/gcc/config/host-linux.c +--- gcc-4.6.3.orig/gcc/config/host-linux.c 2010-11-29 08:09:41.000000000 -0600 ++++ gcc-4.6.3/gcc/config/host-linux.c 2012-03-22 21:19:46.206744000 -0500 +@@ -84,6 +84,8 @@ + # define TRY_EMPTY_VM_SPACE 0x60000000 + #elif defined(__mc68000__) + # define TRY_EMPTY_VM_SPACE 0x40000000 ++#elif defined(__ARM_EABI__) ++# define TRY_EMPTY_VM_SPACE 0x60000000 + #else + # define TRY_EMPTY_VM_SPACE 0 + #endif +diff -Naur gcc-4.6.3.orig/gcc/config/i386/driver-i386.c gcc-4.6.3/gcc/config/i386/driver-i386.c +--- gcc-4.6.3.orig/gcc/config/i386/driver-i386.c 2012-01-19 14:15:29.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/driver-i386.c 2012-10-03 12:51:22.129805000 -0500 +@@ -1,5 +1,5 @@ + /* Subroutines for the gcc driver. +- Copyright (C) 2006, 2007, 2008, 2010 Free Software Foundation, Inc. ++ Copyright (C) 2006-2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -397,6 +397,8 @@ + unsigned int has_pclmul = 0, has_abm = 0, has_lwp = 0; + unsigned int has_fma = 0, has_fma4 = 0, has_xop = 0; + unsigned int has_bmi = 0, has_tbm = 0; ++ unsigned int has_rdrnd = 0, has_f16c = 0, has_fsgsbase = 0; ++ unsigned int has_osxsave = 0; + + bool arch; + +@@ -438,12 +440,15 @@ + has_sse4_1 = ecx & bit_SSE4_1; + has_sse4_2 = ecx & bit_SSE4_2; + has_avx = ecx & bit_AVX; ++ has_osxsave = ecx & bit_OSXSAVE; + has_cmpxchg16b = ecx & bit_CMPXCHG16B; + has_movbe = ecx & bit_MOVBE; + has_popcnt = ecx & bit_POPCNT; + has_aes = ecx & bit_AES; + has_pclmul = ecx & bit_PCLMUL; + has_fma = ecx & bit_FMA; ++ has_f16c = ecx & bit_F16C; ++ has_rdrnd = ecx & bit_RDRND; + + has_cmpxchg8b = edx & bit_CMPXCHG8B; + has_cmov = edx & bit_CMOV; +@@ -451,6 +456,33 @@ + has_sse = edx & bit_SSE; + has_sse2 = edx & bit_SSE2; + ++ if (max_level >= 7) ++ { ++ __cpuid_count (7, 0, eax, ebx, ecx, edx); ++ ++ has_fsgsbase = ebx & bit_FSGSBASE; ++ } ++ ++ /* Get XCR_XFEATURE_ENABLED_MASK register with xgetbv. */ ++#define XCR_XFEATURE_ENABLED_MASK 0x0 ++#define XSTATE_FP 0x1 ++#define XSTATE_SSE 0x2 ++#define XSTATE_YMM 0x4 ++ if (has_osxsave) ++ asm (".byte 0x0f; .byte 0x01; .byte 0xd0" ++ : "=a" (eax), "=d" (edx) ++ : "c" (XCR_XFEATURE_ENABLED_MASK)); ++ ++ /* Check if SSE and YMM states are supported. */ ++ if (!has_osxsave ++ || (eax & (XSTATE_SSE | XSTATE_YMM)) != (XSTATE_SSE | XSTATE_YMM)) ++ { ++ has_avx = 0; ++ has_fma = 0; ++ has_fma4 = 0; ++ has_xop = 0; ++ } ++ + /* Check cpuid level of extended features. */ + __cpuid (0x80000000, ext_level, ebx, ecx, edx); + +@@ -711,10 +743,13 @@ + const char *avx = has_avx ? " -mavx" : " -mno-avx"; + const char *sse4_2 = has_sse4_2 ? " -msse4.2" : " -mno-sse4.2"; + const char *sse4_1 = has_sse4_1 ? " -msse4.1" : " -mno-sse4.1"; ++ const char *rdrnd = has_rdrnd ? " -mrdrnd" : " -mno-rdrnd"; ++ const char *f16c = has_f16c ? " -mf16c" : " -mno-f16c"; ++ const char *fsgsbase = has_fsgsbase ? " -mfsgsbase" : " -mno-fsgsbase"; + + options = concat (options, cx16, sahf, movbe, ase, pclmul, + popcnt, abm, lwp, fma, fma4, xop, bmi, tbm, +- avx, sse4_2, sse4_1, NULL); ++ avx, sse4_2, sse4_1, rdrnd, f16c, fsgsbase, NULL); + } + + done: +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.c gcc-4.6.3/gcc/config/i386/i386.c +--- gcc-4.6.3.orig/gcc/config/i386/i386.c 2012-02-22 13:17:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386.c 2012-05-22 04:20:15.992160000 -0500 +@@ -46,6 +46,7 @@ + #include "target.h" + #include "target-def.h" + #include "langhooks.h" ++#include "reload.h" + #include "cgraph.h" + #include "gimple.h" + #include "dwarf2.h" +@@ -2094,7 +2095,7 @@ + /* Feature tests against the various architecture variations, used to create + ix86_arch_features based on the processor mask. */ + static unsigned int initial_ix86_arch_features[X86_ARCH_LAST] = { +- /* X86_ARCH_CMOVE: Conditional move was added for pentiumpro. */ ++ /* X86_ARCH_CMOV: Conditional move was added for pentiumpro. */ + ~(m_386 | m_486 | m_PENT | m_K6), + + /* X86_ARCH_CMPXCHG: Compare and exchange was added for 80486. */ +@@ -3811,7 +3812,7 @@ + -mtune (rather than -march) points us to a processor that has them. + However, the VIA C3 gives a SIGILL, so we only do that for i686 and + higher processors. */ +- if (TARGET_CMOVE ++ if (TARGET_CMOV + && (processor_alias_table[i].flags & (PTA_PREFETCH_SSE | PTA_SSE))) + x86_prefetch_sse = true; + break; +@@ -4181,12 +4182,6 @@ + target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; + } + +- /* For sane SSE instruction set generation we need fcomi instruction. +- It is safe to enable all CMOVE instructions. Also, RDRAND intrinsic +- expands to a sequence that includes conditional move. */ +- if (TARGET_SSE || TARGET_RDRND) +- TARGET_CMOVE = 1; +- + /* Figure out what ASM_GENERATE_INTERNAL_LABEL builds as a prefix. */ + { + char *p; +@@ -12168,6 +12163,64 @@ + return false; + } + ++/* Our implementation of LEGITIMIZE_RELOAD_ADDRESS. Returns a value to ++ replace the input X, or the original X if no replacement is called for. ++ The output parameter *WIN is 1 if the calling macro should goto WIN, ++ 0 if it should not. */ ++ ++bool ++ix86_legitimize_reload_address (rtx x, ++ enum machine_mode mode ATTRIBUTE_UNUSED, ++ int opnum, int type, ++ int ind_levels ATTRIBUTE_UNUSED) ++{ ++ /* Reload can generate: ++ ++ (plus:DI (plus:DI (unspec:DI [(const_int 0 [0])] UNSPEC_TP) ++ (reg:DI 97)) ++ (reg:DI 2 cx)) ++ ++ This RTX is rejected from ix86_legitimate_address_p due to ++ non-strictness of base register 97. Following this rejection, ++ reload pushes all three components into separate registers, ++ creating invalid memory address RTX. ++ ++ Following code reloads only the invalid part of the ++ memory address RTX. */ ++ ++ if (GET_CODE (x) == PLUS ++ && REG_P (XEXP (x, 1)) ++ && GET_CODE (XEXP (x, 0)) == PLUS ++ && REG_P (XEXP (XEXP (x, 0), 1))) ++ { ++ rtx base, index; ++ bool something_reloaded = false; ++ ++ base = XEXP (XEXP (x, 0), 1); ++ if (!REG_OK_FOR_BASE_STRICT_P (base)) ++ { ++ push_reload (base, NULL_RTX, &XEXP (XEXP (x, 0), 1), NULL, ++ BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0, ++ opnum, (enum reload_type)type); ++ something_reloaded = true; ++ } ++ ++ index = XEXP (x, 1); ++ if (!REG_OK_FOR_INDEX_STRICT_P (index)) ++ { ++ push_reload (index, NULL_RTX, &XEXP (x, 1), NULL, ++ INDEX_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0, ++ opnum, (enum reload_type)type); ++ something_reloaded = true; ++ } ++ ++ gcc_assert (something_reloaded); ++ return true; ++ } ++ ++ return false; ++} ++ + /* Recognizes RTL expressions that are valid memory addresses for an + instruction. The MODE argument is the machine mode for the MEM + expression that wants to use this address. +@@ -27177,8 +27230,8 @@ + arg_adjust = 0; + if (optimize + || target == 0 +- || GET_MODE (target) != tmode +- || !insn_p->operand[0].predicate (target, tmode)) ++ || !register_operand (target, tmode) ++ || GET_MODE (target) != tmode) + target = gen_reg_rtx (tmode); + } + +@@ -31377,9 +31430,9 @@ + tmp = gen_reg_rtx (GET_MODE_INNER (mode)); + ix86_expand_vector_extract (true, tmp, target, 1 - elt); + if (elt == 0) +- tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); +- else + tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); ++ else ++ tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); + emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + return; + } +@@ -31393,9 +31446,9 @@ + tmp = gen_reg_rtx (GET_MODE_INNER (mode)); + ix86_expand_vector_extract (false, tmp, target, 1 - elt); + if (elt == 0) +- tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); +- else + tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); ++ else ++ tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); + emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + return; + +@@ -32823,7 +32876,8 @@ + return ix86_cost->cond_not_taken_branch_cost; + + case vec_perm: +- return 1; ++ case vec_promote_demote: ++ return ix86_cost->vec_stmt_cost; + + default: + gcc_unreachable (); +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.h gcc-4.6.3/gcc/config/i386/i386.h +--- gcc-4.6.3.orig/gcc/config/i386/i386.h 2011-06-29 15:15:32.000000000 -0500 ++++ gcc-4.6.3/gcc/config/i386/i386.h 2012-05-04 12:48:56.810029000 -0500 +@@ -424,7 +424,7 @@ + + /* Feature tests against the various architecture variations. */ + enum ix86_arch_indices { +- X86_ARCH_CMOVE, /* || TARGET_SSE */ ++ X86_ARCH_CMOV, + X86_ARCH_CMPXCHG, + X86_ARCH_CMPXCHG8B, + X86_ARCH_XADD, +@@ -435,12 +435,17 @@ + + extern unsigned char ix86_arch_features[X86_ARCH_LAST]; + +-#define TARGET_CMOVE ix86_arch_features[X86_ARCH_CMOVE] ++#define TARGET_CMOV ix86_arch_features[X86_ARCH_CMOV] + #define TARGET_CMPXCHG ix86_arch_features[X86_ARCH_CMPXCHG] + #define TARGET_CMPXCHG8B ix86_arch_features[X86_ARCH_CMPXCHG8B] + #define TARGET_XADD ix86_arch_features[X86_ARCH_XADD] + #define TARGET_BSWAP ix86_arch_features[X86_ARCH_BSWAP] + ++/* For sane SSE instruction set generation we need fcomi instruction. ++ It is safe to enable all CMOVE instructions. Also, RDRAND intrinsic ++ expands to a sequence that includes conditional move. */ ++#define TARGET_CMOVE (TARGET_CMOV || TARGET_SSE || TARGET_RDRND) ++ + #define TARGET_FISTTP (TARGET_SSE3 && TARGET_80387) + + extern int x86_prefetch_sse; +@@ -1668,6 +1673,17 @@ + + #define LEGITIMATE_CONSTANT_P(X) legitimate_constant_p (X) + ++/* Try a machine-dependent way of reloading an illegitimate address ++ operand. If we find one, push the reload and jump to WIN. This ++ macro is used in only one place: `find_reloads_address' in reload.c. */ ++ ++#define LEGITIMIZE_RELOAD_ADDRESS(X, MODE, OPNUM, TYPE, INDL, WIN) \ ++do { \ ++ if (ix86_legitimize_reload_address ((X), (MODE), (OPNUM), \ ++ (int)(TYPE), (INDL))) \ ++ goto WIN; \ ++} while (0) ++ + /* If defined, a C expression to determine the base term of address X. + This macro is used in only one place: `find_base_term' in alias.c. + +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.md gcc-4.6.3/gcc/config/i386/i386.md +--- gcc-4.6.3.orig/gcc/config/i386/i386.md 2012-01-12 04:33:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386.md 2012-05-21 07:59:53.696085000 -0500 +@@ -233,9 +233,6 @@ + + ;; For BMI support + UNSPEC_BEXTR +- +- ;; For RDRAND support +- UNSPEC_RDRAND + ]) + + (define_c_enum "unspecv" [ +@@ -270,6 +267,9 @@ + UNSPECV_WRFSBASE + UNSPECV_WRGSBASE + UNSPECV_SPLIT_STACK_RETURN ++ ++ ;; For RDRAND support ++ UNSPECV_RDRAND + ]) + + ;; Constants to represent pcomtrue/pcomfalse variants +@@ -16349,7 +16349,8 @@ + (define_insn "*x86_mov<mode>cc_0_m1_neg" + [(set (match_operand:SWI48 0 "register_operand" "=r") + (neg:SWI48 (match_operator 1 "ix86_carry_flag_operator" +- [(reg FLAGS_REG) (const_int 0)])))] ++ [(reg FLAGS_REG) (const_int 0)]))) ++ (clobber (reg:CC FLAGS_REG))] + "" + "sbb{<imodesuffix>}\t%0, %0" + [(set_attr "type" "alu") +@@ -18357,9 +18358,9 @@ + + (define_insn "rdrand<mode>_1" + [(set (match_operand:SWI248 0 "register_operand" "=r") +- (unspec:SWI248 [(const_int 0)] UNSPEC_RDRAND)) ++ (unspec_volatile:SWI248 [(const_int 0)] UNSPECV_RDRAND)) + (set (reg:CCC FLAGS_REG) +- (unspec:CCC [(const_int 0)] UNSPEC_RDRAND))] ++ (unspec_volatile:CCC [(const_int 0)] UNSPECV_RDRAND))] + "TARGET_RDRND" + "rdrand\t%0" + [(set_attr "type" "other") +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386-protos.h gcc-4.6.3/gcc/config/i386/i386-protos.h +--- gcc-4.6.3.orig/gcc/config/i386/i386-protos.h 2011-01-13 14:01:57.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386-protos.h 2012-03-29 14:19:26.420040000 -0500 +@@ -59,7 +59,8 @@ + extern bool constant_address_p (rtx); + extern bool legitimate_pic_operand_p (rtx); + extern bool legitimate_pic_address_disp_p (rtx); +- ++extern bool ix86_legitimize_reload_address (rtx, enum machine_mode, ++ int, int, int); + extern void print_reg (rtx, int, FILE*); + extern void ix86_print_operand (FILE *, rtx, int); + +diff -Naur gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h gcc-4.6.3/gcc/config/i386/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for AMD x86-64 and x86. +- Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2012 Free Software Foundation, ++ Inc. + + This file is part of GCC. + +@@ -133,9 +134,9 @@ + { + struct rt_sigframe { + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +diff -Naur gcc-4.6.3.orig/gcc/config/i386/sse.md gcc-4.6.3/gcc/config/i386/sse.md +--- gcc-4.6.3.orig/gcc/config/i386/sse.md 2011-10-27 16:55:22.000000000 -0500 ++++ gcc-4.6.3/gcc/config/i386/sse.md 2012-06-17 09:09:00.121097000 -0500 +@@ -392,18 +392,7 @@ + DONE; + }) + +-(define_expand "avx_movu<ssemodesuffix><avxmodesuffix>" +- [(set (match_operand:AVXMODEF2P 0 "nonimmediate_operand" "") +- (unspec:AVXMODEF2P +- [(match_operand:AVXMODEF2P 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "AVX_VEC_FLOAT_MODE_P (<MODE>mode)" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*avx_movu<ssemodesuffix><avxmodesuffix>" ++(define_insn "avx_movu<ssemodesuffix><avxmodesuffix>" + [(set (match_operand:AVXMODEF2P 0 "nonimmediate_operand" "=x,m") + (unspec:AVXMODEF2P + [(match_operand:AVXMODEF2P 1 "nonimmediate_operand" "xm,x")] +@@ -429,18 +418,7 @@ + (set_attr "prefix" "maybe_vex") + (set_attr "mode" "TI")]) + +-(define_expand "<sse>_movu<ssemodesuffix>" +- [(set (match_operand:SSEMODEF2P 0 "nonimmediate_operand" "") +- (unspec:SSEMODEF2P +- [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "SSE_VEC_FLOAT_MODE_P (<MODE>mode)" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*<sse>_movu<ssemodesuffix>" ++(define_insn "<sse>_movu<ssemodesuffix>" + [(set (match_operand:SSEMODEF2P 0 "nonimmediate_operand" "=x,m") + (unspec:SSEMODEF2P + [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "xm,x")] +@@ -452,18 +430,7 @@ + (set_attr "movu" "1") + (set_attr "mode" "<MODE>")]) + +-(define_expand "avx_movdqu<avxmodesuffix>" +- [(set (match_operand:AVXMODEQI 0 "nonimmediate_operand" "") +- (unspec:AVXMODEQI +- [(match_operand:AVXMODEQI 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "TARGET_AVX" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*avx_movdqu<avxmodesuffix>" ++(define_insn "avx_movdqu<avxmodesuffix>" + [(set (match_operand:AVXMODEQI 0 "nonimmediate_operand" "=x,m") + (unspec:AVXMODEQI + [(match_operand:AVXMODEQI 1 "nonimmediate_operand" "xm,x")] +@@ -475,17 +442,7 @@ + (set_attr "prefix" "vex") + (set_attr "mode" "<avxvecmode>")]) + +-(define_expand "sse2_movdqu" +- [(set (match_operand:V16QI 0 "nonimmediate_operand" "") +- (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "TARGET_SSE2" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (V16QImode, operands[1]); +-}) +- +-(define_insn "*sse2_movdqu" ++(define_insn "sse2_movdqu" + [(set (match_operand:V16QI 0 "nonimmediate_operand" "=x,m") + (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "xm,x")] + UNSPEC_MOVU))] +@@ -1324,14 +1281,14 @@ + (parallel [(const_int 0)])) + (vec_select:DF (match_dup 1) (parallel [(const_int 1)]))) + (plusminus:DF +- (vec_select:DF (match_dup 1) (parallel [(const_int 2)])) +- (vec_select:DF (match_dup 1) (parallel [(const_int 3)])))) +- (vec_concat:V2DF +- (plusminus:DF + (vec_select:DF + (match_operand:V4DF 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) +- (vec_select:DF (match_dup 2) (parallel [(const_int 1)]))) ++ (vec_select:DF (match_dup 2) (parallel [(const_int 1)])))) ++ (vec_concat:V2DF ++ (plusminus:DF ++ (vec_select:DF (match_dup 1) (parallel [(const_int 2)])) ++ (vec_select:DF (match_dup 1) (parallel [(const_int 3)]))) + (plusminus:DF + (vec_select:DF (match_dup 2) (parallel [(const_int 2)])) + (vec_select:DF (match_dup 2) (parallel [(const_int 3)]))))))] +@@ -5058,7 +5015,7 @@ + (vec_select:DF (match_dup 0) (parallel [(const_int 1)]))))] + "TARGET_SSE2 && reload_completed" + [(set (match_dup 0) (match_dup 1))] +- "operands[0] = adjust_address (operands[0], DFmode, 8);") ++ "operands[0] = adjust_address (operands[0], DFmode, 0);") + + ;; Not sure these two are ever used, but it doesn't hurt to have + ;; them. -aoliva +@@ -12095,7 +12052,7 @@ + (unspec:V8SF [(match_operand:V8HI 1 "register_operand" "x")] + UNSPEC_VCVTPH2PS) + (parallel [(const_int 0) (const_int 1) +- (const_int 1) (const_int 2)])))] ++ (const_int 2) (const_int 3)])))] + "TARGET_F16C" + "vcvtph2ps\t{%1, %0|%0, %1}" + [(set_attr "type" "ssecvt") +diff -Naur gcc-4.6.3.orig/gcc/config/ia64/linux-unwind.h gcc-4.6.3/gcc/config/ia64/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/ia64/linux-unwind.h 2009-08-14 15:49:40.000000000 -0500 ++++ gcc-4.6.3/gcc/config/ia64/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for IA64 Linux. +- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -47,7 +47,7 @@ + struct sigframe { + char scratch[16]; + unsigned long sig_number; +- struct siginfo *info; ++ siginfo_t *info; + struct sigcontext *sc; + } *frame_ = (struct sigframe *)context->psp; + struct sigcontext *sc = frame_->sc; +@@ -137,7 +137,7 @@ + struct sigframe { + char scratch[16]; + unsigned long sig_number; +- struct siginfo *info; ++ siginfo_t *info; + struct sigcontext *sc; + } *frame = (struct sigframe *)context->psp; + struct sigcontext *sc = frame->sc; +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/m32c.c gcc-4.6.3/gcc/config/m32c/m32c.c +--- gcc-4.6.3.orig/gcc/config/m32c/m32c.c 2011-02-10 13:41:26.000000000 -0600 ++++ gcc-4.6.3/gcc/config/m32c/m32c.c 2012-03-28 21:15:29.973365000 -0500 +@@ -447,7 +447,7 @@ + flag_ivopts = 0; + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + /* r8c/m16c have no 16-bit indirect call, so thunks are involved. +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/muldiv.md gcc-4.6.3/gcc/config/m32c/muldiv.md +--- gcc-4.6.3.orig/gcc/config/m32c/muldiv.md 2007-08-02 05:49:31.000000000 -0500 ++++ gcc-4.6.3/gcc/config/m32c/muldiv.md 2012-10-17 20:50:24.536874000 -0500 +@@ -108,7 +108,7 @@ + (define_insn "umulhisi3_c" + [(set (match_operand:SI 0 "ra_operand" "=Rsi") + (mult:SI (zero_extend:SI (match_operand:HI 1 "mra_operand" "%0")) +- (match_operand 2 "immediate_operand" "i")))] ++ (match_operand 2 "m32c_const_u16_operand" "i")))] + "" + "mulu.w\t%u2,%1" + [(set_attr "flags" "o")] +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/predicates.md gcc-4.6.3/gcc/config/m32c/predicates.md +--- gcc-4.6.3.orig/gcc/config/m32c/predicates.md 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/config/m32c/predicates.md 2012-10-18 00:56:54.834308000 -0500 +@@ -293,3 +293,7 @@ + (define_predicate "m32c_1mask16_operand" + (and (match_operand 0 "const_int_operand") + (match_test "m32c_const_ok_for_constraint_p(INTVAL(op), 'I', \"Imw\")"))) ++ ++(define_predicate "m32c_const_u16_operand" ++ (and (match_operand 0 "const_int_operand") ++ (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 65535"))) +diff -Naur gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h gcc-4.6.3/gcc/config/mips/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/mips/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for MIPS Linux. +- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software ++ Foundation, Inc. + + This file is part of GCC. + +@@ -75,7 +76,7 @@ + struct rt_sigframe { + u_int32_t ass[4]; /* Argument save space for o32. */ + u_int32_t trampoline[2]; +- struct siginfo info; ++ siginfo_t info; + _sig_ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; +diff -Naur gcc-4.6.3.orig/gcc/config/mips/mips.c gcc-4.6.3/gcc/config/mips/mips.c +--- gcc-4.6.3.orig/gcc/config/mips/mips.c 2011-05-29 12:48:14.000000000 -0500 ++++ gcc-4.6.3/gcc/config/mips/mips.c 2012-09-02 05:37:49.951074000 -0500 +@@ -15083,7 +15083,10 @@ + } + + if (optimize > 0 && flag_delayed_branch) +- dbr_schedule (get_insns ()); ++ { ++ cleanup_barriers (); ++ dbr_schedule (get_insns ()); ++ } + mips_reorg_process_insns (); + if (!TARGET_MIPS16 + && TARGET_EXPLICIT_RELOCS +diff -Naur gcc-4.6.3.orig/gcc/config/mn10300/mn10300.c gcc-4.6.3/gcc/config/mn10300/mn10300.c +--- gcc-4.6.3.orig/gcc/config/mn10300/mn10300.c 2011-02-15 11:09:39.000000000 -0600 ++++ gcc-4.6.3/gcc/config/mn10300/mn10300.c 2012-07-06 05:09:28.333336000 -0500 +@@ -2505,12 +2505,15 @@ + may access it using GOTOFF instead of GOT. */ + + static void +-mn10300_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED) ++mn10300_encode_section_info (tree decl, rtx rtl, int first) + { + rtx symbol; + ++ default_encode_section_info (decl, rtl, first); ++ + if (! MEM_P (rtl)) + return; ++ + symbol = XEXP (rtl, 0); + if (GET_CODE (symbol) != SYMBOL_REF) + return; +diff -Naur gcc-4.6.3.orig/gcc/config/pa/linux-unwind.h gcc-4.6.3/gcc/config/pa/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/pa/linux-unwind.h 2009-12-05 11:45:59.000000000 -0600 ++++ gcc-4.6.3/gcc/config/pa/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for PA Linux. +- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -63,7 +63,7 @@ + int i; + struct sigcontext *sc; + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *frame; + +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.c gcc-4.6.3/gcc/config/pa/pa.c +--- gcc-4.6.3.orig/gcc/config/pa/pa.c 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.c 2012-06-16 20:33:06.931030000 -0500 +@@ -185,6 +185,7 @@ + static void pa_conditional_register_usage (void); + static enum machine_mode pa_c_mode_for_suffix (char); + static section *pa_function_section (tree, enum node_frequency, bool, bool); ++static unsigned int pa_section_type_flags (tree, const char *, int); + + /* The following extra sections are only used for SOM. */ + static GTY(()) section *som_readonly_data_section; +@@ -400,6 +401,9 @@ + #undef TARGET_ASM_FUNCTION_SECTION + #define TARGET_ASM_FUNCTION_SECTION pa_function_section + ++#undef TARGET_SECTION_TYPE_FLAGS ++#define TARGET_SECTION_TYPE_FLAGS pa_section_type_flags ++ + struct gcc_target targetm = TARGET_INITIALIZER; + + /* Parse the -mfixed-range= option string. */ +@@ -4442,6 +4446,24 @@ + } + } + ++bool ++pa_can_use_return_insn (void) ++{ ++ if (!reload_completed) ++ return false; ++ ++ if (frame_pointer_needed) ++ return false; ++ ++ if (df_regs_ever_live_p (2)) ++ return false; ++ ++ if (crtl->profile) ++ return false; ++ ++ return compute_frame_size (get_frame_size (), 0) == 0; ++} ++ + rtx + hppa_pic_save_rtx (void) + { +@@ -4586,7 +4608,7 @@ + rtx saved_rp; + rtx ins; + +- /* Instruction stream at the normal return address for the export stub: ++ /* The instruction stream at the return address of a PA1.X export stub is: + + 0x4bc23fd1 | stub+8: ldw -18(sr0,sp),rp + 0x004010a1 | stub+12: ldsid (sr0,rp),r1 +@@ -4594,10 +4616,16 @@ + 0xe0400002 | stub+20: be,n 0(sr0,rp) + + 0xe0400002 must be specified as -532676606 so that it won't be +- rejected as an invalid immediate operand on 64-bit hosts. */ ++ rejected as an invalid immediate operand on 64-bit hosts. + +- HOST_WIDE_INT insns[4] = {0x4bc23fd1, 0x004010a1, 0x00011820, -532676606}; +- int i; ++ The instruction stream at the return address of a PA2.0 export stub is: ++ ++ 0x4bc23fd1 | stub+8: ldw -18(sr0,sp),rp ++ 0xe840d002 | stub+12: bve,n (rp) ++ */ ++ ++ HOST_WIDE_INT insns[4]; ++ int i, len; + + if (count != 0) + return NULL_RTX; +@@ -4620,11 +4648,26 @@ + ins = copy_to_reg (gen_rtx_AND (Pmode, rp, MASK_RETURN_ADDR)); + label = gen_label_rtx (); + ++ if (TARGET_PA_20) ++ { ++ insns[0] = 0x4bc23fd1; ++ insns[1] = -398405630; ++ len = 2; ++ } ++ else ++ { ++ insns[0] = 0x4bc23fd1; ++ insns[1] = 0x004010a1; ++ insns[2] = 0x00011820; ++ insns[3] = -532676606; ++ len = 4; ++ } ++ + /* Check the instruction stream at the normal return address for the + export stub. If it is an export stub, than our return address is + really in -24[frameaddr]. */ + +- for (i = 0; i < 3; i++) ++ for (i = 0; i < len; i++) + { + rtx op0 = gen_rtx_MEM (SImode, plus_constant (ins, i * 4)); + rtx op1 = GEN_INT (insns[i]); +@@ -7501,7 +7544,7 @@ + return 24; + else + { +- if (!TARGET_LONG_CALLS && distance < 240000) ++ if (!TARGET_LONG_CALLS && distance < MAX_PCREL17F_OFFSET) + return 8; + + if (TARGET_LONG_ABS_CALL && !flag_pic) +@@ -7714,7 +7757,7 @@ + /* pc-relative branch. */ + if (!TARGET_LONG_CALLS + && ((TARGET_PA_20 && !sibcall && distance < 7600000) +- || distance < 240000)) ++ || distance < MAX_PCREL17F_OFFSET)) + length += 8; + + /* 64-bit plabel sequence. */ +@@ -8073,7 +8116,7 @@ + if (TARGET_FAST_INDIRECT_CALLS + || (!TARGET_PORTABLE_RUNTIME + && ((TARGET_PA_20 && !TARGET_SOM && distance < 7600000) +- || distance < 240000))) ++ || distance < MAX_PCREL17F_OFFSET))) + return 8; + + if (flag_pic) +@@ -10392,4 +10435,23 @@ + return default_function_section (decl, freq, startup, exit); + } + ++/* Implement TARGET_SECTION_TYPE_FLAGS. */ ++ ++static unsigned int ++pa_section_type_flags (tree decl, const char *name, int reloc) ++{ ++ unsigned int flags; ++ ++ flags = default_section_type_flags (decl, name, reloc); ++ ++ /* Function labels are placed in the constant pool. This can ++ cause a section conflict if decls are put in ".data.rel.ro" ++ or ".data.rel.ro.local" using the __attribute__ construct. */ ++ if (strcmp (name, ".data.rel.ro") == 0 ++ || strcmp (name, ".data.rel.ro.local") == 0) ++ flags |= SECTION_WRITE | SECTION_RELRO; ++ ++ return flags; ++} ++ + #include "gt-pa.h" +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.h gcc-4.6.3/gcc/config/pa/pa.h +--- gcc-4.6.3.orig/gcc/config/pa/pa.h 2011-10-29 15:19:38.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.h 2012-06-16 20:33:06.931030000 -0500 +@@ -1563,3 +1563,12 @@ + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true + #endif ++ ++/* The maximum offset in bytes for a PA 1.X pc-relative call to the ++ head of the preceding stub table. The selected offsets have been ++ chosen so that approximately one call stub is allocated for every ++ 86.7 instructions. A long branch stub is two instructions when ++ not generating PIC code. For HP-UX and ELF targets, PIC stubs are ++ seven and four instructions, respectively. */ ++#define MAX_PCREL17F_OFFSET \ ++ (flag_pic ? (TARGET_HPUX ? 198164 : 221312) : 240000) +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.md gcc-4.6.3/gcc/config/pa/pa.md +--- gcc-4.6.3.orig/gcc/config/pa/pa.md 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.md 2012-10-10 11:24:22.028351000 -0500 +@@ -2879,15 +2879,17 @@ + [(set_attr "type" "store") + (set_attr "length" "4")]) + +-(define_insn "" +- [(set (match_operand:HI 0 "register_operand" "=r") +- (plus:HI (match_operand:HI 1 "register_operand" "r") +- (match_operand 2 "const_int_operand" "J")))] ++(define_insn "addhi3" ++ [(set (match_operand:HI 0 "register_operand" "=r,r") ++ (plus:HI (match_operand:HI 1 "register_operand" "%r,r") ++ (match_operand:HI 2 "arith_operand" "r,J")))] + "" +- "ldo %2(%1),%0" +- [(set_attr "type" "binary") ++ "@ ++ {addl|add,l} %1,%2,%0 ++ ldo %2(%1),%0" ++ [(set_attr "type" "binary,binary") + (set_attr "pa_combine_type" "addmove") +- (set_attr "length" "4")]) ++ (set_attr "length" "4,4")]) + + (define_expand "movqi" + [(set (match_operand:QI 0 "general_operand" "") +@@ -6348,7 +6350,7 @@ + "" + "* + { +- int x = INTVAL (operands[1]); ++ unsigned HOST_WIDE_INT x = UINTVAL (operands[1]); + operands[2] = GEN_INT (4 + exact_log2 ((x >> 4) + 1)); + operands[1] = GEN_INT ((x & 0xf) - 0x10); + return \"{zvdepi %1,%2,%0|depwi,z %1,%%sar,%2,%0}\"; +@@ -6366,7 +6368,7 @@ + "exact_log2 (INTVAL (operands[1]) + 1) > 0" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 (x + 1)); + return \"{vdepi -1,%2,%0|depwi -1,%%sar,%2,%0}\"; + }" +@@ -6383,7 +6385,7 @@ + "INTVAL (operands[1]) == -2" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 ((~x) + 1)); + return \"{vdepi 0,%2,%0|depwi 0,%%sar,%2,%0}\"; + }" +@@ -6447,7 +6449,7 @@ + "TARGET_64BIT" + "* + { +- int x = INTVAL (operands[1]); ++ unsigned HOST_WIDE_INT x = UINTVAL (operands[1]); + operands[2] = GEN_INT (4 + exact_log2 ((x >> 4) + 1)); + operands[1] = GEN_INT ((x & 0x1f) - 0x20); + return \"depdi,z %1,%%sar,%2,%0\"; +@@ -6465,7 +6467,7 @@ + "TARGET_64BIT && exact_log2 (INTVAL (operands[1]) + 1) > 0" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 (x + 1)); + return \"depdi -1,%%sar,%2,%0\"; + }" +@@ -6482,7 +6484,7 @@ + "TARGET_64BIT && INTVAL (operands[1]) == -2" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 ((~x) + 1)); + return \"depdi 0,%%sar,%2,%0\"; + }" +@@ -6671,6 +6673,20 @@ + + ;; Unconditional and other jump instructions. + ++;; Trivial return used when no epilogue is needed. ++(define_insn "return" ++ [(return) ++ (use (reg:SI 2))] ++ "pa_can_use_return_insn ()" ++ "* ++{ ++ if (TARGET_PA_20) ++ return \"bve%* (%%r2)\"; ++ return \"bv%* %%r0(%%r2)\"; ++}" ++ [(set_attr "type" "branch") ++ (set_attr "length" "4")]) ++ + ;; This is used for most returns. + (define_insn "return_internal" + [(return) +@@ -6719,11 +6735,8 @@ + rtx x; + + /* Try to use the trivial return first. Else use the full epilogue. */ +- if (reload_completed +- && !frame_pointer_needed +- && !df_regs_ever_live_p (2) +- && (compute_frame_size (get_frame_size (), 0) ? 0 : 1)) +- x = gen_return_internal (); ++ if (pa_can_use_return_insn ()) ++ x = gen_return (); + else + { + hppa_expand_epilogue (); +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa-protos.h gcc-4.6.3/gcc/config/pa/pa-protos.h +--- gcc-4.6.3.orig/gcc/config/pa/pa-protos.h 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa-protos.h 2012-03-12 12:08:20.095334000 -0500 +@@ -136,6 +136,7 @@ + extern int cint_ok_for_move (HOST_WIDE_INT); + extern void hppa_expand_prologue (void); + extern void hppa_expand_epilogue (void); ++extern bool pa_can_use_return_insn (void); + extern int ior_mask_p (unsigned HOST_WIDE_INT); + extern void compute_zdepdi_operands (unsigned HOST_WIDE_INT, + unsigned *); +diff -Naur gcc-4.6.3.orig/gcc/config/pa/predicates.md gcc-4.6.3/gcc/config/pa/predicates.md +--- gcc-4.6.3.orig/gcc/config/pa/predicates.md 2011-04-20 18:36:20.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/predicates.md 2012-03-04 10:23:26.705142000 -0600 +@@ -421,9 +421,9 @@ + (ior (match_operand 0 "register_operand") + (match_operand 0 "cint_ior_operand"))) + +-;; True iff OP is a CONST_INT of the forms 0...0xxxx or +-;; 0...01...1xxxx. Such values can be the left hand side x in (x << +-;; r), using the zvdepi instruction. ++;; True iff OP is a CONST_INT of the forms 0...0xxxx, 0...01...1xxxx, ++;; or 1...1xxxx. Such values can be the left hand side x in (x << r), ++;; using the zvdepi instruction. + + (define_predicate "lhs_lshift_cint_operand" + (match_code "const_int") +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/altivec.md gcc-4.6.3/gcc/config/rs6000/altivec.md +--- gcc-4.6.3.orig/gcc/config/rs6000/altivec.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/altivec.md 2012-06-04 12:42:25.267281000 -0500 +@@ -2394,8 +2394,8 @@ + + (define_insn "altivec_stvlx" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVLX)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvlx %1,%y0" +@@ -2403,8 +2403,8 @@ + + (define_insn "altivec_stvlxl" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVLXL)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvlxl %1,%y0" +@@ -2412,8 +2412,8 @@ + + (define_insn "altivec_stvrx" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVRX)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvrx %1,%y0" +@@ -2421,8 +2421,8 @@ + + (define_insn "altivec_stvrxl" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVRXL)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvrxl %1,%y0" +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.c gcc-4.6.3/gcc/config/rs6000/rs6000.c +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.c 2012-02-15 15:17:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.c 2012-05-24 08:52:56.478084000 -0500 +@@ -3695,12 +3695,23 @@ + case vec_to_scalar: + case scalar_to_vec: + case cond_branch_not_taken: +- case vec_perm: + return 1; + + case cond_branch_taken: + return 3; + ++ case vec_perm: ++ if (TARGET_VSX) ++ return 4; ++ else ++ return 1; ++ ++ case vec_promote_demote: ++ if (TARGET_VSX) ++ return 5; ++ else ++ return 1; ++ + case unaligned_load: + if (TARGET_VSX && TARGET_ALLOW_MOVMISALIGN) + { +@@ -15811,7 +15822,6 @@ + print_operand (FILE *file, rtx x, int code) + { + int i; +- HOST_WIDE_INT val; + unsigned HOST_WIDE_INT uval; + + switch (code) +@@ -16252,34 +16262,17 @@ + + case 'W': + /* MB value for a PowerPC64 rldic operand. */ +- val = (GET_CODE (x) == CONST_INT +- ? INTVAL (x) : CONST_DOUBLE_HIGH (x)); +- +- if (val < 0) +- i = -1; +- else +- for (i = 0; i < HOST_BITS_PER_WIDE_INT; i++) +- if ((val <<= 1) < 0) +- break; ++ i = clz_hwi (GET_CODE (x) == CONST_INT ++ ? INTVAL (x) : CONST_DOUBLE_HIGH (x)); + + #if HOST_BITS_PER_WIDE_INT == 32 +- if (GET_CODE (x) == CONST_INT && i >= 0) ++ if (GET_CODE (x) == CONST_INT && i > 0) + i += 32; /* zero-extend high-part was all 0's */ + else if (GET_CODE (x) == CONST_DOUBLE && i == 32) +- { +- val = CONST_DOUBLE_LOW (x); +- +- gcc_assert (val); +- if (val < 0) +- --i; +- else +- for ( ; i < 64; i++) +- if ((val <<= 1) < 0) +- break; +- } ++ i = clz_hwi (CONST_DOUBLE_LOW (x)) + 32; + #endif + +- fprintf (file, "%d", i + 1); ++ fprintf (file, "%d", i); + return; + + case 'x': +@@ -17229,6 +17222,10 @@ + case EQ: + case GT: + case GTU: ++ case ORDERED: ++ case UNORDERED: ++ case UNEQ: ++ case LTGT: + mask = gen_reg_rtx (mode); + emit_insn (gen_rtx_SET (VOIDmode, + mask, +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.h gcc-4.6.3/gcc/config/rs6000/rs6000.h +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.h 2011-07-27 13:17:15.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.h 2012-04-13 16:55:15.746111000 -0500 +@@ -469,10 +469,11 @@ + /* ISA 2.01 allowed FCFID to be done in 32-bit, previously it was 64-bit only. + Enable 32-bit fcfid's on any of the switches for newer ISA machines or + XILINX. */ +-#define TARGET_FCFID (TARGET_POWERPC64 \ +- || TARGET_POPCNTB /* ISA 2.02 */ \ +- || TARGET_CMPB /* ISA 2.05 */ \ +- || TARGET_POPCNTD /* ISA 2.06 */ \ ++#define TARGET_FCFID (TARGET_POWERPC64 \ ++ || TARGET_PPC_GPOPT /* 970/power4 */ \ ++ || TARGET_POPCNTB /* ISA 2.02 */ \ ++ || TARGET_CMPB /* ISA 2.05 */ \ ++ || TARGET_POPCNTD /* ISA 2.06 */ \ + || TARGET_XILINX_FPU) + + #define TARGET_FCTIDZ TARGET_FCFID +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.md gcc-4.6.3/gcc/config/rs6000/rs6000.md +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.md 2012-01-18 13:14:48.000000000 -0600 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.md 2012-05-03 19:31:50.505528000 -0500 +@@ -2524,7 +2524,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2574,7 +2585,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2655,7 +2677,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2700,7 +2733,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/vector.md gcc-4.6.3/gcc/config/rs6000/vector.md +--- gcc-4.6.3.orig/gcc/config/rs6000/vector.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/vector.md 2012-03-06 13:46:28.829628000 -0600 +@@ -448,6 +448,94 @@ + "VECTOR_UNIT_ALTIVEC_P (<MODE>mode)" + "") + ++(define_insn_and_split "*vector_uneq<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (uneq:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (gt:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (gt:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (not:VEC_F (ior:VEC_F (match_dup 3) ++ (match_dup 4))))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_ltgt<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (ltgt:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (gt:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (gt:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (ior:VEC_F (match_dup 3) ++ (match_dup 4)))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_ordered<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (ordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (ge:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (ge:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (ior:VEC_F (match_dup 3) ++ (match_dup 4)))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_unordered<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (unordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (ge:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (ge:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (not:VEC_F (ior:VEC_F (match_dup 3) ++ (match_dup 4))))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ + ;; Note the arguments for __builtin_altivec_vsel are op2, op1, mask + ;; which is in the reverse order that we want + (define_expand "vector_select_<mode>" +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/vsx.md gcc-4.6.3/gcc/config/rs6000/vsx.md +--- gcc-4.6.3.orig/gcc/config/rs6000/vsx.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/vsx.md 2012-03-02 16:12:52.237313000 -0600 +@@ -1006,9 +1006,9 @@ + "VECTOR_MEM_VSX_P (<MODE>mode)" + { + if (INTVAL (operands[3]) == 0) +- return \"xxpermdi %x0,%x1,%x2,1\"; ++ return \"xxpermdi %x0,%x2,%x1,1\"; + else if (INTVAL (operands[3]) == 1) +- return \"xxpermdi %x0,%x2,%x1,0\"; ++ return \"xxpermdi %x0,%x1,%x2,0\"; + else + gcc_unreachable (); + } +diff -Naur gcc-4.6.3.orig/gcc/config/rx/rx.c gcc-4.6.3/gcc/config/rx/rx.c +--- gcc-4.6.3.orig/gcc/config/rx/rx.c 2011-05-17 03:59:10.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rx/rx.c 2012-03-28 21:15:29.973365000 -0500 +@@ -2348,7 +2348,7 @@ + rx_option_override (void) + { + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + rx_override_options_after_change (); +diff -Naur gcc-4.6.3.orig/gcc/config/sh/linux-unwind.h gcc-4.6.3/gcc/config/sh/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/sh/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for SH Linux. +- Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, ++ Inc. + + This file is part of GCC. + +@@ -80,9 +81,9 @@ + && (*(unsigned long *) (pc+11) == 0x6ff0fff0)) + { + struct rt_sigframe { +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +@@ -179,7 +180,7 @@ + && (*(unsigned short *) (pc+14) == 0x00ad)))) + { + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +diff -Naur gcc-4.6.3.orig/gcc/config/sh/sh.c gcc-4.6.3/gcc/config/sh/sh.c +--- gcc-4.6.3.orig/gcc/config/sh/sh.c 2011-06-07 23:07:25.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/sh.c 2012-07-22 18:49:56.312817000 -0500 +@@ -763,11 +763,6 @@ + SUBTARGET_OVERRIDE_OPTIONS; + if (optimize > 1 && !optimize_size) + target_flags |= MASK_SAVE_ALL_TARGET_REGS; +- if (flag_finite_math_only == 2) +- flag_finite_math_only +- = !flag_signaling_nans && TARGET_SH2E && ! TARGET_IEEE; +- if (TARGET_SH2E && !flag_finite_math_only) +- target_flags |= MASK_IEEE; + sh_cpu = PROCESSOR_SH1; + assembler_dialect = 0; + if (TARGET_SH2) +@@ -911,8 +906,6 @@ + if (! VALID_REGISTER_P (ADDREGNAMES_REGNO (regno))) + sh_additional_register_names[regno][0] = '\0'; + +- flag_omit_frame_pointer = (PREFERRED_DEBUGGING_TYPE == DWARF2_DEBUG); +- + if ((flag_pic && ! TARGET_PREFERGOT) + || (TARGET_SHMEDIA && !TARGET_PT_FIXED)) + flag_no_function_cse = 1; +@@ -944,22 +937,17 @@ + flag_schedule_insns = 0; + } + +- if ((target_flags_explicit & MASK_ACCUMULATE_OUTGOING_ARGS) == 0) +- target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; +- + /* Unwind info is not correct around the CFG unless either a frame + pointer is present or M_A_O_A is set. Fixing this requires rewriting + unwind info generation to be aware of the CFG and propagating states + around edges. */ + if ((flag_unwind_tables || flag_asynchronous_unwind_tables + || flag_exceptions || flag_non_call_exceptions) +- && flag_omit_frame_pointer +- && !(target_flags & MASK_ACCUMULATE_OUTGOING_ARGS)) ++ && flag_omit_frame_pointer && !TARGET_ACCUMULATE_OUTGOING_ARGS) + { +- if (target_flags_explicit & MASK_ACCUMULATE_OUTGOING_ARGS) + warning (0, "unwind tables currently require either a frame pointer " + "or -maccumulate-outgoing-args for correctness"); +- target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; ++ TARGET_ACCUMULATE_OUTGOING_ARGS = 1; + } + + /* Unwinding with -freorder-blocks-and-partition does not work on this +@@ -1014,11 +1002,16 @@ + align_functions = min_align; + } + ++ /* If the -mieee option was not explicitly set by the user, turn it on ++ unless -ffinite-math-only was specified. See also PR 33135. */ ++ if (! global_options_set.x_TARGET_IEEE) ++ TARGET_IEEE = ! flag_finite_math_only; ++ + if (sh_fixed_range_str) + sh_fix_range (sh_fixed_range_str); + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + } + +diff -Naur gcc-4.6.3.orig/gcc/config/sh/sh.opt gcc-4.6.3/gcc/config/sh/sh.opt +--- gcc-4.6.3.orig/gcc/config/sh/sh.opt 2010-10-22 07:14:45.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/sh.opt 2012-07-22 18:49:56.312817000 -0500 +@@ -202,7 +202,7 @@ + Generate FPU-less SHcompact code + + maccumulate-outgoing-args +-Target Report Mask(ACCUMULATE_OUTGOING_ARGS) ++Target Report Var(TARGET_ACCUMULATE_OUTGOING_ARGS) Init(1) + Reserve space for outgoing arguments in the function prologue + + madjust-unroll +@@ -270,8 +270,8 @@ + Follow Renesas (formerly Hitachi) / SuperH calling conventions + + mieee +-Target Report Mask(IEEE) +-Increase the IEEE compliance for floating-point code ++Target Var(TARGET_IEEE) ++Increase the IEEE compliance for floating-point comparisons + + mindexed-addressing + Target Report Mask(ALLOW_INDEXED_ADDRESS) Condition(SUPPORT_ANY_SH5_32MEDIA) +diff -Naur gcc-4.6.3.orig/gcc/config/sol2.h gcc-4.6.3/gcc/config/sol2.h +--- gcc-4.6.3.orig/gcc/config/sol2.h 2011-07-15 04:39:41.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sol2.h 2012-08-16 08:21:11.398440000 -0500 +@@ -1,6 +1,6 @@ + /* Operating system specific defines to be used when targeting GCC for any + Solaris 2 system. +- Copyright 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011 ++ Copyright 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This file is part of GCC. +@@ -163,12 +163,12 @@ + %{YP,*} \ + %{R*} \ + %{compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib} \ +- %{!p:%{!pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib:%R/usr/lib}}} \ ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib:%R/lib} \ ++ %{!p:%{!pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib:%R/usr/lib:%R/lib}}} \ + -R %R/usr/ucblib} \ + %{!compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib} \ +- %{!p:%{!pg:-Y P,%R/usr/ccs/lib:%R/usr/lib}}}}" ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib:%R/lib} \ ++ %{!p:%{!pg:-Y P,%R/usr/ccs/lib:%R/usr/lib:%R/lib}}}}" + + #undef LINK_ARCH32_SPEC + #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE +diff -Naur gcc-4.6.3.orig/gcc/config/sparc/sol2-bi.h gcc-4.6.3/gcc/config/sparc/sol2-bi.h +--- gcc-4.6.3.orig/gcc/config/sparc/sol2-bi.h 2011-02-17 07:57:21.000000000 -0600 ++++ gcc-4.6.3/gcc/config/sparc/sol2-bi.h 2012-08-16 08:21:11.398440000 -0500 +@@ -1,6 +1,6 @@ + /* Definitions of target machine for GCC, for bi-arch SPARC + running Solaris 2 using the system assembler and linker. +- Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011 ++ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This file is part of GCC. +@@ -191,12 +191,12 @@ + %{YP,*} \ + %{R*} \ + %{compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9} \ +- %{!p:%{!pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/sparcv9}}} \ ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9} \ ++ %{!p:%{!pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9}}} \ + -R %R/usr/ucblib/sparcv9} \ + %{!compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9} \ +- %{!p:%{!pg:-Y P,%R/usr/lib/sparcv9}}}}" ++ %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9} \ ++ %{!p:%{!pg:-Y P,%R/usr/lib/sparcv9:%R/lib/sparcv9}}}}" + + #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE + +diff -Naur gcc-4.6.3.orig/gcc/config/sparc/sparc.c gcc-4.6.3/gcc/config/sparc/sparc.c +--- gcc-4.6.3.orig/gcc/config/sparc/sparc.c 2011-12-16 17:38:34.000000000 -0600 ++++ gcc-4.6.3/gcc/config/sparc/sparc.c 2012-09-02 05:37:49.951074000 -0500 +@@ -3658,13 +3658,17 @@ + { + x = delegitimize_mem_from_attrs (x); + +- if (GET_CODE (x) == LO_SUM +- && GET_CODE (XEXP (x, 1)) == UNSPEC +- && XINT (XEXP (x, 1), 1) == UNSPEC_TLSLE) +- { +- x = XVECEXP (XEXP (x, 1), 0, 0); +- gcc_assert (GET_CODE (x) == SYMBOL_REF); +- } ++ if (GET_CODE (x) == LO_SUM && GET_CODE (XEXP (x, 1)) == UNSPEC) ++ switch (XINT (XEXP (x, 1), 1)) ++ { ++ case UNSPEC_MOVE_PIC: ++ case UNSPEC_TLSLE: ++ x = XVECEXP (XEXP (x, 1), 0, 0); ++ gcc_assert (GET_CODE (x) == SYMBOL_REF); ++ break; ++ default: ++ break; ++ } + + return x; + } +@@ -9452,7 +9456,10 @@ + /* We need to have the (essentially) final form of the insn stream in order + to properly detect the various hazards. Run delay slot scheduling. */ + if (optimize > 0 && flag_delayed_branch) +- dbr_schedule (get_insns ()); ++ { ++ cleanup_barriers (); ++ dbr_schedule (get_insns ()); ++ } + + /* Now look for specific patterns in the insn stream. */ + for (insn = get_insns (); insn; insn = next) +@@ -9634,6 +9641,7 @@ + void_list_node)); + DECL_RESULT (decl) = build_decl (BUILTINS_LOCATION, RESULT_DECL, + NULL_TREE, void_type_node); ++ TREE_PUBLIC (decl) = 1; + TREE_STATIC (decl) = 1; + make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); + DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; +diff -Naur gcc-4.6.3.orig/gcc/config/spu/spu.c gcc-4.6.3/gcc/config/spu/spu.c +--- gcc-4.6.3.orig/gcc/config/spu/spu.c 2011-07-15 07:33:27.000000000 -0500 ++++ gcc-4.6.3/gcc/config/spu/spu.c 2012-03-02 08:51:58.551861000 -0600 +@@ -6794,6 +6794,7 @@ + case scalar_to_vec: + case cond_branch_not_taken: + case vec_perm: ++ case vec_promote_demote: + return 1; + + case scalar_store: +diff -Naur gcc-4.6.3.orig/gcc/config/xtensa/linux-unwind.h gcc-4.6.3/gcc/config/xtensa/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/xtensa/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/xtensa/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Xtensa. +- Copyright (C) 2008, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -62,7 +62,7 @@ + struct sigcontext *sc; + + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_; + +diff -Naur gcc-4.6.3.orig/gcc/config.gcc gcc-4.6.3/gcc/config.gcc +--- gcc-4.6.3.orig/gcc/config.gcc 2011-07-22 11:44:50.000000000 -0500 ++++ gcc-4.6.3/gcc/config.gcc 2012-06-04 04:53:04.873173000 -0500 +@@ -817,7 +817,7 @@ + arm*-*-linux*) # ARM GNU/Linux with ELF + tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" + case $target in +- arm*b-*) ++ arm*b-*-linux*) + tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" + ;; + esac +@@ -925,7 +925,7 @@ + extra_objs="avr-devices.o" + ;; + avr-*-*) +- tm_file="avr/avr.h dbxelf.h newlib-stdint.h" ++ tm_file="avr/avr.h dbxelf.h avr/avr-stdint.h" + use_gcc_stdint=wrap + extra_gcc_objs="driver-avr.o avr-devices.o" + extra_objs="avr-devices.o" +diff -Naur gcc-4.6.3.orig/gcc/configure gcc-4.6.3/gcc/configure +--- gcc-4.6.3.orig/gcc/configure 2011-11-20 15:24:07.000000000 -0600 ++++ gcc-4.6.3/gcc/configure 2012-10-18 18:38:21.174413000 -0500 +@@ -4842,7 +4842,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5 + $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; } + +-if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then ++if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then + have_gnat=yes + else + have_gnat=no +@@ -25529,7 +25529,9 @@ + $as_echo_n "(cached) " >&6 + else + gcc_cv_ld_no_dot_syms=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_no_dot_syms=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_no_dot_syms=yes + fi +@@ -25573,7 +25575,9 @@ + $as_echo_n "(cached) " >&6 + else + gcc_cv_ld_large_toc=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_large_toc=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_large_toc=yes + fi +diff -Naur gcc-4.6.3.orig/gcc/configure.ac gcc-4.6.3/gcc/configure.ac +--- gcc-4.6.3.orig/gcc/configure.ac 2011-11-18 05:45:44.000000000 -0600 ++++ gcc-4.6.3/gcc/configure.ac 2012-10-18 18:38:21.174413000 -0500 +@@ -4169,7 +4169,9 @@ + AC_CACHE_CHECK(linker support for omitting dot symbols, + gcc_cv_ld_no_dot_syms, + [gcc_cv_ld_no_dot_syms=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_no_dot_syms=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_no_dot_syms=yes + fi +@@ -4206,7 +4208,9 @@ + AC_CACHE_CHECK(linker large toc support, + gcc_cv_ld_large_toc, + [gcc_cv_ld_large_toc=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_large_toc=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_large_toc=yes + fi +diff -Naur gcc-4.6.3.orig/gcc/convert.c gcc-4.6.3/gcc/convert.c +--- gcc-4.6.3.orig/gcc/convert.c 2011-10-12 06:57:36.000000000 -0500 ++++ gcc-4.6.3/gcc/convert.c 2012-05-22 04:17:42.260176000 -0500 +@@ -44,11 +44,6 @@ + if (TREE_TYPE (expr) == type) + return expr; + +- /* Propagate overflow to the NULL pointer. */ +- if (integer_zerop (expr)) +- return force_fit_type_double (type, double_int_zero, 0, +- TREE_OVERFLOW (expr)); +- + switch (TREE_CODE (TREE_TYPE (expr))) + { + case POINTER_TYPE: +diff -Naur gcc-4.6.3.orig/gcc/cp/decl.c gcc-4.6.3/gcc/cp/decl.c +--- gcc-4.6.3.orig/gcc/cp/decl.c 2012-02-14 17:34:34.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/decl.c 2012-04-04 15:48:59.830836000 -0500 +@@ -3636,7 +3636,7 @@ + TYPE_SIZE_UNIT (nullptr_type_node) = size_int (GET_MODE_SIZE (ptr_mode)); + TYPE_UNSIGNED (nullptr_type_node) = 1; + TYPE_PRECISION (nullptr_type_node) = GET_MODE_BITSIZE (ptr_mode); +- SET_TYPE_MODE (nullptr_type_node, Pmode); ++ SET_TYPE_MODE (nullptr_type_node, ptr_mode); + record_builtin_type (RID_MAX, "decltype(nullptr)", nullptr_type_node); + nullptr_node = build_int_cst (nullptr_type_node, 0); + } +diff -Naur gcc-4.6.3.orig/gcc/cp/pt.c gcc-4.6.3/gcc/cp/pt.c +--- gcc-4.6.3.orig/gcc/cp/pt.c 2012-02-14 17:36:19.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/pt.c 2012-09-13 10:13:08.240418000 -0500 +@@ -10028,6 +10028,16 @@ + break; + } + ++ if (TREE_CODE (t) == VAR_DECL && DECL_ANON_UNION_VAR_P (t)) ++ { ++ /* Just use name lookup to find a member alias for an anonymous ++ union, but then add it to the hash table. */ ++ r = lookup_name (DECL_NAME (t)); ++ gcc_assert (DECL_ANON_UNION_VAR_P (r)); ++ register_local_specialization (r, t); ++ break; ++ } ++ + /* Create a new node for the specialization we need. */ + r = copy_decl (t); + if (type == NULL_TREE) +@@ -17785,6 +17795,7 @@ + } + else + { ++ tree tmp; + decl = tsubst_copy (TREE_PURPOSE (t), argvec, + tf_warning_or_error, NULL_TREE); + +@@ -17793,10 +17804,17 @@ + in_base_initializer = 1; + + init = TREE_VALUE (t); ++ tmp = init; + if (init != void_type_node) + init = tsubst_expr (init, argvec, + tf_warning_or_error, NULL_TREE, + /*integral_constant_expression_p=*/false); ++ if (init == NULL_TREE && tmp != NULL_TREE) ++ /* If we had an initializer but it instantiated to nothing, ++ value-initialize the object. This will only occur when ++ the initializer was a pack expansion where the parameter ++ packs used in that expansion were of length zero. */ ++ init = void_type_node; + in_base_initializer = 0; + } + +diff -Naur gcc-4.6.3.orig/gcc/cp/semantics.c gcc-4.6.3/gcc/cp/semantics.c +--- gcc-4.6.3.orig/gcc/cp/semantics.c 2012-02-09 11:17:36.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/semantics.c 2012-04-03 17:50:13.736130000 -0500 +@@ -6763,7 +6763,6 @@ + + STRIP_NOPS (sub); + subtype = TREE_TYPE (sub); +- gcc_assert (POINTER_TYPE_P (subtype)); + + if (TREE_CODE (sub) == ADDR_EXPR) + { +diff -Naur gcc-4.6.3.orig/gcc/cp/typeck.c gcc-4.6.3/gcc/cp/typeck.c +--- gcc-4.6.3.orig/gcc/cp/typeck.c 2012-01-16 15:34:26.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/typeck.c 2012-06-25 15:37:14.416810000 -0500 +@@ -1822,7 +1822,7 @@ + if (error_operand_p (exp)) + return error_mark_node; + +- if (NULLPTR_TYPE_P (type)) ++ if (NULLPTR_TYPE_P (type) && !TREE_SIDE_EFFECTS (exp)) + return nullptr_node; + + /* build_c_cast puts on a NOP_EXPR to make the result not an lvalue. +diff -Naur gcc-4.6.3.orig/gcc/cselib.c gcc-4.6.3/gcc/cselib.c +--- gcc-4.6.3.orig/gcc/cselib.c 2012-02-14 17:33:23.000000000 -0600 ++++ gcc-4.6.3/gcc/cselib.c 2012-09-14 18:00:45.851369000 -0500 +@@ -1237,8 +1237,18 @@ + unsigned int regno = UINT_MAX; + struct elt_loc_list *p_in = p; + +- for (; p; p = p -> next) ++ for (; p; p = p->next) + { ++ /* Return these right away to avoid returning stack pointer based ++ expressions for frame pointer and vice versa, which is something ++ that would confuse DSE. See the comment in cselib_expand_value_rtx_1 ++ for more details. */ ++ if (REG_P (p->loc) ++ && (REGNO (p->loc) == STACK_POINTER_REGNUM ++ || REGNO (p->loc) == FRAME_POINTER_REGNUM ++ || REGNO (p->loc) == HARD_FRAME_POINTER_REGNUM ++ || REGNO (p->loc) == cfa_base_preserved_regno)) ++ return p->loc; + /* Avoid infinite recursion trying to expand a reg into a + the same reg. */ + if ((REG_P (p->loc)) +diff -Naur gcc-4.6.3.orig/gcc/c-typeck.c gcc-4.6.3/gcc/c-typeck.c +--- gcc-4.6.3.orig/gcc/c-typeck.c 2011-11-04 16:49:49.000000000 -0500 ++++ gcc-4.6.3/gcc/c-typeck.c 2012-09-14 19:29:28.455504000 -0500 +@@ -3527,7 +3527,13 @@ + "wrong type argument to unary exclamation mark"); + return error_mark_node; + } +- arg = c_objc_common_truthvalue_conversion (location, arg); ++ if (int_operands) ++ { ++ arg = c_objc_common_truthvalue_conversion (location, xarg); ++ arg = remove_c_maybe_const_expr (arg); ++ } ++ else ++ arg = c_objc_common_truthvalue_conversion (location, arg); + ret = invert_truthvalue_loc (location, arg); + /* If the TRUTH_NOT_EXPR has been folded, reset the location. */ + if (EXPR_P (ret) && EXPR_HAS_LOCATION (ret)) +@@ -4315,6 +4321,11 @@ + ret = fold_build3_loc (colon_loc, COND_EXPR, result_type, ifexp, op1, op2); + else + { ++ if (int_operands) ++ { ++ op1 = remove_c_maybe_const_expr (op1); ++ op2 = remove_c_maybe_const_expr (op2); ++ } + ret = build3 (COND_EXPR, result_type, ifexp, op1, op2); + if (int_operands) + ret = note_integer_operands (ret); +@@ -4750,8 +4761,11 @@ + ret = build_c_cast (loc, type, expr); + if (type_expr) + { ++ bool inner_expr_const = true; ++ ret = c_fully_fold (ret, require_constant_value, &inner_expr_const); + ret = build2 (C_MAYBE_CONST_EXPR, TREE_TYPE (ret), type_expr, ret); +- C_MAYBE_CONST_EXPR_NON_CONST (ret) = !type_expr_const; ++ C_MAYBE_CONST_EXPR_NON_CONST (ret) = !(type_expr_const ++ && inner_expr_const); + SET_EXPR_LOCATION (ret, loc); + } + +@@ -9628,8 +9642,20 @@ + but that does not mean the operands should be + converted to ints! */ + result_type = integer_type_node; +- op0 = c_common_truthvalue_conversion (location, op0); +- op1 = c_common_truthvalue_conversion (location, op1); ++ if (op0_int_operands) ++ { ++ op0 = c_objc_common_truthvalue_conversion (location, orig_op0); ++ op0 = remove_c_maybe_const_expr (op0); ++ } ++ else ++ op0 = c_objc_common_truthvalue_conversion (location, op0); ++ if (op1_int_operands) ++ { ++ op1 = c_objc_common_truthvalue_conversion (location, orig_op1); ++ op1 = remove_c_maybe_const_expr (op1); ++ } ++ else ++ op1 = c_objc_common_truthvalue_conversion (location, op1); + converted = 1; + boolean_op = true; + } +@@ -10287,12 +10313,17 @@ + + int_const = (TREE_CODE (expr) == INTEGER_CST && !TREE_OVERFLOW (expr)); + int_operands = EXPR_INT_CONST_OPERANDS (expr); +- if (int_operands) +- expr = remove_c_maybe_const_expr (expr); +- +- /* ??? Should we also give an error for vectors rather than leaving +- those to give errors later? */ +- expr = c_common_truthvalue_conversion (location, expr); ++ if (int_operands && TREE_CODE (expr) != INTEGER_CST) ++ { ++ expr = remove_c_maybe_const_expr (expr); ++ expr = build2 (NE_EXPR, integer_type_node, expr, ++ convert (TREE_TYPE (expr), integer_zero_node)); ++ expr = note_integer_operands (expr); ++ } ++ else ++ /* ??? Should we also give an error for vectors rather than leaving ++ those to give errors later? */ ++ expr = c_common_truthvalue_conversion (location, expr); + + if (TREE_CODE (expr) == INTEGER_CST && int_operands && !int_const) + { +diff -Naur gcc-4.6.3.orig/gcc/DATESTAMP gcc-4.6.3/gcc/DATESTAMP +--- gcc-4.6.3.orig/gcc/DATESTAMP 2012-02-29 18:17:53.000000000 -0600 ++++ gcc-4.6.3/gcc/DATESTAMP 2012-11-04 18:17:00.669518000 -0600 +@@ -1 +1 @@ +-20120301 ++20121105 +diff -Naur gcc-4.6.3.orig/gcc/df-problems.c gcc-4.6.3/gcc/df-problems.c +--- gcc-4.6.3.orig/gcc/df-problems.c 2011-07-07 14:10:01.000000000 -0500 ++++ gcc-4.6.3/gcc/df-problems.c 2012-07-16 04:36:04.162835000 -0500 +@@ -3956,6 +3956,19 @@ + df_simulate_initialize_backwards (merge_bb, test_use); + for (insn = across_to; ; insn = next) + { ++ if (CALL_P (insn)) ++ { ++ if (RTL_CONST_OR_PURE_CALL_P (insn)) ++ /* Pure functions can read from memory. Const functions can ++ read from arguments that the ABI has forced onto the stack. ++ Neither sort of read can be volatile. */ ++ memrefs_in_across |= MEMREF_NORMAL; ++ else ++ { ++ memrefs_in_across |= MEMREF_VOLATILE; ++ mem_sets_in_across |= MEMREF_VOLATILE; ++ } ++ } + if (NONDEBUG_INSN_P (insn)) + { + df_simulate_find_defs (insn, test_set); +diff -Naur gcc-4.6.3.orig/gcc/doc/install.texi gcc-4.6.3/gcc/doc/install.texi +--- gcc-4.6.3.orig/gcc/doc/install.texi 2011-03-21 07:13:26.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/install.texi 2012-04-06 03:28:56.865123000 -0500 +@@ -1208,7 +1208,7 @@ + + @item --with-llsc + On MIPS targets, make @option{-mllsc} the default when no +-@option{-mno-lsc} option is passed. This is the default for ++@option{-mno-llsc} option is passed. This is the default for + Linux-based targets, as the kernel will emulate them if the ISA does + not provide them. + +diff -Naur gcc-4.6.3.orig/gcc/doc/invoke.texi gcc-4.6.3/gcc/doc/invoke.texi +--- gcc-4.6.3.orig/gcc/doc/invoke.texi 2012-01-03 10:43:38.000000000 -0600 ++++ gcc-4.6.3/gcc/doc/invoke.texi 2012-10-02 16:24:45.917815000 -0500 +@@ -598,7 +598,8 @@ + -mno-wide-multiply -mrtd -malign-double @gol + -mpreferred-stack-boundary=@var{num} + -mincoming-stack-boundary=@var{num} @gol +--mcld -mcx16 -msahf -mmovbe -mcrc32 -mrecip -mvzeroupper @gol ++-mcld -mcx16 -msahf -mmovbe -mcrc32 -mrecip @gol ++-mvzeroupper -mprefer-avx128 @gol + -mmmx -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -msse4 -mavx @gol + -maes -mpclmul -mfsgsbase -mrdrnd -mf16c -mfused-madd @gol + -msse4a -m3dnow -mpopcnt -mabm -mbmi -mtbm -mfma4 -mxop -mlwp @gol +@@ -853,8 +854,8 @@ + -m5-compact -m5-compact-nofpu @gol + -mb -ml -mdalign -mrelax @gol + -mbigtable -mfmovd -mhitachi -mrenesas -mno-renesas -mnomacsave @gol +--mieee -mbitops -misize -minline-ic_invalidate -mpadstruct -mspace @gol +--mprefergot -musermode -multcost=@var{number} -mdiv=@var{strategy} @gol ++-mieee -mno-ieee -mbitops -misize -minline-ic_invalidate -mpadstruct @gol ++-mspace -mprefergot -musermode -multcost=@var{number} -mdiv=@var{strategy} @gol + -mdivsi3_libfunc=@var{name} -mfixed-range=@var{register-range} @gol + -madjust-unroll -mindexed-addressing -mgettrcost=@var{number} -mpt-fixed @gol + -maccumulate-outgoing-args -minvalid-symbols} +@@ -5282,7 +5283,9 @@ + @opindex fdump-rtl-dfinish + These dumps are defined but always produce empty files. + +-@item -fdump-rtl-all ++@item -da ++@itemx -fdump-rtl-all ++@opindex da + @opindex fdump-rtl-all + Produce all the dumps listed above. + +@@ -5299,11 +5302,6 @@ + @opindex dH + Produce a core dump whenever an error occurs. + +-@item -dm +-@opindex dm +-Print statistics on memory usage, at the end of the run, to +-standard error. +- + @item -dp + @opindex dp + Annotate the assembler output with a comment indicating which +@@ -12708,6 +12706,11 @@ + AVX to SSE transition penalty as well as remove unnecessary zeroupper + intrinsics. + ++@item -mprefer-avx128 ++@opindex mprefer-avx128 ++This option instructs GCC to use 128-bit AVX instructions instead of ++256-bit AVX instructions in the auto-vectorizer. ++ + @item -mcx16 + @opindex mcx16 + This option will enable GCC to use CMPXCHG16B instruction in generated code. +@@ -16938,13 +16941,15 @@ + @option{-mhitachi} is given. + + @item -mieee ++@item -mno-ieee + @opindex mieee +-Increase IEEE-compliance of floating-point code. +-At the moment, this is equivalent to @option{-fno-finite-math-only}. +-When generating 16 bit SH opcodes, getting IEEE-conforming results for +-comparisons of NANs / infinities incurs extra overhead in every +-floating point comparison, therefore the default is set to +-@option{-ffinite-math-only}. ++@opindex mnoieee ++Control the IEEE compliance of floating-point comparisons, which affects the ++handling of cases where the result of a comparison is unordered. By default ++@option{-mieee} is implicitly enabled. If @option{-ffinite-math-only} is ++enabled @option{-mno-ieee} is implicitly set, which results in faster ++floating-point greater-equal and less-equal comparisons. The implcit settings ++can be overridden by specifying either @option{-mieee} or @option{-mno-ieee}. + + @item -minline-ic_invalidate + @opindex minline-ic_invalidate +diff -Naur gcc-4.6.3.orig/gcc/doc/tm.texi gcc-4.6.3/gcc/doc/tm.texi +--- gcc-4.6.3.orig/gcc/doc/tm.texi 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/tm.texi 2012-08-10 08:26:44.694722000 -0500 +@@ -1118,6 +1118,14 @@ + If the value of this macro has a type, it should be an unsigned type. + @end defmac + ++@deftypefn {Target Hook} HOST_WIDE_INT TARGET_VECTOR_ALIGNMENT (const_tree @var{type}) ++This hook can be used to define the alignment for a vector of type ++@var{type}, in order to comply with a platform ABI. The default is to ++require natural alignment for vector types. The alignment returned by ++this hook must be a power-of-two multiple of the default alignment of ++the vector element type. ++@end deftypefn ++ + @defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align}) + If defined, a C expression to compute the alignment for stack slot. + @var{type} is the data type, @var{mode} is the widest mode available, +diff -Naur gcc-4.6.3.orig/gcc/doc/tm.texi.in gcc-4.6.3/gcc/doc/tm.texi.in +--- gcc-4.6.3.orig/gcc/doc/tm.texi.in 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/tm.texi.in 2012-08-10 08:26:44.694722000 -0500 +@@ -1108,6 +1108,8 @@ + If the value of this macro has a type, it should be an unsigned type. + @end defmac + ++@hook TARGET_VECTOR_ALIGNMENT ++ + @defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align}) + If defined, a C expression to compute the alignment for stack slot. + @var{type} is the data type, @var{mode} is the widest mode available, +diff -Naur gcc-4.6.3.orig/gcc/expr.c gcc-4.6.3/gcc/expr.c +--- gcc-4.6.3.orig/gcc/expr.c 2012-02-09 11:28:22.000000000 -0600 ++++ gcc-4.6.3/gcc/expr.c 2012-06-28 07:01:16.874415000 -0500 +@@ -5971,6 +5971,8 @@ + || bitpos % GET_MODE_ALIGNMENT (mode)) + && SLOW_UNALIGNED_ACCESS (mode, MEM_ALIGN (target))) + || (bitpos % BITS_PER_UNIT != 0))) ++ || (bitsize >= 0 && mode != BLKmode ++ && GET_MODE_BITSIZE (mode) > bitsize) + /* If the RHS and field are a constant size and the size of the + RHS isn't the same size as the bitfield, we must use bitfield + operations. */ +@@ -9182,6 +9184,7 @@ + orig_op0 = op0 + = expand_expr (tem, + (TREE_CODE (TREE_TYPE (tem)) == UNION_TYPE ++ && COMPLETE_TYPE_P (TREE_TYPE (tem)) + && (TREE_CODE (TYPE_SIZE (TREE_TYPE (tem))) + != INTEGER_CST) + && modifier != EXPAND_STACK_PARM +diff -Naur gcc-4.6.3.orig/gcc/fold-const.c gcc-4.6.3/gcc/fold-const.c +--- gcc-4.6.3.orig/gcc/fold-const.c 2012-02-27 05:19:03.000000000 -0600 ++++ gcc-4.6.3/gcc/fold-const.c 2012-10-19 12:03:07.571221000 -0500 +@@ -6771,12 +6771,14 @@ + && TREE_TYPE (TREE_OPERAND (arg1, 0)) == inner_type)) + return NULL_TREE; + +- if ((TYPE_UNSIGNED (inner_type) != TYPE_UNSIGNED (outer_type) +- || POINTER_TYPE_P (inner_type) != POINTER_TYPE_P (outer_type)) ++ if (TYPE_UNSIGNED (inner_type) != TYPE_UNSIGNED (outer_type) + && code != NE_EXPR + && code != EQ_EXPR) + return NULL_TREE; + ++ if (POINTER_TYPE_P (inner_type) != POINTER_TYPE_P (outer_type)) ++ return NULL_TREE; ++ + if (TREE_CODE (arg1) == INTEGER_CST) + arg1 = force_fit_type_double (inner_type, tree_to_double_int (arg1), + 0, TREE_OVERFLOW (arg1)); +diff -Naur gcc-4.6.3.orig/gcc/fortran/array.c gcc-4.6.3/gcc/fortran/array.c +--- gcc-4.6.3.orig/gcc/fortran/array.c 2011-08-22 15:03:00.000000000 -0500 ++++ gcc-4.6.3/gcc/fortran/array.c 2012-09-13 13:19:22.374742000 -0500 +@@ -91,9 +91,7 @@ + else if (!star) + m = gfc_match_expr (&ar->start[i]); + +- if (m == MATCH_NO && gfc_match_char ('*') == MATCH_YES) +- return MATCH_NO; +- else if (m == MATCH_NO) ++ if (m == MATCH_NO) + gfc_error ("Expected array subscript at %C"); + if (m != MATCH_YES) + return MATCH_ERROR; +@@ -224,7 +222,7 @@ + + for (ar->codimen = 0; ar->codimen + ar->dimen < GFC_MAX_DIMENSIONS; ar->codimen++) + { +- m = match_subscript (ar, init, ar->codimen == (corank - 1)); ++ m = match_subscript (ar, init, true); + if (m == MATCH_ERROR) + return MATCH_ERROR; + +@@ -249,6 +247,13 @@ + gfc_error ("Invalid form of coarray reference at %C"); + return MATCH_ERROR; + } ++ else if (ar->dimen_type[ar->codimen + ar->dimen] == DIMEN_STAR) ++ { ++ gfc_error ("Unexpected '*' for codimension %d of %d at %C", ++ ar->codimen + 1, corank); ++ return MATCH_ERROR; ++ } ++ + if (ar->codimen >= corank) + { + gfc_error ("Invalid codimension %d at %C, only %d codimensions exist", +diff -Naur gcc-4.6.3.orig/gcc/fortran/decl.c gcc-4.6.3/gcc/fortran/decl.c +--- gcc-4.6.3.orig/gcc/fortran/decl.c 2011-06-02 14:53:02.000000000 -0500 ++++ gcc-4.6.3/gcc/fortran/decl.c 2012-06-14 08:11:27.149798000 -0500 +@@ -3623,8 +3623,9 @@ + } + } + +- /* Module variables implicitly have the SAVE attribute. */ +- if (gfc_current_state () == COMP_MODULE && !current_attr.save) ++ /* Since Fortran 2008 module variables implicitly have the SAVE attribute. */ ++ if (gfc_current_state () == COMP_MODULE && !current_attr.save ++ && (gfc_option.allow_std & GFC_STD_F2008) != 0) + current_attr.save = SAVE_IMPLICIT; + + colon_seen = 1; +diff -Naur gcc-4.6.3.orig/gcc/fortran/expr.c gcc-4.6.3/gcc/fortran/expr.c +--- gcc-4.6.3.orig/gcc/fortran/expr.c 2012-01-19 16:21:43.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/expr.c 2012-05-02 07:53:20.873985000 -0500 +@@ -4474,7 +4474,11 @@ + if (ptr_component && ref->type == REF_COMPONENT) + check_intentin = false; + if (ref->type == REF_COMPONENT && ref->u.c.component->attr.pointer) +- ptr_component = true; ++ { ++ ptr_component = true; ++ if (!pointer) ++ check_intentin = false; ++ } + } + if (check_intentin && sym->attr.intent == INTENT_IN) + { +diff -Naur gcc-4.6.3.orig/gcc/fortran/resolve.c gcc-4.6.3/gcc/fortran/resolve.c +--- gcc-4.6.3.orig/gcc/fortran/resolve.c 2012-01-25 02:11:56.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/resolve.c 2012-09-13 13:15:52.599419000 -0500 +@@ -1452,7 +1452,7 @@ + + if (sym->intmod_sym_id) + isym = gfc_intrinsic_function_by_id ((gfc_isym_id) sym->intmod_sym_id); +- else ++ else if (!sym->attr.subroutine) + isym = gfc_find_function (sym->name); + + if (isym) +@@ -9700,7 +9700,8 @@ + || sym->attr.data + || sym->module + || sym->attr.cray_pointee +- || sym->attr.cray_pointer) ++ || sym->attr.cray_pointer ++ || sym->assoc) + return NULL; + + /* Now we'll try to build an initializer expression. */ +@@ -12908,10 +12909,9 @@ + } + + proc = sym->ns->proc_name; +- if (sym->attr.dummy && gfc_pure (proc) +- && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN) +- || +- proc->attr.function)) ++ if (sym->attr.dummy ++ && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN) ++ || proc->attr.function)) + return 1; + + /* TODO: Sort out what can be storage associated, if anything, and include +diff -Naur gcc-4.6.3.orig/gcc/fortran/simplify.c gcc-4.6.3/gcc/fortran/simplify.c +--- gcc-4.6.3.orig/gcc/fortran/simplify.c 2012-02-03 14:37:36.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/simplify.c 2012-09-12 16:54:50.523207000 -0500 +@@ -3296,6 +3296,9 @@ + gcc_assert (array->expr_type == EXPR_VARIABLE); + gcc_assert (as); + ++ if (gfc_resolve_array_spec (as, 0) == FAILURE) ++ return NULL; ++ + /* The last dimension of an assumed-size array is special. */ + if ((!coarray && d == as->rank && as->type == AS_ASSUMED_SIZE && !upper) + || (coarray && d == as->rank + as->corank)) +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans-array.c gcc-4.6.3/gcc/fortran/trans-array.c +--- gcc-4.6.3.orig/gcc/fortran/trans-array.c 2011-12-08 14:54:57.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans-array.c 2012-07-14 10:24:12.262320000 -0500 +@@ -2056,6 +2056,11 @@ + gfc_se se; + int n; + ++ /* Don't evaluate the arguments for realloc_lhs_loop_for_fcn_call; otherwise, ++ arguments could get evaluated multiple times. */ ++ if (ss->is_alloc_lhs) ++ return; ++ + /* TODO: This can generate bad code if there are ordering dependencies, + e.g., a callee allocated function and an unknown size constructor. */ + gcc_assert (ss != NULL); +@@ -7548,7 +7553,7 @@ + scalar = 1; + for (; arg; arg = arg->next) + { +- if (!arg->expr) ++ if (!arg->expr || arg->expr->expr_type == EXPR_NULL) + continue; + + newss = gfc_walk_subexpr (head, arg->expr); +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans.c gcc-4.6.3/gcc/fortran/trans.c +--- gcc-4.6.3.orig/gcc/fortran/trans.c 2011-02-23 16:38:27.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans.c 2012-06-01 15:06:39.161162000 -0500 +@@ -1005,15 +1005,12 @@ + if (!res && size != 0) + _gfortran_os_error ("Allocation would exceed memory limit"); + +- if (size == 0) +- return NULL; +- + return res; + } */ + tree + gfc_call_realloc (stmtblock_t * block, tree mem, tree size) + { +- tree msg, res, nonzero, zero, null_result, tmp; ++ tree msg, res, nonzero, null_result, tmp; + tree type = TREE_TYPE (mem); + + size = gfc_evaluate_now (size, block); +@@ -1044,15 +1041,6 @@ + build_empty_stmt (input_location)); + gfc_add_expr_to_block (block, tmp); + +- /* if (size == 0) then the result is NULL. */ +- tmp = fold_build2_loc (input_location, MODIFY_EXPR, type, res, +- build_int_cst (type, 0)); +- zero = fold_build1_loc (input_location, TRUTH_NOT_EXPR, boolean_type_node, +- nonzero); +- tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node, zero, tmp, +- build_empty_stmt (input_location)); +- gfc_add_expr_to_block (block, tmp); +- + return res; + } + +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans-types.c gcc-4.6.3/gcc/fortran/trans-types.c +--- gcc-4.6.3.orig/gcc/fortran/trans-types.c 2011-11-25 11:18:05.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans-types.c 2012-03-10 03:20:22.792570000 -0600 +@@ -2519,7 +2519,11 @@ + || sym->attr.flavor == FL_PROGRAM); + + if (sym->backend_decl) +- return TREE_TYPE (sym->backend_decl); ++ { ++ if (sym->attr.proc_pointer) ++ return TREE_TYPE (TREE_TYPE (sym->backend_decl)); ++ return TREE_TYPE (sym->backend_decl); ++ } + + alternate_return = 0; + typelist = NULL_TREE; +diff -Naur gcc-4.6.3.orig/gcc/gcov-iov.c gcc-4.6.3/gcc/gcov-iov.c +--- gcc-4.6.3.orig/gcc/gcov-iov.c 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/gcov-iov.c 2012-06-22 07:32:34.527642000 -0500 +@@ -19,8 +19,8 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +-#include <stdio.h> +-#include <stdlib.h> ++#include "bconfig.h" ++#include "system.h" + + /* Command line arguments are the base GCC version and the development + phase (the latter may be an empty string). */ +@@ -48,8 +48,14 @@ + if (*ptr == '.') + minor = strtoul (ptr + 1, 0, 10); + ++ /* For releases the development phase is an empty string, for ++ prerelease versions on a release branch it is "prerelease". ++ Consider both equal as patch-level releases do not change ++ the GCOV version either. ++ On the trunk the development phase is "experimental". */ + phase = argv[2][0]; +- if (phase == '\0') ++ if (phase == '\0' ++ || strcmp (argv[2], "prerelease") == 0) + phase = '*'; + + v[0] = (major < 10 ? '0' : 'A' - 10) + major; +diff -Naur gcc-4.6.3.orig/gcc/gimple.c gcc-4.6.3/gcc/gimple.c +--- gcc-4.6.3.orig/gcc/gimple.c 2011-08-03 13:56:02.000000000 -0500 ++++ gcc-4.6.3/gcc/gimple.c 2012-05-22 04:23:01.937094000 -0500 +@@ -2275,8 +2275,6 @@ + bool + gimple_has_side_effects (const_gimple s) + { +- unsigned i; +- + if (is_gimple_debug (s)) + return false; + +@@ -2292,45 +2290,15 @@ + + if (is_gimple_call (s)) + { +- unsigned nargs = gimple_call_num_args (s); ++ int flags = gimple_call_flags (s); + +- if (!(gimple_call_flags (s) & (ECF_CONST | ECF_PURE))) +- return true; +- else if (gimple_call_flags (s) & ECF_LOOPING_CONST_OR_PURE) +- /* An infinite loop is considered a side effect. */ ++ /* An infinite loop is considered a side effect. */ ++ if (!(flags & (ECF_CONST | ECF_PURE)) ++ || (flags & ECF_LOOPING_CONST_OR_PURE)) + return true; + +- if (gimple_call_lhs (s) +- && TREE_SIDE_EFFECTS (gimple_call_lhs (s))) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- +- if (TREE_SIDE_EFFECTS (gimple_call_fn (s))) +- return true; +- +- for (i = 0; i < nargs; i++) +- if (TREE_SIDE_EFFECTS (gimple_call_arg (s, i))) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- + return false; + } +- else +- { +- for (i = 0; i < gimple_num_ops (s); i++) +- { +- tree op = gimple_op (s, i); +- if (op && TREE_SIDE_EFFECTS (op)) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- } +- } + + return false; + } +diff -Naur gcc-4.6.3.orig/gcc/gthr-posix.h gcc-4.6.3/gcc/gthr-posix.h +--- gcc-4.6.3.orig/gcc/gthr-posix.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/gthr-posix.h 2012-06-05 16:42:30.036539000 -0500 +@@ -239,16 +239,15 @@ + static inline int + __gthread_active_p (void) + { +- static void *const __gthread_active_ptr +- = __extension__ (void *) &__gthrw_( + /* Android's C library does not provide pthread_cancel, check for + `pthread_create' instead. */ + #ifndef __BIONIC__ +- pthread_cancel ++ static void *const __gthread_active_ptr ++ = __extension__ (void *) &__gthrw_(pthread_cancel); + #else +- pthread_create ++ static void *const __gthread_active_ptr ++ = __extension__ (void *) &__gthrw_(pthread_create); + #endif +- ); + return __gthread_active_ptr != 0; + } + +diff -Naur gcc-4.6.3.orig/gcc/ipa-prop.c gcc-4.6.3/gcc/ipa-prop.c +--- gcc-4.6.3.orig/gcc/ipa-prop.c 2011-12-13 16:03:05.000000000 -0600 ++++ gcc-4.6.3/gcc/ipa-prop.c 2012-07-02 10:53:21.612759000 -0500 +@@ -704,12 +704,11 @@ + || is_global_var (base)) + return; + +- if (detect_type_change (op, base, call, jfunc, offset)) +- return; +- + binfo = TYPE_BINFO (TREE_TYPE (base)); +- if (!binfo) ++ if (!binfo ++ || detect_type_change (op, base, call, jfunc, offset)) + return; ++ + binfo = get_binfo_at_offset (binfo, offset, TREE_TYPE (op)); + if (binfo) + { +diff -Naur gcc-4.6.3.orig/gcc/ira-int.h gcc-4.6.3/gcc/ira-int.h +--- gcc-4.6.3.orig/gcc/ira-int.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/ira-int.h 2012-09-21 05:09:04.504622000 -0500 +@@ -1123,8 +1123,13 @@ + ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a, + ira_object_t *o) + { +- *o = ALLOCNO_OBJECT (a, i->n); +- return i->n++ < ALLOCNO_NUM_OBJECTS (a); ++ int n = i->n++; ++ if (n < ALLOCNO_NUM_OBJECTS (a)) ++ { ++ *o = ALLOCNO_OBJECT (a, n); ++ return true; ++ } ++ return false; + } + + /* Loop over all objects associated with allocno A. In each +diff -Naur gcc-4.6.3.orig/gcc/lto/lto.c gcc-4.6.3/gcc/lto/lto.c +--- gcc-4.6.3.orig/gcc/lto/lto.c 2011-12-13 16:03:05.000000000 -0600 ++++ gcc-4.6.3/gcc/lto/lto.c 2012-04-23 07:44:46.674224000 -0500 +@@ -893,7 +893,8 @@ + + for (node = cgraph_nodes; node; node = node->next) + { +- if (!partition_cgraph_node_p (node)) ++ if (!partition_cgraph_node_p (node) ++ || node->aux) + continue; + + file_data = node->local.lto_file_data; +@@ -923,13 +924,13 @@ + npartitions++; + } + +- if (!node->aux) +- add_cgraph_node_to_partition (partition, node); ++ add_cgraph_node_to_partition (partition, node); + } + + for (vnode = varpool_nodes; vnode; vnode = vnode->next) + { +- if (!partition_varpool_node_p (vnode)) ++ if (!partition_varpool_node_p (vnode) ++ || vnode->aux) + continue; + file_data = vnode->lto_file_data; + slot = pointer_map_contains (pmap, file_data); +@@ -943,8 +944,7 @@ + npartitions++; + } + +- if (!vnode->aux) +- add_varpool_node_to_partition (partition, vnode); ++ add_varpool_node_to_partition (partition, vnode); + } + for (node = cgraph_nodes; node; node = node->next) + node->aux = NULL; +@@ -1050,8 +1050,9 @@ + + for (i = 0; i < n_nodes; i++) + { +- if (!order[i]->aux) +- add_cgraph_node_to_partition (partition, order[i]); ++ if (order[i]->aux) ++ continue; ++ add_cgraph_node_to_partition (partition, order[i]); + total_size -= order[i]->global.size; + + /* Once we added a new node to the partition, we also want to add +@@ -1231,6 +1232,8 @@ + } + i = best_i; + /* When we are finished, avoid creating empty partition. */ ++ while (i < n_nodes - 1 && order[i + 1]->aux) ++ i++; + if (i == n_nodes - 1) + break; + partition = new_partition (""); +diff -Naur gcc-4.6.3.orig/gcc/predict.c gcc-4.6.3/gcc/predict.c +--- gcc-4.6.3.orig/gcc/predict.c 2011-01-22 15:47:40.000000000 -0600 ++++ gcc-4.6.3/gcc/predict.c 2012-03-25 05:59:19.696090000 -0500 +@@ -1790,7 +1790,8 @@ + static void + predict_paths_for_bb (basic_block cur, basic_block bb, + enum br_predictor pred, +- enum prediction taken) ++ enum prediction taken, ++ bitmap visited) + { + edge e; + edge_iterator ei; +@@ -1811,7 +1812,7 @@ + continue; + gcc_assert (bb == cur || dominated_by_p (CDI_POST_DOMINATORS, cur, bb)); + +- /* See if there is how many edge from e->src that is not abnormal ++ /* See if there is an edge from e->src that is not abnormal + and does not lead to BB. */ + FOR_EACH_EDGE (e2, ei2, e->src->succs) + if (e2 != e +@@ -1824,16 +1825,20 @@ + + /* If there is non-abnormal path leaving e->src, predict edge + using predictor. Otherwise we need to look for paths +- leading to e->src. */ ++ leading to e->src. ++ ++ The second may lead to infinite loop in the case we are predicitng ++ regions that are only reachable by abnormal edges. We simply ++ prevent visiting given BB twice. */ + if (found) + predict_edge_def (e, pred, taken); +- else +- predict_paths_for_bb (e->src, e->src, pred, taken); ++ else if (bitmap_set_bit (visited, e->src->index)) ++ predict_paths_for_bb (e->src, e->src, pred, taken, visited); + } + for (son = first_dom_son (CDI_POST_DOMINATORS, cur); + son; + son = next_dom_son (CDI_POST_DOMINATORS, son)) +- predict_paths_for_bb (son, bb, pred, taken); ++ predict_paths_for_bb (son, bb, pred, taken, visited); + } + + /* Sets branch probabilities according to PREDiction and +@@ -1843,7 +1848,9 @@ + predict_paths_leading_to (basic_block bb, enum br_predictor pred, + enum prediction taken) + { +- predict_paths_for_bb (bb, bb, pred, taken); ++ bitmap visited = BITMAP_ALLOC (NULL); ++ predict_paths_for_bb (bb, bb, pred, taken, visited); ++ BITMAP_FREE (visited); + } + + /* Like predict_paths_leading_to but take edge instead of basic block. */ +@@ -1866,7 +1873,11 @@ + break; + } + if (!has_nonloop_edge) +- predict_paths_for_bb (bb, bb, pred, taken); ++ { ++ bitmap visited = BITMAP_ALLOC (NULL); ++ predict_paths_for_bb (bb, bb, pred, taken, visited); ++ BITMAP_FREE (visited); ++ } + else + predict_edge_def (e, pred, taken); + } +diff -Naur gcc-4.6.3.orig/gcc/sel-sched.c gcc-4.6.3/gcc/sel-sched.c +--- gcc-4.6.3.orig/gcc/sel-sched.c 2011-06-28 07:19:18.000000000 -0500 ++++ gcc-4.6.3/gcc/sel-sched.c 2012-10-22 14:34:35.215631000 -0500 +@@ -3578,29 +3578,41 @@ + return NULL; + } + +-/* Lookup EXPR in VINSN_VEC and return TRUE if found. */ ++/* Lookup EXPR in VINSN_VEC and return TRUE if found. Also check patterns from ++ EXPR's history of changes. */ + static bool + vinsn_vec_has_expr_p (vinsn_vec_t vinsn_vec, expr_t expr) + { +- vinsn_t vinsn; ++ vinsn_t vinsn, expr_vinsn; + int n; ++ unsigned i; + +- FOR_EACH_VEC_ELT (vinsn_t, vinsn_vec, n, vinsn) +- if (VINSN_SEPARABLE_P (vinsn)) +- { +- if (vinsn_equal_p (vinsn, EXPR_VINSN (expr))) +- return true; +- } +- else +- { +- /* For non-separable instructions, the blocking insn can have +- another pattern due to substitution, and we can't choose +- different register as in the above case. Check all registers +- being written instead. */ +- if (bitmap_intersect_p (VINSN_REG_SETS (vinsn), +- VINSN_REG_SETS (EXPR_VINSN (expr)))) +- return true; +- } ++ /* Start with checking expr itself and then proceed with all the old forms ++ of expr taken from its history vector. */ ++ for (i = 0, expr_vinsn = EXPR_VINSN (expr); ++ expr_vinsn; ++ expr_vinsn = (i < VEC_length (expr_history_def, ++ EXPR_HISTORY_OF_CHANGES (expr)) ++ ? VEC_index (expr_history_def, ++ EXPR_HISTORY_OF_CHANGES (expr), ++ i++)->old_expr_vinsn ++ : NULL)) ++ FOR_EACH_VEC_ELT (vinsn_t, vinsn_vec, n, vinsn) ++ if (VINSN_SEPARABLE_P (vinsn)) ++ { ++ if (vinsn_equal_p (vinsn, expr_vinsn)) ++ return true; ++ } ++ else ++ { ++ /* For non-separable instructions, the blocking insn can have ++ another pattern due to substitution, and we can't choose ++ different register as in the above case. Check all registers ++ being written instead. */ ++ if (bitmap_intersect_p (VINSN_REG_SETS (vinsn), ++ VINSN_REG_SETS (expr_vinsn))) ++ return true; ++ } + + return false; + } +@@ -5700,8 +5712,8 @@ + || EXPR_TARGET_AVAILABLE (new_expr) + != EXPR_TARGET_AVAILABLE (cur_expr)) + /* Unfortunately, the below code could be also fired up on +- separable insns. +- FIXME: add an example of how this could happen. */ ++ separable insns, e.g. when moving insns through the new ++ speculation check as in PR 53701. */ + vinsn_vec_add (&vec_bookkeeping_blocked_vinsns, cur_expr); + } + +diff -Naur gcc-4.6.3.orig/gcc/sel-sched-ir.h gcc-4.6.3/gcc/sel-sched-ir.h +--- gcc-4.6.3.orig/gcc/sel-sched-ir.h 2011-04-07 07:07:24.000000000 -0500 ++++ gcc-4.6.3/gcc/sel-sched-ir.h 2012-10-30 03:25:16.725474000 -0500 +@@ -1119,7 +1119,8 @@ + /* If bb is empty, and we're skipping to loop exits, then + consider bb as a possible gate to the inner loop now. */ + while (sel_bb_empty_or_nop_p (bb) +- && in_current_region_p (bb)) ++ && in_current_region_p (bb) ++ && EDGE_COUNT (bb->succs) > 0) + { + bb = single_succ (bb); + +diff -Naur gcc-4.6.3.orig/gcc/stor-layout.c gcc-4.6.3/gcc/stor-layout.c +--- gcc-4.6.3.orig/gcc/stor-layout.c 2012-02-20 16:09:48.000000000 -0600 ++++ gcc-4.6.3/gcc/stor-layout.c 2012-08-10 08:26:44.694722000 -0500 +@@ -660,12 +660,13 @@ + /* See if we can use an ordinary integer mode for a bit-field. + Conditions are: a fixed size that is correct for another mode, + occupying a complete byte or bytes on proper boundary, +- and not volatile or not -fstrict-volatile-bitfields. */ ++ and not -fstrict-volatile-bitfields. If the latter is set, ++ we unfortunately can't check TREE_THIS_VOLATILE, as a cast ++ may make a volatile object later. */ + if (TYPE_SIZE (type) != 0 + && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST + && GET_MODE_CLASS (TYPE_MODE (type)) == MODE_INT +- && !(TREE_THIS_VOLATILE (decl) +- && flag_strict_volatile_bitfields > 0)) ++ && flag_strict_volatile_bitfields <= 0) + { + enum machine_mode xmode + = mode_for_size_tree (DECL_SIZE (decl), MODE_INT, 1); +@@ -1926,9 +1927,17 @@ + TYPE_SIZE (type) = int_const_binop (MULT_EXPR, TYPE_SIZE (innertype), + bitsize_int (nunits), 0); + +- /* Always naturally align vectors. This prevents ABI changes +- depending on whether or not native vector modes are supported. */ +- TYPE_ALIGN (type) = tree_low_cst (TYPE_SIZE (type), 0); ++ /* For vector types, we do not default to the mode's alignment. ++ Instead, query a target hook, defaulting to natural alignment. ++ This prevents ABI changes depending on whether or not native ++ vector modes are supported. */ ++ TYPE_ALIGN (type) = targetm.vector_alignment (type); ++ ++ /* However, if the underlying mode requires a bigger alignment than ++ what the target hook provides, we cannot use the mode. For now, ++ simply reject that case. */ ++ gcc_assert (TYPE_ALIGN (type) ++ >= GET_MODE_ALIGNMENT (TYPE_MODE (type))); + break; + } + +diff -Naur gcc-4.6.3.orig/gcc/target.def gcc-4.6.3/gcc/target.def +--- gcc-4.6.3.orig/gcc/target.def 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/target.def 2012-08-10 08:26:44.694722000 -0500 +@@ -1611,6 +1611,16 @@ + bool, (enum machine_mode mode), + hook_bool_mode_false) + ++DEFHOOK ++(vector_alignment, ++ "This hook can be used to define the alignment for a vector of type\n\ ++@var{type}, in order to comply with a platform ABI. The default is to\n\ ++require natural alignment for vector types. The alignment returned by\n\ ++this hook must be a power-of-two multiple of the default alignment of\n\ ++the vector element type.", ++ HOST_WIDE_INT, (const_tree type), ++ default_vector_alignment) ++ + /* Compute cost of moving data from a register of class FROM to one of + TO, using MODE. */ + DEFHOOK +diff -Naur gcc-4.6.3.orig/gcc/target.h gcc-4.6.3/gcc/target.h +--- gcc-4.6.3.orig/gcc/target.h 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/target.h 2012-03-02 08:51:58.551861000 -0600 +@@ -128,7 +128,8 @@ + scalar_to_vec, + cond_branch_not_taken, + cond_branch_taken, +- vec_perm ++ vec_perm, ++ vec_promote_demote + }; + + /* Sets of optimization levels at which an option may be enabled by +diff -Naur gcc-4.6.3.orig/gcc/targhooks.c gcc-4.6.3/gcc/targhooks.c +--- gcc-4.6.3.orig/gcc/targhooks.c 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/targhooks.c 2012-08-10 08:26:44.694722000 -0500 +@@ -529,6 +529,7 @@ + case scalar_to_vec: + case cond_branch_not_taken: + case vec_perm: ++ case vec_promote_demote: + return 1; + + case unaligned_load: +@@ -978,6 +979,13 @@ + return id; + } + ++/* Default to natural alignment for vector types. */ ++HOST_WIDE_INT ++default_vector_alignment (const_tree type) ++{ ++ return tree_low_cst (TYPE_SIZE (type), 0); ++} ++ + bool + default_builtin_vector_alignment_reachable (const_tree type, bool is_packed) + { +diff -Naur gcc-4.6.3.orig/gcc/targhooks.h gcc-4.6.3/gcc/targhooks.h +--- gcc-4.6.3.orig/gcc/targhooks.h 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/targhooks.h 2012-08-10 08:26:44.694722000 -0500 +@@ -85,6 +85,8 @@ + + extern tree default_builtin_reciprocal (unsigned int, bool, bool); + ++extern HOST_WIDE_INT default_vector_alignment (const_tree); ++ + extern bool default_builtin_vector_alignment_reachable (const_tree, bool); + extern bool + default_builtin_support_vector_misalignment (enum machine_mode mode, +diff -Naur gcc-4.6.3.orig/gcc/testsuite/c-c++-common/abi-bf.c gcc-4.6.3/gcc/testsuite/c-c++-common/abi-bf.c +--- gcc-4.6.3.orig/gcc/testsuite/c-c++-common/abi-bf.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/c-c++-common/abi-bf.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,3 @@ ++/* { dg-warning "incompatible" } */ ++/* { dg-do compile } */ ++/* { dg-options "-fstrict-volatile-bitfields -fabi-version=1" } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/c-c++-common/pr33763.c gcc-4.6.3/gcc/testsuite/c-c++-common/pr33763.c +--- gcc-4.6.3.orig/gcc/testsuite/c-c++-common/pr33763.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/c-c++-common/pr33763.c 2012-10-05 07:01:59.135703000 -0500 +@@ -0,0 +1,60 @@ ++/* PR tree-optimization/33763 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++typedef struct ++{ ++ void *a; ++ void *b; ++} T; ++extern void *foo (const char *, const char *); ++extern void *bar (void *, const char *, T); ++extern int baz (const char *, int); ++ ++extern inline __attribute__ ((always_inline, gnu_inline)) int ++baz (const char *x, int y) ++{ ++ return 2; ++} ++ ++int ++baz (const char *x, int y) ++{ ++ return 1; ++} ++ ++int xa, xb; ++ ++static void * ++inl (const char *x, const char *y) ++{ ++ T t = { &xa, &xb }; ++ int *f = (int *) __builtin_malloc (sizeof (int)); ++ const char *z; ++ int o = 0; ++ void *r = 0; ++ ++ for (z = y; *z; z++) ++ { ++ if (*z == 'r') ++ o |= 1; ++ if (*z == 'w') ++ o |= 2; ++ } ++ if (o == 1) ++ *f = baz (x, 0); ++ if (o == 2) ++ *f = baz (x, 1); ++ if (o == 3) ++ *f = baz (x, 2); ++ ++ if (o && *f > 0) ++ r = bar (f, "w", t); ++ return r; ++} ++ ++void * ++foo (const char *x, const char *y) ++{ ++ return inl (x, y); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c 2012-03-24 08:47:46.199387000 -0500 +@@ -0,0 +1,56 @@ ++/* Inspired by the test case for PR middle-end/52640. */ ++ ++typedef struct ++{ ++ char *value; ++} REFERENCE; ++ ++/* Add a few "extern int Xxxxxx ();" declarations. */ ++#undef DEF ++#undef LIM1 ++#undef LIM2 ++#undef LIM3 ++#undef LIM4 ++#undef LIM5 ++#undef LIM6 ++#define DEF(x) extern int x () ++#define LIM1(x) DEF(x##0); DEF(x##1); DEF(x##2); DEF(x##3); DEF(x##4); \ ++ DEF(x##5); DEF(x##6); DEF(x##7); DEF(x##8); DEF(x##9); ++#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ ++ LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) ++#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ ++ LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) ++#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ ++ LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) ++#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ ++ LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) ++#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ ++ LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) ++LIM5 (X); ++ ++/* Add references to them, or GCC will simply ignore the extern decls. */ ++#undef DEF ++#undef LIM1 ++#undef LIM2 ++#undef LIM3 ++#undef LIM4 ++#undef LIM5 ++#undef LIM6 ++#define DEF(x) (char *) x ++#define LIM1(x) DEF(x##0), DEF(x##1), DEF(x##2), DEF(x##3), DEF(x##4), \ ++ DEF(x##5), DEF(x##6), DEF(x##7), DEF(x##8), DEF(x##9), ++#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ ++ LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) ++#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ ++ LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) ++#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ ++ LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) ++#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ ++ LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) ++#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ ++ LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) ++REFERENCE references[] = { ++ LIM5 (X) ++ 0 ++}; ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c 2012-05-21 15:12:05.729358000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ int i = (0 ? 1 : 0U / 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c 2012-05-21 15:12:05.729358000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ int i = (1 ? 0U / 0 : 1); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 0 / 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 || 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 1 && 0 / 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 && 1 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ !(0 / 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 65536*65536 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c 2012-09-14 19:29:28.455504000 -0500 +@@ -0,0 +1,8 @@ ++void ++f (void) ++{ ++ unsigned n = 10; ++ ++ typedef double T[n]; ++ (double (*)[n])((unsigned char (*)[sizeof (T)]){ 0 }); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/20120427-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/20120427-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/20120427-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/20120427-1.c 2012-04-30 04:56:27.764158000 -0500 +@@ -0,0 +1,36 @@ ++typedef struct sreal ++{ ++ unsigned sig; /* Significant. */ ++ int exp; /* Exponent. */ ++} sreal; ++ ++sreal_compare (sreal *a, sreal *b) ++{ ++ if (a->exp > b->exp) ++ return 1; ++ if (a->exp < b->exp) ++ return -1; ++ if (a->sig > b->sig) ++ return 1; ++ return -(a->sig < b->sig); ++} ++ ++sreal a[] = { ++ { 0, 0 }, ++ { 1, 0 }, ++ { 0, 1 }, ++ { 1, 1 } ++}; ++ ++int main() ++{ ++ int i, j; ++ for (i = 0; i <= 3; i++) { ++ for (j = 0; j < 3; j++) { ++ if (i < j && sreal_compare(&a[i], &a[j]) != -1) abort(); ++ if (i == j && sreal_compare(&a[i], &a[j]) != 0) abort(); ++ if (i > j && sreal_compare(&a[i], &a[j]) != 1) abort(); ++ } ++ } ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/pr53084.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/pr53084.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/pr53084.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/pr53084.c 2012-04-24 01:14:37.854759000 -0500 +@@ -0,0 +1,18 @@ ++/* PR middle-end/53084 */ ++ ++extern void abort (void); ++ ++__attribute__((noinline, noclone)) void ++bar (const char *p) ++{ ++ if (p[0] != 'o' || p[1] != 'o' || p[2]) ++ abort (); ++} ++ ++int ++main () ++{ ++ static const char *const foo[] = {"foo" + 1}; ++ bar (foo[0]); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/20020201-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/20020201-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/20020201-1.c 2005-03-31 12:14:11.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/20020201-1.c 2012-08-06 02:11:07.208019000 -0500 +@@ -7,11 +7,7 @@ + /* { dg-options "-fprofile-arcs" } */ + /* { dg-do run { target native } } */ + +-extern void abort (void); +-extern void exit (int); +- +-int rand (void); +-void srand (unsigned int seed); ++#include <stdlib.h> + + int globvar; + +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/align-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/align-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/align-2.c 2004-10-19 14:21:41.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/align-2.c 2012-08-10 08:26:44.694722000 -0500 +@@ -1,5 +1,5 @@ + /* PR 17962 */ +-/* { dg-do compile } */ ++/* { dg-do compile { target vect_natural_alignment } } */ + /* { dg-options "" } */ + + typedef float v4 __attribute__((vector_size(sizeof(float)*4))); +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/c90-const-expr-8.c gcc-4.6.3/gcc/testsuite/gcc.dg/c90-const-expr-8.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/c90-const-expr-8.c 2009-06-12 17:06:47.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/c90-const-expr-8.c 2012-09-14 19:28:05.208434000 -0500 +@@ -22,6 +22,6 @@ + E5 = 0 * -INT_MIN, /* { dg-warning "12:integer overflow in expression" } */ + /* { dg-error "3:overflow in constant expression" "constant" { target *-*-* } 22 } */ + E6 = 0 * !-INT_MIN, /* { dg-warning "13:integer overflow in expression" } */ +- /* { dg-error "3:not an integer constant" "constant" { target *-*-* } 24 } */ ++ /* { dg-error "8:not an integer constant" "constant" { target *-*-* } 24 } */ + E7 = INT_MIN % -1 /* Not an overflow. */ + }; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr48374.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr48374.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr48374.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr48374.c 2012-10-30 03:25:16.725474000 -0500 +@@ -0,0 +1,17 @@ ++/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */ ++/* { dg-options "-O -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param max-sched-extend-regions-iters=2" } */ ++ ++void foo (int y) ++{ ++ switch (y) ++ { ++ case 3: ++ case 5: ++ case 7: ++ case 11: ++ break; ++ default: ++ __builtin_unreachable (); ++ } ++} ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr49948.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr49948.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr49948.c 2011-08-03 13:56:02.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr49948.c 2012-10-11 10:22:41.183494000 -0500 +@@ -1,5 +1,6 @@ + /* PR tree-optimization/49948 */ + /* { dg-do compile } */ ++/* { dg-require-effective-target pthread } */ + /* { dg-options "-O3 -ftree-parallelize-loops=2" } */ + + extern int a, *b; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr52862.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr52862.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr52862.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr52862.c 2012-05-22 04:17:42.260176000 -0500 +@@ -0,0 +1,9 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O" } */ ++ ++void ASMAtomicWritePtrVoid(const void *pv); ++void rtThreadDestroy(void) ++{ ++ void * const pvTypeChecked = ((void *)0); ++ ASMAtomicWritePtrVoid((void *)(pvTypeChecked)); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr53701.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr53701.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr53701.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr53701.c 2012-10-22 14:34:35.215631000 -0500 +@@ -0,0 +1,59 @@ ++/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */ ++/* { dg-options "-O3 -fselective-scheduling2 -fsel-sched-pipelining" } */ ++typedef unsigned short int uint16_t; ++typedef unsigned long int uintptr_t; ++typedef struct GFX_VTABLE ++{ ++ int color_depth; ++ unsigned char *line[]; ++} ++BITMAP; ++extern int _drawing_mode; ++extern BITMAP *_drawing_pattern; ++extern int _drawing_y_anchor; ++extern unsigned int _drawing_x_mask; ++extern unsigned int _drawing_y_mask; ++extern uintptr_t bmp_write_line (BITMAP *, int); ++ void ++_linear_hline15 (BITMAP * dst, int dx1, int dy, int dx2, int color) ++{ ++ int w; ++ if (_drawing_mode == 0) ++ { ++ int x, curw; ++ unsigned short *sline = ++ (unsigned short *) (_drawing_pattern-> ++ line[((dy) - ++ _drawing_y_anchor) & _drawing_y_mask]); ++ unsigned short *s; ++ unsigned short *d = ++ ((unsigned short *) (bmp_write_line (dst, dy)) + (dx1)); ++ s = ((unsigned short *) (sline) + (x)); ++ if (_drawing_mode == 2) ++ { ++ } ++ else if (_drawing_mode == 3) ++ { ++ do ++ { ++ w -= curw; ++ do ++ { ++ unsigned long c = (*(s)); ++ if (!((unsigned long) (c) == 0x7C1F)) ++ { ++ (*((uint16_t *) ((uintptr_t) (d))) = ((color))); ++ } ++ ((s)++); ++ } ++ while (--curw > 0); ++ s = sline; ++ curw = ++ (((w) < ++ ((int) _drawing_x_mask + ++ 1)) ? (w) : ((int) _drawing_x_mask + 1)); ++ } ++ while (curw > 0); ++ } ++ } ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/stack-usage-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/stack-usage-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/stack-usage-1.c 2011-01-05 07:25:36.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/stack-usage-1.c 2012-06-20 02:54:17.441164000 -0500 +@@ -41,6 +41,8 @@ + # define SIZE 160 /* 256 - 96 bytes for register save area */ + #elif defined (__SPU__) + # define SIZE 224 ++#elif defined (__sh__) ++# define SIZE 252 + #else + # define SIZE 256 + #endif +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071-2.c 2012-05-22 04:23:01.937094000 -0500 +@@ -0,0 +1,38 @@ ++/* { dg-do compile } */ ++/* { dg-options "-fno-delete-null-pointer-checks" } */ ++ ++extern struct module __this_module; ++static inline void ++trace_module_get (struct module *mod, unsigned long ip) { } ++struct module; ++static inline __attribute__((no_instrument_function)) ++int try_module_get(struct module *module) ++{ ++ int ret = 1; ++ if (module) ++ { ++ if (module_is_live(module)) ++ { ++ __label__ __here; ++ asm(""); ++ __here: ++ trace_module_get(module, (unsigned long)&&__here); ++ } ++ else ++ ret = 0; ++ } ++ return ret; ++} ++struct net_device; ++struct net_device_ops { ++ int (*ndo_open)(struct net_device *dev); ++}; ++int t3e3_open(struct net_device *dev) ++{ ++ int ret = hdlc_open(dev); ++ if (ret) ++ return ret; ++ try_module_get((&__this_module)); ++ return 0; ++} ++const struct net_device_ops t3e3_ops = { .ndo_open = t3e3_open }; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071.c 2012-05-22 04:23:01.937094000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do compile } */ ++ ++void foo (void); ++void bar (void *); ++extern int t; ++ ++static void kmalloc_large (int size, int flags) ++{ ++ (void) size; ++ (void) flags; ++ foo (); ++ bar (({__here:&&__here;})); ++} ++ ++static void kmalloc (int size, int flags) ++{ ++ if (size) ++ { ++ if ((unsigned long) size > 0x1000) ++ kmalloc_large (size, flags); ++ ++ if (flags) ++ bar (({__here:&&__here;})); ++ } ++} ++ ++void compress_file_range (int i, int j, int k) ++{ ++ int nr_pages = ({j < k;}); ++ ++ if (i || t) ++ kmalloc (0x1000UL * nr_pages, 0x40UL); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52407.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52407.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52407.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52407.c 2012-05-22 04:20:15.992160000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do run } */ ++ ++extern void abort (void); ++ ++typedef long long T; ++typedef T vl_t __attribute__((vector_size(2 * sizeof (T)))); ++ ++vl_t ul[4], vl[4] = { { 1, 2 }, { 3, 4 }, { 5, 6 }, { 7, 8 } }; ++ ++static void ++mul_vl_l(vl_t *u, vl_t *v, T x, int m) ++{ ++ vl_t w; ++ T *p = (T *)&w; ++ p[0] = p[1] = x; ++ while (m--) ++ *u++ = *v++ * w; ++} ++ ++int ++main(int argc, char *argv[]) ++{ ++ int i; ++ T *pl; ++ ++ pl = (T *) &ul; ++ mul_vl_l(ul, vl, 2, 4); ++ for (i = 0; i < 8; i++) ++ if (pl[i] != 2 * (i + 1)) ++ abort (); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52693.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52693.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52693.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52693.c 2012-03-28 13:03:28.014541000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do run } */ ++ ++struct pair ++{ ++ int x; ++ int y; ++}; ++ ++struct array ++{ ++ struct pair elems[ 2 ]; ++ unsigned index; ++}; ++ ++extern void abort (); ++ ++void __attribute__ ((noinline,noclone)) ++test_results (int x1, int y1, int x2, int y2) ++{ ++ if (x1 != x2 || y1 != y2) ++ abort (); ++} ++ ++int ++main (void) ++{ ++ struct array arr = {{{1,2}, {3,4}}, 1}; ++ struct pair last = arr.elems[arr.index]; ++ ++ test_results ( last.x, last.y, arr.elems[1].x, arr.elems[1].y); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53790.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53790.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53790.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53790.c 2012-06-28 07:01:16.874415000 -0500 +@@ -0,0 +1,17 @@ ++/* { dg-do compile } */ ++ ++typedef struct s { ++ int value; ++} s_t; ++ ++static inline int ++read(s_t const *var) ++{ ++ return var->value; ++} ++ ++int main() ++{ ++ extern union u extern_var; ++ return read((s_t *)&extern_var); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53908.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53908.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53908.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53908.c 2012-07-16 04:36:04.162835000 -0500 +@@ -0,0 +1,288 @@ ++/* { dg-do run } */ ++/* SEGV at comment below. */ ++typedef unsigned int size_t; ++typedef enum har { ++ he_fatal = (-199), ++ he_not_initialized, ++ he_bad_input, ++ he_memory_too_small, ++ he_bad_action, ++ he_duplicate, ++ he_bad_nonce, ++ he_stale_nonce, ++ he_bad_credentials, ++ he_bad_user, ++ he_no_such_user, ++ he_bad_passwd, ++ he_unknown_auth_scheme, ++ he_not_found, ++ he_failed_digest_file_check, ++ he_failed_digest_file_save, ++ he_process_not_privileged, ++ he_other, ++ he_end_of_range, ++ ha_no_error = 0, ++ ha_no_value = 1 ++} har; ++typedef enum realm_type ++{ ++ axis_realm = 0, ++ ws_realm ++} realm_type; ++ ++__attribute__((__noclone__, __noinline__)) ++har has_www_auth(char *, size_t, realm_type, har); ++ ++__attribute__((__noclone__, __noinline__)) ++har has_auth_user(const char *, const char *, realm_type, char *, size_t); ++ ++__attribute__((__noclone__, __noinline__)) ++char *ha_get_string_value(void); ++ ++typedef struct ++{ ++ unsigned int track_id; ++ char* user; ++ char* realm; ++ char* authent; ++ int internal_realm; ++} request; ++enum user_response { ++ file_not_found_user_response = -3, ++ access_denied_user_response = -2, ++ no_user_response = -1, ++ ok_user_response = 0 ++}; ++struct realm_group { ++ char *name; ++ int id; ++ struct realm_group *next; ++}; ++struct realm { ++ char *name; ++ char *space; ++ struct realm_group *groups; ++ struct realm *next; ++}; ++struct user_info { ++ char *name; ++ int no_groups; ++ int groups[128]; ++ struct user_info *next; ++}; ++static struct user_info *find_user(const char *user_name); ++static int is_member_of_groups(const struct user_info *user_item, ++ const struct realm_group *groups); ++int authent_author(request *req); ++struct realm *realms = ((void *)0); ++struct user_info *users = ((void *)0); ++static struct user_info* ++find_user(const char *user_name) ++{ ++ struct user_info *user_item; ++ user_item = users; ++ while (user_item != ((void *)0)) { ++ /* SEGV due to NULL access here on user_name. See also comment below. */ ++ if ((__builtin_strcmp(user_item->name, user_name) == 0)) ++ break; ++ user_item = user_item->next; ++ } ++ return user_item; ++} ++static int ++is_member_of_groups(const struct user_info *user_item, ++ const struct realm_group *groups) ++{ ++ const struct realm_group *group_item; ++ int i; ++ group_item = groups; ++ while (group_item != ((void *)0)) { ++ for (i = 0; i < user_item->no_groups; i++) ++ if (user_item->groups[i] == group_item->id) ++ return 0; ++ group_item = group_item->next; ++ } ++ return -1; ++} ++char *foo (void) __attribute__((__noclone__, __noinline__)); ++char* g_strdup (const char *str) __attribute__((__malloc__, __noclone__, __noinline__)); ++int g_strcmp0 (const char *str1, const char *str2); ++static int ++is_basic(char **user) ++{ ++ char *passwd_ptr; ++ char *authent = foo(); ++ passwd_ptr = __builtin_strchr(authent, ':'); ++ if (passwd_ptr != ((void *)0)) { ++ *user = g_strdup(authent); ++ return 0; ++ } ++ return -1; ++} ++static int ++is_digest(char **user) ++{ ++ int ret_val = -1; ++ char *authent; ++ authent = ha_get_string_value(); ++ if (authent) { ++ *user = g_strdup(authent); ++ ret_val = 0; ++ } ++ return ret_val; ++} ++__attribute__((__noclone__, __noinline__)) ++void g_free (void * mem); ++static enum user_response ++get_user_info_from_header(const realm_type type, ++ char **user_name, ++ struct user_info **user_item) ++{ ++ int ret_val = no_user_response; ++ if ((type == ws_realm)) { ++ if (is_basic(user_name) == 0) ++ ret_val = access_denied_user_response; ++ if (is_digest(user_name) == 0) ++ ret_val = ok_user_response; ++ } else { ++ if (is_basic(user_name) < 0 && ++ /* Load of *user_name here, but not after the is_digest call. */ ++ is_digest(user_name) < 0) ++ ; ++ else if ((*user_item = find_user(*user_name)) != ((void *)0)) ++ ret_val = ok_user_response; ++ else ++ ret_val = access_denied_user_response; ++ if (ret_val != ok_user_response) ++ g_free(*user_name); ++ } ++ return ret_val; ++} ++static enum user_response ++authenticate_user(request *req, ++ char **user_name, ++ struct user_info **user_item) ++{ ++ char *authent = ((void *)0); ++ har resp = ha_no_value; ++ enum user_response user_resp; ++ int ret_val = no_user_response; ++ if (req->authent && __builtin_strlen(req->authent)) { ++ authent = req->authent; ++ user_resp = get_user_info_from_header(req->internal_realm, ++ user_name, ++ user_item); ++ if (user_resp == ok_user_response) { ++ resp = has_auth_user(authent, 0, req->internal_realm, "", 1); ++ if (resp == ha_no_error) ++ ret_val = ok_user_response; ++ else if (resp != he_stale_nonce) ++ ret_val = access_denied_user_response; ++ } else if (user_resp == access_denied_user_response) ++ ret_val = access_denied_user_response; ++ } ++ if (resp != he_memory_too_small && resp != ha_no_error) ++ resp = has_www_auth("", 1, req->internal_realm, resp); ++ return ret_val; ++} ++ ++int __attribute__ ((__noinline__, __noclone__)) ++authent_author(request *req) ++{ ++ struct realm *realm; ++ char *user_name = ((void *)0); ++ struct user_info *user_item = ((void *)0); ++ int res = 0; ++ asm (""); ++ realm = realms; ++ if (__builtin_strcmp("Wsd", realm->name) == 0) { ++ req->internal_realm = ws_realm; ++ is_digest(&user_name); ++ } ++ if (authenticate_user(req, &user_name, &user_item) < 0) { ++ if (user_name != ((void *)0)) ++ req->user = user_name; ++ res = -2; ++ goto authent_author_return; ++ } ++ if (is_member_of_groups(user_item, realm->groups) < 0) ++ res = -1; ++authent_author_return: ++ return res; ++} ++ ++int good0, good1, good2; ++ ++__attribute__ ((__noinline__, __noclone__)) ++char *foo(void) ++{ ++ asm (""); ++ good0++; ++ return ""; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++char *ha_get_string_value(void) ++{ ++ asm (""); ++ good1++; ++ return "f"; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++har has_auth_user(const char *a, const char *b, realm_type c, char *d, size_t e) ++{ ++ asm (""); ++ if (*a != 'z' || a[1] != 0 || b != 0 || c != axis_realm || *d != 0 ++ || e != 1) ++ __builtin_abort (); ++ return ha_no_error; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++har has_www_auth(char *a, size_t b, realm_type c, har d) ++{ ++ (void)(*a+b+c+d); ++ asm (""); ++ __builtin_abort (); ++} ++ ++ ++char *strdupped_user = "me"; ++__attribute__((__malloc__, __noclone__, __noinline__)) ++char* g_strdup (const char *str) ++{ ++ asm (""); ++ if (*str != 'f') ++ __builtin_abort (); ++ good2++; ++ return strdupped_user; ++} ++ ++__attribute__((__noclone__, __noinline__)) ++void g_free (void * mem) ++{ ++ (void)mem; ++ asm (""); ++ __builtin_abort (); ++} ++ ++struct user_info me = { .name = "me", .no_groups = 1, .groups = {42}, .next = 0}; ++struct user_info you = { .name = "you", .next = &me}; ++struct realm_group xgroups = { .name = "*", .id = 42, .next = 0}; ++ ++int main(void) ++{ ++ char *orig_user = "?"; ++ struct realm r = { .name = "x", .space = "space?", .groups = &xgroups, .next = 0}; ++ request req = { .user = orig_user, .realm = "!", .authent = "z", ++ .internal_realm = axis_realm}; ++ realms = &r; ++ users = &you; ++ if (authent_author (&req) != 0 || good0 != 1 || good1 != 1 || good2 != 1 ++ || req.user != orig_user ++ || req.internal_realm != axis_realm) ++ __builtin_abort (); ++ __builtin_exit (0); ++} ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/slp-25.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/slp-25.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/slp-25.c 2010-10-04 09:59:30.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/slp-25.c 2012-08-10 08:26:44.694722000 -0500 +@@ -57,5 +57,5 @@ + + /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { vect_no_align } } } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { vect_no_align || { ! vect_natural_alignment } } } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-1.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-1.c 2012-08-10 08:26:44.694722000 -0500 +@@ -49,6 +49,6 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target vect_element_align } } } */ ++/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ + /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-2.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-2.c 2012-08-10 08:26:44.694722000 -0500 +@@ -50,6 +50,6 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target vect_element_align } } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target vect_element_align } } } */ ++/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-3.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-3.c 2010-11-22 07:59:45.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-3.c 2012-08-10 08:26:44.694722000 -0500 +@@ -4,9 +4,7 @@ + #include "tree-vect.h" + + #define N 128 +-#define RES 21888 +- +-/* unaligned store. */ ++#define RES 21640 + + int ib[N+10]; + int ia[N+10]; +@@ -18,11 +16,11 @@ + int i, suma = 0, sumb = 0, sumc = 0; + + /* ib and ic have same misalignment, we peel to align them. */ +- for (i = 1; i <= N; i++) ++ for (i = 0; i <= N; i++) + { + suma += ia[i]; +- sumb += ib[i+6]; +- sumc += ic[i+2]; ++ sumb += ib[i+5]; ++ sumc += ic[i+1]; + } + + /* check results: */ +@@ -49,7 +47,7 @@ + return main1 (); + } + +-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail vect_no_align } } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-4.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-4.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-4.c 2012-08-10 08:26:44.694722000 -0500 +@@ -16,13 +16,13 @@ + /* Don't peel keeping one load and the store aligned. */ + for (i = 0; i <= N; i++) + { +- ia[i] = ib[i] + ib[i+6]; ++ ia[i] = ib[i] + ib[i+5]; + } + + /* check results: */ + for (i = 1; i <= N; i++) + { +- if (ia[i] != ib[i] + ib[i+6]) ++ if (ia[i] != ib[i] + ib[i+5]) + abort (); + } + +@@ -44,7 +44,7 @@ + return main1 (); + } + +-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/volatile-bitfields-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/volatile-bitfields-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/volatile-bitfields-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/volatile-bitfields-2.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,15 @@ ++/* { dg-do run } */ ++/* { dg-options "-fstrict-volatile-bitfields" } */ ++ ++extern void abort(void); ++struct thing { ++ volatile unsigned short a: 8; ++ volatile unsigned short b: 8; ++} t = {1,2}; ++ ++int main() ++{ ++ t.a = 3; ++ if (t.a !=3 || t.b !=2) abort(); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c gcc-4.6.3/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,30 @@ ++/* { dg-require-effective-target arm_eabi } */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++/* { dg-final { scan-assembler-times "ldr\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ ++/* { dg-final { scan-assembler-times "str\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ ++/* { dg-final { scan-assembler-not "strb" } } */ ++ ++struct thing { ++ unsigned a: 8; ++ unsigned b: 8; ++ unsigned c: 8; ++ unsigned d: 8; ++}; ++ ++struct thing2 { ++ volatile unsigned a: 8; ++ volatile unsigned b: 8; ++ volatile unsigned c: 8; ++ volatile unsigned d: 8; ++}; ++ ++void test1(volatile struct thing *t) ++{ ++ t->a = 5; ++} ++ ++void test2(struct thing2 *t) ++{ ++ t->a = 5; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movups256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movups/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movups256/1" } } */ ++/* { dg-final { scan-assembler "avx_movups/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c 2012-05-14 16:32:29.729958000 -0500 +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "\\*avx_movdqu256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movdqu/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movdqu256/1" } } */ ++/* { dg-final { scan-assembler "avx_movdqu/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movupd256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movupd/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movupd256/1" } } */ ++/* { dg-final { scan-assembler "avx_movupd/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + b[i] = a[i+3] * 2; + } + +-/* { dg-final { scan-assembler "\\*avx_movups256/1" } } */ +-/* { dg-final { scan-assembler-not "\\*avx_movups/1" } } */ ++/* { dg-final { scan-assembler "avx_movups256/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movups/1" } } */ + /* { dg-final { scan-assembler-not "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c 2012-05-14 16:32:29.729958000 -0500 +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movups256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movups256/2" } } */ + /* { dg-final { scan-assembler "movups.*\\*avx_movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c 2012-05-14 16:32:29.729958000 -0500 +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "\\*avx_movdqu256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movdqu256/2" } } */ + /* { dg-final { scan-assembler "movdqu.*\\*avx_movv16qi_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c 2012-05-14 16:32:29.729958000 -0500 +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movupd256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movupd256/2" } } */ + /* { dg-final { scan-assembler "movupd.*\\*avx_movv2df_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,7 +14,7 @@ + b[i+3] = a[i] * c[i]; + } + +-/* { dg-final { scan-assembler "\\*avx_movups256/2" } } */ +-/* { dg-final { scan-assembler-not "\\*avx_movups/2" } } */ ++/* { dg-final { scan-assembler "avx_movups256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movups/2" } } */ + /* { dg-final { scan-assembler-not "\\*avx_movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler-not "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr52736.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr52736.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr52736.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr52736.c 2012-03-28 03:09:55.449307000 -0500 +@@ -0,0 +1,29 @@ ++/* PR target/52736 */ ++/* { dg-do run } */ ++/* { dg-options "-O1 -msse2" } */ ++/* { dg-require-effective-target sse2_runtime } */ ++ ++#include <x86intrin.h> ++ ++typedef double D __attribute__((may_alias)); ++__attribute__((aligned(16))) static const double r[4] = { 1., 5., 1., 3. }; ++ ++__attribute__((noinline, noclone)) ++void ++foo (int x) ++{ ++ asm volatile ("" : "+g" (x) : : "memory"); ++ if (x != 3) ++ __builtin_abort (); ++} ++ ++int ++main () ++{ ++ __m128d t = _mm_set1_pd (5.); ++ ((D *)(&t))[0] = 1.; ++ foo (_mm_movemask_pd (_mm_cmpeq_pd (t, _mm_load_pd (&r[0])))); ++ ((D *)(&t))[1] = 3.; ++ foo (_mm_movemask_pd (_mm_cmpeq_pd (t, _mm_load_pd (&r[2])))); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr53416.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr53416.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr53416.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr53416.c 2012-05-21 07:59:53.696085000 -0500 +@@ -0,0 +1,17 @@ ++/* PR target/53416 */ ++/* { dg-options "-O2 -mrdrnd" } */ ++ ++int test (void) ++{ ++ unsigned int number = 0; ++ int result0, result1, result2, result3; ++ ++ result0 = __builtin_ia32_rdrand32_step (&number); ++ result1 = __builtin_ia32_rdrand32_step (&number); ++ result2 = __builtin_ia32_rdrand32_step (&number); ++ result3 = __builtin_ia32_rdrand32_step (&number); ++ ++ return result0 + result1 +result2 + result3; ++} ++ ++/* { dg-final { scan-assembler-times "rdrand" 4 } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvlx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc1(long a, void *p) { return __builtin_altivec_lvlx (a,p); } ++vsf llx01(long a, vsf *p) { return __builtin_vec_lvlx (a,p); } ++vsf llx02(long a, sf *p) { return __builtin_vec_lvlx (a,p); } ++vbi llx03(long a, vbi *p) { return __builtin_vec_lvlx (a,p); } ++vsi llx04(long a, vsi *p) { return __builtin_vec_lvlx (a,p); } ++vsi llx05(long a, si *p) { return __builtin_vec_lvlx (a,p); } ++vui llx06(long a, vui *p) { return __builtin_vec_lvlx (a,p); } ++vui llx07(long a, ui *p) { return __builtin_vec_lvlx (a,p); } ++vbs llx08(long a, vbs *p) { return __builtin_vec_lvlx (a,p); } ++vp llx09(long a, vp *p) { return __builtin_vec_lvlx (a,p); } ++vss llx10(long a, vss *p) { return __builtin_vec_lvlx (a,p); } ++vss llx11(long a, ss *p) { return __builtin_vec_lvlx (a,p); } ++vus llx12(long a, vus *p) { return __builtin_vec_lvlx (a,p); } ++vus llx13(long a, us *p) { return __builtin_vec_lvlx (a,p); } ++vbc llx14(long a, vbc *p) { return __builtin_vec_lvlx (a,p); } ++vsc llx15(long a, vsc *p) { return __builtin_vec_lvlx (a,p); } ++vsc llx16(long a, sc *p) { return __builtin_vec_lvlx (a,p); } ++vuc llx17(long a, vuc *p) { return __builtin_vec_lvlx (a,p); } ++vuc llx18(long a, uc *p) { return __builtin_vec_lvlx (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvlxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc2(long a, void *p) { return __builtin_altivec_lvlxl (a,p); } ++vsf llxl01(long a, vsf *p) { return __builtin_vec_lvlxl (a,p); } ++vsf llxl02(long a, sf *p) { return __builtin_vec_lvlxl (a,p); } ++vbi llxl03(long a, vbi *p) { return __builtin_vec_lvlxl (a,p); } ++vsi llxl04(long a, vsi *p) { return __builtin_vec_lvlxl (a,p); } ++vsi llxl05(long a, si *p) { return __builtin_vec_lvlxl (a,p); } ++vui llxl06(long a, vui *p) { return __builtin_vec_lvlxl (a,p); } ++vui llxl07(long a, ui *p) { return __builtin_vec_lvlxl (a,p); } ++vbs llxl08(long a, vbs *p) { return __builtin_vec_lvlxl (a,p); } ++vp llxl09(long a, vp *p) { return __builtin_vec_lvlxl (a,p); } ++vss llxl10(long a, vss *p) { return __builtin_vec_lvlxl (a,p); } ++vss llxl11(long a, ss *p) { return __builtin_vec_lvlxl (a,p); } ++vus llxl12(long a, vus *p) { return __builtin_vec_lvlxl (a,p); } ++vus llxl13(long a, us *p) { return __builtin_vec_lvlxl (a,p); } ++vbc llxl14(long a, vbc *p) { return __builtin_vec_lvlxl (a,p); } ++vsc llxl15(long a, vsc *p) { return __builtin_vec_lvlxl (a,p); } ++vsc llxl16(long a, sc *p) { return __builtin_vec_lvlxl (a,p); } ++vuc llxl17(long a, vuc *p) { return __builtin_vec_lvlxl (a,p); } ++vuc llxl18(long a, uc *p) { return __builtin_vec_lvlxl (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvrx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc3(long a, void *p) { return __builtin_altivec_lvrx (a,p); } ++vsf lrx01(long a, vsf *p) { return __builtin_vec_lvrx (a,p); } ++vsf lrx02(long a, sf *p) { return __builtin_vec_lvrx (a,p); } ++vbi lrx03(long a, vbi *p) { return __builtin_vec_lvrx (a,p); } ++vsi lrx04(long a, vsi *p) { return __builtin_vec_lvrx (a,p); } ++vsi lrx05(long a, si *p) { return __builtin_vec_lvrx (a,p); } ++vui lrx06(long a, vui *p) { return __builtin_vec_lvrx (a,p); } ++vui lrx07(long a, ui *p) { return __builtin_vec_lvrx (a,p); } ++vbs lrx08(long a, vbs *p) { return __builtin_vec_lvrx (a,p); } ++vp lrx09(long a, vp *p) { return __builtin_vec_lvrx (a,p); } ++vss lrx10(long a, vss *p) { return __builtin_vec_lvrx (a,p); } ++vss lrx11(long a, ss *p) { return __builtin_vec_lvrx (a,p); } ++vus lrx12(long a, vus *p) { return __builtin_vec_lvrx (a,p); } ++vus lrx13(long a, us *p) { return __builtin_vec_lvrx (a,p); } ++vbc lrx14(long a, vbc *p) { return __builtin_vec_lvrx (a,p); } ++vsc lrx15(long a, vsc *p) { return __builtin_vec_lvrx (a,p); } ++vsc lrx16(long a, sc *p) { return __builtin_vec_lvrx (a,p); } ++vuc lrx17(long a, vuc *p) { return __builtin_vec_lvrx (a,p); } ++vuc lrx18(long a, uc *p) { return __builtin_vec_lvrx (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvrxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc4(long a, void *p) { return __builtin_altivec_lvrxl (a,p); } ++vsf lrxl01(long a, vsf *p) { return __builtin_vec_lvrxl (a,p); } ++vsf lrxl02(long a, sf *p) { return __builtin_vec_lvrxl (a,p); } ++vbi lrxl03(long a, vbi *p) { return __builtin_vec_lvrxl (a,p); } ++vsi lrxl04(long a, vsi *p) { return __builtin_vec_lvrxl (a,p); } ++vsi lrxl05(long a, si *p) { return __builtin_vec_lvrxl (a,p); } ++vui lrxl06(long a, vui *p) { return __builtin_vec_lvrxl (a,p); } ++vui lrxl07(long a, ui *p) { return __builtin_vec_lvrxl (a,p); } ++vbs lrxl08(long a, vbs *p) { return __builtin_vec_lvrxl (a,p); } ++vp lrxl09(long a, vp *p) { return __builtin_vec_lvrxl (a,p); } ++vss lrxl10(long a, vss *p) { return __builtin_vec_lvrxl (a,p); } ++vss lrxl11(long a, ss *p) { return __builtin_vec_lvrxl (a,p); } ++vus lrxl12(long a, vus *p) { return __builtin_vec_lvrxl (a,p); } ++vus lrxl13(long a, us *p) { return __builtin_vec_lvrxl (a,p); } ++vbc lrxl14(long a, vbc *p) { return __builtin_vec_lvrxl (a,p); } ++vsc lrxl15(long a, vsc *p) { return __builtin_vec_lvrxl (a,p); } ++vsc lrxl16(long a, sc *p) { return __builtin_vec_lvrxl (a,p); } ++vuc lrxl17(long a, vuc *p) { return __builtin_vec_lvrxl (a,p); } ++vuc lrxl18(long a, uc *p) { return __builtin_vec_lvrxl (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvlx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc1(vsc v, long a, void *p) { __builtin_altivec_stvlx (v,a,p); } ++void slx01(vsf v, long a, vsf *p) { __builtin_vec_stvlx (v,a,p); } ++void slx02(vsf v, long a, sf *p) { __builtin_vec_stvlx (v,a,p); } ++void slx03(vbi v, long a, vbi *p) { __builtin_vec_stvlx (v,a,p); } ++void slx04(vsi v, long a, vsi *p) { __builtin_vec_stvlx (v,a,p); } ++void slx05(vsi v, long a, si *p) { __builtin_vec_stvlx (v,a,p); } ++void slx06(vui v, long a, vui *p) { __builtin_vec_stvlx (v,a,p); } ++void slx07(vui v, long a, ui *p) { __builtin_vec_stvlx (v,a,p); } ++void slx08(vbs v, long a, vbs *p) { __builtin_vec_stvlx (v,a,p); } ++void slx09(vp v, long a, vp *p) { __builtin_vec_stvlx (v,a,p); } ++void slx10(vss v, long a, vss *p) { __builtin_vec_stvlx (v,a,p); } ++void slx11(vss v, long a, ss *p) { __builtin_vec_stvlx (v,a,p); } ++void slx12(vus v, long a, vus *p) { __builtin_vec_stvlx (v,a,p); } ++void slx13(vus v, long a, us *p) { __builtin_vec_stvlx (v,a,p); } ++void slx14(vbc v, long a, vbc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx15(vsc v, long a, vsc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx16(vsc v, long a, sc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx17(vuc v, long a, vuc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx18(vuc v, long a, uc *p) { __builtin_vec_stvlx (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvlxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc2(vsc v, long a, void *p) { __builtin_altivec_stvlxl (v,a,p); } ++void slxl01(vsf v, long a, vsf *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl02(vsf v, long a, sf *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl03(vbi v, long a, vbi *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl04(vsi v, long a, vsi *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl05(vsi v, long a, si *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl06(vui v, long a, vui *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl07(vui v, long a, ui *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl08(vbs v, long a, vbs *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl09(vp v, long a, vp *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl10(vss v, long a, vss *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl11(vss v, long a, ss *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl12(vus v, long a, vus *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl13(vus v, long a, us *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl14(vbc v, long a, vbc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl15(vsc v, long a, vsc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl16(vsc v, long a, sc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl17(vuc v, long a, vuc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl18(vuc v, long a, uc *p) { __builtin_vec_stvlxl (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvrx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc3(vsc v, long a, void *p) { __builtin_altivec_stvrx (v,a,p); } ++void srx01(vsf v, long a, vsf *p) { __builtin_vec_stvrx (v,a,p); } ++void srx02(vsf v, long a, sf *p) { __builtin_vec_stvrx (v,a,p); } ++void srx03(vbi v, long a, vbi *p) { __builtin_vec_stvrx (v,a,p); } ++void srx04(vsi v, long a, vsi *p) { __builtin_vec_stvrx (v,a,p); } ++void srx05(vsi v, long a, si *p) { __builtin_vec_stvrx (v,a,p); } ++void srx06(vui v, long a, vui *p) { __builtin_vec_stvrx (v,a,p); } ++void srx07(vui v, long a, ui *p) { __builtin_vec_stvrx (v,a,p); } ++void srx08(vbs v, long a, vbs *p) { __builtin_vec_stvrx (v,a,p); } ++void srx09(vp v, long a, vp *p) { __builtin_vec_stvrx (v,a,p); } ++void srx10(vss v, long a, vss *p) { __builtin_vec_stvrx (v,a,p); } ++void srx11(vss v, long a, ss *p) { __builtin_vec_stvrx (v,a,p); } ++void srx12(vus v, long a, vus *p) { __builtin_vec_stvrx (v,a,p); } ++void srx13(vus v, long a, us *p) { __builtin_vec_stvrx (v,a,p); } ++void srx14(vbc v, long a, vbc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx15(vsc v, long a, vsc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx16(vsc v, long a, sc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx17(vuc v, long a, vuc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx18(vuc v, long a, uc *p) { __builtin_vec_stvrx (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvrxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc4(vsc v, long a, void *p) { __builtin_altivec_stvrxl (v,a,p); } ++void srxl01(vsf v, long a, vsf *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl02(vsf v, long a, sf *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl03(vbi v, long a, vbi *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl04(vsi v, long a, vsi *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl05(vsi v, long a, si *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl06(vui v, long a, vui *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl07(vui v, long a, ui *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl08(vbs v, long a, vbs *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl09(vp v, long a, vp *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl10(vss v, long a, vss *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl11(vss v, long a, ss *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl12(vus v, long a, vus *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl13(vus v, long a, us *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl14(vbc v, long a, vbc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl15(vsc v, long a, vsc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl16(vsc v, long a, sc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl17(vuc v, long a, vuc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl18(vuc v, long a, uc *p) { __builtin_vec_stvrxl (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52457.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52457.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52457.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52457.c 2012-03-02 16:12:52.237313000 -0600 +@@ -0,0 +1,34 @@ ++/* { dg-do run { target { powerpc*-*-linux* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-skip-if "" { powerpc*-*-*spe* } { "*" } { "" } } */ ++/* { dg-require-effective-target vsx_hw } */ ++/* { dg-options "-O1 -mcpu=power7" } */ ++ ++extern void abort (void); ++ ++typedef long long T; ++typedef T vl_t __attribute__((vector_size(2 * sizeof (T)))); ++ ++vl_t ++buggy_func (T x) ++{ ++ vl_t w; ++ T *p = (T *)&w; ++ p[0] = p[1] = x; ++ return w; ++} ++ ++int ++main(void) ++{ ++ vl_t rval; ++ T *pl; ++ ++ pl = (T *) &rval; ++ rval = buggy_func (2); ++ ++ if (pl[0] != 2 || pl[1] != 2) ++ abort (); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52775.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52775.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52775.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52775.c 2012-04-13 16:55:15.746111000 -0500 +@@ -0,0 +1,16 @@ ++/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-options "-O1 -mcpu=power4" } */ ++/* { dg-final { scan-assembler-times "fcfid" 2 } } */ ++ ++double ++int_to_double (int *p) ++{ ++ return (double)*p; ++} ++ ++double ++long_long_to_double (long long *p) ++{ ++ return (double)*p; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr53199.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr53199.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr53199.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr53199.c 2012-05-03 19:31:50.505528000 -0500 +@@ -0,0 +1,50 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-options "-O2 -mcpu=power6 -mavoid-indexed-addresses" } */ ++/* { dg-final { scan-assembler-times "lwbrx" 6 } } */ ++/* { dg-final { scan-assembler-times "stwbrx" 6 } } */ ++ ++/* PR 51399: bswap gets an error if -mavoid-indexed-addresses was used in ++ creating the two lwbrx instructions. */ ++ ++long long ++load64_reverse_1 (long long *p) ++{ ++ return __builtin_bswap64 (*p); ++} ++ ++long long ++load64_reverse_2 (long long *p) ++{ ++ return __builtin_bswap64 (p[1]); ++} ++ ++long long ++load64_reverse_3 (long long *p, int i) ++{ ++ return __builtin_bswap64 (p[i]); ++} ++ ++void ++store64_reverse_1 (long long *p, long long x) ++{ ++ *p = __builtin_bswap64 (x); ++} ++ ++void ++store64_reverse_2 (long long *p, long long x) ++{ ++ p[1] = __builtin_bswap64 (x); ++} ++ ++void ++store64_reverse_3 (long long *p, long long x, int i) ++{ ++ p[i] = __builtin_bswap64 (x); ++} ++ ++long long ++reg_reverse (long long x) ++{ ++ return __builtin_bswap64 (x); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/nullptr28.C gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/nullptr28.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/nullptr28.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/nullptr28.C 2012-07-03 18:29:03.323158000 -0500 +@@ -0,0 +1,17 @@ ++// { dg-do run } ++// { dg-options "-std=c++0x -pedantic-errors" } ++ ++typedef decltype(nullptr) nullptr_t; ++ ++int i; ++nullptr_t n; ++const nullptr_t& f() { ++i; return n; } ++ ++nullptr_t g() { return f(); } ++ ++int main() ++{ ++ g(); ++ if (i != 1) ++ __builtin_abort (); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C 2012-05-23 16:29:55.463235000 -0500 +@@ -0,0 +1,24 @@ ++// PR c++/52796 ++// { dg-options "-std=c++0x -pedantic-errors" } ++ ++inline void *operator new(__SIZE_TYPE__ s, void *p) { return p; } ++ ++struct A ++{ ++ int i; ++ template<class... Ts> ++ A(Ts&&... ts): i(ts...) { } ++}; ++ ++static union { ++ unsigned char c[sizeof(A)]; ++ int i; ++}; ++ ++int main() ++{ ++ i = 0xdeadbeef; ++ new(c) A; ++ if (i != 0) ++ __builtin_abort(); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/template/anonunion2.C gcc-4.6.3/gcc/testsuite/g++.dg/template/anonunion2.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/template/anonunion2.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/template/anonunion2.C 2012-09-13 10:13:08.240418000 -0500 +@@ -0,0 +1,6 @@ ++template <int i> ++struct S ++{ ++ S () { union { int a; }; a = 0; } ++}; ++S<0> s; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/tree-ssa/pr54515.C gcc-4.6.3/gcc/testsuite/g++.dg/tree-ssa/pr54515.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/tree-ssa/pr54515.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/tree-ssa/pr54515.C 2012-09-10 04:50:02.938856000 -0500 +@@ -0,0 +1,19 @@ ++// { dg-do compile } ++// { dg-options "-O2" } ++ ++template < typename T > T h2le (T) ++{ ++ T a; ++ unsigned short &b = a; ++ short c = 0; ++ unsigned char (&d)[2] = reinterpret_cast < unsigned char (&)[2] > (c); ++ unsigned char (&e)[2] = reinterpret_cast < unsigned char (&)[2] > (b); ++ e[0] = d[0]; ++ return a; ++} ++ ++void ++bar () ++{ ++ h2le ((unsigned short) 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/array_section_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/array_section_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/array_section_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/array_section_3.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -0,0 +1,17 @@ ++! { dg-do compile } ++! ++! PR fortran/54225 ++! ++! Contributed by robb wu ++! ++program test ++ implicit none ++ real :: A(2,3) ++ ++ print *, A(1, *) ! { dg-error "Expected array subscript" } ++end program ++ ++subroutine test2 ++integer, dimension(2) :: a ++a(*) = 1 ! { dg-error "Expected array subscript" } ++end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 2012-09-12 16:54:50.523207000 -0500 +@@ -0,0 +1,23 @@ ++! { dg-do compile } ++! { dg-options "-fdump-tree-original" } ++! ++! PR fortran/54208 ++! The I and J definitions used to raise an error because ARR's array spec ++! was resolved to late for the LBOUND and UBOUND calls to be simplified to ++! a constant. ++! ++! Contributed by Carlos A. Cruz <carlos.a.cruz@nasa.gov> ++ ++program testit ++ integer, parameter :: n=2 ++ integer, dimension(1-min(n,2)/2:n) :: arr ++ integer, parameter :: i=lbound(arr,1) ++ integer, parameter :: j=ubound(arr,1) ++ ! write(6,*) i, j ++ if (i /= 0) call abort ++ if (j /= 2) call abort ++end program testit ++ ++! { dg-final { scan-tree-dump-times "bound" 0 "original" } } ++! { dg-final { scan-tree-dump-times "abort" 0 "original" } } ++! { dg-final { cleanup-tree-dump "original" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_10.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_10.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_10.f90 2010-07-08 10:17:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_10.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -30,12 +30,12 @@ + subroutine rank_mismatch() + implicit none + integer,allocatable :: A(:)[:,:,:,:] +- allocate(A(1)[1,1,1:*]) ! { dg-error "Unexpected ... for codimension" } ++ allocate(A(1)[1,1,1:*]) ! { dg-error "Too few codimensions" } + allocate(A(1)[1,1,1,1,1,*]) ! { dg-error "Invalid codimension 5" } + allocate(A(1)[1,1,1,*]) + allocate(A(1)[1,1]) ! { dg-error "Too few codimensions" } + allocate(A(1)[1,*]) ! { dg-error "Too few codimensions" } +- allocate(A(1)[1,1:*]) ! { dg-error "Unexpected ... for codimension" } ++ allocate(A(1)[1,1:*]) ! { dg-error "Too few codimensions" } + + A(1)[1,1,1] = 1 ! { dg-error "Too few codimensions" } + A(1)[1,1,1,1,1,1] = 1 ! { dg-error "Invalid codimension 5" } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_28.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_28.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_28.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_28.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -0,0 +1,10 @@ ++! { dg-do compile } ++! { dg-options "-fcoarray=single" } ++! ++! PR fortran/54225 ++! ++ ++integer, allocatable :: a[:,:] ++ ++allocate (a[*,4]) ! { dg-error "Unexpected '.' for codimension 1 of 2" } ++end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 2012-09-13 13:15:52.599419000 -0500 +@@ -0,0 +1,109 @@ ++! { dg-do compile } ++! { dg-options "-O2 -fdump-tree-optimized" } ++! ++! PR fortran/54556 ++! ++! Contributed by Joost VandeVondele ++! ++MODULE parallel_rng_types ++ ++ IMPLICIT NONE ++ ++ ! Global parameters in this module ++ INTEGER, PARAMETER :: dp=8 ++ ++ TYPE rng_stream_type ++ PRIVATE ++ CHARACTER(LEN=40) :: name ++ INTEGER :: distribution_type ++ REAL(KIND=dp), DIMENSION(3,2) :: bg,cg,ig ++ LOGICAL :: antithetic,extended_precision ++ REAL(KIND=dp) :: buffer ++ LOGICAL :: buffer_filled ++ END TYPE rng_stream_type ++ ++ REAL(KIND=dp), DIMENSION(3,3) :: a1p0,a1p76,a1p127,& ++ a2p0,a2p76,a2p127,& ++ inv_a1,inv_a2 ++ ++ INTEGER, PARAMETER :: GAUSSIAN = 1,& ++ UNIFORM = 2 ++ ++ REAL(KIND=dp), PARAMETER :: norm = 2.328306549295727688e-10_dp,& ++ m1 = 4294967087.0_dp,& ++ m2 = 4294944443.0_dp,& ++ a12 = 1403580.0_dp,& ++ a13n = 810728.0_dp,& ++ a21 = 527612.0_dp,& ++ a23n = 1370589.0_dp,& ++ two17 = 131072.0_dp,& ! 2**17 ++ two53 = 9007199254740992.0_dp,& ! 2**53 ++ fact = 5.9604644775390625e-8_dp ! 1/2**24 ++ ++ ++CONTAINS ++ ++ FUNCTION rn32(rng_stream) RESULT(u) ++ ++ TYPE(rng_stream_type), POINTER :: rng_stream ++ REAL(KIND=dp) :: u ++ ++ INTEGER :: k ++ REAL(KIND=dp) :: p1, p2 ++ ++! ------------------------------------------------------------------------- ++! Component 1 ++ ++ p1 = a12*rng_stream%cg(2,1) - a13n*rng_stream%cg(1,1) ++ k = INT(p1/m1) ++ p1 = p1 - k*m1 ++ IF (p1 < 0.0_dp) p1 = p1 + m1 ++ rng_stream%cg(1,1) = rng_stream%cg(2,1) ++ rng_stream%cg(2,1) = rng_stream%cg(3,1) ++ rng_stream%cg(3,1) = p1 ++ ++ ! Component 2 ++ ++ p2 = a21*rng_stream%cg(3,2) - a23n*rng_stream%cg(1,2) ++ k = INT(p2/m2) ++ p2 = p2 - k*m2 ++ IF (p2 < 0.0_dp) p2 = p2 + m2 ++ rng_stream%cg(1,2) = rng_stream%cg(2,2) ++ rng_stream%cg(2,2) = rng_stream%cg(3,2) ++ rng_stream%cg(3,2) = p2 ++ ++ ! Combination ++ ++ IF (p1 > p2) THEN ++ u = (p1 - p2)*norm ++ ELSE ++ u = (p1 - p2 + m1)*norm ++ END IF ++ ++ IF (rng_stream%antithetic) u = 1.0_dp - u ++ ++ END FUNCTION rn32 ++ ++! ***************************************************************************** ++ FUNCTION rn53(rng_stream) RESULT(u) ++ ++ TYPE(rng_stream_type), POINTER :: rng_stream ++ REAL(KIND=dp) :: u ++ ++ u = rn32(rng_stream) ++ ++ IF (rng_stream%antithetic) THEN ++ u = u + (rn32(rng_stream) - 1.0_dp)*fact ++ IF (u < 0.0_dp) u = u + 1.0_dp ++ ELSE ++ u = u + rn32(rng_stream)*fact ++ IF (u >= 1.0_dp) u = u - 1.0_dp ++ END IF ++ ++ END FUNCTION rn53 ++ ++END MODULE ++ ++! { dg-final { scan-module-absence "parallel_rng_types" "IMPLICIT_PURE" } } ++! { dg-final { scan-tree-dump-times "rn32 \\(rng_stream" 3 "optimized" } } ++! { dg-final { cleanup-tree-dump "optimized" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/init_flag_10.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/init_flag_10.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/init_flag_10.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/init_flag_10.f90 2012-06-05 08:05:31.580646000 -0500 +@@ -0,0 +1,43 @@ ++! { dg-do run } ++! { dg-options "-finit-real=NAN" } ++! { dg-add-options ieee } ++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } } ++! ++! PR fortran/50619 ++! ++! Contributed by Fred Krogh ++! ++! The NaN initialization used to set the associate name to NaN! ++! ++ ++module testa2 ++type, public :: test_ty ++ real :: rmult = 1.0e0 ++end type test_ty ++ ++contains ++ subroutine test(e, var1) ++ type(test_ty) :: e ++ real :: var1, var2 ! Should get NaN initialized ++ ++ ! Should be the default value ++ if (e%rmult /= 1.0) call abort () ++ ++ ! Check that NaN initialization is really turned on ++ if (var1 == var1) call abort () ++ if (var2 == var2) call abort () ++ ++ ! The following was failing: ++ associate (rmult=>e%rmult) ++ if (e%rmult /= 1.0) call abort () ++ end associate ++ end subroutine test ++end module testa2 ++ ++program testa1 ++ use testa2 ++ type(test_ty) :: e ++ real :: var1 ! Should get NaN initialized ++ call test(e, var1) ++ stop ++end program testa1 +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/intrinsic_8.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/intrinsic_8.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/intrinsic_8.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/intrinsic_8.f90 2012-03-06 11:08:01.409469000 -0600 +@@ -0,0 +1,23 @@ ++! { dg-do compile } ++! ++! PR fortran/52452 ++! ++! Contributed by Roger Ferrer Ibanez ++! ++PROGRAM test_etime ++ IMPLICIT NONE ++ INTRINSIC :: etime ++ REAL(4) :: tarray(1:2) ++ REAL(4) :: result ++ ++ CALL etime(tarray, result) ++END PROGRAM test_etime ++ ++subroutine test_etime2 ++ IMPLICIT NONE ++ INTRINSIC :: etime ++ REAL(4) :: tarray(1:2) ++ REAL(4) :: result ++ ++ result = etime(tarray) ++END subroutine test_etime2 +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/optional_absent_2.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/optional_absent_2.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/optional_absent_2.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/optional_absent_2.f90 2012-07-14 10:24:12.262320000 -0500 +@@ -0,0 +1,53 @@ ++! { dg-do run } ++! ++! PR fortran/51758 ++! ++! Contributed by Mikael Morin ++! ++! Check whether passing NULL() to an elemental procedure works, ++! where NULL() denotes an absent optional argument. ++! ++program p ++ ++ integer :: a(2) ++ integer :: b ++ ++ a = 0 ++ a = foo((/ 1, 1 /), null()) ++! print *, a ++ if (any(a /= 2)) call abort ++ ++ a = 0 ++ a = bar((/ 1, 1 /), null()) ++! print *, a ++ if (any(a /= 2)) call abort ++ ++ b = 0 ++ b = bar(1, null()) ++! print *, b ++ if (b /= 2) call abort ++ ++contains ++ ++ function foo(a, b) ++ integer :: a(:) ++ integer, optional :: b(:) ++ integer :: foo(size(a)) ++ ++ if (present(b)) call abort ++ ++ foo = 2 ++ end function foo ++ ++ elemental function bar(a, b) ++ integer, intent(in) :: a ++ integer, intent(in), optional :: b ++ integer :: bar ++ ++ bar = 2 ++ ++ if (present(b)) bar = 1 ++ ++ end function bar ++ ++end program p +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 2012-05-02 07:53:20.873985000 -0500 +@@ -0,0 +1,19 @@ ++! { dg-do compile } ++! ++! PR fortran/52864 ++! ++! Assigning to an intent(in) pointer (which is valid). ++! ++ program test ++ type PoisFFT_Solver3D ++ complex, dimension(:,:,:), & ++ pointer :: work => null() ++ end type PoisFFT_Solver3D ++ contains ++ subroutine PoisFFT_Solver3D_FullPeriodic(D, p) ++ type(PoisFFT_Solver3D), intent(in) :: D ++ real, intent(in), pointer :: p(:) ++ D%work(i,j,k) = 0.0 ++ p = 0.0 ++ end subroutine ++ end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 2012-03-10 03:20:22.792570000 -0600 +@@ -0,0 +1,79 @@ ++! { dg-do compile } ++! ++! PR fortran/52469 ++! ++! This was failing as the DECL of the proc pointer "func" ++! was used for the interface of the proc-pointer component "my_f_ptr" ++! rather than the decl of the proc-pointer target ++! ++! Contributed by palott@gmail.com ++! ++ ++module ExampleFuncs ++ implicit none ++ ++ ! NOTE: "func" is a procedure pointer! ++ pointer :: func ++ interface ++ function func (z) ++ real :: func ++ real, intent (in) :: z ++ end function func ++ end interface ++ ++ type Contains_f_ptr ++ procedure (func), pointer, nopass :: my_f_ptr ++ end type Contains_f_ptr ++contains ++ ++function f1 (x) ++ real :: f1 ++ real, intent (in) :: x ++ ++ f1 = 2.0 * x ++ ++ return ++end function f1 ++ ++function f2 (x) ++ real :: f2 ++ real, intent (in) :: x ++ ++ f2 = 3.0 * x**2 ++ ++ return ++end function f2 ++ ++function fancy (func, x) ++ real :: fancy ++ real, intent (in) :: x ++ ++ interface AFunc ++ function func (y) ++ real :: func ++ real, intent (in) ::y ++ end function func ++ end interface AFunc ++ ++ fancy = func (x) + 3.3 * x ++end function fancy ++ ++end module ExampleFuncs ++ ++ ++program test_proc_ptr ++ use ExampleFuncs ++ implicit none ++ ++ type (Contains_f_ptr), dimension (2) :: NewType ++ ++ !NewType(1) % my_f_ptr => f1 ++ NewType(2) % my_f_ptr => f2 ++ ++ !write (*, *) NewType(1) % my_f_ptr (3.0), NewType(2) % my_f_ptr (3.0) ++ write (6, *) NewType(2) % my_f_ptr (3.0) ! < Shall print '27.0' ++ ++ stop ++end program test_proc_ptr ++ ++! { dg-final { cleanup-modules "examplefuncs" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 2012-05-23 14:13:27.735982000 -0500 +@@ -0,0 +1,40 @@ ++! { dg-do run } ++! ++! PR fortran/53389 ++! ++! The program was leaking memory before due to ++! realloc on assignment and nested functions. ++! ++module foo ++ implicit none ++ contains ++ ++ function filler(array, val) ++ real, dimension(:), intent(in):: array ++ real, dimension(size(array)):: filler ++ real, intent(in):: val ++ ++ filler=val ++ ++ end function filler ++end module ++ ++program test ++ use foo ++ implicit none ++ ++ real, dimension(:), allocatable:: x, y ++ integer, parameter:: N=1000 !*1000 ++ integer:: i ++ ++! allocate( x(N) ) ++ allocate( y(N) ) ++ y=0.0 ++ ++ do i=1, N ++! print *,i ++ x=filler(filler(y, real(2*i)), real(i)) ++ y=y+x ++ end do ++ ++end program test +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/save_4.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/save_4.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/save_4.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/save_4.f90 2012-06-14 08:11:27.149798000 -0500 +@@ -0,0 +1,13 @@ ++! { dg-do compile } ++! { dg-options "-std=f2003" } ++! ++! PR fortran/53597 ++! ++MODULE somemodule ++ IMPLICIT NONE ++ TYPE sometype ++ INTEGER :: i ++ DOUBLE PRECISION, POINTER, DIMENSION(:,:) :: coef => NULL() ++ END TYPE sometype ++ TYPE(sometype) :: somevariable ! { dg-error "Fortran 2008: Implied SAVE for module variable 'somevariable' at .1., needed due to the default initialization" } ++END MODULE somemodule +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.adb gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.adb 2007-06-06 05:54:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + with System; + package body addr1 is + task type T is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.ads gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.ads 2007-06-06 05:54:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package addr1 is + pragma Elaborate_Body; + end; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.adb gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.adb 2011-09-11 14:00:13.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Atomic5 is + + function Create return R is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.ads gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.ads 2011-09-11 14:00:13.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + with Unchecked_Conversion; + + package Atomic5 is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr23.ads gcc-4.6.3/gcc/testsuite/gnat.dg/discr23.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr23.ads 2010-05-19 12:53:58.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr23.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr23 is + + procedure Dummy; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.adb gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.adb 2011-05-05 11:27:03.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Discr29 is + + procedure Proc (R : out Rec3) is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.ads gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.ads 2011-05-05 11:27:03.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr29 is + + type Rec1 is record +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/nested_float_packed.ads gcc-4.6.3/gcc/testsuite/gnat.dg/nested_float_packed.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/nested_float_packed.ads 2009-06-01 10:27:59.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/nested_float_packed.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Nested_Float_Packed is + + type Float_Type is record +@@ -20,5 +18,3 @@ + Data_Block : array (Range_Type) + of Data_Type := (others => Default_Data); + end; +- +- +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/oconst6.ads gcc-4.6.3/gcc/testsuite/gnat.dg/oconst6.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/oconst6.ads 2009-06-01 09:42:56.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/oconst6.ads 1969-12-31 18:00:00.000000000 -0600 +@@ -1,18 +0,0 @@ +--- { dg-do compile } +--- { dg-final { scan-assembler-not "elabs" } } +- +-package OCONST6 is +- +- type Sequence is array (1 .. 1) of Natural; +- +- type Message is record +- Data : Sequence; +- end record; +- +- for Message'Alignment use 1; +- pragma PACK (Message); +- +- ACK : Message := (Data => (others => 1)); +- +-end; +- +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/specs/oconst6.ads gcc-4.6.3/gcc/testsuite/gnat.dg/specs/oconst6.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/specs/oconst6.ads 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/specs/oconst6.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -0,0 +1,18 @@ ++-- { dg-do compile } ++-- { dg-final { scan-assembler-not "elabs" } } ++ ++package OCONST6 is ++ ++ type Sequence is array (1 .. 1) of Natural; ++ ++ type Message is record ++ Data : Sequence; ++ end record; ++ ++ for Message'Alignment use 1; ++ pragma PACK (Message); ++ ++ ACK : Message := (Data => (others => 1)); ++ ++end; ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/lib/target-supports.exp gcc-4.6.3/gcc/testsuite/lib/target-supports.exp +--- gcc-4.6.3.orig/gcc/testsuite/lib/target-supports.exp 2012-02-22 11:38:22.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/lib/target-supports.exp 2012-08-10 08:26:44.694722000 -0500 +@@ -2976,6 +2976,26 @@ + return $et_natural_alignment_64_saved + } + ++# Return 1 if all vector types are naturally aligned (aligned to their ++# type-size), 0 otherwise. ++# ++# This won't change for different subtargets so cache the result. ++ ++proc check_effective_target_vect_natural_alignment { } { ++ global et_vect_natural_alignment ++ ++ if [info exists et_vect_natural_alignment_saved] { ++ verbose "check_effective_target_vect_natural_alignment: using cached result" 2 ++ } else { ++ set et_vect_natural_alignment_saved 1 ++ if { [check_effective_target_arm_eabi] } { ++ set et_vect_natural_alignment_saved 0 ++ } ++ } ++ verbose "check_effective_target_vect_natural_alignment: returning $et_vect_natural_alignment_saved" 2 ++ return $et_vect_natural_alignment_saved ++} ++ + # Return 1 if vector alignment (for types of size 32 bit or less) is reachable, 0 otherwise. + # + # This won't change for different subtargets so cache the result. +diff -Naur gcc-4.6.3.orig/gcc/toplev.c gcc-4.6.3/gcc/toplev.c +--- gcc-4.6.3.orig/gcc/toplev.c 2011-02-03 02:29:03.000000000 -0600 ++++ gcc-4.6.3/gcc/toplev.c 2012-03-28 21:15:29.973365000 -0500 +@@ -1326,6 +1326,13 @@ + "and -ftree-loop-linear)"); + #endif + ++ if (flag_strict_volatile_bitfields > 0 && !abi_version_at_least (2)) ++ { ++ warning (0, "-fstrict-volatile-bitfields disabled; " ++ "it is incompatible with ABI versions < 2"); ++ flag_strict_volatile_bitfields = 0; ++ } ++ + /* Unrolling all loops implies that standard loop unrolling must also + be done. */ + if (flag_unroll_all_loops) +diff -Naur gcc-4.6.3.orig/gcc/tree-inline.c gcc-4.6.3/gcc/tree-inline.c +--- gcc-4.6.3.orig/gcc/tree-inline.c 2011-07-26 02:52:24.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-inline.c 2012-10-05 07:01:59.135703000 -0500 +@@ -3809,6 +3809,12 @@ + goto egress; + + if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) ++ /* For extern inline functions that get redefined we always ++ silently ignored always_inline flag. Better behaviour would ++ be to be able to keep both bodies and use extern inline body ++ for inlining, but we can't do that because frontends overwrite ++ the body. */ ++ && !cg_edge->callee->local.redefined_extern_inline + /* Avoid warnings during early inline pass. */ + && cgraph_global_info_ready) + { +@@ -4947,7 +4953,7 @@ + if ((e = cgraph_edge (id->dst_node, gsi_stmt (bsi))) != NULL) + { + if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ cgraph_remove_node_and_inline_clones (e->callee, id->dst_node); + else + cgraph_remove_edge (e); + } +@@ -4957,8 +4963,8 @@ + { + if ((e = cgraph_edge (node, gsi_stmt (bsi))) != NULL) + { +- if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ if (!e->inline_failed && e->callee != id->src_node) ++ cgraph_remove_node_and_inline_clones (e->callee, id->dst_node); + else + cgraph_remove_edge (e); + } +diff -Naur gcc-4.6.3.orig/gcc/tree-pretty-print.c gcc-4.6.3/gcc/tree-pretty-print.c +--- gcc-4.6.3.orig/gcc/tree-pretty-print.c 2010-11-05 04:00:50.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-pretty-print.c 2012-05-31 10:03:37.575990000 -0500 +@@ -805,6 +805,8 @@ + infer them and MEM_ATTR caching will share MEM_REFs + with differently-typed op0s. */ + && TREE_CODE (TREE_OPERAND (node, 0)) != INTEGER_CST ++ /* Released SSA_NAMES have no TREE_TYPE. */ ++ && TREE_TYPE (TREE_OPERAND (node, 0)) != NULL_TREE + /* Same pointer types, but ignoring POINTER_TYPE vs. + REFERENCE_TYPE. */ + && (TREE_TYPE (TREE_TYPE (TREE_OPERAND (node, 0))) +@@ -1171,6 +1173,8 @@ + can't infer them and MEM_ATTR caching will share + MEM_REFs with differently-typed op0s. */ + && TREE_CODE (TREE_OPERAND (op0, 0)) != INTEGER_CST ++ /* Released SSA_NAMES have no TREE_TYPE. */ ++ && TREE_TYPE (TREE_OPERAND (op0, 0)) != NULL_TREE + /* Same pointer types, but ignoring POINTER_TYPE vs. + REFERENCE_TYPE. */ + && (TREE_TYPE (TREE_TYPE (TREE_OPERAND (op0, 0))) +diff -Naur gcc-4.6.3.orig/gcc/tree-sra.c gcc-4.6.3/gcc/tree-sra.c +--- gcc-4.6.3.orig/gcc/tree-sra.c 2012-01-05 16:24:45.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-sra.c 2012-09-10 04:50:02.938856000 -0500 +@@ -910,7 +910,8 @@ + disqualify_base_of_expr (tree t, const char *reason) + { + t = get_base_address (t); +- if (sra_mode == SRA_MODE_EARLY_IPA ++ if (t ++ && sra_mode == SRA_MODE_EARLY_IPA + && TREE_CODE (t) == MEM_REF) + t = get_ssa_base_param (TREE_OPERAND (t, 0)); + +@@ -2937,7 +2938,13 @@ + } + else + { +- if (access_has_children_p (lacc) && access_has_children_p (racc)) ++ if (access_has_children_p (lacc) ++ && access_has_children_p (racc) ++ /* When an access represents an unscalarizable region, it usually ++ represents accesses with variable offset and thus must not be used ++ to generate new memory accesses. */ ++ && !lacc->grp_unscalarizable_region ++ && !racc->grp_unscalarizable_region) + { + gimple_stmt_iterator orig_gsi = *gsi; + enum unscalarized_data_handling refreshed; +diff -Naur gcc-4.6.3.orig/gcc/tree-ssa-ccp.c gcc-4.6.3/gcc/tree-ssa-ccp.c +--- gcc-4.6.3.orig/gcc/tree-ssa-ccp.c 2011-09-26 09:08:53.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-ssa-ccp.c 2012-07-04 08:56:00.524689000 -0500 +@@ -1364,6 +1364,10 @@ + if (!DECL_INITIAL (base) + && (TREE_STATIC (base) || DECL_EXTERNAL (base))) + return error_mark_node; ++ /* Do not return an error_mark_node DECL_INITIAL. LTO uses this ++ as special marker (_not_ zero ...) for its own purposes. */ ++ if (DECL_INITIAL (base) == error_mark_node) ++ return NULL_TREE; + return DECL_INITIAL (base); + + case ARRAY_REF: +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-data-refs.c gcc-4.6.3/gcc/tree-vect-data-refs.c +--- gcc-4.6.3.orig/gcc/tree-vect-data-refs.c 2011-12-12 13:43:06.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-vect-data-refs.c 2012-08-10 08:26:44.694722000 -0500 +@@ -1019,7 +1019,7 @@ + int misal = DR_MISALIGNMENT (dr); + tree vectype = STMT_VINFO_VECTYPE (stmt_info); + misal += negative ? -npeel * dr_size : npeel * dr_size; +- misal &= GET_MODE_SIZE (TYPE_MODE (vectype)) - 1; ++ misal &= (TYPE_ALIGN (vectype) / BITS_PER_UNIT) - 1; + SET_DR_MISALIGNMENT (dr, misal); + return; + } +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-loop.c gcc-4.6.3/gcc/tree-vect-loop.c +--- gcc-4.6.3.orig/gcc/tree-vect-loop.c 2011-06-04 04:20:00.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-vect-loop.c 2012-03-02 08:51:58.551861000 -0600 +@@ -2104,7 +2104,8 @@ + if (stmt_info + && !STMT_VINFO_RELEVANT_P (stmt_info) + && (!STMT_VINFO_LIVE_P (stmt_info) +- || STMT_VINFO_DEF_TYPE (stmt_info) != vect_reduction_def)) ++ || !VECTORIZABLE_CYCLE_DEF (STMT_VINFO_DEF_TYPE (stmt_info))) ++ && !STMT_VINFO_IN_PATTERN_P (stmt_info)) + continue; + + if (STMT_VINFO_DATA_REF (vinfo_for_stmt (stmt))) +@@ -2251,11 +2252,19 @@ + { + gimple stmt = gsi_stmt (si); + stmt_vec_info stmt_info = vinfo_for_stmt (stmt); ++ ++ if (STMT_VINFO_IN_PATTERN_P (stmt_info)) ++ { ++ stmt = STMT_VINFO_RELATED_STMT (stmt_info); ++ stmt_info = vinfo_for_stmt (stmt); ++ } ++ + /* Skip stmts that are not vectorized inside the loop. */ + if (!STMT_VINFO_RELEVANT_P (stmt_info) + && (!STMT_VINFO_LIVE_P (stmt_info) +- || STMT_VINFO_DEF_TYPE (stmt_info) != vect_reduction_def)) ++ || !VECTORIZABLE_CYCLE_DEF (STMT_VINFO_DEF_TYPE (stmt_info)))) + continue; ++ + vec_inside_cost += STMT_VINFO_INSIDE_OF_LOOP_COST (stmt_info) * factor; + /* FIXME: for stmts in the inner-loop in outer-loop vectorization, + some of the "outside" costs are generated inside the outer-loop. */ +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-loop-manip.c gcc-4.6.3/gcc/tree-vect-loop-manip.c +--- gcc-4.6.3.orig/gcc/tree-vect-loop-manip.c 2011-06-04 04:20:00.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-vect-loop-manip.c 2012-08-10 08:26:44.694722000 -0500 +@@ -2008,7 +2008,7 @@ + If the misalignment of DR is known at compile time: + addr_mis = int mis = DR_MISALIGNMENT (dr); + Else, compute address misalignment in bytes: +- addr_mis = addr & (vectype_size - 1) ++ addr_mis = addr & (vectype_align - 1) + + prolog_niters = min (LOOP_NITERS, ((VF - addr_mis/elem_size)&(VF-1))/step) + +@@ -2065,9 +2065,10 @@ + tree ptr_type = TREE_TYPE (start_addr); + tree size = TYPE_SIZE (ptr_type); + tree type = lang_hooks.types.type_for_size (tree_low_cst (size, 1), 1); +- tree vectype_size_minus_1 = build_int_cst (type, vectype_align - 1); +- tree elem_size_log = +- build_int_cst (type, exact_log2 (vectype_align/nelements)); ++ tree vectype_align_minus_1 = build_int_cst (type, vectype_align - 1); ++ HOST_WIDE_INT elem_size = ++ int_cst_value (TYPE_SIZE_UNIT (TREE_TYPE (vectype))); ++ tree elem_size_log = build_int_cst (type, exact_log2 (elem_size)); + tree nelements_minus_1 = build_int_cst (type, nelements - 1); + tree nelements_tree = build_int_cst (type, nelements); + tree byte_misalign; +@@ -2076,10 +2077,10 @@ + new_bb = gsi_insert_seq_on_edge_immediate (pe, new_stmts); + gcc_assert (!new_bb); + +- /* Create: byte_misalign = addr & (vectype_size - 1) */ ++ /* Create: byte_misalign = addr & (vectype_align - 1) */ + byte_misalign = + fold_build2 (BIT_AND_EXPR, type, fold_convert (type, start_addr), +- vectype_size_minus_1); ++ vectype_align_minus_1); + + /* Create: elem_misalign = byte_misalign / element_size */ + elem_misalign = +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-stmts.c gcc-4.6.3/gcc/tree-vect-stmts.c +--- gcc-4.6.3.orig/gcc/tree-vect-stmts.c 2012-02-10 06:34:17.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-vect-stmts.c 2012-03-02 08:51:58.551861000 -0600 +@@ -623,6 +623,46 @@ + } + + ++/* Model cost for type demotion and promotion operations. PWR is normally ++ zero for single-step promotions and demotions. It will be one if ++ two-step promotion/demotion is required, and so on. Each additional ++ step doubles the number of instructions required. */ ++ ++static void ++vect_model_promotion_demotion_cost (stmt_vec_info stmt_info, ++ enum vect_def_type *dt, int pwr) ++{ ++ int i, tmp; ++ int inside_cost = 0, outside_cost = 0, single_stmt_cost; ++ ++ /* The SLP costs were already calculated during SLP tree build. */ ++ if (PURE_SLP_STMT (stmt_info)) ++ return; ++ ++ single_stmt_cost = vect_get_stmt_cost (vec_promote_demote); ++ for (i = 0; i < pwr + 1; i++) ++ { ++ tmp = (STMT_VINFO_TYPE (stmt_info) == type_promotion_vec_info_type) ? ++ (i + 1) : i; ++ inside_cost += vect_pow2 (tmp) * single_stmt_cost; ++ } ++ ++ /* FORNOW: Assuming maximum 2 args per stmts. */ ++ for (i = 0; i < 2; i++) ++ { ++ if (dt[i] == vect_constant_def || dt[i] == vect_external_def) ++ outside_cost += vect_get_stmt_cost (vector_stmt); ++ } ++ ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, "vect_model_promotion_demotion_cost: inside_cost = %d, " ++ "outside_cost = %d .", inside_cost, outside_cost); ++ ++ /* Set the costs in STMT_INFO. */ ++ stmt_vinfo_set_inside_of_loop_cost (stmt_info, NULL, inside_cost); ++ stmt_vinfo_set_outside_of_loop_cost (stmt_info, NULL, outside_cost); ++} ++ + /* Function vect_cost_strided_group_size + + For strided load or store, return the group_size only if it is the first +@@ -691,7 +731,7 @@ + { + /* Uses a high and low interleave operation for each needed permute. */ + inside_cost = ncopies * exact_log2(group_size) * group_size +- * vect_get_stmt_cost (vector_stmt); ++ * vect_get_stmt_cost (vec_perm); + + if (vect_print_dump_info (REPORT_COST)) + fprintf (vect_dump, "vect_model_store_cost: strided group_size = %d .", +@@ -795,7 +835,7 @@ + { + /* Uses an even and odd extract operations for each needed permute. */ + inside_cost = ncopies * exact_log2(group_size) * group_size +- * vect_get_stmt_cost (vector_stmt); ++ * vect_get_stmt_cost (vec_perm); + + if (vect_print_dump_info (REPORT_COST)) + fprintf (vect_dump, "vect_model_load_cost: strided group_size = %d .", +@@ -855,7 +895,7 @@ + case dr_explicit_realign: + { + *inside_cost += ncopies * (2 * vect_get_stmt_cost (vector_load) +- + vect_get_stmt_cost (vector_stmt)); ++ + vect_get_stmt_cost (vec_perm)); + + /* FIXME: If the misalignment remains fixed across the iterations of + the containing loop, the following cost should be added to the +@@ -863,6 +903,9 @@ + if (targetm.vectorize.builtin_mask_for_load) + *inside_cost += vect_get_stmt_cost (vector_stmt); + ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, "vect_model_load_cost: explicit realign"); ++ + break; + } + case dr_explicit_realign_optimized: +@@ -886,7 +929,12 @@ + } + + *inside_cost += ncopies * (vect_get_stmt_cost (vector_load) +- + vect_get_stmt_cost (vector_stmt)); ++ + vect_get_stmt_cost (vec_perm)); ++ ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, ++ "vect_model_load_cost: explicit realign optimized"); ++ + break; + } + +@@ -2919,7 +2967,7 @@ + STMT_VINFO_TYPE (stmt_info) = type_demotion_vec_info_type; + if (vect_print_dump_info (REPORT_DETAILS)) + fprintf (vect_dump, "=== vectorizable_demotion ==="); +- vect_model_simple_cost (stmt_info, ncopies, dt, NULL); ++ vect_model_promotion_demotion_cost (stmt_info, dt, multi_step_cvt); + return true; + } + +@@ -3217,7 +3265,7 @@ + STMT_VINFO_TYPE (stmt_info) = type_promotion_vec_info_type; + if (vect_print_dump_info (REPORT_DETAILS)) + fprintf (vect_dump, "=== vectorizable_promotion ==="); +- vect_model_simple_cost (stmt_info, 2*ncopies, dt, NULL); ++ vect_model_promotion_demotion_cost (stmt_info, dt, multi_step_cvt); + return true; + } + +diff -Naur gcc-4.6.3.orig/gcc/varasm.c gcc-4.6.3/gcc/varasm.c +--- gcc-4.6.3.orig/gcc/varasm.c 2011-12-09 13:11:01.000000000 -0600 ++++ gcc-4.6.3/gcc/varasm.c 2012-04-24 01:14:37.854759000 -0500 +@@ -1,7 +1,7 @@ + /* Output variables, constants and external declarations, for GNU compiler. + Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +- 2010, 2011 Free Software Foundation, Inc. ++ 2010, 2011, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -30,6 +30,7 @@ + #include "config.h" + #include "system.h" + #include "coretypes.h" ++#include "pointer-set.h" + #include "tm.h" + #include "rtl.h" + #include "tree.h" +@@ -2097,6 +2098,19 @@ + it all the way to final. See PR 17982 for further discussion. */ + static GTY(()) tree pending_assemble_externals; + ++/* FIXME: Trunk is at GCC 4.8 now and the above problem still hasn't been ++ addressed properly. This caused PR 52640 due to O(external_decls**2) ++ lookups in the pending_assemble_externals TREE_LIST in assemble_external. ++ Paper over with this pointer set, which we use to see if we have already ++ added a decl to pending_assemble_externals without first traversing ++ the entire pending_assemble_externals list. See assemble_external(). */ ++static struct pointer_set_t *pending_assemble_externals_set; ++ ++/* Some targets delay some output to final using TARGET_ASM_FILE_END. ++ As a result, assemble_external can be called after the list of externals ++ is processed and the pointer set destroyed. */ ++static bool pending_assemble_externals_processed; ++ + #ifdef ASM_OUTPUT_EXTERNAL + /* True if DECL is a function decl for which no out-of-line copy exists. + It is assumed that DECL's assembler name has been set. */ +@@ -2146,6 +2160,8 @@ + assemble_external_real (TREE_VALUE (list)); + + pending_assemble_externals = 0; ++ pending_assemble_externals_processed = true; ++ pointer_set_destroy (pending_assemble_externals_set); + #endif + } + +@@ -2186,7 +2202,13 @@ + weak_decls = tree_cons (NULL, decl, weak_decls); + + #ifdef ASM_OUTPUT_EXTERNAL +- if (value_member (decl, pending_assemble_externals) == NULL_TREE) ++ if (pending_assemble_externals_processed) ++ { ++ assemble_external_real (decl); ++ return; ++ } ++ ++ if (! pointer_set_insert (pending_assemble_externals_set, decl)) + pending_assemble_externals = tree_cons (NULL, decl, + pending_assemble_externals); + #endif +@@ -3922,6 +3944,13 @@ + tem = TREE_OPERAND (tem, 0)) + ; + ++ if (TREE_CODE (tem) == MEM_REF ++ && TREE_CODE (TREE_OPERAND (tem, 0)) == ADDR_EXPR) ++ { ++ reloc = compute_reloc_for_constant (TREE_OPERAND (tem, 0)); ++ break; ++ } ++ + if (TREE_PUBLIC (tem)) + reloc |= 2; + else +@@ -3990,6 +4019,9 @@ + + if (CONSTANT_CLASS_P (tem) || TREE_CODE (tem) == CONSTRUCTOR) + output_constant_def (tem, 0); ++ ++ if (TREE_CODE (tem) == MEM_REF) ++ output_addressed_constants (TREE_OPERAND (tem, 0)); + break; + + case PLUS_EXPR: +@@ -6019,6 +6051,10 @@ + + if (readonly_data_section == NULL) + readonly_data_section = text_section; ++ ++#ifdef ASM_OUTPUT_EXTERNAL ++ pending_assemble_externals_set = pointer_set_create (); ++#endif + } + + enum tls_model +diff -Naur gcc-4.6.3.orig/gcc/version.c gcc-4.6.3/gcc/version.c +--- gcc-4.6.3.orig/gcc/version.c 2009-04-21 14:03:23.000000000 -0500 ++++ gcc-4.6.3/gcc/version.c 2012-11-05 15:59:56.218466326 -0600 +@@ -33,4 +33,4 @@ + Makefile. */ + + const char version_string[] = BASEVER DATESTAMP DEVPHASE REVISION; +-const char pkgversion_string[] = PKGVERSION; ++const char pkgversion_string[] = "(GCC for Cross-LFS 4.6.3.20121105) "; +diff -Naur gcc-4.6.3.orig/libffi/configure.ac gcc-4.6.3/libffi/configure.ac +--- gcc-4.6.3.orig/libffi/configure.ac 2012-02-10 10:45:53.000000000 -0600 ++++ gcc-4.6.3/libffi/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -12,7 +12,7 @@ + + . ${srcdir}/configure.host + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([no-dist]) + + # The same as in boehm-gc and libstdc++. Have to borrow it from there. + # We must force CC to /not/ be precious variables; otherwise +diff -Naur gcc-4.6.3.orig/libffi/include/Makefile.in gcc-4.6.3/libffi/include/Makefile.in +--- gcc-4.6.3.orig/libffi/include/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/include/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ffi.h.in $(toollibffi_HEADERS) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +@@ -54,7 +54,6 @@ + CONFIG_CLEAN_FILES = ffi.h ffitarget.h + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -80,7 +79,6 @@ + HEADERS = $(toollibffi_HEADERS) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -329,37 +327,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(HEADERS) +@@ -463,17 +430,16 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip \ +- install-toollibffiHEADERS installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags uninstall uninstall-am \ +- uninstall-toollibffiHEADERS ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip install-toollibffiHEADERS \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-toollibffiHEADERS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libffi/Makefile.in gcc-4.6.3/libffi/Makefile.in +--- gcc-4.6.3.orig/libffi/Makefile.in 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/libffi/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -61,13 +61,10 @@ + @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c + @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ +- $(srcdir)/../config.guess $(srcdir)/../config.sub \ +- $(srcdir)/../depcomp $(srcdir)/../install-sh \ +- $(srcdir)/../ltmain.sh $(srcdir)/../missing \ +- $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/fficonfig.h.in \ +- $(top_srcdir)/configure ChangeLog ++DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ ++ $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(srcdir)/fficonfig.h.in \ ++ $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -201,7 +198,6 @@ + SOURCES = $(libffi_la_SOURCES) $(nodist_libffi_la_SOURCES) \ + $(libffi_convenience_la_SOURCES) \ + $(nodist_libffi_convenience_la_SOURCES) +-DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -218,47 +214,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -1184,182 +1143,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile $(LTLIBRARIES) all-multi fficonfig.h +@@ -1510,18 +1293,15 @@ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi \ + clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-multi distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install 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-multi install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- install-toolexeclibLTLIBRARIES installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-multi distclean-tags \ ++ dvi dvi-am html html-am info info-am install 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-multi \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-toolexeclibLTLIBRARIES installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-multi mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \ +diff -Naur gcc-4.6.3.orig/libffi/man/Makefile.in gcc-4.6.3/libffi/man/Makefile.in +--- gcc-4.6.3.orig/libffi/man/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/man/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = man +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -52,7 +52,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -78,7 +77,6 @@ + am__installdirs = "$(DESTDIR)$(man3dir)" + NROFF = nroff + MANS = $(man_MANS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -292,50 +290,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(MANS) +@@ -439,16 +393,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-man3 \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-man uninstall-man3 ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-man3 install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-man uninstall-man3 + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libffi/src/powerpc/aix_closure.S gcc-4.6.3/libffi/src/powerpc/aix_closure.S +--- gcc-4.6.3.orig/libffi/src/powerpc/aix_closure.S 2009-12-07 18:41:10.000000000 -0600 ++++ gcc-4.6.3/libffi/src/powerpc/aix_closure.S 2012-03-22 09:35:34.814561000 -0500 +@@ -79,6 +79,8 @@ + .set f20,20 + .set f21,21 + ++ .extern .ffi_closure_helper_DARWIN ++ + #define LIBFFI_ASM + #define JUMPTARGET(name) name + #define L(x) x +@@ -165,6 +167,7 @@ + + /* look up the proper starting point in table */ + /* by using return type as offset */ ++ lhz r3, 10(r3) /* load type from return type */ + ld r4, LC..60(2) /* get address of jump table */ + sldi r3, r3, 4 /* now multiply return type by 16 */ + ld r0, 240+16(r1) /* load return address */ +@@ -337,8 +340,9 @@ + + /* look up the proper starting point in table */ + /* by using return type as offset */ ++ lhz r3, 6(r3) /* load type from return type */ + lwz r4, LC..60(2) /* get address of jump table */ +- slwi r3, r3, 4 /* now multiply return type by 4 */ ++ slwi r3, r3, 4 /* now multiply return type by 16 */ + lwz r0, 176+8(r1) /* load return address */ + add r3, r3, r4 /* add contents of table to table address */ + mtctr r3 +diff -Naur gcc-4.6.3.orig/libffi/src/powerpc/aix.S gcc-4.6.3/libffi/src/powerpc/aix.S +--- gcc-4.6.3.orig/libffi/src/powerpc/aix.S 2009-12-05 15:48:58.000000000 -0600 ++++ gcc-4.6.3/libffi/src/powerpc/aix.S 2012-03-22 09:35:34.814561000 -0500 +@@ -1,5 +1,5 @@ + /* ----------------------------------------------------------------------- +- aix.S - Copyright (c) 2002,2009 Free Software Foundation, Inc. ++ aix.S - Copyright (c) 2002, 2009 Free Software Foundation, Inc. + based on darwin.S by John Hornkvist + + PowerPC Assembly glue. +@@ -79,6 +79,8 @@ + .set f20,20 + .set f21,21 + ++ .extern .ffi_prep_args ++ + #define LIBFFI_ASM + #include <fficonfig.h> + #include <ffi.h> +@@ -125,6 +127,7 @@ + /* Call ffi_prep_args. */ + mr r4, r1 + bl .ffi_prep_args ++ nop + + /* Now do the call. */ + ld r0, 0(r29) +@@ -226,6 +229,7 @@ + /* Call ffi_prep_args. */ + mr r4, r1 + bl .ffi_prep_args ++ nop + + /* Now do the call. */ + lwz r0, 0(r29) +diff -Naur gcc-4.6.3.orig/libffi/testsuite/Makefile.in gcc-4.6.3/libffi/testsuite/Makefile.in +--- gcc-4.6.3.orig/libffi/testsuite/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/testsuite/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -52,10 +52,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -278,37 +276,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -410,8 +377,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libgfortran/intrinsics/eoshift2.c gcc-4.6.3/libgfortran/intrinsics/eoshift2.c +--- gcc-4.6.3.orig/libgfortran/intrinsics/eoshift2.c 2009-07-19 10:07:21.000000000 -0500 ++++ gcc-4.6.3/libgfortran/intrinsics/eoshift2.c 2012-05-11 17:33:21.046165000 -0500 +@@ -77,6 +77,12 @@ + + ret->offset = 0; + ret->dtype = array->dtype; ++ ++ if (arraysize > 0) ++ ret->data = internal_malloc_size (size * arraysize); ++ else ++ ret->data = internal_malloc_size (1); ++ + for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) + { + index_type ub, str; +@@ -90,12 +96,6 @@ + * GFC_DESCRIPTOR_STRIDE(ret,i-1); + + GFC_DIMENSION_SET(ret->dim[i], 0, ub, str); +- +- if (arraysize > 0) +- ret->data = internal_malloc_size (size * arraysize); +- else +- ret->data = internal_malloc_size (1); +- + } + } + else if (unlikely (compile_options.bounds_check)) +diff -Naur gcc-4.6.3.orig/libgfortran/runtime/environ.c gcc-4.6.3/libgfortran/runtime/environ.c +--- gcc-4.6.3.orig/libgfortran/runtime/environ.c 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libgfortran/runtime/environ.c 2012-10-21 08:43:32.465342000 -0500 +@@ -453,21 +453,35 @@ + { + int low, high, mid; + +- low = -1; +- high = n_elist; +- while (high - low > 1) ++ if (n_elist == 0) ++ { ++ *ip = 0; ++ return 0; ++ } ++ ++ low = 0; ++ high = n_elist - 1; ++ ++ do + { + mid = (low + high) / 2; +- if (unit <= elist[mid].unit) +- high = mid; ++ if (unit == elist[mid].unit) ++ { ++ *ip = mid; ++ return 1; ++ } ++ else if (unit > elist[mid].unit) ++ low = mid + 1; + else +- low = mid; +- } +- *ip = high; +- if (elist[high].unit == unit) +- return 1; ++ high = mid - 1; ++ } while (low <= high); ++ ++ if (unit > elist[mid].unit) ++ *ip = mid + 1; + else +- return 0; ++ *ip = mid; ++ ++ return 0; + } + + /* This matches a keyword. If it is found, return the token supplied, +@@ -582,13 +596,13 @@ + } + if (search_unit (unit, &i)) + { +- elist[unit].conv = endian; ++ elist[i].conv = endian; + } + else + { +- for (j=n_elist; j>=i; j--) ++ for (j=n_elist-1; j>=i; j--) + elist[j+1] = elist[j]; +- ++ + n_elist += 1; + elist[i].unit = unit; + elist[i].conv = endian; +diff -Naur gcc-4.6.3.orig/libgo/configure.ac gcc-4.6.3/libgo/configure.ac +--- gcc-4.6.3.orig/libgo/configure.ac 2011-02-20 22:17:20.000000000 -0600 ++++ gcc-4.6.3/libgo/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -19,7 +19,7 @@ + AC_CANONICAL_SYSTEM + target_alias=${target_alias-$host_alias} + +-AM_INIT_AUTOMAKE([1.9.3 no-define foreign -Wall]) ++AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dist -Wall]) + AH_TEMPLATE(PACKAGE, [Name of package]) + AH_TEMPLATE(VERSION, [Version number of package]) + +diff -Naur gcc-4.6.3.orig/libgo/Makefile.in gcc-4.6.3/libgo/Makefile.in +--- gcc-4.6.3.orig/libgo/Makefile.in 2011-03-10 19:00:15.000000000 -0600 ++++ gcc-4.6.3/libgo/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -46,12 +46,10 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ +- $(srcdir)/../config.sub $(srcdir)/../depcomp \ +- $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ +- $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/config.h.in $(top_srcdir)/configure ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ++ $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -162,52 +160,6 @@ + libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \ +- runtime/go-assert-interface.c \ +- runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \ +- runtime/go-caller.c runtime/go-can-convert-interface.c \ +- runtime/go-cgo.c runtime/go-chan-cap.c runtime/go-chan-len.c \ +- runtime/go-check-interface.c runtime/go-close.c \ +- runtime/go-closed.c runtime/go-construct-map.c \ +- runtime/go-convert-interface.c runtime/go-copy.c \ +- runtime/go-defer.c runtime/go-deferred-recover.c \ +- runtime/go-eface-compare.c runtime/go-eface-val-compare.c \ +- runtime/go-getgoroot.c runtime/go-go.c runtime/go-gomaxprocs.c \ +- runtime/go-int-array-to-string.c runtime/go-int-to-string.c \ +- runtime/go-interface-compare.c \ +- runtime/go-interface-eface-compare.c \ +- runtime/go-interface-val-compare.c runtime/go-lock-os-thread.c \ +- runtime/go-map-delete.c runtime/go-map-index.c \ +- runtime/go-map-len.c runtime/go-map-range.c \ +- runtime/go-nanotime.c runtime/go-new-channel.c \ +- runtime/go-new-map.c runtime/go-new.c runtime/go-note.c \ +- runtime/go-panic.c runtime/go-panic-defer.c runtime/go-print.c \ +- runtime/go-rec-big.c runtime/go-rec-nb-big.c \ +- runtime/go-rec-nb-small.c runtime/go-rec-small.c \ +- runtime/go-recover.c runtime/go-reflect.c \ +- runtime/go-reflect-call.c runtime/go-reflect-chan.c \ +- runtime/go-reflect-map.c runtime/go-rune.c \ +- runtime/go-runtime-error.c runtime/go-sched.c \ +- runtime/go-select.c runtime/go-semacquire.c \ +- runtime/go-send-big.c runtime/go-send-nb-big.c \ +- runtime/go-send-nb-small.c runtime/go-send-small.c \ +- runtime/go-signal.c runtime/go-strcmp.c \ +- runtime/go-string-to-byte-array.c \ +- runtime/go-string-to-int-array.c runtime/go-strplus.c \ +- runtime/go-strslice.c runtime/go-trampoline.c \ +- runtime/go-type-eface.c runtime/go-type-error.c \ +- runtime/go-type-identity.c runtime/go-type-interface.c \ +- runtime/go-type-string.c runtime/go-typedesc-equal.c \ +- runtime/go-typestring.c runtime/go-unreflect.c \ +- runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \ +- runtime/go-unsafe-pointer.c runtime/go-unwind.c \ +- runtime/mcache.c runtime/mcentral.c \ +- runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \ +- runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \ +- runtime/mheapmap32.c runtime/mheapmap64.c runtime/msize.c \ +- runtime/proc.c runtime/thread.c \ +- runtime/rtems-task-variable-add.c chan.c iface.c malloc.c \ +- map.c mprof.c reflect.c sigqueue.c string.c + @HAVE_SYS_MMAN_H_FALSE@am__objects_1 = mem_posix_memalign.lo + @HAVE_SYS_MMAN_H_TRUE@am__objects_1 = mem.lo + @LIBGO_IS_RTEMS_TRUE@am__objects_2 = rtems-task-variable-add.lo +@@ -256,7 +208,6 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgobegin_a_SOURCES) $(libgo_la_SOURCES) +-DIST_SOURCES = $(libgobegin_a_SOURCES) $(am__libgo_la_SOURCES_DIST) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -284,47 +235,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = testsuite +-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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -3416,182 +3330,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \ +@@ -3743,18 +3481,16 @@ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-local clean-multi \ + clean-toolexeclibLIBRARIES clean-toolexeclibLTLIBRARIES ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-multi distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install 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-multi install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- install-toolexeclibLIBRARIES install-toolexeclibLTLIBRARIES \ +- install-toolexeclibgoDATA install-toolexeclibgoarchiveDATA \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-multi distclean-tags \ ++ dvi dvi-am html html-am info info-am install 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-multi \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-toolexeclibLIBRARIES \ ++ install-toolexeclibLTLIBRARIES install-toolexeclibgoDATA \ ++ install-toolexeclibgoarchiveDATA \ + install-toolexeclibgocompressDATA \ + install-toolexeclibgocontainerDATA \ + install-toolexeclibgocryptoDATA \ +diff -Naur gcc-4.6.3.orig/libgo/testsuite/Makefile.in gcc-4.6.3/libgo/testsuite/Makefile.in +--- gcc-4.6.3.orig/libgo/testsuite/Makefile.in 2011-01-24 17:42:22.000000000 -0600 ++++ gcc-4.6.3/libgo/testsuite/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -54,10 +54,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -298,37 +296,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -430,8 +397,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/configure.ac gcc-4.6.3/libjava/classpath/configure.ac +--- gcc-4.6.3.orig/libjava/classpath/configure.ac 2011-01-30 23:34:09.000000000 -0600 ++++ gcc-4.6.3/libjava/classpath/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -75,7 +75,7 @@ + AC_SUBST(CLASSPATH_CONVENIENCE) + + AC_PREREQ(2.64) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability]) + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + +diff -Naur gcc-4.6.3.orig/libjava/classpath/doc/api/Makefile.in gcc-4.6.3/libjava/classpath/doc/api/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/doc/api/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/doc/api/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc/api +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,9 +69,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -330,37 +328,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -459,16 +426,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-data-local \ +- 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-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local 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-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + @CREATE_API_DOCS_TRUE@install-data-local: +diff -Naur gcc-4.6.3.orig/libjava/classpath/doc/Makefile.in gcc-4.6.3/libjava/classpath/doc/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/doc/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/doc/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + INFO_DEPS = cp-tools.info + am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include + DVIS = cp-tools.dvi +@@ -116,37 +115,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -756,81 +728,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-info + check-am: all-am + check: check-recursive + all-am: Makefile $(INFO_DEPS) $(MANS) all-local +@@ -1020,18 +917,18 @@ + all all-am all-local check check-am clean clean-aminfo \ + clean-generic clean-libtool ctags ctags-recursive dist-info \ + distclean distclean-generic distclean-libtool distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- 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-man1 install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ +- maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ +- mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-dvi-am uninstall-html-am uninstall-info-am \ +- uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am ++ dvi dvi-am html html-am info info-am install 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-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-aminfo \ ++ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-dvi-am \ ++ uninstall-html-am uninstall-info-am uninstall-man \ ++ uninstall-man1 uninstall-pdf-am uninstall-ps-am + + + .texinfo.dvi: +diff -Naur gcc-4.6.3.orig/libjava/classpath/examples/Makefile.in gcc-4.6.3/libjava/classpath/examples/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/examples/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/examples/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,8 +36,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = examples +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.java2d.in $(srcdir)/Makefile.jawt.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.jawt.in $(srcdir)/Makefile.java2d.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -70,7 +70,6 @@ + CONFIG_CLEAN_FILES = Makefile.jawt Makefile.java2d + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -94,7 +93,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(exampledir)" + DATA = $(example_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -419,40 +417,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -557,17 +521,17 @@ + .MAKE: all check install install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-exampleDATA install-exec 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 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-exampleDATA uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exampleDATA install-exec \ ++ 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 install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-exampleDATA uninstall-local + + + # Make sure all sources and icons are also installed so users can use them. +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/jsr166/Makefile.in gcc-4.6.3/libjava/classpath/external/jsr166/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/jsr166/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/jsr166/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/jsr166 +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -398,37 +396,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -527,13 +494,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/Makefile.in gcc-4.6.3/libjava/classpath/external/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,37 +78,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,65 +468,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -657,13 +570,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/relaxngDatatype/Makefile.in gcc-4.6.3/libjava/classpath/external/relaxngDatatype/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/relaxngDatatype/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/relaxngDatatype/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/relaxngDatatype +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -338,37 +336,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -467,13 +434,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/sax/Makefile.in gcc-4.6.3/libjava/classpath/external/sax/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/sax/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/sax/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/sax +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -366,37 +364,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -495,13 +462,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/w3c_dom/Makefile.in gcc-4.6.3/libjava/classpath/external/w3c_dom/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/w3c_dom/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/w3c_dom/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/w3c_dom +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -473,37 +471,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -602,13 +569,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/include/Makefile.in gcc-4.6.3/libjava/classpath/include/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/include/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/include/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.h.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -500,37 +498,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + @CREATE_JNI_HEADERS_FALSE@all-local: +@@ -632,8 +599,8 @@ + + .PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-hdr \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/lib/Makefile.in gcc-4.6.3/libjava/classpath/lib/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/lib/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/lib/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,9 +36,9 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \ +- $(srcdir)/mkcollections.pl.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/mkcollections.pl.in $(srcdir)/gen-classlist.sh.in \ ++ $(srcdir)/copy-vmresources.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -72,9 +72,7 @@ + copy-vmresources.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -356,40 +354,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -492,17 +456,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local 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-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + sinclude $(JAVA_DEPEND) +diff -Naur gcc-4.6.3.orig/libjava/classpath/Makefile.in gcc-4.6.3/libjava/classpath/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,25 +35,15 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \ +- $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ +- $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \ +- $(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(top_srcdir)/configure \ ++DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ ++ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/../../mkinstalldirs \ + $(top_srcdir)/gnu/classpath/Configuration.java.in \ + $(top_srcdir)/gnu/java/security/Configuration.java.in \ + $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \ + $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \ +- $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \ +- ../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \ +- ../../ChangeLog ../../README ../../compile ../../config.guess \ +- ../../config.rpath ../../config.sub ../../depcomp \ +- ../../install-sh ../../ltmain.sh ../../missing \ +- ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \ +- INSTALL NEWS TODO compile config.guess config.rpath config.sub \ +- depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ +- ltmain.sh missing mkinstalldirs ++ $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -92,7 +82,6 @@ + resource/META-INF/services/javax.sound.sampled.spi.MixerProvider + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -109,46 +98,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + 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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -582,185 +534,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile all-multi +@@ -869,20 +642,17 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi ctags ctags-recursive \ +- dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-generic distclean-libtool distclean-multi \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install 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-multi \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-multi mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \ +- tags-recursive uninstall uninstall-am ++ distclean distclean-generic distclean-libtool distclean-multi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-multi install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-multi mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + + + native: lib +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/fdlibm/Makefile.in gcc-4.6.3/libjava/classpath/native/fdlibm/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/fdlibm/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/fdlibm/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/fdlibm +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -95,10 +95,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libfdlibm_la_SOURCES) +-DIST_SOURCES = $(libfdlibm_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -553,37 +551,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -689,8 +656,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jawt/Makefile.in gcc-4.6.3/libjava/classpath/native/jawt/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jawt/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jawt/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jawt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjawt_la_SOURCES) +-DIST_SOURCES = $(libjawt_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -492,37 +490,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -631,8 +598,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/classpath/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/classpath/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/classpath/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/classpath/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/classpath +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspath_la_SOURCES) +-DIST_SOURCES = $(libclasspath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -445,37 +443,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -581,8 +548,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gconf-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gconf-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gconf-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gconf-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gconf-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgconfpeer_la_SOURCES) +-DIST_SOURCES = $(libgconfpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -489,37 +487,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -628,8 +595,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gstreamer-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gstreamer-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gstreamer-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gstreamer-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gstreamer-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgstreamerpeer_la_SOURCES) +-DIST_SOURCES = $(libgstreamerpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -514,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -653,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gtk-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gtk-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gtk-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gtk-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gtk-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -150,10 +150,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgtkpeer_la_SOURCES) +-DIST_SOURCES = $(libgtkpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -620,37 +618,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -759,8 +726,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-io/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-io/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-io/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-io/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-io +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -111,10 +111,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavaio_la_SOURCES) +-DIST_SOURCES = $(libjavaio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -494,37 +492,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -633,8 +600,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-lang/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-lang/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-lang/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-lang/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-lang +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -123,12 +123,8 @@ + SOURCES = $(libjavalang_la_SOURCES) \ + $(libjavalangmanagement_la_SOURCES) \ + $(libjavalangreflect_la_SOURCES) +-DIST_SOURCES = $(libjavalang_la_SOURCES) \ +- $(libjavalangmanagement_la_SOURCES) \ +- $(libjavalangreflect_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -521,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -660,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-math/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-math/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-math/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-math/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-math +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavamath_la_SOURCES) +-DIST_SOURCES = $(libjavamath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -487,37 +485,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -626,8 +593,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-net/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-net/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-net/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-net/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-net +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,10 +96,6 @@ + $(top_builddir)/native/jni/classpath/jcl.lo \ + $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ + $(am__DEPENDENCIES_1) +-am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \ +- java_net_VMInetAddress.c java_net_VMNetworkInterface.c \ +- java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \ +- gnu_java_net_local_LocalSocketImpl.c local.c local.h + @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo + @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \ + @ENABLE_LOCAL_SOCKETS_TRUE@ local.lo +@@ -121,10 +117,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanet_la_SOURCES) +-DIST_SOURCES = $(am__libjavanet_la_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -518,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -657,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-nio/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-nio/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-nio/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-nio/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-nio +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -119,10 +119,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanio_la_SOURCES) +-DIST_SOURCES = $(libjavanio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -519,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -658,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-util/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-util/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-util/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-util/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-util +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -108,10 +108,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavautil_la_SOURCES) +-DIST_SOURCES = $(libjavautil_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -483,37 +481,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -622,8 +589,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -510,65 +482,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile all-local +@@ -671,16 +584,16 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive distclean \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am ++ distclean-generic distclean-libtool distclean-tags dvi dvi-am \ ++ html html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + + all-local: +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/midi-alsa/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/midi-alsa/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/midi-alsa/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/midi-alsa/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-alsa +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmalsa_la_SOURCES) +-DIST_SOURCES = $(libgjsmalsa_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/midi-dssi/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/midi-dssi/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/midi-dssi/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/midi-dssi/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-dssi +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmdssi_la_SOURCES) +-DIST_SOURCES = $(libgjsmdssi_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/native-lib/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/native-lib/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/native-lib/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/native-lib/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/native-lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspathnative_la_SOURCES) +-DIST_SOURCES = $(libclasspathnative_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -448,37 +446,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -584,8 +551,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/qt-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/qt-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/qt-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/qt-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -39,7 +39,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/qt-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -116,10 +116,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES) +-DIST_SOURCES = $(libqtpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -577,37 +575,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -717,8 +684,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/xmlj/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/xmlj/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/xmlj/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/xmlj/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/xmlj +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -110,10 +110,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libxmlj_la_SOURCES) +-DIST_SOURCES = $(libxmlj_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -511,37 +509,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -650,8 +617,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/Makefile.in gcc-4.6.3/libjava/classpath/native/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -498,65 +470,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -659,13 +572,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/plugin/Makefile.in gcc-4.6.3/libjava/classpath/native/plugin/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/plugin/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/plugin/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/plugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgcjwebplugin_la_SOURCES) +-DIST_SOURCES = $(libgcjwebplugin_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -497,37 +495,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -636,8 +603,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/resource/Makefile.in gcc-4.6.3/libjava/classpath/resource/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/resource/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/resource/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = resource +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,7 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -93,7 +92,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)" + DATA = $(logging_DATA) $(security_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -393,37 +391,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -525,17 +492,17 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-loggingDATA install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-securityDATA install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-loggingDATA uninstall-securityDATA ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-loggingDATA install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-securityDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-loggingDATA \ ++ uninstall-securityDATA + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libjava/classpath/scripts/Makefile.in gcc-4.6.3/libjava/classpath/scripts/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/scripts/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/scripts/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,8 +35,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = scripts +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/check_jni_methods.sh.in $(srcdir)/classpath.spec.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/classpath.spec.in $(srcdir)/check_jni_methods.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = classpath.spec check_jni_methods.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -331,37 +329,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -460,13 +427,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/tools/Makefile.in gcc-4.6.3/libjava/classpath/tools/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/tools/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/tools/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -44,13 +44,13 @@ + @CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@ $(am__EXEEXT_2) + @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc + subdir = tools +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/gappletviewer.in $(srcdir)/gjar.in \ +- $(srcdir)/gjarsigner.in $(srcdir)/gjavah.in $(srcdir)/gjdoc.in \ +- $(srcdir)/gkeytool.in $(srcdir)/gnative2ascii.in \ +- $(srcdir)/gorbd.in $(srcdir)/grmic.in $(srcdir)/grmid.in \ +- $(srcdir)/grmiregistry.in $(srcdir)/gserialver.in \ +- $(srcdir)/gtnameserv.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/gappletviewer.in $(srcdir)/gjarsigner.in \ ++ $(srcdir)/gkeytool.in $(srcdir)/gjar.in \ ++ $(srcdir)/gnative2ascii.in $(srcdir)/gserialver.in \ ++ $(srcdir)/grmiregistry.in $(srcdir)/gtnameserv.in \ ++ $(srcdir)/gorbd.in $(srcdir)/grmid.in $(srcdir)/grmic.in \ ++ $(srcdir)/gjavah.in $(srcdir)/gjdoc.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,7 +96,6 @@ + @CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1) + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +-am__gappletviewer_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT) + gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS) +@@ -104,14 +103,12 @@ + gappletviewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gappletviewer_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjar_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjar_OBJECTS = gjar-toolwrapper.$(OBJEXT) + gjar_OBJECTS = $(am_gjar_OBJECTS) + gjar_LDADD = $(LDADD) + gjar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjarsigner_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjarsigner-toolwrapper.$(OBJEXT) + gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) +@@ -119,7 +116,6 @@ + gjarsigner_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjarsigner_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjavah_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjavah_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjavah-toolwrapper.$(OBJEXT) + gjavah_OBJECTS = $(am_gjavah_OBJECTS) +@@ -127,14 +123,12 @@ + gjavah_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjavah_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjdoc_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjdoc_OBJECTS = gjdoc-toolwrapper.$(OBJEXT) + gjdoc_OBJECTS = $(am_gjdoc_OBJECTS) + gjdoc_LDADD = $(LDADD) + gjdoc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjdoc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gkeytool_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gkeytool-toolwrapper.$(OBJEXT) + gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) +@@ -142,7 +136,6 @@ + gkeytool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gkeytool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gnative2ascii_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gnative2ascii_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gnative2ascii-toolwrapper.$(OBJEXT) + gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS) +@@ -150,28 +143,24 @@ + gnative2ascii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gnative2ascii_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gorbd_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gorbd_OBJECTS = gorbd-toolwrapper.$(OBJEXT) + gorbd_OBJECTS = $(am_gorbd_OBJECTS) + gorbd_LDADD = $(LDADD) + gorbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gorbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmic_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmic_OBJECTS = grmic-toolwrapper.$(OBJEXT) + grmic_OBJECTS = $(am_grmic_OBJECTS) + grmic_LDADD = $(LDADD) + grmic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmic_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmid_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmid_OBJECTS = grmid-toolwrapper.$(OBJEXT) + grmid_OBJECTS = $(am_grmid_OBJECTS) + grmid_LDADD = $(LDADD) + grmid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmiregistry_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmiregistry_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ grmiregistry-toolwrapper.$(OBJEXT) + grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS) +@@ -179,7 +168,6 @@ + grmiregistry_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(grmiregistry_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gserialver_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gserialver_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gserialver-toolwrapper.$(OBJEXT) + gserialver_OBJECTS = $(am_gserialver_OBJECTS) +@@ -187,7 +175,6 @@ + gserialver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gserialver_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gtnameserv_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gtnameserv_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gtnameserv-toolwrapper.$(OBJEXT) + gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS) +@@ -235,17 +222,9 @@ + $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \ + $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \ + $(gserialver_SOURCES) $(gtnameserv_SOURCES) +-DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \ +- $(am__gjar_SOURCES_DIST) $(am__gjarsigner_SOURCES_DIST) \ +- $(am__gjavah_SOURCES_DIST) $(am__gjdoc_SOURCES_DIST) \ +- $(am__gkeytool_SOURCES_DIST) $(am__gnative2ascii_SOURCES_DIST) \ +- $(am__gorbd_SOURCES_DIST) $(am__grmic_SOURCES_DIST) \ +- $(am__grmid_SOURCES_DIST) $(am__grmiregistry_SOURCES_DIST) \ +- $(am__gserialver_SOURCES_DIST) $(am__gtnameserv_SOURCES_DIST) + DATA = $(noinst_DATA) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -1199,40 +1178,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -1343,9 +1288,9 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ +- ctags dist-hook distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-binPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-binPROGRAMS \ + install-binSCRIPTS 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 \ +diff -Naur gcc-4.6.3.orig/libjava/configure gcc-4.6.3/libjava/configure +--- gcc-4.6.3.orig/libjava/configure 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/libjava/configure 2012-03-02 12:21:41.598223000 -0600 +@@ -19775,14 +19775,9 @@ + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi + ;; +- *-*-darwin9*) ++ *-*-darwin[912]*) + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" + ;; +- *-*-darwin[12]*) +- # Something is incompatible with pie, would be nice to fix it and +- # remove -no_pie. PR49461 +- SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" +- ;; + *) + SYSTEMSPEC= + ;; +diff -Naur gcc-4.6.3.orig/libjava/configure.ac gcc-4.6.3/libjava/configure.ac +--- gcc-4.6.3.orig/libjava/configure.ac 2012-02-03 04:35:06.000000000 -0600 ++++ gcc-4.6.3/libjava/configure.ac 2012-03-02 12:21:41.598223000 -0600 +@@ -886,14 +886,9 @@ + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi + ;; +- *-*-darwin9*) ++ *-*-darwin[[912]]*) + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" + ;; +- *-*-darwin[[12]]*) +- # Something is incompatible with pie, would be nice to fix it and +- # remove -no_pie. PR49461 +- SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" +- ;; + *) + SYSTEMSPEC= + ;; +diff -Naur gcc-4.6.3.orig/libquadmath/libquadmath.info gcc-4.6.3/libquadmath/libquadmath.info +--- gcc-4.6.3.orig/libquadmath/libquadmath.info 2012-03-01 06:41:20.000000000 -0600 ++++ gcc-4.6.3/libquadmath/libquadmath.info 1969-12-31 18:00:00.000000000 -0600 +@@ -1,924 +0,0 @@ +-This is libquadmath.info, produced by makeinfo version 4.13 from +-/d//gcc-4.6.3/gcc-4.6.3/libquadmath/libquadmath.texi. +- +-Copyright (C) 2010 Free Software Foundation, Inc. +- +- Permission is granted to copy, distribute and/or modify this +- document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover Texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have the freedom to copy +- and modify this GNU manual. +- +-INFO-DIR-SECTION GNU Libraries +-START-INFO-DIR-ENTRY +-* libquadmath: (libquadmath). GCC Quad-Precision Math Library +-END-INFO-DIR-ENTRY +- +- This manual documents the GCC Quad-Precision Math Library API. +- +- Published by the Free Software Foundation 51 Franklin Street, Fifth +-Floor Boston, MA 02110-1301 USA +- +- Copyright (C) 2010 Free Software Foundation, Inc. +- +- Permission is granted to copy, distribute and/or modify this +- document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover Texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have the freedom to copy +- and modify this GNU manual. +- +- +-File: libquadmath.info, Node: Top, Next: Typedef and constants, Up: (dir) +- +-Introduction +-************ +- +-This manual documents the usage of libquadmath, the GCC Quad-Precision +-Math Library Application Programming Interface (API). +- +-* Menu: +- +-* Typedef and constants:: Defined data types and constants +-* Math Library Routines:: The Libquadmath math runtime application +- programming interface. +-* I/O Library Routines:: The Libquadmath I/O runtime application +- programming interface. +-* GNU Free Documentation License:: +- How you can copy and share this manual. +-* Reporting Bugs:: How to report bugs in GCC Libquadmath. +- +- +-File: libquadmath.info, Node: Typedef and constants, Next: Math Library Routines, Prev: Top, Up: Top +- +-1 Typedef and constants +-*********************** +- +-The following data type has been defined via `typedef'. +- +-`__complex128': `__float128'-based complex number +- +- The following macros are defined, which give the numeric limits of +-the `__float128' data type. +- +-`FLT128_MAX': largest finite number +- +-`FLT128_MIN': smallest positive number with full precision +- +-`FLT128_EPSILON': difference between 1 and the next larger +- representable number +- +-`FLT128_DENORM_MIN': smallest positive denormalized number +- +-`FLT128_MANT_DIG': number of digits in the mantissa (bit precision) +- +-`FLT128_MIN_EXP': maximal negative exponent +- +-`FLT128_MAX_EXP': maximal positive exponent +- +-`FLT128_DIG': number of decimal digits in the mantissa +- +-`FLT128_MIN_10_EXP': maximal negative decimal exponent +- +-`FLT128_MAX_10_EXP': maximal positive decimal exponent +- +- The following mathematical constants of type `__float128' are +-defined. +- +-`M_Eq': the constant e (Euler's number) +- +-`M_LOG2Eq': binary logarithm of 2 +- +-`M_LOG10Eq': common, decimal logarithm of 2 +- +-`M_LN2q': natural logarithm of 2 +- +-`M_LN10q': natural logarithm of 10 +- +-`M_PIq': pi +- +-`M_PI_2q': two pi +- +-`M_PI_4q': four pi +- +-`M_1_PIq': one over pi +- +-`M_2_PIq': one over two pi +- +-`M_2_SQRTPIq': two over square root of pi +- +-`M_SQRT2q': square root of 2 +- +-`M_SQRT1_2q': one over square root of 2 +- +- +-File: libquadmath.info, Node: Math Library Routines, Next: I/O Library Routines, Prev: Typedef and constants, Up: Top +- +-2 Math Library Routines +-*********************** +- +-The following mathematical functions are available: +- +-`acosq': arc cosine function +- +-`acoshq': inverse hyperbolic cosine function +- +-`asinq': arc sine function +- +-`asinhq': inverse hyperbolic sine function +- +-`atanq': arc tangent function +- +-`atanhq': inverse hyperbolic tangent function +- +-`atan2q': arc tangent function +- +-`cbrtq': cube root function +- +-`ceilq': ceiling value function +- +-`copysignq': copy sign of a number +- +-`coshq': hyperbolic cosine function +- +-`cosq': cosine function +- +-`erfq': error function +- +-`erfcq': complementary error function +- +-`expq': exponential function +- +-`expm1q': exponential minus 1 function +- +-`fabsq': absolute value function +- +-`fdimq': positive difference function +- +-`finiteq': check finiteness of value +- +-`floorq': floor value function +- +-`fmaq': fused multiply and add +- +-`fmaxq': determine maximum of two values +- +-`fminq': determine minimum of two values +- +-`fmodq': remainder value function +- +-`frexpq': extract mantissa and exponent +- +-`hypotq': Eucledian distance function +- +-`ilogbq': get exponent of the value +- +-`isinfq': check for infinity +- +-`isnanq': check for not a number +- +-`j0q': Bessel function of the first kind, first order +- +-`j1q': Bessel function of the first kind, second order +- +-`jnq': Bessel function of the first kind, N-th order +- +-`ldexpq': load exponent of the value +- +-`lgammaq': logarithmic gamma function +- +-`llrintq': round to nearest integer value +- +-`llroundq': round to nearest integer value away from zero +- +-`logq': natural logarithm function +- +-`log10q': base 10 logarithm function +- +-`log1pq': compute natural logarithm of the value plus one +- +-`log2q': base 2 logarithm function +- +-`lrintq': round to nearest integer value +- +-`lroundq': round to nearest integer value away from zero +- +-`modfq': decompose the floating-point number +- +-`nanq': return quiet NaN +- +-`nearbyintq': round to nearest integer +- +-`nextafterq': next representable floating-point number +- +-`powq': power function +- +-`remainderq': remainder function +- +-`remquoq': remainder and part of quotient +- +-`rintq': round-to-nearest integral value +- +-`roundq': round-to-nearest integral value, return `__float128' +- +-`scalblnq': compute exponent using `FLT_RADIX' +- +-`scalbnq': compute exponent using `FLT_RADIX' +- +-`signbitq': return sign bit +- +-`sincosq': calculate sine and cosine simulataneously +- +-`sinhq': hyperbolic sine function +- +-`sinq': sine function +- +-`sqrtq': square root function +- +-`tanq': tangent function +- +-`tanhq': hyperbolic tangent function +- +-`tgammaq': true gamma function +- +-`truncq': round to integer, towards zero +- +-`y0q': Bessel function of the second kind, first order +- +-`y1q': Bessel function of the second kind, second order +- +-`ynq': Bessel function of the second kind, N-th order +- +-`cabsq' complex absolute value function +- +-`cargq': calculate the argument +- +-`cimagq' imaginary part of complex number +- +-`crealq': real part of complex number +- +-`cacoshq': complex arc hyperbolic cosine function +- +-`cacosq': complex arc cosine function +- +-`casinhq': complex arc hyperbolic sine function +- +-`casinq': complex arc sine function +- +-`catanhq': complex arc hyperbolic tangent function +- +-`catanq': complex arc tangent function +- +-`ccosq' complex cosine function: +- +-`ccoshq': complex hyperbolic cosine function +- +-`cexpq': complex exponential function +- +-`cexpiq': computes the exponential function of "i" times a +- real value +- +-`clogq': complex natural logarithm +- +-`clog10q': complex base 10 logarithm +- +-`conjq': complex conjugate function +- +-`cpowq': complex power function +- +-`cprojq': project into Riemann Sphere +- +-`csinq': complex sine function +- +-`csinhq': complex hyperbolic sine function +- +-`csqrtq': complex square root +- +-`ctanq': complex tangent function +- +-`ctanhq': complex hyperbolic tangent function +- +- +-File: libquadmath.info, Node: I/O Library Routines, Next: GNU Free Documentation License, Prev: Math Library Routines, Up: Top +- +-3 I/O Library Routines +-********************** +- +-* Menu: +- +-* `strtoflt128': strtoflt128, Convert from string +-* `quadmath_snprintf': quadmath_snprintf, Convert to string +- +- +-File: libquadmath.info, Node: strtoflt128, Next: quadmath_snprintf, Up: I/O Library Routines +- +-3.1 `strtoflt128' -- Convert from string +-======================================== +- +-The function `dmath_strtopQ' converts a string into a `__float128' +-number. +- +-Syntax +- `__float128 strtoflt128 (const char *s, char **sp)' +- +-_Arguments_: +- S input string +- SP the address of the next character in the string +- +- The argument SP contains, if not `NULL', the address of the next +- character following the parts of the string, which have been read. +- +-Example +- #include <quadmath.h> +- +- int main () +- { +- __float128 r; +- +- r = strtoflt128 ("1.2345678", NULL); +- +- return 0; +- } +- +- +-File: libquadmath.info, Node: quadmath_snprintf, Prev: strtoflt128, Up: I/O Library Routines +- +-3.2 `quadmath_snprintf' -- Convert to string +-============================================ +- +-The function `quadmath_snprintf' converts a `__float128' floating-point +-number into a string. It is a specialized alternative to `snprintf', +-where the format string is restricted to a single conversion specifier +-with `Q' modifier and conversion specifier `e', `E', `f', `F', `g', +-`G', `a' or `A', with no extra characters before or after the +-conversion specifier. The `%m$' or `*m$' style must not be used in the +-format. +- +-Syntax +- `int quadmath_snprintf (char *s, size_t size, const char *format, +- ...)' +- +-_Arguments_: +- S output string +- SIZE byte size of the string, including tailing NUL +- FORMAT conversion specifier string +- +-Example +- #include <quadmath.h> +- #include <stdlib.h> +- #include <stdio.h> +- +- int main () +- { +- __float128 r; +- int prec = 20; +- int width = 46; +- char buf[128]; +- +- r = 2.0q; +- r = sqrtq (r); +- int n = quadmath_snprintf (buf, sizeof buf, "%+-#*.20Qe", width, r); +- if ((size_t) n < sizeof buf) +- printf ("%s\n", buf); +- /* Prints: +1.41421356237309504880e+00 */ +- quadmath_snprintf (buf, sizeof buf, "%Qa", r); +- if ((size_t) n < sizeof buf) +- printf ("%s\n", buf); +- /* Prints: 0x1.6a09e667f3bcc908b2fb1366ea96p+0 */ +- n = quadmath_snprintf (NULL, 0, "%+-#46.*Qe", prec, r); +- if (n > -1) +- { +- char *str = malloc (n + 1); +- if (str) +- { +- quadmath_snprintf (str, n + 1, "%+-#46.*Qe", prec, r); +- printf ("%s\n", str); +- /* Prints: +1.41421356237309504880e+00 */ +- } +- free (str); +- } +- return 0; +- } +- +- +- On some targets when supported by the C library hooks are installed +-for `printf' family of functions, so that `printf ("%Qe", 1.2Q);' etc. +-works too. +- +- +-File: libquadmath.info, Node: GNU Free Documentation License, Next: Reporting Bugs, Prev: I/O Library Routines, Up: Top +- +-GNU Free Documentation License +-****************************** +- +- Version 1.3, 3 November 2008 +- +- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +- `http://fsf.org/' +- +- Everyone is permitted to copy and distribute verbatim copies +- of this license document, but changing it is not allowed. +- +- 0. PREAMBLE +- +- The purpose of this License is to make a manual, textbook, or other +- functional and useful document "free" in the sense of freedom: to +- assure everyone the effective freedom to copy and redistribute it, +- with or without modifying it, either commercially or +- noncommercially. Secondarily, this License preserves for the +- author and publisher a way to get credit for their work, while not +- being considered responsible for modifications made by others. +- +- This License is a kind of "copyleft", which means that derivative +- works of the document must themselves be free in the same sense. +- It complements the GNU General Public License, which is a copyleft +- license designed for free software. +- +- We have designed this License in order to use it for manuals for +- free software, because free software needs free documentation: a +- free program should come with manuals providing the same freedoms +- that the software does. But this License is not limited to +- software manuals; it can be used for any textual work, regardless +- of subject matter or whether it is published as a printed book. +- We recommend this License principally for works whose purpose is +- instruction or reference. +- +- 1. APPLICABILITY AND DEFINITIONS +- +- This License applies to any manual or other work, in any medium, +- that contains a notice placed by the copyright holder saying it +- can be distributed under the terms of this License. Such a notice +- grants a world-wide, royalty-free license, unlimited in duration, +- to use that work under the conditions stated herein. The +- "Document", below, refers to any such manual or work. Any member +- of the public is a licensee, and is addressed as "you". You +- accept the license if you copy, modify or distribute the work in a +- way requiring permission under copyright law. +- +- A "Modified Version" of the Document means any work containing the +- Document or a portion of it, either copied verbatim, or with +- modifications and/or translated into another language. +- +- A "Secondary Section" is a named appendix or a front-matter section +- of the Document that deals exclusively with the relationship of the +- publishers or authors of the Document to the Document's overall +- subject (or to related matters) and contains nothing that could +- fall directly within that overall subject. (Thus, if the Document +- is in part a textbook of mathematics, a Secondary Section may not +- explain any mathematics.) The relationship could be a matter of +- historical connection with the subject or with related matters, or +- of legal, commercial, philosophical, ethical or political position +- regarding them. +- +- The "Invariant Sections" are certain Secondary Sections whose +- titles are designated, as being those of Invariant Sections, in +- the notice that says that the Document is released under this +- License. If a section does not fit the above definition of +- Secondary then it is not allowed to be designated as Invariant. +- The Document may contain zero Invariant Sections. If the Document +- does not identify any Invariant Sections then there are none. +- +- The "Cover Texts" are certain short passages of text that are +- listed, as Front-Cover Texts or Back-Cover Texts, in the notice +- that says that the Document is released under this License. A +- Front-Cover Text may be at most 5 words, and a Back-Cover Text may +- be at most 25 words. +- +- A "Transparent" copy of the Document means a machine-readable copy, +- represented in a format whose specification is available to the +- general public, that is suitable for revising the document +- straightforwardly with generic text editors or (for images +- composed of pixels) generic paint programs or (for drawings) some +- widely available drawing editor, and that is suitable for input to +- text formatters or for automatic translation to a variety of +- formats suitable for input to text formatters. A copy made in an +- otherwise Transparent file format whose markup, or absence of +- markup, has been arranged to thwart or discourage subsequent +- modification by readers is not Transparent. An image format is +- not Transparent if used for any substantial amount of text. A +- copy that is not "Transparent" is called "Opaque". +- +- Examples of suitable formats for Transparent copies include plain +- ASCII without markup, Texinfo input format, LaTeX input format, +- SGML or XML using a publicly available DTD, and +- standard-conforming simple HTML, PostScript or PDF designed for +- human modification. Examples of transparent image formats include +- PNG, XCF and JPG. Opaque formats include proprietary formats that +- can be read and edited only by proprietary word processors, SGML or +- XML for which the DTD and/or processing tools are not generally +- available, and the machine-generated HTML, PostScript or PDF +- produced by some word processors for output purposes only. +- +- The "Title Page" means, for a printed book, the title page itself, +- plus such following pages as are needed to hold, legibly, the +- material this License requires to appear in the title page. For +- works in formats which do not have any title page as such, "Title +- Page" means the text near the most prominent appearance of the +- work's title, preceding the beginning of the body of the text. +- +- The "publisher" means any person or entity that distributes copies +- of the Document to the public. +- +- A section "Entitled XYZ" means a named subunit of the Document +- whose title either is precisely XYZ or contains XYZ in parentheses +- following text that translates XYZ in another language. (Here XYZ +- stands for a specific section name mentioned below, such as +- "Acknowledgements", "Dedications", "Endorsements", or "History".) +- To "Preserve the Title" of such a section when you modify the +- Document means that it remains a section "Entitled XYZ" according +- to this definition. +- +- The Document may include Warranty Disclaimers next to the notice +- which states that this License applies to the Document. These +- Warranty Disclaimers are considered to be included by reference in +- this License, but only as regards disclaiming warranties: any other +- implication that these Warranty Disclaimers may have is void and +- has no effect on the meaning of this License. +- +- 2. VERBATIM COPYING +- +- You may copy and distribute the Document in any medium, either +- commercially or noncommercially, provided that this License, the +- copyright notices, and the license notice saying this License +- applies to the Document are reproduced in all copies, and that you +- add no other conditions whatsoever to those of this License. You +- may not use technical measures to obstruct or control the reading +- or further copying of the copies you make or distribute. However, +- you may accept compensation in exchange for copies. If you +- distribute a large enough number of copies you must also follow +- the conditions in section 3. +- +- You may also lend copies, under the same conditions stated above, +- and you may publicly display copies. +- +- 3. COPYING IN QUANTITY +- +- If you publish printed copies (or copies in media that commonly +- have printed covers) of the Document, numbering more than 100, and +- the Document's license notice requires Cover Texts, you must +- enclose the copies in covers that carry, clearly and legibly, all +- these Cover Texts: Front-Cover Texts on the front cover, and +- Back-Cover Texts on the back cover. Both covers must also clearly +- and legibly identify you as the publisher of these copies. The +- front cover must present the full title with all words of the +- title equally prominent and visible. You may add other material +- on the covers in addition. Copying with changes limited to the +- covers, as long as they preserve the title of the Document and +- satisfy these conditions, can be treated as verbatim copying in +- other respects. +- +- If the required texts for either cover are too voluminous to fit +- legibly, you should put the first ones listed (as many as fit +- reasonably) on the actual cover, and continue the rest onto +- adjacent pages. +- +- If you publish or distribute Opaque copies of the Document +- numbering more than 100, you must either include a +- machine-readable Transparent copy along with each Opaque copy, or +- state in or with each Opaque copy a computer-network location from +- which the general network-using public has access to download +- using public-standard network protocols a complete Transparent +- copy of the Document, free of added material. If you use the +- latter option, you must take reasonably prudent steps, when you +- begin distribution of Opaque copies in quantity, to ensure that +- this Transparent copy will remain thus accessible at the stated +- location until at least one year after the last time you +- distribute an Opaque copy (directly or through your agents or +- retailers) of that edition to the public. +- +- It is requested, but not required, that you contact the authors of +- the Document well before redistributing any large number of +- copies, to give them a chance to provide you with an updated +- version of the Document. +- +- 4. MODIFICATIONS +- +- You may copy and distribute a Modified Version of the Document +- under the conditions of sections 2 and 3 above, provided that you +- release the Modified Version under precisely this License, with +- the Modified Version filling the role of the Document, thus +- licensing distribution and modification of the Modified Version to +- whoever possesses a copy of it. In addition, you must do these +- things in the Modified Version: +- +- A. Use in the Title Page (and on the covers, if any) a title +- distinct from that of the Document, and from those of +- previous versions (which should, if there were any, be listed +- in the History section of the Document). You may use the +- same title as a previous version if the original publisher of +- that version gives permission. +- +- B. List on the Title Page, as authors, one or more persons or +- entities responsible for authorship of the modifications in +- the Modified Version, together with at least five of the +- principal authors of the Document (all of its principal +- authors, if it has fewer than five), unless they release you +- from this requirement. +- +- C. State on the Title page the name of the publisher of the +- Modified Version, as the publisher. +- +- D. Preserve all the copyright notices of the Document. +- +- E. Add an appropriate copyright notice for your modifications +- adjacent to the other copyright notices. +- +- F. Include, immediately after the copyright notices, a license +- notice giving the public permission to use the Modified +- Version under the terms of this License, in the form shown in +- the Addendum below. +- +- G. Preserve in that license notice the full lists of Invariant +- Sections and required Cover Texts given in the Document's +- license notice. +- +- H. Include an unaltered copy of this License. +- +- I. Preserve the section Entitled "History", Preserve its Title, +- and add to it an item stating at least the title, year, new +- authors, and publisher of the Modified Version as given on +- the Title Page. If there is no section Entitled "History" in +- the Document, create one stating the title, year, authors, +- and publisher of the Document as given on its Title Page, +- then add an item describing the Modified Version as stated in +- the previous sentence. +- +- J. Preserve the network location, if any, given in the Document +- for public access to a Transparent copy of the Document, and +- likewise the network locations given in the Document for +- previous versions it was based on. These may be placed in +- the "History" section. You may omit a network location for a +- work that was published at least four years before the +- Document itself, or if the original publisher of the version +- it refers to gives permission. +- +- K. For any section Entitled "Acknowledgements" or "Dedications", +- Preserve the Title of the section, and preserve in the +- section all the substance and tone of each of the contributor +- acknowledgements and/or dedications given therein. +- +- L. Preserve all the Invariant Sections of the Document, +- unaltered in their text and in their titles. Section numbers +- or the equivalent are not considered part of the section +- titles. +- +- M. Delete any section Entitled "Endorsements". Such a section +- may not be included in the Modified Version. +- +- N. Do not retitle any existing section to be Entitled +- "Endorsements" or to conflict in title with any Invariant +- Section. +- +- O. Preserve any Warranty Disclaimers. +- +- If the Modified Version includes new front-matter sections or +- appendices that qualify as Secondary Sections and contain no +- material copied from the Document, you may at your option +- designate some or all of these sections as invariant. To do this, +- add their titles to the list of Invariant Sections in the Modified +- Version's license notice. These titles must be distinct from any +- other section titles. +- +- You may add a section Entitled "Endorsements", provided it contains +- nothing but endorsements of your Modified Version by various +- parties--for example, statements of peer review or that the text +- has been approved by an organization as the authoritative +- definition of a standard. +- +- You may add a passage of up to five words as a Front-Cover Text, +- and a passage of up to 25 words as a Back-Cover Text, to the end +- of the list of Cover Texts in the Modified Version. Only one +- passage of Front-Cover Text and one of Back-Cover Text may be +- added by (or through arrangements made by) any one entity. If the +- Document already includes a cover text for the same cover, +- previously added by you or by arrangement made by the same entity +- you are acting on behalf of, you may not add another; but you may +- replace the old one, on explicit permission from the previous +- publisher that added the old one. +- +- The author(s) and publisher(s) of the Document do not by this +- License give permission to use their names for publicity for or to +- assert or imply endorsement of any Modified Version. +- +- 5. COMBINING DOCUMENTS +- +- You may combine the Document with other documents released under +- this License, under the terms defined in section 4 above for +- modified versions, provided that you include in the combination +- all of the Invariant Sections of all of the original documents, +- unmodified, and list them all as Invariant Sections of your +- combined work in its license notice, and that you preserve all +- their Warranty Disclaimers. +- +- The combined work need only contain one copy of this License, and +- multiple identical Invariant Sections may be replaced with a single +- copy. If there are multiple Invariant Sections with the same name +- but different contents, make the title of each such section unique +- by adding at the end of it, in parentheses, the name of the +- original author or publisher of that section if known, or else a +- unique number. Make the same adjustment to the section titles in +- the list of Invariant Sections in the license notice of the +- combined work. +- +- In the combination, you must combine any sections Entitled +- "History" in the various original documents, forming one section +- Entitled "History"; likewise combine any sections Entitled +- "Acknowledgements", and any sections Entitled "Dedications". You +- must delete all sections Entitled "Endorsements." +- +- 6. COLLECTIONS OF DOCUMENTS +- +- You may make a collection consisting of the Document and other +- documents released under this License, and replace the individual +- copies of this License in the various documents with a single copy +- that is included in the collection, provided that you follow the +- rules of this License for verbatim copying of each of the +- documents in all other respects. +- +- You may extract a single document from such a collection, and +- distribute it individually under this License, provided you insert +- a copy of this License into the extracted document, and follow +- this License in all other respects regarding verbatim copying of +- that document. +- +- 7. AGGREGATION WITH INDEPENDENT WORKS +- +- A compilation of the Document or its derivatives with other +- separate and independent documents or works, in or on a volume of +- a storage or distribution medium, is called an "aggregate" if the +- copyright resulting from the compilation is not used to limit the +- legal rights of the compilation's users beyond what the individual +- works permit. When the Document is included in an aggregate, this +- License does not apply to the other works in the aggregate which +- are not themselves derivative works of the Document. +- +- If the Cover Text requirement of section 3 is applicable to these +- copies of the Document, then if the Document is less than one half +- of the entire aggregate, the Document's Cover Texts may be placed +- on covers that bracket the Document within the aggregate, or the +- electronic equivalent of covers if the Document is in electronic +- form. Otherwise they must appear on printed covers that bracket +- the whole aggregate. +- +- 8. TRANSLATION +- +- Translation is considered a kind of modification, so you may +- distribute translations of the Document under the terms of section +- 4. Replacing Invariant Sections with translations requires special +- permission from their copyright holders, but you may include +- translations of some or all Invariant Sections in addition to the +- original versions of these Invariant Sections. You may include a +- translation of this License, and all the license notices in the +- Document, and any Warranty Disclaimers, provided that you also +- include the original English version of this License and the +- original versions of those notices and disclaimers. In case of a +- disagreement between the translation and the original version of +- this License or a notice or disclaimer, the original version will +- prevail. +- +- If a section in the Document is Entitled "Acknowledgements", +- "Dedications", or "History", the requirement (section 4) to +- Preserve its Title (section 1) will typically require changing the +- actual title. +- +- 9. TERMINATION +- +- You may not copy, modify, sublicense, or distribute the Document +- except as expressly provided under this License. Any attempt +- otherwise to copy, modify, sublicense, or distribute it is void, +- and will automatically terminate your rights under this License. +- +- However, if you cease all violation of this License, then your +- license from a particular copyright holder is reinstated (a) +- provisionally, unless and until the copyright holder explicitly +- and finally terminates your license, and (b) permanently, if the +- copyright holder fails to notify you of the violation by some +- reasonable means prior to 60 days after the cessation. +- +- Moreover, your license from a particular copyright holder is +- reinstated permanently if the copyright holder notifies you of the +- violation by some reasonable means, this is the first time you have +- received notice of violation of this License (for any work) from +- that copyright holder, and you cure the violation prior to 30 days +- after your receipt of the notice. +- +- Termination of your rights under this section does not terminate +- the licenses of parties who have received copies or rights from +- you under this License. If your rights have been terminated and +- not permanently reinstated, receipt of a copy of some or all of +- the same material does not give you any rights to use it. +- +- 10. FUTURE REVISIONS OF THIS LICENSE +- +- The Free Software Foundation may publish new, revised versions of +- the GNU Free Documentation License from time to time. Such new +- versions will be similar in spirit to the present version, but may +- differ in detail to address new problems or concerns. See +- `http://www.gnu.org/copyleft/'. +- +- Each version of the License is given a distinguishing version +- number. If the Document specifies that a particular numbered +- version of this License "or any later version" applies to it, you +- have the option of following the terms and conditions either of +- that specified version or of any later version that has been +- published (not as a draft) by the Free Software Foundation. If +- the Document does not specify a version number of this License, +- you may choose any version ever published (not as a draft) by the +- Free Software Foundation. If the Document specifies that a proxy +- can decide which future versions of this License can be used, that +- proxy's public statement of acceptance of a version permanently +- authorizes you to choose that version for the Document. +- +- 11. RELICENSING +- +- "Massive Multiauthor Collaboration Site" (or "MMC Site") means any +- World Wide Web server that publishes copyrightable works and also +- provides prominent facilities for anybody to edit those works. A +- public wiki that anybody can edit is an example of such a server. +- A "Massive Multiauthor Collaboration" (or "MMC") contained in the +- site means any set of copyrightable works thus published on the MMC +- site. +- +- "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +- license published by Creative Commons Corporation, a not-for-profit +- corporation with a principal place of business in San Francisco, +- California, as well as future copyleft versions of that license +- published by that same organization. +- +- "Incorporate" means to publish or republish a Document, in whole or +- in part, as part of another Document. +- +- An MMC is "eligible for relicensing" if it is licensed under this +- License, and if all works that were first published under this +- License somewhere other than this MMC, and subsequently +- incorporated in whole or in part into the MMC, (1) had no cover +- texts or invariant sections, and (2) were thus incorporated prior +- to November 1, 2008. +- +- The operator of an MMC Site may republish an MMC contained in the +- site under CC-BY-SA on the same site at any time before August 1, +- 2009, provided the MMC is eligible for relicensing. +- +- +-ADDENDUM: How to use this License for your documents +-==================================================== +- +-To use this License in a document you have written, include a copy of +-the License in the document and put the following copyright and license +-notices just after the title page: +- +- Copyright (C) YEAR YOUR NAME. +- Permission is granted to copy, distribute and/or modify this document +- under the terms of the GNU Free Documentation License, Version 1.3 +- or any later version published by the Free Software Foundation; +- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover +- Texts. A copy of the license is included in the section entitled ``GNU +- Free Documentation License''. +- +- If you have Invariant Sections, Front-Cover Texts and Back-Cover +-Texts, replace the "with...Texts." line with this: +- +- with the Invariant Sections being LIST THEIR TITLES, with +- the Front-Cover Texts being LIST, and with the Back-Cover Texts +- being LIST. +- +- If you have Invariant Sections without Cover Texts, or some other +-combination of the three, merge those two alternatives to suit the +-situation. +- +- If your document contains nontrivial examples of program code, we +-recommend releasing these examples in parallel under your choice of +-free software license, such as the GNU General Public License, to +-permit their use in free software. +- +- +-File: libquadmath.info, Node: Reporting Bugs, Prev: GNU Free Documentation License, Up: Top +- +-4 Reporting Bugs +-**************** +- +-Bugs in the GCC Quad-Precision Math Library implementation should be +-reported via `http://gcc.gnu.org/bugs.html'. +- +- +- +-Tag Table: +-Node: Top1661 +-Node: Typedef and constants2395 +-Node: Math Library Routines3813 +-Node: I/O Library Routines7618 +-Node: strtoflt1287943 +-Node: quadmath_snprintf8703 +-Node: GNU Free Documentation License10894 +-Node: Reporting Bugs36060 +- +-End Tag Table +diff -Naur gcc-4.6.3.orig/libstdc++-v3/acinclude.m4 gcc-4.6.3/libstdc++-v3/acinclude.m4 +--- gcc-4.6.3.orig/libstdc++-v3/acinclude.m4 2011-10-05 18:09:51.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/acinclude.m4 2012-07-22 11:46:02.814828000 -0500 +@@ -3213,6 +3213,58 @@ + ]) + ]) + ++dnl ++dnl Check whether gthreads types can be copy-assigned in C++11 mode. ++dnl ++AC_DEFUN([GLIBCXX_GTHREADS_CXX11_COPY_ASSIGN], [ ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS -std=c++0x -I${toplevel_srcdir}/gcc" ++ ++ target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` ++ case $target_thread_file in ++ posix) ++ CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" ++ esac ++ ++ AC_MSG_CHECKING([whether gthreads types are copy-assignable in C++11 mode]) ++ ++ AC_TRY_COMPILE([#include "gthr.h"], ++ [ ++ #ifdef __GTHREAD_MUTEX_INIT ++ __gthread_mutex_t m1; ++ __gthread_mutex_t m2 = __GTHREAD_MUTEX_INIT; ++ m1 = m2; ++ #endif ++ #ifdef __GTHREAD_RECURSIVE_MUTEX_INIT ++ __gthread_recursive_mutex_t r1; ++ __gthread_recursive_mutex_t r2 = __GTHREAD_RECURSIVE_MUTEX_INIT; ++ r1 = r2; ++ #endif ++ #ifdef __GTHREAD_HAS_COND ++ #ifdef __GTHREAD_COND_INIT ++ __gthread_cond_t c1; ++ __gthread_cond_t c2 = __GTHREAD_COND_INIT; ++ c1 = c2; ++ #endif ++ #endif ++ ], [ac_gthread_cxx11_copy_assign=1], [ac_gthread_cxx11_copy_assign=0]) ++ ++ if test $ac_gthread_cxx11_copy_assign = 1 ; then res_gthr_copy_assign=yes ; ++ else res_gthr_copy_assign=no ; fi ++ AC_MSG_RESULT([$res_gthr_copy_assign]) ++ ++ if test x"$res_gthr_copy_assign" = x"no"; then ++ AC_DEFINE(_GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11, 1, ++ [Define if gthreads types cannot be copy-assigned in C++11.]) ++ fi ++ ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ AC_LANG_RESTORE ++]) ++ + # Macros from the top-level gcc directory. + m4_include([../config/gc++filt.m4]) + m4_include([../config/tls.m4]) +diff -Naur gcc-4.6.3.orig/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h gcc-4.6.3/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +--- gcc-4.6.3.orig/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 2012-06-20 03:30:55.151768000 -0500 +@@ -1,6 +1,6 @@ + // Locale support -*- C++ -*- + +-// Copyright (C) 2000, 2009 Free Software Foundation, Inc. ++// Copyright (C) 2000, 2009, 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -31,8 +31,6 @@ + // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h + // See www.netbsd.org for details of access. + +-#include <sys/param.h> +- + namespace std _GLIBCXX_VISIBILITY(default) + { + _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -47,7 +45,7 @@ + // on the mask type. Because of this, we don't use an enum. + typedef unsigned char mask; + +-#if __NetBSD_Version__ < 599004100 ++#ifndef _CTYPE_U + static const mask upper = _U; + static const mask lower = _L; + static const mask alpha = _U | _L; +diff -Naur gcc-4.6.3.orig/libstdc++-v3/config.h.in gcc-4.6.3/libstdc++-v3/config.h.in +--- gcc-4.6.3.orig/libstdc++-v3/config.h.in 2010-07-27 05:36:50.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/config.h.in 2012-07-22 11:46:02.814828000 -0500 +@@ -692,6 +692,9 @@ + /* Define if a fully dynamic basic_string is wanted. */ + #undef _GLIBCXX_FULLY_DYNAMIC_STRING + ++/* Define if gthreads types cannot be copy-assigned in C++11. */ ++#undef _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ + /* Define if gthreads library is available. */ + #undef _GLIBCXX_HAS_GTHREADS + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/configure gcc-4.6.3/libstdc++-v3/configure +--- gcc-4.6.3.orig/libstdc++-v3/configure 2011-11-20 15:24:07.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/configure 2012-07-22 11:46:02.814828000 -0500 +@@ -19477,6 +19477,84 @@ + + + ++# For copy-assignable gthreads types ++ ++ ++ ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS -std=c++0x -I${toplevel_srcdir}/gcc" ++ ++ target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` ++ case $target_thread_file in ++ posix) ++ CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" ++ esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gthreads types are copy-assignable in C++11 mode" >&5 ++$as_echo_n "checking whether gthreads types are copy-assignable in C++11 mode... " >&6; } ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include "gthr.h" ++int ++main () ++{ ++ ++ #ifdef __GTHREAD_MUTEX_INIT ++ __gthread_mutex_t m1; ++ __gthread_mutex_t m2 = __GTHREAD_MUTEX_INIT; ++ m1 = m2; ++ #endif ++ #ifdef __GTHREAD_RECURSIVE_MUTEX_INIT ++ __gthread_recursive_mutex_t r1; ++ __gthread_recursive_mutex_t r2 = __GTHREAD_RECURSIVE_MUTEX_INIT; ++ r1 = r2; ++ #endif ++ #ifdef __GTHREAD_HAS_COND ++ #ifdef __GTHREAD_COND_INIT ++ __gthread_cond_t c1; ++ __gthread_cond_t c2 = __GTHREAD_COND_INIT; ++ c1 = c2; ++ #endif ++ #endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_gthread_cxx11_copy_assign=1 ++else ++ ac_gthread_cxx11_copy_assign=0 ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ if test $ac_gthread_cxx11_copy_assign = 1 ; then res_gthr_copy_assign=yes ; ++ else res_gthr_copy_assign=no ; fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $res_gthr_copy_assign" >&5 ++$as_echo "$res_gthr_copy_assign" >&6; } ++ ++ if test x"$res_gthr_copy_assign" = x"no"; then ++ ++$as_echo "#define _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 1" >>confdefs.h ++ ++ fi ++ ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ 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 ++ ++ ++ + + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" + if test "x$ac_cv_header_locale_h" = x""yes; then : +diff -Naur gcc-4.6.3.orig/libstdc++-v3/configure.ac gcc-4.6.3/libstdc++-v3/configure.ac +--- gcc-4.6.3.orig/libstdc++-v3/configure.ac 2011-10-05 18:09:51.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/configure.ac 2012-07-22 11:46:02.814828000 -0500 +@@ -164,6 +164,9 @@ + # For gthread support + GLIBCXX_CHECK_GTHREADS + ++# For copy-assignable gthreads types ++GLIBCXX_GTHREADS_CXX11_COPY_ASSIGN ++ + AC_LC_MESSAGES + + # Check for available headers. +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/bits/stl_algo.h gcc-4.6.3/libstdc++-v3/include/bits/stl_algo.h +--- gcc-4.6.3.orig/libstdc++-v3/include/bits/stl_algo.h 2011-09-27 03:22:07.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/include/bits/stl_algo.h 2012-04-12 17:26:02.694716000 -0500 +@@ -1811,7 +1811,8 @@ + for (; __first != __last; ++__first) + if (__pred(*__first)) + { +- *__result1 = _GLIBCXX_MOVE(*__first); ++ if (__result1 != __first) ++ *__result1 = _GLIBCXX_MOVE(*__first); + ++__result1; + } + else +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/debug/safe_iterator.h gcc-4.6.3/libstdc++-v3/include/debug/safe_iterator.h +--- gcc-4.6.3.orig/libstdc++-v3/include/debug/safe_iterator.h 2011-01-21 13:41:13.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/debug/safe_iterator.h 2012-03-08 16:31:19.955944000 -0600 +@@ -1,6 +1,6 @@ + // Safe iterator implementation -*- C++ -*- + +-// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011 ++// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2012 + // Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free +@@ -142,6 +142,24 @@ + ._M_iterator(__x, "other")); + } + ++#ifdef __GXX_EXPERIMENTAL_CXX0X__ ++ /** ++ * @brief Move construction. ++ * @post __x is singular and unattached ++ */ ++ _Safe_iterator(_Safe_iterator&& __x) : _M_current() ++ { ++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() ++ || __x._M_current == _Iterator(), ++ _M_message(__msg_init_copy_singular) ++ ._M_iterator(*this, "this") ++ ._M_iterator(__x, "other")); ++ std::swap(_M_current, __x._M_current); ++ this->_M_attach(__x._M_sequence); ++ __x._M_detach(); ++ } ++#endif ++ + /** + * @brief Converting constructor from a mutable iterator to a + * constant iterator. +@@ -181,6 +199,27 @@ + return *this; + } + ++#ifdef __GXX_EXPERIMENTAL_CXX0X__ ++ /** ++ * @brief Move assignment. ++ * @post __x is singular and unattached ++ */ ++ _Safe_iterator& ++ operator=(_Safe_iterator&& __x) ++ { ++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() ++ || __x._M_current == _Iterator(), ++ _M_message(__msg_copy_singular) ++ ._M_iterator(*this, "this") ++ ._M_iterator(__x, "other")); ++ _M_current = __x._M_current; ++ _M_attach(__x._M_sequence); ++ __x._M_detach(); ++ __x._M_current = _Iterator(); ++ return *this; ++ } ++#endif ++ + /** + * @brief Iterator dereference. + * @pre iterator is dereferenceable +@@ -415,7 +454,9 @@ + /// Is this iterator equal to the sequence's before_begin() iterator if + /// any? + bool _M_is_before_begin() const +- { return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence()); } ++ { ++ return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence()); ++ } + }; + + template<typename _IteratorL, typename _IteratorR, typename _Sequence> +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/ext/concurrence.h gcc-4.6.3/libstdc++-v3/include/ext/concurrence.h +--- gcc-4.6.3.orig/libstdc++-v3/include/ext/concurrence.h 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/ext/concurrence.h 2012-07-22 11:46:02.814828000 -0500 +@@ -1,6 +1,6 @@ + // Support for concurrent programing -*- C++ -*- + +-// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 + // Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free +@@ -140,6 +140,18 @@ + } + #endif + ++ template<typename _Tp> ++ static inline void ++ __copy_gthr_type(_Tp& __to, const _Tp& __from) ++ { ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&__to, &__from, sizeof(__to)); ++#else ++ __to = __from; ++#endif ++ } ++ + class __mutex + { + private: +@@ -156,7 +168,7 @@ + { + #if defined __GTHREAD_MUTEX_INIT + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_mutex = __tmp; ++ __copy_gthr_type(_M_mutex, __tmp); + #else + __GTHREAD_MUTEX_INIT_FUNCTION(&_M_mutex); + #endif +@@ -214,7 +226,7 @@ + { + #if defined __GTHREAD_RECURSIVE_MUTEX_INIT + __gthread_recursive_mutex_t __tmp = __GTHREAD_RECURSIVE_MUTEX_INIT; +- _M_mutex = __tmp; ++ __copy_gthr_type(_M_mutex, __tmp); + #else + __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION(&_M_mutex); + #endif +@@ -270,7 +282,7 @@ + + // matches a gthr-win32.h recursive mutex + template<typename _Rm> +- static typename __enable_if<sizeof(&_Rm::sema), void>::__type ++ static typename __enable_if<(bool)sizeof(&_Rm::sema), void>::__type + _S_destroy(_Rm* __mx) + { + __gthread_mutex_t __tmp; +@@ -279,7 +291,7 @@ + + // matches a recursive mutex with a member 'actual' + template<typename _Rm> +- static typename __enable_if<sizeof(&_Rm::actual), void>::__type ++ static typename __enable_if<(bool)sizeof(&_Rm::actual), void>::__type + _S_destroy(_Rm* __mx) + { __gthread_mutex_destroy(&__mx->actual); } + +@@ -332,7 +344,7 @@ + { + #if defined __GTHREAD_COND_INIT + __gthread_cond_t __tmp = __GTHREAD_COND_INIT; +- _M_cond = __tmp; ++ __copy_gthr_type(_M_cond, __tmp); + #else + __GTHREAD_COND_INIT_FUNCTION(&_M_cond); + #endif +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/ext/rope gcc-4.6.3/libstdc++-v3/include/ext/rope +--- gcc-4.6.3.orig/libstdc++-v3/include/ext/rope 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/ext/rope 2012-07-22 11:46:02.814828000 -0500 +@@ -1,7 +1,7 @@ + // SGI's rope class -*- C++ -*- + +-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-// Free Software Foundation, Inc. ++// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, ++// 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -445,6 +445,17 @@ + identity_element(_Rope_Concat_fn<_CharT, _Alloc>) + { return rope<_CharT, _Alloc>(); } + ++ static inline void ++ __copy_gthr_mutex(__gthread_mutex_t& __to, const __gthread_mutex_t& __from) ++ { ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&__to, &__from, sizeof(__to)); ++#else ++ __to = __from; ++#endif ++ } ++ + // Class _Refcount_Base provides a type, _RC_t, a data member, + // _M_ref_count, and member functions _M_incr and _M_decr, which perform + // atomic preincrement/predecrement. The constructor initializes +@@ -464,7 +475,7 @@ + { + #ifdef __GTHREAD_MUTEX_INIT + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_ref_count_lock = __tmp; ++ __copy_gthr_mutex(_M_ref_count_lock, __tmp); + #elif defined(__GTHREAD_MUTEX_INIT_FUNCTION) + __GTHREAD_MUTEX_INIT_FUNCTION (&_M_ref_count_lock); + #else +@@ -605,7 +616,7 @@ + { + // Do not copy a POSIX/gthr mutex once in use. However, bits are bits. + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_c_string_lock = __tmp; ++ __copy_gthr_mutex(_M_c_string_lock, __tmp); + } + #else + { __GTHREAD_MUTEX_INIT_FUNCTION (&_M_c_string_lock); } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/std/condition_variable gcc-4.6.3/libstdc++-v3/include/std/condition_variable +--- gcc-4.6.3.orig/libstdc++-v3/include/std/condition_variable 2011-12-18 18:34:29.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/std/condition_variable 2012-07-04 20:10:10.791368000 -0500 +@@ -1,6 +1,6 @@ + // <condition_variable> -*- C++ -*- + +-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -171,6 +171,26 @@ + condition_variable _M_cond; + mutex _M_mutex; + ++ // scoped unlock - unlocks in ctor, re-locks in dtor ++ template<typename _Lock> ++ struct _Unlock ++ { ++ explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); } ++ ++ ~_Unlock() noexcept(false) ++ { ++ if (uncaught_exception()) ++ __try { _M_lock.lock(); } __catch(...) { } ++ else ++ _M_lock.lock(); ++ } ++ ++ _Unlock(const _Unlock&) = delete; ++ _Unlock& operator=(const _Unlock&) = delete; ++ ++ _Lock& _M_lock; ++ }; ++ + public: + typedef condition_variable::native_handle_type native_handle_type; + +@@ -198,21 +218,8 @@ + void + wait(_Lock& __lock) + { +- // scoped unlock - unlocks in ctor, re-locks in dtor +- struct _Unlock { +- explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); } +- ~_Unlock() noexcept(false) +- { +- if (uncaught_exception()) +- __try { _M_lock.lock(); } __catch(...) { } +- else +- _M_lock.lock(); +- } +- _Lock& _M_lock; +- }; +- + unique_lock<mutex> __my_lock(_M_mutex); +- _Unlock __unlock(__lock); ++ _Unlock<_Lock> __unlock(__lock); + // _M_mutex must be unlocked before re-locking __lock so move + // ownership of _M_mutex lock to an object with shorter lifetime. + unique_lock<mutex> __my_lock2(std::move(__my_lock)); +@@ -233,11 +240,12 @@ + wait_until(_Lock& __lock, + const chrono::time_point<_Clock, _Duration>& __atime) + { +- unique_lock<mutex> __my_lock(_M_mutex); +- __lock.unlock(); +- cv_status __status = _M_cond.wait_until(__my_lock, __atime); +- __lock.lock(); +- return __status; ++ unique_lock<mutex> __my_lock(_M_mutex); ++ _Unlock<_Lock> __unlock(__lock); ++ // _M_mutex must be unlocked before re-locking __lock so move ++ // ownership of _M_mutex lock to an object with shorter lifetime. ++ unique_lock<mutex> __my_lock2(std::move(__my_lock)); ++ return _M_cond.wait_until(__my_lock2, __atime); + } + + template<typename _Lock, typename _Clock, +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/std/mutex gcc-4.6.3/libstdc++-v3/include/std/mutex +--- gcc-4.6.3.orig/libstdc++-v3/include/std/mutex 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/std/mutex 2012-07-07 13:35:52.084223000 -0500 +@@ -130,7 +130,7 @@ + public: + // matches a gthr-win32.h recursive mutex + template<typename _Rm> +- static typename enable_if<sizeof(&_Rm::sema), void>::type ++ static typename enable_if<(bool)sizeof(&_Rm::sema), void>::type + _S_destroy(_Rm* __mx) + { + __gthread_mutex_t __tmp; +@@ -139,7 +139,7 @@ + + // matches a recursive mutex with a member 'actual' + template<typename _Rm> +- static typename enable_if<sizeof(&_Rm::actual), void>::type ++ static typename enable_if<(bool)sizeof(&_Rm::actual), void>::type + _S_destroy(_Rm* __mx) + { __gthread_mutex_destroy(&__mx->actual); } + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/src/condition_variable.cc gcc-4.6.3/libstdc++-v3/src/condition_variable.cc +--- gcc-4.6.3.orig/libstdc++-v3/src/condition_variable.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/src/condition_variable.cc 2012-07-22 11:46:02.814828000 -0500 +@@ -1,6 +1,6 @@ + // condition_variable -*- C++ -*- + +-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2008, 2009, 2010, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -34,7 +34,12 @@ + { + #ifdef __GTHREAD_COND_INIT + __native_type __tmp = __GTHREAD_COND_INIT; ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&_M_cond, &__tmp, sizeof(_M_cond)); ++#else + _M_cond = __tmp; ++#endif + #else + int __e = __gthread_cond_init(&_M_cond, 0); + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc gcc-4.6.3/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc 2012-06-20 03:30:55.151768000 -0500 +@@ -0,0 +1,28 @@ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// { dg-do compile } ++ ++// 22.2.1 The ctype category ++ ++#include <locale> ++ ++// libstdc++/53678 ++void test01() ++{ ++ bool NetBSD __attribute__((unused)) = true; ++} +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc gcc-4.6.3/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc 2010-09-15 05:46:39.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc 2012-09-27 16:00:14.870001000 -0500 +@@ -1,7 +1,7 @@ + // { dg-require-namedlocale "de_DE" } + // { dg-require-namedlocale "es_ES" } + +-// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++// Copyright (C) 2004-2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -22,23 +22,60 @@ + #include <locale> + #include <testsuite_hooks.h> + +-int main() ++// Make sure that formatted output uses the locale in the output stream. ++using namespace std; ++locale l1 = locale("de_DE"); ++const num_put<char>& np = use_facet<num_put<char> >(l1); ++const numpunct<char>& npunct = use_facet<numpunct<char> >(l1); ++ ++void test01() + { +- using namespace std; ++ bool test __attribute__((unused)) = true; ++ ++ locale l2 = locale("C"); ++ const numpunct<char>& npunct2 = use_facet<numpunct<char> >(l2); ++ char c = npunct2.thousands_sep(); ++ string s = npunct2.grouping(); ++ ++ ostringstream oss; ++ oss.imbue(l2); ++ ++ long l = 1234567890; ++ np.put(oss.rdbuf(), oss, ' ', l); ++ string res = oss.str(); ++ ++ VERIFY( res == "1234567890" ); ++} + ++void test02() ++{ + bool test __attribute__((unused)) = true; +- locale l1 = locale("de_DE"); ++ + locale l2 = locale("es_ES"); +- +- const num_put<char>& np = use_facet<num_put<char> >(l1); ++ const numpunct<char>& npunct3 = use_facet<numpunct<char> >(l2); ++ char c = npunct3.thousands_sep(); ++ string s = npunct3.grouping(); ++ + ostringstream oss; + oss.imbue(l2); + + long l = 1234567890; +- np.put(oss.rdbuf(), oss, ' ', l); // 1234567890 ++ np.put(oss.rdbuf(), oss, ' ', l); + string res = oss.str(); +- +- VERIFY( res == "1234567890" ); + ++ if (!s.empty()) ++ VERIFY( res == "1.234.567.890" ); ++ else ++ VERIFY( res == "1234567890" ); ++} ++ ++int main() ++{ ++ // Sanity check. ++ char c = npunct.thousands_sep(); ++ string s = npunct.grouping(); ++ ++ test01(); ++ test02(); + return 0; + } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/array/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/array/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/array/range_access.cc 2010-08-10 05:28:47.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/array/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc 2011-01-05 14:52:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc 2010-03-15 20:32:53.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc 2010-10-17 12:34:38.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc 2009-07-31 21:26:32.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc 2009-07-31 21:26:32.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc 2009-12-15 23:16:46.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h 2009-12-15 23:16:46.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc 2009-12-11 16:04:56.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.h 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc 2012-03-08 16:31:19.955944000 -0600 +@@ -0,0 +1,43 @@ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++// ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++// ++// { dg-require-debug-mode "" } ++// { dg-options "-std=gnu++0x" } ++// { dg-do compile } ++ ++// PR libstdc++/52433 ++ ++#include <vector> ++ ++struct X ++{ ++ std::vector<int>::iterator i; ++ ++ X() = default; ++ X(const X&) = default; ++ X(X&&) = default; ++ X& operator=(const X&) = default; ++ X& operator=(X&&) = default; ++}; ++ ++X test01() ++{ ++ X x; ++ x = X(); ++ return x; ++} ++ +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/24_iterators/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/24_iterators/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/24_iterators/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/24_iterators/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc 2009-12-23 12:45:41.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc 2009-11-04 20:55:08.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -8,7 +8,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc 2009-12-23 12:45:41.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -1,6 +1,6 @@ + // { dg-options "-std=gnu++0x" } + +-// Copyright (C) 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +@@ -39,6 +39,11 @@ + const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17}; + const int N = sizeof(A) / sizeof(int); + ++// Check that starting with a true predicate works too. (PR52822) ++const int A2[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; ++const int B2[] = {2, 4, 6, 8, 10, 12, 14, 16, 3, 5, 7, 9, 11, 13, 15, 17}; ++const int N2 = sizeof(A2) / sizeof(int); ++ + struct Pred + { + bool +@@ -46,7 +51,7 @@ + { return (x.val % 2) == 0; } + }; + +-// 25.2.12 stable_partition() ++// 25.2.12 stable_partition(), starting with a false predicate. + void + test01() + { +@@ -60,9 +65,24 @@ + VERIFY( std::equal(s1, s1 + N, B) ); + } + ++// 25.2.12 stable_partition(), starting with a true predicate. ++void ++test02() ++{ ++ bool test __attribute__((unused)) = true; ++ ++ rvalstruct s1[N2]; ++ std::copy(A2, A2 + N2, s1); ++ Container con(s1, s1 + N2); ++ ++ std::stable_partition(con.begin(), con.end(), Pred()); ++ VERIFY( std::equal(s1, s1 + N2, B2) ); ++} ++ + int + main() + { + test01(); ++ test02(); + return 0; + } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -0,0 +1,43 @@ ++// { dg-options "-std=gnu++0x" } ++ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// 25.2.12 [lib.alg.partitions] Partitions. ++ ++#include <algorithm> ++#include <vector> ++#include <testsuite_hooks.h> ++ ++bool true_vector_pred(const std::vector<int>&) { return true; } ++ ++void ++test01() ++{ ++ std::vector<std::vector<int> > v(1); ++ v[0].push_back(7); ++ VERIFY( v[0].size() == 1 ); ++ std::stable_partition(v.begin(), v.end(), &true_vector_pred); ++ VERIFY( v[0].size() == 1 ); ++} ++ ++int ++main() ++{ ++ test01(); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/28_regex/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/28_regex/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/28_regex/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/28_regex/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc gcc-4.6.3/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc 2012-07-04 20:10:10.791368000 -0500 +@@ -0,0 +1,68 @@ ++// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } ++// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } } ++// { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } ++// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } ++// { dg-require-cstdint "" } ++// { dg-require-gthreads "" } ++// { dg-require-sched-yield "" } ++// { dg-require-nanosleep "" } ++ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// PR libstdc++/53830 ++// Test for deadlock in condition_variable_any::wait_for ++ ++#include <thread> ++#include <mutex> ++#include <condition_variable> ++#include <chrono> ++#include <atomic> ++ ++std::mutex mutex; ++std::condition_variable_any cv; ++ ++std::atomic<int> barrier(0); ++ ++// waits for data from another thread ++void wait_for_data() ++{ ++ std::unique_lock<std::mutex> lock(mutex); ++ barrier = 1; ++ cv.wait_for(lock, std::chrono::milliseconds(100), []{ return false; }); ++ // read data ++} ++ ++// passes data to waiting thread ++void provide_data() ++{ ++ while (barrier == 0) ++ std::this_thread::yield(); ++ std::unique_lock<std::mutex> lock(mutex); ++ // pass data ++ std::this_thread::sleep_for(std::chrono::seconds(1)); ++ cv.notify_one(); ++} ++ ++int main() ++{ ++ std::thread thread1(wait_for_data); ++ provide_data(); ++ thread1.join(); ++ return 0; ++} ++ +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc 2011-02-17 02:38:11.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc 2011-02-17 02:38:11.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.am gcc-4.6.3/libstdc++-v3/testsuite/Makefile.am +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.am 2011-03-02 17:32:56.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/Makefile.am 2012-04-08 20:42:09.946040000 -0500 +@@ -59,6 +59,7 @@ + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp ++ @echo 'set TEST_GCC_EXEC_PREFIX "$(libdir)/gcc/"' >> site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.in gcc-4.6.3/libstdc++-v3/testsuite/Makefile.in +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.in 2011-03-07 18:04:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/Makefile.in 2012-04-08 20:42:09.946040000 -0500 +@@ -502,6 +502,7 @@ + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp ++ @echo 'set TEST_GCC_EXEC_PREFIX "$(libdir)/gcc/"' >> site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc 2009-12-23 11:14:15.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + diff --git a/stage0/patches/common/linux-3.14.4-noperl-timeconst.patch b/stage0/patches/common/linux-3.14.4-noperl-timeconst.patch new file mode 100644 index 0000000..fa7098d --- /dev/null +++ b/stage0/patches/common/linux-3.14.4-noperl-timeconst.patch @@ -0,0 +1,254 @@ +Replace timeconst.bc with the c version I've been using for years (to replace +the perl version). Eventually I should add bc to toybox, but for now... + +--- /dev/null ++++ linux/kernel/mktimeconst.c +@@ -0,0 +1,110 @@ ++/* Copyright 2010 Parallels Inc, licensed under GPLv2 */ ++/* Copyright 2010-2013 Rob Landley <rob@landley.net> */ ++ ++#include <inttypes.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++int main(int argc, char *argv[]) ++{ ++ uint64_t hz, periods[] = {1000, 1000000}; ++ char *names[] = {"MSEC", "USEC"}; ++ FILE *file; ++ int i, j; ++ ++ if (argc != 3 || (hz = atol(argv[1])) < 1 ++ || !(file = fopen(argv[2], "w"))) ++ { ++ fprintf(stderr, "Usage: mktimeconst HZ FILENAME\n\n"); ++ fprintf(stderr, "Generate a header file with constants to convert between\n"); ++ fprintf(stderr, "decimal HZ timer ticks and milisecond or microsecond delays,\n"); ++ fprintf(stderr, "using reciprocal multiplication to avoid 64 bit division.\n"); ++ exit(1); ++ } ++ ++ fprintf(file, ++ "/* Automatically generated by kernel/mktimeconst */\n" ++ "/* Conversion constants for HZ == %"PRIu64" */\n\n" ++ "#ifndef __KERNEL_TIMECONST_H\n" ++ "#define __KERNEL_TIMECONST_H\n\n" ++ "#include <linux/param.h>\n" ++ "#include <linux/types.h>\n\n" ++ "#if HZ != %"PRIu64"\n" ++ "#error \"kernel/timeconst.h has the wrong HZ value!\"\n" ++ "#endif\n\n", hz, hz); ++ ++ /* Repeat for MSEC and USEC */ ++ ++ for (i = 0; i < 2; i++) { ++ uint64_t gcd, period; ++ ++ /* Find greatest common denominator using Euclid's algorithm. */ ++ ++ gcd = hz; ++ period = periods[i]; ++ while (period) { ++ uint64_t temp = gcd % period; ++ gcd = period; ++ period = temp; ++ } ++ ++ /* Output both directions (HZ_TO_PERIOD and PERIOD_TO_HZ) */ ++ ++ for (j = 0; j < 2; j++) { ++ char name[16]; ++ uint64_t from = j ? periods[i] : hz; ++ uint64_t to = j ? hz : periods[i]; ++ uint64_t mul32 = 0, adj32 = 0, shift = 0; ++ ++ sprintf(name, j ? "%s_TO_HZ" : "HZ_TO_%s", names[i]); ++ ++ /* Figure out what shift value gives 32 significant ++ bits of MUL32 data. (Worst case to=1 from=1000000 ++ uses 52 bits, to<<shift won't overflow 64 bit math.) ++ */ ++ ++ for (;;) { ++ mul32 = ((to << shift) + from - 1) / from; ++ if (mul32 >= (1UL<<31)) ++ break; ++ shift++; ++ } ++ ++ /* ADJ32 is is just (((FROM/GCD)-1)<<SHIFT)/(FROM/GCD) ++ but this can overflow 64 bit math (examples, HZ=24 ++ or HZ=122). Worst case scenario uses 32+20+20=72 ++ bits. Workaround: split off bottom 32 bits and ++ reassemble after calculation (32+64=96 bits). */ ++ ++ adj32 = from / gcd; ++ ++ if (shift > 32) { ++ uint64_t upper, lower; ++ ++ upper = (adj32 - 1) << (shift - 32); ++ lower = (upper % adj32) << 32; ++ adj32 = ((upper/adj32) << 32) + (lower/adj32); ++ } else ++ adj32 = ((adj32 - 1) << shift) / adj32; ++ ++ /* Emit the constants into the header file. */ ++ ++ fprintf(file, "#define %s_MUL32\tU64_C(0x%"PRIx64")\n", ++ name, mul32); ++ fprintf(file, "#define %s_ADJ32\tU64_C(0x%"PRIx64")\n", ++ name, adj32); ++ fprintf(file, "#define %s_SHR32\t%"PRIu64"\n", ++ name, shift); ++ fprintf(file, "#define %s_NUM\t\tU64_C(%"PRIu64")\n", ++ name, to/gcd); ++ fprintf(file, "#define %s_DEN\t\tU64_C(%"PRIu64")\n\n", ++ name, from/gcd); ++ } ++ } ++ fprintf(file, "#endif /* __KERNEL_TIMECONST_H */\n"); ++ ++ /* Notice if the disk fills up. */ ++ ++ fflush(stdout); ++ return ferror(stdout); ++} +--- linux/kernel/timeconst.bc 2013-04-28 19:36:01.000000000 -0500 ++++ /dev/null 2013-02-23 10:58:11.743993346 -0600 +@@ -1,108 +0,0 @@ +-scale=0 +- +-define gcd(a,b) { +- auto t; +- while (b) { +- t = b; +- b = a % b; +- a = t; +- } +- return a; +-} +- +-/* Division by reciprocal multiplication. */ +-define fmul(b,n,d) { +- return (2^b*n+d-1)/d; +-} +- +-/* Adjustment factor when a ceiling value is used. Use as: +- (imul * n) + (fmulxx * n + fadjxx) >> xx) */ +-define fadj(b,n,d) { +- auto v; +- d = d/gcd(n,d); +- v = 2^b*(d-1)/d; +- return v; +-} +- +-/* Compute the appropriate mul/adj values as well as a shift count, +- which brings the mul value into the range 2^b-1 <= x < 2^b. Such +- a shift value will be correct in the signed integer range and off +- by at most one in the upper half of the unsigned range. */ +-define fmuls(b,n,d) { +- auto s, m; +- for (s = 0; 1; s++) { +- m = fmul(s,n,d); +- if (m >= 2^(b-1)) +- return s; +- } +- return 0; +-} +- +-define timeconst(hz) { +- print "/* Automatically generated by kernel/timeconst.bc */\n" +- print "/* Time conversion constants for HZ == ", hz, " */\n" +- print "\n" +- +- print "#ifndef KERNEL_TIMECONST_H\n" +- print "#define KERNEL_TIMECONST_H\n\n" +- +- print "#include <linux/param.h>\n" +- print "#include <linux/types.h>\n\n" +- +- print "#if HZ != ", hz, "\n" +- print "#error \qkernel/timeconst.h has the wrong HZ value!\q\n" +- print "#endif\n\n" +- +- if (hz < 2) { +- print "#error Totally bogus HZ value!\n" +- } else { +- s=fmuls(32,1000,hz) +- obase=16 +- print "#define HZ_TO_MSEC_MUL32\tU64_C(0x", fmul(s,1000,hz), ")\n" +- print "#define HZ_TO_MSEC_ADJ32\tU64_C(0x", fadj(s,1000,hz), ")\n" +- obase=10 +- print "#define HZ_TO_MSEC_SHR32\t", s, "\n" +- +- s=fmuls(32,hz,1000) +- obase=16 +- print "#define MSEC_TO_HZ_MUL32\tU64_C(0x", fmul(s,hz,1000), ")\n" +- print "#define MSEC_TO_HZ_ADJ32\tU64_C(0x", fadj(s,hz,1000), ")\n" +- obase=10 +- print "#define MSEC_TO_HZ_SHR32\t", s, "\n" +- +- obase=10 +- cd=gcd(hz,1000) +- print "#define HZ_TO_MSEC_NUM\t\t", 1000/cd, "\n" +- print "#define HZ_TO_MSEC_DEN\t\t", hz/cd, "\n" +- print "#define MSEC_TO_HZ_NUM\t\t", hz/cd, "\n" +- print "#define MSEC_TO_HZ_DEN\t\t", 1000/cd, "\n" +- print "\n" +- +- s=fmuls(32,1000000,hz) +- obase=16 +- print "#define HZ_TO_USEC_MUL32\tU64_C(0x", fmul(s,1000000,hz), ")\n" +- print "#define HZ_TO_USEC_ADJ32\tU64_C(0x", fadj(s,1000000,hz), ")\n" +- obase=10 +- print "#define HZ_TO_USEC_SHR32\t", s, "\n" +- +- s=fmuls(32,hz,1000000) +- obase=16 +- print "#define USEC_TO_HZ_MUL32\tU64_C(0x", fmul(s,hz,1000000), ")\n" +- print "#define USEC_TO_HZ_ADJ32\tU64_C(0x", fadj(s,hz,1000000), ")\n" +- obase=10 +- print "#define USEC_TO_HZ_SHR32\t", s, "\n" +- +- obase=10 +- cd=gcd(hz,1000000) +- print "#define HZ_TO_USEC_NUM\t\t", 1000000/cd, "\n" +- print "#define HZ_TO_USEC_DEN\t\t", hz/cd, "\n" +- print "#define USEC_TO_HZ_NUM\t\t", hz/cd, "\n" +- print "#define USEC_TO_HZ_DEN\t\t", 1000000/cd, "\n" +- print "\n" +- +- print "#endif /* KERNEL_TIMECONST_H */\n" +- } +- halt +-} +- +-timeconst(hz) +--- linux/kernel/Makefile ++++ linux/kernel/Makefile +@@ -125,19 +125,13 @@ + + $(obj)/time.o: $(obj)/timeconst.h + +-quiet_cmd_hzfile = HZFILE $@ +- cmd_hzfile = echo "hz=$(CONFIG_HZ)" > $@ +- +-targets += hz.bc +-$(obj)/hz.bc: $(objtree)/include/config/hz.h FORCE +- $(call if_changed,hzfile) +- +-quiet_cmd_bc = BC $@ +- cmd_bc = bc -q $(filter-out FORCE,$^) > $@ ++hostprogs-y += mktimeconst ++quiet_cmd_mktimeconst = TIMEC $@ ++ cmd_mktimeconst = $(obj)/mktimeconst $(CONFIG_HZ) $@ || ( rm -f $@ && exit 1 ) + + targets += timeconst.h +-$(obj)/timeconst.h: $(obj)/hz.bc $(src)/timeconst.bc FORCE +- $(call if_changed,bc) ++$(obj)/timeconst.h: $(obj)/mktimeconst FORCE ++ $(call if_changed,mktimeconst) + + ifeq ($(CONFIG_MODULE_SIG),y) + # diff --git a/stage0/patches/common/mpfr-3.1.2-fixes-3.patch b/stage0/patches/common/mpfr-3.1.2-fixes-3.patch new file mode 100644 index 0000000..6a93309 --- /dev/null +++ b/stage0/patches/common/mpfr-3.1.2-fixes-3.patch @@ -0,0 +1,1280 @@ +Submitted By: William Harrington (kb0iic at cross-lfs dot org) +Date: 2014-05-09 +Initial Package Version: 3.1.2 +Origin: Upstream +Upstream Status: Applied +Description: Contains all upstream patches of mpfr current to patch level 8. + +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:52:52.000000000 +0000 +@@ -0,0 +1 @@ ++exp_2 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-03-13 15:37:28.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-09-26 10:52:52.000000000 +0000 +@@ -1 +1 @@ +-3.1.2 ++3.1.2-p1 +diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c +--- mpfr-3.1.2-a/src/exp_2.c 2013-03-13 15:37:28.000000000 +0000 ++++ mpfr-3.1.2-b/src/exp_2.c 2013-09-26 10:52:52.000000000 +0000 +@@ -204,7 +204,7 @@ + for (k = 0; k < K; k++) + { + mpz_mul (ss, ss, ss); +- exps <<= 1; ++ exps *= 2; + exps += mpz_normalize (ss, ss, q); + } + mpfr_set_z (s, ss, MPFR_RNDN); +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-03-13 15:37:37.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2" ++#define MPFR_VERSION_STRING "3.1.2-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-03-13 15:37:34.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:52:52.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2"; ++ return "3.1.2-p1"; + } +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-09-26 10:56:55.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:56:55.000000000 +0000 +@@ -0,0 +1 @@ ++fits-smallneg +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-09-26 10:56:55.000000000 +0000 +@@ -1 +1 @@ +-3.1.2-p1 ++3.1.2-p2 +diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h +--- mpfr-3.1.2-a/src/fits_u.h 2013-03-13 15:37:35.000000000 +0000 ++++ mpfr-3.1.2-b/src/fits_u.h 2013-09-26 10:56:55.000000000 +0000 +@@ -32,17 +32,20 @@ + int res; + + if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) +- /* Zero always fit */ +- return MPFR_IS_ZERO (f) ? 1 : 0; +- else if (MPFR_IS_NEG (f)) +- /* Negative numbers don't fit */ +- return 0; +- /* now it fits if +- (a) f <= MAXIMUM +- (b) round(f, prec(slong), rnd) <= MAXIMUM */ ++ return MPFR_IS_ZERO (f) ? 1 : 0; /* Zero always fits */ + + e = MPFR_GET_EXP (f); + ++ if (MPFR_IS_NEG (f)) ++ return e >= 1 ? 0 /* f <= -1 does not fit */ ++ : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1) /* directed mode */ ++ : e < 0 ? 1 /* f > -1/2 fits in MPFR_RNDN */ ++ : mpfr_powerof2_raw(f); /* -1/2 fits, -1 < f < -1/2 don't */ ++ ++ /* Now it fits if ++ (a) f <= MAXIMUM ++ (b) round(f, prec(slong), rnd) <= MAXIMUM */ ++ + /* first compute prec(MAXIMUM); fits in an int */ + for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++); + +diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c +--- mpfr-3.1.2-a/src/fits_uintmax.c 2013-03-13 15:37:33.000000000 +0000 ++++ mpfr-3.1.2-b/src/fits_uintmax.c 2013-09-26 10:56:55.000000000 +0000 +@@ -27,51 +27,19 @@ + #include "mpfr-intmax.h" + #include "mpfr-impl.h" + +-#ifdef _MPFR_H_HAVE_INTMAX_T +- +-/* We can't use fits_u.h <= mpfr_cmp_ui */ +-int +-mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd) +-{ +- mpfr_exp_t e; +- int prec; +- uintmax_t s; +- mpfr_t x; +- int res; +- +- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) +- /* Zero always fit */ +- return MPFR_IS_ZERO (f) ? 1 : 0; +- else if (MPFR_IS_NEG (f)) +- /* Negative numbers don't fit */ +- return 0; +- /* now it fits if +- (a) f <= MAXIMUM +- (b) round(f, prec(slong), rnd) <= MAXIMUM */ +- +- e = MPFR_GET_EXP (f); +- +- /* first compute prec(MAXIMUM); fits in an int */ +- for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++); +- +- /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */ +- +- /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */ +- if (e <= prec - 1) +- return 1; ++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it ++ above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not ++ defined; this is necessary to avoid an empty translation unit, which ++ is forbidden by ISO C. Without this, a failing test can be reproduced ++ by creating an invalid stdint.h somewhere in the default include path ++ and by compiling MPFR with "gcc -ansi -pedantic-errors". */ + +- /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */ +- if (e >= prec + 1) +- return 0; ++#ifdef _MPFR_H_HAVE_INTMAX_T + +- MPFR_ASSERTD (e == prec); ++#define FUNCTION mpfr_fits_uintmax_p ++#define MAXIMUM MPFR_UINTMAX_MAX ++#define TYPE uintmax_t + +- /* hard case: first round to prec bits, then check */ +- mpfr_init2 (x, prec); +- mpfr_set (x, f, rnd); +- res = MPFR_GET_EXP (x) == e; +- mpfr_clear (x); +- return res; +-} ++#include "fits_u.h" + + #endif +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:56:55.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p1" ++#define MPFR_VERSION_STRING "3.1.2-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:56:55.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p1"; ++ return "3.1.2-p2"; + } +diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c +--- mpfr-3.1.2-a/tests/tfits.c 2013-03-13 15:37:45.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tfits.c 2013-09-26 10:56:55.000000000 +0000 +@@ -33,155 +33,176 @@ + #include "mpfr-intmax.h" + #include "mpfr-test.h" + +-#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); } +-#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); } ++#define ERROR1(N) \ ++ do \ ++ { \ ++ printf("Error %d for rnd = %s and x = ", N, \ ++ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); \ ++ mpfr_dump(x); \ ++ exit(1); \ ++ } \ ++ while (0) + + static void check_intmax (void); + + int + main (void) + { +- mpfr_t x; ++ mpfr_t x, y; ++ int i, r; + + tests_start_mpfr (); + + mpfr_init2 (x, 256); ++ mpfr_init2 (y, 8); + +- /* Check NAN */ +- mpfr_set_nan (x); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ RND_LOOP (r) ++ { + +- /* Check INF */ +- mpfr_set_inf (x, 1); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check NAN */ ++ mpfr_set_nan (x); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (1); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (2); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (3); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (4); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (5); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (6); + +- /* Check Zero */ +- MPFR_SET_ZERO (x); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check INF */ ++ mpfr_set_inf (x, 1); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (7); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (8); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (9); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (10); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (11); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (12); + +- /* Check small op */ +- mpfr_set_str1 (x, "1@-1"); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check Zero */ ++ MPFR_SET_ZERO (x); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (13); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (14); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (15); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (16); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (17); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (18); + +- /* Check 17 */ +- mpfr_set_ui (x, 17, MPFR_RNDN); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check small positive op */ ++ mpfr_set_str1 (x, "1@-1"); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (19); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (20); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (21); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (22); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (23); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (24); + +- /* Check all other values */ +- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); +- mpfr_mul_2exp (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_mul_2exp (x, x, 40, MPFR_RNDN); +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check 17 */ ++ mpfr_set_ui (x, 17, MPFR_RNDN); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (25); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (26); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (27); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (28); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (29); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (30); + +- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); +- if (!mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); +- if (!mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, INT_MAX, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); +- if (!mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check all other values */ ++ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); ++ mpfr_mul_2exp (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (31); ++ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (32); ++ mpfr_mul_2exp (x, x, 40, MPFR_RNDN); ++ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (33); ++ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (34); ++ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (35); ++ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (36); ++ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (37); + +- mpfr_set_si (x, 1, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; ++ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (38); ++ mpfr_set_ui (x, LONG_MAX, MPFR_RNDN); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (39); ++ mpfr_set_ui (x, UINT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (40); ++ mpfr_set_ui (x, INT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (41); ++ mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (42); ++ mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (43); + +- /* Check negative value */ +- mpfr_set_si (x, -1, MPFR_RNDN); +- if (!mpfr_fits_sint_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_sshort_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_slong_p (x, MPFR_RNDN)) +- ERROR2; +- if (mpfr_fits_uint_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ushort_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_ulong_p (x, MPFR_RNDN)) +- ERROR1; ++ mpfr_set_si (x, 1, MPFR_RNDN); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (44); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (45); ++ ++ /* Check negative op */ ++ for (i = 1; i <= 4; i++) ++ { ++ int inv; ++ ++ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); ++ mpfr_rint (y, x, (mpfr_rnd_t) r); ++ inv = MPFR_NOTZERO (y); ++ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (46); ++ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (47); ++ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (48); ++ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (49); ++ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (50); ++ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (51); ++ } ++ } + + mpfr_clear (x); ++ mpfr_clear (y); + + check_intmax (); + +@@ -189,85 +210,98 @@ + return 0; + } + +-static void check_intmax (void) ++static void ++check_intmax (void) + { + #ifdef _MPFR_H_HAVE_INTMAX_T +- mpfr_t x; ++ mpfr_t x, y; ++ int i, r; + +- mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT); ++ mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT); ++ mpfr_init2 (y, 8); + +- /* Check NAN */ +- mpfr_set_nan (x); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ RND_LOOP (r) ++ { ++ /* Check NAN */ ++ mpfr_set_nan (x); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (52); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (53); + +- /* Check INF */ +- mpfr_set_inf (x, 1); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check INF */ ++ mpfr_set_inf (x, 1); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (54); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (55); + +- /* Check Zero */ +- MPFR_SET_ZERO (x); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check Zero */ ++ MPFR_SET_ZERO (x); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (56); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (57); + +- /* Check small op */ +- mpfr_set_str1 (x, "1@-1"); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check positive small op */ ++ mpfr_set_str1 (x, "1@-1"); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (58); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (59); + +- /* Check 17 */ +- mpfr_set_ui (x, 17, MPFR_RNDN); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; ++ /* Check 17 */ ++ mpfr_set_ui (x, 17, MPFR_RNDN); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (60); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (61); + +- /* Check hugest */ +- mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check hugest */ ++ mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (62); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (63); + +- /* Check all other values */ +- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); +- mpfr_add_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); +- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); +- mpfr_add_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; +- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- mpfr_sub_ui (x, x, 1, MPFR_RNDN); +- if (mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check all other values */ ++ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); ++ mpfr_add_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (64); ++ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (65); ++ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); ++ mpfr_add_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (66); ++ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (67); ++ mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (68); ++ mpfr_sub_ui (x, x, 1, MPFR_RNDN); ++ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (69); + +- /* Check negative value */ +- mpfr_set_si (x, -1, MPFR_RNDN); +- if (!mpfr_fits_intmax_p (x, MPFR_RNDN)) +- ERROR2; +- if (mpfr_fits_uintmax_p (x, MPFR_RNDN)) +- ERROR1; ++ /* Check negative op */ ++ for (i = 1; i <= 4; i++) ++ { ++ int inv; ++ ++ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN); ++ mpfr_rint (y, x, (mpfr_rnd_t) r); ++ inv = MPFR_NOTZERO (y); ++ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv) ++ ERROR1 (70); ++ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r)) ++ ERROR1 (71); ++ } ++ } + + mpfr_clear (x); ++ mpfr_clear (y); + #endif + } +- +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-10-09 13:34:21.000000000 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-10-09 13:34:21.000000000 +0000 +@@ -0,0 +1 @@ ++clang-divby0 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-10-09 13:34:21.000000000 +0000 +@@ -1 +1 @@ +-3.1.2-p2 ++3.1.2-p3 +diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h +--- mpfr-3.1.2-a/src/mpfr-impl.h 2013-03-13 15:37:36.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000 +@@ -468,8 +468,16 @@ + #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1) + + /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0 +- at compile time. */ +-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200) ++ at compile time. ++ Clang with -fsanitize=undefined is a bit similar due to a bug: ++ http://llvm.org/bugs/show_bug.cgi?id=17381 ++ but even without its sanitizer, it may be better to use the ++ double_zero version until IEEE 754 division by zero is properly ++ supported: ++ http://llvm.org/bugs/show_bug.cgi?id=17000 ++*/ ++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \ ++ defined(__clang__) + static double double_zero = 0.0; + # define DBL_NAN (double_zero/double_zero) + # define DBL_POS_INF ((double) 1.0/double_zero) +@@ -501,6 +509,8 @@ + (with Xcode 2.4.1, i.e. the latest one). */ + #define LVALUE(x) (&(x) == &(x) || &(x) != &(x)) + #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX)) ++/* The DOUBLE_ISNAN(x) macro is also valid on long double x ++ (assuming that the compiler isn't too broken). */ + #ifdef MPFR_NANISNAN + /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations. + The + must not be replaced by a ||. With gcc -ffast-math, NaN is +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-10-09 13:34:21.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p2" ++#define MPFR_VERSION_STRING "3.1.2-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-10-09 13:34:21.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p2"; ++ return "3.1.2-p3"; + } +diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c +--- mpfr-3.1.2-a/tests/tget_flt.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tget_flt.c 2013-10-09 13:34:21.000000000 +0000 +@@ -28,9 +28,17 @@ + main (void) + { + mpfr_t x, y; +- float f, g, infp; ++ float f, g; + int i; ++#if !defined(MPFR_ERRDIVZERO) ++ float infp; ++#endif ++ ++ tests_start_mpfr (); + ++#if !defined(MPFR_ERRDIVZERO) ++ /* The definition of DBL_POS_INF involves a division by 0. This makes ++ "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */ + infp = (float) DBL_POS_INF; + if (infp * 0.5 != infp) + { +@@ -38,8 +46,7 @@ + fprintf (stderr, "(this is probably a compiler bug, please report)\n"); + exit (1); + } +- +- tests_start_mpfr (); ++#endif + + mpfr_init2 (x, 24); + mpfr_init2 (y, 24); +@@ -353,6 +360,7 @@ + printf ("expected %.8e, got %.8e\n", g, f); + exit (1); + } ++#if !defined(MPFR_ERRDIVZERO) + f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule), + thus we should get +Inf */ + g = infp; +@@ -376,6 +384,7 @@ + printf ("expected %.8e, got %.8e\n", g, f); + exit (1); + } ++#endif + + mpfr_clear (x); + mpfr_clear (y); +diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c +--- mpfr-3.1.2-a/tests/tset_ld.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tset_ld.c 2013-10-09 13:34:21.000000000 +0000 +@@ -47,8 +47,11 @@ + static int + Isnan_ld (long double d) + { +- double e = (double) d; +- if (DOUBLE_ISNAN (e)) ++ /* Do not convert d to double as this can give an overflow, which ++ may confuse compilers without IEEE 754 support (such as clang ++ -fsanitize=undefined), or trigger a trap if enabled. ++ The DOUBLE_ISNAN macro should work fine on long double. */ ++ if (DOUBLE_ISNAN (d)) + return 1; + LONGDOUBLE_NAN_ACTION (d, goto yes); + return 0; +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-11-15 00:51:49.211333830 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-11-15 00:51:49.323334999 +0000 +@@ -0,0 +1 @@ ++printf-alt0 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-11-15 00:51:49.211333830 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-11-15 00:51:49.323334999 +0000 +@@ -1 +1 @@ +-3.1.2-p3 ++3.1.2-p4 +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-11-15 00:51:49.211333830 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-11-15 00:51:49.323334999 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p3" ++#define MPFR_VERSION_STRING "3.1.2-p4" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c +--- mpfr-3.1.2-a/src/vasprintf.c 2013-03-13 15:37:37.000000000 +0000 ++++ mpfr-3.1.2-b/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000 +@@ -1040,7 +1040,7 @@ + } + + /* Determine the different parts of the string representation of the regular +- number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'. ++ number P when spec.spec is 'e', 'E', 'g', or 'G'. + DEC_INFO contains the previously computed exponent and string or is NULL. + + return -1 if some field > INT_MAX */ +@@ -1167,7 +1167,7 @@ + } + + /* Determine the different parts of the string representation of the regular +- number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'. ++ number P when spec.spec is 'f', 'F', 'g', or 'G'. + DEC_INFO contains the previously computed exponent and string or is NULL. + + return -1 if some field of number_parts is greater than INT_MAX */ +@@ -1559,7 +1559,7 @@ + /* fractional part */ + { + np->point = MPFR_DECIMAL_POINT; +- np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ? ++ np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ? + spec.prec - 1 : spec.prec; + } + else if (spec.alt) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-11-15 00:51:49.211333830 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-11-15 00:51:49.323334999 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p3"; ++ return "3.1.2-p4"; + } +diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c +--- mpfr-3.1.2-a/tests/tsprintf.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000 +@@ -456,10 +456,16 @@ + check_sprintf ("1.999900 ", "%-#10.7RG", x); + check_sprintf ("1.9999 ", "%-10.7RG", x); + mpfr_set_ui (x, 1, MPFR_RNDN); ++ check_sprintf ("1.", "%#.1Rg", x); ++ check_sprintf ("1. ", "%-#5.1Rg", x); ++ check_sprintf (" 1.0", "%#5.2Rg", x); + check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x); + check_sprintf ("1", "%.30Rg", x); + mpfr_set_ui (x, 0, MPFR_RNDN); +- check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x); ++ check_sprintf ("0.", "%#.1Rg", x); ++ check_sprintf ("0. ", "%-#5.1Rg", x); ++ check_sprintf (" 0.0", "%#5.2Rg", x); ++ check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x); + check_sprintf ("0", "%.30Rg", x); + + /* following tests with precision 53 bits */ +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2013-12-01 11:07:49.575329762 +0000 ++++ mpfr-3.1.2-b/PATCHES 2013-12-01 11:07:49.751331625 +0000 +@@ -0,0 +1 @@ ++custom_init_set +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2013-12-01 11:07:49.571329714 +0000 ++++ mpfr-3.1.2-b/VERSION 2013-12-01 11:07:49.747331585 +0000 +@@ -1 +1 @@ +-3.1.2-p4 ++3.1.2-p5 +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2013-12-01 11:07:49.571329714 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2013-12-01 11:07:49.747331585 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p4" ++#define MPFR_VERSION_STRING "3.1.2-p5" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +@@ -861,7 +861,7 @@ + _t = (mpfr_kind_t) _k; \ + _s = 1; \ + } else { \ +- _t = (mpfr_kind_t) -k; \ ++ _t = (mpfr_kind_t) - _k; \ + _s = -1; \ + } \ + _e = _t == MPFR_REGULAR_KIND ? (e) : \ +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2013-12-01 11:07:49.575329762 +0000 ++++ mpfr-3.1.2-b/src/version.c 2013-12-01 11:07:49.747331585 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p4"; ++ return "3.1.2-p5"; + } +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2014-04-15 21:56:49.609057464 +0000 ++++ mpfr-3.1.2-b/PATCHES 2014-04-15 21:56:49.697059857 +0000 +@@ -0,0 +1 @@ ++li2-return +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2014-04-15 21:56:49.609057464 +0000 ++++ mpfr-3.1.2-b/VERSION 2014-04-15 21:56:49.697059857 +0000 +@@ -1 +1 @@ +-3.1.2-p5 ++3.1.2-p6 +diff -Naurd mpfr-3.1.2-a/src/li2.c mpfr-3.1.2-b/src/li2.c +--- mpfr-3.1.2-a/src/li2.c 2013-03-13 15:37:32.000000000 +0000 ++++ mpfr-3.1.2-b/src/li2.c 2014-04-15 21:56:49.653058661 +0000 +@@ -630,5 +630,5 @@ + return mpfr_check_range (y, inexact, rnd_mode); + } + +- MPFR_ASSERTN (0); /* should never reach this point */ ++ MPFR_RET_NEVER_GO_HERE (); + } +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 21:56:49.609057464 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 21:56:49.697059857 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p5" ++#define MPFR_VERSION_STRING "3.1.2-p6" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2014-04-15 21:56:49.609057464 +0000 ++++ mpfr-3.1.2-b/src/version.c 2014-04-15 21:56:49.697059857 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p5"; ++ return "3.1.2-p6"; + } +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2014-04-15 22:04:57.090286262 +0000 ++++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:04:57.162288198 +0000 +@@ -0,0 +1 @@ ++exp3 +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2014-04-15 22:04:57.086286154 +0000 ++++ mpfr-3.1.2-b/VERSION 2014-04-15 22:04:57.162288198 +0000 +@@ -1 +1 @@ +-3.1.2-p6 ++3.1.2-p7 +diff -Naurd mpfr-3.1.2-a/src/exp3.c mpfr-3.1.2-b/src/exp3.c +--- mpfr-3.1.2-a/src/exp3.c 2013-03-13 15:37:34.000000000 +0000 ++++ mpfr-3.1.2-b/src/exp3.c 2014-04-15 22:04:57.126287230 +0000 +@@ -283,7 +283,7 @@ + } + } + +- if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ, ++ if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ, + MPFR_PREC(y) + (rnd_mode == MPFR_RNDN))) + { + inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode); +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:04:57.086286154 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:04:57.162288198 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p6" ++#define MPFR_VERSION_STRING "3.1.2-p7" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2014-04-15 22:04:57.090286262 +0000 ++++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:04:57.162288198 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p6"; ++ return "3.1.2-p7"; + } +diff -Naurd mpfr-3.1.2-a/tests/texp.c mpfr-3.1.2-b/tests/texp.c +--- mpfr-3.1.2-a/tests/texp.c 2013-03-13 15:37:44.000000000 +0000 ++++ mpfr-3.1.2-b/tests/texp.c 2014-04-15 22:04:57.126287230 +0000 +@@ -150,6 +150,22 @@ + exit (1); + } + ++ mpfr_set_prec (x, 118); ++ mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86"); ++ mpfr_set_prec (y, 118); ++ mpfr_exp_2 (y, x, MPFR_RNDU); ++ mpfr_exp_3 (x, x, MPFR_RNDU); ++ if (mpfr_cmp (x, y)) ++ { ++ printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n"); ++ printf ("mpfr_exp_2 gives "); ++ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); ++ printf ("\nmpfr_exp_3 gives "); ++ mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN); ++ printf ("\n"); ++ exit (1); ++ } ++ + mpfr_clear (x); + mpfr_clear (y); + return 0; +diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES +--- mpfr-3.1.2-a/PATCHES 2014-04-15 22:20:32.243481506 +0000 ++++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:22:32.418722707 +0000 +@@ -0,0 +1 @@ ++gmp6-compat +diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION +--- mpfr-3.1.2-a/VERSION 2014-04-15 22:20:20.755171478 +0000 ++++ mpfr-3.1.2-b/VERSION 2014-04-15 22:21:45.225450147 +0000 +@@ -1 +1 @@ +-3.1.2-p7 ++3.1.2-p8 +diff -Naurd mpfr-3.1.2-a/configure mpfr-3.1.2-b/configure +--- mpfr-3.1.2-a/configure 2013-03-13 15:38:20.000000000 +0000 ++++ mpfr-3.1.2-b/configure 2014-04-15 22:21:38.821277476 +0000 +@@ -14545,26 +14545,30 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-if test "$use_gmp_build" = yes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid GMP_NUMB_BITS" >&5 +-$as_echo_n "checking for valid GMP_NUMB_BITS... " >&6; } +- if test "$cross_compiling" = yes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency" >&5 ++$as_echo_n "checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency... " >&6; } ++if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't test" >&5 + $as_echo "can't test" >&6; } + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include <stdio.h> + #include <limits.h> + #include "gmp.h" +-#include "gmp-impl.h" + + int + main () + { + +- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT +- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1; ++ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT) ++ return 0; ++ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS); ++ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t)); ++ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n", ++ (long) (sizeof(mp_limb_t) * CHAR_BIT)); ++ return 1; + + ; + return 0; +@@ -14577,14 +14581,14 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- as_fn_error $? "GMP_NUMB_BITS is incorrect. +-You probably need to change some of the GMP or MPFR compile options." "$LINENO" 5 ++ as_fn_error $? "GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent. ++You probably need to change some of the GMP or MPFR compile options. ++See 'config.log' for details (search for GMP_NUMB_BITS)." "$LINENO" 5 + fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +-fi + + + if test "$dont_link_with_gmp" = yes ; then +diff -Naurd mpfr-3.1.2-a/configure.ac mpfr-3.1.2-b/configure.ac +--- mpfr-3.1.2-a/configure.ac 2013-03-13 15:37:46.000000000 +0000 ++++ mpfr-3.1.2-b/configure.ac 2013-03-13 15:37:46.000000000 +0000 +@@ -435,23 +435,29 @@ + ]) + fi + +-dnl Check for valid GMP_NUMB_BITS and BYTES_PER_MP_LIMB ++dnl Check for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency. ++dnl Problems may occur if gmp.h was generated with some ABI ++dnl and is used with another ABI (or if nails are used). + dnl This test doesn't need to link with libgmp (at least it shouldn't). +-if test "$use_gmp_build" = yes ; then +- AC_MSG_CHECKING(for valid GMP_NUMB_BITS) +- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ ++AC_MSG_CHECKING(for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency) ++AC_RUN_IFELSE([AC_LANG_PROGRAM([[ ++#include <stdio.h> + #include <limits.h> + #include "gmp.h" +-#include "gmp-impl.h" + ]], [[ +- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT +- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1; ++ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT) ++ return 0; ++ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS); ++ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t)); ++ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n", ++ (long) (sizeof(mp_limb_t) * CHAR_BIT)); ++ return 1; + ]])], [AC_MSG_RESULT(yes)], [ + AC_MSG_RESULT(no) +- AC_MSG_ERROR([GMP_NUMB_BITS is incorrect. +-You probably need to change some of the GMP or MPFR compile options.])], ++ AC_MSG_ERROR([GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent. ++You probably need to change some of the GMP or MPFR compile options. ++See 'config.log' for details (search for GMP_NUMB_BITS).])], + [AC_MSG_RESULT([can't test])]) +-fi + + + dnl We really need to link using libtool. But it is impossible with the current +diff -Naurd mpfr-3.1.2-a/src/init2.c mpfr-3.1.2-b/src/init2.c +--- mpfr-3.1.2-a/src/init2.c 2013-03-13 15:37:32.000000000 +0000 ++++ mpfr-3.1.2-b/src/init2.c 2014-04-15 22:21:06.220398489 +0000 +@@ -30,11 +30,11 @@ + + /* Check if we can represent the number of limbs + * associated to the maximum of mpfr_prec_t*/ +- MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) ); ++ MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) ); + +- /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */ +- MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT +- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ); ++ /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */ ++ MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT ++ && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB ); + + MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS); + +diff -Naurd mpfr-3.1.2-a/src/mpfr-gmp.h mpfr-3.1.2-b/src/mpfr-gmp.h +--- mpfr-3.1.2-a/src/mpfr-gmp.h 2013-03-13 15:37:32.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr-gmp.h 2014-04-15 22:21:06.220398489 +0000 +@@ -72,7 +72,6 @@ + #endif + + /* Define some macros */ +-#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) + + #define MP_LIMB_T_MAX (~(mp_limb_t)0) + +@@ -96,19 +95,19 @@ + #define SHRT_HIGHBIT SHRT_MIN + + /* MP_LIMB macros */ +-#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB) +-#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) +-#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB) ++#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB) ++#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) ++#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB) + #define MPN_COPY(dst,src,n) \ + do \ + { \ + if ((dst) != (src)) \ + { \ + MPFR_ASSERTD ((char *) (dst) >= (char *) (src) + \ +- (n) * BYTES_PER_MP_LIMB || \ ++ (n) * MPFR_BYTES_PER_MP_LIMB || \ + (char *) (src) >= (char *) (dst) + \ +- (n) * BYTES_PER_MP_LIMB); \ +- memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB); \ ++ (n) * MPFR_BYTES_PER_MP_LIMB); \ ++ memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB); \ + } \ + } \ + while (0) +diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h +--- mpfr-3.1.2-a/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000 ++++ mpfr-3.1.2-b/src/mpfr-impl.h 2014-04-15 22:21:06.220398489 +0000 +@@ -191,7 +191,7 @@ + # endif + #endif + +- ++#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT) + + /****************************************************** + ******************** Check GMP *********************** +@@ -930,7 +930,7 @@ + #define MPFR_SET_ALLOC_SIZE(x, n) \ + ( ((mp_size_t*) MPFR_MANT(x))[-1] = n) + #define MPFR_MALLOC_SIZE(s) \ +- ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) ) ++ ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) ) + #define MPFR_SET_MANT_PTR(x,p) \ + (MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1)) + #define MPFR_GET_REAL_PTR(x) \ +@@ -964,7 +964,7 @@ + #endif + + #define MPFR_TMP_LIMBS_ALLOC(N) \ +- ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB)) ++ ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB)) + + /* temporary allocate 1 limb at xp, and initialize mpfr variable x */ + /* The temporary var doesn't have any size field, but it doesn't matter +diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h +--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:20:20.755171478 +0000 ++++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:21:45.225450147 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "3.1.2-p7" ++#define MPFR_VERSION_STRING "3.1.2-p8" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.2-a/src/mul.c mpfr-3.1.2-b/src/mul.c +--- mpfr-3.1.2-a/src/mul.c 2013-03-13 15:37:37.000000000 +0000 ++++ mpfr-3.1.2-b/src/mul.c 2014-04-15 22:21:06.224398597 +0000 +@@ -106,7 +106,7 @@ + MPFR_ASSERTD(tn <= k); + + /* Check for no size_t overflow*/ +- MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); ++ MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); + MPFR_TMP_MARK(marker); + tmp = MPFR_TMP_LIMBS_ALLOC (k); + +@@ -301,7 +301,7 @@ + MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ + + /* Check for no size_t overflow*/ +- MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB); ++ MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB); + MPFR_TMP_MARK (marker); + tmp = MPFR_TMP_LIMBS_ALLOC (k); + +diff -Naurd mpfr-3.1.2-a/src/stack_interface.c mpfr-3.1.2-b/src/stack_interface.c +--- mpfr-3.1.2-a/src/stack_interface.c 2013-03-13 15:37:32.000000000 +0000 ++++ mpfr-3.1.2-b/src/stack_interface.c 2014-04-15 22:21:06.220398489 +0000 +@@ -26,7 +26,7 @@ + size_t + mpfr_custom_get_size (mpfr_prec_t prec) + { +- return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; ++ return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB; + } + + #undef mpfr_custom_init +diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c +--- mpfr-3.1.2-a/src/version.c 2014-04-15 22:20:20.755171478 +0000 ++++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:21:45.225450147 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.2-p7"; ++ return "3.1.2-p8"; + } diff --git a/stage0/patches/common/ncurses-5.9-bash_fix-1.patch b/stage0/patches/common/ncurses-5.9-bash_fix-1.patch new file mode 100644 index 0000000..ef3d104 --- /dev/null +++ b/stage0/patches/common/ncurses-5.9-bash_fix-1.patch @@ -0,0 +1,21 @@ +Submitted by: Jim Gifford (patches at jg555 dot com) +Date: 2007-02-15 +Initial Package Version: 5.6 +Upstream Status: Sent +Origin: Jim Gifford +Description: Fixes Ncurses to utilize a buggy version of Bash + +diff -Naur ncurses-5.6.orig/include/MKhashsize.sh ncurses-5.6/include/MKhashsize.sh +--- ncurses-5.6.orig/include/MKhashsize.sh 2006-10-21 17:45:39.000000000 -0700 ++++ ncurses-5.6/include/MKhashsize.sh 2007-02-15 07:16:46.000000000 -0800 +@@ -35,7 +35,7 @@ + echo " */" + + CAPS="${1-Caps}" +-TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l` ++TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l) + + echo "" + echo "#define CAPTABSIZE ${TABSIZE}" + + diff --git a/stage0/patches/common/ncurses-5.9-branch_update-4.patch b/stage0/patches/common/ncurses-5.9-branch_update-4.patch new file mode 100644 index 0000000..097f2b1 --- /dev/null +++ b/stage0/patches/common/ncurses-5.9-branch_update-4.patch @@ -0,0 +1,75926 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) +Date: 2012-08-25 +Initial Package Version: 5.9 +Origin: Upstream +Upstream Status: Applied +Description: Contains all upstream patches up to 5.9-20120616 + +diff -Naur ncurses-5.9.orig/Ada95/aclocal.m4 ncurses-5.9/Ada95/aclocal.m4 +--- ncurses-5.9.orig/Ada95/aclocal.m4 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/Ada95/aclocal.m4 2012-08-25 19:58:02.099888180 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $ ++dnl $Id: aclocal.m4,v 1.52 2012/08/04 18:12:47 tom Exp $ + dnl Macros used in NCURSES Ada95 auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -39,6 +39,31 @@ + dnl + dnl --------------------------------------------------------------------------- + dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 ++dnl ------------------ ++dnl Conditionally generate script according to whether we're using a given autoconf. ++dnl ++dnl $1 = version to compare against ++dnl $2 = code to use if AC_ACVERSION is at least as high as $1. ++dnl $3 = code to use if AC_ACVERSION is older than $1. ++define(CF_ACVERSION_CHECK, ++[ ++ifdef([m4_version_compare], ++[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], ++[CF_ACVERSION_COMPARE( ++AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), ++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 ++dnl -------------------- ++dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, ++dnl MAJOR2, MINOR2, TERNARY2, ++dnl PRINTABLE2, not FOUND, FOUND) ++define(CF_ACVERSION_COMPARE, ++[ifelse(builtin([eval], [$2 < $5]), 1, ++[ifelse([$8], , ,[$8])], ++[ifelse([$9], , ,[$9])])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07 + dnl ------------------- + dnl Construct the list of include-options for the C programs in the Ada95 +@@ -290,12 +315,33 @@ + } + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 ++dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45 + dnl ---------------- +-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' +-dnl in the sharutils 4.2 distribution. ++dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and ++dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. + AC_DEFUN([CF_ANSI_CC_CHECK], + [ ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++AC_MSG_CHECKING(\$CC variable) ++case "$CC" in #(vi ++*[[\ \ ]]-[[IUD]]*) ++ AC_MSG_RESULT(broken) ++ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` ++ CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ++ CF_ADD_CFLAGS($cf_flags) ++ ;; ++*) ++ AC_MSG_RESULT(ok) ++ ;; ++esac ++ + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ + cf_cv_ansi_cc=no + cf_save_CFLAGS="$CFLAGS" +@@ -413,6 +459,35 @@ + AC_SUBST(ARFLAGS) + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31 ++dnl -------------- ++dnl Allow user to disable a normally-on option. ++AC_DEFUN([CF_ARG_DISABLE], ++[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42 ++dnl ------------- ++dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus ++dnl values. ++dnl ++dnl Parameters: ++dnl $1 = option name ++dnl $2 = help-string ++dnl $3 = action to perform if option is not default ++dnl $4 = action if perform if option is default ++dnl $5 = default option value (either 'yes' or 'no') ++AC_DEFUN([CF_ARG_OPTION], ++[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) ++ if test "$enableval" != "$5" ; then ++ifelse([$3],,[ :]dnl ++,[ $3]) ifelse([$4],,,[ ++ else ++ $4]) ++ fi],[enableval=$5 ifelse([$4],,,[ ++ $4 ++])dnl ++ ])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15 + dnl ----------- + dnl If we're cross-compiling, allow the user to override the tools and their +@@ -504,7 +579,7 @@ + AC_SUBST(BUILD_OBJEXT) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00 ++dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 + dnl --------------- + dnl Determine the default configuration into which we'll install ncurses. This + dnl can be overridden by the user's command-line options. There's two items to +@@ -522,7 +597,7 @@ + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix +@@ -593,7 +668,40 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 ++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 ++dnl ----------------- ++dnl Check if the given compiler is really clang. clang's C driver defines ++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does ++dnl not ignore some gcc options. ++dnl ++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to ++dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from ++dnl the wrappers for gcc and g++ warnings. ++dnl ++dnl $1 = GCC (default) or GXX ++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS ++dnl $3 = CFLAGS (default) or CXXFLAGS ++AC_DEFUN([CF_CLANG_COMPILER],[ ++ifelse([$2],,CLANG_COMPILER,[$2])=no ++ ++if test "$ifelse([$1],,[$1],GCC)" = yes ; then ++ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) ++ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ++ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" ++ AC_TRY_COMPILE([],[ ++#ifdef __clang__ ++#else ++make an error ++#endif ++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++],[]) ++ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" ++ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) ++fi ++]) ++dnl --------------------------------------------------------------------------- ++dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 + dnl ---------------- + dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common + dnl variations of ncurses' installs. +@@ -603,10 +711,10 @@ + AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ + cf_cv_ncurses_header=none + for cf_header in ifelse($1,,,[ \ +- $1/curses.h \ +- $1/ncurses.h]) \ +- curses.h \ +- ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h]) ++ $1/ncurses.h \ ++ $1/curses.h]) \ ++ ncurses.h \ ++ curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) + do + AC_TRY_COMPILE([#include <${cf_header}>], + [initscr(); tgoto("?", 0,0)], +@@ -627,6 +735,67 @@ + dnl "dirname" is not portable, so we fake it with a shell script. + AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 ++dnl --------------- ++dnl You can always use "make -n" to see the actual options, but it's hard to ++dnl pick out/analyze warning messages when the compile-line is long. ++dnl ++dnl Sets: ++dnl ECHO_LT - symbol to control if libtool is verbose ++dnl ECHO_LD - symbol to prefix "cc -o" lines ++dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o) ++dnl SHOW_CC - symbol to put before explicit "cc -c" lines ++dnl ECHO_CC - symbol to put before any "cc" line ++dnl ++AC_DEFUN([CF_DISABLE_ECHO],[ ++AC_MSG_CHECKING(if you want to see long compiling messages) ++CF_ARG_DISABLE(echo, ++ [ --disable-echo display "compiling" commands], ++ [ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking [$]@;' ++ RULE_CC='@echo compiling [$]<' ++ SHOW_CC='@echo compiling [$]@' ++ ECHO_CC='@' ++],[ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++]) ++AC_MSG_RESULT($enableval) ++AC_SUBST(ECHO_LT) ++AC_SUBST(ECHO_LD) ++AC_SUBST(RULE_CC) ++AC_SUBST(SHOW_CC) ++AC_SUBST(ECHO_CC) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54 ++dnl ------------------ ++dnl This is the "--enable-pc-files" option, which is available if there is a ++dnl pkg-config configuration on the local machine. ++AC_DEFUN([CF_ENABLE_PC_FILES],[ ++AC_REQUIRE([CF_PKG_CONFIG]) ++AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR]) ++ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) ++ AC_ARG_ENABLE(pc-files, ++ [ --enable-pc-files generate and install .pc files for pkg-config], ++ [enable_pc_files=$enableval], ++ [enable_pc_files=no]) ++ AC_MSG_RESULT($enable_pc_files) ++ if test "$enable_pc_files" != no ++ then ++ CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR) ++ fi ++else ++ enable_pc_files=no ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 + dnl --------------- + dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We +@@ -807,6 +976,25 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10 ++dnl ----------------- ++dnl make ADAFLAGS consistent with CFLAGS ++AC_DEFUN([CF_FIXUP_ADAFLAGS],[ ++ AC_MSG_CHECKING(optimization options for ADAFLAGS) ++ case "$CFLAGS" in ++ *-g*) ++ CF_ADD_ADAFLAGS(-g) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[ ]].*//'` ++ CF_ADD_ADAFLAGS($cf_O_flag) ++ ;; ++ esac ++ AC_MSG_RESULT($ADAFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32 + dnl ----------------- + dnl Test for availability of useful gcc __attribute__ directives to quiet +@@ -931,7 +1119,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 ++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. There's a few that + dnl we don't use, simply because they're too noisy: +@@ -954,6 +1142,7 @@ + [ + AC_REQUIRE([CF_GCC_VERSION]) + CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + + cat > conftest.$ac_ext <<EOF + #line __oline__ "${as_me:-configure}" +@@ -1029,6 +1218,13 @@ + continue;; + esac + ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [[12]].*) ++ CF_VERBOSE(feature is broken in gcc $GCC_VERSION) ++ continue;; ++ esac ++ ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -1070,53 +1266,6 @@ + AC_SUBST(cf_generic_objects) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59 +-dnl -------------- +-dnl Check if gnat supports SIGINT, and presumably tasking. For the latter, it +-dnl is noted that gnat may compile a tasking unit even for configurations which +-dnl fail at runtime. +-AC_DEFUN([CF_GNAT_SIGINT],[ +-AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[ +-CF_GNAT_TRY_LINK([with Ada.Interrupts.Names; +- +-package ConfTest is +- +- pragma Warnings (Off); -- the next pragma exists since 3.11p +- pragma Unreserve_All_Interrupts; +- pragma Warnings (On); +- +- protected Process is +- procedure Stop; +- function Continue return Boolean; +- pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT); +- private +- Done : Boolean := False; +- end Process; +- +-end ConfTest;], +-[package body ConfTest is +- protected body Process is +- procedure Stop is +- begin +- Done := True; +- end Stop; +- function Continue return Boolean is +- begin +- return not Done; +- end Continue; +- end Process; +-end ConfTest;], +- [cf_cv_gnat_sigint=yes], +- [cf_cv_gnat_sigint=no])]) +- +-if test $cf_cv_gnat_sigint = yes ; then +- USE_GNAT_SIGINT="" +-else +- USE_GNAT_SIGINT="#" +-fi +-AC_SUBST(USE_GNAT_SIGINT) +-])dnl +-dnl --------------------------------------------------------------------------- + dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18 + dnl -------------------- + dnl Check if the gnat pragma "Unreferenced" works. +@@ -1253,6 +1402,53 @@ + AC_SUBST(USE_GNAT_LIBRARIES) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59 ++dnl -------------- ++dnl Check if gnat supports SIGINT, and presumably tasking. For the latter, it ++dnl is noted that gnat may compile a tasking unit even for configurations which ++dnl fail at runtime. ++AC_DEFUN([CF_GNAT_SIGINT],[ ++AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[ ++CF_GNAT_TRY_LINK([with Ada.Interrupts.Names; ++ ++package ConfTest is ++ ++ pragma Warnings (Off); -- the next pragma exists since 3.11p ++ pragma Unreserve_All_Interrupts; ++ pragma Warnings (On); ++ ++ protected Process is ++ procedure Stop; ++ function Continue return Boolean; ++ pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT); ++ private ++ Done : Boolean := False; ++ end Process; ++ ++end ConfTest;], ++[package body ConfTest is ++ protected body Process is ++ procedure Stop is ++ begin ++ Done := True; ++ end Stop; ++ function Continue return Boolean is ++ begin ++ return not Done; ++ end Continue; ++ end Process; ++end ConfTest;], ++ [cf_cv_gnat_sigint=yes], ++ [cf_cv_gnat_sigint=no])]) ++ ++if test $cf_cv_gnat_sigint = yes ; then ++ USE_GNAT_SIGINT="" ++else ++ USE_GNAT_SIGINT="#" ++fi ++AC_SUBST(USE_GNAT_SIGINT) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45 + dnl ---------------- + dnl Verify that a test program compiles/links with GNAT. +@@ -1311,7 +1507,7 @@ + rm -rf conftest* *~conftest* + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41 ++dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10 + dnl --------------- + dnl Verify version of GNAT. + AC_DEFUN([CF_GNAT_VERSION], +@@ -1323,7 +1519,7 @@ + AC_MSG_RESULT($cf_gnat_version) + + case $cf_gnat_version in #(vi +-3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi ++3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +@@ -1518,7 +1714,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05 ++dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 + dnl --------------- + dnl For the given system and compiler, find the compiler flags to pass to the + dnl loader to use the "rpath" feature. +@@ -1539,10 +1735,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[[2-9]].*) #(vi ++openbsd[[2-9]].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -1601,11 +1797,11 @@ + $1="$cf_library_path_list [$]$1" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 ++dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 + dnl ------------- + dnl Compute the library-prefix for the given host system + dnl $1 = variable to set +-AC_DEFUN([CF_LIB_PREFIX], ++define([CF_LIB_PREFIX], + [ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi +@@ -1655,7 +1851,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03 ++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07 + dnl ------------- + dnl Compute the library file-suffix from the given model name + dnl $1 = model name +@@ -1684,11 +1880,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[[56]]*) #(vi ++ aix[[5-7]]*) #(vi + $2='.a' + $3=[$]$2 + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + $2='.dll' + $3='.dll.a' + ;; +@@ -1974,7 +2170,7 @@ + test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37 ++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56 + dnl ---------- + dnl Check for a working mkstemp. This creates two files, checks that they are + dnl successfully created and distinct (AmigaOS apparently fails on the last). +@@ -2016,9 +2212,11 @@ + } + ],[cf_cv_func_mkstemp=yes + ],[cf_cv_func_mkstemp=no +-],[AC_CHECK_FUNC(mkstemp) +-]) ++],[cf_cv_func_mkstemp=maybe]) + ]) ++if test "x$cf_cv_func_mkstemp" = xmaybe ; then ++ AC_CHECK_FUNC(mkstemp) ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + AC_DEFINE(HAVE_MKSTEMP) + fi +@@ -2141,7 +2339,7 @@ + ,[$1=no]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 ++dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05 + dnl ----------------- + dnl Tie together the configure-script macros for ncurses. + dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. +@@ -2153,7 +2351,10 @@ + cf_ncuconfig_root=ifelse($1,,ncurses,$1) + + echo "Looking for ${cf_ncuconfig_root}-config" +-AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) ++ ++CF_ACVERSION_CHECK(2.52, ++ [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], ++ [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + + if test "$NCURSES_CONFIG" != none ; then + +@@ -2509,7 +2710,7 @@ + AC_SUBST(PATH_SEPARATOR) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 ++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 + dnl -------------- + dnl Check the argument to see that it looks like a pathname. Rewrite it if it + dnl begins with one of the prefix/exec_prefix variables, and then again if the +@@ -2529,7 +2730,7 @@ + ;; + .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX + ;; +-.\[$]{*prefix}*) #(vi ++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi + eval $1="[$]$1" + case ".[$]$1" in #(vi + .NONE/*) +@@ -2546,7 +2747,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24 ++dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 + dnl ------------- + dnl Check for the package-config program, unless disabled by command-line. + AC_DEFUN([CF_PKG_CONFIG], +@@ -2563,7 +2764,9 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) ++ CF_ACVERSION_CHECK(2.52, ++ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], ++ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; + *) + PKG_CONFIG=$withval +@@ -2746,7 +2949,7 @@ + test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18 ++dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47 + dnl ------------ + dnl Check for gnatmake, ensure that it is complete. + AC_DEFUN([CF_PROG_GNAT],[ +@@ -2754,6 +2957,7 @@ + AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no) + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + CF_GNAT_VERSION + AC_CHECK_PROG(M4_exists, m4, yes, no) +@@ -2831,7 +3035,7 @@ + $1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'` + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16 ++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07 + dnl -------------- + dnl -------------- + dnl Attempt to determine the appropriate CC/LD options for creating a shared +@@ -2906,10 +3110,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[[56]]*) #(vi ++ aix4.[3-9]*|aix[[5-7]]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' + fi + ;; + beos*) #(vi +@@ -2962,9 +3170,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename $@`' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -2981,18 +3199,39 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; +- openbsd[[2-9]].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\[$]1 ++ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \[$]SHARED_LIB ++ ** IMPORT_LIB \[$]IMPORT_LIB ++EOF ++ exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[[2-9]].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + CF_SHARED_SONAME +@@ -3003,12 +3242,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' +@@ -3018,7 +3257,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -3123,9 +3362,12 @@ + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) ++ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + + AC_SUBST(CC_SHARED_OPTS) + AC_SUBST(LD_RPATH_OPT) +@@ -3137,6 +3379,7 @@ + AC_SUBST(LOCAL_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS2) + AC_SUBST(INSTALL_LIB) ++ AC_SUBST(RPATH_LIST) + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 +@@ -3253,6 +3496,45 @@ + AC_SUBST(top_builddir) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 ++dnl ------------------- ++dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we ++dnl can define it successfully. ++AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ ++AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) ++ CPPFLAGS="$cf_save" ++ ]) ++]) ++ ++if test "$cf_cv_xopen_source" != no ; then ++ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) ++ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ CF_ADD_CFLAGS($cf_temp_xopen_source) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59 + dnl -------- + dnl Make an uppercase version of a variable +@@ -3415,6 +3697,32 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10 ++dnl ------------------ ++dnl Allow the library-prefix to be overridden. OS/2 EMX originally had no ++dnl "lib" prefix, e.g., because it used the dll naming convention. ++dnl ++dnl $1 = variable to set ++AC_DEFUN([CF_WITH_LIB_PREFIX], ++[ ++AC_MSG_CHECKING(if you want to have a library-prefix) ++AC_ARG_WITH(lib-prefix, ++ [ --with-lib-prefix override library-prefix], ++ [with_lib_prefix=$withval], ++ [with_lib_prefix=auto]) ++AC_MSG_RESULT($with_lib_prefix) ++ ++if test $with_lib_prefix = auto ++then ++ CF_LIB_PREFIX($1) ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 + dnl ------------ + dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +@@ -3436,7 +3744,50 @@ + AC_SUBST($3)dnl + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47 ++dnl ------------------------- ++dnl Allow the choice of the pkg-config library directory to be overridden. ++AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(for $PKG_CONFIG library directory) ++ AC_ARG_WITH(pkg-config-libdir, ++ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], ++ [PKG_CONFIG_LIBDIR=$withval], ++ [PKG_CONFIG_LIBDIR=yes]) ++ ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ ++AC_SUBST(PKG_CONFIG_LIBDIR) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56 + dnl --------------- + dnl Check for POSIX thread library. + AC_DEFUN([CF_WITH_PTHREAD], +@@ -3452,28 +3803,33 @@ + AC_CHECK_HEADER(pthread.h,[ + AC_DEFINE(HAVE_PTHREADS_H) + +- AC_MSG_CHECKING(if we can link with the pthread library) +- cf_save_LIBS="$LIBS" +- CF_ADD_LIB(pthread) +- AC_TRY_LINK([ ++ for cf_lib_pthread in pthread c_r ++ do ++ AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) ++ cf_save_LIBS="$LIBS" ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_TRY_LINK([ + #include <pthread.h> + ],[ +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + ],[with_pthread=yes],[with_pthread=no]) +- LIBS="$cf_save_LIBS" +- AC_MSG_RESULT($with_pthread) ++ LIBS="$cf_save_LIBS" ++ AC_MSG_RESULT($with_pthread) ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- CF_ADD_LIB(pthread) +- AC_DEFINE(HAVE_LIBPTHREADS) +- else +- AC_MSG_ERROR(Cannot link with pthread library) +- fi ++ if test "$with_pthread" = yes ; then ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_DEFINE(HAVE_LIBPTHREADS) ++ else ++ AC_MSG_ERROR(Cannot link with pthread library) ++ fi + ]) + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 ++dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 + dnl --------------- + dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, + dnl or adapt to the vendor's definitions to get equivalent functionality, +@@ -3489,7 +3845,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[[456]]*) #(vi ++aix[[4-7]]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -3500,6 +3856,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -3517,15 +3874,23 @@ + ;; + irix[[56]].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + CF_GNU_SOURCE + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[[4-9]]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 + ;; + openbsd*) #(vi + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +@@ -3539,36 +3904,11 @@ + sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +-solaris2.1[[0-9]]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[[1-9]]) #(vi ++solaris2.*) #(vi + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifndef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifdef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) +- CPPFLAGS="$cf_save" +- ]) +-]) +- if test "$cf_cv_xopen_source" != no ; then +- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) +- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +- CF_ADD_CFLAGS($cf_temp_xopen_source) +- fi ++ CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + esac +@@ -3576,4 +3916,33 @@ + if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) + fi ++ ++dnl In anything but the default case, we may have system-specific setting ++dnl which is still not guaranteed to provide all of the entrypoints that ++dnl _XOPEN_SOURCE would yield. ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set=yes], ++ [cf_XOPEN_SOURCE_set=no]) ++ AC_MSG_RESULT($cf_XOPEN_SOURCE_set) ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set_ok=yes], ++ [cf_XOPEN_SOURCE_set_ok=no]) ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) ++ fi ++ else ++ CF_TRY_XOPEN_SOURCE ++ fi ++fi + ]) +diff -Naur ncurses-5.9.orig/Ada95/configure ncurses-5.9/Ada95/configure +--- ncurses-5.9.orig/Ada95/configure 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/Ada95/configure 2012-08-25 19:58:02.283220646 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh +-# From configure.in Revision: 1.30 . ++# From configure.in Revision: 1.41 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20101002. ++# Generated by Autoconf 2.52.20120811. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -135,15 +135,16 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datarootdir}/info' ++mandir='${datarootdir}/man' + + # Identity of this package. + PACKAGE_NAME= +@@ -194,6 +195,13 @@ + | --da=*) + 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. +@@ -469,7 +477,7 @@ + done + + # Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` +@@ -606,15 +614,16 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] ++ --datarootdir=DIR read-only architecture-independent data [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --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] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --mandir=DIR man documentation [DATAROOTDIR/man] + EOF + + cat <<\EOF +@@ -645,6 +654,7 @@ + + --with-system-type=XXX test: override derived host system-type + --with-pkg-config{=path} enable/disable use of pkg-config ++ --with-pkg-config-libdir=XXX use given directory for installing pc-files + --enable-pc-files generate and install .pc files for pkg-config + --without-tests suppress build with test-programs + --enable-mixed-case tic should assume mixed-case filenames +@@ -660,6 +670,7 @@ + --with-shared generate shared C-objects (needed for --with-ada-sharedlib) + --enable-widec compile with wide-char/UTF-8 code + --with-curses-dir=DIR directory in which (n)curses is installed ++ --with-lib-prefix override library-prefix + --with-shlib-version=X Specify rel or abi version for shared libs + --enable-rpath-link link sample programs with rpath option + Fine-Tuning Your Configuration: +@@ -677,7 +688,7 @@ + --enable-reentrant compile with experimental reentrant code + --with-wrap-prefix=XXX override prefix used for public variables + Testing/development Options: +- --enable-echo build: display "compiling" commands (default) ++ --disable-echo display "compiling" commands + --enable-warnings build: turn on GCC compiler warnings + --enable-assertions test: turn on generation of assertion code + --enable-expanded test: generate functions for certain macros +@@ -757,7 +768,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20101002. Invocation command line was ++generated by GNU Autoconf 2.52.20120811. Invocation command line was + + $ $0 $@ + +@@ -881,7 +892,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:884: loading site script $ac_site_file" >&5 ++ { echo "$as_me:895: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -892,7 +903,7 @@ + # 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:895: loading cache $cache_file" >&5 ++ { echo "$as_me:906: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -900,7 +911,7 @@ + esac + fi + else +- { echo "$as_me:903: creating cache $cache_file" >&5 ++ { echo "$as_me:914: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -916,21 +927,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:930: 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:923: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:934: 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:929: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:940: 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:931: former value: $ac_old_val" >&5 ++ { echo "$as_me:942: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:933: current value: $ac_new_val" >&5 ++ { echo "$as_me:944: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -949,9 +960,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:952: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:963: 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:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:965: 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 +@@ -972,10 +983,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:986: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:978: \$? = $ac_status" >&5 ++ echo "$as_me:989: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1005,7 +1016,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1019: 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 +@@ -1015,11 +1026,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1029: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1022: checking build system type" >&5 ++echo "$as_me:1033: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1028,23 +1039,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1042: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1046: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1040: result: $ac_cv_build" >&5 ++echo "$as_me:1051: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +-echo "$as_me:1047: checking host system type" >&5 ++echo "$as_me:1058: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1053,12 +1064,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1067: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1061: result: $ac_cv_host" >&5 ++echo "$as_me:1072: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1066,7 +1077,7 @@ + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +- echo "$as_me:1069: checking target system type" >&5 ++ echo "$as_me:1080: checking target system type" >&5 + echo $ECHO_N "checking target system type... $ECHO_C" >&6 + if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1075,12 +1086,12 @@ + test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias + ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || +- { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1089: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1083: result: $ac_cv_target" >&5 ++echo "$as_me:1094: result: $ac_cv_target" >&5 + echo "${ECHO_T}$ac_cv_target" >&6 + target=$ac_cv_target + target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1111,13 +1122,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1125: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1129: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1120: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1131: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1125,7 +1136,7 @@ + # Check whether --with-system-type or --without-system-type was given. + if test "${with_system_type+set}" = set; then + withval="$with_system_type" +- { echo "$as_me:1128: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1139: WARNING: overriding system type to $withval" >&5 + echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + fi; +@@ -1135,23 +1146,23 @@ + + ### Default install-location + +-echo "$as_me:1138: checking for prefix" >&5 ++echo "$as_me:1149: checking for prefix" >&5 + echo $ECHO_N "checking for prefix... $ECHO_C" >&6 + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix + ;; + esac + fi +-echo "$as_me:1150: result: $prefix" >&5 ++echo "$as_me:1161: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1154: checking for default include-directory" >&5 ++echo "$as_me:1165: checking for default include-directory" >&5 + echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 + test -n "$verbose" && echo 1>&6 + for cf_symbol in \ +@@ -1174,7 +1185,7 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1177: result: $includedir" >&5 ++echo "$as_me:1188: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + +@@ -1186,213 +1197,11 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:1191: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}gcc" +-echo "$as_me:1206: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1214: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1217: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo "$as_me:1226: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="gcc" +-echo "$as_me:1241: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1249: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1252: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:1265: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}cc" +-echo "$as_me:1280: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1288: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1291: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1300: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="cc" +-echo "$as_me:1315: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1323: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1326: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1339: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +-fi +-ac_cv_prog_CC="cc" +-echo "$as_me:1359: found $ac_dir/$ac_word" >&5 +-break +-done +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- set dummy "$ac_dir/$ac_word" ${1+"$@"} +- shift +- ac_cv_prog_CC="$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1381: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1384: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in gnatgcc gcc cc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1395: checking for $ac_word" >&5 ++echo "$as_me:1204: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1407,7 +1216,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +-echo "$as_me:1410: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1219: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1415,10 +1224,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1418: result: $CC" >&5 ++ echo "$as_me:1227: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1421: result: no" >&5 ++ echo "$as_me:1230: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1427,11 +1236,11 @@ + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in gnatgcc gcc cc + 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:1434: checking for $ac_word" >&5 ++echo "$as_me:1243: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1446,7 +1255,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="$ac_prog" +-echo "$as_me:1449: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1258: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1454,10 +1263,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1457: result: $ac_ct_CC" >&5 ++ echo "$as_me:1266: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1460: result: no" >&5 ++ echo "$as_me:1269: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1467,34 +1276,32 @@ + CC=$ac_ct_CC + fi + +-fi +- +-test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1279: error: no acceptable cc found in \$PATH" >&5 + echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:1477:" \ ++echo "$as_me:1284:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1480: \"$ac_compiler --version </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1287: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1483: \$? = $ac_status" >&5 ++ echo "$as_me:1290: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1485: \"$ac_compiler -v </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1292: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1488: \$? = $ac_status" >&5 ++ echo "$as_me:1295: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1490: \"$ac_compiler -V </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1297: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1493: \$? = $ac_status" >&5 ++ echo "$as_me:1300: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1497 "configure" ++#line 1304 "configure" + #include "confdefs.h" + + int +@@ -1510,13 +1317,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1513: checking for C compiler default output" >&5 ++echo "$as_me:1320: checking for C compiler default output" >&5 + echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1516: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1323: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1519: \$? = $ac_status" >&5 ++ echo "$as_me:1326: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1539,34 +1346,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1349: error: C compiler cannot create executables" >&5 + echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:1548: result: $ac_file" >&5 ++echo "$as_me:1355: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1553: checking whether the C compiler works" >&5 ++echo "$as_me:1360: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:1559: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1562: \$? = $ac_status" >&5 ++ echo "$as_me:1369: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1569: error: cannot run C compiled programs. ++ { { echo "$as_me:1376: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1574,24 +1381,24 @@ + fi + fi + fi +-echo "$as_me:1577: result: yes" >&5 ++echo "$as_me:1384: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + + rm -f a.out a.exe conftest$ac_cv_exeext + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1584: checking whether we are cross compiling" >&5 ++echo "$as_me:1391: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1586: result: $cross_compiling" >&5 ++echo "$as_me:1393: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1589: checking for executable suffix" >&5 ++echo "$as_me:1396: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1591: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1398: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1594: \$? = $ac_status" >&5 ++ echo "$as_me:1401: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1607,25 +1414,25 @@ + esac + done + else +- { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1417: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:1616: result: $ac_cv_exeext" >&5 ++echo "$as_me:1423: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:1622: checking for object suffix" >&5 ++echo "$as_me:1429: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1628 "configure" ++#line 1435 "configure" + #include "confdefs.h" + + int +@@ -1637,10 +1444,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1447: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1643: \$? = $ac_status" >&5 ++ echo "$as_me:1450: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1652,24 +1459,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1462: error: cannot compute OBJEXT: cannot compile" >&5 + echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:1662: result: $ac_cv_objext" >&5 ++echo "$as_me:1469: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1473: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1672 "configure" ++#line 1479 "configure" + #include "confdefs.h" + + int +@@ -1684,16 +1491,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1494: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1690: \$? = $ac_status" >&5 ++ echo "$as_me:1497: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1693: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1500: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1696: \$? = $ac_status" >&5 ++ echo "$as_me:1503: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1705,19 +1512,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1515: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" +-echo "$as_me:1714: checking whether $CC accepts -g" >&5 ++echo "$as_me:1521: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1720 "configure" ++#line 1527 "configure" + #include "confdefs.h" + + int +@@ -1729,16 +1536,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1539: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1735: \$? = $ac_status" >&5 ++ echo "$as_me:1542: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1738: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1545: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1741: \$? = $ac_status" >&5 ++ echo "$as_me:1548: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1748,7 +1555,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1558: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -1775,16 +1582,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1781: \$? = $ac_status" >&5 ++ echo "$as_me:1588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1784: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1787: \$? = $ac_status" >&5 ++ echo "$as_me:1594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -1796,7 +1603,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1799 "configure" ++#line 1606 "configure" + #include "confdefs.h" + #include <stdlib.h> + $ac_declaration +@@ -1809,16 +1616,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1815: \$? = $ac_status" >&5 ++ echo "$as_me:1622: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1818: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1821: \$? = $ac_status" >&5 ++ echo "$as_me:1628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -1828,7 +1635,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1831 "configure" ++#line 1638 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1840,16 +1647,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1650: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1846: \$? = $ac_status" >&5 ++ echo "$as_me:1653: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1656: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1852: \$? = $ac_status" >&5 ++ echo "$as_me:1659: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -1879,11 +1686,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:1882: checking version of $CC" >&5 ++ echo "$as_me:1689: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:1886: result: $GCC_VERSION" >&5 ++ echo "$as_me:1693: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -1893,7 +1700,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return +-echo "$as_me:1896: checking how to run the C preprocessor" >&5 ++echo "$as_me:1703: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -1914,18 +1721,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1917 "configure" ++#line 1724 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:1922: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1729: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1928: \$? = $ac_status" >&5 ++ echo "$as_me:1735: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1948,17 +1755,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1951 "configure" ++#line 1758 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1762: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1961: \$? = $ac_status" >&5 ++ echo "$as_me:1768: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1995,7 +1802,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:1998: result: $CPP" >&5 ++echo "$as_me:1805: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2005,18 +1812,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 2008 "configure" ++#line 1815 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:2013: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1820: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2019: \$? = $ac_status" >&5 ++ echo "$as_me:1826: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2039,17 +1846,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2042 "configure" ++#line 1849 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:2046: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1853: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2052: \$? = $ac_status" >&5 ++ echo "$as_me:1859: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2077,7 +1884,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:1887: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2090,14 +1897,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2093: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:1900: checking whether $CC needs -traditional" >&5 + echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 + if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_pattern="Autoconf.*'x'" + cat >conftest.$ac_ext <<_ACEOF +-#line 2100 "configure" ++#line 1907 "configure" + #include "confdefs.h" + #include <sgtty.h> + int Autoconf = TIOCGETP; +@@ -2112,7 +1919,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2115 "configure" ++#line 1922 "configure" + #include "confdefs.h" + #include <termio.h> + int Autoconf = TCGETA; +@@ -2125,14 +1932,14 @@ + + fi + fi +-echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:1935: result: $ac_cv_prog_gcc_traditional" >&5 + echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi + fi + +-echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:1942: checking whether $CC understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CC_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2148,15 +1955,15 @@ + # 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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:2151: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:1958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2154: \$? = $ac_status" >&5 ++ echo "$as_me:1961: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:1963: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2159: \$? = $ac_status" >&5 ++ echo "$as_me:1966: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2167,19 +1974,19 @@ + + fi + if test $cf_cv_prog_CC_c_o = yes; then +- echo "$as_me:2170: result: yes" >&5 ++ echo "$as_me:1977: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2173: result: no" >&5 ++ echo "$as_me:1980: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:2177: checking for POSIXized ISC" >&5 ++echo "$as_me:1984: checking for POSIXized ISC" >&5 + echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +- echo "$as_me:2182: result: yes" >&5 ++ echo "$as_me:1989: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ISC=yes # If later tests want to check for ISC. + +@@ -2193,12 +2000,115 @@ + CC="$CC -Xp" + fi + else +- echo "$as_me:2196: result: no" >&5 ++ echo "$as_me:2003: result: no" >&5 + echo "${ECHO_T}no" >&6 + ISC= + fi + +-echo "$as_me:2201: checking for ${CC:-cc} option to accept ANSI C" >&5 ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++echo "$as_me:2014: checking \$CC variable" >&5 ++echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 ++case "$CC" in #(vi ++*[\ \ ]-[IUD]*) ++ echo "$as_me:2018: result: broken" >&5 ++echo "${ECHO_T}broken" >&6 ++ { echo "$as_me:2020: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` ++ CC=`echo "$CC" | sed -e 's/[ ].*//'` ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_flags ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++ ;; ++*) ++ echo "$as_me:2106: result: ok" >&5 ++echo "${ECHO_T}ok" >&6 ++ ;; ++esac ++ ++echo "$as_me:2111: checking for ${CC:-cc} option to accept ANSI C" >&5 + echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 + if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2302,7 +2212,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 2305 "configure" ++#line 2215 "configure" + #include "confdefs.h" + + #ifndef CC_HAS_PROTOS +@@ -2323,16 +2233,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2236: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2329: \$? = $ac_status" >&5 ++ echo "$as_me:2239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2332: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2335: \$? = $ac_status" >&5 ++ echo "$as_me:2245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ansi_cc="$cf_arg"; break + else +@@ -2345,7 +2255,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5 ++echo "$as_me:2258: result: $cf_cv_ansi_cc" >&5 + echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + + if test "$cf_cv_ansi_cc" != "no"; then +@@ -2438,7 +2348,7 @@ + fi + + if test "$cf_cv_ansi_cc" = "no"; then +- { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes. ++ { { echo "$as_me:2351: error: Your compiler does not appear to recognize prototypes. + You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler +@@ -2485,7 +2395,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 "$as_me:2488: checking for $ac_word" >&5 ++echo "$as_me:2398: 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 +@@ -2500,7 +2410,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2503: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2413: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2508,21 +2418,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2511: result: $AWK" >&5 ++ echo "$as_me:2421: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2514: result: no" >&5 ++ echo "$as_me:2424: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:2431: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:2525: checking for egrep" >&5 ++echo "$as_me:2435: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2532,11 +2442,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:2445: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + +-test -z "$EGREP" && { { echo "$as_me:2539: error: No egrep program found" >&5 ++test -z "$EGREP" && { { echo "$as_me:2449: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -2552,7 +2462,7 @@ + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:2555: checking for a BSD compatible install" >&5 ++echo "$as_me:2465: 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 +@@ -2601,7 +2511,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2604: result: $INSTALL" >&5 ++echo "$as_me:2514: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2612,18 +2522,18 @@ + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo "$as_me:2615: checking whether ln -s works" >&5 ++echo "$as_me:2525: checking whether ln -s works" >&5 + echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:2619: result: yes" >&5 ++ echo "$as_me:2529: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2622: result: no, using $LN_S" >&5 ++ echo "$as_me:2532: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:2626: checking if $LN_S -f options work" >&5 ++echo "$as_me:2536: checking if $LN_S -f options work" >&5 + echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 + + rm -f conf$$.src conf$$dst +@@ -2635,12 +2545,12 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:2638: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:2548: result: $cf_prog_ln_sf" >&5 + echo "${ECHO_T}$cf_prog_ln_sf" >&6 + + test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" + +-echo "$as_me:2643: checking for long file names" >&5 ++echo "$as_me:2553: checking for long file names" >&5 + echo $ECHO_N "checking for long file names... $ECHO_C" >&6 + if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2679,7 +2589,7 @@ + rm -rf $ac_xdir 2>/dev/null + done + fi +-echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:2592: result: $ac_cv_sys_long_file_names" >&5 + echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 + if test $ac_cv_sys_long_file_names = yes; then + +@@ -2691,7 +2601,7 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:2694: checking if you want to use pkg-config" >&5 ++echo "$as_me:2604: checking if you want to use pkg-config" >&5 + echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 + + # Check whether --with-pkg-config or --without-pkg-config was given. +@@ -2701,7 +2611,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:2704: result: $cf_pkg_config" >&5 ++echo "$as_me:2614: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in #(vi +@@ -2709,10 +2619,11 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- if test -n "$ac_tool_prefix"; then ++ ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-echo "$as_me:2715: checking for $ac_word" >&5 ++echo "$as_me:2626: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2729,7 +2640,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:2732: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2643: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2740,10 +2651,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:2743: result: $PKG_CONFIG" >&5 ++ echo "$as_me:2654: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:2746: result: no" >&5 ++ echo "$as_me:2657: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2752,7 +2663,7 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:2755: checking for $ac_word" >&5 ++echo "$as_me:2666: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2769,7 +2680,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:2772: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2683: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2781,10 +2692,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:2695: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:2787: result: no" >&5 ++ echo "$as_me:2698: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2815,7 +2726,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) +@@ -2827,7 +2738,7 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:2741: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -2836,35 +2747,100 @@ + fi + + if test "$PKG_CONFIG" != none ; then +- echo "$as_me:2839: checking if we should install .pc files for $PKG_CONFIG" >&5 +-echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 ++ echo "$as_me:2750: checking for $PKG_CONFIG library directory" >&5 ++echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then +- +-# Check whether --enable-pc-files or --disable-pc-files was given. +-if test "${enable_pc_files+set}" = set; then +- enableval="$enable_pc_files" +- enable_pc_files=$enableval ++# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. ++if test "${with_pkg_config_libdir+set}" = set; then ++ withval="$with_pkg_config_libdir" ++ PKG_CONFIG_LIBDIR=$withval + else +- enable_pc_files=no ++ PKG_CONFIG_LIBDIR=yes + fi; +- echo "$as_me:2856: result: $enable_pc_files" >&5 +-echo "${ECHO_T}$enable_pc_files" >&6 +- else +- echo "$as_me:2859: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 +-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} +- enable_pc_files=no +- fi +-fi + +-echo "$as_me:2867: checking if you want to build test-programs" >&5 ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ echo "$as_me:2787: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++fi ++ ++if test "$PKG_CONFIG" != none ; then ++ echo "$as_me:2792: checking if we should install .pc files for $PKG_CONFIG" >&5 ++echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 ++ ++# Check whether --enable-pc-files or --disable-pc-files was given. ++if test "${enable_pc_files+set}" = set; then ++ enableval="$enable_pc_files" ++ enable_pc_files=$enableval ++else ++ enable_pc_files=no ++fi; ++ echo "$as_me:2802: result: $enable_pc_files" >&5 ++echo "${ECHO_T}$enable_pc_files" >&6 ++ if test "$enable_pc_files" != no ++ then ++ ++if test "x$prefix" != xNONE; then ++ cf_path_syntax="$prefix" ++else ++ cf_path_syntax="$ac_default_prefix" ++fi ++ ++case ".$PKG_CONFIG_LIBDIR" in #(vi ++.\$\(*\)*|.\'*\'*) #(vi ++ ;; ++..|./*|.\\*) #(vi ++ ;; ++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ++ ;; ++.\${*prefix}*|.\${*dir}*) #(vi ++ eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" ++ case ".$PKG_CONFIG_LIBDIR" in #(vi ++ .NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++ esac ++ ;; #(vi ++.no|.NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++*) ++ { { echo "$as_me:2832: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++esac ++ ++ fi ++else ++ enable_pc_files=no ++fi ++ ++echo "$as_me:2843: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -2874,10 +2850,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:2877: result: $cf_with_tests" >&5 ++echo "$as_me:2853: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:2856: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -2887,11 +2863,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:2890: result: $enable_mixedcase" >&5 ++echo "$as_me:2866: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:2870: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2918,7 +2894,7 @@ + fi + + fi +-echo "$as_me:2921: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:2897: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF + #define MIXEDCASE_FILENAMES 1 +@@ -2935,7 +2911,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:2914: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -2955,11 +2931,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:2958: result: yes" >&5 ++ echo "$as_me:2934: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:2962: result: no" >&5 ++ echo "$as_me:2938: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -2968,7 +2944,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 "$as_me:2971: checking for $ac_word" >&5 ++echo "$as_me:2947: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2983,7 +2959,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:2986: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2962: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2991,10 +2967,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:2994: result: $CTAGS" >&5 ++ echo "$as_me:2970: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:2997: result: no" >&5 ++ echo "$as_me:2973: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3005,7 +2981,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 "$as_me:3008: checking for $ac_word" >&5 ++echo "$as_me:2984: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3020,7 +2996,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3023: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2999: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3028,10 +3004,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3031: result: $ETAGS" >&5 ++ echo "$as_me:3007: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3034: result: no" >&5 ++ echo "$as_me:3010: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3040,7 +3016,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3043: checking for $ac_word" >&5 ++echo "$as_me:3019: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3055,7 +3031,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3058: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3034: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3064,17 +3040,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3043: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3070: result: no" >&5 ++ echo "$as_me:3046: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:3077: checking for $ac_word" >&5 ++echo "$as_me:3053: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3089,7 +3065,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3092: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3068: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3098,10 +3074,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3077: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3104: result: no" >&5 ++ echo "$as_me:3080: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3121,7 +3097,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3124: checking for makeflags variable" >&5 ++echo "$as_me:3100: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3155,13 +3131,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3158: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3134: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:3164: checking for $ac_word" >&5 ++echo "$as_me:3140: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3176,7 +3152,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3179: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3155: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3184,10 +3160,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3187: result: $RANLIB" >&5 ++ echo "$as_me:3163: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3190: result: no" >&5 ++ echo "$as_me:3166: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3196,7 +3172,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3199: checking for $ac_word" >&5 ++echo "$as_me:3175: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3211,7 +3187,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3214: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3190: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3220,10 +3196,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3223: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3199: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3226: result: no" >&5 ++ echo "$as_me:3202: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3235,7 +3211,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:3238: checking for $ac_word" >&5 ++echo "$as_me:3214: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3250,7 +3226,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:3253: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3229: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3258,10 +3234,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:3261: result: $LD" >&5 ++ echo "$as_me:3237: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:3264: result: no" >&5 ++ echo "$as_me:3240: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3270,7 +3246,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:3273: checking for $ac_word" >&5 ++echo "$as_me:3249: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3285,7 +3261,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:3288: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3264: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3294,10 +3270,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:3297: result: $ac_ct_LD" >&5 ++ echo "$as_me:3273: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:3300: result: no" >&5 ++ echo "$as_me:3276: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3309,7 +3285,7 @@ + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:3312: checking for $ac_word" >&5 ++echo "$as_me:3288: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3324,7 +3300,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3327: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3303: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3332,10 +3308,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3335: result: $AR" >&5 ++ echo "$as_me:3311: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3338: result: no" >&5 ++ echo "$as_me:3314: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3344,7 +3320,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3347: checking for $ac_word" >&5 ++echo "$as_me:3323: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3359,7 +3335,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3362: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3338: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3368,10 +3344,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3371: result: $ac_ct_AR" >&5 ++ echo "$as_me:3347: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3374: result: no" >&5 ++ echo "$as_me:3350: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3383,7 +3359,7 @@ + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:3386: checking for $ac_word" >&5 ++echo "$as_me:3362: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3398,7 +3374,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:3401: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3377: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3406,10 +3382,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:3409: result: $AR" >&5 ++ echo "$as_me:3385: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:3412: result: no" >&5 ++ echo "$as_me:3388: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3418,7 +3394,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:3421: checking for $ac_word" >&5 ++echo "$as_me:3397: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3433,7 +3409,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:3436: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3412: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3442,10 +3418,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:3445: result: $ac_ct_AR" >&5 ++ echo "$as_me:3421: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:3448: result: no" >&5 ++ echo "$as_me:3424: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3454,7 +3430,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:3457: checking for options to update archives" >&5 ++echo "$as_me:3433: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3477,13 +3453,13 @@ + rm -f conftest.a + + cat >conftest.$ac_ext <<EOF +-#line 3480 "configure" ++#line 3456 "configure" + int testdata[3] = { 123, 456, 789 }; + EOF +- if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3486: \$? = $ac_status" >&5 ++ echo "$as_me:3462: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null +@@ -3494,7 +3470,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:3473: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -3502,7 +3478,7 @@ + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + + fi +-echo "$as_me:3505: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:3481: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -3513,7 +3489,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:3516: checking if you have specified an install-prefix" >&5 ++echo "$as_me:3492: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -3526,7 +3502,7 @@ + ;; + esac + fi; +-echo "$as_me:3529: result: $DESTDIR" >&5 ++echo "$as_me:3505: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -3554,7 +3530,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 "$as_me:3557: checking for $ac_word" >&5 ++echo "$as_me:3533: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3569,7 +3545,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:3572: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3548: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3577,10 +3553,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:3580: result: $BUILD_CC" >&5 ++ echo "$as_me:3556: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:3583: result: no" >&5 ++ echo "$as_me:3559: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3588,12 +3564,12 @@ + done + + fi; +- echo "$as_me:3591: checking for native build C compiler" >&5 ++ echo "$as_me:3567: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:3593: result: $BUILD_CC" >&5 ++ echo "$as_me:3569: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:3596: checking for native build C preprocessor" >&5 ++ echo "$as_me:3572: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -3603,10 +3579,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:3606: result: $BUILD_CPP" >&5 ++ echo "$as_me:3582: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:3609: checking for native build C flags" >&5 ++ echo "$as_me:3585: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -3614,10 +3590,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:3617: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:3593: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:3620: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:3596: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -3625,10 +3601,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:3604: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:3631: checking for native build linker-flags" >&5 ++ echo "$as_me:3607: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -3636,10 +3612,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:3615: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:3642: checking for native build linker-libraries" >&5 ++ echo "$as_me:3618: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -3647,7 +3623,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:3650: result: $BUILD_LIBS" >&5 ++ echo "$as_me:3626: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -3657,7 +3633,7 @@ + : ${BUILD_CC:='${CC}'} + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:3660: error: Cross-build requires two compilers. ++ { { echo "$as_me:3636: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -3682,7 +3658,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:3685: checking if you want to build shared C-objects" >&5 ++echo "$as_me:3661: checking if you want to build shared C-objects" >&5 + echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -3692,27 +3668,27 @@ + else + with_shared=no + fi; +-echo "$as_me:3695: result: $with_shared" >&5 ++echo "$as_me:3671: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:3699: checking for specified models" >&5 ++echo "$as_me:3675: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal +-echo "$as_me:3702: result: $cf_list_models" >&5 ++echo "$as_me:3678: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:3707: checking for default model" >&5 ++echo "$as_me:3683: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:3710: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:3686: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +-echo "$as_me:3715: checking for specific curses-directory" >&5 ++echo "$as_me:3691: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -3722,7 +3698,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:3725: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:3701: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +@@ -3741,7 +3717,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -3753,7 +3729,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:3732: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -3786,7 +3762,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 3789 "configure" ++#line 3765 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -3798,16 +3774,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3777: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3804: \$? = $ac_status" >&5 ++ echo "$as_me:3780: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3807: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3783: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3810: \$? = $ac_status" >&5 ++ echo "$as_me:3786: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3824,7 +3800,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:3803: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -3858,7 +3834,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:3837: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -3869,7 +3845,7 @@ + fi + fi + +-echo "$as_me:3872: checking if you want wide-character code" >&5 ++echo "$as_me:3848: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -3879,11 +3855,11 @@ + else + with_widec=no + fi; +-echo "$as_me:3882: result: $with_widec" >&5 ++echo "$as_me:3858: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + +-echo "$as_me:3886: checking for multibyte character support" >&5 ++echo "$as_me:3862: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3891,7 +3867,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 3894 "configure" ++#line 3870 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -3904,16 +3880,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3907: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3883: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3910: \$? = $ac_status" >&5 ++ echo "$as_me:3886: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3913: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3889: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3916: \$? = $ac_status" >&5 ++ echo "$as_me:3892: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -3925,12 +3901,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:3904: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3933 "configure" ++#line 3909 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -3943,16 +3919,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3946: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3922: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3949: \$? = $ac_status" >&5 ++ echo "$as_me:3925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3952: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3955: \$? = $ac_status" >&5 ++ echo "$as_me:3931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -3966,7 +3942,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 3969 "configure" ++#line 3945 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -3979,16 +3955,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:3982: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:3958: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:3985: \$? = $ac_status" >&5 ++ echo "$as_me:3961: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:3988: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3991: \$? = $ac_status" >&5 ++ echo "$as_me:3967: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -4005,9 +3981,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:3984: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:3986: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -4120,11 +4096,11 @@ + if test -d $cf_cv_header_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4099: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 4127 "configure" ++#line 4103 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -4137,21 +4113,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4116: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4143: \$? = $ac_status" >&5 ++ echo "$as_me:4119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4149: \$? = $ac_status" >&5 ++ echo "$as_me:4125: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4130: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -4169,7 +4145,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:4148: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -4266,13 +4242,13 @@ + if test -d $cf_cv_library_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4245: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 4275 "configure" ++#line 4251 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -4285,21 +4261,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4288: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4264: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4291: \$? = $ac_status" >&5 ++ echo "$as_me:4267: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4270: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4297: \$? = $ac_status" >&5 ++ echo "$as_me:4273: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:4278: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -4341,7 +4317,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:4320: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -4375,7 +4351,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4378 "configure" ++#line 4354 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -4387,16 +4363,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4366: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4393: \$? = $ac_status" >&5 ++ echo "$as_me:4369: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4396: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4399: \$? = $ac_status" >&5 ++ echo "$as_me:4375: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4413,7 +4389,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4392: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4447,7 +4423,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:4426: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4461,48 +4437,87 @@ + cf_ncuconfig_root=ncursesw + + echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:4446: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:4461: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:4469: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++else ++ echo "$as_me:4472: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$NCURSES_CONFIG" && break ++ done ++fi ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:4468: checking for $ac_word" >&5 ++echo "$as_me:4485: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. ++else + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:4485: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:4500: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:4496: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:4508: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:4499: result: no" >&5 ++ echo "$as_me:4511: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -4511,7 +4526,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:4514: checking if we have identified curses headers" >&5 ++echo "$as_me:4529: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4519,13 +4534,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncursesw/curses.h \ +- ncursesw/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncursesw/ncurses.h \ ++ ncursesw/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4528 "configure" ++#line 4543 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -4537,16 +4552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4543: \$? = $ac_status" >&5 ++ echo "$as_me:4558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4546: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4549: \$? = $ac_status" >&5 ++ echo "$as_me:4564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -4557,11 +4572,11 @@ + done + + fi +-echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:4575: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:4564: error: No curses header-files found" >&5 ++ { { echo "$as_me:4579: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4571,23 +4586,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:4574: checking for $ac_header" >&5 ++echo "$as_me:4589: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4580 "configure" ++#line 4595 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4584: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4599: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4590: \$? = $ac_status" >&5 ++ echo "$as_me:4605: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4606,7 +4621,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4609: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:4624: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -4659,7 +4674,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4662 "configure" ++#line 4677 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -4671,16 +4686,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4677: \$? = $ac_status" >&5 ++ echo "$as_me:4692: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4680: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4695: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4683: \$? = $ac_status" >&5 ++ echo "$as_me:4698: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4697,7 +4712,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4715: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4714,7 +4729,7 @@ + + } + +-echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:4732: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4726,7 +4741,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 4729 "configure" ++#line 4744 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -4758,16 +4773,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4776: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4764: \$? = $ac_status" >&5 ++ echo "$as_me:4779: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4767: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4782: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4770: \$? = $ac_status" >&5 ++ echo "$as_me:4785: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -4782,14 +4797,14 @@ + done + + fi +-echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:4800: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:4792: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:4807: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4929,7 +4944,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4932 "configure" ++#line 4947 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -4941,16 +4956,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4947: \$? = $ac_status" >&5 ++ echo "$as_me:4962: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4950: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4953: \$? = $ac_status" >&5 ++ echo "$as_me:4968: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4967,7 +4982,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:4985: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4988,7 +5003,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 4991 "configure" ++#line 5006 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -5012,16 +5027,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5030: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5018: \$? = $ac_status" >&5 ++ echo "$as_me:5033: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5024: \$? = $ac_status" >&5 ++ echo "$as_me:5039: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -5042,12 +5057,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5060: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:5065: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -5080,7 +5095,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 5083 "configure" ++#line 5098 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -5092,16 +5107,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5098: \$? = $ac_status" >&5 ++ echo "$as_me:5113: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5101: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5104: \$? = $ac_status" >&5 ++ echo "$as_me:5119: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -5118,7 +5133,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5136: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -5161,7 +5176,7 @@ + ;; + esac + +-echo "$as_me:5164: checking for terminfo header" >&5 ++echo "$as_me:5179: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5179,7 +5194,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5182 "configure" ++#line 5197 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5194,16 +5209,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5212: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5200: \$? = $ac_status" >&5 ++ echo "$as_me:5215: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5203: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5218: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5206: \$? = $ac_status" >&5 ++ echo "$as_me:5221: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -5219,7 +5234,7 @@ + done + + fi +-echo "$as_me:5222: result: $cf_cv_term_header" >&5 ++echo "$as_me:5237: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5253,7 +5268,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:5256: checking for ncurses version" >&5 ++echo "$as_me:5271: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5279,10 +5294,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:5282: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:5297: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:5285: \$? = $ac_status" >&5 ++ echo "$as_me:5300: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -5292,7 +5307,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5295 "configure" ++#line 5310 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5317,15 +5332,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5320: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5335: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5323: \$? = $ac_status" >&5 ++ echo "$as_me:5338: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5325: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5328: \$? = $ac_status" >&5 ++ echo "$as_me:5343: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -5339,7 +5354,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:5357: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -5351,7 +5366,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:5369: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5359,7 +5374,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5362 "configure" ++#line 5377 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5378,16 +5393,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5381: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5384: \$? = $ac_status" >&5 ++ echo "$as_me:5399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5387: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5390: \$? = $ac_status" >&5 ++ echo "$as_me:5405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -5398,10 +5413,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:5416: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:5404: checking for initscr in -lgpm" >&5 ++ echo "$as_me:5419: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5409,7 +5424,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5412 "configure" ++#line 5427 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5428,16 +5443,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5431: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5446: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5434: \$? = $ac_status" >&5 ++ echo "$as_me:5449: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5437: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5440: \$? = $ac_status" >&5 ++ echo "$as_me:5455: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -5448,7 +5463,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:5466: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -5463,7 +5478,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:5466: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:5481: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5471,7 +5486,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5474 "configure" ++#line 5489 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5490,16 +5505,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5493: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5508: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5496: \$? = $ac_status" >&5 ++ echo "$as_me:5511: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5514: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5502: \$? = $ac_status" >&5 ++ echo "$as_me:5517: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -5510,7 +5525,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:5528: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -5529,13 +5544,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:5532: checking for initscr" >&5 ++ echo "$as_me:5547: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5538 "configure" ++#line 5553 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -5558,7 +5573,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -5566,16 +5581,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5584: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5572: \$? = $ac_status" >&5 ++ echo "$as_me:5587: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5575: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5590: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5578: \$? = $ac_status" >&5 ++ echo "$as_me:5593: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -5585,18 +5600,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:5588: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:5603: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:5595: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:5610: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5599 "configure" ++#line 5614 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5608,25 +5623,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5611: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5614: \$? = $ac_status" >&5 ++ echo "$as_me:5629: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5617: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5620: \$? = $ac_status" >&5 ++ echo "$as_me:5635: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5622: result: yes" >&5 ++ echo "$as_me:5637: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:5629: result: no" >&5 ++echo "$as_me:5644: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -5716,11 +5731,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:5734: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5723 "configure" ++#line 5738 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5732,25 +5747,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5735: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5738: \$? = $ac_status" >&5 ++ echo "$as_me:5753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5741: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5744: \$? = $ac_status" >&5 ++ echo "$as_me:5759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5746: result: yes" >&5 ++ echo "$as_me:5761: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:5753: result: no" >&5 ++echo "$as_me:5768: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -5765,7 +5780,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:5783: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5773,7 +5788,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:5791: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -5783,7 +5798,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 5786 "configure" ++#line 5801 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5795,23 +5810,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5798: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5813: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5801: \$? = $ac_status" >&5 ++ echo "$as_me:5816: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5804: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5807: \$? = $ac_status" >&5 ++ echo "$as_me:5822: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:5809: result: yes" >&5 ++ echo "$as_me:5824: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:5814: result: no" >&5 ++echo "$as_me:5829: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -5831,48 +5846,87 @@ + cf_ncuconfig_root=ncurses + + echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:5855: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:5870: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:5878: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++else ++ echo "$as_me:5881: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$NCURSES_CONFIG" && break ++ done ++fi ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:5838: checking for $ac_word" >&5 ++echo "$as_me:5894: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. ++else + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:5855: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:5909: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5866: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:5917: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5869: result: no" >&5 ++ echo "$as_me:5920: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -5881,7 +5935,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5884: checking if we have identified curses headers" >&5 ++echo "$as_me:5938: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5889,13 +5943,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncurses/curses.h \ +- ncurses/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncurses/ncurses.h \ ++ ncurses/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5898 "configure" ++#line 5952 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5907,16 +5961,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5964: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5913: \$? = $ac_status" >&5 ++ echo "$as_me:5967: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5916: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5970: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5919: \$? = $ac_status" >&5 ++ echo "$as_me:5973: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5927,11 +5981,11 @@ + done + + fi +-echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5984: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5934: error: No curses header-files found" >&5 ++ { { echo "$as_me:5988: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5941,23 +5995,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5944: checking for $ac_header" >&5 ++echo "$as_me:5998: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5950 "configure" ++#line 6004 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5954: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6008: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:5960: \$? = $ac_status" >&5 ++ echo "$as_me:6014: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -5976,7 +6030,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:5979: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:6033: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -6029,7 +6083,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6032 "configure" ++#line 6086 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6041,16 +6095,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6098: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6047: \$? = $ac_status" >&5 ++ echo "$as_me:6101: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6050: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6104: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6053: \$? = $ac_status" >&5 ++ echo "$as_me:6107: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6067,7 +6121,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6124: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6084,7 +6138,7 @@ + + } + +-echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:6141: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6096,7 +6150,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6099 "configure" ++#line 6153 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6120,16 +6174,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6177: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6126: \$? = $ac_status" >&5 ++ echo "$as_me:6180: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6129: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6132: \$? = $ac_status" >&5 ++ echo "$as_me:6186: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -6144,14 +6198,14 @@ + done + + fi +-echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:6201: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:6154: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:6208: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6291,7 +6345,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6294 "configure" ++#line 6348 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6303,16 +6357,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6360: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6309: \$? = $ac_status" >&5 ++ echo "$as_me:6363: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6312: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6366: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6315: \$? = $ac_status" >&5 ++ echo "$as_me:6369: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6329,7 +6383,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6386: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6350,7 +6404,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6353 "configure" ++#line 6407 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6374,16 +6428,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6380: \$? = $ac_status" >&5 ++ echo "$as_me:6434: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6383: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6437: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6386: \$? = $ac_status" >&5 ++ echo "$as_me:6440: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -6404,12 +6458,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6461: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:6466: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -6442,7 +6496,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6445 "configure" ++#line 6499 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6454,16 +6508,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6460: \$? = $ac_status" >&5 ++ echo "$as_me:6514: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6463: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6466: \$? = $ac_status" >&5 ++ echo "$as_me:6520: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6480,7 +6534,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6537: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6523,7 +6577,7 @@ + ;; + esac + +-echo "$as_me:6526: checking for terminfo header" >&5 ++echo "$as_me:6580: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6541,7 +6595,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6544 "configure" ++#line 6598 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6556,16 +6610,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6613: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6562: \$? = $ac_status" >&5 ++ echo "$as_me:6616: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6565: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6619: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6568: \$? = $ac_status" >&5 ++ echo "$as_me:6622: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6581,7 +6635,7 @@ + done + + fi +-echo "$as_me:6584: result: $cf_cv_term_header" >&5 ++echo "$as_me:6638: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6615,7 +6669,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:6618: checking for ncurses version" >&5 ++echo "$as_me:6672: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6641,10 +6695,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6644: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:6698: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6647: \$? = $ac_status" >&5 ++ echo "$as_me:6701: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -6654,7 +6708,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6657 "configure" ++#line 6711 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6679,15 +6733,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6682: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6736: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6685: \$? = $ac_status" >&5 ++ echo "$as_me:6739: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6687: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6690: \$? = $ac_status" >&5 ++ echo "$as_me:6744: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6701,7 +6755,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:6758: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -6713,7 +6767,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6716: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:6770: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6721,7 +6775,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6724 "configure" ++#line 6778 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6740,16 +6794,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6743: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6746: \$? = $ac_status" >&5 ++ echo "$as_me:6800: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6749: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6803: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6752: \$? = $ac_status" >&5 ++ echo "$as_me:6806: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6760,10 +6814,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6763: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:6817: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:6766: checking for initscr in -lgpm" >&5 ++ echo "$as_me:6820: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6771,7 +6825,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6774 "configure" ++#line 6828 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6790,16 +6844,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6793: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6847: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6796: \$? = $ac_status" >&5 ++ echo "$as_me:6850: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6799: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6802: \$? = $ac_status" >&5 ++ echo "$as_me:6856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6810,7 +6864,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6813: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:6867: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6825,7 +6879,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6828: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:6882: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6833,7 +6887,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6836 "configure" ++#line 6890 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6852,16 +6906,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6855: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6909: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6858: \$? = $ac_status" >&5 ++ echo "$as_me:6912: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6861: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6915: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6864: \$? = $ac_status" >&5 ++ echo "$as_me:6918: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6872,7 +6926,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6875: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:6929: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6891,13 +6945,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:6894: checking for initscr" >&5 ++ echo "$as_me:6948: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6900 "configure" ++#line 6954 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -6920,7 +6974,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -6928,16 +6982,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6931: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6985: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6934: \$? = $ac_status" >&5 ++ echo "$as_me:6988: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6991: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6940: \$? = $ac_status" >&5 ++ echo "$as_me:6994: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -6947,18 +7001,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6950: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:7004: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:6957: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:7011: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6961 "configure" ++#line 7015 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -6970,25 +7024,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6973: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7027: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6976: \$? = $ac_status" >&5 ++ echo "$as_me:7030: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6979: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7033: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6982: \$? = $ac_status" >&5 ++ echo "$as_me:7036: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:6984: result: yes" >&5 ++ echo "$as_me:7038: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:6991: result: no" >&5 ++echo "$as_me:7045: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -7078,11 +7132,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:7135: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7085 "configure" ++#line 7139 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7094,25 +7148,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7097: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7151: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7100: \$? = $ac_status" >&5 ++ echo "$as_me:7154: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7103: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7157: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7106: \$? = $ac_status" >&5 ++ echo "$as_me:7160: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7108: result: yes" >&5 ++ echo "$as_me:7162: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7115: result: no" >&5 ++echo "$as_me:7169: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -7127,7 +7181,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:7130: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:7184: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7135,7 +7189,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:7138: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:7192: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -7145,7 +7199,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 7148 "configure" ++#line 7202 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7157,23 +7211,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7160: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7214: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7163: \$? = $ac_status" >&5 ++ echo "$as_me:7217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7169: \$? = $ac_status" >&5 ++ echo "$as_me:7223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7171: result: yes" >&5 ++ echo "$as_me:7225: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7176: result: no" >&5 ++echo "$as_me:7230: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -7210,10 +7264,10 @@ + AUTOCONF_$cf_name NCURSES_VERSION_$cf_name + CF_EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" +- { (eval echo "$as_me:7213: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:7267: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:7216: \$? = $ac_status" >&5 ++ echo "$as_me:7270: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` +@@ -7231,9 +7285,25 @@ + + cf_cv_timestamp=`date` + +-echo "$as_me:7234: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:7288: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + ++echo "$as_me:7291: checking if you want to have a library-prefix" >&5 ++echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 ++ ++# Check whether --with-lib-prefix or --without-lib-prefix was given. ++if test "${with_lib_prefix+set}" = set; then ++ withval="$with_lib_prefix" ++ with_lib_prefix=$withval ++else ++ with_lib_prefix=auto ++fi; ++echo "$as_me:7301: result: $with_lib_prefix" >&5 ++echo "${ECHO_T}$with_lib_prefix" >&6 ++ ++if test $with_lib_prefix = auto ++then ++ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi + LIB_PREFIX='' +@@ -7243,7 +7313,12 @@ + esac + cf_prefix=$LIB_PREFIX + +-LIB_PREFIX=$cf_prefix ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi + + LIB_SUFFIX= + +@@ -7254,7 +7329,7 @@ + test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' + fi + +-echo "$as_me:7257: checking for default loader flags" >&5 ++echo "$as_me:7332: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + normal) LD_MODEL='' ;; +@@ -7262,11 +7337,11 @@ + profile) LD_MODEL='-pg';; + shared) LD_MODEL='' ;; + esac +-echo "$as_me:7265: result: $LD_MODEL" >&5 ++echo "$as_me:7340: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + LD_RPATH_OPT= +-echo "$as_me:7269: checking for an rpath option" >&5 ++echo "$as_me:7344: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in #(vi + irix*) #(vi +@@ -7279,10 +7354,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[2-9].*) #(vi ++openbsd[2-9].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -7297,17 +7372,17 @@ + *) + ;; + esac +-echo "$as_me:7300: result: $LD_RPATH_OPT" >&5 ++echo "$as_me:7375: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in #(vi + x-R*) +- echo "$as_me:7305: checking if we need a space after rpath option" >&5 ++ echo "$as_me:7380: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7310 "configure" ++#line 7385 "configure" + #include "confdefs.h" + + int +@@ -7319,16 +7394,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7322: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7397: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7325: \$? = $ac_status" >&5 ++ echo "$as_me:7400: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7328: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7403: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7331: \$? = $ac_status" >&5 ++ echo "$as_me:7406: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -7338,7 +7413,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:7341: result: $cf_rpath_space" >&5 ++ echo "$as_me:7416: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -7353,7 +7428,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:7356: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:7431: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -7368,7 +7443,7 @@ + cf_cv_shlib_version=$withval + ;; + *) +- { { echo "$as_me:7371: error: option value must be one of: rel, abi, auto or no" >&5 ++ { { echo "$as_me:7446: error: option value must be one of: rel, abi, auto or no" >&5 + echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -7377,7 +7452,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:7380: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:7455: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -7386,14 +7461,14 @@ + CC_SHARED_OPTS= + if test "$GCC" = yes + then +- echo "$as_me:7389: checking which $CC option to use" >&5 ++ echo "$as_me:7464: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7396 "configure" ++#line 7471 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -7405,16 +7480,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7483: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7411: \$? = $ac_status" >&5 ++ echo "$as_me:7486: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7489: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7417: \$? = $ac_status" >&5 ++ echo "$as_me:7492: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -7423,7 +7498,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + done +- echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:7501: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -7431,10 +7506,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[56]*) #(vi ++ aix4.3-9*|aix[5-7]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + fi + ;; + beos*) #(vi +@@ -7465,7 +7544,7 @@ + MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:7468: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:7547: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7474,7 +7553,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +-#line 7477 "configure" ++#line 7556 "configure" + #include "confdefs.h" + + int +@@ -7486,16 +7565,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7489: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7492: \$? = $ac_status" >&5 ++ echo "$as_me:7571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7495: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7498: \$? = $ac_status" >&5 ++ echo "$as_me:7577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -7506,7 +7585,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:7509: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:7588: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test $cf_cv_ldflags_search_paths_first = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -7525,9 +7604,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename `' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -7544,7 +7633,7 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -7556,13 +7645,34 @@ + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; +- openbsd[2-9].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\$1 ++ IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \$SHARED_LIB ++ ** IMPORT_LIB \$IMPORT_LIB ++EOF ++ exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[2-9].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + +@@ -7580,12 +7690,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -7602,7 +7712,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -7686,7 +7796,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7689 "configure" ++#line 7799 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -7698,16 +7808,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7811: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7704: \$? = $ac_status" >&5 ++ echo "$as_me:7814: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7707: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7817: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7710: \$? = $ac_status" >&5 ++ echo "$as_me:7820: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -7744,22 +7854,30 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + *) +- { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:7857: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 ++ ++echo "${as_me:-configure}:7870: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++ ++ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 ++ ++echo "${as_me:-configure}:7874: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + # The test/sample programs in the original tree link using rpath option. + # Make it optional for packagers. + if test -n "$LOCAL_LDFLAGS" + then +- echo "$as_me:7762: checking if you want to link sample programs with rpath option" >&5 ++ echo "$as_me:7880: checking if you want to link sample programs with rpath option" >&5 + echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 + + # Check whether --enable-rpath-link or --disable-rpath-link was given. +@@ -7769,7 +7887,7 @@ + else + with_rpath_link=yes + fi; +- echo "$as_me:7772: result: $with_rpath_link" >&5 ++ echo "$as_me:7890: result: $with_rpath_link" >&5 + echo "${ECHO_T}$with_rpath_link" >&6 + if test "$with_rpath_link" = no + then +@@ -7780,13 +7898,8 @@ + + ############################################################################### + +- case $cf_cv_system_name in +- os2*) PATH_SEPARATOR=';' ;; +- *) PATH_SEPARATOR=':' ;; +- esac +- + ### use option --enable-broken-linker to force on use of broken-linker support +-echo "$as_me:7789: checking if you want broken-linker support code" >&5 ++echo "$as_me:7902: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -7796,7 +7909,7 @@ + else + with_broken_linker=${BROKEN_LINKER:-no} + fi; +-echo "$as_me:7799: result: $with_broken_linker" >&5 ++echo "$as_me:7912: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + BROKEN_LINKER=0 +@@ -7816,7 +7929,7 @@ + BROKEN_LINKER=1 + test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + +-echo "${as_me:-configure}:7819: testing cygwin linker is broken anyway ..." 1>&5 ++echo "${as_me:-configure}:7932: testing cygwin linker is broken anyway ..." 1>&5 + + ;; + esac +@@ -7829,7 +7942,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[456]*) #(vi ++aix[4-7]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -7840,6 +7953,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -7857,17 +7971,18 @@ + ;; + irix[56].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + +-echo "$as_me:7863: checking if we must define _GNU_SOURCE" >&5 ++echo "$as_me:7978: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 7870 "configure" ++#line 7985 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -7882,16 +7997,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8000: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7888: \$? = $ac_status" >&5 ++ echo "$as_me:8003: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7891: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8006: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7894: \$? = $ac_status" >&5 ++ echo "$as_me:8009: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7900,7 +8015,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 7903 "configure" ++#line 8018 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -7915,16 +8030,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8033: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7921: \$? = $ac_status" >&5 ++ echo "$as_me:8036: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8039: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7927: \$? = $ac_status" >&5 ++ echo "$as_me:8042: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7939,51 +8054,45 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:7942: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:8057: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> +- ;; +-netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw +- ;; +-openbsd*) #(vi +- # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +- ;; +-osf[45]*) #(vi +- cf_xopen_source="-D_OSF_SOURCE" +- ;; +-nto-qnx*) #(vi +- cf_xopen_source="-D_QNX_SOURCE" +- ;; +-sco*) #(vi +- # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer +- ;; +-solaris2.1[0-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[1-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__" +- ;; +-*) +- echo "$as_me:7972: checking if we should define _XOPEN_SOURCE" >&5 +-echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +-if test "${cf_cv_xopen_source+set}" = set; then ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ++cf_save_CFLAGS="$CFLAGS" ++cf_save_CPPFLAGS="$CPPFLAGS" ++ ++cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++echo "$as_me:8079: checking if we should define _POSIX_C_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ++echo "${as_me:-configure}:8085: testing if the symbol is already defined go no further ..." 1>&5 ++ + cat >conftest.$ac_ext <<_ACEOF +-#line 7979 "configure" ++#line 8088 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifndef _XOPEN_SOURCE ++#ifndef _POSIX_C_SOURCE + make an error + #endif + ; +@@ -7991,32 +8100,44 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8103: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7997: \$? = $ac_status" >&5 ++ echo "$as_me:8106: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8000: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8003: \$? = $ac_status" >&5 ++ echo "$as_me:8112: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ cf_cv_posix_c_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- cat >conftest.$ac_ext <<_ACEOF +-#line 8012 "configure" ++cf_want_posix_source=no ++ case .$cf_POSIX_C_SOURCE in #(vi ++ .[12]??*) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ ;; ++ .2) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ cf_want_posix_source=yes ++ ;; ++ .*) ++ cf_want_posix_source=yes ++ ;; ++ esac ++ if test "$cf_want_posix_source" = yes ; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8133 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifdef _XOPEN_SOURCE ++#ifdef _POSIX_SOURCE + make an error + #endif + ; +@@ -8024,33 +8145,278 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8148: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8030: \$? = $ac_status" >&5 ++ echo "$as_me:8151: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8033: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8036: \$? = $ac_status" >&5 ++ echo "$as_me:8157: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_xopen_source=$cf_XOPEN_SOURCE ++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$cf_save" ++ fi ++ ++echo "${as_me:-configure}:8168: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++ ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" ++ ++echo "${as_me:-configure}:8173: testing if the second compile does not leave our definition intact error ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8176 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++int ++main () ++{ ++ ++#ifndef _POSIX_C_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8194: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8197: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8200: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ CPPFLAGS="$cf_save_CPPFLAGS" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:8216: result: $cf_cv_posix_c_source" >&5 ++echo "${ECHO_T}$cf_cv_posix_c_source" >&6 ++ ++if test "$cf_cv_posix_c_source" != no ; then ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_cv_posix_c_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ ;; ++netbsd*) #(vi ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[4-9]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 ++ ;; ++openbsd*) #(vi ++ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ++ ;; ++osf[45]*) #(vi ++ cf_xopen_source="-D_OSF_SOURCE" ++ ;; ++nto-qnx*) #(vi ++ cf_xopen_source="-D_QNX_SOURCE" ++ ;; ++sco*) #(vi ++ # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ++ ;; ++solaris2.*) #(vi ++ cf_xopen_source="-D__EXTENSIONS__" ++ ;; ++*) ++ ++echo "$as_me:8329: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8336 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8358: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8361: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8364: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8373 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8392: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8395: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8398: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8401: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" + + fi + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8051: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:8416: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 +- if test "$cf_cv_xopen_source" != no ; then ++ ++if test "$cf_cv_xopen_source" != no ; then + + CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +@@ -8060,7 +8426,7 @@ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + + cf_fix_cppflags=no + cf_new_cflags= +@@ -8140,7 +8506,7 @@ + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + +- fi ++fi + + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +@@ -8155,16 +8521,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:8524: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:8530: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8167 "configure" ++#line 8533 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -8179,16 +8545,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8548: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8185: \$? = $ac_status" >&5 ++ echo "$as_me:8551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8191: \$? = $ac_status" >&5 ++ echo "$as_me:8557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -8209,7 +8575,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 8212 "configure" ++#line 8578 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -8224,16 +8590,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8593: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8230: \$? = $ac_status" >&5 ++ echo "$as_me:8596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8233: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8236: \$? = $ac_status" >&5 ++ echo "$as_me:8602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8244,15 +8610,15 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:8613: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + +-echo "${as_me:-configure}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:8618: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8255 "configure" ++#line 8621 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -8267,16 +8633,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8636: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8273: \$? = $ac_status" >&5 ++ echo "$as_me:8639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8276: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8279: \$? = $ac_status" >&5 ++ echo "$as_me:8645: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8292,7 +8658,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:8661: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -8362,34 +8728,298 @@ + esac + done + +-if test -n "$cf_new_cflags" ; then ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ ;; ++esac ++ ++if test -n "$cf_xopen_source" ; then ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ echo "$as_me:8834: checking if _XOPEN_SOURCE really is set" >&5 ++echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8837 "configure" ++#include "confdefs.h" ++#include <stdlib.h> ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8852: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8855: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8858: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8861: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ echo "$as_me:8870: result: $cf_XOPEN_SOURCE_set" >&5 ++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8875 "configure" ++#include "confdefs.h" ++#include <stdlib.h> ++int ++main () ++{ ++ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8890: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8893: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8896: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8899: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set_ok=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set_ok=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ { echo "$as_me:8910: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} ++ fi ++ else ++ ++echo "$as_me:8915: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8922 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8941: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8944: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8947: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8950: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8959 "configure" ++#include "confdefs.h" + +- CFLAGS="$CFLAGS $cf_new_cflags" +-fi ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> + +-if test -n "$cf_new_cppflags" ; then ++int ++main () ++{ + +- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8981: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8984: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8987: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" + +-if test -n "$cf_new_extra_cppflags" ; then +- +- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi ++rm -f conftest.$ac_objext conftest.$ac_ext + + fi ++echo "$as_me:9002: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 + +- ;; +-esac ++if test "$cf_cv_xopen_source" != no ; then + +-if test -n "$cf_xopen_source" ; then ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + + cf_fix_cppflags=no + cf_new_cflags= + cf_new_cppflags= + cf_new_extra_cppflags= + +-for cf_add_cflags in $cf_xopen_source ++for cf_add_cflags in $cf_temp_xopen_source + do + case $cf_fix_cppflags in + no) +@@ -8464,6 +9094,9 @@ + + fi + ++ fi ++fi ++ + # Check whether --enable-largefile or --disable-largefile was given. + if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" +@@ -8471,7 +9104,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:8474: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:9107: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8483,7 +9116,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +-#line 8486 "configure" ++#line 9119 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8503,16 +9136,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8509: \$? = $ac_status" >&5 ++ echo "$as_me:9142: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8512: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8515: \$? = $ac_status" >&5 ++ echo "$as_me:9148: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8522,16 +9155,16 @@ + rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8528: \$? = $ac_status" >&5 ++ echo "$as_me:9161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8531: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8534: \$? = $ac_status" >&5 ++ echo "$as_me:9167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -8545,13 +9178,13 @@ + rm -f conftest.$ac_ext + fi + fi +-echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:9181: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:8554: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:9187: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8559,7 +9192,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8562 "configure" ++#line 9195 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8579,16 +9212,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8585: \$? = $ac_status" >&5 ++ echo "$as_me:9218: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8591: \$? = $ac_status" >&5 ++ echo "$as_me:9224: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8597,7 +9230,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8600 "configure" ++#line 9233 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include <sys/types.h> +@@ -8618,16 +9251,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9254: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8624: \$? = $ac_status" >&5 ++ echo "$as_me:9257: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8627: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9260: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8630: \$? = $ac_status" >&5 ++ echo "$as_me:9263: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -8638,7 +9271,7 @@ + break + done + fi +-echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:9274: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -8648,7 +9281,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:9284: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8656,7 +9289,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8659 "configure" ++#line 9292 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8676,16 +9309,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9312: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8682: \$? = $ac_status" >&5 ++ echo "$as_me:9315: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8685: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9318: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8688: \$? = $ac_status" >&5 ++ echo "$as_me:9321: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8694,7 +9327,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8697 "configure" ++#line 9330 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include <sys/types.h> +@@ -8715,16 +9348,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9351: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8721: \$? = $ac_status" >&5 ++ echo "$as_me:9354: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8724: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9357: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8727: \$? = $ac_status" >&5 ++ echo "$as_me:9360: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -8735,7 +9368,7 @@ + break + done + fi +-echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:9371: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -8748,7 +9381,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:8751: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:9384: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8756,7 +9389,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +-#line 8759 "configure" ++#line 9392 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8768,16 +9401,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9404: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8774: \$? = $ac_status" >&5 ++ echo "$as_me:9407: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8777: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9410: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8780: \$? = $ac_status" >&5 ++ echo "$as_me:9413: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8786,7 +9419,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 8789 "configure" ++#line 9422 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include <stdio.h> +@@ -8799,16 +9432,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9435: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8805: \$? = $ac_status" >&5 ++ echo "$as_me:9438: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8808: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9441: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8811: \$? = $ac_status" >&5 ++ echo "$as_me:9444: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -8819,7 +9452,7 @@ + break + done + fi +-echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:9455: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -8833,13 +9466,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:8836: checking for fseeko" >&5 ++echo "$as_me:9469: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8842 "configure" ++#line 9475 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8851,16 +9484,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8854: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9487: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8857: \$? = $ac_status" >&5 ++ echo "$as_me:9490: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8860: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9493: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8863: \$? = $ac_status" >&5 ++ echo "$as_me:9496: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +@@ -8870,7 +9503,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8873: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:9506: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -8891,14 +9524,14 @@ + test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " + test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " + +- echo "$as_me:8894: checking whether to use struct dirent64" >&5 ++ echo "$as_me:9527: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8901 "configure" ++#line 9534 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -8919,16 +9552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8925: \$? = $ac_status" >&5 ++ echo "$as_me:9558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8931: \$? = $ac_status" >&5 ++ echo "$as_me:9564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -8939,7 +9572,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:9575: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF + #define HAVE_STRUCT_DIRENT64 1 +@@ -8948,7 +9581,7 @@ + fi + + ### Enable compiling-in rcs id's +-echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:9584: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -8958,7 +9591,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:8961: result: $with_rcs_ids" >&5 ++echo "$as_me:9594: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF + #define USE_RCS_IDS 1 +@@ -8967,7 +9600,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:8970: checking if you want to build with function extensions" >&5 ++echo "$as_me:9603: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -8977,7 +9610,7 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:8980: result: $with_ext_funcs" >&5 ++echo "$as_me:9613: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 +@@ -8994,7 +9627,7 @@ + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:8997: checking for extended use of const keyword" >&5 ++echo "$as_me:9630: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -9004,7 +9637,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:9007: result: $with_ext_const" >&5 ++echo "$as_me:9640: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -9014,7 +9647,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:9017: checking if you want all development code" >&5 ++echo "$as_me:9650: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -9024,7 +9657,7 @@ + else + with_develop=no + fi; +-echo "$as_me:9027: result: $with_develop" >&5 ++echo "$as_me:9660: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ############################################################################### +@@ -9033,7 +9666,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:9036: checking if you want to link with the pthread library" >&5 ++echo "$as_me:9669: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -9043,27 +9676,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:9046: result: $with_pthread" >&5 ++echo "$as_me:9679: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:9050: checking for pthread.h" >&5 ++ echo "$as_me:9683: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9056 "configure" ++#line 9689 "configure" + #include "confdefs.h" + #include <pthread.h> + _ACEOF +-if { (eval echo "$as_me:9060: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:9693: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9066: \$? = $ac_status" >&5 ++ echo "$as_me:9699: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9082,7 +9715,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:9718: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test $ac_cv_header_pthread_h = yes; then + +@@ -9090,12 +9723,14 @@ + #define HAVE_PTHREADS_H 1 + EOF + +- echo "$as_me:9093: checking if we can link with the pthread library" >&5 +-echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 +- cf_save_LIBS="$LIBS" +- LIBS="-lpthread $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-#line 9098 "configure" ++ for cf_lib_pthread in pthread c_r ++ do ++ echo "$as_me:9728: checking if we can link with the $cf_lib_pthread library" >&5 ++echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 ++ cf_save_LIBS="$LIBS" ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 9733 "configure" + #include "confdefs.h" + + #include <pthread.h> +@@ -9104,23 +9739,24 @@ + main () + { + +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9114: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9117: \$? = $ac_status" >&5 ++ echo "$as_me:9753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9120: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9123: \$? = $ac_status" >&5 ++ echo "$as_me:9759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_pthread=yes + else +@@ -9129,27 +9765,29 @@ + with_pthread=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- LIBS="$cf_save_LIBS" +- echo "$as_me:9133: result: $with_pthread" >&5 ++ LIBS="$cf_save_LIBS" ++ echo "$as_me:9769: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- LIBS="-lpthread $LIBS" +- cat >>confdefs.h <<\EOF ++ if test "$with_pthread" = yes ; then ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >>confdefs.h <<\EOF + #define HAVE_LIBPTHREADS 1 + EOF + +- else +- { { echo "$as_me:9143: error: Cannot link with pthread library" >&5 ++ else ++ { { echo "$as_me:9781: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi + + fi + + fi + +-echo "$as_me:9152: checking if you want to use weak-symbols for pthreads" >&5 ++echo "$as_me:9790: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -9159,18 +9797,18 @@ + else + use_weak_symbols=no + fi; +-echo "$as_me:9162: result: $use_weak_symbols" >&5 ++echo "$as_me:9800: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:9166: checking if $CC supports weak symbols" >&5 ++echo "$as_me:9804: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 9173 "configure" ++#line 9811 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -9196,16 +9834,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9837: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9202: \$? = $ac_status" >&5 ++ echo "$as_me:9840: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9843: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9208: \$? = $ac_status" >&5 ++ echo "$as_me:9846: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_weak_symbols=yes + else +@@ -9216,7 +9854,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:9857: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -9243,13 +9881,13 @@ + fi + + # OpenSUSE is installing ncurses6, using reentrant option. +-echo "$as_me:9246: checking for _nc_TABSIZE" >&5 ++echo "$as_me:9884: checking for _nc_TABSIZE" >&5 + echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 + if test "${ac_cv_func__nc_TABSIZE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9252 "configure" ++#line 9890 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char _nc_TABSIZE (); below. */ +@@ -9272,7 +9910,7 @@ + #if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE) + choke me + #else +-f = _nc_TABSIZE; ++f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -9280,16 +9918,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9283: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9921: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9286: \$? = $ac_status" >&5 ++ echo "$as_me:9924: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9292: \$? = $ac_status" >&5 ++ echo "$as_me:9930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__nc_TABSIZE=yes + else +@@ -9299,7 +9937,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9302: result: $ac_cv_func__nc_TABSIZE" >&5 ++echo "$as_me:9940: result: $ac_cv_func__nc_TABSIZE" >&5 + echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 + if test $ac_cv_func__nc_TABSIZE = yes; then + assume_reentrant=yes +@@ -9311,7 +9949,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:9314: checking if you want experimental reentrant code" >&5 ++echo "$as_me:9952: checking if you want experimental reentrant code" >&5 + echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -9321,7 +9959,7 @@ + else + with_reentrant=$assume_reentrant + fi; +-echo "$as_me:9324: result: $with_reentrant" >&5 ++echo "$as_me:9962: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -9343,7 +9981,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:9346: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:9984: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -9353,7 +9991,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:9994: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -9366,26 +10004,46 @@ + ############################################################################### + + ### use option --disable-echo to suppress full display compiling commands +-echo "$as_me:9369: checking if you want to display full commands during build" >&5 +-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 ++ ++echo "$as_me:10008: checking if you want to see long compiling messages" >&5 ++echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. + if test "${enable_echo+set}" = set; then + enableval="$enable_echo" +- with_echo=$enableval ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking $@;' ++ RULE_CC='@echo compiling $<' ++ SHOW_CC='@echo compiling $@' ++ ECHO_CC='@' ++ ++ else ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ ++ fi + else +- with_echo=yes ++ enableval=yes ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ + fi; +-if test "$with_echo" = yes; then +- ECHO_LINK= +-else +- ECHO_LINK='@ echo linking $@ ... ;' +-fi +-echo "$as_me:9384: result: $with_echo" >&5 +-echo "${ECHO_T}$with_echo" >&6 ++echo "$as_me:10042: result: $enableval" >&5 ++echo "${ECHO_T}$enableval" >&6 + + ### use option --enable-warnings to turn on all gcc warnings +-echo "$as_me:9388: checking if you want to see compiler warnings" >&5 ++echo "$as_me:10046: checking if you want to see compiler warnings" >&5 + echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -9393,7 +10051,7 @@ + enableval="$enable_warnings" + with_warnings=$enableval + fi; +-echo "$as_me:9396: result: $with_warnings" >&5 ++echo "$as_me:10054: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + + if test "x$with_warnings" = "xyes"; then +@@ -9405,12 +10063,12 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:9408: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:10066: checking if this is really Intel C compiler" >&5 + echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +-#line 9413 "configure" ++#line 10071 "configure" + #include "confdefs.h" + + int +@@ -9427,16 +10085,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10088: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9433: \$? = $ac_status" >&5 ++ echo "$as_me:10091: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9436: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10094: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9439: \$? = $ac_status" >&5 ++ echo "$as_me:10097: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +@@ -9447,14 +10105,63 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:9450: result: $INTEL_COMPILER" >&5 ++ echo "$as_me:10108: result: $INTEL_COMPILER" >&5 + echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac + fi + ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:10117: checking if this is really Clang C compiler" >&5 ++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 ++ cf_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 10122 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:10139: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:10142: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:10145: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:10148: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:10159: result: $CLANG_COMPILER" >&5 ++echo "${ECHO_T}$CLANG_COMPILER" >&6 ++fi ++ + cat > conftest.$ac_ext <<EOF +-#line 9457 "${as_me:-configure}" ++#line 10164 "${as_me:-configure}" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + +@@ -9471,7 +10178,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #279: controlling expression is constant + +- { echo "$as_me:9474: checking for $CC warning options..." >&5 ++ { echo "$as_me:10181: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -9487,12 +10194,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9493: \$? = $ac_status" >&5 ++ echo "$as_me:10200: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:10202: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -9501,7 +10208,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:9504: checking for $CC warning options..." >&5 ++ { echo "$as_me:10211: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -9521,12 +10228,12 @@ + Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9527: \$? = $ac_status" >&5 ++ echo "$as_me:10234: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:10236: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in #(vi + Wcast-qual) #(vi +@@ -9537,7 +10244,17 @@ + [34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:9540: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:10247: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++ ++ continue;; ++ esac ++ ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [12].*) ++ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 ++ ++echo "${as_me:-configure}:10257: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -9570,10 +10287,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:10290: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <<EOF +-#line 9576 "${as_me:-configure}" ++#line 10293 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -9622,12 +10339,12 @@ + ;; + esac + +- if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:10342: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9628: \$? = $ac_status" >&5 ++ echo "$as_me:10345: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:10347: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in #(vi +@@ -9663,7 +10380,7 @@ + fi + + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:9666: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:10383: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -9673,16 +10390,12 @@ + else + with_assertions=no + fi; +-echo "$as_me:9676: result: $with_assertions" >&5 ++echo "$as_me:10393: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then + if test "$with_assertions" = no + then +- cat >>confdefs.h <<\EOF +-#define NDEBUG 1 +-EOF +- + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + +@@ -9727,7 +10440,7 @@ + ;; + esac + +-echo "$as_me:9730: checking whether to add trace feature to all models" >&5 ++echo "$as_me:10443: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -9737,7 +10450,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:9740: result: $cf_with_trace" >&5 ++echo "$as_me:10453: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -9830,13 +10543,13 @@ + *mingw32*) #(vi + ;; + *) +-echo "$as_me:9833: checking for gettimeofday" >&5 ++echo "$as_me:10546: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9839 "configure" ++#line 10552 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gettimeofday (); below. */ +@@ -9859,7 +10572,7 @@ + #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) + choke me + #else +-f = gettimeofday; ++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -9867,16 +10580,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9870: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10583: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9873: \$? = $ac_status" >&5 ++ echo "$as_me:10586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9876: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9879: \$? = $ac_status" >&5 ++ echo "$as_me:10592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -9886,7 +10599,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9889: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:10602: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test $ac_cv_func_gettimeofday = yes; then + cat >>confdefs.h <<\EOF +@@ -9895,7 +10608,7 @@ + + else + +-echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:10611: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9903,7 +10616,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9906 "configure" ++#line 10619 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9922,16 +10635,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9925: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10638: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9928: \$? = $ac_status" >&5 ++ echo "$as_me:10641: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9931: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9934: \$? = $ac_status" >&5 ++ echo "$as_me:10647: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -9942,7 +10655,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9945: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:10658: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test $ac_cv_lib_bsd_gettimeofday = yes; then + cat >>confdefs.h <<\EOF +@@ -9957,13 +10670,13 @@ + esac + + ### Checks for header files. +-echo "$as_me:9960: checking for ANSI C header files" >&5 ++echo "$as_me:10673: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9966 "configure" ++#line 10679 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -9971,13 +10684,13 @@ + #include <float.h> + + _ACEOF +-if { (eval echo "$as_me:9974: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10687: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9980: \$? = $ac_status" >&5 ++ echo "$as_me:10693: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9999,7 +10712,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 <<_ACEOF +-#line 10002 "configure" ++#line 10715 "configure" + #include "confdefs.h" + #include <string.h> + +@@ -10017,7 +10730,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 <<_ACEOF +-#line 10020 "configure" ++#line 10733 "configure" + #include "confdefs.h" + #include <stdlib.h> + +@@ -10038,7 +10751,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10041 "configure" ++#line 10754 "configure" + #include "confdefs.h" + #include <ctype.h> + #if ((' ' & 0x0FF) == 0x020) +@@ -10064,15 +10777,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10067: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10780: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10070: \$? = $ac_status" >&5 ++ echo "$as_me:10783: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10785: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10075: \$? = $ac_status" >&5 ++ echo "$as_me:10788: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10085,7 +10798,7 @@ + fi + fi + fi +-echo "$as_me:10088: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:10801: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -10098,13 +10811,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:10101: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:10814: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10107 "configure" ++#line 10820 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$ac_hdr> +@@ -10119,16 +10832,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10835: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10125: \$? = $ac_status" >&5 ++ echo "$as_me:10838: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10841: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10131: \$? = $ac_status" >&5 ++ echo "$as_me:10844: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -10138,7 +10851,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10141: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:10854: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -10151,7 +10864,7 @@ + done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then +- echo "$as_me:10154: checking for opendir in -ldir" >&5 ++ echo "$as_me:10867: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10159,7 +10872,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10162 "configure" ++#line 10875 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10178,16 +10891,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10894: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10184: \$? = $ac_status" >&5 ++ echo "$as_me:10897: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10900: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10190: \$? = $ac_status" >&5 ++ echo "$as_me:10903: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -10198,14 +10911,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10201: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:10914: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test $ac_cv_lib_dir_opendir = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:10208: checking for opendir in -lx" >&5 ++ echo "$as_me:10921: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10213,7 +10926,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10216 "configure" ++#line 10929 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10232,16 +10945,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10235: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10948: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10238: \$? = $ac_status" >&5 ++ echo "$as_me:10951: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10241: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10954: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10244: \$? = $ac_status" >&5 ++ echo "$as_me:10957: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -10252,7 +10965,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10255: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:10968: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test $ac_cv_lib_x_opendir = yes; then + LIBS="$LIBS -lx" +@@ -10260,13 +10973,13 @@ + + fi + +-echo "$as_me:10263: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:10976: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10269 "configure" ++#line 10982 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/time.h> +@@ -10282,16 +10995,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10288: \$? = $ac_status" >&5 ++ echo "$as_me:11001: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10294: \$? = $ac_status" >&5 ++ echo "$as_me:11007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -10301,7 +11014,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10304: result: $ac_cv_header_time" >&5 ++echo "$as_me:11017: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -10319,7 +11032,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +-echo "$as_me:10322: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:11035: checking for $CC option to accept ANSI C" >&5 + echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10327,7 +11040,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 10330 "configure" ++#line 11043 "configure" + #include "confdefs.h" + #include <stdarg.h> + #include <stdio.h> +@@ -10376,16 +11089,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10382: \$? = $ac_status" >&5 ++ echo "$as_me:11095: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10385: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10388: \$? = $ac_status" >&5 ++ echo "$as_me:11101: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -10402,21 +11115,21 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:10405: result: none needed" >&5 ++ echo "$as_me:11118: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:11121: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + +-echo "$as_me:10413: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:11126: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10419 "configure" ++#line 11132 "configure" + #include "confdefs.h" + + int +@@ -10474,16 +11187,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11190: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10480: \$? = $ac_status" >&5 ++ echo "$as_me:11193: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11196: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10486: \$? = $ac_status" >&5 ++ echo "$as_me:11199: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -10493,7 +11206,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10496: result: $ac_cv_c_const" >&5 ++echo "$as_me:11209: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -10505,7 +11218,7 @@ + + ### Checks for external-data + +-echo "$as_me:10508: checking if data-only library module links" >&5 ++echo "$as_me:11221: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10513,20 +11226,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <<EOF +-#line 10516 "configure" ++#line 11229 "configure" + int testdata[3] = { 123, 456, 789 }; + EOF +- if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:11232: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10522: \$? = $ac_status" >&5 ++ echo "$as_me:11235: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <<EOF +-#line 10529 "configure" ++#line 11242 "configure" + int testfunc() + { + #if defined(NeXT) +@@ -10539,10 +11252,10 @@ + #endif + } + EOF +- if { (eval echo "$as_me:10542: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:11255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10545: \$? = $ac_status" >&5 ++ echo "$as_me:11258: \$? = $ac_status" >&5 + (exit $ac_status); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -10555,7 +11268,7 @@ + cf_cv_link_dataonly=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10558 "configure" ++#line 11271 "configure" + #include "confdefs.h" + + int main() +@@ -10566,15 +11279,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11282: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10572: \$? = $ac_status" >&5 ++ echo "$as_me:11285: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10574: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10577: \$? = $ac_status" >&5 ++ echo "$as_me:11290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_link_dataonly=yes + else +@@ -10589,7 +11302,7 @@ + + fi + +-echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:11305: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -10602,7 +11315,7 @@ + + ### Checks for library functions. + +-echo "$as_me:10605: checking for working mkstemp" >&5 ++echo "$as_me:11318: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10610,68 +11323,10 @@ + + rm -rf conftest* + if test "$cross_compiling" = yes; then +- echo "$as_me:10613: checking for mkstemp" >&5 +-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 +-if test "${ac_cv_func_mkstemp+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 10619 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char mkstemp (); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char mkstemp (); +-char (*f) (); +- +-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_mkstemp) || defined (__stub___mkstemp) +-choke me +-#else +-f = mkstemp; +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10650: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:10653: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10656: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:10659: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mkstemp=yes +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_func_mkstemp=no +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:10669: result: $ac_cv_func_mkstemp" >&5 +-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 +- ++ cf_cv_func_mkstemp=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10674 "configure" ++#line 11329 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -10709,15 +11364,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10712: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11367: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10715: \$? = $ac_status" >&5 ++ echo "$as_me:11370: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10717: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10720: \$? = $ac_status" >&5 ++ echo "$as_me:11375: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_mkstemp=yes + +@@ -10732,8 +11387,69 @@ + fi + + fi +-echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:11390: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 ++if test "x$cf_cv_func_mkstemp" = xmaybe ; then ++ echo "$as_me:11393: checking for mkstemp" >&5 ++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 ++if test "${ac_cv_func_mkstemp+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 11399 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char mkstemp (); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char mkstemp (); ++char (*f) (); ++ ++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_mkstemp) || defined (__stub___mkstemp) ++choke me ++#else ++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:11430: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:11433: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:11436: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:11439: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_mkstemp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_mkstemp=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:11449: result: $ac_cv_func_mkstemp" >&5 ++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 ++ ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + cat >>confdefs.h <<\EOF + #define HAVE_MKSTEMP 1 +@@ -10741,13 +11457,13 @@ + + fi + +-echo "$as_me:10744: checking return type of signal handlers" >&5 ++echo "$as_me:11460: checking return type of signal handlers" >&5 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 + if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10750 "configure" ++#line 11466 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <signal.h> +@@ -10769,16 +11485,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10775: \$? = $ac_status" >&5 ++ echo "$as_me:11491: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10781: \$? = $ac_status" >&5 ++ echo "$as_me:11497: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signal=void + else +@@ -10788,7 +11504,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10791: result: $ac_cv_type_signal" >&5 ++echo "$as_me:11507: result: $ac_cv_type_signal" >&5 + echo "${ECHO_T}$ac_cv_type_signal" >&6 + + cat >>confdefs.h <<EOF +@@ -10800,12 +11516,13 @@ + CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'` + fi + ++cf_with_ada=yes + if test "$cf_with_ada" != "no" ; then + + cf_ada_make=gnatmake + # Extract the first word of "$cf_ada_make", so it can be a program name with args. + set dummy $cf_ada_make; ac_word=$2 +-echo "$as_me:10808: checking for $ac_word" >&5 ++echo "$as_me:11525: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_gnat_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10820,7 +11537,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnat_exists="yes" +-echo "$as_me:10823: found $ac_dir/$ac_word" >&5 ++echo "$as_me:11540: found $ac_dir/$ac_word" >&5 + break + done + +@@ -10829,31 +11546,32 @@ + fi + gnat_exists=$ac_cv_prog_gnat_exists + if test -n "$gnat_exists"; then +- echo "$as_me:10832: result: $gnat_exists" >&5 ++ echo "$as_me:11549: result: $gnat_exists" >&5 + echo "${ECHO_T}$gnat_exists" >&6 + else +- echo "$as_me:10835: result: no" >&5 ++ echo "$as_me:11552: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + +-echo "$as_me:10843: checking for gnat version" >&5 ++echo "$as_me:11561: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +-echo "$as_me:10848: result: $cf_gnat_version" >&5 ++echo "$as_me:11566: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in #(vi +-3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi ++3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +- { echo "$as_me:10856: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:11574: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -10861,7 +11579,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:10864: checking for $ac_word" >&5 ++echo "$as_me:11582: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10876,7 +11594,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:10879: found $ac_dir/$ac_word" >&5 ++echo "$as_me:11597: found $ac_dir/$ac_word" >&5 + break + done + +@@ -10885,10 +11603,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:10888: result: $M4_exists" >&5 ++ echo "$as_me:11606: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:10891: result: no" >&5 ++ echo "$as_me:11609: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10897,7 +11615,7 @@ + echo Ada95 binding required program m4 not found. Ada95 binding disabled. + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:10900: checking if GNAT works" >&5 ++ echo "$as_me:11618: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -10925,30 +11643,34 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:11646: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + fi + + if test "$cf_cv_prog_gnat_correct" = yes; then + +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) ++ echo "$as_me:11653: checking optimization options for ADAFLAGS" >&5 ++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ++ case "$CFLAGS" in ++ *-g*) + + ADAFLAGS="$ADAFLAGS -g" + +- ;; +- esac +- case "$CFLAGS" in +- *-O*) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[ ].*//'` + +- ADAFLAGS="$ADAFLAGS -O3" ++ ADAFLAGS="$ADAFLAGS $cf_O_flag" + +- ;; +- esac ++ ;; ++ esac ++ echo "$as_me:11670: result: $ADAFLAGS" >&5 ++echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:10951: checking if GNAT supports generics" >&5 ++echo "$as_me:11673: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[1-9]*|[4-9].*) #(vi +@@ -10958,7 +11680,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:10961: result: $cf_gnat_generics" >&5 ++echo "$as_me:11683: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -10970,7 +11692,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:10973: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:11695: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11018,7 +11740,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:11743: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -11027,7 +11749,7 @@ + USE_GNAT_SIGINT="#" + fi + +-echo "$as_me:11030: checking if GNAT pragma Unreferenced works" >&5 ++echo "$as_me:11752: checking if GNAT pragma Unreferenced works" >&5 + echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 + if test "${cf_cv_pragma_unreferenced+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11058,7 +11780,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:11061: result: $cf_cv_pragma_unreferenced" >&5 ++echo "$as_me:11783: result: $cf_cv_pragma_unreferenced" >&5 + echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 + + # if the pragma is supported, use it (needed in the Trace code). +@@ -11071,7 +11793,7 @@ + cf_gnat_libraries=no + cf_gnat_projects=no + +-echo "$as_me:11074: checking if GNAT supports project files" >&5 ++echo "$as_me:11796: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[0-9]*) #(vi +@@ -11139,14 +11861,14 @@ + esac + ;; + esac +-echo "$as_me:11142: result: $cf_gnat_projects" >&5 ++echo "$as_me:11864: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + + if test $cf_gnat_projects = yes + then +- echo "$as_me:11147: checking if GNAT supports libraries" >&5 ++ echo "$as_me:11869: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:11149: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:11871: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -11166,7 +11888,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:11169: checking for ada-compiler" >&5 ++echo "$as_me:11891: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -11177,12 +11899,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:11180: result: $cf_ada_compiler" >&5 ++echo "$as_me:11902: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:11185: checking for ada-include" >&5 ++echo "$as_me:11907: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -11206,7 +11928,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -11218,7 +11940,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:11943: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11227,10 +11949,10 @@ + fi + ADA_INCLUDE="$withval" + +-echo "$as_me:11230: result: $ADA_INCLUDE" >&5 ++echo "$as_me:11952: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:11233: checking for ada-objects" >&5 ++echo "$as_me:11955: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -11254,7 +11976,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -11266,7 +11988,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:11991: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -11275,10 +11997,10 @@ + fi + ADA_OBJECTS="$withval" + +-echo "$as_me:11278: result: $ADA_OBJECTS" >&5 ++echo "$as_me:12000: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:11281: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:12003: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -11288,7 +12010,7 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:11291: result: $with_ada_sharedlib" >&5 ++echo "$as_me:12013: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' +@@ -11304,12 +12026,12 @@ + fi + + else +- { { echo "$as_me:11307: error: No usable Ada compiler found" >&5 ++ { { echo "$as_me:12029: error: No usable Ada compiler found" >&5 + echo "$as_me: error: No usable Ada compiler found" >&2;} + { (exit 1); exit 1; }; } + fi + else +- { { echo "$as_me:11312: error: The Ada compiler is needed for this package" >&5 ++ { { echo "$as_me:12034: error: The Ada compiler is needed for this package" >&5 + echo "$as_me: error: The Ada compiler is needed for this package" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11317,7 +12039,9 @@ + ################################################################################ + + # not needed +-TINFO_ARGS2= ++TINFO_LDFLAGS2= ++ ++TINFO_LIBS= + + ### Construct the list of include-directories to be generated + +@@ -11354,7 +12078,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:11357: checking default library suffix" >&5 ++echo "$as_me:12081: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -11365,10 +12089,10 @@ + shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:11368: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:12092: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:11371: checking default library-dependency suffix" >&5 ++echo "$as_me:12095: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in #(vi +@@ -11390,11 +12114,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.a' + ;; +@@ -11421,10 +12145,10 @@ + esac + test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" + test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" +-echo "$as_me:11424: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:12148: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:11427: checking default object directory" >&5 ++echo "$as_me:12151: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -11440,7 +12164,7 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:12167: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + ### Set up low-level terminfo dependencies for makefiles. +@@ -11656,7 +12380,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:11659: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:12383: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -11788,7 +12512,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20101002, ++configured by $0, generated by GNU Autoconf 2.52.20120811, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -11832,7 +12556,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:11835: error: ambiguous option: $1 ++ { { echo "$as_me:12559: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -11851,7 +12575,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:11854: error: unrecognized option: $1 ++ -*) { { echo "$as_me:12578: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -11870,7 +12594,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20101002, executed with ++This file was extended by $as_me 2.52.20120811, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -11892,8 +12616,8 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUFFIX="$LIB_SUFFIX" + LN_S="$LN_S" + NCURSES_MAJOR="$NCURSES_MAJOR" +@@ -11922,7 +12646,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:11925: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:12649: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -11981,6 +12705,7 @@ + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t + s,@libexecdir@,$libexecdir,;t t ++s,@datarootdir@,$datarootdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t +@@ -12061,6 +12786,7 @@ + s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t + s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t + s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t ++s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t + s,@NCURSES_MAJOR@,$NCURSES_MAJOR,;t t + s,@NCURSES_MINOR@,$NCURSES_MINOR,;t t + s,@NCURSES_PATCH@,$NCURSES_PATCH,;t t +@@ -12083,13 +12809,18 @@ + s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t + s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t + s,@INSTALL_LIB@,$INSTALL_LIB,;t t ++s,@RPATH_LIST@,$RPATH_LIST,;t t + s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t + s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t + s,@NCURSES_CONST@,$NCURSES_CONST,;t t + s,@PTHREAD@,$PTHREAD,;t t + s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t + s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t +-s,@ECHO_LINK@,$ECHO_LINK,;t t ++s,@ECHO_LT@,$ECHO_LT,;t t ++s,@ECHO_LD@,$ECHO_LD,;t t ++s,@RULE_CC@,$RULE_CC,;t t ++s,@SHOW_CC@,$SHOW_CC,;t t ++s,@ECHO_CC@,$ECHO_CC,;t t + s,@ADAFLAGS@,$ADAFLAGS,;t t + s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t + s,@ADA_TRACE@,$ADA_TRACE,;t t +@@ -12109,7 +12840,8 @@ + s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t + s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t + s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t +-s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t ++s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t ++s,@TINFO_LIBS@,$TINFO_LIBS,;t t + s,@ACPPFLAGS@,$ACPPFLAGS,;t t + s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t + s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t +@@ -12237,7 +12969,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:12240: creating $ac_file" >&5 ++ { echo "$as_me:12972: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -12255,7 +12987,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12258: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:12990: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12268,7 +13000,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12271: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:13003: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12334,7 +13066,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:12337: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:13069: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -12345,7 +13077,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:12348: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:13080: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -12358,7 +13090,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:12361: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:13093: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -12416,7 +13148,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then +- { echo "$as_me:12419: $ac_file is unchanged" >&5 ++ { echo "$as_me:13151: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +diff -Naur ncurses-5.9.orig/Ada95/configure.in ncurses-5.9/Ada95/configure.in +--- ncurses-5.9.orig/Ada95/configure.in 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/configure.in 2012-08-25 19:58:01.333225137 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 2010-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey + dnl +-dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $ ++dnl $Id: configure.in,v 1.41 2012/05/05 20:54:52 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl See http://invisible-island.net/autoconf/ for additional information. + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.13.20020210) +-AC_REVISION($Revision: 1.30 $) ++AC_REVISION($Revision: 1.41 $) + AC_INIT(gen/gen.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -54,7 +54,7 @@ + CF_CFG_DEFAULTS + + ### Checks for programs. +-AC_PROG_CC ++AC_PROG_CC(gnatgcc gcc cc) + CF_GCC_VERSION + + AC_PROG_CPP +@@ -75,28 +75,8 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + CF_PKG_CONFIG +- +-if test "$PKG_CONFIG" != none ; then +- AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) +- +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then +- AC_ARG_ENABLE(pc-files, +- [ --enable-pc-files generate and install .pc files for pkg-config], +- [enable_pc_files=$enableval], +- [enable_pc_files=no]) +- AC_MSG_RESULT($enable_pc_files) +- else +- AC_MSG_RESULT(no) +- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR) +- enable_pc_files=no +- fi +-fi +-AC_SUBST(PKG_CONFIG_LIBDIR) ++CF_WITH_PKG_CONFIG_LIBDIR ++CF_ENABLE_PC_FILES + + AC_MSG_CHECKING(if you want to build test-programs) + AC_ARG_WITH(tests, +@@ -186,9 +166,7 @@ + + CF_NCURSES_ADDON + +-CF_LIB_PREFIX(cf_prefix) +-LIB_PREFIX=$cf_prefix +-AC_SUBST(LIB_PREFIX) ++CF_WITH_LIB_PREFIX(cf_prefix) + + LIB_SUFFIX= + AC_SUBST(LIB_SUFFIX) +@@ -235,8 +213,6 @@ + ############################################################################### + CF_HELP_MESSAGE(Fine-Tuning Your Configuration:) + +-CF_PATHSEP +- + ### use option --enable-broken-linker to force on use of broken-linker support + AC_MSG_CHECKING(if you want broken-linker support code) + AC_ARG_ENABLE(broken_linker, +@@ -394,18 +370,7 @@ + CF_HELP_MESSAGE(Testing/development Options:) + + ### use option --disable-echo to suppress full display compiling commands +-AC_MSG_CHECKING(if you want to display full commands during build) +-AC_ARG_ENABLE(echo, +- [ --enable-echo build: display "compiling" commands (default)], +- [with_echo=$enableval], +- [with_echo=yes]) +-if test "$with_echo" = yes; then +- ECHO_LINK= +-else +- ECHO_LINK='@ echo linking $@ ... ;' +-fi +-AC_MSG_RESULT($with_echo) +-AC_SUBST(ECHO_LINK) ++CF_DISABLE_ECHO + + ### use option --enable-warnings to turn on all gcc warnings + AC_MSG_CHECKING(if you want to see compiler warnings) +@@ -431,7 +396,6 @@ + then + if test "$with_assertions" = no + then +- AC_DEFINE(NDEBUG) + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + CF_ADD_ADAFLAGS(-gnata) +@@ -514,24 +478,13 @@ + fi + + CF_HELP_MESSAGE(Ada95 Binding Options:) +- ++cf_with_ada=yes + dnl Check for availability of GNU Ada Translator (GNAT). + dnl At the moment we support no other Ada95 compiler. + if test "$cf_with_ada" != "no" ; then + CF_PROG_GNAT + if test "$cf_cv_prog_gnat_correct" = yes; then +- +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) +- CF_ADD_ADAFLAGS(-g) +- ;; +- esac +- case "$CFLAGS" in +- *-O*) +- CF_ADD_ADAFLAGS(-O3) +- ;; +- esac ++ CF_FIXUP_ADAFLAGS + + CF_GNAT_GENERICS + CF_GNAT_SIGINT +@@ -556,8 +509,10 @@ + ################################################################################ + + # not needed +-TINFO_ARGS2= +-AC_SUBST(TINFO_ARGS2) ++TINFO_LDFLAGS2= ++AC_SUBST(TINFO_LDFLAGS2) ++TINFO_LIBS= ++AC_SUBST(TINFO_LIBS) + + ### Construct the list of include-directories to be generated + CF_INCLUDE_DIRS +@@ -656,8 +611,8 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUFFIX="$LIB_SUFFIX" + LN_S="$LN_S" + NCURSES_MAJOR="$NCURSES_MAJOR" +diff -Naur ncurses-5.9.orig/Ada95/doc/Makefile.in ncurses-5.9/Ada95/doc/Makefile.in +--- ncurses-5.9.orig/Ada95/doc/Makefile.in 2012-08-25 19:57:59.376567724 +0000 ++++ ncurses-5.9/Ada95/doc/Makefile.in 2012-08-25 19:58:02.286553964 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.2 2011/03/26 19:26:17 tom Exp $ ++# $Id: Makefile.in,v 1.3 2012/08/11 21:31:56 tom Exp $ + ############################################################################## + # Copyright (c) 2011 Free Software Foundation, Inc. # + # # +@@ -38,6 +38,7 @@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + mandir = @mandir@ + +diff -Naur ncurses-5.9.orig/Ada95/gen/Makefile.in ncurses-5.9/Ada95/gen/Makefile.in +--- ncurses-5.9.orig/Ada95/gen/Makefile.in 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/gen/Makefile.in 2012-08-25 19:58:01.003226698 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $ ++# $Id: Makefile.in,v 1.76 2012/03/17 16:45:38 tom Exp $ + # + .SUFFIXES: + +@@ -73,7 +73,7 @@ + LOCAL_LIBDIR = @top_builddir@/lib + + LINK = $(HOST_CC) +-LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@ ++LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@ + + RANLIB = @RANLIB@ + +@@ -179,7 +179,7 @@ + -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG) + + $(PROG_GENERATE): gen.o +- @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@ ++ @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@ + + gen.o: $(srcdir)/gen.c + $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c +@@ -411,7 +411,7 @@ + @mkdir -p $(HTML_DIR) + cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] + @USE_OLD_MAKERULES@ ln -sf ../src/*.ali . +-@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali . ++@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali . + @echo "Filtering generated files" + @for f in $(GEN_SRC); do \ + h=`basename $$f` ;\ +diff -Naur ncurses-5.9.orig/Ada95/gen/gen.c ncurses-5.9/Ada95/gen/gen.c +--- ncurses-5.9.orig/Ada95/gen/gen.c 2012-08-25 19:57:59.379901042 +0000 ++++ ncurses-5.9/Ada95/gen/gen.c 2012-08-25 19:57:59.859898773 +0000 +@@ -32,7 +32,7 @@ + + /* + Version Control +- $Id: gen.c,v 1.59 2011/03/31 23:50:24 tom Exp $ ++ $Id: gen.c,v 1.60 2011/04/30 19:47:19 Nicolas.Boulenguez Exp $ + --------------------------------------------------------------------------*/ + /* + This program generates various record structures and constants from the +@@ -124,19 +124,15 @@ + int len, /* size of the record in bytes */ + int bias) + { +- const char *unused_name = "Unused"; +- int long_bits = (8 * (int)sizeof(unsigned long)); +- int len_bits = (8 * len); +- int i, j, n, l, cnt = 0, low, high; ++ const int len_bits = (8 * len); ++ int i, l, low, high; + int width = strlen(RES_NAME) + 3; + unsigned long a; +- unsigned long mask = 0; + + assert(nap != NULL); + + for (i = 0; nap[i].name != (char *)0; i++) + { +- cnt++; + l = (int)strlen(nap[i].name); + if (l > width) + width = l; +@@ -147,32 +143,8 @@ + printf(" record\n"); + for (i = 0; nap[i].name != (char *)0; i++) + { +- mask |= nap[i].attr; + printf(" %-*s : Boolean;\n", width, nap[i].name); + } +- +- /* +- * Compute a mask for the unused bits in this target. +- */ +- mask = ~mask; +- /* +- * Bits in the biased area are unused by the target. +- */ +- for (j = 0; j < bias; ++j) +- { +- mask &= (unsigned long)(~(1L << j)); +- } +- /* +- * Bits past the target's size are really unused. +- */ +- for (j = len_bits + bias; j < long_bits; ++j) +- { +- mask &= (unsigned long)(~(1L << j)); +- } +- if (mask != 0) +- { +- printf(" %-*s : Boolean;\n", width, unused_name); +- } + printf(" end record;\n"); + printf(" pragma Convention (C, %s);\n\n", name); + +@@ -187,17 +159,10 @@ + printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name, + low - bias, high - bias); + } +- if (mask != 0) +- { +- l = find_pos((char *)&mask, sizeof(mask), &low, &high); +- if (l >= 0) +- printf(" %-*s at 0 range %2d .. %2d;\n", width, unused_name, +- low - bias, high - bias); +- } +- i = 1; +- n = cnt; + printf(" end record;\n"); ++ printf(" pragma Warnings (Off);"); + printf(" for %s'Size use %d;\n", name, len_bits); ++ printf(" pragma Warnings (On);\n"); + printf(" -- Please note: this rep. clause is generated and may be\n"); + printf(" -- different on your system."); + } +diff -Naur ncurses-5.9.orig/Ada95/samples/Makefile.in ncurses-5.9/Ada95/samples/Makefile.in +--- ncurses-5.9.orig/Ada95/samples/Makefile.in 2012-08-25 19:57:59.376567724 +0000 ++++ ncurses-5.9/Ada95/samples/Makefile.in 2012-08-25 19:58:02.286553964 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.46 2011/03/28 23:45:08 tom Exp $ ++# $Id: Makefile.in,v 1.47 2012/08/11 21:31:56 tom Exp $ + # + .SUFFIXES: + +@@ -42,6 +42,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + libdir = @libdir@ + includedir = @includedir@ +diff -Naur ncurses-5.9.orig/Ada95/src/Makefile.in ncurses-5.9/Ada95/src/Makefile.in +--- ncurses-5.9.orig/Ada95/src/Makefile.in 2012-08-25 19:57:59.383234360 +0000 ++++ ncurses-5.9/Ada95/src/Makefile.in 2012-08-25 19:57:59.859898773 +0000 +@@ -28,7 +28,7 @@ + # + # Author: Juergen Pfeifer, 1996 + # +-# $Id: Makefile.in,v 1.60 2011/03/31 09:46:16 tom Exp $ ++# $Id: Makefile.in,v 1.62 2011/04/30 22:24:45 tom Exp $ + # + .SUFFIXES: + +@@ -218,7 +218,9 @@ + $(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@ + + ############################################################################### +-C_OBJS = c_varargs_to_ada.o ncurses_compat.o ++# Use these definitions when building a shared library. ++SHARED_C_OBJS = c_varargs_to_ada.o ncurses_compat.o ++SHARED_OBJS = $(SHARED_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ + + c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c + $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c +@@ -227,13 +229,22 @@ + $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/ncurses_compat.c + + ############################################################################### ++# Use these definitions when building a static library. ++STATIC_C_OBJS = static_c_varargs_to_ada.o static_ncurses_compat.o ++STATIC_OBJS = $(STATIC_C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ + +-MIXED_OBJS = $(C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ ++static_c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c ++ $(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/c_varargs_to_ada.c ++ ++static_ncurses_compat.o : $(srcdir)/ncurses_compat.c ++ $(CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/ncurses_compat.c ++ ++############################################################################### + + @USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ + @USE_OLD_MAKERULES@ $(BUILD_DIR_LIB) \ +-@USE_OLD_MAKERULES@ $(MIXED_OBJS) +-@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(MIXED_OBJS) ++@USE_OLD_MAKERULES@ $(STATIC_OBJS) ++@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(STATIC_OBJS) + + $(BUILD_DIR)/static-ali : ; mkdir -p $@ + $(BUILD_DIR)/static-obj : ; mkdir -p $@ +@@ -245,10 +256,10 @@ + + @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ + @USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ +-@USE_GNAT_PROJECTS@ $(C_OBJS) \ ++@USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \ + @USE_GNAT_PROJECTS@ $(STATIC_DIRS) + @USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static +-@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(C_OBJS) ++@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS) + @USE_GNAT_PROJECTS@ + @USE_GNAT_LIBRARIES@install \ + @USE_GNAT_LIBRARIES@install.libs :: \ +@@ -274,8 +285,11 @@ + $(BUILD_DIR)/dynamic-obj + + @MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) +-@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS) +-@MAKE_ADA_SHAREDLIB@ cp $(MIXED_OBJS) $(BUILD_DIR)/dynamic-obj/ ++@MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: \ ++@MAKE_ADA_SHAREDLIB@ $(ABASE)-trace.adb \ ++@MAKE_ADA_SHAREDLIB@ $(SHARED_DIRS) \ ++@MAKE_ADA_SHAREDLIB@ $(SHARED_OBJS) ++@MAKE_ADA_SHAREDLIB@ cp $(SHARED_OBJS) $(BUILD_DIR)/dynamic-obj/ + @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic + + install \ +diff -Naur ncurses-5.9.orig/INSTALL ncurses-5.9/INSTALL +--- ncurses-5.9.orig/INSTALL 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/INSTALL 2012-08-25 19:58:02.289887281 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: INSTALL,v 1.155 2011/03/31 08:27:24 tom Exp $ ++-- $Id: INSTALL,v 1.166 2012/08/11 20:12:34 tom Exp $ + --------------------------------------------------------------------- + How to install Ncurses/Terminfo on your system + --------------------------------------------------------------------- +@@ -407,13 +407,14 @@ + + --disable-tic-depends + When building shared libraries, normally the tic library is linked to +- depend upon the ncurses library (and in turn, on the term-library if +- the --with-termlib option was given). The tic- and term-libraries +- ABI does not depend on the --enable-widec option. Some packagers have +- used this to reduce the number of library files which are packaged +- by using only one copy of those libraries. To make this work properly, ++ depend upon the ncurses library (or equivalently, on the tinfo-library ++ if the --with-termlib option was given). The tic- and tinfo-library ++ ABIs do not depend on the --enable-widec option. Some packagers have ++ used this to reduce the number of library files which are packaged by ++ using only one copy of those libraries. To make this work properly, + the tic library must be built without an explicit dependency on the +- ncurses (or ncursesw) library. Use this configure option to do that. ++ underlying library (ncurses vs ncursesw, tinfo vs tinfow). Use this ++ configure option to do that. + For example + configure --with-ticlib --with-shared --disable-tic-depends + +@@ -555,6 +556,9 @@ + library by reducing global and static variables. This option is also + set if --with-pthread is used. + ++ Enabling this option adds a "t" to the library names, except for the ++ special case when --enable-weak-symbols is also used. ++ + --enable-rpath + Use rpath option when generating shared libraries, and (with some + restrictions) when linking the corresponding programs. This originally +@@ -595,6 +599,14 @@ + reducing the need for juggling the global SP value with set_term() and + delscreen(). + ++ --enable-string-hacks ++ Controls whether strlcat and strlcpy may be used. The same issue ++ applies to OpenBSD's warnings about snprintf, noting that this function ++ is weakly standardized. ++ ++ Aside from stifling these warnings, there is no functional improvement ++ in ncurses. ++ + --enable-symlinks + If your system supports symbolic links, make tic use symbolic links + rather than hard links to save diskspace when writing aliases in the +@@ -616,6 +628,12 @@ + match is found in the terminfo database. See also the --enable-getcap + and --enable-getcap-cache options. + ++ Termcap support requires run-time parsing rather than loading ++ predigested data. If you have specified --with-ticlib, then you ++ cannot have termcap support since run-time parsing is done in the ++ tic library, which is intentionally not part of normal linkage ++ dependencies. ++ + --enable-warnings + Turn on GCC compiler warnings. There should be only a few. + +@@ -824,7 +842,17 @@ + NOTE: a few systems build shared libraries with fixed pathnames; this + option probably will not work for those configurations. + +- --with-libtool[=XXX] ++ --with-lib-prefix=XXX ++ OS/2 EMX used a different naming convention from most Unix-like ++ platforms. It required that the "lib" part of a library name was ++ omitted. Newer EMX as part of eComStation does not follow that ++ convention. Use this option to override the configure script's ++ assumptions about the library-prefix. If this option is omitted, it ++ uses the original OS/2 EMX convention for that platform. Use ++ "--with-lib-prefix=lib" for the newer EMX in eComStation. Use ++ "--without-lib-prefix" to suppress it for other odd platforms. ++ ++ --with-libtool[=XXX] + Generate libraries with libtool. If this option is selected, then it + overrides all other library model specifications. Note that libtool + must already be installed, uses makefile rules dependent on GNU make, +@@ -904,6 +932,10 @@ + --with-pkg-config=[DIR] + Check for pkg-config, optionally specifying its path. + ++ --with-pkg-config-libdir=[DIR] ++ If pkg-config was found, override the automatic check for its library ++ path. ++ + --with-profile + Generate profile-libraries These are named by adding "_p" to the root, + e.g., libncurses_p.a +@@ -996,10 +1028,27 @@ + library dependencies for tic and other programs built with the tic + library. + ++ --with-tparm-arg[=XXX] ++ Override the type used for tparm() arguments, which normally is a ++ "long". However the function must assume that its arguments can hold a ++ pointer to char's which is not always workable for 64-bit platforms. A ++ better choice would be intptr_t, which was not available at the time ++ tparm's interface was defined. ++ ++ If the option is not given, this defaults to "long". ++ + --with-trace + Configure the trace() function as part of the all models of the ncurses + library. Normally it is part of the debug (libncurses_g) library only. + ++ --with-xterm-kbs=XXX ++ Configure xterm's terminfo entries to use either BS (^H, i.e., ASCII ++ backspace) or DEL (^?, or 127). XXX can be BS (or bs, 8) or DEL ++ (or del, 127). ++ ++ During installation, the makefile and scripts modifies the "xterm+kbs" ++ terminfo entry to use this setting. ++ + --with-valgrind + For testing, compile with debug option. + This also sets the --disable-leaks option. +@@ -1024,6 +1073,8 @@ + install as "ncurses.h" and modify the installed headers and manpages + accordingly. + ++ Likewise, do not install an alias "curses" for the ncurses manpage. ++ + --without-cxx + XSI curses declares "bool" as part of the interface. C++ also declares + "bool". Neither specifies the size and type of booleans, but both +@@ -1726,20 +1777,37 @@ + By default, there are no entries on the fallback list. After you have + built the ncurses suite for the first time, you can change the list + (the process needs infocmp(1)). To do so, use the script +- ncurses/tinfo/MKfallback.sh. A configure script option ++ ncurses/tinfo/MKfallback.sh. The configure script option + --with-fallbacks does this (it accepts a comma-separated list of the + names you wish, and does not require a rebuild). + + If you wanted (say) to have linux, vt100, and xterm fallbacks, you +- would use the commands ++ might use the commands + + cd ncurses; +- tinfo/MKfallback.sh linux vt100 xterm >fallback.c ++ tinfo/MKfallback.sh \ ++ $TERMINFO \ ++ ../misc/terminfo.src \ ++ `which tic` \ ++ linux vt100 xterm >fallback.c ++ ++ The first three parameters of the script are normally supplied by ++ the configured makefiles via the "--with-fallbacks" option. They ++ are ++ ++ 1) the location of the terminfo database ++ 2) the source for the terminfo entries ++ 3) the location of the tic program, used to create a terminfo ++ database. + + Then just rebuild and reinstall the library as you would normally. + You can restore the default empty fallback list with + +- tinfo/MKfallback.sh >fallback.c ++ tinfo/MKfallback.sh \ ++ $TERMINFO \ ++ ../misc/terminfo.src \ ++ `which tic` \ ++ >fallback.c + + The overhead for an empty fallback list is one trivial stub function. + Any non-empty fallback list is const-ed and therefore lives in sharable +diff -Naur ncurses-5.9.orig/MANIFEST ncurses-5.9/MANIFEST +--- ncurses-5.9.orig/MANIFEST 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/MANIFEST 2012-08-25 19:58:01.833222773 +0000 +@@ -545,6 +545,8 @@ + ./include/nc_alloc.h + ./include/nc_mingw.h + ./include/nc_panel.h ++./include/nc_string.h ++./include/nc_termios.h + ./include/nc_tparm.h + ./include/ncurses_cfg.hin + ./include/ncurses_defs +@@ -764,7 +766,6 @@ + ./mk-0th.awk + ./mk-1st.awk + ./mk-2nd.awk +-./mk-dlls.sh.in + ./mk-hdr.awk + ./ncurses/Makefile.in + ./ncurses/README +@@ -867,6 +868,12 @@ + ./ncurses/llib-lncursest + ./ncurses/llib-lncursestw + ./ncurses/llib-lncursesw ++./ncurses/llib-ltic ++./ncurses/llib-ltictw ++./ncurses/llib-lticw ++./ncurses/llib-ltinfo ++./ncurses/llib-ltinfotw ++./ncurses/llib-ltinfow + ./ncurses/modules + ./ncurses/tinfo/MKcaptab.awk + ./ncurses/tinfo/MKcaptab.sh +@@ -970,6 +977,14 @@ + ./ncurses/win32con/gettimeofday.c + ./ncurses/win32con/wcwidth.c + ./ncurses/win32con/win_driver.c ++./package/debian/changelog ++./package/debian/compat ++./package/debian/control ++./package/debian/copyright ++./package/debian/rules ++./package/debian/source/format ++./package/debian/watch ++./package/ncurses.spec + ./panel/Makefile.in + ./panel/headers + ./panel/llib-lpanel +@@ -1022,6 +1037,7 @@ + ./test/cardfile.dat + ./test/chgat.c + ./test/clip_printw.c ++./test/color_name.h + ./test/color_set.c + ./test/configure + ./test/configure.in +diff -Naur ncurses-5.9.orig/Makefile.in ncurses-5.9/Makefile.in +--- ncurses-5.9.orig/Makefile.in 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/Makefile.in 2012-08-25 19:58:02.289887281 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.34 2012/08/11 21:41:19 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -35,7 +35,8 @@ + VPATH = @srcdir@ + + DESTDIR=@DESTDIR@ +-CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" ++RPATH_LIST=@RPATH_LIST@ ++CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" + + @SET_MAKE@ + +@@ -48,6 +49,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + + bindir = @bindir@ + ticdir = @TERMINFO@ +@@ -87,12 +89,9 @@ + fgrep NCURSES_VERSION $(includedir)/curses.h >/dev/null || \ + echo '** Will overwrite non-ncurses curses.h' + +-dlls: libs +- $(SHELL) $(srcdir)/mk-dlls.sh +- + distclean \ + realclean :: +- -rm -f mk-dlls.sh mingw_arch ++ + + # Put the common rules here so that we can easily construct the list of + # directories to visit. +diff -Naur ncurses-5.9.orig/NEWS ncurses-5.9/NEWS +--- ncurses-5.9.orig/NEWS 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/NEWS 2012-08-25 19:58:02.303220551 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: NEWS,v 1.1682 2011/04/04 00:02:42 tom Exp $ ++-- $Id: NEWS,v 1.1942 2012/08/11 21:30:05 tom Exp $ + ------------------------------------------------------------------------------- + + This is a log of changes that ncurses has gone through since Zeyd started +@@ -45,6 +45,731 @@ + Changes through 1.9.9e did not credit all contributions; + it is not possible to add this information. + ++20120811 ++ + update autoconf patch to 2.52.20120811, adding --datarootdir ++ (prompted by discussion with Erwin Waterlander). ++ + improve description of --enable-reentrant option in README and the ++ INSTALL file. ++ + add nsterm-256color, make this the default nsterm -TD ++ + remove bw from nsterm-bce, per testing with tack -TD ++ ++20120804 ++ + update test/configure, adding check for tinfo library. ++ + improve limit-checks for the getch fifo (report by Werner Fink). ++ + fix a remaining mismatch between $with_echo and the symbols updated ++ by CF_DISABLE_ECHO affecting parameters for mk-2nd.awk (report by ++ Sven Joachim, cf: 20120317). ++ + modify followup check for pkg-config's library directory in the ++ --enable-pc-files option to validate syntax (report by Sven Joachim, ++ cf: 20110716). ++ ++20120728 ++ + correct path for ncurses_mingw.h in include/headers, in case build ++ is done outside source-tree (patch by Roumen Petrov). ++ + modify some older xterm entries to align with xterm source -TD ++ + separate "xterm-old" alias from "xterm-r6" -TD ++ + add E3 extended capability to xterm-basic and putty -TD ++ + parenthesize parameters of other macros in curses.h -TD ++ + parenthesize parameter of COLOR_PAIR and PAIR_NUMBER in curses.h ++ in case it happens to be a comma-expression, etc. (patch by Nick ++ Black). ++ ++20120721 ++ + improved form_request_by_name() and menu_request_by_name(). ++ + eliminate two fixed-size buffers in toe.c ++ + extend use_tioctl() to have expected behavior when use_env(FALSE) and ++ use_tioctl(TRUE) are called. ++ + modify ncurses test-program, adding -E and -T options to demonstrate ++ use_env() versus use_tioctl(). ++ ++20120714 ++ + add use_tioctl() function (adapted from patch by Werner Fink, ++ Novell #769788): ++ ++20120707 ++ + add ncurses_mingw.h to installed headers (prompted by patch by ++ Juergen Pfeifer). ++ + clarify return-codes from wgetch() in response to SIGWINCH (prompted ++ by Novell #769788). ++ + modify resizeterm() to always push a KEY_RESIZE onto the fifo, even ++ if screensize is unchanged. Modify _nc_update_screensize() to push a ++ KEY_RESIZE if there was a SIGWINCH, even if it does not call ++ resizeterm(). These changes eliminate the case where a SIGWINCH is ++ received, but ERR returned from wgetch or wgetnstr because the screen ++ dimensions did not change (Novell #769788). ++ ++20120630 ++ + add --enable-interop to sample package scripts (suggested by Juergen ++ Pfeifer). ++ + update CF_PATH_SYNTAX macro, from mawk changes. ++ + modify mk-0th.awk to allow for generating llib-ltic, etc., though ++ some work is needed on cproto to work with lib_gen.c to update ++ llib-lncurses. ++ + remove redundant getenv() cal in database-iterator leftover from ++ cleanup in 20120622 changes (report by Sven Joachim). ++ ++20120622 ++ + add -d, -e and -q options to test/demo_terminfo and test/demo_termcap ++ + fix caching of environment variables in database-iterator (patch by ++ Philippe Troin, Redhat #831366). ++ ++20120616 ++ + add configure check to distinguish clang from gcc to eliminate ++ warnings about unused command-line parameters when compiler warnings ++ are enabled. ++ + improve behavior when updating terminfo entries which are hardlinked ++ by allowing for the possibility that an alias has been repurposed to ++ a new primary name. ++ + fix some strict compiler warnings based on package scripts. ++ + further fixes for configure check for working poll (Debian #676461). ++ ++20120608 ++ + fix an uninitialized variable in -c/-n logic for infocmp changes ++ (cf: 20120526). ++ + corrected fix for building c++ binding with clang 3.0 (report/patch ++ by Richard Yao, Gentoo #417613, cf: 20110409) ++ + correct configure check for working poll, fixing the case where stdin ++ is redirected, e.g., in rpm/dpkg builds (Debian #676461). ++ + add rpm- and dpkg-scripts, to test those build-environments. ++ The resulting packages are used only for testing. ++ ++20120602 ++ + add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD ++ + add kdch1, etc., to qvt108 -TD ++ + add dl1/il1 to some entries based on dl/il values -TD ++ + add dl to simpleterm -TD ++ + add consistency-checks in tic for insert-line vs delete-line ++ controls, and insert/delete-char keys ++ + correct no-leaks logic in infocmp when doing comparisons, fixing ++ duplicate free of entries given via the command-line, and freeing ++ entries loaded from the last-but-one of files specified on the ++ command-line. ++ + add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord, ++ analysis by Martin Husemann). ++ + add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by ++ Onno van der Linden). ++ ++20120526 ++ + extend -c and -n options of infocmp to allow comparing more than two ++ entries. ++ + correct check in infocmp for number of terminal names when more than ++ two are given. ++ + correct typo in curs_threads.3x (report by Yanhui Shen on ++ freebsd-hackers mailing list). ++ ++20120512 ++ + corrected 'op' for bterm (report by Samuel Thibault) -TD ++ + modify test/background.c to demonstrate a background character ++ holding a colored ACS_HLINE. The behavior differs from SVr4 due to ++ the thick- and double-line extension (cf: 20091003). ++ + modify handling of acs characters in PutAttrChar to avoid mapping an ++ unmapped character to a space with A_ALTCHARSET set. ++ + rewrite vt520 entry based on vt420 -TD ++ ++20120505 ++ + remove p6 (bold) from opus3n1+ for consistency -TD ++ + remove acs stuff from env230 per clues in Ingres termcap -TD ++ + modify env230 sgr/sgr0 to match other capabilities -TD ++ + modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD ++ + make sgr for dku7202 agree with other caps -TD ++ + make sgr for ibmpc agree with other caps -TD ++ + make sgr for tek4107 agree with other caps -TD ++ + make sgr for ndr9500 agree with other caps -TD ++ + make sgr for sco-ansi agree with other caps -TD ++ + make sgr for d410 agree with other caps -TD ++ + make sgr for d210 agree with other caps -TD ++ + make sgr for d470c, d470c-7b agree with other caps -TD ++ + remove redundant AC_DEFINE for NDEBUG versus Makefile definition. ++ + fix a back-link in _nc_delink_entry(), which is needed if ncurses is ++ configured with --enable-termcap and --disable-getcap. ++ ++20120428 ++ + fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD ++ + add eslok flag to dec+sl -TD ++ + dec+sl applies to vt320 and up -TD ++ + drop wsl width from xterm+sl -TD ++ + reuse xterm+sl in putty and nsca-m -TD ++ + add ansi+tabs to vt520 -TD ++ + add ansi+enq to vt220-vt520 -TD ++ + fix a compiler warning in example in ncurses-intro.doc (Paul Waring). ++ + added paragraph in keyname manpage telling how extended capabilities ++ are interpreted as key definitions. ++ + modify tic's check of conflicting key definitions to include extended ++ capability strings in addition to the existing check on predefined ++ keys. ++ ++20120421 ++ + improve cleanup of temporary files in tic using atexit(). ++ + add msgr to vt420, similar DEC vtXXX entries -TD ++ + add several missing vt420 capabilities from vt220 -TD ++ + factor out ansi+pp from several entries -TD ++ + change xterm+sl and xterm+sl-twm to include only the status-line ++ capabilities and not "use=xterm", making them more generally useful ++ as building-blocks -TD ++ + add dec+sl building block, as example -TD ++ ++20120414 ++ + add XT to some terminfo entries to improve usefulness for other ++ applications than screen, which would like to pretend that xterm's ++ title is a status-line. -TD ++ + change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review ++ of ordering and overrides -TD ++ + add consistency check in tic for screen's "XT" capability. ++ + add section in terminfo.src summarizing the user-defined capabilities ++ used in that file -TD ++ ++20120407 ++ + fix an inconsistency between tic/infocmp "-x" option; tic omits all ++ non-standard capabilities, while infocmp was ignoring only the user ++ definable capabilities. ++ + improve special case in tic parsing of description to allow it to be ++ followed by terminfo capabilities. Previously the description had to ++ be the last field on an input line to allow tic to distinguish ++ between termcap and terminfo format while still allowing commas to be ++ embedded in the description. ++ + correct variable name in gen_edit.sh which broke configurability of ++ the --with-xterm-kbs option. ++ + revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD ++ + further amend 20110910 change, providing for configure-script ++ override of the "linux" terminfo entry to install and changing the ++ default for that to "linux2.2" (Debian #665959). ++ ++20120331 ++ + update Ada95/configure to use CF_DISABLE_ECHO (cf: 20120317). ++ + correct order of use-clauses in st-256color -TD ++ + modify configure script to look for gnatgcc if the Ada95 binding ++ is built, in preference to the default gcc/cc (suggested by ++ Nicolas Boulenguez). ++ + modify configure script to ensure that the same -On option used for ++ the C compiler in CFLAGS is used for ADAFLAGS rather than simply ++ using "-O3" (suggested by Nicolas Boulenguez) ++ ++20120324 ++ + amend an old fix so that next_char() exits properly for empty files, ++ e.g., from reading /dev/null (cf: 20080804). ++ + modify tic so that it can read from the standard input, or from ++ a character device. Because tic uses seek's, this requires writing ++ the data to a temporary file first (prompted by remark by Sven ++ Joachim) (cf: 20000923). ++ ++20120317 ++ + correct a check made in lib_napms.c, so that terminfo applications ++ can again use napms() (cf: 20110604). ++ + add a note in tic.h regarding required casts for ABSENT_BOOLEAN ++ (cf: 20040327). ++ + correct scripting for --disable-echo option in test/configure. ++ + amend check for missing c++ compiler to work when no error is ++ reported, and no variables set (cf: 20021206). ++ + add/use configure macro CF_DISABLE_ECHO. ++ ++20120310 ++ + fix some strict compiler warnings for abi6 and 64-bits. ++ + use begin_va_copy/end_va_copy macros in lib_printw.c (cf: 20120303). ++ + improve a limit-check in infocmp.c (Werner Fink): ++ ++20120303 ++ + minor tidying of terminfo.tail, clarify reason for limitation ++ regarding mapping of \0 to \200 ++ + minor improvement to _nc_copy_termtype(), using memcpy to replace ++ loops. ++ + fix no-leaks checking in test/demo_termcap.c to account for multiple ++ calls to setupterm(). ++ + modified the libgpm change to show previous load as a problem in the ++ debug-trace. ++ > merge some patches from OpenSUSE rpm (Werner Fink): ++ + ncurses-5.7-printw.dif, fixes for varargs handling in lib_printw.c ++ + ncurses-5.7-gpm.dif, do not dlopen libgpm if already loaded by ++ runtime linker ++ + ncurses-5.6-fallback.dif, do not free arrays and strings from static ++ fallback entries ++ ++20120228 ++ + fix breakage in tic/infocmp from 20120225 (report by Werner Fink). ++ ++20120225 ++ + modify configure script to allow creating dll's for MinGW when ++ cross-compiling. ++ + add --enable-string-hacks option to control whether strlcat and ++ strlcpy may be used. The same issue applies to OpenBSD's warnings ++ about snprintf, noting that this function is weakly standardized. ++ + add configure checks for strlcat, strlcpy and snprintf, to help ++ reduce bogus warnings with OpenBSD builds. ++ + build-fix for OpenBSD 4.9 to supply consistent intptr_t declaration ++ (cf:20111231) ++ + update config.guess, config.sub ++ ++20120218 ++ + correct CF_ETIP_DEFINES configure macro, making it exit properly on ++ the first success (patch by Pierre Labastie). ++ + improve configure macro CF_MKSTEMP by moving existence-check for ++ mkstemp out of the AC_TRY_RUN, to help with cross-compiles. ++ + improve configure macro CF_FUNC_POLL from luit changes to detect ++ broken implementations, e.g., with Mac OS X. ++ + add configure option --with-tparm-arg ++ + build-fix for MinGW cross-compiling, so that make_hash does not ++ depend on TTY definition (cf: 20111008). ++ ++20120211 ++ + make sgr for xterm-pcolor agree with other caps -TD ++ + make sgr for att5425 agree with other caps -TD ++ + make sgr for att630 agree with other caps -TD ++ + make sgr for linux entries agree with other caps -TD ++ + make sgr for tvi9065 agree with other caps -TD ++ + make sgr for ncr260vt200an agree with other caps -TD ++ + make sgr for ncr160vt100pp agree with other caps -TD ++ + make sgr for ncr260vt300an agree with other caps -TD ++ + make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD ++ + make sgr for cygwin, cygwinDBG agree with other caps -TD ++ + add configure option --with-xterm-kbs to simplify configuration for ++ Linux versus most other systems. ++ ++20120204 ++ + improved tic -D option, avoid making target directory and provide ++ better diagnostics. ++ ++20120128 ++ + add mach-gnu (Debian #614316, patch by Samuel Thibault) ++ + add mach-gnu-color, tweaks to mach-gnu terminfo -TD ++ + make sgr for sun-color agree with smso -TD ++ + make sgr for prism9 agree with other caps -TD ++ + make sgr for icl6404 agree with other caps -TD ++ + make sgr for ofcons agree with other caps -TD ++ + make sgr for att5410v1, att4415, att620 agree with other caps -TD ++ + make sgr for aaa-unk, aaa-rv agree with other caps -TD ++ + make sgr for avt-ns agree with other caps -TD ++ + amend fix intended to separate fixups for acsc to allow "tic -cv" to ++ give verbose warnings (cf: 20110730). ++ + modify misc/gen-edit.sh to make the location of the tabset directory ++ consistent with misc/Makefile.in, i.e., using ${datadir}/tabset ++ (Debian #653435, patch by Sven Joachim). ++ ++20120121 ++ + add --with-lib-prefix option to allow configuring for old/new flavors ++ of OS/2 EMX. ++ + modify check for gnat version to allow for year, as used in FreeBSD ++ port. ++ + modify check_existence() in db_iterator.c to simply check if the ++ path is a directory or file, according to the need. Checking for ++ directory size also gives no usable result with OS/2 (cf: 20120107). ++ + support OS/2 kLIBC (patch by KO Myung-Han). ++ ++20120114 ++ + several improvements to test/movewindow.c (prompted by discussion on ++ Linux Mint forum): ++ + modify movement commands to make them continuous ++ + rewrote the test for mvderwin ++ + rewrote the test for recursive mvwin ++ + split-out reusable CF_WITH_NCURSES_ETC macro in test/configure.in ++ + updated configure macro CF_XOPEN_SOURCE, build-fixes for Mac OS X ++ and OpenBSD. ++ + regenerated html manpages. ++ ++20120107 ++ + various improvments for MinGW (Juergen Pfeifer): ++ + modify stat() calls to ignore the st_size member ++ + drop mk-dlls.sh script. ++ + change recommended regular expression library. ++ + modify rain.c to allow for threaded configuraton. ++ + modify tset.c to allow for case when size-change logic is not used. ++ ++20111231 ++ + modify toe's report when -a and -s options are combined, to add ++ a column showing which entries belong to a given database. ++ + add -s option to toe, to sort its output. ++ + modify progs/toe.c, simplifying use of db-iterator results to use ++ caching improvements from 20111001 and 20111126. ++ + correct generation of pc-files when ticlib or termlib options are ++ given to rename the corresponding tic- or tinfo-libraries (report ++ by Sven Joachim). ++ ++20111224 ++ + document a portability issue with tput, i.e., that scripts which work ++ with ncurses may fail in other implementations that do no parameter ++ analysis. ++ + add putty-sco entry -TD ++ ++20111217 ++ + review/fix places in manpages where --program-prefix configure option ++ was not being used. ++ + add -D option to infocmp, to show the database locations that it ++ could use. ++ + fix build for the special case where term-driver, ticlib and termlib ++ are all enabled. The terminal driver depends on a few features in ++ the base ncurses library, so tic's dependencies include both ncurses ++ and termlib. ++ + fix build work for term-driver when --enable-wgetch-events option is ++ enabled. ++ + use <stdint.h> types to fix some questionable casts to void*. ++ ++20111210 ++ + modify configure script to check if thread library provides ++ pthread_mutexattr_settype(), e.g., not provided by Solaris 2.6 ++ + modify configure script to suppress check to define _XOPEN_SOURCE ++ for IRIX64, since its header files have a conflict versus ++ _SGI_SOURCE. ++ + modify configure script to add ".pc" files for tic- and ++ tinfo-libraries, which were omitted in recent change (cf: 20111126). ++ + fix inconsistent checks on $PKG_CONFIG variable in configure script. ++ ++20111203 ++ + modify configure-check for etip.h dependencies, supplying a temporary ++ copy of ncurses_dll.h since it is a generated file (prompted by ++ Debian #646977). ++ + modify CF_CPP_PARAM_INIT "main" function to work with current C++. ++ ++20111126 ++ + correct database iterator's check for duplicate entries ++ (cf: 20111001). ++ + modify database iterator to ignore $TERMCAP when it is not an ++ absolute pathname. ++ + add -D option to tic, to show the database locations that it could ++ use. ++ + improve description of database locations in tic manpage. ++ + modify the configure script to generate a list of the ".pc" files to ++ generate, rather than deriving the list from the libraries which have ++ been built (patch by Mike Frysinger). ++ + use AC_CHECK_TOOLS in preference to AC_PATH_PROGS when searching for ++ ncurses*-config, e.g., in Ada95/configure and test/configure (adapted ++ from patch by Mike Frysinger). ++ ++20111119 ++ + remove obsolete/conflicting fallback definition for _POSIX_SOURCE ++ from curses.priv.h, fixing a regression with IRIX64 and Tru64 ++ (cf: 20110416) ++ + modify _nc_tic_dir() to ensure that its return-value is nonnull, ++ i.e., the database iterator was not initialized. This case is needed ++ to when tic is translating to termcap, rather than loading the ++ database (cf: 20111001). ++ ++20111112 ++ + add pccon entries for OpenBSD console (Alexei Malinin). ++ + build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to ++ 600 to work around inconsistent ifdef'ing of wcstof between C and ++ C++ header files. ++ + modify capconvert script to accept more than exact match on "xterm", ++ e.g., the "xterm-*" variants, to exclude from the conversion (patch ++ by Robert Millan). ++ + add -lc_r as alternative for -lpthread, allows build of threaded code ++ in older FreeBSD machines. ++ + build-fix for MirBSD, which fails when either _XOPEN_SOURCE or ++ _POSIX_SOURCE are defined. ++ + fix a typo misc/Makefile.in, used in uninstalling pc-files. ++ ++20111030 ++ + modify make_db_path() to allow creating "terminfo.db" in the same ++ directory as an existing "terminfo" directory. This fixes a case ++ where switching between hashed/filesystem databases would cause the ++ new hashed database to be installed in the next best location - ++ root's home directory. ++ + add variable cf_cv_prog_gnat_correct to those passed to ++ config.status, fixing a problem with Ada95 builds (cf: 20111022). ++ + change feature test from _XPG5 to _XOPEN_SOURCE in two places, to ++ accommodate broken implementations for _XPG6. ++ + eliminate usage of NULL symbol from etip.h, to reduce header ++ interdependencies. ++ + add configure check to decide when to add _XOPEN_SOURCE define to ++ compiler options, i.e., for Solaris 10 and later (cf: 20100403). ++ This is a workaround for gcc 4.6, which fails to build the c++ ++ binding if that symbol is defined by the application, due to ++ incorrectly combining the corresponding feature test macros ++ (report by Peter Kruse). ++ ++20111022 ++ + correct logic for discarding mouse events, retaining the partial ++ events used to build up click, double-click, etc, until needed ++ (cf: 20110917). ++ + fix configure script to avoid creating unused Ada95 makefile when ++ gnat does not work. ++ + cleanup width-related gcc 3.4.3 warnings for 64-bit platform, for the ++ internal functions of libncurses. The external interface of courses ++ uses bool, which still produces these warnings. ++ ++20111015 ++ + improve description of --disable-tic-depends option to make it ++ clear that it may be useful whether or not the --with-termlib ++ option is also given (report by Sven Joachim). ++ + amend termcap equivalent for set_pglen_inch to use the X/Open ++ "YI" rather than the obsolete Solaris 2.5 "sL" (cf: 990109). ++ + improve manpage for tgetent differences from termcap library. ++ ++20111008 ++ + moved static data from db_iterator.c to lib_data.c ++ + modify db_iterator.c for memory-leak checking, fix one leak. ++ + modify misc/gen-pkgconfig.in to use Requires.private for the parts ++ of ncurses rather than Requires, as well as Libs.private for the ++ other library dependencies (prompted by Debian #644728). ++ ++20111001 ++ + modify tic "-K" option to only set the strict-flag rather than force ++ source-output. That allows the same flag to control the parser for ++ input and output of termcap source. ++ + modify _nc_getent() to ignore backslash at the end of a comment line, ++ making it consistent with ncurses' parser. ++ + restore a special-case check for directory needed to make termcap ++ text files load as if they were databases (cf: 20110924). ++ + modify tic's resolution/collision checking to attempt to remove the ++ conflicting alias from the second entry in the pair, which is ++ normally following in the source file. Also improved the warning ++ message to make it simpler to see which alias is the problem. ++ + improve performance of the database iterator by caching search-list. ++ ++20110925 ++ + add a missing "else" in changes to _nc_read_tic_entry(). ++ ++20110924 ++ + modify _nc_read_tic_entry() so that hashed-database is checked before ++ filesystem. ++ + updated CF_CURSES_LIBS check in test/configure script. ++ + modify configure script and makefiles to split TIC_ARGS and ++ TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables, ++ to help separate searches for tic- and tinfo-libraries (patch by Nick ++ Alcock aka "Nix"). ++ + build-fix for lib_mouse.c changes (cf: 20110917). ++ ++20110917 ++ + fix compiler warning for clang 2.9 ++ + improve merging of mouse events (integrated patch by Damien ++ Guibouret). ++ + correct mask-check used in lib_mouse for wheel mouse buttons 4/5 ++ (patch by Damien Guibouret). ++ ++20110910 ++ + modify misc/gen_edit.sh to select a "linux" entry which works with ++ the current kernel rather than assuming it is always "linux3.0" ++ (cf: 20110716). ++ + revert a change to getmouse() which had the undesirable side-effect ++ of suppressing button-release events (report by Damien Guibouret, ++ cf: 20100102). ++ + add xterm+kbs fragment from xterm #272 -TD ++ + add configure option --with-pkg-config-libdir to provide control over ++ the actual directory into which pc-files are installed, do not use ++ the pkg-config environment variables (discussion with Frederic L W ++ Meunier). ++ + add link to mailing-list archive in announce.html.in, as done in ++ FAQ (prompted by question by Andrius Bentkus). ++ + improve manpage install by adjusting the "#include" examples to ++ show the ncurses-subdirectory used when --disable-overwrite option ++ is used. ++ + install an alias for "curses" to the ncurses manpage, tied to the ++ --with-curses-h configure option (suggested by Reuben Thomas). ++ ++20110903 ++ + propagate error-returns from wresize, i.e., the internal ++ increase_size and decrease_size functions through resize_term (report ++ by Tim van der Molen, cf: 20020713). ++ + fix typo in tset manpage (patch by Sven Joachim). ++ ++20110820 ++ + add a check to ensure that termcap files which might have "^?" do ++ not use the terminfo interpretation as "\177". ++ + minor cleanup of X-terminal emulator section of terminfo.src -TD ++ + add terminator entry -TD ++ + add simpleterm entry -TD ++ + improve wattr_get macros by ensuring that if the window pointer is ++ null, then the attribute and color values returned will be zero ++ (cf: 20110528). ++ ++20110813 ++ + add substitution for $RPATH_LIST to misc/ncurses-config.in ++ + improve performance of tic with hashed-database by caching the ++ database connection, using atexit() to cleanup. ++ + modify treatment of 2-character aliases at the beginning of termcap ++ entries so they are not counted in use-resolution, since these are ++ guaranteed to be unique. Also ignore these aliases when reporting ++ the primary name of the entry (cf: 20040501) ++ + double-check gn (generic) flag in terminal descriptions to ++ accommodate old/buggy termcap databases which misused that feature. ++ + minor fixes to _nc_tgetent(), ensure buffer is initialized even on ++ error-return. ++ ++20110807 ++ + improve rpath fix from 20110730 by ensuring that the new $RPATH_LIST ++ variable is defined in the makefiles which use it. ++ + build-fix for DragonFlyBSD's pkgsrc in test/configure script. ++ + build-fixes for NetBSD 5.1 with termcap support enabled. ++ + corrected k9 in dg460-ansi, add other features based on manuals -TD ++ + improve trimming of whitespace at the end of terminfo/termcap output ++ from tic/infocmp. ++ + when writing termcap source, ensure that colons in the description ++ field are translated to a non-delimiter, i.e., "=". ++ + add "-0" option to tic/infocmp, to make the termcap/terminfo source ++ use a single line. ++ + add a null-pointer check when handling the $CC variable. ++ ++20110730 ++ + modify configure script and makefiles in c++ and progs to allow the ++ directory used for rpath option to be overridden, e.g., to work ++ around updates to the variables used by tic during an install. ++ + add -K option to tic/infocmp, to provide stricter BSD-compatibility ++ for termcap output. ++ + add _nc_strict_bsd variable in tic library which controls the ++ "strict" BSD termcap compatibility from 20110723, plus these ++ features: ++ + allow escapes such as "\8" and "\9" when reading termcap ++ + disallow "\a", "\e", "\l", "\s" and "\:" escapes when reading ++ termcap files, passing through "a", "e", etc. ++ + expand "\:" as "\072" on output. ++ + modify _nc_get_token() to reset the token's string value in case ++ there is a string-typed token lacking the "=" marker. ++ + fix a few memory leaks in _nc_tgetent. ++ + fix a few places where reading from a termcap file could refer to ++ freed memory. ++ + add an overflow check when converting terminfo/termcap numeric ++ values, since terminfo stores those in a short, and they must be ++ positive. ++ + correct internal variables used for translating to termcap "%>" ++ feature, and translating from termcap %B to terminfo, needed by ++ tctest (cf: 19991211). ++ + amend a minor fix to acsc when loading a termcap file to separate it ++ from warnings needed for tic (cf: 20040710) ++ + modify logic in _nc_read_entry() and _nc_read_tic_entry() to allow ++ a termcap file to be handled via TERMINFO_DIRS. ++ + modify _nc_infotocap() to include non-mandatory padding when ++ translating to termcap. ++ + modify _nc_read_termcap_entry(), passing a flag in the case where ++ getcap is used, to reduce interactive warning messages. ++ ++20110723 ++ + add a check in start_color() to limit color-pairs to 256 when ++ extended colors are not supported (patch by David Benjamin). ++ + modify setcchar to omit no-longer-needed OR'ing of color pair in ++ the SetAttr() macro (patch by David Benjamin). ++ + add kich1 to sun terminfo entry (Yuri Pankov) ++ + use bold rather than reverse for smso in sun-color terminfo entry ++ (Yuri Pankov). ++ + improve generation of termcap using tic/infocmp -C option, e.g., ++ to correspond with 4.2BSD (prompted by discussion with Yuri Pankov ++ regarding Schilling's test program): ++ + translate %02 and %03 to %2 and %3 respectively. ++ + suppress string capabilities which use %s, not supported by tgoto ++ + use \040 rather than \s ++ + expand null characters as \200 rather than \0 ++ + modify configure script to support shared libraries for DragonFlyBSD. ++ ++20110716 ++ + replace an assert() in _nc_Free_Argument() with a regular null ++ pointer check (report/analysis by Franjo Ivancic). ++ + modify configure --enable-pc-files option to take into account the ++ PKG_CONFIG_PATH variable (report by Frederic L W Meunier). ++ + add/use xterm+tmux chunk from xterm #271 -TD ++ + resync xterm-new entry from xterm #271 -TD ++ + add E3 extended capability to linux-basic (Miroslav Lichvar) ++ + add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD ++ + add SI/SO change to linux2.6 entry (Debian #515609) -TD ++ + fix inconsistent tabset path in pcmw (Todd C. Miller). ++ + remove a backslash which continued comment, obscuring altos3 ++ definition with OpenBSD toolset (Nicholas Marriott). ++ ++20110702 ++ + add workaround from xterm #271 changes to ensure that compiler flags ++ are not used in the $CC variable. ++ + improve support for shared libraries, tested with AIX 5.3, 6.1 and ++ 7.1 with both gcc 4.2.4 and cc. ++ + modify configure checks for AIX to include release 7.x ++ + add loader flags/libraries to libtool options so that dynamic loading ++ works properly, adapted from ncurses-5.7-ldflags-with-libtool.patch ++ at gentoo prefix repository (patch by Michael Haubenwallner). ++ ++20110626 ++ + move include of nc_termios.h out of term_entry.h, since the latter ++ is installed, e.g., for tack while the former is not (report by ++ Sven Joachim). ++ ++20110625 ++ + improve cleanup() function in lib_tstp.c, using _exit() rather than ++ exit() and checking for SIGTERM rather than SIGQUIT (prompted by ++ comments forwarded by Nicholas Marriott). ++ + reduce name pollution from term.h, moving fallback #define's for ++ tcgetattr(), etc., to new private header nc_termios.h (report by ++ Sergio NNX). ++ + two minor fixes for tracing (patch by Vassili Courzakis). ++ + improve trace initialization by starting it in use_env() and ++ ripoffline(). ++ + review old email, add details for some changelog entries. ++ ++20110611 ++ + update minix entry to minix 3.2 (Thomas Cort). ++ + fix a strict compiler warning in change to wattr_get (cf: 20110528). ++ ++20110604 ++ + fixes for MirBSD port: ++ + set default prefix to /usr. ++ + add support for shared libraries in configure script. ++ + use S_ISREG and S_ISDIR consistently, with fallback definitions. ++ + add a few more checks based on ncurses/link_test. ++ + modify MKlib_gen.sh to handle sp-funcs renaming of NCURSES_OUTC type. ++ ++20110528 ++ + add case to CF_SHARED_OPTS for Interix (patch by Markus Duft). ++ + used ncurses/link_test to check for behavior when the terminal has ++ not been initialized and when an application passes null pointers ++ to the library. Added checks to cover this (prompted by Redhat ++ #707344). ++ + modify MKlib_gen.sh to make its main() function call each function ++ with zero parameters, to help find inconsistent checking for null ++ pointers, etc. ++ ++20110521 ++ + fix warnings from clang 2.7 "--analyze" ++ ++20110514 ++ + compiler-warning fixes in panel and progs. ++ + modify CF_PKG_CONFIG macro, from changes to tin -TD ++ + modify CF_CURSES_FUNCS configure macro, used in test directory ++ configure script: ++ + work around (non-optimizer) bug in gcc 4.2.1 which caused ++ test-expression to be omitted from executable. ++ + force the linker to see a link-time expression of a symbol, to ++ help work around weak-symbol issues. ++ ++20110507 ++ + update discussion of MKfallback.sh script in INSTALL; normally the ++ script is used automatically via the configured makefiles. However ++ there are still occasions when it might be used directly by packagers ++ (report by Gunter Schaffler). ++ + modify misc/ncurses-config.in to omit the "-L" option from the ++ "--libs" output if the library directory is /usr/lib. ++ + change order of tests for curses.h versus ncurses.h headers in the ++ configure scripts for Ada95 and test-directories, to look for ++ ncurses.h, from fixes to tin -TD ++ + modify ncurses/tinfo/access.c to account for Tandem's root uid ++ (report by Joachim Schmitz). ++ ++20110430 ++ + modify rules in Ada95/src/Makefile.in to ensure that the PIC option ++ is not used when building a static library (report by Nicolas ++ Boulenguez): ++ + Ada95 build-fix for big-endian architectures such as sparc. This ++ undoes one of the fixes from 20110319, which added an "Unused" member ++ to representation clauses, replacing that with pragmas to suppress ++ warnings about unused bits (patch by Nicolas Boulenguez): ++ ++20110423 ++ + add check in test/configure for use_window, use_screen. ++ + add configure-checks for getopt's variables, which may be declared ++ as different types on some Unix systems. ++ + add check in test/configure for some legacy curses types of the ++ function pointer passed to tputs(). ++ + modify init_pair() to accept -1's for color value after ++ assume_default_colors() has been called (Debian #337095). ++ + modify test/background.c, adding commmand-line options to demonstrate ++ assume_default_colors() and use_default_colors(). ++ ++20110416 ++ + modify configure script/source-code to only define _POSIX_SOURCE if ++ the checks for sigaction and/or termios fail, and if _POSIX_C_SOURCE ++ and _XOPEN_SOURCE are undefined (report by Valentin Ochs). ++ + update config.guess, config.sub ++ ++20110409 ++ + fixes to build c++ binding with clang 3.0 (patch by Alexander ++ Kolesen). ++ + add check for unctrl.h in test/configure, to work around breakage in ++ some ncurses packages. ++ + add "--disable-widec" option to test/configure script. ++ + add "--with-curses-colr" and "--with-curses-5lib" options to the ++ test/configure script to address testing with very old machines. ++ + 20110404 5.9 release for upload to ftp.gnu.org + + 20110402 +@@ -100,7 +825,7 @@ + + modify configure script to provide value for HTML_DIR in + Ada95/gen/Makefile.in, which depends on whether the Ada95 binding is + distributed separately (report by Nicolas Boulenguez). +- + modify configure script to add -g and/or -O3 to ADAFLAGS if the ++ + modify configure script to add "-g" and/or "-O3" to ADAFLAGS if the + CFLAGS for the build has these options. + + amend change from 20070324, to not add 1 to the result of getmaxx + and getmaxy in the Ada binding (report by Nicolas Boulenguez for +@@ -155,7 +880,7 @@ + 20110212 + + regenerated html manpages. + + use _tracef() in show_where() function of tic, to work correctly with +- special case of trace configuration. ++ special case of trace configuration. + + 20110205 + + add xterm-utf8 entry as a demo of the U8 feature -TD +@@ -219,7 +944,7 @@ + version which works with termcap. + + remove obsolete emacs "Local Variables" section from documentation + (request by Sven Joachim). +- + update doc/html/index.html to include NCURSES-Programming-HOWTO.html ++ + update doc/html/index.html to include NCURSES-Programming-HOWTO.html + (report by Sven Joachim). + + 20101128 +@@ -294,8 +1019,8 @@ + Sven Joachim). + + add parameterized cursor-controls to linux-basic (report by Dae) -TD + > patch by Juergen Pfeifer: +- + document how to build 32-bit libraries in README.MinGW +- + fixes to filename computation in mk-dlls.sh.in ++ + document how to build 32-bit libraries in README.MinGW ++ + fixes to filename computation in mk-dlls.sh.in + + use POSIX locale in mk-dlls.sh.in rather than en_US (report by Sven + Joachim). + + add a check in mk-dlls.sh.in to obtain the size of a pointer to +@@ -478,7 +1203,7 @@ + 20100417 + + modify _nc_capcmp() to work with cancelled strings. + + correct translation of "^" in _nc_infotocap(), used to transform +- terminfo to termcap strings ++ terminfo to termcap strings + + add configure --disable-rpath-hack, to allow disabling the feature + which adds rpath options for libraries in unusual places. + + improve CF_RPATH_HACK_2 by checking if the rpath option for a given +@@ -6530,7 +7255,7 @@ + handling in lynx (reported by Kim DeVaughn). + + 990306 pre-release +- + add -G option to tic and infocmp, to reverse the -g option. ++ + add -G option to tic and infocmp, to reverse the "-g" option. + + recode functions in name_match.c to avoid use of strncpy, which + caused a 4-fold slowdown in tic (cf: 980530). + + correct a few warnings about sign-extension in recent changes. +@@ -6901,7 +7626,7 @@ + since that is a little more efficient. + + minor correction to infocmp to avoid displaying "difference" between + two capabilities that are rendered in equivalent forms. +- + add -g option to tic/infocmp to force character constants to be ++ + add "-g" option to tic/infocmp to force character constants to be + displayed in quoted form. Otherwise their decimal values are shown. + + modify setupterm so that cancelled strings are treated the same as + absent strings, cancelled and absent booleans false (does not affect +@@ -8979,15 +9704,18 @@ + + correction to #317. + > patch 317 (ESR): + + re-add _nc_hash_map +- + modify EmitRange to maintain position as per original design. +- + add hashtest.c, program to time the hashmap optimization. ++ + modify EmitRange to maintain position as per original design ++ (patch by A. Lukyanov). ++ + modify test/ncurses.c and tputs, etc., to allow trace counting ++ output characters. ++ + add hashtest.c program to time the hashmap optimization. + > patch 316 (ESR): + + add logic to deal with magic-cookie (how was this tested?) + (lib_doupdate.c). + + add ncurses.c driver for magic-cookie, some fixes to ncurses.c + > patch 315 (ESR): +- + merged Alexander V Lukyanov's patch to use ech and rep - untested +- (lib_doupdate.c). ++ + merge changes to lib_doupdate.c to use ech and rep - untested ++ (patch by Alexander V Lukyanov). + + modified handling of interrupted system calls - untested + (lib_getch.c, lib_twait.c). + + new function _nc_mvcur_resume() +@@ -9059,12 +9787,12 @@ + + corrected typo in dtterm description. + > patch 313 (ESR): + + add dtterm description +- + clarify ncurses 'i' test (drop vscanf subtest) ++ + clarify ncurses 'i' test (drop mvwscanw subtest) + + 960810 - snapshot + + correct nl()/nonl() to work as per SVr4 & XSI. + + minor fixes to ncurses.c (use 'noraw()', mvscanw return-code) +- + refine configure-test for -g option (Tim Mooney). ++ + refine configure-test for "-g" option (Tim Mooney). + + correct interaction between O_BLANK and NEW_LINE request in form + library (Juergen Pfeifer) + +@@ -9073,7 +9801,8 @@ + > patch 312 (ESR): + correct terminfo.src corrupted by #310 + > patch 311 (ESR): +- + fix idlok() and idcok() and the default of the idlok switch. ++ + fix idlok() and idcok() and the default of the idlok switch (report ++ by Ville Sulko). + + 960803 - snapshot + + corrected tparm to handle capability strings without explicit pop +@@ -9083,7 +9812,7 @@ + > patch 310 (ESR): + + documentation and prototyping errors for has_color, immedok and idcok + (reported by William P Setzer <wsetzer@pams.ncsu.edu>) +- + updated qnx terminfo entry (by Michael Hunter) ++ + updated qnx terminfo entry (patch by Michael Hunter) + + 960730 + + eliminate quoted includes in ncurses subdirectory, ensure config.h +@@ -9095,7 +9824,7 @@ + + call cbreak() in initscr(), as per XSI & SVr4. + + turn off hardware echo in initscr() as per XSI & SVr4 + > patch 309 (ESR): +- + terminfo changes (9.3.10), from BRL ++ + terminfo changes (9.3.9), from BRL + + add more checks to terminfo parser. + + add more symbols to infocmp. + +@@ -9114,6 +9843,7 @@ + > patch 308 (ESR): + + terminfo changes (9.3.8) + + modified logic of error-reporting in terminfo parser ++ + fix option-processing bug in toe. + + 960713 - snapshot + + always check for <sys/bsdtypes.h> since ISC needs it to declare +@@ -9122,9 +9852,19 @@ + by Juergen Pfeifer, Mike Long) + + add LOCAL_LDFLAGS2 symbol (Juergen Pfeifer) + + corrected prototype for delay_output() -- bump ABI to 3.2 +- + terminfo patches #306/307 (ESR). ++ + patch 307 (ESR): ++ + enable more translations of nonstandard caps, and document them. ++ + misc/terminfo.src update to 9.13.8 ++ + patch 306 (ESR): + + moved logic that filters out rmul and rmso from setupterm to newterm + where it is less likely to interfere with termcap applications. ++ + cosmetic fixes to test/ncurses.c ++ + modify open() call in ncurses/read_entry.c to use O_RDONLY symbol ++ rather than constant (report by mib). ++ + misc/terminfo.src sgr0 and acsc changes (report by Philippe De ++ Muyter). ++ + modify ncurses/comp_parse.c so that entries containing a "+" can ++ have missing rmcup vs smcup. + + 960707 + + rollback ESR's #305 change to terminfo.src (it breaks existing +@@ -9139,7 +9879,6 @@ + + make lib_vidattr.c more readable using macros. + + filter out rmul, rmso that conflict with sgr0 when reading terminal + descriptions. +- + added sanity-checking of various paired string attributes (ESR). + + work around autoconf bug, force $INSTALL to absolute path + (reported by Zeyd). + + modify man-page install for BSDI to install preformatted .0 files +@@ -9152,6 +9891,12 @@ + + disable scrollok during the ncurses 'p' test; if it is enabled the + stdscr will scroll when putting the box-corners in the lower-right + of the screen. ++ > patch 305 (ESR): ++ + added sanity-checking of various paired string attributes. ++ + misc/terminfo.src update to 9.13.7 (report by A. Lukyanov). ++ + modify man/Makefile.in to make terminfo.5 during normal build. ++ > patch 304 (ESR): ++ + corrected allocation-length for $HOME/.terminfo path. + + 960629 - snapshot + + check return code of _nc_mvcur_scrolln() in _nc_scroll_optimize() for +@@ -9234,6 +9979,7 @@ + + better fix for nvi refresh-bug (Rick Marshall) + + fix for bug in handling of interrupted keystroke waits, + (Werner Fleck). ++ + misc/ncurses-intro.html syntax fix (Kajiyama Tamito). + + 960601 - snapshot + + auto-configure man-page compression-format and renames for Debian. +@@ -9248,7 +9994,7 @@ + + enhancement to the control over the new PC-style soft key format. + allow caller now to select whether or not one wants to have + the index-line; see curs_slk.3x for documentation (Juergen Pfeifer). +- + typos, don't use inline with -g (Philippe De Muyter) ++ + typos, don't use inline with "-g" (Philippe De Muyter) + + fixes for menus & wattr-, slk-functions (Juergen Pfeifer) + + 960526 - snapshot +@@ -9263,6 +10009,9 @@ + + include sys/types.h in case stdlib.h does not declare size_t. + + fixes for makefile (Tim Mooney) + + fixes for menus & forms (Juergen Pfeifer) ++ > patch 302 (ESR): ++ + improve hash function (suggested by Alexander V Lukyanov). ++ + 9.13.4 update for terminfo.src + + 960518 - snapshot + + revised ncurses.c panner test, let pad abut all 4 sides of screen. +@@ -9275,6 +10024,8 @@ + confusion, and made this check for the /usr/lib/terminfo pre-existing + directory. + > patches 299-301 (ESR): ++ + html fixes (Phillippe de Muyter). ++ + fix typo in ncurses-intro.html (report by Fabrizio Polacco). + + added hashmap.c + + mods to tracing, especially for ACS chars. + + corrected off-by-one in IDCtransform. +@@ -9294,13 +10045,21 @@ + > patches 297, 298 (ESR): + + implement TERMINFO_DIRS, and -o option of tic + + added TRACE_IEVENT +- + removed boolean version of 'getm' +- + added lib_print.c (for Rick Marshall) +- + added has_key() ++ + fix REQ_TOGGLE_ITEM in menu/menu_driver.c; it could select but not ++ deselect. ++ + added lib_print.c (request by Rick Marshall). ++ + added has_key() (request by Juergen Pfeifer). ++ + do not issue clrtoeol or clrtobot if the relevant portion of the line ++ is already blank (analysis by Keith Bostic). ++ + add parentheses for parameters of COLOR_PAIR and PAIR_NUMBER macros ++ (analysis by Jurgen Eidt). ++ + update screen's notion of cursor position in endwin() (analysis by ++ Alexander Lukyanov). + + added 't' to ncurses.c test. + + moved delay_output() to lib_tputs.c + + removed tparam() (was added in 1.9.9, but conflicts with emacs and + is not part of X/Open Curses). ++ + removed boolean version of 'getm'. + + misc cursor & optimization fixes. + + 960504 - snapshot +@@ -9326,11 +10085,20 @@ + + make TIOCGWINSZ configure test less stringent, in case user + configures via terminal that cannot get screen size. + > patches 295, 296 (ESR): +- + new "-e" option of tic. +- + fix for "infocmp -e". +- + restore working-directory in read_termcap.c + + split lib_kernel.c, lib_setup.c and names.c in order to reduce + overhead for programs that use only termcap features. ++ + new "-e" and "-h" options of tic (request by Tony Nugent). ++ + fix bug in mandatory-delay logic in lib_tputs.c (report by Sven ++ Verdoolaege). ++ + fix for "infocmp -e" to emit correct initializers (reported by Manual ++ J Novoa III). ++ + restore working-directory in read_termcap.c (report by Kayvan ++ Sylvan). ++ + use "-h" option on Solaris when generating shared libraries on ++ Solaris 2.5 to record the library name in the file, for assisting ++ the loader (patch by Scott Kramer). ++ + undo patch #294 changes to form and menu libraries (request by ++ Juergen Pfeifer). + + 960418 - snapshot + + use autoconf 2.9 +@@ -9338,10 +10106,22 @@ + definitions via <termios.h>, modified macros in lib_raw.c to avoid + K&R-style substitution) + > patches 293, 294 (ESR): +- + mods to wgetch() in cooked mode +- + corrected askuser() logic in tset +- + correct interaction of endwin() with mouse processing ++ + rewrite wsyncup(), wsyncdown(), as well as small fixes to form and ++ menu libraries to fix echo-breakage introduced by 1.8.9, 1.9.9e ++ changes (patches by Juergen Pfeifer). ++ + fix compile under QNX 4.2 by defining ONLCR in lib_raw.c when ++ __QNX__ is defined (patch by Michael Hunter). ++ + modify setupterm() to match documentation for its return value, fix ++ newterm to work with this change (report by Emmet Lazich). ++ + add checks in getch() for error, return ERR as appropriate (report by ++ Emmet Lazich). ++ + mods to wgetch() in cooked mode (report by Pete Seebach). ++ + corrected askuser() logic in tset (patch by Remco Treffkorn). ++ + correct interaction of endwin() with mouse processing (report by ++ Michael Elkins). + + added trace support for TTY flags ++ + update terminfo.src to 9.13.1 ++ + FreeBSD console entries (patch by Andrew Chernov). + + 960406 + + fixes for NeXT, ISC and HPUX auto-configure +diff -Naur ncurses-5.9.orig/README ncurses-5.9/README +--- ncurses-5.9.orig/README 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/README 2012-08-25 19:58:02.303220551 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README,v 1.23 2006/04/22 22:19:37 tom Exp $ ++-- $Id: README,v 1.25 2012/08/11 20:11:26 tom Exp $ + ------------------------------------------------------------------------------- + README file for the ncurses package + +@@ -78,6 +78,10 @@ + library interfaces are not binary-compatible with the non-wide-character + version. + ++If you configure using the --enable-reentrant option, a "t" is appended to the ++library names (e.g., libncursest.a) and the resulting libraries have a ++different binary interface which makes the ncurses interface more "opaque". ++ + The ncurses libraries implement the curses API. The panel, menu and forms + libraries implement clones of the SVr4 panel, menu and forms APIs. The source + code for these lives in the `ncurses', `panel', `menu', and `form' directories +@@ -122,8 +126,9 @@ + tic -- terminfo source to binary compiler + infocmp -- terminfo binary to source decompiler/comparator + clear -- emits clear-screen for current terminal ++ tabs -- set tabs on a terminal + tput -- shell-script access to terminal capabilities. +- toe -- table of entries utility ++ toe -- table of entries utility + tset -- terminal-initialization utility + + The first two (tic and infocmp) are used for manipulating terminfo +@@ -153,8 +158,10 @@ + configuration scripts, porting, mods to adhere to XSI Curses in the + areas of background color, terminal modes. Also memory leak testing, + the wresize, default colors and key definition extensions and numerous +- bug fixes (more than half of those enumerated in NEWS beginning with +- the internal release 1.8.9). ++ bug fixes -- more than half of those enumerated in NEWS beginning with ++ the internal release 1.8.9, see ++ ++ http://invisible-island.net/personal/changelogs.html + + Florian La Roche (official maintainer for FSF's ncurses 4.2) + Beginning with release 4.2, ncurses is distributed under an MIT-style +diff -Naur ncurses-5.9.orig/README.MinGW ncurses-5.9/README.MinGW +--- ncurses-5.9.orig/README.MinGW 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/README.MinGW 2012-08-25 19:58:00.359896408 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README.MinGW,v 1.5 2011/02/26 16:57:17 tom Exp $ ++-- $Id: README.MinGW,v 1.8 2012/01/21 23:55:33 tom Exp $ + -- Author: Juergen Pfeifer + ------------------------------------------------------------------------------- + +@@ -39,7 +39,7 @@ + To build ncurses for native Windows, you need the MinGW toolchain. The + original MinGW toolchain from the above site is only for 32-Bit Windows. As + Windows Server - and also regular workstations - are moving to 64-Bit, it +-seems to be reasonable to have a toolchain that supports both architectures. ++seems to be reasonable to have a toolchain that supports both architectures. + I recommend to use the TDM gcc toolchain which you can find at + http://tdm-gcc.tdragon.net/download. Go to the download section and select + the bundle installer for tdm64 (MinGW-w64). This installs a multilib version +@@ -47,7 +47,7 @@ + versions. It also comes with a working pthread implementation. + + The latest config and build scripts we use for MinGW have only been tested +-for the gcc-4.4 compiler toolchain (or better). ++for the gcc-4.6.1 compiler toolchain (or better). + + Using MinGW is a pragmatic decision, it's the easiest way to port this + heavily UNIX based sourcebase to native Windows. The goal is of course +@@ -55,22 +55,12 @@ + common traditional development environments on Windows, mainly with + Microsoft Visual Studio. + +-If you start a bash from the MSYS environment, please make sure that the +-Microsoft Development tools are in your PATH right after the MinGW +-tools. The LIB.EXE tool is the only one needed. You need this only if +-you want to build DLLs that work with native Windows programs. If you +-don't have any Microsoft Development tools on your machine, consider +-at least to get the free "Visual C++ 2010 Express Edition". +-It contains the LIB.EXE tool. You may also use this compiler to test +-writing native Windows programs using the ncurses DLLs without using +-MinGW then for writing apps. +- + It is necessary to unset the TERM environment variable, to activate the + Windows console-driver. + + Please also make sure that MSYS links to the correct directory containing + your MinGW toolchain. For TDM this is usually C:\MinGW64. In your Windows +-CMD.EXE command shell go to the MSYS root directory (most probably ++CMD.EXE command shell go to the MSYS root directory (most probably + C:\MSYS or C:\MSYS\1.0) and verify, that there is a junction point mingw + that points to the MinGW toolchain directory. If not, delete the mingw + directory and use the mklink command (or the linkd.exe utility on older +@@ -79,58 +69,54 @@ + This code requires WindowsNT 5.1 or better, which means on the client + Windows XP or better, on the server Windows Server 2003 or better. + +-In order to build ncurses for the planned interop layer with .NET, we +-recommend to use these options with configure ++I recommend using libtool to build ncurses on MinGW, because libtool ++knows exactly how to build dll's on Windows for use with MinGW. ++ ++To build a modern but still small footprint ncurses that provides ++hooks for interop, I recommend using these options: + ++ --with-libtool + --disable-home-terminfo +- --enable-reentrant ++ --enable-database ++ --disable-termcap + --enable-sp-funcs + --enable-term-driver + --enable-interop +- --with-pthread (if using TDM toolchain as recommended) + +-This is the configuration commandline as I'm using it at the moment: ++This is the configuration commandline as I'm using it at the moment (assuming environment variable MINGW_ROOT to hold the root directory name of your MinGW build): + + ./configure \ +- --prefix=/mingw \ +- --without-cxx-binding \ ++ --prefix=$MINGW_ROOT \ ++ --with-cxx \ + --without-ada \ + --enable-warnings \ + --enable-assertions \ +- --enable-reentrant \ +- --with-debug \ +- --with-normal \ + --disable-home-terminfo \ ++ --enable-database \ + --enable-sp-funcs \ + --enable-term-driver \ + --enable-interop \ +- --with-pthread ++ --disable-termcap \ ++ --with-progs \ ++ --with-libtool \ ++ --enable-pc-files \ ++ --mandir=$MINGW_ROOT/share/man + +-If you are on a 64-Bit Windows system and want to build a 32-Bit version +-of ncurses, you may use this commandline for configuration (when using +-the TDM toolchain): +- +-CC="gcc -m32" LD="ld -m32" ./configure \ +- --prefix=/mingw \ +- --without-cxx-binding \ +- --without-ada \ +- --enable-warnings \ +- --enable-assertions \ +- --enable-reentrant \ +- --with-debug \ +- --with-normal \ +- --disable-home-terminfo \ +- --enable-sp-funcs \ +- --enable-term-driver \ +- --enable-interop \ +- --with-pthread ++Please note that it is also necessary to set this environment variable: + +-All the options above are - like the whole Windows support - +-experimental. ++export PATH_SEPARATOR=";" ++ ++in order to parse the terminfo paths correctly. Terminfo paths should ++always be separated by a seeeemicolon,even when running under MSYS. + +-In order to build the DLLs, after your regular make you must call ++To support regular expressions properly, ncurses under MinGW should be ++linked against the gnurx regex library, which must be built separately ++under MinGW. See + +- make dlls ++ ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/libgnurx-src-2.5.zip ++ ++All the options above are - like the whole Windows support - ++experimental. + + A lot is still TODO, e.g.: + +diff -Naur ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4 +--- ncurses-5.9.orig/aclocal.m4 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/aclocal.m4 2012-08-25 19:58:02.309887187 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $ ++dnl $Id: aclocal.m4,v 1.621 2012/08/11 23:36:44 tom Exp $ + dnl Macros used in NCURSES auto-configuration script. + dnl + dnl These macros are maintained separately from NCURSES. The copyright on +@@ -62,6 +62,31 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 ++dnl ------------------ ++dnl Conditionally generate script according to whether we're using a given autoconf. ++dnl ++dnl $1 = version to compare against ++dnl $2 = code to use if AC_ACVERSION is at least as high as $1. ++dnl $3 = code to use if AC_ACVERSION is older than $1. ++define(CF_ACVERSION_CHECK, ++[ ++ifdef([m4_version_compare], ++[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], ++[CF_ACVERSION_COMPARE( ++AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), ++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 ++dnl -------------------- ++dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, ++dnl MAJOR2, MINOR2, TERNARY2, ++dnl PRINTABLE2, not FOUND, FOUND) ++define(CF_ACVERSION_COMPARE, ++[ifelse(builtin([eval], [$2 < $5]), 1, ++[ifelse([$8], , ,[$8])], ++[ifelse([$9], , ,[$9])])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07 + dnl ------------------- + dnl Construct the list of include-options for the C programs in the Ada95 +@@ -313,12 +338,33 @@ + } + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 ++dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45 + dnl ---------------- +-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' +-dnl in the sharutils 4.2 distribution. ++dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and ++dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. + AC_DEFUN([CF_ANSI_CC_CHECK], + [ ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++AC_MSG_CHECKING(\$CC variable) ++case "$CC" in #(vi ++*[[\ \ ]]-[[IUD]]*) ++ AC_MSG_RESULT(broken) ++ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` ++ CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ++ CF_ADD_CFLAGS($cf_flags) ++ ;; ++*) ++ AC_MSG_RESULT(ok) ++ ;; ++esac ++ + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ + cf_cv_ansi_cc=no + cf_save_CFLAGS="$CFLAGS" +@@ -465,7 +511,7 @@ + AC_SUBST(ARFLAGS) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03 ++dnl CF_AWK_BIG_PRINTF version: 4 updated: 2011/10/30 17:09:50 + dnl ----------------- + dnl Check if awk can handle big strings using printf. Some older versions of + dnl awk choke on large strings passed via "%s". +@@ -479,8 +525,8 @@ + eval $2=no + ;; + *) #(vi +- if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' \ +- | $AWK '{ printf "%d\n", length([$]0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then ++ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \ ++ | $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then + eval $2=yes + else + eval $2=no +@@ -695,7 +741,7 @@ + AC_SUBST(BUILD_OBJEXT) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CFG_DEFAULTS version: 7 updated: 2005/09/24 16:15:00 ++dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13 + dnl --------------- + dnl Determine the default configuration into which we'll install ncurses. This + dnl can be overridden by the user's command-line options. There's two items to +@@ -713,7 +759,7 @@ + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix +@@ -749,27 +795,48 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52 ++dnl CF_CGETENT version: 4 updated: 2011/08/07 14:54:41 + dnl ---------- + dnl Check if the terminal-capability database functions are available. If not, + dnl ncurses has a much-reduced version. + AC_DEFUN([CF_CGETENT],[ +-AC_MSG_CHECKING(for terminal-capability database functions) +-AC_CACHE_VAL(cf_cv_cgetent,[ ++AC_CACHE_CHECK(for terminal-capability database functions,cf_cv_cgetent,[ + AC_TRY_LINK([ + #include <stdlib.h>],[ + char temp[128]; + char *buf = temp; + char *db_array = temp; +- cgetent(&buf, /* int *, */ &db_array, "vt100"); ++ cgetent(&buf, &db_array, "vt100"); + cgetcap(buf, "tc", '='); + cgetmatch(buf, "tc"); + ], + [cf_cv_cgetent=yes], + [cf_cv_cgetent=no]) + ]) +-AC_MSG_RESULT($cf_cv_cgetent) +-test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT) ++ ++if test "$cf_cv_cgetent" = yes ++then ++ AC_DEFINE(HAVE_BSD_CGETENT) ++AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[ ++AC_TRY_LINK([ ++#include <stdlib.h>],[ ++ char temp[128]; ++ char *buf = temp; ++#ifndef _NETBSD_SOURCE /* given, since April 2004 in stdlib.h */ ++ const char *db_array = temp; ++ cgetent(&buf, &db_array, "vt100"); ++#endif ++ cgetcap(buf, "tc", '='); ++ cgetmatch(buf, "tc"); ++ ], ++ [cf_cv_cgetent_const=yes], ++ [cf_cv_cgetent_const=no]) ++]) ++ if test "$cf_cv_cgetent_const" = yes ++ then ++ AC_DEFINE_UNQUOTED(CGETENT_CONST,const) ++ fi ++fi + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59 +@@ -908,7 +975,61 @@ + fi + ])])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18 ++dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05 ++dnl ---------------- ++dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED ++AC_DEFUN([CF_CHECK_WCHAR_H],[ ++AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[ ++AC_TRY_COMPILE( ++[ ++#include <stdlib.h> ++#include <wchar.h> ++],[ ++ wint_t foo = 0; ++ int bar = iswpunct(foo)], ++ [cf_cv_wchar_h_okay=yes], ++ [cf_cv_wchar_h_okay=no])]) ++ ++if test $cf_cv_wchar_h_okay = no ++then ++ CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 ++dnl ----------------- ++dnl Check if the given compiler is really clang. clang's C driver defines ++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does ++dnl not ignore some gcc options. ++dnl ++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to ++dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from ++dnl the wrappers for gcc and g++ warnings. ++dnl ++dnl $1 = GCC (default) or GXX ++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS ++dnl $3 = CFLAGS (default) or CXXFLAGS ++AC_DEFUN([CF_CLANG_COMPILER],[ ++ifelse([$2],,CLANG_COMPILER,[$2])=no ++ ++if test "$ifelse([$1],,[$1],GCC)" = yes ; then ++ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) ++ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ++ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" ++ AC_TRY_COMPILE([],[ ++#ifdef __clang__ ++#else ++make an error ++#endif ++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++],[]) ++ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" ++ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) ++fi ++]) ++dnl --------------------------------------------------------------------------- ++dnl CF_CPP_PARAM_INIT version: 5 updated: 2011/12/03 16:54:03 + dnl ----------------- + dnl Check if the C++ compiler accepts duplicate parameter initialization. This + dnl is a late feature for the standard and is not in some recent compilers +@@ -932,7 +1053,7 @@ + { + value = x; + } +-void main() { } ++int main() { } + ], + [cf_cv_cpp_param_init=yes], + [cf_cv_cpp_param_init=no], +@@ -999,7 +1120,55 @@ + test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_C_INLINE version: 3 updated: 2010/05/01 15:14:41 ++dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34 ++dnl --------------- ++dnl Setup special archiver flags for given compilers. ++AC_DEFUN([CF_CXX_AR_FLAGS],[ ++ CXX_AR='$(AR)' ++ CXX_ARFLAGS='$(ARFLAGS)' ++ case $cf_cv_system_name in #(vi ++ irix*) #(vi ++ if test "$GXX" != yes ; then ++ CXX_AR='$(CXX)' ++ CXX_ARFLAGS='-ar -o' ++ fi ++ ;; ++ sco3.2v5*) #(vi ++ CXXLDFLAGS="-u main" ++ ;; ++ solaris2*) ++ if test "$GXX" != yes ; then ++ CXX_AR='$(CXX)' ++ CXX_ARFLAGS='-xar -o' ++ fi ++ ;; ++ esac ++ AC_SUBST(CXXLDFLAGS) ++ AC_SUBST(CXX_AR) ++ AC_SUBST(CXX_ARFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_CXX_IOSTREAM_NAMESPACE version: 1 updated: 2011/10/29 08:35:34 ++dnl ------------------------- ++dnl For c++, check if iostream uses "std::" namespace. ++AC_DEFUN([CF_CXX_IOSTREAM_NAMESPACE],[ ++AC_CHECK_HEADERS(iostream) ++if test x"$ac_cv_header_iostream" = xyes ; then ++ AC_MSG_CHECKING(if iostream uses std-namespace) ++ AC_TRY_COMPILE([ ++#include <iostream> ++using std::endl; ++using std::cerr;],[ ++cerr << "testing" << endl; ++],[cf_iostream_namespace=yes],[cf_iostream_namespace=no]) ++ AC_MSG_RESULT($cf_iostream_namespace) ++ if test "$cf_iostream_namespace" = yes ; then ++ AC_DEFINE(IOSTREAM_NAMESPACE) ++ fi ++fi ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39 + dnl ----------- + dnl Check if the C compiler supports "inline". + dnl $1 is the name of a shell variable to set if inline is supported +@@ -1012,6 +1181,9 @@ + if test "$INTEL_COMPILER" = yes + then + : ++ elif test "$CLANG_COMPILER" = yes ++ then ++ : + elif test "$GCC" = yes + then + AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[ +@@ -1057,6 +1229,43 @@ + AC_SUBST(DIRS_TO_MAKE) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 ++dnl --------------- ++dnl You can always use "make -n" to see the actual options, but it's hard to ++dnl pick out/analyze warning messages when the compile-line is long. ++dnl ++dnl Sets: ++dnl ECHO_LT - symbol to control if libtool is verbose ++dnl ECHO_LD - symbol to prefix "cc -o" lines ++dnl RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o) ++dnl SHOW_CC - symbol to put before explicit "cc -c" lines ++dnl ECHO_CC - symbol to put before any "cc" line ++dnl ++AC_DEFUN([CF_DISABLE_ECHO],[ ++AC_MSG_CHECKING(if you want to see long compiling messages) ++CF_ARG_DISABLE(echo, ++ [ --disable-echo display "compiling" commands], ++ [ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking [$]@;' ++ RULE_CC='@echo compiling [$]<' ++ SHOW_CC='@echo compiling [$]@' ++ ECHO_CC='@' ++],[ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++]) ++AC_MSG_RESULT($enableval) ++AC_SUBST(ECHO_LT) ++AC_SUBST(ECHO_LD) ++AC_SUBST(RULE_CC) ++AC_SUBST(SHOW_CC) ++AC_SUBST(ECHO_CC) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_DISABLE_LEAKS version: 6 updated: 2010/07/23 04:14:32 + dnl ---------------- + dnl Combine no-leak checks with the libraries or tools that are used for the +@@ -1123,6 +1332,30 @@ + fi + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54 ++dnl ------------------ ++dnl This is the "--enable-pc-files" option, which is available if there is a ++dnl pkg-config configuration on the local machine. ++AC_DEFUN([CF_ENABLE_PC_FILES],[ ++AC_REQUIRE([CF_PKG_CONFIG]) ++AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR]) ++ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) ++ AC_ARG_ENABLE(pc-files, ++ [ --enable-pc-files generate and install .pc files for pkg-config], ++ [enable_pc_files=$enableval], ++ [enable_pc_files=no]) ++ AC_MSG_RESULT($enable_pc_files) ++ if test "$enable_pc_files" != no ++ then ++ CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR) ++ fi ++else ++ enable_pc_files=no ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 + dnl --------------- + dnl Check if the rpath option should be used, setting cache variable +@@ -1137,6 +1370,37 @@ + AC_MSG_RESULT($cf_cv_enable_rpath) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_ENABLE_STRING_HACKS version: 1 updated: 2012/02/25 06:33:21 ++dnl ---------------------- ++dnl On a few platforms, the compiler and/or loader nags with untruthful ++dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect, ++dnl and implying that most uses of the recommended alternatives are correct. ++dnl ++dnl Factually speaking, no one has actually counted the number of uses of these ++dnl functions versus the total of incorrect uses. Samples of a few thousand ++dnl instances are meaningless compared to the hundreds of millions of lines of ++dnl existing C code. ++dnl ++dnl strlcat/strlcpy are (as of 2012) non-standard, and are available on some ++dnl platforms, in implementations of varying quality. Likewise, snprintf is ++dnl standard - but evolved through phases, and older implementations are likely ++dnl to yield surprising results, as documented in manpages on various systems. ++AC_DEFUN([CF_ENABLE_STRING_HACKS], ++[ ++AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings) ++AC_ARG_ENABLE(string-hacks, ++ [ --enable-string-hacks work around bogus compiler/loader warnings], ++ [with_string_hacks=$enableval], ++ [with_string_hacks=no]) ++AC_MSG_RESULT($with_string_hacks) ++ ++if test "x$with_string_hacks" = "xyes"; then ++ AC_DEFINE(USE_STRING_HACKS) ++ AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings) ++ AC_CHECK_FUNCS( strlcat strlcpy snprintf ) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 + dnl -------- + dnl Check if 'errno' is declared in <errno.h> +@@ -1145,7 +1409,7 @@ + CF_CHECK_ERRNO(errno) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43 ++dnl CF_ETIP_DEFINES version: 5 updated: 2012/02/18 17:51:07 + dnl --------------- + dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between + dnl math.h and builtin.h, only for ncurses +@@ -1154,11 +1418,17 @@ + AC_MSG_CHECKING(for special defines needed for etip.h) + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" ++ ++# etip.h includes ncurses.h which includes ncurses_dll.h ++# But ncurses_dll.h is generated - fix here. ++test -d include || mkdir include ++test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h ++ + for cf_math in "" MATH_H + do + for cf_excp in "" MATH_EXCEPTION + do +- CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" ++ CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + AC_TRY_COMPILE([ +@@ -1167,7 +1437,7 @@ + test -n "$cf_math" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_math}) + test -n "$cf_excp" && AC_DEFINE_UNQUOTED(ETIP_NEEDS_${cf_excp}) + cf_result="$cf_math $cf_excp" +- break ++ break 2 + ],[]) + done + done +@@ -1305,6 +1575,25 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10 ++dnl ----------------- ++dnl make ADAFLAGS consistent with CFLAGS ++AC_DEFUN([CF_FIXUP_ADAFLAGS],[ ++ AC_MSG_CHECKING(optimization options for ADAFLAGS) ++ case "$CFLAGS" in ++ *-g*) ++ CF_ADD_ADAFLAGS(-g) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[ ]].*//'` ++ CF_ADD_ADAFLAGS($cf_O_flag) ++ ;; ++ esac ++ AC_MSG_RESULT($ADAFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_FUNC_DLSYM version: 2 updated: 2010/05/29 16:31:02 + dnl ------------- + dnl Test for dlsym() and related functions, as well as libdl. +@@ -1433,14 +1722,17 @@ + ]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30 ++dnl CF_FUNC_POLL version: 7 updated: 2012/06/09 16:22:17 + dnl ------------ + dnl See if the poll function really works. Some platforms have poll(), but + dnl it does not work for terminals or files. + AC_DEFUN([CF_FUNC_POLL],[ + AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[ + AC_TRY_RUN([ ++#include <stdlib.h> + #include <stdio.h> ++#include <unistd.h> ++#include <fcntl.h> + #ifdef HAVE_POLL_H + #include <poll.h> + #else +@@ -1450,11 +1742,34 @@ + struct pollfd myfds; + int ret; + +- myfds.fd = 0; ++ /* check for Darwin bug with respect to "devices" */ ++ myfds.fd = open("/dev/null", 1); /* O_WRONLY */ ++ if (myfds.fd < 0) ++ myfds.fd = 0; + myfds.events = POLLIN; ++ myfds.revents = 0; + + ret = poll(&myfds, 1, 100); +- ${cf_cv_main_return:-return}(ret != 0); ++ ++ if (ret < 0 || (myfds.revents & POLLNVAL)) { ++ ret = -1; ++ } else { ++ int fd = 0; ++ if (!isatty(fd)) { ++ fd = open("/dev/tty", 2); /* O_RDWR */ ++ } ++ ++ if (fd >= 0) { ++ /* also check with standard input */ ++ myfds.fd = fd; ++ myfds.events = POLLIN; ++ myfds.revents = 0; ++ ret = poll(&myfds, 1, 100); ++ } else { ++ ret = -1; ++ } ++ } ++ ${cf_cv_main_return:-return}(ret < 0); + }], + [cf_cv_working_poll=yes], + [cf_cv_working_poll=no], +@@ -1660,7 +1975,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 ++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. There's a few that + dnl we don't use, simply because they're too noisy: +@@ -1683,6 +1998,7 @@ + [ + AC_REQUIRE([CF_GCC_VERSION]) + CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + + cat > conftest.$ac_ext <<EOF + #line __oline__ "${as_me:-configure}" +@@ -1758,6 +2074,13 @@ + continue;; + esac + ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [[12]].*) ++ CF_VERBOSE(feature is broken in gcc $GCC_VERSION) ++ continue;; ++ esac ++ ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -1769,6 +2092,29 @@ + AC_SUBST(EXTRA_CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_GETOPT_HEADER version: 4 updated: 2009/08/31 20:07:52 ++dnl ---------------- ++dnl Check for getopt's variables which are commonly defined in stdlib.h, ++dnl unistd.h or (nonstandard) in getopt.h ++AC_DEFUN([CF_GETOPT_HEADER], ++[ ++AC_HAVE_HEADERS(unistd.h getopt.h) ++AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ ++cf_cv_getopt_header=none ++for cf_header in stdio.h stdlib.h unistd.h getopt.h ++do ++AC_TRY_COMPILE([ ++#include <$cf_header>], ++[int x = optind; char *y = optarg], ++[cf_cv_getopt_header=$cf_header ++ break]) ++done ++]) ++if test $cf_cv_getopt_header != none ; then ++ AC_DEFINE(HAVE_GETOPT_HEADER) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41 + dnl ---------------- + AC_DEFUN([CF_GNAT_GENERICS], +@@ -2040,7 +2386,7 @@ + rm -rf conftest* *~conftest* + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41 ++dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10 + dnl --------------- + dnl Verify version of GNAT. + AC_DEFUN([CF_GNAT_VERSION], +@@ -2052,7 +2398,7 @@ + AC_MSG_RESULT($cf_gnat_version) + + case $cf_gnat_version in #(vi +-3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi ++3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +@@ -2136,21 +2482,21 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GXX_VERSION version: 6 updated: 2010/10/23 15:44:18 ++dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39 + dnl -------------- + dnl Check for version of g++ + AC_DEFUN([CF_GXX_VERSION],[ + AC_REQUIRE([AC_PROG_CPP]) + GXX_VERSION=none + if test "$GXX" = yes; then +- AC_MSG_CHECKING(version of g++) ++ AC_MSG_CHECKING(version of ${CXX:-g++}) + GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + test -z "$GXX_VERSION" && GXX_VERSION=unknown + AC_MSG_RESULT($GXX_VERSION) + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GXX_WARNINGS version: 6 updated: 2010/08/14 18:25:37 ++dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. + dnl +@@ -2173,6 +2519,7 @@ + [ + + CF_INTEL_COMPILER(GXX,INTEL_CPLUSPLUS,CXXFLAGS) ++CF_CLANG_COMPILER(GXX,CLANG_CPLUSPLUS,CXXFLAGS) + + AC_REQUIRE([CF_GXX_VERSION]) + +@@ -2581,7 +2928,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LDFLAGS_STATIC version: 8 updated: 2010/10/23 14:39:56 ++dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48 + dnl ----------------- + dnl Check for compiler/linker flags used to temporarily force usage of static + dnl libraries. This depends on the compiler and platform. Use this to help +@@ -2602,7 +2949,7 @@ + esac + else + case $cf_cv_system_name in #( +- aix[[456]]*) #( from ld manpage ++ aix[[4-7]]*) #( from ld manpage + LDFLAGS_STATIC=-bstatic + LDFLAGS_SHARED=-bdynamic + ;; +@@ -2652,7 +2999,17 @@ + int cf_ldflags_static(FILE *fp); + ],[ + return cf_ldflags_static(stdin); +-],[cf_ldflags_static=yes],[cf_ldflags_static=no]) ++],[ ++ # some linkers simply ignore the -dynamic ++ case x`file conftest$ac_exeext 2>/dev/null` in #(vi ++ *static*) # (vi ++ cf_ldflags_static=no ++ ;; ++ *) ++ cf_ldflags_static=yes ++ ;; ++ esac ++],[cf_ldflags_static=no]) + + rm -f libconftest.* + LIBS="$cf_save_LIBS" +@@ -2673,7 +3030,7 @@ + AC_SUBST(LDFLAGS_SHARED) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05 ++dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 + dnl --------------- + dnl For the given system and compiler, find the compiler flags to pass to the + dnl loader to use the "rpath" feature. +@@ -2694,10 +3051,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[[2-9]].*) #(vi ++openbsd[[2-9]].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -2756,11 +3113,11 @@ + $1="$cf_library_path_list [$]$1" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16 ++dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 + dnl ------------- + dnl Compute the library-prefix for the given host system + dnl $1 = variable to set +-AC_DEFUN([CF_LIB_PREFIX], ++define([CF_LIB_PREFIX], + [ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi +@@ -2773,7 +3130,7 @@ + AC_SUBST(LIB_PREFIX) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_RULES version: 61 updated: 2010/10/23 16:10:30 ++dnl CF_LIB_RULES version: 65 updated: 2012/06/30 17:25:25 + dnl ------------ + dnl Append definitions and rules for the given models to the subdirectory + dnl Makefiles, and the recursion rule for the top-level Makefile. If the +@@ -2788,13 +3145,15 @@ + dnl lib<name>.so.<maj>.<minor> + AC_DEFUN([CF_LIB_RULES], + [ +-CF_LIB_PREFIX(cf_prefix) ++cf_prefix=$LIB_PREFIX + AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) + +-if test $cf_cv_shlib_version = cygdll ; then ++case $cf_cv_shlib_version in #(vi ++cygdll|mingw) + TINFO_NAME=$TINFO_ARG_SUFFIX + TINFO_SUFFIX=.dll +-fi ++ ;; ++esac + + if test -n "$TINFO_SUFFIX" ; then + case $TINFO_SUFFIX in +@@ -2880,11 +3239,18 @@ + # cygwin needs import library, and has unique naming convention + # use autodetected ${cf_prefix} for import lib and static lib, but + # use 'cyg' prefix for shared lib. +- if test $cf_cv_shlib_version = cygdll ; then ++ case $cf_cv_shlib_version in #(vi ++ cygdll) #(vi + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" + continue +- fi ++ ;; ++ mingw) ++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` ++ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" ++ continue ++ ;; ++ esac + fi + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" + done +@@ -2928,7 +3294,7 @@ + mv $cf_dir/Makefile.out $cf_dir/Makefile + + $AWK -f $srcdir/mk-0th.awk \ +- libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \ ++ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \ + $srcdir/$cf_dir/modules >>$cf_dir/Makefile + + for cf_subset in $cf_subsets +@@ -3010,6 +3376,7 @@ + prefix=$cf_prefix \ + suffix=$cf_suffix \ + subset=$cf_subset \ ++ driver=$cf_cv_term_driver \ + SymLink="$LN_S" \ + TermlibRoot=$TINFO_NAME \ + TermlibSuffix=$TINFO_SUFFIX \ +@@ -3292,7 +3659,7 @@ + ]) + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_LIB_SUFFIX version: 16 updated: 2008/12/27 12:30:03 ++dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07 + dnl ------------- + dnl Compute the library file-suffix from the given model name + dnl $1 = model name +@@ -3321,11 +3688,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[[56]]*) #(vi ++ aix[[5-7]]*) #(vi + $2='.a' + $3=[$]$2 + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + $2='.dll' + $3='.dll.a' + ;; +@@ -3799,7 +4166,7 @@ + AC_MSG_RESULT($MANPAGE_TBL) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_MAN_PAGES version: 39 updated: 2010/10/23 15:44:18 ++dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44 + dnl ------------ + dnl Try to determine if the man-pages on the system are compressed, and if + dnl so, what format is used. Use this information to construct a script that +@@ -3856,6 +4223,7 @@ + # this script is generated by the configure-script CF_MAN_PAGES macro. + + prefix="$cf_prefix" ++datarootdir="$datarootdir" + datadir="$datadir" + + NCURSES_MAJOR="$NCURSES_MAJOR" +@@ -3949,7 +4317,9 @@ + + if test "$MANPAGE_ALIASES" != no ; then + cat >>$cf_edit_man <<CF_EOF +- aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\` ++ nCurses=ignore.3x ++ test $with_curses_h = yes && nCurses=ncurses.3x ++ aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\` + CF_EOF + fi + +@@ -3995,6 +4365,13 @@ + fi + CF_EOF + ++if test $with_overwrite != yes ; then ++cat >>$cf_edit_man <<CF_EOF ++ sed -e "/\#[ ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi ++ + if test $with_curses_h != yes ; then + cat >>$cf_edit_man <<CF_EOF + sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out +@@ -4184,7 +4561,7 @@ + test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37 ++dnl CF_MKSTEMP version: 8 updated: 2012/02/13 20:34:56 + dnl ---------- + dnl Check for a working mkstemp. This creates two files, checks that they are + dnl successfully created and distinct (AmigaOS apparently fails on the last). +@@ -4226,9 +4603,11 @@ + } + ],[cf_cv_func_mkstemp=yes + ],[cf_cv_func_mkstemp=no +-],[AC_CHECK_FUNC(mkstemp) +-]) ++],[cf_cv_func_mkstemp=maybe]) + ]) ++if test "x$cf_cv_func_mkstemp" = xmaybe ; then ++ AC_CHECK_FUNC(mkstemp) ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + AC_DEFINE(HAVE_MKSTEMP) + fi +@@ -4339,7 +4718,7 @@ + AC_SUBST(PATH_SEPARATOR) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 ++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 + dnl -------------- + dnl Check the argument to see that it looks like a pathname. Rewrite it if it + dnl begins with one of the prefix/exec_prefix variables, and then again if the +@@ -4359,7 +4738,7 @@ + ;; + .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX + ;; +-.\[$]{*prefix}*) #(vi ++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi + eval $1="[$]$1" + case ".[$]$1" in #(vi + .NONE/*) +@@ -4376,7 +4755,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24 ++dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 + dnl ------------- + dnl Check for the package-config program, unless disabled by command-line. + AC_DEFUN([CF_PKG_CONFIG], +@@ -4393,7 +4772,9 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) ++ CF_ACVERSION_CHECK(2.52, ++ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], ++ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; + *) + PKG_CONFIG=$withval +@@ -4658,7 +5039,7 @@ + test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_GNAT version: 1 updated: 2010/06/19 15:22:18 ++dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47 + dnl ------------ + dnl Check for gnatmake, ensure that it is complete. + AC_DEFUN([CF_PROG_GNAT],[ +@@ -4666,6 +5047,7 @@ + AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no) + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + CF_GNAT_VERSION + AC_CHECK_PROG(M4_exists, m4, yes, no) +@@ -4709,7 +5091,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PROG_LDCONFIG version: 2 updated: 2008/12/13 14:08:40 ++dnl CF_PROG_LDCONFIG version: 3 updated: 2011/06/04 20:09:13 + dnl ---------------- + dnl Check for ldconfig, needed to fixup shared libraries that would be built + dnl and then used in the install. +@@ -4718,7 +5100,7 @@ + LDCONFIG=: + else + case "$cf_cv_system_name" in #(vi +-dragonfly*|freebsd*) #(vi ++dragonfly*|mirbsd*|freebsd*) #(vi + test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" + ;; + *) LDPATH=$PATH:/sbin:/usr/sbin +@@ -4759,7 +5141,7 @@ + test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_REGEX version: 8 updated: 2010/08/07 14:09:44 ++dnl CF_REGEX version: 9 updated: 2012/01/07 15:08:24 + dnl -------- + dnl Attempt to determine if we've got one of the flavors of regular-expression + dnl code that we can support. +@@ -4771,7 +5153,7 @@ + cf_regex_libs="regex re" + case $host_os in #(vi + mingw*) +- cf_regex_libs="regex.dll $cf_regex_libs" ++ cf_regex_libs="gnurx $cf_regex_libs" + ;; + esac + +@@ -4984,7 +5366,7 @@ + AC_SUBST(EXTRA_LDFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SHARED_OPTS version: 64 updated: 2010/06/05 16:51:16 ++dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07 + dnl -------------- + dnl -------------- + dnl Attempt to determine the appropriate CC/LD options for creating a shared +@@ -5059,10 +5441,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[[56]]*) #(vi ++ aix4.[3-9]*|aix[[5-7]]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' + fi + ;; + beos*) #(vi +@@ -5115,9 +5501,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename $@`' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -5134,18 +5530,39 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; +- openbsd[[2-9]].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\[$]1 ++ IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \[$]SHARED_LIB ++ ** IMPORT_LIB \[$]IMPORT_LIB ++EOF ++ exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[[2-9]].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + CF_SHARED_SONAME +@@ -5156,12 +5573,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' +@@ -5171,7 +5588,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -5276,9 +5693,12 @@ + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) ++ CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + + AC_SUBST(CC_SHARED_OPTS) + AC_SUBST(LD_RPATH_OPT) +@@ -5290,6 +5710,7 @@ + AC_SUBST(LOCAL_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS2) + AC_SUBST(INSTALL_LIB) ++ AC_SUBST(RPATH_LIST) + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 +@@ -5474,7 +5895,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40 ++dnl CF_SRC_MODULES version: 26 updated: 2012/01/07 15:08:24 + dnl -------------- + dnl For each parameter, test if the source-directory exists, and if it contains + dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll +@@ -5497,6 +5918,7 @@ + TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi + ++PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}" + cf_cv_src_modules= + for cf_dir in $1 + do +@@ -5535,6 +5957,7 @@ + TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}" + fi + fi + done +@@ -5562,10 +5985,18 @@ + SRC_SUBDIRS="$SRC_SUBDIRS test" + fi + test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +-test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++" ++if test "$cf_with_cxx_binding" != no; then ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}" ++ SRC_SUBDIRS="$SRC_SUBDIRS c++" ++fi ++ ++test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX" ++test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX" ++ ++AC_SUBST(PC_MODULES_TO_MAKE) + + ADA_SUBDIRS= +-if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then + SRC_SUBDIRS="$SRC_SUBDIRS Ada95" + ADA_SUBDIRS="gen src" + if test "x$cf_with_tests" != "xno" ; then +@@ -5624,13 +6055,13 @@ + AC_DEFUN([CF_STRIP_G_OPT], + [$1=`echo ${$1} | sed -e 's%-g %%' -e 's%-g$%%'`])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_STRUCT_SIGACTION version: 3 updated: 2000/08/12 23:18:52 ++dnl CF_STRUCT_SIGACTION version: 4 updated: 2011/04/16 11:52:53 + dnl ------------------- + dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only + dnl do this if we've found the sigaction function. +-dnl +-dnl If needed, define SVR4_ACTION. + AC_DEFUN([CF_STRUCT_SIGACTION],[ ++AC_REQUIRE([CF_XOPEN_SOURCE]) ++ + if test "$ac_cv_func_sigaction" = yes; then + AC_MSG_CHECKING(whether sigaction needs _POSIX_SOURCE) + AC_TRY_COMPILE([ +@@ -5645,22 +6076,24 @@ + #include <signal.h>], + [struct sigaction act], + [sigact_bad=yes +- AC_DEFINE(SVR4_ACTION)], ++ AC_DEFINE(_POSIX_SOURCE)], + [sigact_bad=unknown])]) + AC_MSG_RESULT($sigact_bad) + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46 ++dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53 + dnl ----------------- + dnl Some machines require _POSIX_SOURCE to completely define struct termios. +-dnl If so, define SVR4_TERMIO + AC_DEFUN([CF_STRUCT_TERMIOS],[ ++AC_REQUIRE([CF_XOPEN_SOURCE]) ++ + AC_CHECK_HEADERS( \ + termio.h \ + termios.h \ + unistd.h \ + ) ++ + if test "$ISC" = yes ; then + AC_CHECK_HEADERS( sys/termio.h ) + fi +@@ -5680,7 +6113,7 @@ + #include <termios.h>], + [struct termios foo; int x = foo.c_iflag], + termios_bad=unknown, +- termios_bad=yes AC_DEFINE(SVR4_TERMIO)) ++ termios_bad=yes AC_DEFINE(_POSIX_SOURCE)) + ]) + AC_MSG_RESULT($termios_bad) + fi +@@ -5798,6 +6231,45 @@ + AC_SUBST(top_builddir) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 ++dnl ------------------- ++dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we ++dnl can define it successfully. ++AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ ++AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) ++ CPPFLAGS="$cf_save" ++ ]) ++]) ++ ++if test "$cf_cv_xopen_source" != no ; then ++ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) ++ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ CF_ADD_CFLAGS($cf_temp_xopen_source) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_TYPEOF_CHTYPE version: 8 updated: 2006/12/16 12:33:30 + dnl ---------------- + dnl Determine the type we should use for chtype (and attr_t, which is treated +@@ -6182,7 +6654,7 @@ + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24 ++dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32 + dnl --------------- + dnl Provide a configure option to incorporate libtool. Define several useful + dnl symbols for the makefile rules. +@@ -6258,7 +6730,7 @@ + AC_MSG_ERROR(Cannot find libtool) + fi + ])dnl +- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' ++ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' + LIB_OBJECT='${OBJECTS:.o=.lo}' + LIB_SUFFIX=.la + LIB_CLEAN='${LIBTOOL} --mode=clean' +@@ -6283,7 +6755,7 @@ + # special hack to add -no-undefined (which libtool should do for itself) + LT_UNDEF= + case "$cf_cv_system_name" in #(vi +- cygwin*|mingw32*|uwin*|aix[[456]]) #(vi ++ cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi + LT_UNDEF=-no-undefined + ;; + esac +@@ -6323,6 +6795,32 @@ + + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_LIB_PREFIX version: 1 updated: 2012/01/21 19:28:10 ++dnl ------------------ ++dnl Allow the library-prefix to be overridden. OS/2 EMX originally had no ++dnl "lib" prefix, e.g., because it used the dll naming convention. ++dnl ++dnl $1 = variable to set ++AC_DEFUN([CF_WITH_LIB_PREFIX], ++[ ++AC_MSG_CHECKING(if you want to have a library-prefix) ++AC_ARG_WITH(lib-prefix, ++ [ --with-lib-prefix override library-prefix], ++ [with_lib_prefix=$withval], ++ [with_lib_prefix=auto]) ++AC_MSG_RESULT($with_lib_prefix) ++ ++if test $with_lib_prefix = auto ++then ++ CF_LIB_PREFIX($1) ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 + dnl ------------ + dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +@@ -6386,7 +6884,50 @@ + + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02 ++dnl CF_WITH_PKG_CONFIG_LIBDIR version: 2 updated: 2011/12/10 18:58:47 ++dnl ------------------------- ++dnl Allow the choice of the pkg-config library directory to be overridden. ++AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ ++if test "$PKG_CONFIG" != none ; then ++ AC_MSG_CHECKING(for $PKG_CONFIG library directory) ++ AC_ARG_WITH(pkg-config-libdir, ++ [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], ++ [PKG_CONFIG_LIBDIR=$withval], ++ [PKG_CONFIG_LIBDIR=yes]) ++ ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ AC_MSG_RESULT($PKG_CONFIG_LIBDIR) ++fi ++ ++AC_SUBST(PKG_CONFIG_LIBDIR) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_WITH_PTHREAD version: 5 updated: 2011/12/10 19:01:56 + dnl --------------- + dnl Check for POSIX thread library. + AC_DEFUN([CF_WITH_PTHREAD], +@@ -6402,23 +6943,28 @@ + AC_CHECK_HEADER(pthread.h,[ + AC_DEFINE(HAVE_PTHREADS_H) + +- AC_MSG_CHECKING(if we can link with the pthread library) +- cf_save_LIBS="$LIBS" +- CF_ADD_LIB(pthread) +- AC_TRY_LINK([ ++ for cf_lib_pthread in pthread c_r ++ do ++ AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library) ++ cf_save_LIBS="$LIBS" ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_TRY_LINK([ + #include <pthread.h> + ],[ +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + ],[with_pthread=yes],[with_pthread=no]) +- LIBS="$cf_save_LIBS" +- AC_MSG_RESULT($with_pthread) ++ LIBS="$cf_save_LIBS" ++ AC_MSG_RESULT($with_pthread) ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- CF_ADD_LIB(pthread) +- AC_DEFINE(HAVE_LIBPTHREADS) +- else +- AC_MSG_ERROR(Cannot link with pthread library) +- fi ++ if test "$with_pthread" = yes ; then ++ CF_ADD_LIB($cf_lib_pthread) ++ AC_DEFINE(HAVE_LIBPTHREADS) ++ else ++ AC_MSG_ERROR(Cannot link with pthread library) ++ fi + ]) + fi + ]) +@@ -6486,7 +7032,7 @@ + [USE_VALGRIND]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 ++dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 + dnl --------------- + dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, + dnl or adapt to the vendor's definitions to get equivalent functionality, +@@ -6502,7 +7048,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[[456]]*) #(vi ++aix[[4-7]]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -6513,6 +7059,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -6530,15 +7077,23 @@ + ;; + irix[[56]].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + CF_GNU_SOURCE + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[[4-9]]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 + ;; + openbsd*) #(vi + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +@@ -6552,36 +7107,11 @@ + sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +-solaris2.1[[0-9]]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[[1-9]]) #(vi ++solaris2.*) #(vi + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifndef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifdef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) +- CPPFLAGS="$cf_save" +- ]) +-]) +- if test "$cf_cv_xopen_source" != no ; then +- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) +- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +- CF_ADD_CFLAGS($cf_temp_xopen_source) +- fi ++ CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + esac +@@ -6589,4 +7119,33 @@ + if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) + fi ++ ++dnl In anything but the default case, we may have system-specific setting ++dnl which is still not guaranteed to provide all of the entrypoints that ++dnl _XOPEN_SOURCE would yield. ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set=yes], ++ [cf_XOPEN_SOURCE_set=no]) ++ AC_MSG_RESULT($cf_XOPEN_SOURCE_set) ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set_ok=yes], ++ [cf_XOPEN_SOURCE_set_ok=no]) ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) ++ fi ++ else ++ CF_TRY_XOPEN_SOURCE ++ fi ++fi + ]) +diff -Naur ncurses-5.9.orig/announce.html.in ncurses-5.9/announce.html.in +--- ncurses-5.9.orig/announce.html.in 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/announce.html.in 2012-08-25 19:57:59.893231947 +0000 +@@ -1,6 +1,6 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <!-- +- $Id: announce.html.in,v 1.85 2011/04/04 00:05:34 tom Exp $ ++ $Id: announce.html.in,v 1.86 2011/09/10 18:11:12 tom Exp $ + **************************************************************************** + * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * +@@ -77,30 +77,38 @@ + compatible from ncurses 5.0 through 5.8; very few applications + will require recompilation, depending on the platform. These are + the highlights from the change-log since ncurses 5.8 release. +- <p> +- This is a bug-fix release, correcting a small number of urgent problems +- in the ncurses library from the 5.8 release. +- <p> +- It also improves the Ada95 binding: ++ ++ <p>This is a bug-fix release, correcting a small number of urgent ++ problems in the ncurses library from the 5.8 release.</p> ++ ++ <p>It also improves the Ada95 binding:</p> ++ + <ul> +- <li>fixes a longstanding portability problem with its use of the +- <a href="http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a> +- function. Because that function uses variable-length argument lists, +- its interface with gnat does not work with certain platforms. +- <li>improves configurability and portability, particularly when built +- separately from the main ncurses tree. The 5.8 release introduced +- scripts which can be used to construct separate tarballs for the +- Ada95 and ncurses examples. +- <p>Those were a proof of concept. For the 5.9 release, those +- scripts are augmented with rpm- and dpkg-scripts used in test builds +- against a variety of gnat- and system ncurses versions as old as +- gnat 3.15 and ncurses 5.4 (see snapshots and systems tested +- <a href="http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>. +- <li>additional improvements were made for portability of the +- ncurses examples, adding rpm- and dpkg-scripts for test-builds. +- See +- <a href="http://invisible-island.net/ncurses/ncurses-examples.html">this page</a> +- for snapshots and other information. ++ <li>fixes a longstanding portability problem with its use of ++ the <a href= ++ "http://invisible-island.net/ncurses/man/form_fieldtype.3x">set_field_type</a> ++ function. Because that function uses variable-length argument ++ lists, its interface with gnat does not work with certain ++ platforms.</li> ++ ++ <li>improves configurability and portability, particularly when ++ built separately from the main ncurses tree. The 5.8 release ++ introduced scripts which can be used to construct separate ++ tarballs for the Ada95 and ncurses examples. ++ ++ <p>Those were a proof of concept. For the 5.9 release, those ++ scripts are augmented with rpm- and dpkg-scripts used in test ++ builds against a variety of gnat- and system ncurses versions ++ as old as gnat 3.15 and ncurses 5.4 (see snapshots and ++ systems tested <a href= ++ "http://invisible-island.net/ncurses/ncurses-Ada95.html">here</a>.</p> ++ </li> ++ ++ <li>additional improvements were made for portability of the ++ ncurses examples, adding rpm- and dpkg-scripts for test-builds. ++ See <a href= ++ "http://invisible-island.net/ncurses/ncurses-examples.html">this ++ page</a> for snapshots and other information.</li> + </ul> + + <h1>Features of Ncurses</h1>The ncurses package is fully +@@ -364,6 +372,13 @@ + are made available at <a href= + "ftp://invisible-island.net/ncurses/">ftp://invisible-island.net/ncurses/</a> .</p> + ++ <p>There is an archive of the mailing list here:</p> ++ ++ <p><a href= ++ "http://lists.gnu.org/archive/html/bug-ncurses">http://lists.gnu.org/archive/html/bug-ncurses</a> ++ (also <a href= ++ "https://lists.gnu.org/archive/html/bug-ncurses">https</a>)</p> ++ + <h2>Future Plans</h2> + + <ul> +diff -Naur ncurses-5.9.orig/c++/Makefile.in ncurses-5.9/c++/Makefile.in +--- ncurses-5.9.orig/c++/Makefile.in 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/Makefile.in 2012-08-25 19:58:01.013226651 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.93 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.96 2012/03/17 16:45:38 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -112,6 +112,7 @@ + MY_LIBRARY = ../lib/$(LIBNAME) + + LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@ ++RPATH_LIST = @RPATH_LIST@ + + LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY) + LINK_NORMAL = $(LINK_FLAGS) +@@ -169,7 +170,7 @@ + cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \ + -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \ + -rpath $(INSTALL_PREFIX)$(libdir) \ +- $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST) ++ $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST) + + OBJS_DEMO = $(MODEL)/demo$o + +@@ -179,7 +180,7 @@ + demo$x: $(OBJS_DEMO) \ + $(MY_LIBRARY) \ + @TEST_DEPS@ +- @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) ++ @ECHO_LD@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) + + etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh + cp $(srcdir)/etip.h.in $@ +diff -Naur ncurses-5.9.orig/c++/cursesapp.h ncurses-5.9/c++/cursesapp.h +--- ncurses-5.9.orig/c++/cursesapp.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/cursesapp.h 2012-08-25 19:57:59.893231947 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + * Author: Juergen Pfeifer, 1997 * + ****************************************************************************/ + +-// $Id: cursesapp.h,v 1.11 2005/05/28 21:57:44 tom Exp $ ++// $Id: cursesapp.h,v 1.12 2011/09/17 22:12:10 tom Exp $ + + #ifndef NCURSES_CURSESAPP_H_incl + #define NCURSES_CURSESAPP_H_incl +@@ -80,6 +80,7 @@ + // This method is called to initialize the SLKs. Default is nothing. + // You may rewrite this in your derived class + virtual void init_labels(Soft_Label_Key_Set& S) const { ++ (void) S; + } + + // Your derived class must implement this method. The return value must +@@ -118,6 +119,8 @@ + // Process the commandline arguments. The default implementation simply + // ignores them. Your derived class may rewrite this. + virtual void handleArgs(int argc, char* argv[]) { ++ (void) argc; ++ (void) argv; + } + + // Does this application use colors? +@@ -138,37 +141,37 @@ + + // Attributes to use for menu and forms foregrounds + virtual chtype foregrounds() const { +- return b_Colors ? COLOR_PAIR(1) : A_BOLD; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(1)) : A_BOLD; + } + + // Attributes to use for menu and forms backgrounds + virtual chtype backgrounds() const { +- return b_Colors ? COLOR_PAIR(2) : A_NORMAL; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(2)) : A_NORMAL; + } + + // Attributes to use for inactive (menu) elements + virtual chtype inactives() const { +- return b_Colors ? (COLOR_PAIR(3)|A_DIM) : A_DIM; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(3)|A_DIM) : A_DIM; + } + + // Attributes to use for (form) labels and SLKs + virtual chtype labels() const { +- return b_Colors ? COLOR_PAIR(4) : A_NORMAL; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL; + } + + // Attributes to use for form backgrounds + virtual chtype dialog_backgrounds() const { +- return b_Colors ? COLOR_PAIR(4) : A_NORMAL; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(4)) : A_NORMAL; + } + + // Attributes to use as default for (form) window backgrounds + virtual chtype window_backgrounds() const { +- return b_Colors ? COLOR_PAIR(5) : A_NORMAL; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(5)) : A_NORMAL; + } + + // Attributes to use for the title window + virtual chtype screen_titles() const { +- return b_Colors ? COLOR_PAIR(6) : A_BOLD; ++ return b_Colors ? static_cast<chtype>(COLOR_PAIR(6)) : A_BOLD; + } + + }; +diff -Naur ncurses-5.9.orig/c++/cursesf.cc ncurses-5.9/c++/cursesf.cc +--- ncurses-5.9.orig/c++/cursesf.cc 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/cursesf.cc 2012-08-25 19:57:59.896565265 +0000 +@@ -1,6 +1,6 @@ + // * this is for making emacs happy: -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + #include "cursesf.h" + #include "cursesapp.h" + +-MODULE_ID("$Id: cursesf.cc,v 1.21 2005/08/13 18:09:06 tom Exp $") ++MODULE_ID("$Id: cursesf.cc,v 1.22 2011/09/17 22:12:10 tom Exp $") + + NCursesFormField::~NCursesFormField () + { +@@ -234,11 +234,13 @@ + void + NCursesForm::On_Field_Init(NCursesFormField& field) + { ++ (void) field; + } + + void + NCursesForm::On_Field_Termination(NCursesFormField& field) + { ++ (void) field; + } + + // call the form driver and do basic error checking. +@@ -260,16 +262,19 @@ + + void NCursesForm::On_Request_Denied(int c) const + { ++ (void) c; + ::beep(); + } + + void NCursesForm::On_Invalid_Field(int c) const + { ++ (void) c; + ::beep(); + } + + void NCursesForm::On_Unknown_Command(int c) const + { ++ (void) c; + ::beep(); + } + +@@ -373,6 +378,7 @@ + // + bool _nc_xx_fld_fcheck(FIELD *f, const void *u) + { ++ (void) f; + NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u)); + assert(F != 0); + UserDefinedFieldType* udf = reinterpret_cast<UserDefinedFieldType*>(F->fieldtype()); +@@ -405,6 +411,7 @@ + + bool _nc_xx_next_choice(FIELD *f, const void *u) + { ++ (void) f; + NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u)); + assert(F != 0); + UserDefinedFieldType_With_Choice* udf = +@@ -415,6 +422,7 @@ + + bool _nc_xx_prev_choice(FIELD *f, const void *u) + { ++ (void) f; + NCursesFormField* F = reinterpret_cast<NCursesFormField*>(const_cast<void *>(u)); + assert(F != 0); + UserDefinedFieldType_With_Choice* udf = +diff -Naur ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h +--- ncurses-5.9.orig/c++/cursesf.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/cursesf.h 2012-08-25 19:58:01.569890686 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + * Author: Juergen Pfeifer, 1997 * + ****************************************************************************/ + +-// $Id: cursesf.h,v 1.28 2005/08/13 18:08:24 tom Exp $ ++// $Id: cursesf.h,v 1.30 2012/06/08 17:43:56 Richard.Yao Exp $ + + #ifndef NCURSES_CURSESF_H_incl + #define NCURSES_CURSESF_H_incl 1 +@@ -677,7 +677,7 @@ + } + + public: +- NCursesUserForm (NCursesFormField Fields[], ++ NCursesUserForm (NCursesFormField* Fields[], + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Fields=FALSE) +@@ -686,7 +686,7 @@ + set_user (const_cast<void *>(p_UserData)); + }; + +- NCursesUserForm (NCursesFormField Fields[], ++ NCursesUserForm (NCursesFormField* Fields[], + int nlines, + int ncols, + int begin_y = 0, +diff -Naur ncurses-5.9.orig/c++/cursesm.cc ncurses-5.9/c++/cursesm.cc +--- ncurses-5.9.orig/c++/cursesm.cc 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/cursesm.cc 2012-08-25 19:57:59.899898583 +0000 +@@ -1,6 +1,6 @@ + // * this is for making emacs happy: -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2005,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + #include "cursesm.h" + #include "cursesapp.h" + +-MODULE_ID("$Id: cursesm.cc,v 1.22 2005/04/02 20:39:05 tom Exp $") ++MODULE_ID("$Id: cursesm.cc,v 1.23 2011/09/17 22:11:32 tom Exp $") + + NCursesMenuItem::~NCursesMenuItem() + { +@@ -375,33 +375,39 @@ + void + NCursesMenu::On_Item_Init(NCursesMenuItem& item) + { ++ (void) item; + } + + void + NCursesMenu::On_Item_Termination(NCursesMenuItem& item) + { ++ (void) item; + } + + void + NCursesMenu::On_Request_Denied(int c) const + { ++ (void) c; + ::beep(); + } + + void + NCursesMenu::On_Not_Selectable(int c) const + { ++ (void) c; + ::beep(); + } + + void + NCursesMenu::On_No_Match(int c) const + { ++ (void) c; + ::beep(); + } + + void + NCursesMenu::On_Unknown_Command(int c) const + { ++ (void) c; + ::beep(); + } +diff -Naur ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h +--- ncurses-5.9.orig/c++/cursesm.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/cursesm.h 2012-08-25 19:58:01.569890686 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + * Author: Juergen Pfeifer, 1997 * + ****************************************************************************/ + +-// $Id: cursesm.h,v 1.25 2005/08/13 18:10:36 tom Exp $ ++// $Id: cursesm.h,v 1.28 2012/06/08 17:43:56 Richard.Yao Exp $ + + #ifndef NCURSES_CURSESM_H_incl + #define NCURSES_CURSESM_H_incl 1 +@@ -82,6 +82,7 @@ + NCursesMenuItem(const NCursesMenuItem& rhs) + : item(0) + { ++ (void) rhs; + } + + virtual ~NCursesMenuItem (); +@@ -635,7 +636,7 @@ + } + + public: +- NCursesUserMenu (NCursesMenuItem Items[], ++ NCursesUserMenu (NCursesMenuItem* Items[], + const T* p_UserData = STATIC_CAST(T*)(0), + bool with_frame=FALSE, + bool autoDelete_Items=FALSE) +@@ -644,7 +645,7 @@ + set_user (const_cast<void *>(p_UserData)); + }; + +- NCursesUserMenu (NCursesMenuItem Items[], ++ NCursesUserMenu (NCursesMenuItem* Items[], + int nlines, + int ncols, + int begin_y = 0, +diff -Naur ncurses-5.9.orig/c++/cursespad.cc ncurses-5.9/c++/cursespad.cc +--- ncurses-5.9.orig/c++/cursespad.cc 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/cursespad.cc 2012-08-25 19:57:59.899898583 +0000 +@@ -1,6 +1,6 @@ + // * this is for making emacs happy: -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + #include <etip.h> + #include <cursesw.h> + +-MODULE_ID("$Id: cursespad.cc,v 1.13 2008/08/04 18:59:22 tom Exp $") ++MODULE_ID("$Id: cursespad.cc,v 1.14 2011/09/17 22:12:10 tom Exp $") + + NCursesPad::NCursesPad(int nlines, int ncols) + : NCursesWindow(), +@@ -220,6 +220,7 @@ + + void NCursesFramedPad::OnOperation(int pad_req) + { ++ (void) pad_req; + NCursesWindow* W = Win(); + NCursesWindow* W2 = getWindow(); + +diff -Naur ncurses-5.9.orig/c++/cursesw.cc ncurses-5.9/c++/cursesw.cc +--- ncurses-5.9.orig/c++/cursesw.cc 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/cursesw.cc 2012-08-25 19:57:59.903231901 +0000 +@@ -1,6 +1,6 @@ + // * this is for making emacs happy: -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 2007-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + #include "internal.h" + #include "cursesw.h" + +-MODULE_ID("$Id: cursesw.cc,v 1.51 2009/03/28 21:31:37 tom Exp $") ++MODULE_ID("$Id: cursesw.cc,v 1.52 2011/09/17 22:12:10 tom Exp $") + + #define COLORS_NEED_INITIALIZATION -1 + #define COLORS_NOT_INITIALIZED 0 +@@ -285,12 +285,14 @@ + NCursesWindow::NCursesWindow(WINDOW *win, int ncols) + : w(0), alloced(FALSE), par(0), subwins(0), sib(0) + { ++ (void) ncols; + initialize(); + w = win; + } + + int _nc_xx_ripoff_init(WINDOW *w, int ncols) + { ++ (void) ncols; + int res = ERR; + + RIPOFFINIT init = *prip++; +diff -Naur ncurses-5.9.orig/c++/cursesw.h ncurses-5.9/c++/cursesw.h +--- ncurses-5.9.orig/c++/cursesw.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/cursesw.h 2012-08-25 19:57:59.903231901 +0000 +@@ -1,7 +1,7 @@ + // * This makes emacs happy -*-Mode: C++;-*- + // vile:cppmode + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + #ifndef NCURSES_CURSESW_H_incl + #define NCURSES_CURSESW_H_incl 1 + +-// $Id: cursesw.h,v 1.48 2008/01/19 21:09:10 tom Exp $ ++// $Id: cursesw.h,v 1.49 2011/09/17 22:12:10 tom Exp $ + + #include <etip.h> + +@@ -1438,16 +1438,19 @@ + // The driver translates the keystroke c into an Pad_Request + + virtual void OnUnknownOperation(int pad_req) { ++ (void) pad_req; + ::beep(); + } + // This is called if the driver returns an unknown op-code + + virtual void OnNavigationError(int pad_req) { ++ (void) pad_req; + ::beep(); + } + // This is called if a navigation request couldn't be satisfied + + virtual void OnOperation(int pad_req) { ++ (void) pad_req; + }; + // OnOperation is called if a Pad_Operation was executed and just before + // the refresh() operation is done. +@@ -1542,11 +1545,15 @@ + } + + void setWindow(NCursesWindow& view, int v_grid = 1, int h_grid = 1) { ++ (void) view; ++ (void) v_grid; ++ (void) h_grid; + err_handler("Operation not allowed"); + } + // Disable this call; the viewport is already defined + + void setSubWindow(NCursesWindow& sub) { ++ (void) sub; + err_handler("Operation not allowed"); + } + // Disable this call; the viewport subwindow is already defined +diff -Naur ncurses-5.9.orig/c++/cursslk.cc ncurses-5.9/c++/cursslk.cc +--- ncurses-5.9.orig/c++/cursslk.cc 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/cursslk.cc 2012-08-25 19:58:00.879893949 +0000 +@@ -1,6 +1,6 @@ + // * this is for making emacs happy: -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2005,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,14 +35,15 @@ + #include "cursslk.h" + #include "cursesapp.h" + +-MODULE_ID("$Id: cursslk.cc,v 1.15 2005/08/06 22:12:36 tom Exp $") ++MODULE_ID("$Id: cursslk.cc,v 1.16 2012/02/23 10:41:56 tom Exp $") + + Soft_Label_Key_Set::Soft_Label_Key& + Soft_Label_Key_Set::Soft_Label_Key::operator=(char *text) + { + delete[] label; +- label = new char[1 + ::strlen(text)]; +- (::strcpy)(label,text); ++ size_t need = 1 + ::strlen(text); ++ label = new char[need]; ++ ::_nc_STRCPY(label,text,need); + return *this; + } + +diff -Naur ncurses-5.9.orig/c++/demo.cc ncurses-5.9/c++/demo.cc +--- ncurses-5.9.orig/c++/demo.cc 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/demo.cc 2012-08-25 19:58:00.879893949 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + * Demo code for NCursesMenu and NCursesForm written by + * Juergen Pfeifer + * +- * $Id: demo.cc,v 1.39 2008/12/07 02:07:34 juergen Exp $ ++ * $Id: demo.cc,v 1.41 2012/02/23 10:41:56 tom Exp $ + */ + + #include "internal.h" +@@ -220,6 +220,7 @@ + int chk; + protected: + bool field_check(NCursesFormField& f) { ++ (void) f; + return TRUE; + } + bool char_check(int c) { +@@ -319,7 +320,7 @@ + for(int i=1; i <= S->labels(); i++) { + char buf[8]; + assert(i < 100); +- ::sprintf(buf, "Frm%02d", i); ++ ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Frm%02d", i); + (*S)[i] = buf; // Text + (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification + } +@@ -539,7 +540,7 @@ + for(int i=1; i <= S.labels(); i++) { + char buf[8]; + assert(i < 100); +- ::sprintf(buf, "Key%02d", i); ++ ::_nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "Key%02d", i); + S[i] = buf; // Text + S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification + } +diff -Naur ncurses-5.9.orig/c++/etip.h.in ncurses-5.9/c++/etip.h.in +--- ncurses-5.9.orig/c++/etip.h.in 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/c++/etip.h.in 2012-08-25 19:57:59.906565219 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + * Author: Juergen Pfeifer, 1997 * + ****************************************************************************/ + +-// $Id: etip.h.in,v 1.37 2008/08/30 19:27:32 tom Exp $ ++// $Id: etip.h.in,v 1.38 2011/10/29 14:01:50 tom Exp $ + + #ifndef NCURSES_ETIP_H_incl + #define NCURSES_ETIP_H_incl 1 +@@ -184,7 +184,7 @@ + + NCursesPanelException (const char *msg, int err) : + NCursesException (msg, err), +- p (NULL) ++ p (0) + {}; + + NCursesPanelException (const NCursesPanel* panel, +@@ -196,7 +196,7 @@ + + NCursesPanelException (int err) : + NCursesException ("panel library error", err), +- p (NULL) ++ p (0) + {}; + + NCursesPanelException (const NCursesPanel* panel, +@@ -235,7 +235,7 @@ + + NCursesMenuException (const char *msg, int err) : + NCursesException (msg, err), +- m (NULL) ++ m (0) + {}; + + NCursesMenuException (const NCursesMenu* menu, +@@ -247,7 +247,7 @@ + + NCursesMenuException (int err) : + NCursesException ("menu library error", err), +- m (NULL) ++ m (0) + {}; + + NCursesMenuException (const NCursesMenu* menu, +@@ -286,7 +286,7 @@ + + NCursesFormException (const char *msg, int err) : + NCursesException (msg, err), +- f (NULL) ++ f (0) + {}; + + NCursesFormException (const NCursesForm* form, +@@ -298,7 +298,7 @@ + + NCursesFormException (int err) : + NCursesException ("form library error", err), +- f (NULL) ++ f (0) + {}; + + NCursesFormException (const NCursesForm* form, +diff -Naur ncurses-5.9.orig/c++/internal.h ncurses-5.9/c++/internal.h +--- ncurses-5.9.orig/c++/internal.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/c++/internal.h 2012-08-25 19:58:00.879893949 +0000 +@@ -1,6 +1,6 @@ + // * This makes emacs happy -*-Mode: C++;-*- + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,7 +31,7 @@ + * Author: Juergen Pfeifer, 1997 * + ****************************************************************************/ + +-// $Id: internal.h,v 1.17 2008/12/07 02:07:34 juergen Exp $ ++// $Id: internal.h,v 1.18 2012/02/23 10:41:56 tom Exp $ + + #ifndef NCURSES_CPLUS_INTERNAL_H + #define NCURSES_CPLUS_INTERNAL_H 1 +@@ -62,4 +62,6 @@ + #define NULL 0 + #endif + ++#include <nc_string.h> ++ + #endif /* NCURSES_CPLUS_INTERNAL_H */ +diff -Naur ncurses-5.9.orig/config.guess ncurses-5.9/config.guess +--- ncurses-5.9.orig/config.guess 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/config.guess 2012-08-25 19:58:00.879893949 +0000 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2010-09-24' ++timestamp='2012-02-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # 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. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -57,8 +55,8 @@ + + Originally written by Per Bothner. + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -92,7 +90,7 @@ + exit 1 + fi + +-trap 'exit 1' HUP INT TERM ++trap 'exit 1' 1 2 15 + + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a + # compiler to aid in system detection is discouraged as it requires +@@ -106,7 +104,7 @@ + + set_cc_for_build=' + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || +@@ -145,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -220,10 +218,10 @@ + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in +- *4.0) ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; +- *5.*) ++ *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac +@@ -270,7 +268,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -326,8 +327,8 @@ + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) +- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit ;; ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +@@ -495,7 +496,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -597,50 +598,50 @@ + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> + +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -789,13 +790,12 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) +@@ -804,6 +804,9 @@ + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 +@@ -820,8 +823,8 @@ + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +- echo ia64-unknown-interix${UNAME_RELEASE} +- exit ;; ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks +@@ -858,15 +861,22 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +@@ -874,30 +884,39 @@ + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build +- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | \ +- grep -q __ARM_EABI__ ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +@@ -934,14 +953,14 @@ + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit ;; ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -969,13 +988,13 @@ + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-tilera-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -1093,7 +1112,7 @@ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1136,8 +1155,8 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel@ccMail.Census.GOV> ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) +@@ -1165,9 +1184,9 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +@@ -1212,12 +1231,12 @@ + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then +- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- UNAME_PROCESSOR="x86_64" +- fi ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac +@@ -1226,8 +1245,8 @@ + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +- UNAME_PROCESSOR=i386 +- UNAME_MACHINE=pc ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; +@@ -1306,6 +1325,9 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +@@ -1328,11 +1350,11 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -Naur ncurses-5.9.orig/config.sub ncurses-5.9/config.sub +--- ncurses-5.9.orig/config.sub 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/config.sub 2012-08-25 19:58:00.879893949 +0000 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2010-09-11' ++timestamp='2012-02-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # 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. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -76,8 +74,8 @@ + GNU config.sub ($timestamp) + + Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +-Software Foundation, Inc. ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -132,6 +130,10 @@ + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -175,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -247,17 +249,22 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ +@@ -283,25 +290,26 @@ + | moxie \ + | mt \ + | msp430 \ +- | nds32 | nds32le | nds32be\ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +@@ -314,8 +322,7 @@ + c6x) + basic_machine=tic6x-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -325,12 +332,27 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) +- basic_machine=$basic_machine-pc +- ;; ++ basic_machine=$basic_machine-pc ++ ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +@@ -339,11 +361,13 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ +@@ -352,8 +376,10 @@ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +@@ -382,24 +408,26 @@ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ +- | tile-* | tilegx-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -539,7 +567,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -697,7 +725,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -794,10 +821,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -950,9 +985,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1046,6 +1082,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1102,13 +1141,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- # This must be matched before tile*. +- tilegx*) +- basic_machine=tilegx-unknown +- os=-linux-gnu +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1178,6 +1212,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1315,7 +1352,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ +@@ -1527,9 +1564,6 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout +diff -Naur ncurses-5.9.orig/configure ncurses-5.9/configure +--- ncurses-5.9.orig/configure 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/configure 2012-08-25 19:58:02.356553633 +0000 +@@ -1,7 +1,7 @@ + #! /bin/sh +-# From configure.in Revision: 1.520 . ++# From configure.in Revision: 1.552 . + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20101002. ++# Generated by Autoconf 2.52.20120811. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -171,15 +171,16 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datarootdir}/info' ++mandir='${datarootdir}/man' + + # Identity of this package. + PACKAGE_NAME= +@@ -230,6 +231,13 @@ + | --da=*) + 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. +@@ -505,7 +513,7 @@ + done + + # Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` +@@ -654,15 +662,16 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] ++ --datarootdir=DIR read-only architecture-independent data [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --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] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --mandir=DIR man documentation [DATAROOTDIR/man] + EOF + + cat <<\EOF +@@ -694,14 +703,15 @@ + --with-rel-version=XXX override derived release version + --with-abi-version=XXX override derived ABI version + --with-system-type=XXX test: override derived host system-type ++ --without-ada suppress check for Ada95, don't build demo + --without-cxx do not adjust ncurses bool to match C++ + --without-cxx-binding do not build C++ binding and demo +- --without-ada suppress check for Ada95, don't build demo + --without-manpages suppress install of manpages + --without-progs suppress build with programs (e.g., tic) + --without-tests suppress build with test-programs + --without-curses-h install curses.h as ncurses.h only + --with-pkg-config{=path} enable/disable use of pkg-config ++ --with-pkg-config-libdir=XXX use given directory for installing pc-files + --enable-pc-files generate and install .pc files for pkg-config + --enable-mixed-case tic should assume mixed-case filenames + --with-install-prefix prefixes actual install-location ($DESTDIR) +@@ -719,6 +729,7 @@ + --with-normal generate normal-libraries (default) + --with-debug generate debug-libraries (default) + --with-profile generate profile-libraries ++ --with-lib-prefix override library-prefix + --with-termlib generate separate terminfo library + --with-ticlib generate separate tic library + --with-gpm use Alessandro Rubini's GPM library +@@ -735,6 +746,7 @@ + --with-hashed-db specify hashed-database library + --with-fallbacks=XXX specify list of fallback terminal descriptions + --without-xterm-new specify if xterm terminfo should be old version ++ --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL + --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo) + --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo) + --disable-big-core assume machine has little memory +@@ -759,6 +771,7 @@ + --with-ospeed=TYPE override type of ospeed variable + --with-mmask-t=TYPE override type of mmask_t + --with-ccharw-max=XXX override size CCHARW_MAX ++ --with-tparm-arg=TYPE override parameter type of tparm + --with-rcs-ids compile-in RCS identifiers + Options to Specify How Manpages are Installed: + --with-manpage-format specify manpage-format: gzip/compress/BSDI/normal and +@@ -796,8 +809,9 @@ + --disable-scroll-hints compile without scroll-hints code + --enable-wgetch-events compile with experimental wgetch-events code + Testing/development Options: +- --enable-echo build: display "compiling" commands (default) ++ --disable-echo display "compiling" commands + --enable-warnings build: turn on GCC compiler warnings ++ --enable-string-hacks work around bogus compiler/loader warnings + --enable-assertions test: turn on generation of assertion code + --with-dmalloc test: use Gray Watson's dmalloc library + --with-dbmalloc test: use Conor Cahill's dbmalloc library +@@ -883,7 +897,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20101002. Invocation command line was ++generated by GNU Autoconf 2.52.20120811. Invocation command line was + + $ $0 $@ + +@@ -1007,7 +1021,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:1010: loading site script $ac_site_file" >&5 ++ { echo "$as_me:1024: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -1018,7 +1032,7 @@ + # 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:1021: loading cache $cache_file" >&5 ++ { echo "$as_me:1035: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -1026,7 +1040,7 @@ + esac + fi + else +- { echo "$as_me:1029: creating cache $cache_file" >&5 ++ { echo "$as_me:1043: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -1042,21 +1056,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:1045: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:1059: 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:1049: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:1063: 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:1055: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:1069: 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:1057: former value: $ac_old_val" >&5 ++ { echo "$as_me:1071: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:1059: current value: $ac_new_val" >&5 ++ { echo "$as_me:1073: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -1075,9 +1089,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:1078: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:1092: 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:1080: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:1094: 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 +@@ -1098,10 +1112,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:1101: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:1115: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:1104: \$? = $ac_status" >&5 ++ echo "$as_me:1118: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1114,7 +1128,7 @@ + + top_builddir=`pwd` + +-echo "$as_me:1117: checking for egrep" >&5 ++echo "$as_me:1131: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1124,11 +1138,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:1127: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:1141: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + +-test -z "$EGREP" && { { echo "$as_me:1131: error: No egrep program found" >&5 ++test -z "$EGREP" && { { echo "$as_me:1145: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -1138,7 +1152,7 @@ + cf_cv_abi_version=${NCURSES_MAJOR} + cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} + cf_cv_timestamp=`date` +-echo "$as_me:1141: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 ++echo "$as_me:1155: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 + echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 + + test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 +@@ -1146,7 +1160,7 @@ + # Check whether --with-rel-version or --without-rel-version was given. + if test "${with_rel_version+set}" = set; then + withval="$with_rel_version" +- { echo "$as_me:1149: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 ++ { echo "$as_me:1163: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} + cf_cv_rel_version=$withval + fi; +@@ -1159,13 +1173,13 @@ + [0-9]*) #(vi + ;; + *) +- { { echo "$as_me:1162: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 ++ { { echo "$as_me:1176: error: Release major-version is not a number: $NCURSES_MAJOR" >&5 + echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:1168: error: Release major-version value is empty" >&5 ++ { { echo "$as_me:1182: error: Release major-version value is empty" >&5 + echo "$as_me: error: Release major-version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1175,13 +1189,13 @@ + [0-9]*) #(vi + ;; + *) +- { { echo "$as_me:1178: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 ++ { { echo "$as_me:1192: error: Release minor-version is not a number: $NCURSES_MINOR" >&5 + echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:1184: error: Release minor-version value is empty" >&5 ++ { { echo "$as_me:1198: error: Release minor-version value is empty" >&5 + echo "$as_me: error: Release minor-version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1191,7 +1205,7 @@ + # Check whether --with-abi-version or --without-abi-version was given. + if test "${with_abi_version+set}" = set; then + withval="$with_abi_version" +- { echo "$as_me:1194: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 ++ { echo "$as_me:1208: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} + cf_cv_abi_version=$withval + fi; +@@ -1201,13 +1215,13 @@ + [0-9]*) #(vi + ;; + *) +- { { echo "$as_me:1204: error: ABI version is not a number: $cf_cv_abi_version" >&5 ++ { { echo "$as_me:1218: error: ABI version is not a number: $cf_cv_abi_version" >&5 + echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + else +- { { echo "$as_me:1210: error: ABI version value is empty" >&5 ++ { { echo "$as_me:1224: error: ABI version value is empty" >&5 + echo "$as_me: error: ABI version value is empty" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1229,7 +1243,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1232: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:1246: 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 +@@ -1239,11 +1253,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1242: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1256: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1246: checking build system type" >&5 ++echo "$as_me:1260: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1252,23 +1266,23 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1255: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1269: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1273: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1264: result: $ac_cv_build" >&5 ++echo "$as_me:1278: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +-echo "$as_me:1271: checking host system type" >&5 ++echo "$as_me:1285: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1277,12 +1291,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1280: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1294: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1285: result: $ac_cv_host" >&5 ++echo "$as_me:1299: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1290,7 +1304,7 @@ + host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +- echo "$as_me:1293: checking target system type" >&5 ++ echo "$as_me:1307: checking target system type" >&5 + echo $ECHO_N "checking target system type... $ECHO_C" >&6 + if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1299,12 +1313,12 @@ + test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias + ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || +- { { echo "$as_me:1302: error: $ac_config_sub $ac_cv_target_alias failed" >&5 ++ { { echo "$as_me:1316: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1307: result: $ac_cv_target" >&5 ++echo "$as_me:1321: result: $ac_cv_target" >&5 + echo "${ECHO_T}$ac_cv_target" >&6 + target=$ac_cv_target + target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1335,13 +1349,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1338: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1352: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1342: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1356: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1344: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1358: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1349,7 +1363,7 @@ + # Check whether --with-system-type or --without-system-type was given. + if test "${with_system_type+set}" = set; then + withval="$with_system_type" +- { echo "$as_me:1352: WARNING: overriding system type to $withval" >&5 ++ { echo "$as_me:1366: WARNING: overriding system type to $withval" >&5 + echo "$as_me: WARNING: overriding system type to $withval" >&2;} + cf_cv_system_name=$withval + fi; +@@ -1359,23 +1373,23 @@ + + ### Default install-location + +-echo "$as_me:1362: checking for prefix" >&5 ++echo "$as_me:1376: checking for prefix" >&5 + echo $ECHO_N "checking for prefix... $ECHO_C" >&6 + if test "x$prefix" = "xNONE" ; then + case "$cf_cv_system_name" in + # non-vendor systems don't have a conflict +- openbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) ++ openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu) + prefix=/usr + ;; + *) prefix=$ac_default_prefix + ;; + esac + fi +-echo "$as_me:1374: result: $prefix" >&5 ++echo "$as_me:1388: result: $prefix" >&5 + echo "${ECHO_T}$prefix" >&6 + + if test "x$prefix" = "xNONE" ; then +-echo "$as_me:1378: checking for default include-directory" >&5 ++echo "$as_me:1392: checking for default include-directory" >&5 + echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 + test -n "$verbose" && echo 1>&6 + for cf_symbol in \ +@@ -1398,11 +1412,26 @@ + fi + test -n "$verbose" && echo " tested $cf_dir" 1>&6 + done +-echo "$as_me:1401: result: $includedir" >&5 ++echo "$as_me:1415: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + fi + + ### Checks for programs. ++ ++# Check whether --with-ada or --without-ada was given. ++if test "${with_ada+set}" = set; then ++ withval="$with_ada" ++ cf_with_ada=$withval ++else ++ cf_with_ada=yes ++fi; ++if test x"$cf_with_ada" = xyes ++then ++ cf_PROG_CC="gnatgcc gcc cc" ++else ++ cf_PROG_CC="gcc cc" ++fi ++ + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -1410,213 +1439,11 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:1415: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}gcc" +-echo "$as_me:1430: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1438: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1441: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "gcc", so it can be a program name with args. +-set dummy gcc; ac_word=$2 +-echo "$as_me:1450: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="gcc" +-echo "$as_me:1465: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1473: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1476: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +-set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:1489: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_CC="${ac_tool_prefix}cc" +-echo "$as_me:1504: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1512: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1515: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$ac_cv_prog_CC"; then +- ac_ct_CC=$CC +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1524: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$ac_ct_CC"; then +- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +-else +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-ac_cv_prog_ac_ct_CC="cc" +-echo "$as_me:1539: found $ac_dir/$ac_word" >&5 +-break +-done +- +-fi +-fi +-ac_ct_CC=$ac_cv_prog_ac_ct_CC +-if test -n "$ac_ct_CC"; then +- echo "$as_me:1547: result: $ac_ct_CC" >&5 +-echo "${ECHO_T}$ac_ct_CC" >&6 +-else +- echo "$as_me:1550: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- CC=$ac_ct_CC +-else +- CC="$ac_cv_prog_CC" +-fi +- +-fi +-if test -z "$CC"; then +- # Extract the first word of "cc", so it can be a program name with args. +-set dummy cc; ac_word=$2 +-echo "$as_me:1563: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_CC+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$CC"; then +- ac_cv_prog_CC="$CC" # Let the user override the test. +-else +- ac_prog_rejected=no +- ac_save_IFS=$IFS; IFS=$ac_path_separator +-ac_dummy="$PATH" +-for ac_dir in $ac_dummy; do +- IFS=$ac_save_IFS +- test -z "$ac_dir" && ac_dir=. +- $as_executable_p "$ac_dir/$ac_word" || continue +-if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +-fi +-ac_cv_prog_CC="cc" +-echo "$as_me:1583: found $ac_dir/$ac_word" >&5 +-break +-done +- +-if test $ac_prog_rejected = yes; then +- # We found a bogon in the path, so make sure we never use it. +- set dummy $ac_cv_prog_CC +- shift +- if test $# != 0; then +- # We chose a different compiler from the bogus one. +- # However, it has the same basename, so the bogon will be chosen +- # first if we set CC to just the basename; use the full file name. +- shift +- set dummy "$ac_dir/$ac_word" ${1+"$@"} +- shift +- ac_cv_prog_CC="$@" +- fi +-fi +-fi +-fi +-CC=$ac_cv_prog_CC +-if test -n "$CC"; then +- echo "$as_me:1605: result: $CC" >&5 +-echo "${ECHO_T}$CC" >&6 +-else +- echo "$as_me:1608: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +-fi +-if test -z "$CC"; then +- if test -n "$ac_tool_prefix"; then +- for ac_prog in cl ++ for ac_prog in $cf_PROG_CC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1619: checking for $ac_word" >&5 ++echo "$as_me:1446: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1631,7 +1458,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +-echo "$as_me:1634: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1461: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1639,10 +1466,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1642: result: $CC" >&5 ++ echo "$as_me:1469: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1645: result: no" >&5 ++ echo "$as_me:1472: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1651,11 +1478,11 @@ + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in cl ++ for ac_prog in $cf_PROG_CC + 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:1658: checking for $ac_word" >&5 ++echo "$as_me:1485: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1670,7 +1497,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="$ac_prog" +-echo "$as_me:1673: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1500: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1678,10 +1505,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1681: result: $ac_ct_CC" >&5 ++ echo "$as_me:1508: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1684: result: no" >&5 ++ echo "$as_me:1511: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1691,34 +1518,32 @@ + CC=$ac_ct_CC + fi + +-fi +- +-test -z "$CC" && { { echo "$as_me:1696: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1521: error: no acceptable cc found in \$PATH" >&5 + echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:1701:" \ ++echo "$as_me:1526:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1704: \"$ac_compiler --version </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1529: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1707: \$? = $ac_status" >&5 ++ echo "$as_me:1532: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1709: \"$ac_compiler -v </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1534: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1712: \$? = $ac_status" >&5 ++ echo "$as_me:1537: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1714: \"$ac_compiler -V </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1539: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1717: \$? = $ac_status" >&5 ++ echo "$as_me:1542: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1721 "configure" ++#line 1546 "configure" + #include "confdefs.h" + + int +@@ -1734,13 +1559,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1737: checking for C compiler default output" >&5 ++echo "$as_me:1562: checking for C compiler default output" >&5 + echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1740: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1565: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1743: \$? = $ac_status" >&5 ++ echo "$as_me:1568: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1763,34 +1588,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1766: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1591: error: C compiler cannot create executables" >&5 + echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:1772: result: $ac_file" >&5 ++echo "$as_me:1597: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1777: checking whether the C compiler works" >&5 ++echo "$as_me:1602: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:1783: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1608: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1786: \$? = $ac_status" >&5 ++ echo "$as_me:1611: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1793: error: cannot run C compiled programs. ++ { { echo "$as_me:1618: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1798,24 +1623,24 @@ + fi + fi + fi +-echo "$as_me:1801: result: yes" >&5 ++echo "$as_me:1626: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + + rm -f a.out a.exe conftest$ac_cv_exeext + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1808: checking whether we are cross compiling" >&5 ++echo "$as_me:1633: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1810: result: $cross_compiling" >&5 ++echo "$as_me:1635: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1813: checking for executable suffix" >&5 ++echo "$as_me:1638: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1815: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1640: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1818: \$? = $ac_status" >&5 ++ echo "$as_me:1643: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1831,25 +1656,25 @@ + esac + done + else +- { { echo "$as_me:1834: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1659: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:1840: result: $ac_cv_exeext" >&5 ++echo "$as_me:1665: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:1846: checking for object suffix" >&5 ++echo "$as_me:1671: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1852 "configure" ++#line 1677 "configure" + #include "confdefs.h" + + int +@@ -1861,10 +1686,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1864: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1867: \$? = $ac_status" >&5 ++ echo "$as_me:1692: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1876,24 +1701,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1879: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1704: error: cannot compute OBJEXT: cannot compile" >&5 + echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:1886: result: $ac_cv_objext" >&5 ++echo "$as_me:1711: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1890: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1715: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1896 "configure" ++#line 1721 "configure" + #include "confdefs.h" + + int +@@ -1908,16 +1733,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1911: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1736: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1914: \$? = $ac_status" >&5 ++ echo "$as_me:1739: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1917: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1742: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1920: \$? = $ac_status" >&5 ++ echo "$as_me:1745: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1929,19 +1754,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1932: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1757: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" +-echo "$as_me:1938: checking whether $CC accepts -g" >&5 ++echo "$as_me:1763: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1944 "configure" ++#line 1769 "configure" + #include "confdefs.h" + + int +@@ -1953,16 +1778,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1959: \$? = $ac_status" >&5 ++ echo "$as_me:1784: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1787: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1965: \$? = $ac_status" >&5 ++ echo "$as_me:1790: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1972,7 +1797,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1975: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1800: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -1999,16 +1824,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2002: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2005: \$? = $ac_status" >&5 ++ echo "$as_me:1830: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1833: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2011: \$? = $ac_status" >&5 ++ echo "$as_me:1836: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -2020,7 +1845,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 2023 "configure" ++#line 1848 "configure" + #include "confdefs.h" + #include <stdlib.h> + $ac_declaration +@@ -2033,16 +1858,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2036: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1861: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2039: \$? = $ac_status" >&5 ++ echo "$as_me:1864: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2042: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1867: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2045: \$? = $ac_status" >&5 ++ echo "$as_me:1870: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -2052,7 +1877,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 2055 "configure" ++#line 1880 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -2064,16 +1889,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2067: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2070: \$? = $ac_status" >&5 ++ echo "$as_me:1895: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2073: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2076: \$? = $ac_status" >&5 ++ echo "$as_me:1901: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -2103,11 +1928,11 @@ + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:2106: checking version of $CC" >&5 ++ echo "$as_me:1931: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:2110: result: $GCC_VERSION" >&5 ++ echo "$as_me:1935: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + +@@ -2117,7 +1942,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return +-echo "$as_me:2120: checking how to run the C preprocessor" >&5 ++echo "$as_me:1945: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -2138,18 +1963,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 2141 "configure" ++#line 1966 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:2146: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1971: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2152: \$? = $ac_status" >&5 ++ echo "$as_me:1977: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2172,17 +1997,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2175 "configure" ++#line 2000 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:2179: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2004: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2185: \$? = $ac_status" >&5 ++ echo "$as_me:2010: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2219,7 +2044,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:2222: result: $CPP" >&5 ++echo "$as_me:2047: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -2229,18 +2054,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 2232 "configure" ++#line 2057 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:2237: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2062: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2243: \$? = $ac_status" >&5 ++ echo "$as_me:2068: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2263,17 +2088,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2266 "configure" ++#line 2091 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:2270: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:2095: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2276: \$? = $ac_status" >&5 ++ echo "$as_me:2101: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2301,7 +2126,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2304: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2129: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2314,14 +2139,14 @@ + ac_main_return=return + + if test $ac_cv_c_compiler_gnu = yes; then +- echo "$as_me:2317: checking whether $CC needs -traditional" >&5 ++ echo "$as_me:2142: checking whether $CC needs -traditional" >&5 + echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 + if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_pattern="Autoconf.*'x'" + cat >conftest.$ac_ext <<_ACEOF +-#line 2324 "configure" ++#line 2149 "configure" + #include "confdefs.h" + #include <sgtty.h> + int Autoconf = TIOCGETP; +@@ -2336,7 +2161,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +-#line 2339 "configure" ++#line 2164 "configure" + #include "confdefs.h" + #include <termio.h> + int Autoconf = TCGETA; +@@ -2349,14 +2174,14 @@ + + fi + fi +-echo "$as_me:2352: result: $ac_cv_prog_gcc_traditional" >&5 ++echo "$as_me:2177: result: $ac_cv_prog_gcc_traditional" >&5 + echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi + fi + +-echo "$as_me:2359: checking whether $CC understands -c and -o together" >&5 ++echo "$as_me:2184: checking whether $CC understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CC_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2372,15 +2197,15 @@ + # 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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:2375: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:2200: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2378: \$? = $ac_status" >&5 ++ echo "$as_me:2203: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:2380: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:2205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2383: \$? = $ac_status" >&5 ++ echo "$as_me:2208: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CC_c_o=yes +@@ -2391,19 +2216,19 @@ + + fi + if test $cf_cv_prog_CC_c_o = yes; then +- echo "$as_me:2394: result: yes" >&5 ++ echo "$as_me:2219: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:2397: result: no" >&5 ++ echo "$as_me:2222: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:2401: checking for POSIXized ISC" >&5 ++echo "$as_me:2226: checking for POSIXized ISC" >&5 + echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +- echo "$as_me:2406: result: yes" >&5 ++ echo "$as_me:2231: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + ISC=yes # If later tests want to check for ISC. + +@@ -2417,12 +2242,115 @@ + CC="$CC -Xp" + fi + else +- echo "$as_me:2420: result: no" >&5 ++ echo "$as_me:2245: result: no" >&5 + echo "${ECHO_T}no" >&6 + ISC= + fi + +-echo "$as_me:2425: checking for ${CC:-cc} option to accept ANSI C" >&5 ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++echo "$as_me:2256: checking \$CC variable" >&5 ++echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 ++case "$CC" in #(vi ++*[\ \ ]-[IUD]*) ++ echo "$as_me:2260: result: broken" >&5 ++echo "${ECHO_T}broken" >&6 ++ { echo "$as_me:2262: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` ++ CC=`echo "$CC" | sed -e 's/[ ].*//'` ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_flags ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++ ;; ++*) ++ echo "$as_me:2348: result: ok" >&5 ++echo "${ECHO_T}ok" >&6 ++ ;; ++esac ++ ++echo "$as_me:2353: checking for ${CC:-cc} option to accept ANSI C" >&5 + echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 + if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2526,7 +2454,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 2529 "configure" ++#line 2457 "configure" + #include "confdefs.h" + + #ifndef CC_HAS_PROTOS +@@ -2547,16 +2475,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2550: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2478: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2553: \$? = $ac_status" >&5 ++ echo "$as_me:2481: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2556: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2484: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2559: \$? = $ac_status" >&5 ++ echo "$as_me:2487: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ansi_cc="$cf_arg"; break + else +@@ -2569,7 +2497,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2572: result: $cf_cv_ansi_cc" >&5 ++echo "$as_me:2500: result: $cf_cv_ansi_cc" >&5 + echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + + if test "$cf_cv_ansi_cc" != "no"; then +@@ -2662,7 +2590,7 @@ + fi + + if test "$cf_cv_ansi_cc" = "no"; then +- { { echo "$as_me:2665: error: Your compiler does not appear to recognize prototypes. ++ { { echo "$as_me:2593: error: Your compiler does not appear to recognize prototypes. + You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler +@@ -2696,13 +2624,13 @@ + LDCONFIG=: + else + case "$cf_cv_system_name" in #(vi +-dragonfly*|freebsd*) #(vi ++dragonfly*|mirbsd*|freebsd*) #(vi + test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R" + ;; + *) LDPATH=$PATH:/sbin:/usr/sbin + # Extract the first word of "ldconfig", so it can be a program name with args. + set dummy ldconfig; ac_word=$2 +-echo "$as_me:2705: checking for $ac_word" >&5 ++echo "$as_me:2633: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_LDCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2719,7 +2647,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_LDCONFIG="$ac_dir/$ac_word" +- echo "$as_me:2722: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:2650: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -2730,10 +2658,10 @@ + LDCONFIG=$ac_cv_path_LDCONFIG + + if test -n "$LDCONFIG"; then +- echo "$as_me:2733: result: $LDCONFIG" >&5 ++ echo "$as_me:2661: result: $LDCONFIG" >&5 + echo "${ECHO_T}$LDCONFIG" >&6 + else +- echo "$as_me:2736: result: no" >&5 ++ echo "$as_me:2664: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2741,7 +2669,7 @@ + esac + fi + +-echo "$as_me:2744: checking if you want to ensure bool is consistent with C++" >&5 ++echo "$as_me:2672: checking if you want to ensure bool is consistent with C++" >&5 + echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6 + + # Check whether --with-cxx or --without-cxx was given. +@@ -2751,7 +2679,7 @@ + else + cf_with_cxx=yes + fi; +-echo "$as_me:2754: result: $cf_with_cxx" >&5 ++echo "$as_me:2682: result: $cf_with_cxx" >&5 + echo "${ECHO_T}$cf_with_cxx" >&6 + if test "X$cf_with_cxx" = Xno ; then + CXX="" +@@ -2769,7 +2697,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:2772: checking for $ac_word" >&5 ++echo "$as_me:2700: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2784,7 +2712,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" +-echo "$as_me:2787: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2715: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2792,10 +2720,10 @@ + fi + CXX=$ac_cv_prog_CXX + if test -n "$CXX"; then +- echo "$as_me:2795: result: $CXX" >&5 ++ echo "$as_me:2723: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:2798: result: no" >&5 ++ echo "$as_me:2726: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2808,7 +2736,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 "$as_me:2811: checking for $ac_word" >&5 ++echo "$as_me:2739: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2823,7 +2751,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CXX="$ac_prog" +-echo "$as_me:2826: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2754: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2831,10 +2759,10 @@ + fi + ac_ct_CXX=$ac_cv_prog_ac_ct_CXX + if test -n "$ac_ct_CXX"; then +- echo "$as_me:2834: result: $ac_ct_CXX" >&5 ++ echo "$as_me:2762: result: $ac_ct_CXX" >&5 + echo "${ECHO_T}$ac_ct_CXX" >&6 + else +- echo "$as_me:2837: result: no" >&5 ++ echo "$as_me:2765: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2846,32 +2774,32 @@ + fi + + # Provide some information about the compiler. +-echo "$as_me:2849:" \ ++echo "$as_me:2777:" \ + "checking for C++ compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:2852: \"$ac_compiler --version </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:2780: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:2855: \$? = $ac_status" >&5 ++ echo "$as_me:2783: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:2857: \"$ac_compiler -v </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:2785: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:2860: \$? = $ac_status" >&5 ++ echo "$as_me:2788: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:2862: \"$ac_compiler -V </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:2790: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:2865: \$? = $ac_status" >&5 ++ echo "$as_me:2793: \$? = $ac_status" >&5 + (exit $ac_status); } + +-echo "$as_me:2868: checking whether we are using the GNU C++ compiler" >&5 ++echo "$as_me:2796: checking whether we are using the GNU C++ compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 + if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 2874 "configure" ++#line 2802 "configure" + #include "confdefs.h" + + int +@@ -2886,16 +2814,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2889: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2892: \$? = $ac_status" >&5 ++ echo "$as_me:2820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2895: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2898: \$? = $ac_status" >&5 ++ echo "$as_me:2826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -2907,19 +2835,19 @@ + ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:2910: result: $ac_cv_cxx_compiler_gnu" >&5 ++echo "$as_me:2838: result: $ac_cv_cxx_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 + GXX=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CXXFLAGS=${CXXFLAGS+set} + ac_save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="-g" +-echo "$as_me:2916: checking whether $CXX accepts -g" >&5 ++echo "$as_me:2844: checking whether $CXX accepts -g" >&5 + echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 2922 "configure" ++#line 2850 "configure" + #include "confdefs.h" + + int +@@ -2931,16 +2859,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2934: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2862: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2937: \$? = $ac_status" >&5 ++ echo "$as_me:2865: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2940: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2868: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2943: \$? = $ac_status" >&5 ++ echo "$as_me:2871: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes + else +@@ -2950,7 +2878,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:2953: result: $ac_cv_prog_cxx_g" >&5 ++echo "$as_me:2881: result: $ac_cv_prog_cxx_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +@@ -2977,7 +2905,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 2980 "configure" ++#line 2908 "configure" + #include "confdefs.h" + #include <stdlib.h> + $ac_declaration +@@ -2990,16 +2918,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2993: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2921: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2996: \$? = $ac_status" >&5 ++ echo "$as_me:2924: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2999: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2927: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3002: \$? = $ac_status" >&5 ++ echo "$as_me:2930: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3009,7 +2937,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 3012 "configure" ++#line 2940 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -3021,16 +2949,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3027: \$? = $ac_status" >&5 ++ echo "$as_me:2955: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3030: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2958: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3033: \$? = $ac_status" >&5 ++ echo "$as_me:2961: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -3053,11 +2981,11 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +- # autoconf 2.5x removed the error - by hardcoding it to g++. ++ # autoconf 2.5x removed the error (hardcoding it to g++, or just blank) + if test "$CXX" = "g++" ; then + # Extract the first word of "g++", so it can be a program name with args. + set dummy g++; ac_word=$2 +-echo "$as_me:3060: checking for $ac_word" >&5 ++echo "$as_me:2988: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3074,7 +3002,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_CXX="$ac_dir/$ac_word" +- echo "$as_me:3077: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3005: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3085,28 +3013,30 @@ + CXX=$ac_cv_path_CXX + + if test -n "$CXX"; then +- echo "$as_me:3088: result: $CXX" >&5 ++ echo "$as_me:3016: result: $CXX" >&5 + echo "${ECHO_T}$CXX" >&6 + else +- echo "$as_me:3091: result: no" >&5 ++ echo "$as_me:3019: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi +- if test "$CXX" = "g++" ; then +- { echo "$as_me:3097: WARNING: ignoring hardcoded g++" >&5 +-echo "$as_me: WARNING: ignoring hardcoded g++" >&2;} ++ case "x$CXX" in #(vi ++ x|xg++) ++ { echo "$as_me:3026: WARNING: You don't have any C++ compiler, too bad" >&5 ++echo "$as_me: WARNING: You don't have any C++ compiler, too bad" >&2;} + cf_with_cxx=no; CXX=""; GXX=""; +- fi ++ ;; ++ esac + fi + + GXX_VERSION=none + if test "$GXX" = yes; then +- echo "$as_me:3105: checking version of g++" >&5 +-echo $ECHO_N "checking version of g++... $ECHO_C" >&6 ++ echo "$as_me:3035: checking version of ${CXX:-g++}" >&5 ++echo $ECHO_N "checking version of ${CXX:-g++}... $ECHO_C" >&6 + GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GXX_VERSION" && GXX_VERSION=unknown +- echo "$as_me:3109: result: $GXX_VERSION" >&5 ++ echo "$as_me:3039: result: $GXX_VERSION" >&5 + echo "${ECHO_T}$GXX_VERSION" >&6 + fi + +@@ -3114,12 +3044,12 @@ + 1*|2.[0-6]*) + # GXX=""; CXX=""; ac_cv_prog_gxx=no + # cf_cxx_library=no +- { echo "$as_me:3117: WARNING: templates do not work" >&5 ++ { echo "$as_me:3047: WARNING: templates do not work" >&5 + echo "$as_me: WARNING: templates do not work" >&2;} + ;; + esac + +-echo "$as_me:3122: checking if you want to build C++ binding and demo" >&5 ++echo "$as_me:3052: checking if you want to build C++ binding and demo" >&5 + echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6 + + # Check whether --with-cxx-binding or --without-cxx-binding was given. +@@ -3129,23 +3059,15 @@ + else + cf_with_cxx_binding=$cf_with_cxx + fi; +-echo "$as_me:3132: result: $cf_with_cxx_binding" >&5 ++echo "$as_me:3062: result: $cf_with_cxx_binding" >&5 + echo "${ECHO_T}$cf_with_cxx_binding" >&6 + +-echo "$as_me:3135: checking if you want to build with Ada95" >&5 ++echo "$as_me:3065: checking if you want to build with Ada95" >&5 + echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6 +- +-# Check whether --with-ada or --without-ada was given. +-if test "${with_ada+set}" = set; then +- withval="$with_ada" +- cf_with_ada=$withval +-else +- cf_with_ada=yes +-fi; +-echo "$as_me:3145: result: $cf_with_ada" >&5 ++echo "$as_me:3067: result: $cf_with_ada" >&5 + echo "${ECHO_T}$cf_with_ada" >&6 + +-echo "$as_me:3148: checking if you want to install manpages" >&5 ++echo "$as_me:3070: checking if you want to install manpages" >&5 + echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6 + + # Check whether --with-manpages or --without-manpages was given. +@@ -3155,10 +3077,10 @@ + else + cf_with_manpages=yes + fi; +-echo "$as_me:3158: result: $cf_with_manpages" >&5 ++echo "$as_me:3080: result: $cf_with_manpages" >&5 + echo "${ECHO_T}$cf_with_manpages" >&6 + +-echo "$as_me:3161: checking if you want to build programs such as tic" >&5 ++echo "$as_me:3083: checking if you want to build programs such as tic" >&5 + echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6 + + # Check whether --with-progs or --without-progs was given. +@@ -3168,10 +3090,10 @@ + else + cf_with_progs=yes + fi; +-echo "$as_me:3171: result: $cf_with_progs" >&5 ++echo "$as_me:3093: result: $cf_with_progs" >&5 + echo "${ECHO_T}$cf_with_progs" >&6 + +-echo "$as_me:3174: checking if you want to build test-programs" >&5 ++echo "$as_me:3096: checking if you want to build test-programs" >&5 + echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 + + # Check whether --with-tests or --without-tests was given. +@@ -3181,10 +3103,10 @@ + else + cf_with_tests=yes + fi; +-echo "$as_me:3184: result: $cf_with_tests" >&5 ++echo "$as_me:3106: result: $cf_with_tests" >&5 + echo "${ECHO_T}$cf_with_tests" >&6 + +-echo "$as_me:3187: checking if you wish to install curses.h" >&5 ++echo "$as_me:3109: checking if you wish to install curses.h" >&5 + echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6 + + # Check whether --with-curses-h or --without-curses-h was given. +@@ -3194,7 +3116,7 @@ + else + with_curses_h=yes + fi; +-echo "$as_me:3197: result: $with_curses_h" >&5 ++echo "$as_me:3119: result: $with_curses_h" >&5 + echo "${ECHO_T}$with_curses_h" >&6 + + modules_to_build="ncurses" +@@ -3220,7 +3142,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 "$as_me:3223: checking for $ac_word" >&5 ++echo "$as_me:3145: 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 +@@ -3235,7 +3157,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:3238: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3160: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3243,21 +3165,21 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:3246: result: $AWK" >&5 ++ echo "$as_me:3168: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:3249: result: no" >&5 ++ echo "$as_me:3171: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$AWK" && break + done + +-test -z "$AWK" && { { echo "$as_me:3256: error: No awk program found" >&5 ++test -z "$AWK" && { { echo "$as_me:3178: error: No awk program found" >&5 + echo "$as_me: error: No awk program found" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:3260: checking for egrep" >&5 ++echo "$as_me:3182: checking for egrep" >&5 + echo $ECHO_N "checking for egrep... $ECHO_C" >&6 + if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3267,11 +3189,11 @@ + else ac_cv_prog_egrep='egrep' + fi + fi +-echo "$as_me:3270: result: $ac_cv_prog_egrep" >&5 ++echo "$as_me:3192: result: $ac_cv_prog_egrep" >&5 + echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + +-test -z "$EGREP" && { { echo "$as_me:3274: error: No egrep program found" >&5 ++test -z "$EGREP" && { { echo "$as_me:3196: error: No egrep program found" >&5 + echo "$as_me: error: No egrep program found" >&2;} + { (exit 1); exit 1; }; } + +@@ -3287,7 +3209,7 @@ + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:3290: checking for a BSD compatible install" >&5 ++echo "$as_me:3212: 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 +@@ -3336,7 +3258,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:3339: result: $INSTALL" >&5 ++echo "$as_me:3261: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -3361,7 +3283,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 "$as_me:3364: checking for $ac_word" >&5 ++echo "$as_me:3286: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LINT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3376,7 +3298,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:3379: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3301: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3384,28 +3306,28 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:3387: result: $LINT" >&5 ++ echo "$as_me:3309: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:3390: result: no" >&5 ++ echo "$as_me:3312: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$LINT" && break + done + +-echo "$as_me:3397: checking whether ln -s works" >&5 ++echo "$as_me:3319: checking whether ln -s works" >&5 + echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 + LN_S=$as_ln_s + if test "$LN_S" = "ln -s"; then +- echo "$as_me:3401: result: yes" >&5 ++ echo "$as_me:3323: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:3404: result: no, using $LN_S" >&5 ++ echo "$as_me:3326: result: no, using $LN_S" >&5 + echo "${ECHO_T}no, using $LN_S" >&6 + fi + +-echo "$as_me:3408: checking if $LN_S -f options work" >&5 ++echo "$as_me:3330: checking if $LN_S -f options work" >&5 + echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 + + rm -f conf$$.src conf$$dst +@@ -3417,12 +3339,12 @@ + cf_prog_ln_sf=no + fi + rm -f conf$$.dst conf$$src +-echo "$as_me:3420: result: $cf_prog_ln_sf" >&5 ++echo "$as_me:3342: result: $cf_prog_ln_sf" >&5 + echo "${ECHO_T}$cf_prog_ln_sf" >&6 + + test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" + +-echo "$as_me:3425: checking for long file names" >&5 ++echo "$as_me:3347: checking for long file names" >&5 + echo $ECHO_N "checking for long file names... $ECHO_C" >&6 + if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3461,7 +3383,7 @@ + rm -rf $ac_xdir 2>/dev/null + done + fi +-echo "$as_me:3464: result: $ac_cv_sys_long_file_names" >&5 ++echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5 + echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 + if test $ac_cv_sys_long_file_names = yes; then + +@@ -3473,7 +3395,7 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + +-echo "$as_me:3476: checking if you want to use pkg-config" >&5 ++echo "$as_me:3398: checking if you want to use pkg-config" >&5 + echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 + + # Check whether --with-pkg-config or --without-pkg-config was given. +@@ -3483,7 +3405,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:3486: result: $cf_pkg_config" >&5 ++echo "$as_me:3408: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in #(vi +@@ -3491,10 +3413,11 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- if test -n "$ac_tool_prefix"; then ++ ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-echo "$as_me:3497: checking for $ac_word" >&5 ++echo "$as_me:3420: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3511,7 +3434,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:3514: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3437: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3522,10 +3445,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:3525: result: $PKG_CONFIG" >&5 ++ echo "$as_me:3448: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:3528: result: no" >&5 ++ echo "$as_me:3451: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3534,7 +3457,7 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:3537: checking for $ac_word" >&5 ++echo "$as_me:3460: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3551,7 +3474,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:3554: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:3477: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -3563,10 +3486,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:3566: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:3489: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:3569: result: no" >&5 ++ echo "$as_me:3492: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3597,7 +3520,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) +@@ -3609,7 +3532,7 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:3612: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:3535: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -3617,16 +3540,51 @@ + + fi + +-if test "$PKG_CONFIG" != no ; then +- echo "$as_me:3621: checking if we should install .pc files for $PKG_CONFIG" >&5 +-echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 ++if test "$PKG_CONFIG" != none ; then ++ echo "$as_me:3544: checking for $PKG_CONFIG library directory" >&5 ++echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 + +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then ++# Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. ++if test "${with_pkg_config_libdir+set}" = set; then ++ withval="$with_pkg_config_libdir" ++ PKG_CONFIG_LIBDIR=$withval ++else ++ PKG_CONFIG_LIBDIR=yes ++fi; ++ ++ case x$PKG_CONFIG_LIBDIR in #(vi ++ x/*) #(vi ++ ;; ++ xyes) #(vi ++ # look for the library directory using the same prefix as the executable ++ cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` ++ case x`(arch) 2>/dev/null` in #(vi ++ *64) #(vi ++ for cf_config in $cf_path/share $cf_path/lib64 $cf_path/lib32 $cf_path/lib ++ do ++ if test -d $cf_config/pkgconfig ++ then ++ PKG_CONFIG_LIBDIR=$cf_config/pkgconfig ++ break ++ fi ++ done ++ ;; ++ *) ++ PKG_CONFIG_LIBDIR=$cf_path/lib/pkgconfig ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ++ echo "$as_me:3581: result: $PKG_CONFIG_LIBDIR" >&5 ++echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 ++fi ++ ++if test "$PKG_CONFIG" != none ; then ++ echo "$as_me:3586: checking if we should install .pc files for $PKG_CONFIG" >&5 ++echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 + + # Check whether --enable-pc-files or --disable-pc-files was given. + if test "${enable_pc_files+set}" = set; then +@@ -3635,18 +3593,48 @@ + else + enable_pc_files=no + fi; +- echo "$as_me:3638: result: $enable_pc_files" >&5 ++ echo "$as_me:3596: result: $enable_pc_files" >&5 + echo "${ECHO_T}$enable_pc_files" >&6 +- else +- echo "$as_me:3641: result: no" >&5 +-echo "${ECHO_T}no" >&6 +- { echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 +-echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} +- enable_pc_files=no ++ if test "$enable_pc_files" != no ++ then ++ ++if test "x$prefix" != xNONE; then ++ cf_path_syntax="$prefix" ++else ++ cf_path_syntax="$ac_default_prefix" ++fi ++ ++case ".$PKG_CONFIG_LIBDIR" in #(vi ++.\$\(*\)*|.\'*\'*) #(vi ++ ;; ++..|./*|.\\*) #(vi ++ ;; ++.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ++ ;; ++.\${*prefix}*|.\${*dir}*) #(vi ++ eval PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR" ++ case ".$PKG_CONFIG_LIBDIR" in #(vi ++ .NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++ esac ++ ;; #(vi ++.no|.NONE/*) ++ PKG_CONFIG_LIBDIR=`echo $PKG_CONFIG_LIBDIR | sed -e s%NONE%$cf_path_syntax%` ++ ;; ++*) ++ { { echo "$as_me:3626: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&5 ++echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG_LIBDIR\"" >&2;} ++ { (exit 1); exit 1; }; } ++ ;; ++esac ++ + fi ++else ++ enable_pc_files=no + fi + +-echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5 ++echo "$as_me:3637: checking if we should assume mixed-case filenames" >&5 + echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 + + # Check whether --enable-mixed-case or --disable-mixed-case was given. +@@ -3656,11 +3644,11 @@ + else + enable_mixedcase=auto + fi; +-echo "$as_me:3659: result: $enable_mixedcase" >&5 ++echo "$as_me:3647: result: $enable_mixedcase" >&5 + echo "${ECHO_T}$enable_mixedcase" >&6 + if test "$enable_mixedcase" = "auto" ; then + +-echo "$as_me:3663: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:3651: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3687,7 +3675,7 @@ + fi + + fi +-echo "$as_me:3690: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:3678: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF + #define MIXEDCASE_FILENAMES 1 +@@ -3704,7 +3692,7 @@ + fi + + # do this after mixed-case option (tags/TAGS is not as important as tic). +-echo "$as_me:3707: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:3695: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -3724,11 +3712,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:3727: result: yes" >&5 ++ echo "$as_me:3715: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:3731: result: no" >&5 ++ echo "$as_me:3719: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -3737,7 +3725,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 "$as_me:3740: checking for $ac_word" >&5 ++echo "$as_me:3728: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3752,7 +3740,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:3755: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3743: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3760,10 +3748,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:3763: result: $CTAGS" >&5 ++ echo "$as_me:3751: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:3766: result: no" >&5 ++ echo "$as_me:3754: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3774,7 +3762,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 "$as_me:3777: checking for $ac_word" >&5 ++echo "$as_me:3765: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3789,7 +3777,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:3792: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3780: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3797,10 +3785,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:3800: result: $ETAGS" >&5 ++ echo "$as_me:3788: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:3803: result: no" >&5 ++ echo "$as_me:3791: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3809,7 +3797,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:3812: checking for $ac_word" >&5 ++echo "$as_me:3800: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3824,7 +3812,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:3827: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3815: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3833,17 +3821,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:3836: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:3824: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:3839: result: no" >&5 ++ echo "$as_me:3827: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:3846: checking for $ac_word" >&5 ++echo "$as_me:3834: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3858,7 +3846,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:3861: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3849: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3867,10 +3855,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:3870: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:3858: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:3873: result: no" >&5 ++ echo "$as_me:3861: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3890,7 +3878,7 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:3893: checking for makeflags variable" >&5 ++echo "$as_me:3881: checking for makeflags variable" >&5 + echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 + if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3924,13 +3912,13 @@ + rm -f cf_makeflags.tmp + + fi +-echo "$as_me:3927: result: $cf_cv_makeflags" >&5 ++echo "$as_me:3915: result: $cf_cv_makeflags" >&5 + echo "${ECHO_T}$cf_cv_makeflags" >&6 + + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:3933: checking for $ac_word" >&5 ++echo "$as_me:3921: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3945,7 +3933,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +-echo "$as_me:3948: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3936: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3953,10 +3941,10 @@ + fi + RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$as_me:3956: result: $RANLIB" >&5 ++ echo "$as_me:3944: result: $RANLIB" >&5 + echo "${ECHO_T}$RANLIB" >&6 + else +- echo "$as_me:3959: result: no" >&5 ++ echo "$as_me:3947: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -3965,7 +3953,7 @@ + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 +-echo "$as_me:3968: checking for $ac_word" >&5 ++echo "$as_me:3956: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3980,7 +3968,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_RANLIB="ranlib" +-echo "$as_me:3983: found $ac_dir/$ac_word" >&5 ++echo "$as_me:3971: found $ac_dir/$ac_word" >&5 + break + done + +@@ -3989,10 +3977,10 @@ + fi + ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB + if test -n "$ac_ct_RANLIB"; then +- echo "$as_me:3992: result: $ac_ct_RANLIB" >&5 ++ echo "$as_me:3980: result: $ac_ct_RANLIB" >&5 + echo "${ECHO_T}$ac_ct_RANLIB" >&6 + else +- echo "$as_me:3995: result: no" >&5 ++ echo "$as_me:3983: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4004,7 +3992,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. + set dummy ${ac_tool_prefix}ld; ac_word=$2 +-echo "$as_me:4007: checking for $ac_word" >&5 ++echo "$as_me:3995: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4019,7 +4007,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LD="${ac_tool_prefix}ld" +-echo "$as_me:4022: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4010: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4027,10 +4015,10 @@ + fi + LD=$ac_cv_prog_LD + if test -n "$LD"; then +- echo "$as_me:4030: result: $LD" >&5 ++ echo "$as_me:4018: result: $LD" >&5 + echo "${ECHO_T}$LD" >&6 + else +- echo "$as_me:4033: result: no" >&5 ++ echo "$as_me:4021: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4039,7 +4027,7 @@ + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. + set dummy ld; ac_word=$2 +-echo "$as_me:4042: checking for $ac_word" >&5 ++echo "$as_me:4030: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4054,7 +4042,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_LD="ld" +-echo "$as_me:4057: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4045: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4063,10 +4051,10 @@ + fi + ac_ct_LD=$ac_cv_prog_ac_ct_LD + if test -n "$ac_ct_LD"; then +- echo "$as_me:4066: result: $ac_ct_LD" >&5 ++ echo "$as_me:4054: result: $ac_ct_LD" >&5 + echo "${ECHO_T}$ac_ct_LD" >&6 + else +- echo "$as_me:4069: result: no" >&5 ++ echo "$as_me:4057: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4078,7 +4066,7 @@ + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:4081: checking for $ac_word" >&5 ++echo "$as_me:4069: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4093,7 +4081,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4096: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4084: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4101,10 +4089,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4104: result: $AR" >&5 ++ echo "$as_me:4092: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4107: result: no" >&5 ++ echo "$as_me:4095: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4113,7 +4101,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4116: checking for $ac_word" >&5 ++echo "$as_me:4104: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4128,7 +4116,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4131: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4119: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4137,10 +4125,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4140: result: $ac_ct_AR" >&5 ++ echo "$as_me:4128: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4143: result: no" >&5 ++ echo "$as_me:4131: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4152,7 +4140,7 @@ + if test -n "$ac_tool_prefix"; then + # 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 "$as_me:4155: checking for $ac_word" >&5 ++echo "$as_me:4143: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4167,7 +4155,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AR="${ac_tool_prefix}ar" +-echo "$as_me:4170: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4158: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4175,10 +4163,10 @@ + fi + AR=$ac_cv_prog_AR + if test -n "$AR"; then +- echo "$as_me:4178: result: $AR" >&5 ++ echo "$as_me:4166: result: $AR" >&5 + echo "${ECHO_T}$AR" >&6 + else +- echo "$as_me:4181: result: no" >&5 ++ echo "$as_me:4169: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4187,7 +4175,7 @@ + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 +-echo "$as_me:4190: checking for $ac_word" >&5 ++echo "$as_me:4178: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4202,7 +4190,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_AR="ar" +-echo "$as_me:4205: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4193: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4211,10 +4199,10 @@ + fi + ac_ct_AR=$ac_cv_prog_ac_ct_AR + if test -n "$ac_ct_AR"; then +- echo "$as_me:4214: result: $ac_ct_AR" >&5 ++ echo "$as_me:4202: result: $ac_ct_AR" >&5 + echo "${ECHO_T}$ac_ct_AR" >&6 + else +- echo "$as_me:4217: result: no" >&5 ++ echo "$as_me:4205: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4223,7 +4211,7 @@ + AR="$ac_cv_prog_AR" + fi + +-echo "$as_me:4226: checking for options to update archives" >&5 ++echo "$as_me:4214: checking for options to update archives" >&5 + echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 + if test "${cf_cv_ar_flags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4246,13 +4234,13 @@ + rm -f conftest.a + + cat >conftest.$ac_ext <<EOF +-#line 4249 "configure" ++#line 4237 "configure" + int testdata[3] = { 123, 456, 789 }; + EOF +- if { (eval echo "$as_me:4252: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:4240: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4255: \$? = $ac_status" >&5 ++ echo "$as_me:4243: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null +@@ -4263,7 +4251,7 @@ + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +-echo "${as_me:-configure}:4266: testing cannot compile test-program ..." 1>&5 ++echo "${as_me:-configure}:4254: testing cannot compile test-program ..." 1>&5 + + break + fi +@@ -4271,7 +4259,7 @@ + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + + fi +-echo "$as_me:4274: result: $cf_cv_ar_flags" >&5 ++echo "$as_me:4262: result: $cf_cv_ar_flags" >&5 + echo "${ECHO_T}$cf_cv_ar_flags" >&6 + + if test -n "$ARFLAGS" ; then +@@ -4282,7 +4270,7 @@ + ARFLAGS=$cf_cv_ar_flags + fi + +-echo "$as_me:4285: checking if you have specified an install-prefix" >&5 ++echo "$as_me:4273: checking if you have specified an install-prefix" >&5 + echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 + + # Check whether --with-install-prefix or --without-install-prefix was given. +@@ -4295,7 +4283,7 @@ + ;; + esac + fi; +-echo "$as_me:4298: result: $DESTDIR" >&5 ++echo "$as_me:4286: result: $DESTDIR" >&5 + echo "${ECHO_T}$DESTDIR" >&6 + + ############################################################################### +@@ -4323,7 +4311,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 "$as_me:4326: checking for $ac_word" >&5 ++echo "$as_me:4314: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_BUILD_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4338,7 +4326,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_BUILD_CC="$ac_prog" +-echo "$as_me:4341: found $ac_dir/$ac_word" >&5 ++echo "$as_me:4329: found $ac_dir/$ac_word" >&5 + break + done + +@@ -4346,10 +4334,10 @@ + fi + BUILD_CC=$ac_cv_prog_BUILD_CC + if test -n "$BUILD_CC"; then +- echo "$as_me:4349: result: $BUILD_CC" >&5 ++ echo "$as_me:4337: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + else +- echo "$as_me:4352: result: no" >&5 ++ echo "$as_me:4340: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -4357,12 +4345,12 @@ + done + + fi; +- echo "$as_me:4360: checking for native build C compiler" >&5 ++ echo "$as_me:4348: checking for native build C compiler" >&5 + echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 +- echo "$as_me:4362: result: $BUILD_CC" >&5 ++ echo "$as_me:4350: result: $BUILD_CC" >&5 + echo "${ECHO_T}$BUILD_CC" >&6 + +- echo "$as_me:4365: checking for native build C preprocessor" >&5 ++ echo "$as_me:4353: checking for native build C preprocessor" >&5 + echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 + + # Check whether --with-build-cpp or --without-build-cpp was given. +@@ -4372,10 +4360,10 @@ + else + BUILD_CPP='${BUILD_CC} -E' + fi; +- echo "$as_me:4375: result: $BUILD_CPP" >&5 ++ echo "$as_me:4363: result: $BUILD_CPP" >&5 + echo "${ECHO_T}$BUILD_CPP" >&6 + +- echo "$as_me:4378: checking for native build C flags" >&5 ++ echo "$as_me:4366: checking for native build C flags" >&5 + echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 + + # Check whether --with-build-cflags or --without-build-cflags was given. +@@ -4383,10 +4371,10 @@ + withval="$with_build_cflags" + BUILD_CFLAGS="$withval" + fi; +- echo "$as_me:4386: result: $BUILD_CFLAGS" >&5 ++ echo "$as_me:4374: result: $BUILD_CFLAGS" >&5 + echo "${ECHO_T}$BUILD_CFLAGS" >&6 + +- echo "$as_me:4389: checking for native build C preprocessor-flags" >&5 ++ echo "$as_me:4377: checking for native build C preprocessor-flags" >&5 + echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 + + # Check whether --with-build-cppflags or --without-build-cppflags was given. +@@ -4394,10 +4382,10 @@ + withval="$with_build_cppflags" + BUILD_CPPFLAGS="$withval" + fi; +- echo "$as_me:4397: result: $BUILD_CPPFLAGS" >&5 ++ echo "$as_me:4385: result: $BUILD_CPPFLAGS" >&5 + echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 + +- echo "$as_me:4400: checking for native build linker-flags" >&5 ++ echo "$as_me:4388: checking for native build linker-flags" >&5 + echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 + + # Check whether --with-build-ldflags or --without-build-ldflags was given. +@@ -4405,10 +4393,10 @@ + withval="$with_build_ldflags" + BUILD_LDFLAGS="$withval" + fi; +- echo "$as_me:4408: result: $BUILD_LDFLAGS" >&5 ++ echo "$as_me:4396: result: $BUILD_LDFLAGS" >&5 + echo "${ECHO_T}$BUILD_LDFLAGS" >&6 + +- echo "$as_me:4411: checking for native build linker-libraries" >&5 ++ echo "$as_me:4399: checking for native build linker-libraries" >&5 + echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 + + # Check whether --with-build-libs or --without-build-libs was given. +@@ -4416,7 +4404,7 @@ + withval="$with_build_libs" + BUILD_LIBS="$withval" + fi; +- echo "$as_me:4419: result: $BUILD_LIBS" >&5 ++ echo "$as_me:4407: result: $BUILD_LIBS" >&5 + echo "${ECHO_T}$BUILD_LIBS" >&6 + + # this assumes we're on Unix. +@@ -4426,7 +4414,7 @@ + : ${BUILD_CC:='${CC}'} + + if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then +- { { echo "$as_me:4429: error: Cross-build requires two compilers. ++ { { echo "$as_me:4417: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&5 + echo "$as_me: error: Cross-build requires two compilers. + Use --with-build-cc to specify the native compiler." >&2;} +@@ -4451,7 +4439,7 @@ + ### shared, for example. + cf_list_models="" + +-echo "$as_me:4454: checking if libtool -version-number should be used" >&5 ++echo "$as_me:4442: checking if libtool -version-number should be used" >&5 + echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 + + # Check whether --enable-libtool-version or --disable-libtool-version was given. +@@ -4468,7 +4456,7 @@ + cf_libtool_version=yes + + fi; +-echo "$as_me:4471: result: $cf_libtool_version" >&5 ++echo "$as_me:4459: result: $cf_libtool_version" >&5 + echo "${ECHO_T}$cf_libtool_version" >&6 + + if test "$cf_libtool_version" = yes ; then +@@ -4493,7 +4481,7 @@ + LIB_INSTALL= + LIB_UNINSTALL= + +-echo "$as_me:4496: checking if you want to build libraries with libtool" >&5 ++echo "$as_me:4484: checking if you want to build libraries with libtool" >&5 + echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 + + # Check whether --with-libtool or --without-libtool was given. +@@ -4503,7 +4491,7 @@ + else + with_libtool=no + fi; +-echo "$as_me:4506: result: $with_libtool" >&5 ++echo "$as_me:4494: result: $with_libtool" >&5 + echo "${ECHO_T}$with_libtool" >&6 + if test "$with_libtool" != "no"; then + +@@ -4522,7 +4510,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval with_libtool="$with_libtool" + case ".$with_libtool" in #(vi + .NONE/*) +@@ -4534,7 +4522,7 @@ + with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:4537: error: expected a pathname, not \"$with_libtool\"" >&5 ++ { { echo "$as_me:4525: error: expected a pathname, not \"$with_libtool\"" >&5 + echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4544,7 +4532,7 @@ + else + # Extract the first word of "libtool", so it can be a program name with args. + set dummy libtool; ac_word=$2 +-echo "$as_me:4547: checking for $ac_word" >&5 ++echo "$as_me:4535: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4561,7 +4549,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_LIBTOOL="$ac_dir/$ac_word" +- echo "$as_me:4564: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:4552: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -4572,20 +4560,20 @@ + LIBTOOL=$ac_cv_path_LIBTOOL + + if test -n "$LIBTOOL"; then +- echo "$as_me:4575: result: $LIBTOOL" >&5 ++ echo "$as_me:4563: result: $LIBTOOL" >&5 + echo "${ECHO_T}$LIBTOOL" >&6 + else +- echo "$as_me:4578: result: no" >&5 ++ echo "$as_me:4566: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + fi + if test -z "$LIBTOOL" ; then +- { { echo "$as_me:4584: error: Cannot find libtool" >&5 ++ { { echo "$as_me:4572: error: Cannot find libtool" >&5 + echo "$as_me: error: Cannot find libtool" >&2;} + { (exit 1); exit 1; }; } + fi +- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' ++ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' + LIB_OBJECT='${OBJECTS:.o=.lo}' + LIB_SUFFIX=.la + LIB_CLEAN='${LIBTOOL} --mode=clean' +@@ -4596,17 +4584,17 @@ + LIB_PREP=: + + # Show the version of libtool +- echo "$as_me:4599: checking version of libtool" >&5 ++ echo "$as_me:4587: checking version of libtool" >&5 + echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 + + # Save the version in a cache variable - this is not entirely a good + # thing, but the version string from libtool is very ugly, and for + # bug reports it might be useful to have the original string. "(" + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` +- echo "$as_me:4606: result: $cf_cv_libtool_version" >&5 ++ echo "$as_me:4594: result: $cf_cv_libtool_version" >&5 + echo "${ECHO_T}$cf_cv_libtool_version" >&6 + if test -z "$cf_cv_libtool_version" ; then +- { { echo "$as_me:4609: error: This is not GNU libtool" >&5 ++ { { echo "$as_me:4597: error: This is not GNU libtool" >&5 + echo "$as_me: error: This is not GNU libtool" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4614,7 +4602,7 @@ + # special hack to add -no-undefined (which libtool should do for itself) + LT_UNDEF= + case "$cf_cv_system_name" in #(vi +- cygwin*|mingw32*|uwin*|aix[456]) #(vi ++ cygwin*|mingw32*|uwin*|aix[4-7]) #(vi + LT_UNDEF=-no-undefined + ;; + esac +@@ -4642,7 +4630,7 @@ + + else + +-echo "$as_me:4645: checking if you want to build shared libraries" >&5 ++echo "$as_me:4633: checking if you want to build shared libraries" >&5 + echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 + + # Check whether --with-shared or --without-shared was given. +@@ -4652,11 +4640,11 @@ + else + with_shared=no + fi; +-echo "$as_me:4655: result: $with_shared" >&5 ++echo "$as_me:4643: result: $with_shared" >&5 + echo "${ECHO_T}$with_shared" >&6 + test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" + +-echo "$as_me:4659: checking if you want to build static libraries" >&5 ++echo "$as_me:4647: checking if you want to build static libraries" >&5 + echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6 + + # Check whether --with-normal or --without-normal was given. +@@ -4666,11 +4654,11 @@ + else + with_normal=yes + fi; +-echo "$as_me:4669: result: $with_normal" >&5 ++echo "$as_me:4657: result: $with_normal" >&5 + echo "${ECHO_T}$with_normal" >&6 + test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal" + +-echo "$as_me:4673: checking if you want to build debug libraries" >&5 ++echo "$as_me:4661: checking if you want to build debug libraries" >&5 + echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6 + + # Check whether --with-debug or --without-debug was given. +@@ -4680,11 +4668,11 @@ + else + with_debug=yes + fi; +-echo "$as_me:4683: result: $with_debug" >&5 ++echo "$as_me:4671: result: $with_debug" >&5 + echo "${ECHO_T}$with_debug" >&6 + test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug" + +-echo "$as_me:4687: checking if you want to build profiling libraries" >&5 ++echo "$as_me:4675: checking if you want to build profiling libraries" >&5 + echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6 + + # Check whether --with-profile or --without-profile was given. +@@ -4694,7 +4682,7 @@ + else + with_profile=no + fi; +-echo "$as_me:4697: result: $with_profile" >&5 ++echo "$as_me:4685: result: $with_profile" >&5 + echo "${ECHO_T}$with_profile" >&6 + test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile" + +@@ -4702,19 +4690,19 @@ + + ############################################################################### + +-echo "$as_me:4705: checking for specified models" >&5 ++echo "$as_me:4693: checking for specified models" >&5 + echo $ECHO_N "checking for specified models... $ECHO_C" >&6 + test -z "$cf_list_models" && cf_list_models=normal + test "$with_libtool" != "no" && cf_list_models=libtool +-echo "$as_me:4709: result: $cf_list_models" >&5 ++echo "$as_me:4697: result: $cf_list_models" >&5 + echo "${ECHO_T}$cf_list_models" >&6 + + ### Use the first model as the default, and save its suffix for use in building + ### up test-applications. +-echo "$as_me:4714: checking for default model" >&5 ++echo "$as_me:4702: checking for default model" >&5 + echo $ECHO_N "checking for default model... $ECHO_C" >&6 + DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` +-echo "$as_me:4717: result: $DFT_LWR_MODEL" >&5 ++echo "$as_me:4705: result: $DFT_LWR_MODEL" >&5 + echo "${ECHO_T}$DFT_LWR_MODEL" >&6 + + DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -4728,6 +4716,22 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + ++echo "$as_me:4719: checking if you want to have a library-prefix" >&5 ++echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 ++ ++# Check whether --with-lib-prefix or --without-lib-prefix was given. ++if test "${with_lib_prefix+set}" = set; then ++ withval="$with_lib_prefix" ++ with_lib_prefix=$withval ++else ++ with_lib_prefix=auto ++fi; ++echo "$as_me:4729: result: $with_lib_prefix" >&5 ++echo "${ECHO_T}$with_lib_prefix" >&6 ++ ++if test $with_lib_prefix = auto ++then ++ + case $cf_cv_system_name in #(vi + OS/2*|os2*) #(vi + LIB_PREFIX='' +@@ -4737,13 +4741,18 @@ + esac + cf_prefix=$LIB_PREFIX + +-LIB_PREFIX=$cf_prefix ++elif test $with_lib_prefix = no ++then ++ LIB_PREFIX= ++else ++ LIB_PREFIX=$with_lib_prefix ++fi + + LIB_SUFFIX= + + ############################################################################### + +-echo "$as_me:4746: checking if you want to build a separate terminfo library" >&5 ++echo "$as_me:4755: checking if you want to build a separate terminfo library" >&5 + echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6 + + # Check whether --with-termlib or --without-termlib was given. +@@ -4753,10 +4762,10 @@ + else + with_termlib=no + fi; +-echo "$as_me:4756: result: $with_termlib" >&5 ++echo "$as_me:4765: result: $with_termlib" >&5 + echo "${ECHO_T}$with_termlib" >&6 + +-echo "$as_me:4759: checking if you want to build a separate tic library" >&5 ++echo "$as_me:4768: checking if you want to build a separate tic library" >&5 + echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6 + + # Check whether --with-ticlib or --without-ticlib was given. +@@ -4766,13 +4775,13 @@ + else + with_ticlib=no + fi; +-echo "$as_me:4769: result: $with_ticlib" >&5 ++echo "$as_me:4778: result: $with_ticlib" >&5 + echo "${ECHO_T}$with_ticlib" >&6 + + ### Checks for special libraries, must be done up-front. + SHLIB_LIST="" + +-echo "$as_me:4775: checking if you want to link with the GPM mouse library" >&5 ++echo "$as_me:4784: checking if you want to link with the GPM mouse library" >&5 + echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6 + + # Check whether --with-gpm or --without-gpm was given. +@@ -4782,27 +4791,27 @@ + else + with_gpm=maybe + fi; +-echo "$as_me:4785: result: $with_gpm" >&5 ++echo "$as_me:4794: result: $with_gpm" >&5 + echo "${ECHO_T}$with_gpm" >&6 + + if test "$with_gpm" != no ; then +- echo "$as_me:4789: checking for gpm.h" >&5 ++ echo "$as_me:4798: checking for gpm.h" >&5 + echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6 + if test "${ac_cv_header_gpm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4795 "configure" ++#line 4804 "configure" + #include "confdefs.h" + #include <gpm.h> + _ACEOF +-if { (eval echo "$as_me:4799: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4808: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4805: \$? = $ac_status" >&5 ++ echo "$as_me:4814: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4821,7 +4830,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4824: result: $ac_cv_header_gpm_h" >&5 ++echo "$as_me:4833: result: $ac_cv_header_gpm_h" >&5 + echo "${ECHO_T}$ac_cv_header_gpm_h" >&6 + if test $ac_cv_header_gpm_h = yes; then + +@@ -4832,14 +4841,14 @@ + if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then + test -n "$verbose" && echo " assuming we really have GPM library" 1>&6 + +-echo "${as_me:-configure}:4835: testing assuming we really have GPM library ..." 1>&5 ++echo "${as_me:-configure}:4844: testing assuming we really have GPM library ..." 1>&5 + + cat >>confdefs.h <<\EOF + #define HAVE_LIBGPM 1 + EOF + + else +- echo "$as_me:4842: checking for Gpm_Open in -lgpm" >&5 ++ echo "$as_me:4851: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4847,7 +4856,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 4850 "configure" ++#line 4859 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -4866,16 +4875,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4869: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4872: \$? = $ac_status" >&5 ++ echo "$as_me:4881: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4875: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4878: \$? = $ac_status" >&5 ++ echo "$as_me:4887: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -4886,13 +4895,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:4889: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:4898: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then + : + else + +- { { echo "$as_me:4895: error: Cannot link with GPM library" >&5 ++ { { echo "$as_me:4904: error: Cannot link with GPM library" >&5 + echo "$as_me: error: Cannot link with GPM library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4902,7 +4911,7 @@ + + else + +- test "$with_gpm" != maybe && { echo "$as_me:4905: WARNING: Cannot find GPM header" >&5 ++ test "$with_gpm" != maybe && { echo "$as_me:4914: WARNING: Cannot find GPM header" >&5 + echo "$as_me: WARNING: Cannot find GPM header" >&2;} + with_gpm=no + +@@ -4911,7 +4920,7 @@ + fi + + if test "$with_gpm" != no ; then +- echo "$as_me:4914: checking if you want to load GPM dynamically" >&5 ++ echo "$as_me:4923: checking if you want to load GPM dynamically" >&5 + echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6 + + # Check whether --with-dlsym or --without-dlsym was given. +@@ -4921,18 +4930,18 @@ + else + with_dlsym=yes + fi; +- echo "$as_me:4924: result: $with_dlsym" >&5 ++ echo "$as_me:4933: result: $with_dlsym" >&5 + echo "${ECHO_T}$with_dlsym" >&6 + if test "$with_dlsym" = yes ; then + + cf_have_dlsym=no +-echo "$as_me:4929: checking for dlsym" >&5 ++echo "$as_me:4938: checking for dlsym" >&5 + echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 + if test "${ac_cv_func_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4935 "configure" ++#line 4944 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlsym (); below. */ +@@ -4955,7 +4964,7 @@ + #if defined (__stub_dlsym) || defined (__stub___dlsym) + choke me + #else +-f = dlsym; ++f = dlsym; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -4963,16 +4972,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4966: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4975: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4969: \$? = $ac_status" >&5 ++ echo "$as_me:4978: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4972: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4975: \$? = $ac_status" >&5 ++ echo "$as_me:4984: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_dlsym=yes + else +@@ -4982,14 +4991,14 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:4985: result: $ac_cv_func_dlsym" >&5 ++echo "$as_me:4994: result: $ac_cv_func_dlsym" >&5 + echo "${ECHO_T}$ac_cv_func_dlsym" >&6 + if test $ac_cv_func_dlsym = yes; then + cf_have_dlsym=yes + else + + cf_have_libdl=no +-echo "$as_me:4992: checking for dlsym in -ldl" >&5 ++echo "$as_me:5001: checking for dlsym in -ldl" >&5 + echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 + if test "${ac_cv_lib_dl_dlsym+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4997,7 +5006,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5000 "configure" ++#line 5009 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5016,16 +5025,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5019: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5028: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5022: \$? = $ac_status" >&5 ++ echo "$as_me:5031: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5025: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5028: \$? = $ac_status" >&5 ++ echo "$as_me:5037: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -5036,7 +5045,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5039: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:5048: result: $ac_cv_lib_dl_dlsym" >&5 + echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 + if test $ac_cv_lib_dl_dlsym = yes; then + +@@ -5049,10 +5058,10 @@ + if test "$cf_have_dlsym" = yes ; then + test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" + +- echo "$as_me:5052: checking whether able to link to dl*() functions" >&5 ++ echo "$as_me:5061: checking whether able to link to dl*() functions" >&5 + echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 5055 "configure" ++#line 5064 "configure" + #include "confdefs.h" + #include <dlfcn.h> + int +@@ -5070,16 +5079,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5073: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5082: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5076: \$? = $ac_status" >&5 ++ echo "$as_me:5085: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5079: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5082: \$? = $ac_status" >&5 ++ echo "$as_me:5091: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >>confdefs.h <<\EOF +@@ -5090,15 +5099,15 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- { { echo "$as_me:5093: error: Cannot link test program for libdl" >&5 ++ { { echo "$as_me:5102: error: Cannot link test program for libdl" >&5 + echo "$as_me: error: Cannot link test program for libdl" >&2;} + { (exit 1); exit 1; }; } + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:5098: result: ok" >&5 ++ echo "$as_me:5107: result: ok" >&5 + echo "${ECHO_T}ok" >&6 + else +- { { echo "$as_me:5101: error: Cannot find dlsym function" >&5 ++ { { echo "$as_me:5110: error: Cannot find dlsym function" >&5 + echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5106,12 +5115,12 @@ + if test "$with_gpm" != yes ; then + test -n "$verbose" && echo " assuming soname for gpm is $with_gpm" 1>&6 + +-echo "${as_me:-configure}:5109: testing assuming soname for gpm is $with_gpm ..." 1>&5 ++echo "${as_me:-configure}:5118: testing assuming soname for gpm is $with_gpm ..." 1>&5 + + cf_cv_gpm_soname="$with_gpm" + else + +-echo "$as_me:5114: checking for soname of gpm library" >&5 ++echo "$as_me:5123: checking for soname of gpm library" >&5 + echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6 + if test "${cf_cv_gpm_soname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5129,15 +5138,15 @@ + CF_EOF + cf_save_LIBS="$LIBS" + LIBS="-lgpm $LIBS" +- if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:5141: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5135: \$? = $ac_status" >&5 ++ echo "$as_me:5144: \$? = $ac_status" >&5 + (exit $ac_status); } ; then +- if { (eval echo "$as_me:5137: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:5146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5140: \$? = $ac_status" >&5 ++ echo "$as_me:5149: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.` + test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown +@@ -5148,7 +5157,7 @@ + fi + + fi +-echo "$as_me:5151: result: $cf_cv_gpm_soname" >&5 ++echo "$as_me:5160: result: $cf_cv_gpm_soname" >&5 + echo "${ECHO_T}$cf_cv_gpm_soname" >&6 + + fi +@@ -5165,7 +5174,7 @@ + #define HAVE_LIBGPM 1 + EOF + +-echo "$as_me:5168: checking for Gpm_Wgetch in -lgpm" >&5 ++echo "$as_me:5177: checking for Gpm_Wgetch in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5173,7 +5182,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5176 "configure" ++#line 5185 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5192,16 +5201,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5195: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5204: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5198: \$? = $ac_status" >&5 ++ echo "$as_me:5207: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5201: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5210: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5204: \$? = $ac_status" >&5 ++ echo "$as_me:5213: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Wgetch=yes + else +@@ -5212,11 +5221,11 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5215: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 ++echo "$as_me:5224: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6 + if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then + +-echo "$as_me:5219: checking if GPM is weakly bound to curses library" >&5 ++echo "$as_me:5228: checking if GPM is weakly bound to curses library" >&5 + echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6 + if test "${cf_cv_check_gpm_wgetch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5240,15 +5249,15 @@ + # to rely on the static library, noting that some packagers may not + # include it. + LIBS="-static -lgpm -dynamic $LIBS" +- if { (eval echo "$as_me:5243: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:5252: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5246: \$? = $ac_status" >&5 ++ echo "$as_me:5255: \$? = $ac_status" >&5 + (exit $ac_status); } ; then +- if { (eval echo "$as_me:5248: \"$ac_link\"") >&5 ++ if { (eval echo "$as_me:5257: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5251: \$? = $ac_status" >&5 ++ echo "$as_me:5260: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'` + test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes +@@ -5260,11 +5269,11 @@ + fi + + fi +-echo "$as_me:5263: result: $cf_cv_check_gpm_wgetch" >&5 ++echo "$as_me:5272: result: $cf_cv_check_gpm_wgetch" >&5 + echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6 + + if test "$cf_cv_check_gpm_wgetch" != yes ; then +- { echo "$as_me:5267: WARNING: GPM library is already linked with curses - read the FAQ" >&5 ++ { echo "$as_me:5276: WARNING: GPM library is already linked with curses - read the FAQ" >&5 + echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;} + fi + +@@ -5274,7 +5283,7 @@ + + # not everyone has "test -c" + if test -c /dev/sysmouse 2>/dev/null ; then +-echo "$as_me:5277: checking if you want to use sysmouse" >&5 ++echo "$as_me:5286: checking if you want to use sysmouse" >&5 + echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6 + + # Check whether --with-sysmouse or --without-sysmouse was given. +@@ -5286,7 +5295,7 @@ + fi; + if test "$cf_with_sysmouse" != no ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 5289 "configure" ++#line 5298 "configure" + #include "confdefs.h" + + #include <osreldate.h> +@@ -5309,16 +5318,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5312: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5321: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5315: \$? = $ac_status" >&5 ++ echo "$as_me:5324: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5318: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5327: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5321: \$? = $ac_status" >&5 ++ echo "$as_me:5330: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_with_sysmouse=yes + else +@@ -5328,7 +5337,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:5331: result: $cf_with_sysmouse" >&5 ++echo "$as_me:5340: result: $cf_with_sysmouse" >&5 + echo "${ECHO_T}$cf_with_sysmouse" >&6 + test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF + #define USE_SYSMOUSE 1 +@@ -5346,7 +5355,7 @@ + test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT='' + fi + +-echo "$as_me:5349: checking for default loader flags" >&5 ++echo "$as_me:5358: checking for default loader flags" >&5 + echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 + case $DFT_LWR_MODEL in + libtool) LD_MODEL='' ;; +@@ -5355,13 +5364,13 @@ + profile) LD_MODEL='-pg';; + shared) LD_MODEL='' ;; + esac +-echo "$as_me:5358: result: $LD_MODEL" >&5 ++echo "$as_me:5367: result: $LD_MODEL" >&5 + echo "${ECHO_T}$LD_MODEL" >&6 + + case $DFT_LWR_MODEL in + shared) + +-echo "$as_me:5364: checking if rpath option should be used" >&5 ++echo "$as_me:5373: checking if rpath option should be used" >&5 + echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + + # Check whether --enable-rpath or --disable-rpath was given. +@@ -5371,10 +5380,10 @@ + else + cf_cv_enable_rpath=no + fi; +-echo "$as_me:5374: result: $cf_cv_enable_rpath" >&5 ++echo "$as_me:5383: result: $cf_cv_enable_rpath" >&5 + echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + +-echo "$as_me:5377: checking if shared libraries should be relinked during install" >&5 ++echo "$as_me:5386: checking if shared libraries should be relinked during install" >&5 + echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6 + + # Check whether --enable-relink or --disable-relink was given. +@@ -5384,13 +5393,13 @@ + else + cf_cv_do_relink=yes + fi; +-echo "$as_me:5387: result: $cf_cv_do_relink" >&5 ++echo "$as_me:5396: result: $cf_cv_do_relink" >&5 + echo "${ECHO_T}$cf_cv_do_relink" >&6 + ;; + esac + + LD_RPATH_OPT= +-echo "$as_me:5393: checking for an rpath option" >&5 ++echo "$as_me:5402: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in #(vi + irix*) #(vi +@@ -5403,10 +5412,10 @@ + linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-openbsd[2-9].*) #(vi ++openbsd[2-9].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +-freebsd*) #(vi ++dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; + netbsd*) #(vi +@@ -5421,17 +5430,17 @@ + *) + ;; + esac +-echo "$as_me:5424: result: $LD_RPATH_OPT" >&5 ++echo "$as_me:5433: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in #(vi + x-R*) +- echo "$as_me:5429: checking if we need a space after rpath option" >&5 ++ echo "$as_me:5438: checking if we need a space after rpath option" >&5 + echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5434 "configure" ++#line 5443 "configure" + #include "confdefs.h" + + int +@@ -5443,16 +5452,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5446: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5455: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5449: \$? = $ac_status" >&5 ++ echo "$as_me:5458: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5461: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5455: \$? = $ac_status" >&5 ++ echo "$as_me:5464: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -5462,7 +5471,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:5465: result: $cf_rpath_space" >&5 ++ echo "$as_me:5474: result: $cf_rpath_space" >&5 + echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +@@ -5477,7 +5486,7 @@ + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + +- echo "$as_me:5480: checking if release/abi version should be used for shared libs" >&5 ++ echo "$as_me:5489: checking if release/abi version should be used for shared libs" >&5 + echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + + # Check whether --with-shlib-version or --without-shlib-version was given. +@@ -5492,7 +5501,7 @@ + cf_cv_shlib_version=$withval + ;; + *) +- { { echo "$as_me:5495: error: option value must be one of: rel, abi, auto or no" >&5 ++ { { echo "$as_me:5504: error: option value must be one of: rel, abi, auto or no" >&5 + echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -5501,7 +5510,7 @@ + else + cf_cv_shlib_version=auto + fi; +- echo "$as_me:5504: result: $cf_cv_shlib_version" >&5 ++ echo "$as_me:5513: result: $cf_cv_shlib_version" >&5 + echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no +@@ -5510,14 +5519,14 @@ + CC_SHARED_OPTS= + if test "$GCC" = yes + then +- echo "$as_me:5513: checking which $CC option to use" >&5 ++ echo "$as_me:5522: checking which $CC option to use" >&5 + echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5520 "configure" ++#line 5529 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -5529,16 +5538,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5532: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5541: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5535: \$? = $ac_status" >&5 ++ echo "$as_me:5544: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5538: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5547: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5541: \$? = $ac_status" >&5 ++ echo "$as_me:5550: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -5547,7 +5556,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + done +- echo "$as_me:5550: result: $CC_SHARED_OPTS" >&5 ++ echo "$as_me:5559: result: $CC_SHARED_OPTS" >&5 + echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi +@@ -5555,10 +5564,14 @@ + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi +- aix[56]*) #(vi ++ aix4.3-9*|aix[5-7]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= +- MK_SHARED_LIB='$(CC) -shared' ++ MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' ++ else ++ # CC_SHARED_OPTS='-qpic=large -G' ++ # perhaps "-bM:SRE -bnoentry -bexpall" ++ MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + fi + ;; + beos*) #(vi +@@ -5589,7 +5602,7 @@ + MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes +- echo "$as_me:5592: checking if ld -search_paths_first works" >&5 ++ echo "$as_me:5605: checking if ld -search_paths_first works" >&5 + echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 + if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5598,7 +5611,7 @@ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +-#line 5601 "configure" ++#line 5614 "configure" + #include "confdefs.h" + + int +@@ -5610,16 +5623,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5613: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5626: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5616: \$? = $ac_status" >&5 ++ echo "$as_me:5629: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5619: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5622: \$? = $ac_status" >&5 ++ echo "$as_me:5635: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes + else +@@ -5630,7 +5643,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS + fi +-echo "$as_me:5633: result: $cf_cv_ldflags_search_paths_first" >&5 ++echo "$as_me:5646: result: $cf_cv_ldflags_search_paths_first" >&5 + echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test $cf_cv_ldflags_search_paths_first = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" +@@ -5649,9 +5662,19 @@ + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; ++ interix*) ++ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel ++ if test "$cf_cv_shlib_version" = rel; then ++ cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}' ++ else ++ cf_shared_soname='`basename `' ++ fi ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' ++ ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then +@@ -5668,7 +5691,7 @@ + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -5680,13 +5703,34 @@ + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; +- openbsd[2-9].*) #(vi ++ mingw*) #(vi ++ cf_cv_shlib_version=mingw ++ cf_cv_shlib_version_infix=mingw ++ CC_SHARED_OPTS= ++ MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}' ++ #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]' ++ #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]' ++ cat >mk_shared_lib.sh <<-CF_EOF ++ #!/bin/sh ++ SHARED_LIB=\$1 ++ IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` ++ shift ++ cat <<-EOF ++ Linking shared library ++ ** SHARED_LIB \$SHARED_LIB ++ ** IMPORT_LIB \$IMPORT_LIB ++EOF ++ exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB} ++CF_EOF ++ chmod +x mk_shared_lib.sh ++ ;; ++ openbsd[2-9].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + +@@ -5704,12 +5748,12 @@ + MK_SHARED_LIB='${LD} -Bshareable -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; +- freebsd*) #(vi ++ dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" +- LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${libdir} $LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel +@@ -5726,7 +5770,7 @@ + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +- EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${libdir} $EXTRA_LDFLAGS" ++ EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi +@@ -5810,7 +5854,7 @@ + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5813 "configure" ++#line 5857 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -5822,16 +5866,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5825: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5869: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5828: \$? = $ac_status" >&5 ++ echo "$as_me:5872: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5831: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5875: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5834: \$? = $ac_status" >&5 ++ echo "$as_me:5878: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -5868,21 +5912,29 @@ + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + *) +- { echo "$as_me:5871: WARNING: ignored --with-shlib-version" >&5 ++ { echo "$as_me:5915: WARNING: ignored --with-shlib-version" >&5 + echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac + ;; + esac + +- if test -n "$cf_ld_rpath_opt" ; then +- MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" +- fi ++ # RPATH_LIST is a colon-separated list of directories ++ test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" ++ test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" ++ ++ test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 ++ ++echo "${as_me:-configure}:5928: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 ++ ++ test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 ++ ++echo "${as_me:-configure}:5932: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + if test "$CC_SHARED_OPTS" = "unknown"; then + for model in $cf_list_models; do + if test "$model" = "shared"; then +- { { echo "$as_me:5885: error: Shared libraries are not supported in this version" >&5 ++ { { echo "$as_me:5937: error: Shared libraries are not supported in this version" >&5 + echo "$as_me: error: Shared libraries are not supported in this version" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5892,7 +5944,7 @@ + ### If we're building with rpath, try to link non-standard libs that way too. + if test "$DFT_LWR_MODEL" = "shared"; then + +-echo "$as_me:5895: checking if rpath-hack should be disabled" >&5 ++echo "$as_me:5947: checking if rpath-hack should be disabled" >&5 + echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -5909,21 +5961,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:5912: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:5964: result: $cf_disable_rpath_hack" >&5 + echo "${ECHO_T}$cf_disable_rpath_hack" >&6 + if test "$cf_disable_rpath_hack" = no ; then + +-echo "$as_me:5916: checking for updated LDFLAGS" >&5 ++echo "$as_me:5968: checking for updated LDFLAGS" >&5 + echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 + if test -n "$LD_RPATH_OPT" ; then +- echo "$as_me:5919: result: maybe" >&5 ++ echo "$as_me:5971: result: maybe" >&5 + echo "${ECHO_T}maybe" >&6 + + for ac_prog in ldd + 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:5926: checking for $ac_word" >&5 ++echo "$as_me:5978: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5938,7 +5990,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_cf_ldd_prog="$ac_prog" +-echo "$as_me:5941: found $ac_dir/$ac_word" >&5 ++echo "$as_me:5993: found $ac_dir/$ac_word" >&5 + break + done + +@@ -5946,10 +5998,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:5949: result: $cf_ldd_prog" >&5 ++ echo "$as_me:6001: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:5952: result: no" >&5 ++ echo "$as_me:6004: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -5963,7 +6015,7 @@ + cf_rpath_oops= + + cat >conftest.$ac_ext <<_ACEOF +-#line 5966 "configure" ++#line 6018 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -5975,16 +6027,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5978: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6030: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5981: \$? = $ac_status" >&5 ++ echo "$as_me:6033: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5984: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6036: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5987: \$? = $ac_status" >&5 ++ echo "$as_me:6039: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` +@@ -6012,7 +6064,7 @@ + then + test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 + +-echo "${as_me:-configure}:6015: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++echo "${as_me:-configure}:6067: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 + + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break +@@ -6024,11 +6076,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:6027: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:6079: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:6031: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:6083: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -6065,7 +6117,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:6068: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:6120: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -6078,11 +6130,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:6081: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:6133: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:6085: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:6137: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -6119,7 +6171,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me:-configure}:6122: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me:-configure}:6174: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -6132,11 +6184,11 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me:-configure}:6135: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me:-configure}:6187: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me:-configure}:6139: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me:-configure}:6191: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + fi + +@@ -6147,7 +6199,7 @@ + ############################################################################### + + ### use option --disable-overwrite to leave out the link to -lcurses +-echo "$as_me:6150: checking if you wish to install ncurses overwriting curses" >&5 ++echo "$as_me:6202: checking if you wish to install ncurses overwriting curses" >&5 + echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6 + + # Check whether --enable-overwrite or --disable-overwrite was given. +@@ -6157,10 +6209,10 @@ + else + if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi + fi; +-echo "$as_me:6160: result: $with_overwrite" >&5 ++echo "$as_me:6212: result: $with_overwrite" >&5 + echo "${ECHO_T}$with_overwrite" >&6 + +-echo "$as_me:6163: checking if external terminfo-database is used" >&5 ++echo "$as_me:6215: checking if external terminfo-database is used" >&5 + echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6 + + # Check whether --enable-database or --disable-database was given. +@@ -6170,7 +6222,7 @@ + else + use_database=yes + fi; +-echo "$as_me:6173: result: $use_database" >&5 ++echo "$as_me:6225: result: $use_database" >&5 + echo "${ECHO_T}$use_database" >&6 + + case $host_os in #(vi +@@ -6182,17 +6234,12 @@ + ;; + esac + +- case $cf_cv_system_name in +- os2*) PATH_SEPARATOR=';' ;; +- *) PATH_SEPARATOR=':' ;; +- esac +- + if test "$use_database" != no ; then + cat >>confdefs.h <<\EOF + #define USE_DATABASE 1 + EOF + +- echo "$as_me:6195: checking which terminfo source-file will be installed" >&5 ++ echo "$as_me:6242: checking which terminfo source-file will be installed" >&5 + echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6 + + # Check whether --with-database or --without-database was given. +@@ -6200,10 +6247,10 @@ + withval="$with_database" + TERMINFO_SRC=$withval + fi; +- echo "$as_me:6203: result: $TERMINFO_SRC" >&5 ++ echo "$as_me:6250: result: $TERMINFO_SRC" >&5 + echo "${ECHO_T}$TERMINFO_SRC" >&6 + +- echo "$as_me:6206: checking whether to use hashed database instead of directory/tree" >&5 ++ echo "$as_me:6253: checking whether to use hashed database instead of directory/tree" >&5 + echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6 + + # Check whether --with-hashed-db or --without-hashed-db was given. +@@ -6213,13 +6260,13 @@ + else + with_hashed_db=no + fi; +- echo "$as_me:6216: result: $with_hashed_db" >&5 ++ echo "$as_me:6263: result: $with_hashed_db" >&5 + echo "${ECHO_T}$with_hashed_db" >&6 + else + with_hashed_db=no + fi + +-echo "$as_me:6222: checking for list of fallback descriptions" >&5 ++echo "$as_me:6269: checking for list of fallback descriptions" >&5 + echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6 + + # Check whether --with-fallbacks or --without-fallbacks was given. +@@ -6229,11 +6276,11 @@ + else + with_fallback= + fi; +-echo "$as_me:6232: result: $with_fallback" >&5 ++echo "$as_me:6279: result: $with_fallback" >&5 + echo "${ECHO_T}$with_fallback" >&6 + FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'` + +-echo "$as_me:6236: checking if you want modern xterm or antique" >&5 ++echo "$as_me:6283: checking if you want modern xterm or antique" >&5 + echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6 + + # Check whether --with-xterm-new or --without-xterm-new was given. +@@ -6247,19 +6294,49 @@ + no) with_xterm_new=xterm-old;; + *) with_xterm_new=xterm-new;; + esac +-echo "$as_me:6250: result: $with_xterm_new" >&5 ++echo "$as_me:6297: result: $with_xterm_new" >&5 + echo "${ECHO_T}$with_xterm_new" >&6 + WHICH_XTERM=$with_xterm_new + ++echo "$as_me:6301: checking if xterm backspace sends BS or DEL" >&5 ++echo $ECHO_N "checking if xterm backspace sends BS or DEL... $ECHO_C" >&6 ++ ++# Check whether --with-xterm-kbs or --without-xterm-kbs was given. ++if test "${with_xterm_kbs+set}" = set; then ++ withval="$with_xterm_kbs" ++ with_xterm_kbs=$withval ++else ++ with_xterm_kbs=BS ++fi; ++case x$with_xterm_kbs in ++xyes|xno|xBS|xbs|x8) ++ with_xterm_kbs=BS ++ ;; ++xDEL|xdel|x127) ++ with_xterm_kbs=DEL ++ ;; ++*) ++ with_xterm_kbs=$withval ++ ;; ++esac ++echo "$as_me:6322: result: $with_xterm_kbs" >&5 ++echo "${ECHO_T}$with_xterm_kbs" >&6 ++XTERM_KBS=$with_xterm_kbs ++ + MAKE_TERMINFO= + if test "$use_database" = no ; then + TERMINFO="${datadir}/terminfo" + MAKE_TERMINFO="#" + else + +-echo "$as_me:6260: checking for list of terminfo directories" >&5 ++echo "$as_me:6332: checking for list of terminfo directories" >&5 + echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6 + ++ case $cf_cv_system_name in ++ os2*) PATH_SEPARATOR=';' ;; ++ *) PATH_SEPARATOR=':' ;; ++ esac ++ + # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given. + if test "${with_terminfo_dirs+set}" = set; then + withval="$with_terminfo_dirs" +@@ -6285,7 +6362,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval cf_src_path="$cf_src_path" + case ".$cf_src_path" in #(vi + .NONE/*) +@@ -6297,7 +6374,7 @@ + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:6300: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:6377: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6310,13 +6387,13 @@ + + eval 'TERMINFO_DIRS="$cf_dst_path"' + +-echo "$as_me:6313: result: $TERMINFO_DIRS" >&5 ++echo "$as_me:6390: result: $TERMINFO_DIRS" >&5 + echo "${ECHO_T}$TERMINFO_DIRS" >&6 + test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF + #define TERMINFO_DIRS "$TERMINFO_DIRS" + EOF + +-echo "$as_me:6319: checking for default terminfo directory" >&5 ++echo "$as_me:6396: checking for default terminfo directory" >&5 + echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6 + + # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given. +@@ -6340,7 +6417,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -6352,7 +6429,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:6355: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:6432: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6361,7 +6438,7 @@ + fi + TERMINFO="$withval" + +-echo "$as_me:6364: result: $TERMINFO" >&5 ++echo "$as_me:6441: result: $TERMINFO" >&5 + echo "${ECHO_T}$TERMINFO" >&6 + cat >>confdefs.h <<EOF + #define TERMINFO "$TERMINFO" +@@ -6371,7 +6448,7 @@ + + ### use option --disable-big-core to make tic run on small machines + ### We need 4Mb, check if we can allocate 50% more than that. +-echo "$as_me:6374: checking if big-core option selected" >&5 ++echo "$as_me:6451: checking if big-core option selected" >&5 + echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6 + + # Check whether --enable-big-core or --disable-big-core was given. +@@ -6383,7 +6460,7 @@ + with_big_core=no + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6386 "configure" ++#line 6463 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -6397,15 +6474,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6400: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6477: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6403: \$? = $ac_status" >&5 ++ echo "$as_me:6480: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6405: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6482: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6408: \$? = $ac_status" >&5 ++ echo "$as_me:6485: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_big_core=yes + else +@@ -6417,7 +6494,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi; +-echo "$as_me:6420: result: $with_big_core" >&5 ++echo "$as_me:6497: result: $with_big_core" >&5 + echo "${ECHO_T}$with_big_core" >&6 + test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF + #define HAVE_BIG_CORE 1 +@@ -6426,7 +6503,7 @@ + ### ISO C only guarantees 512-char strings, we have tables which load faster + ### when constructed using "big" strings. More than the C compiler, the awk + ### program is a limit on most vendor UNIX systems. Check that we can build. +-echo "$as_me:6429: checking if big-strings option selected" >&5 ++echo "$as_me:6506: checking if big-strings option selected" >&5 + echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6 + + # Check whether --enable-big-strings or --disable-big-strings was given. +@@ -6440,8 +6517,8 @@ + eval with_big_strings=no + ;; + *) #(vi +- if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' \ +- | $AWK '{ printf "%d\n", length($0); }' | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then ++ if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < 12000) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \ ++ | $AWK '{ printf "%d\n", length($0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ($0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then + eval with_big_strings=yes + else + eval with_big_strings=no +@@ -6450,14 +6527,14 @@ + esac + + fi; +-echo "$as_me:6453: result: $with_big_strings" >&5 ++echo "$as_me:6530: result: $with_big_strings" >&5 + echo "${ECHO_T}$with_big_strings" >&6 + + USE_BIG_STRINGS=0 + test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1 + + ### use option --enable-termcap to compile in the termcap fallback support +-echo "$as_me:6460: checking if you want termcap-fallback support" >&5 ++echo "$as_me:6537: checking if you want termcap-fallback support" >&5 + echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6 + + # Check whether --enable-termcap or --disable-termcap was given. +@@ -6467,13 +6544,13 @@ + else + with_termcap=no + fi; +-echo "$as_me:6470: result: $with_termcap" >&5 ++echo "$as_me:6547: result: $with_termcap" >&5 + echo "${ECHO_T}$with_termcap" >&6 + + if test "$with_termcap" != "yes" ; then + if test "$use_database" = no ; then + if test -z "$with_fallback" ; then +- { { echo "$as_me:6476: error: You have disabled the database w/o specifying fallbacks" >&5 ++ { { echo "$as_me:6553: error: You have disabled the database w/o specifying fallbacks" >&5 + echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6485,7 +6562,7 @@ + else + + if test "$with_ticlib" != no ; then +- { { echo "$as_me:6488: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 ++ { { echo "$as_me:6565: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5 + echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -6494,7 +6571,7 @@ + #define USE_TERMCAP 1 + EOF + +-echo "$as_me:6497: checking for list of termcap files" >&5 ++echo "$as_me:6574: checking for list of termcap files" >&5 + echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6 + + # Check whether --with-termpath or --without-termpath was given. +@@ -6522,7 +6599,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval cf_src_path="$cf_src_path" + case ".$cf_src_path" in #(vi + .NONE/*) +@@ -6534,7 +6611,7 @@ + cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:6537: error: expected a pathname, not \"$cf_src_path\"" >&5 ++ { { echo "$as_me:6614: error: expected a pathname, not \"$cf_src_path\"" >&5 + echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -6547,14 +6624,14 @@ + + eval 'TERMPATH="$cf_dst_path"' + +-echo "$as_me:6550: result: $TERMPATH" >&5 ++echo "$as_me:6627: result: $TERMPATH" >&5 + echo "${ECHO_T}$TERMPATH" >&6 + test -n "$TERMPATH" && cat >>confdefs.h <<EOF + #define TERMPATH "$TERMPATH" + EOF + + ### use option --enable-getcap to use a hacked getcap for reading termcaps +-echo "$as_me:6557: checking if fast termcap-loader is needed" >&5 ++echo "$as_me:6634: checking if fast termcap-loader is needed" >&5 + echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6 + + # Check whether --enable-getcap or --disable-getcap was given. +@@ -6564,13 +6641,13 @@ + else + with_getcap=no + fi; +-echo "$as_me:6567: result: $with_getcap" >&5 ++echo "$as_me:6644: result: $with_getcap" >&5 + echo "${ECHO_T}$with_getcap" >&6 + test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF + #define USE_GETCAP 1 + EOF + +-echo "$as_me:6573: checking if translated termcaps will be cached in ~/.terminfo" >&5 ++echo "$as_me:6650: checking if translated termcaps will be cached in ~/.terminfo" >&5 + echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6 + + # Check whether --enable-getcap-cache or --disable-getcap-cache was given. +@@ -6580,7 +6657,7 @@ + else + with_getcap_cache=no + fi; +-echo "$as_me:6583: result: $with_getcap_cache" >&5 ++echo "$as_me:6660: result: $with_getcap_cache" >&5 + echo "${ECHO_T}$with_getcap_cache" >&6 + test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF + #define USE_GETCAP_CACHE 1 +@@ -6589,7 +6666,7 @@ + fi + + ### Use option --disable-home-terminfo to completely remove ~/.terminfo +-echo "$as_me:6592: checking if ~/.terminfo is wanted" >&5 ++echo "$as_me:6669: checking if ~/.terminfo is wanted" >&5 + echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6 + + # Check whether --enable-home-terminfo or --disable-home-terminfo was given. +@@ -6599,13 +6676,13 @@ + else + with_home_terminfo=yes + fi; +-echo "$as_me:6602: result: $with_home_terminfo" >&5 ++echo "$as_me:6679: result: $with_home_terminfo" >&5 + echo "${ECHO_T}$with_home_terminfo" >&6 + test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF + #define USE_HOME_TERMINFO 1 + EOF + +-echo "$as_me:6608: checking if you want to use restricted environment when running as root" >&5 ++echo "$as_me:6685: checking if you want to use restricted environment when running as root" >&5 + echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6 + + # Check whether --enable-root-environ or --disable-root-environ was given. +@@ -6615,7 +6692,7 @@ + else + with_root_environ=yes + fi; +-echo "$as_me:6618: result: $with_root_environ" >&5 ++echo "$as_me:6695: result: $with_root_environ" >&5 + echo "${ECHO_T}$with_root_environ" >&6 + test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF + #define USE_ROOT_ENVIRON 1 +@@ -6629,13 +6706,13 @@ + unlink + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:6632: checking for $ac_func" >&5 ++echo "$as_me:6709: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6638 "configure" ++#line 6715 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -6658,7 +6735,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -6666,16 +6743,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6669: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6672: \$? = $ac_status" >&5 ++ echo "$as_me:6749: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6675: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6752: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6678: \$? = $ac_status" >&5 ++ echo "$as_me:6755: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -6685,7 +6762,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6688: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:6765: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -6702,13 +6779,13 @@ + symlink + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:6705: checking for $ac_func" >&5 ++echo "$as_me:6782: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6711 "configure" ++#line 6788 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -6731,7 +6808,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -6739,16 +6816,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6742: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6819: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6745: \$? = $ac_status" >&5 ++ echo "$as_me:6822: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6748: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6825: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6751: \$? = $ac_status" >&5 ++ echo "$as_me:6828: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -6758,7 +6835,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6761: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:6838: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -6769,7 +6846,7 @@ + done + + else +- echo "$as_me:6772: checking if link/symlink functions work" >&5 ++ echo "$as_me:6849: checking if link/symlink functions work" >&5 + echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6 + if test "${cf_cv_link_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6782,7 +6859,7 @@ + eval 'ac_cv_func_'$cf_func'=error' + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6785 "configure" ++#line 6862 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -6812,15 +6889,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6815: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6892: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6818: \$? = $ac_status" >&5 ++ echo "$as_me:6895: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6820: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6897: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6823: \$? = $ac_status" >&5 ++ echo "$as_me:6900: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_link_funcs="$cf_cv_link_funcs $cf_func" +@@ -6838,7 +6915,7 @@ + test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no + + fi +-echo "$as_me:6841: result: $cf_cv_link_funcs" >&5 ++echo "$as_me:6918: result: $cf_cv_link_funcs" >&5 + echo "${ECHO_T}$cf_cv_link_funcs" >&6 + test "$ac_cv_func_link" = yes && cat >>confdefs.h <<\EOF + #define HAVE_LINK 1 +@@ -6856,7 +6933,7 @@ + # soft links (symbolic links) are useful for some systems where hard links do + # not work, or to make it simpler to copy terminfo trees around. + if test "$ac_cv_func_symlink" = yes ; then +- echo "$as_me:6859: checking if tic should use symbolic links" >&5 ++ echo "$as_me:6936: checking if tic should use symbolic links" >&5 + echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6 + + # Check whether --enable-symlinks or --disable-symlinks was given. +@@ -6866,21 +6943,21 @@ + else + with_symlinks=no + fi; +- echo "$as_me:6869: result: $with_symlinks" >&5 ++ echo "$as_me:6946: result: $with_symlinks" >&5 + echo "${ECHO_T}$with_symlinks" >&6 + fi + + # If we have hard links and did not choose to use soft links instead, there is + # no reason to make this choice optional - use the hard links. + if test "$with_symlinks" = no ; then +- echo "$as_me:6876: checking if tic should use hard links" >&5 ++ echo "$as_me:6953: checking if tic should use hard links" >&5 + echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6 + if test "$ac_cv_func_link" = yes ; then + with_links=yes + else + with_links=no + fi +- echo "$as_me:6883: result: $with_links" >&5 ++ echo "$as_me:6960: result: $with_links" >&5 + echo "${ECHO_T}$with_links" >&6 + fi + +@@ -6893,7 +6970,7 @@ + EOF + + ### use option --enable-broken-linker to force on use of broken-linker support +-echo "$as_me:6896: checking if you want broken-linker support code" >&5 ++echo "$as_me:6973: checking if you want broken-linker support code" >&5 + echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 + + # Check whether --enable-broken_linker or --disable-broken_linker was given. +@@ -6903,7 +6980,7 @@ + else + with_broken_linker=${BROKEN_LINKER:-no} + fi; +-echo "$as_me:6906: result: $with_broken_linker" >&5 ++echo "$as_me:6983: result: $with_broken_linker" >&5 + echo "${ECHO_T}$with_broken_linker" >&6 + + BROKEN_LINKER=0 +@@ -6923,14 +7000,14 @@ + BROKEN_LINKER=1 + test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 + +-echo "${as_me:-configure}:6926: testing cygwin linker is broken anyway ..." 1>&5 ++echo "${as_me:-configure}:7003: testing cygwin linker is broken anyway ..." 1>&5 + + ;; + esac + fi + + ### use option --enable-bsdpad to have tputs process BSD-style prefix padding +-echo "$as_me:6933: checking if tputs should process BSD-style prefix padding" >&5 ++echo "$as_me:7010: checking if tputs should process BSD-style prefix padding" >&5 + echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6 + + # Check whether --enable-bsdpad or --disable-bsdpad was given. +@@ -6940,7 +7017,7 @@ + else + with_bsdpad=no + fi; +-echo "$as_me:6943: result: $with_bsdpad" >&5 ++echo "$as_me:7020: result: $with_bsdpad" >&5 + echo "${ECHO_T}$with_bsdpad" >&6 + test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF + #define BSD_TPUTS 1 +@@ -6962,7 +7039,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[456]*) #(vi ++aix[4-7]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -6973,6 +7050,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -6990,17 +7068,18 @@ + ;; + irix[56].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + +-echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5 ++echo "$as_me:7075: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 7003 "configure" ++#line 7082 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -7015,16 +7094,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7018: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7097: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7021: \$? = $ac_status" >&5 ++ echo "$as_me:7100: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7103: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7027: \$? = $ac_status" >&5 ++ echo "$as_me:7106: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7033,7 +7112,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 7036 "configure" ++#line 7115 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -7048,16 +7127,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7051: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7130: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7054: \$? = $ac_status" >&5 ++ echo "$as_me:7133: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7057: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7136: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7060: \$? = $ac_status" >&5 ++ echo "$as_me:7139: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -7072,51 +7151,45 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:7075: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:7154: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> +- ;; +-netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw +- ;; +-openbsd*) #(vi +- # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +- ;; +-osf[45]*) #(vi +- cf_xopen_source="-D_OSF_SOURCE" +- ;; +-nto-qnx*) #(vi +- cf_xopen_source="-D_QNX_SOURCE" +- ;; +-sco*) #(vi +- # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer +- ;; +-solaris2.1[0-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[1-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__" +- ;; +-*) +- echo "$as_me:7105: checking if we should define _XOPEN_SOURCE" >&5 +-echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +-if test "${cf_cv_xopen_source+set}" = set; then ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ++cf_save_CFLAGS="$CFLAGS" ++cf_save_CPPFLAGS="$CPPFLAGS" ++ ++cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++echo "$as_me:7176: checking if we should define _POSIX_C_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ++echo "${as_me:-configure}:7182: testing if the symbol is already defined go no further ..." 1>&5 ++ + cat >conftest.$ac_ext <<_ACEOF +-#line 7112 "configure" ++#line 7185 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifndef _XOPEN_SOURCE ++#ifndef _POSIX_C_SOURCE + make an error + #endif + ; +@@ -7124,32 +7197,44 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7127: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7200: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7130: \$? = $ac_status" >&5 ++ echo "$as_me:7203: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7133: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7206: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7136: \$? = $ac_status" >&5 ++ echo "$as_me:7209: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ cf_cv_posix_c_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- cat >conftest.$ac_ext <<_ACEOF +-#line 7145 "configure" ++cf_want_posix_source=no ++ case .$cf_POSIX_C_SOURCE in #(vi ++ .[12]??*) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ ;; ++ .2) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ cf_want_posix_source=yes ++ ;; ++ .*) ++ cf_want_posix_source=yes ++ ;; ++ esac ++ if test "$cf_want_posix_source" = yes ; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7230 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifdef _XOPEN_SOURCE ++#ifdef _POSIX_SOURCE + make an error + #endif + ; +@@ -7157,50 +7242,87 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7160: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7245: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7163: \$? = $ac_status" >&5 ++ echo "$as_me:7248: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7169: \$? = $ac_status" >&5 ++ echo "$as_me:7254: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_xopen_source=$cf_XOPEN_SOURCE ++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$cf_save" ++ fi ++ ++echo "${as_me:-configure}:7265: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++ ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" ++ ++echo "${as_me:-configure}:7270: testing if the second compile does not leave our definition intact error ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7273 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++int ++main () ++{ + ++#ifndef _POSIX_C_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7288: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7291: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7294: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7297: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:7184: result: $cf_cv_xopen_source" >&5 +-echo "${ECHO_T}$cf_cv_xopen_source" >&6 +- if test "$cf_cv_xopen_source" != no ; then +- +-CFLAGS=`echo "$CFLAGS" | \ +- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++rm -f conftest.$ac_objext conftest.$ac_ext + +-CPPFLAGS=`echo "$CPPFLAGS" | \ +- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++fi ++echo "$as_me:7313: result: $cf_cv_posix_c_source" >&5 ++echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++if test "$cf_cv_posix_c_source" != no ; then ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS" + + cf_fix_cppflags=no + cf_new_cflags= + cf_new_cppflags= + cf_new_extra_cppflags= + +-for cf_add_cflags in $cf_temp_xopen_source ++for cf_add_cflags in $cf_cv_posix_c_source + do + case $cf_fix_cppflags in + no) +@@ -7273,9 +7395,217 @@ + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + +- fi ++fi + +-cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ;; ++netbsd*) #(vi ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[4-9]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 ++ ;; ++openbsd*) #(vi ++ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ++ ;; ++osf[45]*) #(vi ++ cf_xopen_source="-D_OSF_SOURCE" ++ ;; ++nto-qnx*) #(vi ++ cf_xopen_source="-D_QNX_SOURCE" ++ ;; ++sco*) #(vi ++ # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ++ ;; ++solaris2.*) #(vi ++ cf_xopen_source="-D__EXTENSIONS__" ++ ;; ++*) ++ ++echo "$as_me:7426: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7433 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7452: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7455: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7458: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7461: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7470 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7489: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7492: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7495: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7498: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:7513: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 ++ ++if test "$cf_cv_xopen_source" != no ; then ++ ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_temp_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + + cf_save_CFLAGS="$CFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" +@@ -7288,16 +7618,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:7291: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:7621: checking if we should define _POSIX_C_SOURCE" >&5 + echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:7297: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me:-configure}:7627: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 7300 "configure" ++#line 7630 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -7312,16 +7642,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7315: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7318: \$? = $ac_status" >&5 ++ echo "$as_me:7648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7321: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7324: \$? = $ac_status" >&5 ++ echo "$as_me:7654: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -7342,14 +7672,362 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 7345 "configure" ++#line 7675 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++int ++main () ++{ ++ ++#ifdef _POSIX_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7690: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7693: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7696: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7699: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ fi ++ ++echo "${as_me:-configure}:7710: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++ ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" ++ ++echo "${as_me:-configure}:7715: testing if the second compile does not leave our definition intact error ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7718 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++int ++main () ++{ ++ ++#ifndef _POSIX_C_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7733: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7736: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7739: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7742: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ CPPFLAGS="$cf_save_CPPFLAGS" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:7758: result: $cf_cv_posix_c_source" >&5 ++echo "${ECHO_T}$cf_cv_posix_c_source" >&6 ++ ++if test "$cf_cv_posix_c_source" != no ; then ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_cv_posix_c_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ ;; ++esac ++ ++if test -n "$cf_xopen_source" ; then ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ echo "$as_me:7931: checking if _XOPEN_SOURCE really is set" >&5 ++echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7934 "configure" ++#include "confdefs.h" ++#include <stdlib.h> ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7949: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7952: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7955: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7958: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ echo "$as_me:7967: result: $cf_XOPEN_SOURCE_set" >&5 ++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 7972 "configure" ++#include "confdefs.h" ++#include <stdlib.h> ++int ++main () ++{ ++ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:7987: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:7990: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:7993: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:7996: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set_ok=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set_ok=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ { echo "$as_me:8007: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} ++ fi ++ else ++ ++echo "$as_me:8012: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 8019 "configure" + #include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> + #include <sys/types.h> ++ + int + main () + { + +-#ifdef _POSIX_SOURCE ++#ifndef _XOPEN_SOURCE + make an error + #endif + ; +@@ -7357,42 +8035,36 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7360: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8038: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7363: \$? = $ac_status" >&5 ++ echo "$as_me:8041: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7366: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8044: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7369: \$? = $ac_status" >&5 ++ echo "$as_me:8047: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- : ++ cf_cv_xopen_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +- fi +- +-echo "${as_me:-configure}:7380: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +- +- CFLAGS="$cf_trim_CFLAGS" +- CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" +- +-echo "${as_me:-configure}:7385: testing if the second compile does not leave our definition intact error ..." 1>&5 +- ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 7388 "configure" ++#line 8056 "configure" + #include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> + #include <sys/types.h> ++ + int + main () + { + +-#ifndef _POSIX_C_SOURCE ++#ifdef _XOPEN_SOURCE + make an error + #endif + ; +@@ -7400,129 +8072,51 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7403: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8075: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7406: \$? = $ac_status" >&5 ++ echo "$as_me:8078: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7409: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8081: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7412: \$? = $ac_status" >&5 ++ echo "$as_me:8084: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- : ++ cf_cv_xopen_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_posix_c_source=no ++cf_cv_xopen_source=$cf_XOPEN_SOURCE + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- CPPFLAGS="$cf_save_CPPFLAGS" ++ CPPFLAGS="$cf_save" + + fi + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:7428: result: $cf_cv_posix_c_source" >&5 +-echo "${ECHO_T}$cf_cv_posix_c_source" >&6 +- +-if test "$cf_cv_posix_c_source" != no ; then +- CFLAGS="$cf_trim_CFLAGS" +- CPPFLAGS="$cf_trim_CPPFLAGS" +- +-cf_fix_cppflags=no +-cf_new_cflags= +-cf_new_cppflags= +-cf_new_extra_cppflags= +- +-for cf_add_cflags in $cf_cv_posix_c_source +-do +-case $cf_fix_cppflags in +-no) +- case $cf_add_cflags in #(vi +- -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +- case $cf_add_cflags in +- -D*) +- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++echo "$as_me:8099: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 + +- test "${cf_add_cflags}" != "${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=yes ++if test "$cf_cv_xopen_source" != no ; then + +- if test $cf_fix_cppflags = yes ; then +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- continue +- elif test "${cf_tst_cflags}" = "\"'" ; then +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- continue +- fi +- ;; +- esac +- case "$CPPFLAGS" in +- *$cf_add_cflags) #(vi +- ;; +- *) #(vi +- case $cf_add_cflags in #(vi +- -D*) +- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + + CPPFLAGS=`echo "$CPPFLAGS" | \ +- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +- +- ;; +- esac +- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" +- ;; +- esac +- ;; +- *) +- cf_new_cflags="$cf_new_cflags $cf_add_cflags" +- ;; +- esac +- ;; +-yes) +- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" +- +- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +- +- test "${cf_add_cflags}" != "${cf_tst_cflags}" \ +- && test -z "${cf_tst_cflags}" \ +- && cf_fix_cppflags=no +- ;; +-esac +-done +- +-if test -n "$cf_new_cflags" ; then +- +- CFLAGS="$CFLAGS $cf_new_cflags" +-fi +- +-if test -n "$cf_new_cppflags" ; then +- +- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +-fi +- +-if test -n "$cf_new_extra_cppflags" ; then +- +- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +-fi +- +-fi +- +- ;; +-esac ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + +-if test -n "$cf_xopen_source" ; then ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + + cf_fix_cppflags=no + cf_new_cflags= + cf_new_cppflags= + cf_new_extra_cppflags= + +-for cf_add_cflags in $cf_xopen_source ++for cf_add_cflags in $cf_temp_xopen_source + do + case $cf_fix_cppflags in + no) +@@ -7597,16 +8191,19 @@ + + fi + ++ fi ++fi ++ + # Work around breakage on OS X + +-echo "$as_me:7602: checking if SIGWINCH is defined" >&5 ++echo "$as_me:8199: checking if SIGWINCH is defined" >&5 + echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 + if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 7609 "configure" ++#line 8206 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -7621,23 +8218,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7624: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8221: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7627: \$? = $ac_status" >&5 ++ echo "$as_me:8224: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7630: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8227: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7633: \$? = $ac_status" >&5 ++ echo "$as_me:8230: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 7640 "configure" ++#line 8237 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -7655,16 +8252,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7658: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8255: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7661: \$? = $ac_status" >&5 ++ echo "$as_me:8258: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7664: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8261: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7667: \$? = $ac_status" >&5 ++ echo "$as_me:8264: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -7678,11 +8275,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:7681: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:8278: result: $cf_cv_define_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + + if test "$cf_cv_define_sigwinch" = maybe ; then +-echo "$as_me:7685: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:8282: checking for actual SIGWINCH definition" >&5 + echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 + if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7693,7 +8290,7 @@ + while test $cf_sigwinch != 1 + do + cat >conftest.$ac_ext <<_ACEOF +-#line 7696 "configure" ++#line 8293 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -7715,16 +8312,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7718: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8315: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7721: \$? = $ac_status" >&5 ++ echo "$as_me:8318: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7724: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7727: \$? = $ac_status" >&5 ++ echo "$as_me:8324: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -7738,7 +8335,7 @@ + done + + fi +-echo "$as_me:7741: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:8338: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -7748,13 +8345,13 @@ + + # Checks for CODESET support. + +- echo "$as_me:7751: checking for nl_langinfo and CODESET" >&5 ++ echo "$as_me:8348: checking for nl_langinfo and CODESET" >&5 + echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 + if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7757 "configure" ++#line 8354 "configure" + #include "confdefs.h" + #include <langinfo.h> + int +@@ -7766,16 +8363,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7769: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8366: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7772: \$? = $ac_status" >&5 ++ echo "$as_me:8369: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7775: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8372: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7778: \$? = $ac_status" >&5 ++ echo "$as_me:8375: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -7786,7 +8383,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:7789: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:8386: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then + +@@ -7800,7 +8397,7 @@ + NCURSES_OK_WCHAR_T= + NCURSES_OK_WINT_T= + +-echo "$as_me:7803: checking if you want wide-character code" >&5 ++echo "$as_me:8400: checking if you want wide-character code" >&5 + echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 + + # Check whether --enable-widec or --disable-widec was given. +@@ -7810,7 +8407,7 @@ + else + with_widec=no + fi; +-echo "$as_me:7813: result: $with_widec" >&5 ++echo "$as_me:8410: result: $with_widec" >&5 + echo "${ECHO_T}$with_widec" >&6 + if test "$with_widec" = yes ; then + LIB_SUFFIX="w${LIB_SUFFIX}" +@@ -7818,15 +8415,63 @@ + #define USE_WIDEC_SUPPORT 1 + EOF + +- case "$CFLAGS $CPPFLAGS" in #(vi +- *-D_XOPEN_SOURCE=500) #(vi +- ;; +- *) ++ cat >>confdefs.h <<\EOF ++#define NCURSES_WIDECHAR 1 ++EOF ++ ++echo "$as_me:8422: checking if wchar.h can be used as is" >&5 ++echo $ECHO_N "checking if wchar.h can be used as is... $ECHO_C" >&6 ++if test "${cf_cv_wchar_h_okay+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line 8429 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <wchar.h> ++ ++int ++main () ++{ ++ ++ wint_t foo = 0; ++ int bar = iswpunct(foo) ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:8446: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:8449: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:8452: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:8455: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_wchar_h_okay=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_wchar_h_okay=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:8465: result: $cf_cv_wchar_h_okay" >&5 ++echo "${ECHO_T}$cf_cv_wchar_h_okay" >&6 ++ ++if test $cf_cv_wchar_h_okay = no ++then + +-echo "$as_me:7826: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:8471: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 7829 "configure" ++#line 8474 "configure" + #include "confdefs.h" + #include <sys/types.h> + +@@ -7842,16 +8487,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7845: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8490: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7848: \$? = $ac_status" >&5 ++ echo "$as_me:8493: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7851: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8496: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7854: \$? = $ac_status" >&5 ++ echo "$as_me:8499: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no + else +@@ -7860,16 +8505,16 @@ + cf_result=yes + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:7863: result: $cf_result" >&5 ++echo "$as_me:8508: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = yes ; then + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + elif test "x" != "x" ; then +- echo "$as_me:7869: checking checking for compatible value versus " >&5 ++ echo "$as_me:8514: checking checking for compatible value versus " >&5 + echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 7872 "configure" ++#line 8517 "configure" + #include "confdefs.h" + #include <sys/types.h> + +@@ -7885,16 +8530,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7888: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8533: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7891: \$? = $ac_status" >&5 ++ echo "$as_me:8536: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7894: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8539: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7897: \$? = $ac_status" >&5 ++ echo "$as_me:8542: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -7903,7 +8548,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:7906: result: $cf_result" >&5 ++ echo "$as_me:8551: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = no ; then + # perhaps we can override it - try... +@@ -7911,8 +8556,7 @@ + fi + fi + +- ;; +- esac ++fi + + # with_overwrite=no + NCURSES_CH_T=cchar_t +@@ -7920,13 +8564,13 @@ + for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc wcsrtombs mbsrtowcs wcstombs mbstowcs + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:7923: checking for $ac_func" >&5 ++echo "$as_me:8567: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7929 "configure" ++#line 8573 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -7949,7 +8593,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -7957,16 +8601,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7960: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8604: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7963: \$? = $ac_status" >&5 ++ echo "$as_me:8607: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7966: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7969: \$? = $ac_status" >&5 ++ echo "$as_me:8613: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -7976,7 +8620,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7979: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:8623: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -7988,7 +8632,7 @@ + + if test "$ac_cv_func_putwc" != yes ; then + +-echo "$as_me:7991: checking for multibyte character support" >&5 ++echo "$as_me:8635: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7996,7 +8640,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7999 "configure" ++#line 8643 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8009,16 +8653,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8012: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8656: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8015: \$? = $ac_status" >&5 ++ echo "$as_me:8659: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8021: \$? = $ac_status" >&5 ++ echo "$as_me:8665: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -8030,12 +8674,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:8033: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:8677: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 8038 "configure" ++#line 8682 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -8048,16 +8692,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8051: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8054: \$? = $ac_status" >&5 ++ echo "$as_me:8698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8057: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8060: \$? = $ac_status" >&5 ++ echo "$as_me:8704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -8071,7 +8715,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 8074 "configure" ++#line 8718 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -8084,16 +8728,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8087: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8731: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8090: \$? = $ac_status" >&5 ++ echo "$as_me:8734: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8093: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8096: \$? = $ac_status" >&5 ++ echo "$as_me:8740: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -8110,9 +8754,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:8113: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:8757: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:8115: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:8759: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -8225,11 +8869,11 @@ + if test -d $cf_cv_header_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:8228: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8872: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 8232 "configure" ++#line 8876 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -8242,21 +8886,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8245: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8889: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8248: \$? = $ac_status" >&5 ++ echo "$as_me:8892: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8251: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8254: \$? = $ac_status" >&5 ++ echo "$as_me:8898: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:8259: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8903: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -8274,7 +8918,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:8277: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:8921: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -8371,13 +9015,13 @@ + if test -d $cf_cv_library_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:8374: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:9018: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 8380 "configure" ++#line 9024 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -8390,21 +9034,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8393: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9037: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8396: \$? = $ac_status" >&5 ++ echo "$as_me:9040: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8399: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9043: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8402: \$? = $ac_status" >&5 ++ echo "$as_me:9046: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:8407: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:9051: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -8446,7 +9090,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8449: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:9093: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -8480,7 +9124,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 8483 "configure" ++#line 9127 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8492,16 +9136,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8495: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9139: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8498: \$? = $ac_status" >&5 ++ echo "$as_me:9142: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8501: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8504: \$? = $ac_status" >&5 ++ echo "$as_me:9148: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8518,7 +9162,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8521: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9165: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8552,7 +9196,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:8555: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:9199: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -8569,14 +9213,14 @@ + fi + + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:8572: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:9216: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8579 "configure" ++#line 9223 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8594,23 +9238,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8600: \$? = $ac_status" >&5 ++ echo "$as_me:9244: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8603: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9247: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8606: \$? = $ac_status" >&5 ++ echo "$as_me:9250: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8613 "configure" ++#line 9257 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8629,16 +9273,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8632: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9276: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8635: \$? = $ac_status" >&5 ++ echo "$as_me:9279: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8638: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9282: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8641: \$? = $ac_status" >&5 ++ echo "$as_me:9285: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -8650,7 +9294,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:8653: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:9297: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -8667,14 +9311,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:8670: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:9314: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8677 "configure" ++#line 9321 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8692,23 +9336,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8695: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9339: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8698: \$? = $ac_status" >&5 ++ echo "$as_me:9342: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8701: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9345: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8704: \$? = $ac_status" >&5 ++ echo "$as_me:9348: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8711 "configure" ++#line 9355 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8727,16 +9371,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9374: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8733: \$? = $ac_status" >&5 ++ echo "$as_me:9377: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8736: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9380: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8739: \$? = $ac_status" >&5 ++ echo "$as_me:9383: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -8748,7 +9392,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:8751: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:9395: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -8770,14 +9414,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:8773: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:9417: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 8780 "configure" ++#line 9424 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8795,23 +9439,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8798: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9442: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8801: \$? = $ac_status" >&5 ++ echo "$as_me:9445: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8804: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9448: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8807: \$? = $ac_status" >&5 ++ echo "$as_me:9451: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 8814 "configure" ++#line 9458 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -8830,16 +9474,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9477: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8836: \$? = $ac_status" >&5 ++ echo "$as_me:9480: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8839: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8842: \$? = $ac_status" >&5 ++ echo "$as_me:9486: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -8851,7 +9495,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:8854: result: $cf_cv_wint_t" >&5 ++echo "$as_me:9498: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -8890,7 +9534,7 @@ + ;; + esac + +-echo "$as_me:8893: checking whether to enable _LP64 definition in curses.h" >&5 ++echo "$as_me:9537: checking whether to enable _LP64 definition in curses.h" >&5 + echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6 + + # Check whether --enable-lp64 or --disable-lp64 was given. +@@ -8900,7 +9544,7 @@ + else + with_lp64=$default_with_lp64 + fi; +-echo "$as_me:8903: result: $with_lp64" >&5 ++echo "$as_me:9547: result: $with_lp64" >&5 + echo "${ECHO_T}$with_lp64" >&6 + + if test "$with_lp64" = yes ; then +@@ -8916,7 +9560,7 @@ + fi; + if test "$enable_largefile" != no; then + +- echo "$as_me:8919: checking for special C compiler options needed for large files" >&5 ++ echo "$as_me:9563: checking for special C compiler options needed for large files" >&5 + echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8928,7 +9572,7 @@ + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +-#line 8931 "configure" ++#line 9575 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -8948,16 +9592,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8951: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9595: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8954: \$? = $ac_status" >&5 ++ echo "$as_me:9598: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8957: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9601: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8960: \$? = $ac_status" >&5 ++ echo "$as_me:9604: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -8967,16 +9611,16 @@ + rm -f conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8970: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8973: \$? = $ac_status" >&5 ++ echo "$as_me:9617: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8976: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9620: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8979: \$? = $ac_status" >&5 ++ echo "$as_me:9623: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break + else +@@ -8990,13 +9634,13 @@ + rm -f conftest.$ac_ext + fi + fi +-echo "$as_me:8993: result: $ac_cv_sys_largefile_CC" >&5 ++echo "$as_me:9637: result: $ac_cv_sys_largefile_CC" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + +- echo "$as_me:8999: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++ echo "$as_me:9643: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9004,7 +9648,7 @@ + while :; do + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +-#line 9007 "configure" ++#line 9651 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -9024,16 +9668,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9027: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9671: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9030: \$? = $ac_status" >&5 ++ echo "$as_me:9674: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9033: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9677: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9036: \$? = $ac_status" >&5 ++ echo "$as_me:9680: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -9042,7 +9686,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 9045 "configure" ++#line 9689 "configure" + #include "confdefs.h" + #define _FILE_OFFSET_BITS 64 + #include <sys/types.h> +@@ -9063,16 +9707,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9066: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9710: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9069: \$? = $ac_status" >&5 ++ echo "$as_me:9713: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9072: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9716: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9075: \$? = $ac_status" >&5 ++ echo "$as_me:9719: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_file_offset_bits=64; break + else +@@ -9083,7 +9727,7 @@ + break + done + fi +-echo "$as_me:9086: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "$as_me:9730: result: $ac_cv_sys_file_offset_bits" >&5 + echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 + if test "$ac_cv_sys_file_offset_bits" != no; then + +@@ -9093,7 +9737,7 @@ + + fi + rm -rf conftest* +- echo "$as_me:9096: checking for _LARGE_FILES value needed for large files" >&5 ++ echo "$as_me:9740: checking for _LARGE_FILES value needed for large files" >&5 + echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9101,7 +9745,7 @@ + while :; do + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +-#line 9104 "configure" ++#line 9748 "configure" + #include "confdefs.h" + #include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. +@@ -9121,16 +9765,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9124: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9768: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9127: \$? = $ac_status" >&5 ++ echo "$as_me:9771: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9130: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9133: \$? = $ac_status" >&5 ++ echo "$as_me:9777: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -9139,7 +9783,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 9142 "configure" ++#line 9786 "configure" + #include "confdefs.h" + #define _LARGE_FILES 1 + #include <sys/types.h> +@@ -9160,16 +9804,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9163: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9807: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9166: \$? = $ac_status" >&5 ++ echo "$as_me:9810: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9169: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9172: \$? = $ac_status" >&5 ++ echo "$as_me:9816: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_large_files=1; break + else +@@ -9180,7 +9824,7 @@ + break + done + fi +-echo "$as_me:9183: result: $ac_cv_sys_large_files" >&5 ++echo "$as_me:9827: result: $ac_cv_sys_large_files" >&5 + echo "${ECHO_T}$ac_cv_sys_large_files" >&6 + if test "$ac_cv_sys_large_files" != no; then + +@@ -9193,7 +9837,7 @@ + fi + + if test "$enable_largefile" != no ; then +- echo "$as_me:9196: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++ echo "$as_me:9840: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 + if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9201,7 +9845,7 @@ + while :; do + ac_cv_sys_largefile_source=no + cat >conftest.$ac_ext <<_ACEOF +-#line 9204 "configure" ++#line 9848 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -9213,16 +9857,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9216: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9860: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9219: \$? = $ac_status" >&5 ++ echo "$as_me:9863: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9222: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9866: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9225: \$? = $ac_status" >&5 ++ echo "$as_me:9869: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -9231,7 +9875,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 9234 "configure" ++#line 9878 "configure" + #include "confdefs.h" + #define _LARGEFILE_SOURCE 1 + #include <stdio.h> +@@ -9244,16 +9888,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9891: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9250: \$? = $ac_status" >&5 ++ echo "$as_me:9894: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9253: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9897: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9256: \$? = $ac_status" >&5 ++ echo "$as_me:9900: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sys_largefile_source=1; break + else +@@ -9264,7 +9908,7 @@ + break + done + fi +-echo "$as_me:9267: result: $ac_cv_sys_largefile_source" >&5 ++echo "$as_me:9911: result: $ac_cv_sys_largefile_source" >&5 + echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 + if test "$ac_cv_sys_largefile_source" != no; then + +@@ -9278,13 +9922,13 @@ + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +-echo "$as_me:9281: checking for fseeko" >&5 ++echo "$as_me:9925: checking for fseeko" >&5 + echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 + if test "${ac_cv_func_fseeko+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9287 "configure" ++#line 9931 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -9296,16 +9940,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9299: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9943: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9302: \$? = $ac_status" >&5 ++ echo "$as_me:9946: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9305: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9949: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9308: \$? = $ac_status" >&5 ++ echo "$as_me:9952: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +@@ -9315,7 +9959,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9318: result: $ac_cv_func_fseeko" >&5 ++echo "$as_me:9962: result: $ac_cv_func_fseeko" >&5 + echo "${ECHO_T}$ac_cv_func_fseeko" >&6 + if test $ac_cv_func_fseeko = yes; then + +@@ -9336,14 +9980,14 @@ + test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " + test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " + +- echo "$as_me:9339: checking whether to use struct dirent64" >&5 ++ echo "$as_me:9983: checking whether to use struct dirent64" >&5 + echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 + if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 9346 "configure" ++#line 9990 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -9364,16 +10008,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9367: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10011: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9370: \$? = $ac_status" >&5 ++ echo "$as_me:10014: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10017: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9376: \$? = $ac_status" >&5 ++ echo "$as_me:10020: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_struct_dirent64=yes + else +@@ -9384,7 +10028,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9387: result: $cf_cv_struct_dirent64" >&5 ++echo "$as_me:10031: result: $cf_cv_struct_dirent64" >&5 + echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF + #define HAVE_STRUCT_DIRENT64 1 +@@ -9393,7 +10037,7 @@ + fi + + ### use option --disable-tparm-varargs to make tparm() conform to X/Open +-echo "$as_me:9396: checking if you want tparm not to use X/Open fixed-parameter list" >&5 ++echo "$as_me:10040: checking if you want tparm not to use X/Open fixed-parameter list" >&5 + echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6 + + # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given. +@@ -9403,14 +10047,14 @@ + else + with_tparm_varargs=yes + fi; +-echo "$as_me:9406: result: $with_tparm_varargs" >&5 ++echo "$as_me:10050: result: $with_tparm_varargs" >&5 + echo "${ECHO_T}$with_tparm_varargs" >&6 + NCURSES_TPARM_VARARGS=0 + test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1 + + ### use option --disable-tic-depends to make libtic not explicitly depend on ncurses/ncursesw + if test "$with_ticlib" != no ; then +-echo "$as_me:9413: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 ++echo "$as_me:10057: checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library" >&5 + echo $ECHO_N "checking if you want tic library to use explicit dependency on ncurses$LIB_SUFFIX library... $ECHO_C" >&6 + + # Check whether --enable-tic-depends or --disable-tic-depends was given. +@@ -9420,14 +10064,14 @@ + else + with_tic_depends=yes + fi; +-echo "$as_me:9423: result: $with_tic_depends" >&5 ++echo "$as_me:10067: result: $with_tic_depends" >&5 + echo "${ECHO_T}$with_tic_depends" >&6 + else + with_tic_depends=no + fi + + ### use option --with-bool to override bool's type +-echo "$as_me:9430: checking for type of bool" >&5 ++echo "$as_me:10074: checking for type of bool" >&5 + echo $ECHO_N "checking for type of bool... $ECHO_C" >&6 + + # Check whether --with-bool or --without-bool was given. +@@ -9437,10 +10081,10 @@ + else + NCURSES_BOOL=auto + fi; +-echo "$as_me:9440: result: $NCURSES_BOOL" >&5 ++echo "$as_me:10084: result: $NCURSES_BOOL" >&5 + echo "${ECHO_T}$NCURSES_BOOL" >&6 + +-echo "$as_me:9443: checking for alternate terminal capabilities file" >&5 ++echo "$as_me:10087: checking for alternate terminal capabilities file" >&5 + echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6 + + # Check whether --with-caps or --without-caps was given. +@@ -9451,11 +10095,11 @@ + TERMINFO_CAPS=Caps + fi; + test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps +-echo "$as_me:9454: result: $TERMINFO_CAPS" >&5 ++echo "$as_me:10098: result: $TERMINFO_CAPS" >&5 + echo "${ECHO_T}$TERMINFO_CAPS" >&6 + + ### use option --with-chtype to override chtype's type +-echo "$as_me:9458: checking for type of chtype" >&5 ++echo "$as_me:10102: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + + # Check whether --with-chtype or --without-chtype was given. +@@ -9465,11 +10109,11 @@ + else + NCURSES_CHTYPE=auto + fi; +-echo "$as_me:9468: result: $NCURSES_CHTYPE" >&5 ++echo "$as_me:10112: result: $NCURSES_CHTYPE" >&5 + echo "${ECHO_T}$NCURSES_CHTYPE" >&6 + + ### use option --with-ospeed to override ospeed's type +-echo "$as_me:9472: checking for type of ospeed" >&5 ++echo "$as_me:10116: checking for type of ospeed" >&5 + echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6 + + # Check whether --with-ospeed or --without-ospeed was given. +@@ -9479,11 +10123,11 @@ + else + NCURSES_OSPEED=short + fi; +-echo "$as_me:9482: result: $NCURSES_OSPEED" >&5 ++echo "$as_me:10126: result: $NCURSES_OSPEED" >&5 + echo "${ECHO_T}$NCURSES_OSPEED" >&6 + + ### use option --with-mmask-t to override mmask_t's type +-echo "$as_me:9486: checking for type of mmask_t" >&5 ++echo "$as_me:10130: checking for type of mmask_t" >&5 + echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6 + + # Check whether --with-mmask-t or --without-mmask-t was given. +@@ -9493,11 +10137,11 @@ + else + NCURSES_MMASK_T=auto + fi; +-echo "$as_me:9496: result: $NCURSES_MMASK_T" >&5 ++echo "$as_me:10140: result: $NCURSES_MMASK_T" >&5 + echo "${ECHO_T}$NCURSES_MMASK_T" >&6 + + ### use option --with-ccharw-max to override CCHARW_MAX size +-echo "$as_me:9500: checking for size CCHARW_MAX" >&5 ++echo "$as_me:10144: checking for size CCHARW_MAX" >&5 + echo $ECHO_N "checking for size CCHARW_MAX... $ECHO_C" >&6 + + # Check whether --with-ccharw-max or --without-ccharw-max was given. +@@ -9507,11 +10151,25 @@ + else + NCURSES_CCHARW_MAX=5 + fi; +-echo "$as_me:9510: result: $NCURSES_CCHARW_MAX" >&5 ++echo "$as_me:10154: result: $NCURSES_CCHARW_MAX" >&5 + echo "${ECHO_T}$NCURSES_CCHARW_MAX" >&6 + ++### use option --with-tparm-arg to override tparm's argument type ++echo "$as_me:10158: checking for type of tparm args" >&5 ++echo $ECHO_N "checking for type of tparm args... $ECHO_C" >&6 ++ ++# Check whether --with-tparm-arg or --without-tparm-arg was given. ++if test "${with_tparm_arg+set}" = set; then ++ withval="$with_tparm_arg" ++ NCURSES_TPARM_ARG="$withval" ++else ++ NCURSES_TPARM_ARG=long ++fi; ++echo "$as_me:10168: result: $NCURSES_TPARM_ARG" >&5 ++echo "${ECHO_T}$NCURSES_TPARM_ARG" >&6 ++ + ### Enable compiling-in rcs id's +-echo "$as_me:9514: checking if RCS identifiers should be compiled-in" >&5 ++echo "$as_me:10172: checking if RCS identifiers should be compiled-in" >&5 + echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 + + # Check whether --with-rcs-ids or --without-rcs-ids was given. +@@ -9521,7 +10179,7 @@ + else + with_rcs_ids=no + fi; +-echo "$as_me:9524: result: $with_rcs_ids" >&5 ++echo "$as_me:10182: result: $with_rcs_ids" >&5 + echo "${ECHO_T}$with_rcs_ids" >&6 + test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF + #define USE_RCS_IDS 1 +@@ -9529,7 +10187,7 @@ + + ############################################################################### + +-echo "$as_me:9532: checking format of man-pages" >&5 ++echo "$as_me:10190: checking format of man-pages" >&5 + echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6 + + # Check whether --with-manpage-format or --without-manpage-format was given. +@@ -9618,14 +10276,14 @@ + ;; + esac + +-echo "$as_me:9621: result: $MANPAGE_FORMAT" >&5 ++echo "$as_me:10279: result: $MANPAGE_FORMAT" >&5 + echo "${ECHO_T}$MANPAGE_FORMAT" >&6 + if test -n "$cf_unknown" ; then +- { echo "$as_me:9624: WARNING: Unexpected manpage-format $cf_unknown" >&5 ++ { echo "$as_me:10282: WARNING: Unexpected manpage-format $cf_unknown" >&5 + echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;} + fi + +-echo "$as_me:9628: checking for manpage renaming" >&5 ++echo "$as_me:10286: checking for manpage renaming" >&5 + echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6 + + # Check whether --with-manpage-renames or --without-manpage-renames was given. +@@ -9653,7 +10311,7 @@ + if test -f $srcdir/man/$MANPAGE_RENAMES ; then + MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES + elif test ! -f $MANPAGE_RENAMES ; then +- { { echo "$as_me:9656: error: not a filename: $MANPAGE_RENAMES" >&5 ++ { { echo "$as_me:10314: error: not a filename: $MANPAGE_RENAMES" >&5 + echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9667,10 +10325,10 @@ + fi + fi + +-echo "$as_me:9670: result: $MANPAGE_RENAMES" >&5 ++echo "$as_me:10328: result: $MANPAGE_RENAMES" >&5 + echo "${ECHO_T}$MANPAGE_RENAMES" >&6 + +-echo "$as_me:9673: checking if manpage aliases will be installed" >&5 ++echo "$as_me:10331: checking if manpage aliases will be installed" >&5 + echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6 + + # Check whether --with-manpage-aliases or --without-manpage-aliases was given. +@@ -9681,7 +10339,7 @@ + MANPAGE_ALIASES=yes + fi; + +-echo "$as_me:9684: result: $MANPAGE_ALIASES" >&5 ++echo "$as_me:10342: result: $MANPAGE_ALIASES" >&5 + echo "${ECHO_T}$MANPAGE_ALIASES" >&6 + + case "x$LN_S" in #(vi +@@ -9695,7 +10353,7 @@ + + MANPAGE_SYMLINKS=no + if test "$MANPAGE_ALIASES" = yes ; then +-echo "$as_me:9698: checking if manpage symlinks should be used" >&5 ++echo "$as_me:10356: checking if manpage symlinks should be used" >&5 + echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6 + + # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given. +@@ -9708,17 +10366,17 @@ + + if test "$$cf_use_symlinks" = no; then + if test "$MANPAGE_SYMLINKS" = yes ; then +- { echo "$as_me:9711: WARNING: cannot make symlinks" >&5 ++ { echo "$as_me:10369: WARNING: cannot make symlinks" >&5 + echo "$as_me: WARNING: cannot make symlinks" >&2;} + MANPAGE_SYMLINKS=no + fi + fi + +-echo "$as_me:9717: result: $MANPAGE_SYMLINKS" >&5 ++echo "$as_me:10375: result: $MANPAGE_SYMLINKS" >&5 + echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6 + fi + +-echo "$as_me:9721: checking for manpage tbl" >&5 ++echo "$as_me:10379: checking for manpage tbl" >&5 + echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6 + + # Check whether --with-manpage-tbl or --without-manpage-tbl was given. +@@ -9729,7 +10387,7 @@ + MANPAGE_TBL=no + fi; + +-echo "$as_me:9732: result: $MANPAGE_TBL" >&5 ++echo "$as_me:10390: result: $MANPAGE_TBL" >&5 + echo "${ECHO_T}$MANPAGE_TBL" >&6 + + if test "$prefix" = "NONE" ; then +@@ -9776,6 +10434,7 @@ + # this script is generated by the configure-script CF_MAN_PAGES macro. + + prefix="$cf_prefix" ++datarootdir="$datarootdir" + datadir="$datadir" + + NCURSES_MAJOR="$NCURSES_MAJOR" +@@ -9869,7 +10528,9 @@ + + if test "$MANPAGE_ALIASES" != no ; then + cat >>$cf_edit_man <<CF_EOF +- aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\` ++ nCurses=ignore.3x ++ test $with_curses_h = yes && nCurses=ncurses.3x ++ aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u; test \$inalias = \$nCurses && echo curses\` + CF_EOF + fi + +@@ -9915,6 +10576,13 @@ + fi + CF_EOF + ++if test $with_overwrite != yes ; then ++cat >>$cf_edit_man <<CF_EOF ++ sed -e "/\#[ ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," < \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi ++ + if test $with_curses_h != yes ; then + cat >>$cf_edit_man <<CF_EOF + sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out +@@ -10051,7 +10719,7 @@ + ############################################################################### + + ### Note that some functions (such as const) are normally disabled anyway. +-echo "$as_me:10054: checking if you want to build with function extensions" >&5 ++echo "$as_me:10722: checking if you want to build with function extensions" >&5 + echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 + + # Check whether --enable-ext-funcs or --disable-ext-funcs was given. +@@ -10061,11 +10729,15 @@ + else + with_ext_funcs=yes + fi; +-echo "$as_me:10064: result: $with_ext_funcs" >&5 ++echo "$as_me:10732: result: $with_ext_funcs" >&5 + echo "${ECHO_T}$with_ext_funcs" >&6 + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 + cat >>confdefs.h <<\EOF ++#define HAVE_ASSUME_DEFAULT_COLORS 1 ++EOF ++ ++ cat >>confdefs.h <<\EOF + #define HAVE_CURSES_VERSION 1 + EOF + +@@ -10090,6 +10762,14 @@ + EOF + + cat >>confdefs.h <<\EOF ++#define HAVE_USE_SCREEN 1 ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define HAVE_USE_WINDOW 1 ++EOF ++ ++ cat >>confdefs.h <<\EOF + #define HAVE_WRESIZE 1 + EOF + +@@ -10103,7 +10783,7 @@ + GENERATED_EXT_FUNCS= + fi + +-echo "$as_me:10106: checking if you want to build with experimental SCREEN extensions" >&5 ++echo "$as_me:10786: checking if you want to build with experimental SCREEN extensions" >&5 + echo $ECHO_N "checking if you want to build with experimental SCREEN extensions... $ECHO_C" >&6 + + # Check whether --enable-sp-funcs or --disable-sp-funcs was given. +@@ -10113,7 +10793,7 @@ + else + with_sp_funcs=no + fi; +-echo "$as_me:10116: result: $with_sp_funcs" >&5 ++echo "$as_me:10796: result: $with_sp_funcs" >&5 + echo "${ECHO_T}$with_sp_funcs" >&6 + if test "$with_sp_funcs" = yes ; then + NCURSES_SP_FUNCS=1 +@@ -10127,7 +10807,7 @@ + GENERATED_SP_FUNCS= + fi + +-echo "$as_me:10130: checking if you want to build with experimental terminal-driver" >&5 ++echo "$as_me:10810: checking if you want to build with experimental terminal-driver" >&5 + echo $ECHO_N "checking if you want to build with experimental terminal-driver... $ECHO_C" >&6 + + # Check whether --enable-term-driver or --disable-term-driver was given. +@@ -10137,7 +10817,7 @@ + else + with_term_driver=no + fi; +-echo "$as_me:10140: result: $with_term_driver" >&5 ++echo "$as_me:10820: result: $with_term_driver" >&5 + echo "${ECHO_T}$with_term_driver" >&6 + if test "$with_term_driver" = yes ; then + cat >>confdefs.h <<\EOF +@@ -10145,14 +10825,14 @@ + EOF + + if test "$with_sp_funcs" != yes ; then +- { { echo "$as_me:10148: error: The term-driver option relies upon sp-funcs" >&5 ++ { { echo "$as_me:10828: error: The term-driver option relies upon sp-funcs" >&5 + echo "$as_me: error: The term-driver option relies upon sp-funcs" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + ### use option --enable-const to turn on use of const beyond that in XSI. +-echo "$as_me:10155: checking for extended use of const keyword" >&5 ++echo "$as_me:10835: checking for extended use of const keyword" >&5 + echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 + + # Check whether --enable-const or --disable-const was given. +@@ -10162,7 +10842,7 @@ + else + with_ext_const=no + fi; +-echo "$as_me:10165: result: $with_ext_const" >&5 ++echo "$as_me:10845: result: $with_ext_const" >&5 + echo "${ECHO_T}$with_ext_const" >&6 + NCURSES_CONST='/*nothing*/' + if test "$with_ext_const" = yes ; then +@@ -10170,7 +10850,7 @@ + fi + + ### use option --enable-ext-colors to turn on use of colors beyond 16. +-echo "$as_me:10173: checking if you want to use extended colors" >&5 ++echo "$as_me:10853: checking if you want to use extended colors" >&5 + echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6 + + # Check whether --enable-ext-colors or --disable-ext-colors was given. +@@ -10180,12 +10860,12 @@ + else + with_ext_colors=no + fi; +-echo "$as_me:10183: result: $with_ext_colors" >&5 ++echo "$as_me:10863: result: $with_ext_colors" >&5 + echo "${ECHO_T}$with_ext_colors" >&6 + NCURSES_EXT_COLORS=0 + if test "$with_ext_colors" = yes ; then + if test "$with_widec" != yes ; then +- { { echo "$as_me:10188: error: This option applies only to wide-character library" >&5 ++ { { echo "$as_me:10868: error: This option applies only to wide-character library" >&5 + echo "$as_me: error: This option applies only to wide-character library" >&2;} + { (exit 1); exit 1; }; } + else +@@ -10196,7 +10876,7 @@ + 5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:10199: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:10879: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -10211,7 +10891,7 @@ + fi + + ### use option --enable-ext-mouse to modify coding to support 5-button mice +-echo "$as_me:10214: checking if you want to use extended mouse encoding" >&5 ++echo "$as_me:10894: checking if you want to use extended mouse encoding" >&5 + echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6 + + # Check whether --enable-ext-mouse or --disable-ext-mouse was given. +@@ -10221,7 +10901,7 @@ + else + with_ext_mouse=no + fi; +-echo "$as_me:10224: result: $with_ext_mouse" >&5 ++echo "$as_me:10904: result: $with_ext_mouse" >&5 + echo "${ECHO_T}$with_ext_mouse" >&6 + NCURSES_MOUSE_VERSION=1 + if test "$with_ext_mouse" = yes ; then +@@ -10232,7 +10912,7 @@ + 5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:10235: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:10915: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -10240,7 +10920,7 @@ + + fi + +-echo "$as_me:10243: checking if you want \$NCURSES_NO_PADDING code" >&5 ++echo "$as_me:10923: checking if you want \$NCURSES_NO_PADDING code" >&5 + echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6 + + # Check whether --enable-no-padding or --disable-no-padding was given. +@@ -10250,19 +10930,19 @@ + else + with_no_padding=$with_ext_funcs + fi; +-echo "$as_me:10253: result: $with_no_padding" >&5 ++echo "$as_me:10933: result: $with_no_padding" >&5 + echo "${ECHO_T}$with_no_padding" >&6 + test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF + #define NCURSES_NO_PADDING 1 + EOF + +-echo "$as_me:10259: checking for ANSI C header files" >&5 ++echo "$as_me:10939: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10265 "configure" ++#line 10945 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -10270,13 +10950,13 @@ + #include <float.h> + + _ACEOF +-if { (eval echo "$as_me:10273: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10953: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10279: \$? = $ac_status" >&5 ++ echo "$as_me:10959: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10298,7 +10978,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 <<_ACEOF +-#line 10301 "configure" ++#line 10981 "configure" + #include "confdefs.h" + #include <string.h> + +@@ -10316,7 +10996,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 <<_ACEOF +-#line 10319 "configure" ++#line 10999 "configure" + #include "confdefs.h" + #include <stdlib.h> + +@@ -10337,7 +11017,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10340 "configure" ++#line 11020 "configure" + #include "confdefs.h" + #include <ctype.h> + #if ((' ' & 0x0FF) == 0x020) +@@ -10363,15 +11043,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10366: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11046: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10369: \$? = $ac_status" >&5 ++ echo "$as_me:11049: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10371: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11051: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10374: \$? = $ac_status" >&5 ++ echo "$as_me:11054: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10384,7 +11064,7 @@ + fi + fi + fi +-echo "$as_me:10387: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:11067: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -10400,28 +11080,28 @@ + inttypes.h stdint.h unistd.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:10403: checking for $ac_header" >&5 ++echo "$as_me:11083: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10409 "configure" ++#line 11089 "configure" + #include "confdefs.h" + $ac_includes_default + #include <$ac_header> + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10415: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11095: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10418: \$? = $ac_status" >&5 ++ echo "$as_me:11098: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10421: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11101: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10424: \$? = $ac_status" >&5 ++ echo "$as_me:11104: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -10431,7 +11111,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10434: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:11114: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -10441,13 +11121,13 @@ + fi + done + +-echo "$as_me:10444: checking for signed char" >&5 ++echo "$as_me:11124: checking for signed char" >&5 + echo $ECHO_N "checking for signed char... $ECHO_C" >&6 + if test "${ac_cv_type_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10450 "configure" ++#line 11130 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10462,16 +11142,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11145: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10468: \$? = $ac_status" >&5 ++ echo "$as_me:11148: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10471: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11151: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10474: \$? = $ac_status" >&5 ++ echo "$as_me:11154: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signed_char=yes + else +@@ -10481,10 +11161,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:10484: result: $ac_cv_type_signed_char" >&5 ++echo "$as_me:11164: result: $ac_cv_type_signed_char" >&5 + echo "${ECHO_T}$ac_cv_type_signed_char" >&6 + +-echo "$as_me:10487: checking size of signed char" >&5 ++echo "$as_me:11167: checking size of signed char" >&5 + echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 + if test "${ac_cv_sizeof_signed_char+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10493,7 +11173,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 10496 "configure" ++#line 11176 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10505,21 +11185,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10508: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11188: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10511: \$? = $ac_status" >&5 ++ echo "$as_me:11191: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10514: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11194: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10517: \$? = $ac_status" >&5 ++ echo "$as_me:11197: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 10522 "configure" ++#line 11202 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10531,16 +11211,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10534: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11214: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10537: \$? = $ac_status" >&5 ++ echo "$as_me:11217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10543: \$? = $ac_status" >&5 ++ echo "$as_me:11223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -10556,7 +11236,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 10559 "configure" ++#line 11239 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10568,16 +11248,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10571: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10574: \$? = $ac_status" >&5 ++ echo "$as_me:11254: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10577: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10580: \$? = $ac_status" >&5 ++ echo "$as_me:11260: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -10593,7 +11273,7 @@ + while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +-#line 10596 "configure" ++#line 11276 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10605,16 +11285,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10608: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11288: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10611: \$? = $ac_status" >&5 ++ echo "$as_me:11291: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11294: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10617: \$? = $ac_status" >&5 ++ echo "$as_me:11297: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -10627,12 +11307,12 @@ + ac_cv_sizeof_signed_char=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:10630: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:11310: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10635 "configure" ++#line 11315 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -10648,15 +11328,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:10651: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11331: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10654: \$? = $ac_status" >&5 ++ echo "$as_me:11334: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:10656: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10659: \$? = $ac_status" >&5 ++ echo "$as_me:11339: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` + else +@@ -10672,7 +11352,7 @@ + ac_cv_sizeof_signed_char=0 + fi + fi +-echo "$as_me:10675: result: $ac_cv_sizeof_signed_char" >&5 ++echo "$as_me:11355: result: $ac_cv_sizeof_signed_char" >&5 + echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 + cat >>confdefs.h <<EOF + #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char +@@ -10683,7 +11363,7 @@ + else + NCURSES_SBOOL="char" + fi +-echo "$as_me:10686: checking if you want to use signed Boolean array in term.h" >&5 ++echo "$as_me:11366: checking if you want to use signed Boolean array in term.h" >&5 + echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6 + + # Check whether --enable-signed-char or --disable-signed-char was given. +@@ -10693,12 +11373,12 @@ + else + with_signed_char=no + fi; +-echo "$as_me:10696: result: $with_signed_char" >&5 ++echo "$as_me:11376: result: $with_signed_char" >&5 + echo "${ECHO_T}$with_signed_char" >&6 + test "$with_signed_char" != yes && NCURSES_SBOOL="char" + + ### use option --enable-sigwinch to turn on use of SIGWINCH logic +-echo "$as_me:10701: checking if you want SIGWINCH handler" >&5 ++echo "$as_me:11381: checking if you want SIGWINCH handler" >&5 + echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6 + + # Check whether --enable-sigwinch or --disable-sigwinch was given. +@@ -10708,14 +11388,14 @@ + else + with_sigwinch=$with_ext_funcs + fi; +-echo "$as_me:10711: result: $with_sigwinch" >&5 ++echo "$as_me:11391: result: $with_sigwinch" >&5 + echo "${ECHO_T}$with_sigwinch" >&6 + test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF + #define USE_SIGWINCH 1 + EOF + + ### use option --enable-tcap-names to allow user to define new capabilities +-echo "$as_me:10718: checking if you want user-definable terminal capabilities like termcap" >&5 ++echo "$as_me:11398: checking if you want user-definable terminal capabilities like termcap" >&5 + echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6 + + # Check whether --enable-tcap-names or --disable-tcap-names was given. +@@ -10725,7 +11405,7 @@ + else + with_tcap_names=$with_ext_funcs + fi; +-echo "$as_me:10728: result: $with_tcap_names" >&5 ++echo "$as_me:11408: result: $with_tcap_names" >&5 + echo "${ECHO_T}$with_tcap_names" >&6 + NCURSES_XNAMES=0 + test "$with_tcap_names" = yes && NCURSES_XNAMES=1 +@@ -10733,7 +11413,7 @@ + ############################################################################### + # These options are relatively safe to experiment with. + +-echo "$as_me:10736: checking if you want all development code" >&5 ++echo "$as_me:11416: checking if you want all development code" >&5 + echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 + + # Check whether --with-develop or --without-develop was given. +@@ -10743,11 +11423,11 @@ + else + with_develop=no + fi; +-echo "$as_me:10746: result: $with_develop" >&5 ++echo "$as_me:11426: result: $with_develop" >&5 + echo "${ECHO_T}$with_develop" >&6 + + ### use option --enable-hard-tabs to turn on use of hard-tabs optimize +-echo "$as_me:10750: checking if you want hard-tabs code" >&5 ++echo "$as_me:11430: checking if you want hard-tabs code" >&5 + echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6 + + # Check whether --enable-hard-tabs or --disable-hard-tabs was given. +@@ -10757,14 +11437,14 @@ + else + enable_hard_tabs=$with_develop + fi; +-echo "$as_me:10760: result: $enable_hard_tabs" >&5 ++echo "$as_me:11440: result: $enable_hard_tabs" >&5 + echo "${ECHO_T}$enable_hard_tabs" >&6 + test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF + #define USE_HARD_TABS 1 + EOF + + ### use option --enable-xmc-glitch to turn on use of magic-cookie optimize +-echo "$as_me:10767: checking if you want limited support for xmc" >&5 ++echo "$as_me:11447: checking if you want limited support for xmc" >&5 + echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6 + + # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +@@ -10774,7 +11454,7 @@ + else + enable_xmc_glitch=$with_develop + fi; +-echo "$as_me:10777: result: $enable_xmc_glitch" >&5 ++echo "$as_me:11457: result: $enable_xmc_glitch" >&5 + echo "${ECHO_T}$enable_xmc_glitch" >&6 + test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF + #define USE_XMC_SUPPORT 1 +@@ -10783,7 +11463,7 @@ + ############################################################################### + # These are just experimental, probably should not be in a package: + +-echo "$as_me:10786: checking if you do not want to assume colors are white-on-black" >&5 ++echo "$as_me:11466: checking if you do not want to assume colors are white-on-black" >&5 + echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6 + + # Check whether --enable-assumed-color or --disable-assumed-color was given. +@@ -10793,14 +11473,14 @@ + else + with_assumed_color=yes + fi; +-echo "$as_me:10796: result: $with_assumed_color" >&5 ++echo "$as_me:11476: result: $with_assumed_color" >&5 + echo "${ECHO_T}$with_assumed_color" >&6 + test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF + #define USE_ASSUMED_COLOR 1 + EOF + + ### use option --enable-hashmap to turn on use of hashmap scrolling logic +-echo "$as_me:10803: checking if you want hashmap scrolling-optimization code" >&5 ++echo "$as_me:11483: checking if you want hashmap scrolling-optimization code" >&5 + echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6 + + # Check whether --enable-hashmap or --disable-hashmap was given. +@@ -10810,14 +11490,14 @@ + else + with_hashmap=yes + fi; +-echo "$as_me:10813: result: $with_hashmap" >&5 ++echo "$as_me:11493: result: $with_hashmap" >&5 + echo "${ECHO_T}$with_hashmap" >&6 + test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF + #define USE_HASHMAP 1 + EOF + + ### use option --enable-colorfgbg to turn on use of $COLORFGBG environment +-echo "$as_me:10820: checking if you want colorfgbg code" >&5 ++echo "$as_me:11500: checking if you want colorfgbg code" >&5 + echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6 + + # Check whether --enable-colorfgbg or --disable-colorfgbg was given. +@@ -10827,14 +11507,14 @@ + else + with_colorfgbg=no + fi; +-echo "$as_me:10830: result: $with_colorfgbg" >&5 ++echo "$as_me:11510: result: $with_colorfgbg" >&5 + echo "${ECHO_T}$with_colorfgbg" >&6 + test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF + #define USE_COLORFGBG 1 + EOF + + ### use option --enable-interop to turn on use of bindings used for interop +-echo "$as_me:10837: checking if you want interop bindings" >&5 ++echo "$as_me:11517: checking if you want interop bindings" >&5 + echo $ECHO_N "checking if you want interop bindings... $ECHO_C" >&6 + + # Check whether --enable-interop or --disable-interop was given. +@@ -10844,7 +11524,7 @@ + else + with_exp_interop=no + fi; +-echo "$as_me:10847: result: $with_exp_interop" >&5 ++echo "$as_me:11527: result: $with_exp_interop" >&5 + echo "${ECHO_T}$with_exp_interop" >&6 + + NCURSES_INTEROP_FUNCS=0 +@@ -10853,7 +11533,7 @@ + # This is still experimental (20080329), but should ultimately be moved to + # the script-block --with-normal, etc. + +-echo "$as_me:10856: checking if you want to link with the pthread library" >&5 ++echo "$as_me:11536: checking if you want to link with the pthread library" >&5 + echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 + + # Check whether --with-pthread or --without-pthread was given. +@@ -10863,27 +11543,27 @@ + else + with_pthread=no + fi; +-echo "$as_me:10866: result: $with_pthread" >&5 ++echo "$as_me:11546: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 + + if test "$with_pthread" != no ; then +- echo "$as_me:10870: checking for pthread.h" >&5 ++ echo "$as_me:11550: checking for pthread.h" >&5 + echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 + if test "${ac_cv_header_pthread_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10876 "configure" ++#line 11556 "configure" + #include "confdefs.h" + #include <pthread.h> + _ACEOF +-if { (eval echo "$as_me:10880: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:11560: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:10886: \$? = $ac_status" >&5 ++ echo "$as_me:11566: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10902,7 +11582,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:10905: result: $ac_cv_header_pthread_h" >&5 ++echo "$as_me:11585: result: $ac_cv_header_pthread_h" >&5 + echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 + if test $ac_cv_header_pthread_h = yes; then + +@@ -10910,12 +11590,14 @@ + #define HAVE_PTHREADS_H 1 + EOF + +- echo "$as_me:10913: checking if we can link with the pthread library" >&5 +-echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 +- cf_save_LIBS="$LIBS" +- LIBS="-lpthread $LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-#line 10918 "configure" ++ for cf_lib_pthread in pthread c_r ++ do ++ echo "$as_me:11595: checking if we can link with the $cf_lib_pthread library" >&5 ++echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 ++ cf_save_LIBS="$LIBS" ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 11600 "configure" + #include "confdefs.h" + + #include <pthread.h> +@@ -10924,23 +11606,24 @@ + main () + { + +- int rc = pthread_create(0,0,0,0); ++ int rc = pthread_create(0,0,0,0); ++ int r2 = pthread_mutexattr_settype(0, 0); + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10934: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11617: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10937: \$? = $ac_status" >&5 ++ echo "$as_me:11620: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10940: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11623: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10943: \$? = $ac_status" >&5 ++ echo "$as_me:11626: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + with_pthread=yes + else +@@ -10949,34 +11632,36 @@ + with_pthread=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- LIBS="$cf_save_LIBS" +- echo "$as_me:10953: result: $with_pthread" >&5 ++ LIBS="$cf_save_LIBS" ++ echo "$as_me:11636: result: $with_pthread" >&5 + echo "${ECHO_T}$with_pthread" >&6 ++ test "$with_pthread" = yes && break ++ done + +- if test "$with_pthread" = yes ; then +- LIBS="-lpthread $LIBS" +- cat >>confdefs.h <<\EOF ++ if test "$with_pthread" = yes ; then ++ LIBS="-l$cf_lib_pthread $LIBS" ++ cat >>confdefs.h <<\EOF + #define HAVE_LIBPTHREADS 1 + EOF + +- else +- { { echo "$as_me:10963: error: Cannot link with pthread library" >&5 ++ else ++ { { echo "$as_me:11648: error: Cannot link with pthread library" >&5 + echo "$as_me: error: Cannot link with pthread library" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi + + fi + + fi + + if test "x$with_pthread" != xno; then +- echo "$as_me:10973: checking for pthread_kill" >&5 ++ echo "$as_me:11658: checking for pthread_kill" >&5 + echo $ECHO_N "checking for pthread_kill... $ECHO_C" >&6 + if test "${ac_cv_func_pthread_kill+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10979 "configure" ++#line 11664 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char pthread_kill (); below. */ +@@ -10999,7 +11684,7 @@ + #if defined (__stub_pthread_kill) || defined (__stub___pthread_kill) + choke me + #else +-f = pthread_kill; ++f = pthread_kill; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -11007,16 +11692,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11010: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11013: \$? = $ac_status" >&5 ++ echo "$as_me:11698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11016: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11019: \$? = $ac_status" >&5 ++ echo "$as_me:11704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_pthread_kill=yes + else +@@ -11026,11 +11711,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11029: result: $ac_cv_func_pthread_kill" >&5 ++echo "$as_me:11714: result: $ac_cv_func_pthread_kill" >&5 + echo "${ECHO_T}$ac_cv_func_pthread_kill" >&6 + if test $ac_cv_func_pthread_kill = yes; then + +- echo "$as_me:11033: checking if you want to allow EINTR in wgetch with pthreads" >&5 ++ echo "$as_me:11718: checking if you want to allow EINTR in wgetch with pthreads" >&5 + echo $ECHO_N "checking if you want to allow EINTR in wgetch with pthreads... $ECHO_C" >&6 + + # Check whether --enable-pthreads-eintr or --disable-pthreads-eintr was given. +@@ -11040,7 +11725,7 @@ + else + use_pthreads_eintr=no + fi; +- echo "$as_me:11043: result: $use_pthreads_eintr" >&5 ++ echo "$as_me:11728: result: $use_pthreads_eintr" >&5 + echo "${ECHO_T}$use_pthreads_eintr" >&6 + if test $use_pthreads_eintr = yes ; then + cat >>confdefs.h <<\EOF +@@ -11050,7 +11735,7 @@ + fi + fi + +- echo "$as_me:11053: checking if you want to use weak-symbols for pthreads" >&5 ++ echo "$as_me:11738: checking if you want to use weak-symbols for pthreads" >&5 + echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 + + # Check whether --enable-weak-symbols or --disable-weak-symbols was given. +@@ -11060,18 +11745,18 @@ + else + use_weak_symbols=no + fi; +- echo "$as_me:11063: result: $use_weak_symbols" >&5 ++ echo "$as_me:11748: result: $use_weak_symbols" >&5 + echo "${ECHO_T}$use_weak_symbols" >&6 + if test "$use_weak_symbols" = yes ; then + +-echo "$as_me:11067: checking if $CC supports weak symbols" >&5 ++echo "$as_me:11752: checking if $CC supports weak symbols" >&5 + echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 + if test "${cf_cv_weak_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 11074 "configure" ++#line 11759 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -11097,16 +11782,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11100: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:11785: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11103: \$? = $ac_status" >&5 ++ echo "$as_me:11788: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11106: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11791: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11109: \$? = $ac_status" >&5 ++ echo "$as_me:11794: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_weak_symbols=yes + else +@@ -11117,7 +11802,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:11120: result: $cf_cv_weak_symbols" >&5 ++echo "$as_me:11805: result: $cf_cv_weak_symbols" >&5 + echo "${ECHO_T}$cf_cv_weak_symbols" >&6 + + else +@@ -11148,7 +11833,7 @@ + # opaque outside of that, so there is no --enable-opaque option. We can use + # this option without --with-pthreads, but this will be always set for + # pthreads. +-echo "$as_me:11151: checking if you want experimental reentrant code" >&5 ++echo "$as_me:11836: checking if you want experimental reentrant code" >&5 + echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 + + # Check whether --enable-reentrant or --disable-reentrant was given. +@@ -11158,7 +11843,7 @@ + else + with_reentrant=no + fi; +-echo "$as_me:11161: result: $with_reentrant" >&5 ++echo "$as_me:11846: result: $with_reentrant" >&5 + echo "${ECHO_T}$with_reentrant" >&6 + if test "$with_reentrant" = yes ; then + cf_cv_enable_reentrant=1 +@@ -11184,7 +11869,7 @@ + 5.*) + cf_cv_rel_version=6.0 + cf_cv_abi_version=6 +- { echo "$as_me:11187: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 ++ { echo "$as_me:11872: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5 + echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;} + ;; + esac +@@ -11199,7 +11884,7 @@ + + ### Allow using a different wrap-prefix + if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then +- echo "$as_me:11202: checking for prefix used to wrap public variables" >&5 ++ echo "$as_me:11887: checking for prefix used to wrap public variables" >&5 + echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 + + # Check whether --with-wrap-prefix or --without-wrap-prefix was given. +@@ -11209,7 +11894,7 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +- echo "$as_me:11212: result: $NCURSES_WRAP_PREFIX" >&5 ++ echo "$as_me:11897: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + else + NCURSES_WRAP_PREFIX=_nc_ +@@ -11219,7 +11904,7 @@ + #define NCURSES_WRAP_PREFIX "$NCURSES_WRAP_PREFIX" + EOF + +-echo "$as_me:11222: checking if you want experimental safe-sprintf code" >&5 ++echo "$as_me:11907: checking if you want experimental safe-sprintf code" >&5 + echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6 + + # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given. +@@ -11229,7 +11914,7 @@ + else + with_safe_sprintf=no + fi; +-echo "$as_me:11232: result: $with_safe_sprintf" >&5 ++echo "$as_me:11917: result: $with_safe_sprintf" >&5 + echo "${ECHO_T}$with_safe_sprintf" >&6 + test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF + #define USE_SAFE_SPRINTF 1 +@@ -11238,7 +11923,7 @@ + ### use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic + # when hashmap is used scroll hints are useless + if test "$with_hashmap" = no ; then +-echo "$as_me:11241: checking if you want to experiment without scrolling-hints code" >&5 ++echo "$as_me:11926: checking if you want to experiment without scrolling-hints code" >&5 + echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6 + + # Check whether --enable-scroll-hints or --disable-scroll-hints was given. +@@ -11248,7 +11933,7 @@ + else + with_scroll_hints=yes + fi; +-echo "$as_me:11251: result: $with_scroll_hints" >&5 ++echo "$as_me:11936: result: $with_scroll_hints" >&5 + echo "${ECHO_T}$with_scroll_hints" >&6 + test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF + #define USE_SCROLL_HINTS 1 +@@ -11256,7 +11941,7 @@ + + fi + +-echo "$as_me:11259: checking if you want experimental wgetch-events code" >&5 ++echo "$as_me:11944: checking if you want experimental wgetch-events code" >&5 + echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6 + + # Check whether --enable-wgetch-events or --disable-wgetch-events was given. +@@ -11266,7 +11951,7 @@ + else + with_wgetch_events=no + fi; +-echo "$as_me:11269: result: $with_wgetch_events" >&5 ++echo "$as_me:11954: result: $with_wgetch_events" >&5 + echo "${ECHO_T}$with_wgetch_events" >&6 + test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF + #define NCURSES_WGETCH_EVENTS 1 +@@ -11275,28 +11960,54 @@ + ############################################################################### + + ### use option --disable-echo to suppress full display compiling commands +-echo "$as_me:11278: checking if you want to display full commands during build" >&5 +-echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 ++ ++echo "$as_me:11964: checking if you want to see long compiling messages" >&5 ++echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. + if test "${enable_echo+set}" = set; then + enableval="$enable_echo" +- with_echo=$enableval ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ ++ ECHO_LT='--silent' ++ ECHO_LD='@echo linking $@;' ++ RULE_CC='@echo compiling $<' ++ SHOW_CC='@echo compiling $@' ++ ECHO_CC='@' ++ ++ else ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ ++ fi + else +- with_echo=yes ++ enableval=yes ++ ++ ECHO_LT='' ++ ECHO_LD='' ++ RULE_CC='' ++ SHOW_CC='' ++ ECHO_CC='' ++ + fi; +-if test "$with_echo" = yes; then ++echo "$as_me:11998: result: $enableval" >&5 ++echo "${ECHO_T}$enableval" >&6 ++ ++if test "$enable_echo" = yes; then + ECHO_LINK= + else + ECHO_LINK='@ echo linking $@ ... ;' + test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" + test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" + fi +-echo "$as_me:11295: result: $with_echo" >&5 +-echo "${ECHO_T}$with_echo" >&6 + + ### use option --enable-warnings to turn on all gcc warnings +-echo "$as_me:11299: checking if you want to see compiler warnings" >&5 ++echo "$as_me:12010: checking if you want to see compiler warnings" >&5 + echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -11304,7 +12015,7 @@ + enableval="$enable_warnings" + with_warnings=$enableval + fi; +-echo "$as_me:11307: result: $with_warnings" >&5 ++echo "$as_me:12018: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + + if test "x$with_warnings" = "xyes"; then +@@ -11316,12 +12027,12 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:11319: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:12030: checking if this is really Intel C compiler" >&5 + echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +-#line 11324 "configure" ++#line 12035 "configure" + #include "confdefs.h" + + int +@@ -11338,16 +12049,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11341: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12052: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11344: \$? = $ac_status" >&5 ++ echo "$as_me:12055: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11347: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12058: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11350: \$? = $ac_status" >&5 ++ echo "$as_me:12061: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +@@ -11357,15 +12068,64 @@ + cat conftest.$ac_ext >&5 + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:11361: result: $INTEL_COMPILER" >&5 +-echo "${ECHO_T}$INTEL_COMPILER" >&6 +- ;; +- esac ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:12072: result: $INTEL_COMPILER" >&5 ++echo "${ECHO_T}$INTEL_COMPILER" >&6 ++ ;; ++ esac ++fi ++ ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:12081: checking if this is really Clang C compiler" >&5 ++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 ++ cf_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 12086 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:12103: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:12106: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:12109: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:12112: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:12123: result: $CLANG_COMPILER" >&5 ++echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + + cat > conftest.$ac_ext <<EOF +-#line 11368 "${as_me:-configure}" ++#line 12128 "${as_me:-configure}" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + +@@ -11382,7 +12142,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #279: controlling expression is constant + +- { echo "$as_me:11385: checking for $CC warning options..." >&5 ++ { echo "$as_me:12145: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -11398,12 +12158,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:11401: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12161: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11404: \$? = $ac_status" >&5 ++ echo "$as_me:12164: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11406: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:12166: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -11412,7 +12172,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:11415: checking for $CC warning options..." >&5 ++ { echo "$as_me:12175: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -11432,12 +12192,12 @@ + Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:11435: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12195: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11438: \$? = $ac_status" >&5 ++ echo "$as_me:12198: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11440: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:12200: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in #(vi + Wcast-qual) #(vi +@@ -11448,7 +12208,17 @@ + [34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:11451: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:12211: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++ ++ continue;; ++ esac ++ ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [12].*) ++ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 ++ ++echo "${as_me:-configure}:12221: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -11468,12 +12238,12 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:11471: checking if this is really Intel C++ compiler" >&5 ++ echo "$as_me:12241: checking if this is really Intel C++ compiler" >&5 + echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +-#line 11476 "configure" ++#line 12246 "configure" + #include "confdefs.h" + + int +@@ -11490,16 +12260,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11493: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12263: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11496: \$? = $ac_status" >&5 ++ echo "$as_me:12266: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11499: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12269: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11502: \$? = $ac_status" >&5 ++ echo "$as_me:12272: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_CPLUSPLUS=yes + cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +@@ -11510,12 +12280,61 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$cf_save_CFLAGS" +- echo "$as_me:11513: result: $INTEL_CPLUSPLUS" >&5 ++ echo "$as_me:12283: result: $INTEL_CPLUSPLUS" >&5 + echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6 + ;; + esac + fi + ++CLANG_CPLUSPLUS=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:12292: checking if this is really Clang C++ compiler" >&5 ++echo $ECHO_N "checking if this is really Clang C++ compiler... $ECHO_C" >&6 ++ cf_save_CFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 12297 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++#ifdef __clang__ ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:12314: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:12317: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:12320: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:12323: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ CLANG_CPLUSPLUS=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CXXFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:12334: result: $CLANG_CPLUSPLUS" >&5 ++echo "${ECHO_T}$CLANG_CPLUSPLUS" >&6 ++fi ++ + ac_ext=cc + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +@@ -11524,7 +12343,7 @@ + ac_main_return=return + + cat > conftest.$ac_ext <<EOF +-#line 11527 "configure" ++#line 12346 "configure" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + +@@ -11542,7 +12361,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #269: invalid format string conversion + +- { echo "$as_me:11545: checking for $CC warning options..." >&5 ++ { echo "$as_me:12364: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-Wall" +@@ -11559,12 +12378,12 @@ + wd981 + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt" +- if { (eval echo "$as_me:11562: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11565: \$? = $ac_status" >&5 ++ echo "$as_me:12384: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11567: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:12386: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + fi +@@ -11573,7 +12392,7 @@ + + elif test "$GXX" = yes + then +- { echo "$as_me:11576: checking for $CXX warning options..." >&5 ++ { echo "$as_me:12395: checking for $CXX warning options..." >&5 + echo "$as_me: checking for $CXX warning options..." >&6;} + cf_save_CXXFLAGS="$CXXFLAGS" + EXTRA_CXXFLAGS="-W -Wall" +@@ -11602,16 +12421,16 @@ + Wundef $cf_gxx_extra_warnings Wno-unused + do + CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt" +- if { (eval echo "$as_me:11605: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12424: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11608: \$? = $ac_status" >&5 ++ echo "$as_me:12427: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11610: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:12429: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt" + else +- test -n "$verbose" && echo "$as_me:11614: result: ... no -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:12433: result: ... no -$cf_opt" >&5 + echo "${ECHO_T}... no -$cf_opt" >&6 + fi + done +@@ -11647,10 +12466,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:11650: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:12469: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <<EOF +-#line 11653 "${as_me:-configure}" ++#line 12472 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -11699,12 +12518,12 @@ + ;; + esac + +- if { (eval echo "$as_me:11702: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:12521: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11705: \$? = $ac_status" >&5 ++ echo "$as_me:12524: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:11707: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:12526: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in #(vi +@@ -11739,8 +12558,100 @@ + rm -rf conftest* + fi + ++echo "$as_me:12561: checking if you want to work around bogus compiler/loader warnings" >&5 ++echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 ++ ++# Check whether --enable-string-hacks or --disable-string-hacks was given. ++if test "${enable_string_hacks+set}" = set; then ++ enableval="$enable_string_hacks" ++ with_string_hacks=$enableval ++else ++ with_string_hacks=no ++fi; ++echo "$as_me:12571: result: $with_string_hacks" >&5 ++echo "${ECHO_T}$with_string_hacks" >&6 ++ ++if test "x$with_string_hacks" = "xyes"; then ++ cat >>confdefs.h <<\EOF ++#define USE_STRING_HACKS 1 ++EOF ++ ++ { echo "$as_me:12579: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 ++echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} ++ ++for ac_func in strlcat strlcpy snprintf ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:12585: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 12591 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* 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 (*f) (); ++ ++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 ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:12622: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:12625: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:12628: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:12631: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++eval "$as_ac_var=no" ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:12641: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<EOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++EOF ++ ++fi ++done ++ ++fi ++ + ### use option --enable-assertions to turn on generation of assertion code +-echo "$as_me:11743: checking if you want to enable runtime assertions" >&5 ++echo "$as_me:12654: checking if you want to enable runtime assertions" >&5 + echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 + + # Check whether --enable-assertions or --disable-assertions was given. +@@ -11750,16 +12661,12 @@ + else + with_assertions=no + fi; +-echo "$as_me:11753: result: $with_assertions" >&5 ++echo "$as_me:12664: result: $with_assertions" >&5 + echo "${ECHO_T}$with_assertions" >&6 + if test -n "$GCC" + then + if test "$with_assertions" = no + then +- cat >>confdefs.h <<\EOF +-#define NDEBUG 1 +-EOF +- + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + +@@ -11770,7 +12677,7 @@ + + ### use option --disable-leaks to suppress "permanent" leaks, for testing + +-echo "$as_me:11773: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:12680: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -11786,7 +12693,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:11789: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:12696: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in #(vi +@@ -11880,23 +12787,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:11883: checking for dmalloc.h" >&5 ++ echo "$as_me:12790: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 11889 "configure" ++#line 12796 "configure" + #include "confdefs.h" + #include <dmalloc.h> + _ACEOF +-if { (eval echo "$as_me:11893: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:12800: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:11899: \$? = $ac_status" >&5 ++ echo "$as_me:12806: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -11915,11 +12822,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:11918: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:12825: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test $ac_cv_header_dmalloc_h = yes; then + +-echo "$as_me:11922: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:12829: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11927,7 +12834,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11930 "configure" ++#line 12837 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11946,16 +12853,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11949: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12856: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11952: \$? = $ac_status" >&5 ++ echo "$as_me:12859: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11955: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12862: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11958: \$? = $ac_status" >&5 ++ echo "$as_me:12865: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -11966,7 +12873,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11969: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:12876: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then + cat >>confdefs.h <<EOF +@@ -11981,7 +12888,7 @@ + + fi + +-echo "$as_me:11984: checking if you want to use dbmalloc for testing" >&5 ++echo "$as_me:12891: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -11997,7 +12904,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:12000: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:12907: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in #(vi +@@ -12091,23 +12998,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:12094: checking for dbmalloc.h" >&5 ++ echo "$as_me:13001: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12100 "configure" ++#line 13007 "configure" + #include "confdefs.h" + #include <dbmalloc.h> + _ACEOF +-if { (eval echo "$as_me:12104: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13011: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12110: \$? = $ac_status" >&5 ++ echo "$as_me:13017: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12126,11 +13033,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:12129: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:13036: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test $ac_cv_header_dbmalloc_h = yes; then + +-echo "$as_me:12133: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:13040: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12138,7 +13045,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12141 "configure" ++#line 13048 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12157,16 +13064,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12160: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13067: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12163: \$? = $ac_status" >&5 ++ echo "$as_me:13070: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13073: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12169: \$? = $ac_status" >&5 ++ echo "$as_me:13076: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -12177,7 +13084,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12180: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:13087: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then + cat >>confdefs.h <<EOF +@@ -12192,7 +13099,7 @@ + + fi + +-echo "$as_me:12195: checking if you want to use valgrind for testing" >&5 ++echo "$as_me:13102: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -12208,7 +13115,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:12211: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:13118: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in #(vi +@@ -12301,7 +13208,7 @@ + ;; + esac + +-echo "$as_me:12304: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:13211: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -12311,7 +13218,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:12314: result: $with_no_leaks" >&5 ++echo "$as_me:13221: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -12360,7 +13267,7 @@ + ;; + esac + +-echo "$as_me:12363: checking whether to add trace feature to all models" >&5 ++echo "$as_me:13270: checking whether to add trace feature to all models" >&5 + echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 + + # Check whether --with-trace or --without-trace was given. +@@ -12370,7 +13277,7 @@ + else + cf_with_trace=$cf_all_traces + fi; +-echo "$as_me:12373: result: $cf_with_trace" >&5 ++echo "$as_me:13280: result: $cf_with_trace" >&5 + echo "${ECHO_T}$cf_with_trace" >&6 + + if test "$cf_with_trace" = yes ; then +@@ -12465,13 +13372,13 @@ + *mingw32*) #(vi + ;; + *) +-echo "$as_me:12468: checking for gettimeofday" >&5 ++echo "$as_me:13375: checking for gettimeofday" >&5 + echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 + if test "${ac_cv_func_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12474 "configure" ++#line 13381 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gettimeofday (); below. */ +@@ -12494,7 +13401,7 @@ + #if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) + choke me + #else +-f = gettimeofday; ++f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -12502,16 +13409,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12505: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13412: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12508: \$? = $ac_status" >&5 ++ echo "$as_me:13415: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12511: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13418: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12514: \$? = $ac_status" >&5 ++ echo "$as_me:13421: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gettimeofday=yes + else +@@ -12521,7 +13428,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12524: result: $ac_cv_func_gettimeofday" >&5 ++echo "$as_me:13431: result: $ac_cv_func_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 + if test $ac_cv_func_gettimeofday = yes; then + cat >>confdefs.h <<\EOF +@@ -12530,7 +13437,7 @@ + + else + +-echo "$as_me:12533: checking for gettimeofday in -lbsd" >&5 ++echo "$as_me:13440: checking for gettimeofday in -lbsd" >&5 + echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12538,7 +13445,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12541 "configure" ++#line 13448 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12557,16 +13464,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12560: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13467: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12563: \$? = $ac_status" >&5 ++ echo "$as_me:13470: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12566: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13473: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12569: \$? = $ac_status" >&5 ++ echo "$as_me:13476: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gettimeofday=yes + else +@@ -12577,7 +13484,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12580: result: $ac_cv_lib_bsd_gettimeofday" >&5 ++echo "$as_me:13487: result: $ac_cv_lib_bsd_gettimeofday" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 + if test $ac_cv_lib_bsd_gettimeofday = yes; then + cat >>confdefs.h <<\EOF +@@ -12591,14 +13498,14 @@ + ;; + esac + +-echo "$as_me:12594: checking if -lm needed for math functions" >&5 ++echo "$as_me:13501: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 12601 "configure" ++#line 13508 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -12613,16 +13520,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12616: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13523: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12619: \$? = $ac_status" >&5 ++ echo "$as_me:13526: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12622: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13529: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12625: \$? = $ac_status" >&5 ++ echo "$as_me:13532: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_libm=no + else +@@ -12632,7 +13539,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12635: result: $cf_cv_need_libm" >&5 ++echo "$as_me:13542: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then +@@ -12640,13 +13547,13 @@ + fi + + ### Checks for header files. +-echo "$as_me:12643: checking for ANSI C header files" >&5 ++echo "$as_me:13550: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12649 "configure" ++#line 13556 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -12654,13 +13561,13 @@ + #include <float.h> + + _ACEOF +-if { (eval echo "$as_me:12657: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13564: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12663: \$? = $ac_status" >&5 ++ echo "$as_me:13570: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12682,7 +13589,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 <<_ACEOF +-#line 12685 "configure" ++#line 13592 "configure" + #include "confdefs.h" + #include <string.h> + +@@ -12700,7 +13607,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 <<_ACEOF +-#line 12703 "configure" ++#line 13610 "configure" + #include "confdefs.h" + #include <stdlib.h> + +@@ -12721,7 +13628,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12724 "configure" ++#line 13631 "configure" + #include "confdefs.h" + #include <ctype.h> + #if ((' ' & 0x0FF) == 0x020) +@@ -12747,15 +13654,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:12750: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13657: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12753: \$? = $ac_status" >&5 ++ echo "$as_me:13660: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:12755: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12758: \$? = $ac_status" >&5 ++ echo "$as_me:13665: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12768,7 +13675,7 @@ + fi + fi + fi +-echo "$as_me:12771: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:13678: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -12781,13 +13688,13 @@ + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +-echo "$as_me:12784: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:13691: checking for $ac_hdr that defines DIR" >&5 + echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12790 "configure" ++#line 13697 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$ac_hdr> +@@ -12802,16 +13709,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12808: \$? = $ac_status" >&5 ++ echo "$as_me:13715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12811: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12814: \$? = $ac_status" >&5 ++ echo "$as_me:13721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -12821,7 +13728,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12824: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:13731: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12834,7 +13741,7 @@ + done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then +- echo "$as_me:12837: checking for opendir in -ldir" >&5 ++ echo "$as_me:13744: checking for opendir in -ldir" >&5 + echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 + if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12842,7 +13749,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12845 "configure" ++#line 13752 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12861,16 +13768,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12864: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13771: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12867: \$? = $ac_status" >&5 ++ echo "$as_me:13774: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12870: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13777: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12873: \$? = $ac_status" >&5 ++ echo "$as_me:13780: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -12881,14 +13788,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12884: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:13791: result: $ac_cv_lib_dir_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 + if test $ac_cv_lib_dir_opendir = yes; then + LIBS="$LIBS -ldir" + fi + + else +- echo "$as_me:12891: checking for opendir in -lx" >&5 ++ echo "$as_me:13798: checking for opendir in -lx" >&5 + echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 + if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12896,7 +13803,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12899 "configure" ++#line 13806 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12915,16 +13822,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12918: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13825: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12921: \$? = $ac_status" >&5 ++ echo "$as_me:13828: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12924: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12927: \$? = $ac_status" >&5 ++ echo "$as_me:13834: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -12935,7 +13842,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12938: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:13845: result: $ac_cv_lib_x_opendir" >&5 + echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 + if test $ac_cv_lib_x_opendir = yes; then + LIBS="$LIBS -lx" +@@ -12943,13 +13850,13 @@ + + fi + +-echo "$as_me:12946: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:13853: checking whether time.h and sys/time.h may both be included" >&5 + echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 + if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12952 "configure" ++#line 13859 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/time.h> +@@ -12965,16 +13872,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12968: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12971: \$? = $ac_status" >&5 ++ echo "$as_me:13878: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12974: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12977: \$? = $ac_status" >&5 ++ echo "$as_me:13884: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -12984,7 +13891,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12987: result: $ac_cv_header_time" >&5 ++echo "$as_me:13894: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -12999,17 +13906,17 @@ + cf_regex_libs="regex re" + case $host_os in #(vi + mingw*) +- cf_regex_libs="regex.dll $cf_regex_libs" ++ cf_regex_libs="gnurx $cf_regex_libs" + ;; + esac + +-echo "$as_me:13006: checking for regcomp" >&5 ++echo "$as_me:13913: checking for regcomp" >&5 + echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 + if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13012 "configure" ++#line 13919 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char regcomp (); below. */ +@@ -13032,7 +13939,7 @@ + #if defined (__stub_regcomp) || defined (__stub___regcomp) + choke me + #else +-f = regcomp; ++f = regcomp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -13040,16 +13947,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13043: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13950: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13046: \$? = $ac_status" >&5 ++ echo "$as_me:13953: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13049: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13956: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13052: \$? = $ac_status" >&5 ++ echo "$as_me:13959: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_regcomp=yes + else +@@ -13059,7 +13966,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13062: result: $ac_cv_func_regcomp" >&5 ++echo "$as_me:13969: result: $ac_cv_func_regcomp" >&5 + echo "${ECHO_T}$ac_cv_func_regcomp" >&6 + if test $ac_cv_func_regcomp = yes; then + cf_regex_func=regcomp +@@ -13068,7 +13975,7 @@ + for cf_regex_lib in $cf_regex_libs + do + as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` +-echo "$as_me:13071: checking for regcomp in -l$cf_regex_lib" >&5 ++echo "$as_me:13978: checking for regcomp in -l$cf_regex_lib" >&5 + echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13076,7 +13983,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_regex_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 13079 "configure" ++#line 13986 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -13095,16 +14002,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13098: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14005: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13101: \$? = $ac_status" >&5 ++ echo "$as_me:14008: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13104: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13107: \$? = $ac_status" >&5 ++ echo "$as_me:14014: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -13115,7 +14022,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:13118: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:14025: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + +@@ -13129,13 +14036,13 @@ + fi + + if test "$cf_regex_func" = no ; then +- echo "$as_me:13132: checking for compile" >&5 ++ echo "$as_me:14039: checking for compile" >&5 + echo $ECHO_N "checking for compile... $ECHO_C" >&6 + if test "${ac_cv_func_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13138 "configure" ++#line 14045 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char compile (); below. */ +@@ -13158,7 +14065,7 @@ + #if defined (__stub_compile) || defined (__stub___compile) + choke me + #else +-f = compile; ++f = compile; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -13166,16 +14073,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13169: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14076: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13172: \$? = $ac_status" >&5 ++ echo "$as_me:14079: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13175: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14082: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13178: \$? = $ac_status" >&5 ++ echo "$as_me:14085: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_compile=yes + else +@@ -13185,13 +14092,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13188: result: $ac_cv_func_compile" >&5 ++echo "$as_me:14095: result: $ac_cv_func_compile" >&5 + echo "${ECHO_T}$ac_cv_func_compile" >&6 + if test $ac_cv_func_compile = yes; then + cf_regex_func=compile + else + +- echo "$as_me:13194: checking for compile in -lgen" >&5 ++ echo "$as_me:14101: checking for compile in -lgen" >&5 + echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 + if test "${ac_cv_lib_gen_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13199,7 +14106,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgen $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 13202 "configure" ++#line 14109 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -13218,16 +14125,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13221: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14128: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13224: \$? = $ac_status" >&5 ++ echo "$as_me:14131: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14134: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13230: \$? = $ac_status" >&5 ++ echo "$as_me:14137: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gen_compile=yes + else +@@ -13238,7 +14145,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:13241: result: $ac_cv_lib_gen_compile" >&5 ++echo "$as_me:14148: result: $ac_cv_lib_gen_compile" >&5 + echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 + if test $ac_cv_lib_gen_compile = yes; then + +@@ -13251,11 +14158,11 @@ + fi + + if test "$cf_regex_func" = no ; then +- { echo "$as_me:13254: WARNING: cannot find regular expression library" >&5 ++ { echo "$as_me:14161: WARNING: cannot find regular expression library" >&5 + echo "$as_me: WARNING: cannot find regular expression library" >&2;} + fi + +-echo "$as_me:13258: checking for regular-expression headers" >&5 ++echo "$as_me:14165: checking for regular-expression headers" >&5 + echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 + if test "${cf_cv_regex_hdrs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13267,7 +14174,7 @@ + for cf_regex_hdr in regexp.h regexpr.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 13270 "configure" ++#line 14177 "configure" + #include "confdefs.h" + #include <$cf_regex_hdr> + int +@@ -13282,16 +14189,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13285: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14192: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13288: \$? = $ac_status" >&5 ++ echo "$as_me:14195: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14198: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13294: \$? = $ac_status" >&5 ++ echo "$as_me:14201: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -13308,7 +14215,7 @@ + for cf_regex_hdr in regex.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 13311 "configure" ++#line 14218 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$cf_regex_hdr> +@@ -13326,16 +14233,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13329: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14236: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13332: \$? = $ac_status" >&5 ++ echo "$as_me:14239: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13335: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13338: \$? = $ac_status" >&5 ++ echo "$as_me:14245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_regex_hdrs=$cf_regex_hdr +@@ -13351,11 +14258,11 @@ + esac + + fi +-echo "$as_me:13354: result: $cf_cv_regex_hdrs" >&5 ++echo "$as_me:14261: result: $cf_cv_regex_hdrs" >&5 + echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 + + case $cf_cv_regex_hdrs in #(vi +- no) { echo "$as_me:13358: WARNING: no regular expression header found" >&5 ++ no) { echo "$as_me:14265: WARNING: no regular expression header found" >&5 + echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi + regex.h) cat >>confdefs.h <<\EOF + #define HAVE_REGEX_H_FUNCS 1 +@@ -13391,23 +14298,71 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:13394: checking for $ac_header" >&5 ++echo "$as_me:14301: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14307 "configure" ++#include "confdefs.h" ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:14311: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ egrep -v '^ *\+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:14317: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ eval "$as_ac_Header=no" ++fi ++rm -f conftest.err conftest.$ac_ext ++fi ++echo "$as_me:14336: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<EOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++EOF ++ ++fi ++done ++ ++for ac_header in unistd.h getopt.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:14349: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13400 "configure" ++#line 14355 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:13404: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:14359: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:13410: \$? = $ac_status" >&5 ++ echo "$as_me:14365: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -13426,7 +14381,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:13429: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:14384: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -13436,11 +14391,64 @@ + fi + done + ++echo "$as_me:14394: checking for header declaring getopt variables" >&5 ++echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 ++if test "${cf_cv_getopt_header+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cf_cv_getopt_header=none ++for cf_header in stdio.h stdlib.h unistd.h getopt.h ++do ++cat >conftest.$ac_ext <<_ACEOF ++#line 14404 "configure" ++#include "confdefs.h" ++ ++#include <$cf_header> ++int ++main () ++{ ++int x = optind; char *y = optarg ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:14417: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:14420: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:14423: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14426: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_getopt_header=$cf_header ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++done ++ ++fi ++echo "$as_me:14438: result: $cf_cv_getopt_header" >&5 ++echo "${ECHO_T}$cf_cv_getopt_header" >&6 ++if test $cf_cv_getopt_header != none ; then ++ cat >>confdefs.h <<\EOF ++#define HAVE_GETOPT_HEADER 1 ++EOF ++ ++fi ++ + # check for ISC (this may also define _POSIX_SOURCE) + # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set + if test "$ISC" = yes ; then + +-echo "$as_me:13443: checking for main in -lcposix" >&5 ++echo "$as_me:14451: checking for main in -lcposix" >&5 + echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 + if test "${ac_cv_lib_cposix_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13448,7 +14456,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 13451 "configure" ++#line 14459 "configure" + #include "confdefs.h" + + int +@@ -13460,16 +14468,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13463: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14471: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13466: \$? = $ac_status" >&5 ++ echo "$as_me:14474: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14477: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13472: \$? = $ac_status" >&5 ++ echo "$as_me:14480: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cposix_main=yes + else +@@ -13480,7 +14488,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:13483: result: $ac_cv_lib_cposix_main" >&5 ++echo "$as_me:14491: result: $ac_cv_lib_cposix_main" >&5 + echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 + if test $ac_cv_lib_cposix_main = yes; then + cat >>confdefs.h <<EOF +@@ -13491,7 +14499,7 @@ + + fi + +- echo "$as_me:13494: checking for bzero in -linet" >&5 ++ echo "$as_me:14502: checking for bzero in -linet" >&5 + echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 + if test "${ac_cv_lib_inet_bzero+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13499,7 +14507,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 13502 "configure" ++#line 14510 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -13518,16 +14526,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13521: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14529: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13524: \$? = $ac_status" >&5 ++ echo "$as_me:14532: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13527: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14535: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13530: \$? = $ac_status" >&5 ++ echo "$as_me:14538: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_inet_bzero=yes + else +@@ -13538,21 +14546,21 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:13541: result: $ac_cv_lib_inet_bzero" >&5 ++echo "$as_me:14549: result: $ac_cv_lib_inet_bzero" >&5 + echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 + if test $ac_cv_lib_inet_bzero = yes; then + LIBS="-linet $LIBS" + fi + fi + +-echo "$as_me:13548: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:14556: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 13555 "configure" ++#line 14563 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -13572,16 +14580,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14583: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13578: \$? = $ac_status" >&5 ++ echo "$as_me:14586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13581: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13584: \$? = $ac_status" >&5 ++ echo "$as_me:14592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_time_select=yes + else +@@ -13593,7 +14601,7 @@ + + fi + +-echo "$as_me:13596: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:14604: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF + #define HAVE_SYS_TIME_SELECT 1 +@@ -13607,7 +14615,7 @@ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return + +-echo "$as_me:13610: checking for $CC option to accept ANSI C" >&5 ++echo "$as_me:14618: checking for $CC option to accept ANSI C" >&5 + echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13615,7 +14623,7 @@ + ac_cv_prog_cc_stdc=no + ac_save_CC=$CC + cat >conftest.$ac_ext <<_ACEOF +-#line 13618 "configure" ++#line 14626 "configure" + #include "confdefs.h" + #include <stdarg.h> + #include <stdio.h> +@@ -13664,16 +14672,16 @@ + do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13667: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14675: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13670: \$? = $ac_status" >&5 ++ echo "$as_me:14678: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13676: \$? = $ac_status" >&5 ++ echo "$as_me:14684: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg + break +@@ -13690,21 +14698,21 @@ + + case "x$ac_cv_prog_cc_stdc" in + x|xno) +- echo "$as_me:13693: result: none needed" >&5 ++ echo "$as_me:14701: result: none needed" >&5 + echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:13696: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:14704: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + +-echo "$as_me:13701: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:14709: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13707 "configure" ++#line 14715 "configure" + #include "confdefs.h" + + int +@@ -13762,16 +14770,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14773: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13768: \$? = $ac_status" >&5 ++ echo "$as_me:14776: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13771: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13774: \$? = $ac_status" >&5 ++ echo "$as_me:14782: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -13781,7 +14789,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:13784: result: $ac_cv_c_const" >&5 ++echo "$as_me:14792: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -13791,7 +14799,7 @@ + + fi + +-echo "$as_me:13794: checking for inline" >&5 ++echo "$as_me:14802: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13799,7 +14807,7 @@ + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat >conftest.$ac_ext <<_ACEOF +-#line 13802 "configure" ++#line 14810 "configure" + #include "confdefs.h" + #ifndef __cplusplus + static $ac_kw int static_foo () {return 0; } +@@ -13808,16 +14816,16 @@ + + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13811: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14819: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13814: \$? = $ac_status" >&5 ++ echo "$as_me:14822: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13817: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14825: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13820: \$? = $ac_status" >&5 ++ echo "$as_me:14828: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_inline=$ac_kw; break + else +@@ -13828,7 +14836,7 @@ + done + + fi +-echo "$as_me:13831: result: $ac_cv_c_inline" >&5 ++echo "$as_me:14839: result: $ac_cv_c_inline" >&5 + echo "${ECHO_T}$ac_cv_c_inline" >&6 + case $ac_cv_c_inline in + inline | yes) ;; +@@ -13849,9 +14857,12 @@ + if test "$INTEL_COMPILER" = yes + then + : ++ elif test "$CLANG_COMPILER" = yes ++ then ++ : + elif test "$GCC" = yes + then +- echo "$as_me:13854: checking if $CC supports options to tune inlining" >&5 ++ echo "$as_me:14865: checking if $CC supports options to tune inlining" >&5 + echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 + if test "${cf_cv_gcc_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13860,7 +14871,7 @@ + cf_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS --param max-inline-insns-single=1200" + cat >conftest.$ac_ext <<_ACEOF +-#line 13863 "configure" ++#line 14874 "configure" + #include "confdefs.h" + inline int foo(void) { return 1; } + int +@@ -13872,16 +14883,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14886: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13878: \$? = $ac_status" >&5 ++ echo "$as_me:14889: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13881: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14892: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13884: \$? = $ac_status" >&5 ++ echo "$as_me:14895: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gcc_inline=yes + else +@@ -13893,7 +14904,7 @@ + CFLAGS=$cf_save_CFLAGS + + fi +-echo "$as_me:13896: result: $cf_cv_gcc_inline" >&5 ++echo "$as_me:14907: result: $cf_cv_gcc_inline" >&5 + echo "${ECHO_T}$cf_cv_gcc_inline" >&6 + if test "$cf_cv_gcc_inline" = yes ; then + +@@ -13979,7 +14990,7 @@ + fi + fi + +-echo "$as_me:13982: checking for signal global datatype" >&5 ++echo "$as_me:14993: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13991,7 +15002,7 @@ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 13994 "configure" ++#line 15005 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -14014,16 +15025,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15028: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14020: \$? = $ac_status" >&5 ++ echo "$as_me:15031: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14023: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15034: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14026: \$? = $ac_status" >&5 ++ echo "$as_me:15037: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -14037,7 +15048,7 @@ + + fi + +-echo "$as_me:14040: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:15051: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF + #define SIG_ATOMIC_T $cf_cv_sig_atomic_t +@@ -14045,7 +15056,7 @@ + + if test $NCURSES_CHTYPE = auto ; then + +-echo "$as_me:14048: checking for type of chtype" >&5 ++echo "$as_me:15059: checking for type of chtype" >&5 + echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 + if test "${cf_cv_typeof_chtype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14055,7 +15066,7 @@ + cf_cv_typeof_chtype=long + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14058 "configure" ++#line 15069 "configure" + #include "confdefs.h" + + #define WANT_BITS 31 +@@ -14090,15 +15101,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15104: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14096: \$? = $ac_status" >&5 ++ echo "$as_me:15107: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14098: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14101: \$? = $ac_status" >&5 ++ echo "$as_me:15112: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_typeof_chtype=`cat cf_test.out` + else +@@ -14113,7 +15124,7 @@ + + fi + +-echo "$as_me:14116: result: $cf_cv_typeof_chtype" >&5 ++echo "$as_me:15127: result: $cf_cv_typeof_chtype" >&5 + echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 + + cat >>confdefs.h <<EOF +@@ -14125,14 +15136,14 @@ + fi + test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype="" + +-echo "$as_me:14128: checking if unsigned literals are legal" >&5 ++echo "$as_me:15139: checking if unsigned literals are legal" >&5 + echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 + if test "${cf_cv_unsigned_literals+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14135 "configure" ++#line 15146 "configure" + #include "confdefs.h" + + int +@@ -14144,16 +15155,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14147: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14150: \$? = $ac_status" >&5 ++ echo "$as_me:15161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14153: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14156: \$? = $ac_status" >&5 ++ echo "$as_me:15167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_unsigned_literals=yes + else +@@ -14165,7 +15176,7 @@ + + fi + +-echo "$as_me:14168: result: $cf_cv_unsigned_literals" >&5 ++echo "$as_me:15179: result: $cf_cv_unsigned_literals" >&5 + echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 + + cf_cv_1UL="1" +@@ -14181,14 +15192,14 @@ + + ### Checks for external-data + +-echo "$as_me:14184: checking if external errno is declared" >&5 ++echo "$as_me:15195: checking if external errno is declared" >&5 + echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 + if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14191 "configure" ++#line 15202 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -14206,16 +15217,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14209: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14212: \$? = $ac_status" >&5 ++ echo "$as_me:15223: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14215: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14218: \$? = $ac_status" >&5 ++ echo "$as_me:15229: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_errno=yes + else +@@ -14226,7 +15237,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:14229: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:15240: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -14241,14 +15252,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:14244: checking if external errno exists" >&5 ++echo "$as_me:15255: checking if external errno exists" >&5 + echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 + if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14251 "configure" ++#line 15262 "configure" + #include "confdefs.h" + + #undef errno +@@ -14263,16 +15274,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14266: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15277: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14269: \$? = $ac_status" >&5 ++ echo "$as_me:15280: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14272: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15283: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14275: \$? = $ac_status" >&5 ++ echo "$as_me:15286: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_errno=yes + else +@@ -14283,7 +15294,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:14286: result: $cf_cv_have_errno" >&5 ++echo "$as_me:15297: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -14296,7 +15307,7 @@ + + fi + +-echo "$as_me:14299: checking if data-only library module links" >&5 ++echo "$as_me:15310: checking if data-only library module links" >&5 + echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 + if test "${cf_cv_link_dataonly+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14304,20 +15315,20 @@ + + rm -f conftest.a + cat >conftest.$ac_ext <<EOF +-#line 14307 "configure" ++#line 15318 "configure" + int testdata[3] = { 123, 456, 789 }; + EOF +- if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15321: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14313: \$? = $ac_status" >&5 ++ echo "$as_me:15324: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + mv conftest.o data.o && \ + ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null + fi + rm -f conftest.$ac_ext data.o + cat >conftest.$ac_ext <<EOF +-#line 14320 "configure" ++#line 15331 "configure" + int testfunc() + { + #if defined(NeXT) +@@ -14330,10 +15341,10 @@ + #endif + } + EOF +- if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:15344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14336: \$? = $ac_status" >&5 ++ echo "$as_me:15347: \$? = $ac_status" >&5 + (exit $ac_status); }; then + mv conftest.o func.o && \ + ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null +@@ -14346,7 +15357,7 @@ + cf_cv_link_dataonly=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14349 "configure" ++#line 15360 "configure" + #include "confdefs.h" + + int main() +@@ -14357,15 +15368,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14360: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14363: \$? = $ac_status" >&5 ++ echo "$as_me:15374: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14365: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15376: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14368: \$? = $ac_status" >&5 ++ echo "$as_me:15379: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_link_dataonly=yes + else +@@ -14380,7 +15391,7 @@ + + fi + +-echo "$as_me:14383: result: $cf_cv_link_dataonly" >&5 ++echo "$as_me:15394: result: $cf_cv_link_dataonly" >&5 + echo "${ECHO_T}$cf_cv_link_dataonly" >&6 + + if test "$cf_cv_link_dataonly" = no ; then +@@ -14400,10 +15411,12 @@ + getttynam \ + issetugid \ + poll \ ++putenv \ + remove \ + select \ + setbuf \ + setbuffer \ ++setenv \ + setvbuf \ + sigaction \ + sigvec \ +@@ -14415,13 +15428,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:14418: checking for $ac_func" >&5 ++echo "$as_me:15431: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14424 "configure" ++#line 15437 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -14444,7 +15457,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -14452,16 +15465,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14455: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15468: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14458: \$? = $ac_status" >&5 ++ echo "$as_me:15471: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14461: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15474: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14464: \$? = $ac_status" >&5 ++ echo "$as_me:15477: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -14471,7 +15484,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14474: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:15487: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -14483,14 +15496,70 @@ + + if test "$with_getcap" = "yes" ; then + +-echo "$as_me:14486: checking for terminal-capability database functions" >&5 ++echo "$as_me:15499: checking for terminal-capability database functions" >&5 + echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 + if test "${cf_cv_cgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14493 "configure" ++#line 15506 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++int ++main () ++{ ++ ++ char temp[128]; ++ char *buf = temp; ++ char *db_array = temp; ++ cgetent(&buf, &db_array, "vt100"); ++ cgetcap(buf, "tc", '='); ++ cgetmatch(buf, "tc"); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:15526: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:15529: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:15532: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:15535: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_cgetent=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_cgetent=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ ++fi ++echo "$as_me:15546: result: $cf_cv_cgetent" >&5 ++echo "${ECHO_T}$cf_cv_cgetent" >&6 ++ ++if test "$cf_cv_cgetent" = yes ++then ++ cat >>confdefs.h <<\EOF ++#define HAVE_BSD_CGETENT 1 ++EOF ++ ++echo "$as_me:15555: checking if cgetent uses const parameter" >&5 ++echo $ECHO_N "checking if cgetent uses const parameter... $ECHO_C" >&6 ++if test "${cf_cv_cgetent_const+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line 15562 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14500,8 +15569,10 @@ + + char temp[128]; + char *buf = temp; +- char *db_array = temp; +- cgetent(&buf, /* int *, */ &db_array, "vt100"); ++#ifndef _NETBSD_SOURCE /* given, since April 2004 in stdlib.h */ ++ const char *db_array = temp; ++ cgetent(&buf, &db_array, "vt100"); ++#endif + cgetcap(buf, "tc", '='); + cgetmatch(buf, "tc"); + +@@ -14510,43 +15581,47 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14513: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15584: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14516: \$? = $ac_status" >&5 ++ echo "$as_me:15587: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14519: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15590: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14522: \$? = $ac_status" >&5 ++ echo "$as_me:15593: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_cgetent=yes ++ cf_cv_cgetent_const=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_cgetent=no ++cf_cv_cgetent_const=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +- +-echo "$as_me:14534: result: $cf_cv_cgetent" >&5 +-echo "${ECHO_T}$cf_cv_cgetent" >&6 +-test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF +-#define HAVE_BSD_CGETENT 1 ++echo "$as_me:15604: result: $cf_cv_cgetent_const" >&5 ++echo "${ECHO_T}$cf_cv_cgetent_const" >&6 ++ if test "$cf_cv_cgetent_const" = yes ++ then ++ cat >>confdefs.h <<EOF ++#define CGETENT_CONST const + EOF + ++ fi ++fi ++ + fi + +-echo "$as_me:14542: checking for isascii" >&5 ++echo "$as_me:15617: checking for isascii" >&5 + echo $ECHO_N "checking for isascii... $ECHO_C" >&6 + if test "${cf_cv_have_isascii+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14549 "configure" ++#line 15624 "configure" + #include "confdefs.h" + #include <ctype.h> + int +@@ -14558,16 +15633,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14561: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15636: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14564: \$? = $ac_status" >&5 ++ echo "$as_me:15639: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14567: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15642: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14570: \$? = $ac_status" >&5 ++ echo "$as_me:15645: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_isascii=yes + else +@@ -14578,17 +15653,17 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:14581: result: $cf_cv_have_isascii" >&5 ++echo "$as_me:15656: result: $cf_cv_have_isascii" >&5 + echo "${ECHO_T}$cf_cv_have_isascii" >&6 + test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF + #define HAVE_ISASCII 1 + EOF + + if test "$ac_cv_func_sigaction" = yes; then +-echo "$as_me:14588: checking whether sigaction needs _POSIX_SOURCE" >&5 ++echo "$as_me:15663: checking whether sigaction needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14591 "configure" ++#line 15666 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -14602,16 +15677,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15680: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14608: \$? = $ac_status" >&5 ++ echo "$as_me:15683: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14611: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15686: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14614: \$? = $ac_status" >&5 ++ echo "$as_me:15689: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + sigact_bad=no + else +@@ -14619,7 +15694,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 14622 "configure" ++#line 15697 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -14634,20 +15709,20 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14637: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14640: \$? = $ac_status" >&5 ++ echo "$as_me:15715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14643: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14646: \$? = $ac_status" >&5 ++ echo "$as_me:15721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + sigact_bad=yes + cat >>confdefs.h <<\EOF +-#define SVR4_ACTION 1 ++#define _POSIX_SOURCE 1 + EOF + + else +@@ -14658,11 +15733,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14661: result: $sigact_bad" >&5 ++echo "$as_me:15736: result: $sigact_bad" >&5 + echo "${ECHO_T}$sigact_bad" >&6 + fi + +-echo "$as_me:14665: checking if nanosleep really works" >&5 ++echo "$as_me:15740: checking if nanosleep really works" >&5 + echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 + if test "${cf_cv_func_nanosleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14672,7 +15747,7 @@ + cf_cv_func_nanosleep=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14675 "configure" ++#line 15750 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -14697,15 +15772,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14700: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15775: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14703: \$? = $ac_status" >&5 ++ echo "$as_me:15778: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14705: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14708: \$? = $ac_status" >&5 ++ echo "$as_me:15783: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_nanosleep=yes + else +@@ -14717,7 +15792,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:14720: result: $cf_cv_func_nanosleep" >&5 ++echo "$as_me:15795: result: $cf_cv_func_nanosleep" >&5 + echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 + + test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF +@@ -14731,23 +15806,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14734: checking for $ac_header" >&5 ++echo "$as_me:15809: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14740 "configure" ++#line 15815 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:14744: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:15819: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14750: \$? = $ac_status" >&5 ++ echo "$as_me:15825: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14766,7 +15841,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:14769: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:15844: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -14781,23 +15856,23 @@ + for ac_header in sys/termio.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:14784: checking for $ac_header" >&5 ++echo "$as_me:15859: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14790 "configure" ++#line 15865 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:14794: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:15869: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:14800: \$? = $ac_status" >&5 ++ echo "$as_me:15875: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -14816,7 +15891,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:14819: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:15894: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -14834,10 +15909,10 @@ + *) termios_bad=maybe ;; + esac + if test "$termios_bad" = maybe ; then +- echo "$as_me:14837: checking whether termios.h needs _POSIX_SOURCE" >&5 ++ echo "$as_me:15912: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14840 "configure" ++#line 15915 "configure" + #include "confdefs.h" + #include <termios.h> + int +@@ -14849,16 +15924,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14852: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15927: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14855: \$? = $ac_status" >&5 ++ echo "$as_me:15930: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14858: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15933: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14861: \$? = $ac_status" >&5 ++ echo "$as_me:15936: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=no + else +@@ -14866,7 +15941,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 14869 "configure" ++#line 15944 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -14880,23 +15955,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14883: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15958: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14886: \$? = $ac_status" >&5 ++ echo "$as_me:15961: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14889: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15964: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14892: \$? = $ac_status" >&5 ++ echo "$as_me:15967: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=unknown + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + termios_bad=yes cat >>confdefs.h <<\EOF +-#define SVR4_TERMIO 1 ++#define _POSIX_SOURCE 1 + EOF + + fi +@@ -14904,19 +15979,19 @@ + + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:14907: result: $termios_bad" >&5 ++ echo "$as_me:15982: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:14912: checking for tcgetattr" >&5 ++echo "$as_me:15987: checking for tcgetattr" >&5 + echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 + if test "${cf_cv_have_tcgetattr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14919 "configure" ++#line 15994 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -14944,16 +16019,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14947: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16022: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14950: \$? = $ac_status" >&5 ++ echo "$as_me:16025: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14953: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16028: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14956: \$? = $ac_status" >&5 ++ echo "$as_me:16031: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_tcgetattr=yes + else +@@ -14963,20 +16038,20 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:14966: result: $cf_cv_have_tcgetattr" >&5 ++echo "$as_me:16041: result: $cf_cv_have_tcgetattr" >&5 + echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 + test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF + #define HAVE_TCGETATTR 1 + EOF + +-echo "$as_me:14972: checking for vsscanf function or workaround" >&5 ++echo "$as_me:16047: checking for vsscanf function or workaround" >&5 + echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 + if test "${cf_cv_func_vsscanf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14979 "configure" ++#line 16054 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -14992,16 +16067,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14995: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16070: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14998: \$? = $ac_status" >&5 ++ echo "$as_me:16073: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15001: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16076: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15004: \$? = $ac_status" >&5 ++ echo "$as_me:16079: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=vsscanf + else +@@ -15009,7 +16084,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 15012 "configure" ++#line 16087 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -15031,16 +16106,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15034: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15037: \$? = $ac_status" >&5 ++ echo "$as_me:16112: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15040: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15043: \$? = $ac_status" >&5 ++ echo "$as_me:16118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=vfscanf + else +@@ -15048,7 +16123,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 15051 "configure" ++#line 16126 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -15070,16 +16145,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15073: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16148: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15076: \$? = $ac_status" >&5 ++ echo "$as_me:16151: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15079: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16154: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15082: \$? = $ac_status" >&5 ++ echo "$as_me:16157: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_vsscanf=_doscan + else +@@ -15094,7 +16169,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15097: result: $cf_cv_func_vsscanf" >&5 ++echo "$as_me:16172: result: $cf_cv_func_vsscanf" >&5 + echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 + + case $cf_cv_func_vsscanf in #(vi +@@ -15112,7 +16187,7 @@ + ;; + esac + +-echo "$as_me:15115: checking for working mkstemp" >&5 ++echo "$as_me:16190: checking for working mkstemp" >&5 + echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 + if test "${cf_cv_func_mkstemp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15120,68 +16195,10 @@ + + rm -rf conftest* + if test "$cross_compiling" = yes; then +- echo "$as_me:15123: checking for mkstemp" >&5 +-echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 +-if test "${ac_cv_func_mkstemp+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 15129 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char mkstemp (); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char mkstemp (); +-char (*f) (); +- +-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_mkstemp) || defined (__stub___mkstemp) +-choke me +-#else +-f = mkstemp; +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15160: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:15163: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15166: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:15169: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_func_mkstemp=yes +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_func_mkstemp=no +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:15179: result: $ac_cv_func_mkstemp" >&5 +-echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 +- ++ cf_cv_func_mkstemp=maybe + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15184 "configure" ++#line 16201 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -15219,15 +16236,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15222: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16239: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15225: \$? = $ac_status" >&5 ++ echo "$as_me:16242: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16244: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15230: \$? = $ac_status" >&5 ++ echo "$as_me:16247: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_mkstemp=yes + +@@ -15242,8 +16259,69 @@ + fi + + fi +-echo "$as_me:15245: result: $cf_cv_func_mkstemp" >&5 ++echo "$as_me:16262: result: $cf_cv_func_mkstemp" >&5 + echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 ++if test "x$cf_cv_func_mkstemp" = xmaybe ; then ++ echo "$as_me:16265: checking for mkstemp" >&5 ++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 ++if test "${ac_cv_func_mkstemp+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 16271 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char mkstemp (); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char mkstemp (); ++char (*f) (); ++ ++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_mkstemp) || defined (__stub___mkstemp) ++choke me ++#else ++f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:16302: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16305: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:16308: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16311: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_mkstemp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_func_mkstemp=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:16321: result: $ac_cv_func_mkstemp" >&5 ++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 ++ ++fi + if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then + cat >>confdefs.h <<\EOF + #define HAVE_MKSTEMP 1 +@@ -15260,21 +16338,21 @@ + fi + + if test "$cross_compiling" = yes ; then +- { echo "$as_me:15263: WARNING: cross compiling: assume setvbuf params not reversed" >&5 ++ { echo "$as_me:16341: WARNING: cross compiling: assume setvbuf params not reversed" >&5 + echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} + else +- echo "$as_me:15266: checking whether setvbuf arguments are reversed" >&5 ++ echo "$as_me:16344: checking whether setvbuf arguments are reversed" >&5 + echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 + if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:15272: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:16350: error: cannot run test program while cross compiling" >&5 + echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15277 "configure" ++#line 16355 "configure" + #include "confdefs.h" + #include <stdio.h> + /* If setvbuf has the reversed format, exit 0. */ +@@ -15291,15 +16369,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15294: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16372: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15297: \$? = $ac_status" >&5 ++ echo "$as_me:16375: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15299: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16377: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15302: \$? = $ac_status" >&5 ++ echo "$as_me:16380: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_setvbuf_reversed=yes + else +@@ -15312,7 +16390,7 @@ + fi + rm -f core core.* *.core + fi +-echo "$as_me:15315: result: $ac_cv_func_setvbuf_reversed" >&5 ++echo "$as_me:16393: result: $ac_cv_func_setvbuf_reversed" >&5 + echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 + if test $ac_cv_func_setvbuf_reversed = yes; then + +@@ -15323,13 +16401,13 @@ + fi + + fi +-echo "$as_me:15326: checking return type of signal handlers" >&5 ++echo "$as_me:16404: checking return type of signal handlers" >&5 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 + if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15332 "configure" ++#line 16410 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <signal.h> +@@ -15351,16 +16429,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16432: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15357: \$? = $ac_status" >&5 ++ echo "$as_me:16435: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15360: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16438: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15363: \$? = $ac_status" >&5 ++ echo "$as_me:16441: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signal=void + else +@@ -15370,21 +16448,73 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15373: result: $ac_cv_type_signal" >&5 ++echo "$as_me:16451: result: $ac_cv_type_signal" >&5 + echo "${ECHO_T}$ac_cv_type_signal" >&6 + + cat >>confdefs.h <<EOF + #define RETSIGTYPE $ac_cv_type_signal + EOF + +-echo "$as_me:15380: checking for type sigaction_t" >&5 ++echo "$as_me:16458: checking for intptr_t" >&5 ++echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 ++if test "${ac_cv_type_intptr_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 16464 "configure" ++#include "confdefs.h" ++$ac_includes_default ++int ++main () ++{ ++if ((intptr_t *) 0) ++ return 0; ++if (sizeof (intptr_t)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:16479: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:16482: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:16485: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16488: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_intptr_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_type_intptr_t=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:16498: result: $ac_cv_type_intptr_t" >&5 ++echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 ++if test $ac_cv_type_intptr_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<EOF ++#define intptr_t long ++EOF ++ ++fi ++ ++echo "$as_me:16510: checking for type sigaction_t" >&5 + echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 + if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 15387 "configure" ++#line 16517 "configure" + #include "confdefs.h" + + #include <signal.h> +@@ -15397,16 +16527,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16530: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15403: \$? = $ac_status" >&5 ++ echo "$as_me:16533: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15406: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16536: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15409: \$? = $ac_status" >&5 ++ echo "$as_me:16539: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_sigaction=yes + else +@@ -15417,13 +16547,13 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:15420: result: $cf_cv_type_sigaction" >&5 ++echo "$as_me:16550: result: $cf_cv_type_sigaction" >&5 + echo "${ECHO_T}$cf_cv_type_sigaction" >&6 + test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF + #define HAVE_TYPE_SIGACTION 1 + EOF + +-echo "$as_me:15426: checking declaration of size-change" >&5 ++echo "$as_me:16556: checking declaration of size-change" >&5 + echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 + if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15438,7 +16568,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + cat >conftest.$ac_ext <<_ACEOF +-#line 15441 "configure" ++#line 16571 "configure" + #include "confdefs.h" + #include <sys/types.h> + #ifdef HAVE_TERMIOS_H +@@ -15482,16 +16612,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16615: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15488: \$? = $ac_status" >&5 ++ echo "$as_me:16618: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15491: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15494: \$? = $ac_status" >&5 ++ echo "$as_me:16624: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sizechange=yes + else +@@ -15510,7 +16640,7 @@ + done + + fi +-echo "$as_me:15513: result: $cf_cv_sizechange" >&5 ++echo "$as_me:16643: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + cat >>confdefs.h <<\EOF +@@ -15527,13 +16657,13 @@ + esac + fi + +-echo "$as_me:15530: checking for memmove" >&5 ++echo "$as_me:16660: checking for memmove" >&5 + echo $ECHO_N "checking for memmove... $ECHO_C" >&6 + if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15536 "configure" ++#line 16666 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char memmove (); below. */ +@@ -15556,7 +16686,7 @@ + #if defined (__stub_memmove) || defined (__stub___memmove) + choke me + #else +-f = memmove; ++f = memmove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -15564,16 +16694,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15567: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16697: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15570: \$? = $ac_status" >&5 ++ echo "$as_me:16700: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15573: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16703: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15576: \$? = $ac_status" >&5 ++ echo "$as_me:16706: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memmove=yes + else +@@ -15583,19 +16713,19 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15586: result: $ac_cv_func_memmove" >&5 ++echo "$as_me:16716: result: $ac_cv_func_memmove" >&5 + echo "${ECHO_T}$ac_cv_func_memmove" >&6 + if test $ac_cv_func_memmove = yes; then + : + else + +-echo "$as_me:15592: checking for bcopy" >&5 ++echo "$as_me:16722: checking for bcopy" >&5 + echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 + if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15598 "configure" ++#line 16728 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char bcopy (); below. */ +@@ -15618,7 +16748,7 @@ + #if defined (__stub_bcopy) || defined (__stub___bcopy) + choke me + #else +-f = bcopy; ++f = bcopy; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -15626,16 +16756,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15629: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16759: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15632: \$? = $ac_status" >&5 ++ echo "$as_me:16762: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15635: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16765: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15638: \$? = $ac_status" >&5 ++ echo "$as_me:16768: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_bcopy=yes + else +@@ -15645,11 +16775,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15648: result: $ac_cv_func_bcopy" >&5 ++echo "$as_me:16778: result: $ac_cv_func_bcopy" >&5 + echo "${ECHO_T}$ac_cv_func_bcopy" >&6 + if test $ac_cv_func_bcopy = yes; then + +- echo "$as_me:15652: checking if bcopy does overlapping moves" >&5 ++ echo "$as_me:16782: checking if bcopy does overlapping moves" >&5 + echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 + if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15659,7 +16789,7 @@ + cf_cv_good_bcopy=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15662 "configure" ++#line 16792 "configure" + #include "confdefs.h" + + int main() { +@@ -15673,15 +16803,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15676: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16806: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15679: \$? = $ac_status" >&5 ++ echo "$as_me:16809: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15681: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16811: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15684: \$? = $ac_status" >&5 ++ echo "$as_me:16814: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_good_bcopy=yes + else +@@ -15694,7 +16824,7 @@ + fi + + fi +-echo "$as_me:15697: result: $cf_cv_good_bcopy" >&5 ++echo "$as_me:16827: result: $cf_cv_good_bcopy" >&5 + echo "${ECHO_T}$cf_cv_good_bcopy" >&6 + + else +@@ -15715,7 +16845,7 @@ + + fi + +-echo "$as_me:15718: checking if poll really works" >&5 ++echo "$as_me:16848: checking if poll really works" >&5 + echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 + if test "${cf_cv_working_poll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15725,10 +16855,13 @@ + cf_cv_working_poll=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15728 "configure" ++#line 16858 "configure" + #include "confdefs.h" + ++#include <stdlib.h> + #include <stdio.h> ++#include <unistd.h> ++#include <fcntl.h> + #ifdef HAVE_POLL_H + #include <poll.h> + #else +@@ -15738,23 +16871,46 @@ + struct pollfd myfds; + int ret; + +- myfds.fd = 0; ++ /* check for Darwin bug with respect to "devices" */ ++ myfds.fd = open("/dev/null", 1); /* O_WRONLY */ ++ if (myfds.fd < 0) ++ myfds.fd = 0; + myfds.events = POLLIN; ++ myfds.revents = 0; + + ret = poll(&myfds, 1, 100); +- ${cf_cv_main_return:-return}(ret != 0); ++ ++ if (ret < 0 || (myfds.revents & POLLNVAL)) { ++ ret = -1; ++ } else { ++ int fd = 0; ++ if (!isatty(fd)) { ++ fd = open("/dev/tty", 2); /* O_RDWR */ ++ } ++ ++ if (fd >= 0) { ++ /* also check with standard input */ ++ myfds.fd = fd; ++ myfds.events = POLLIN; ++ myfds.revents = 0; ++ ret = poll(&myfds, 1, 100); ++ } else { ++ ret = -1; ++ } ++ } ++ ${cf_cv_main_return:-return}(ret < 0); + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15749: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16905: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15752: \$? = $ac_status" >&5 ++ echo "$as_me:16908: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15754: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16910: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15757: \$? = $ac_status" >&5 ++ echo "$as_me:16913: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_working_poll=yes + else +@@ -15766,20 +16922,20 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:15769: result: $cf_cv_working_poll" >&5 ++echo "$as_me:16925: result: $cf_cv_working_poll" >&5 + echo "${ECHO_T}$cf_cv_working_poll" >&6 + test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF + #define HAVE_WORKING_POLL 1 + EOF + +-echo "$as_me:15775: checking for va_copy" >&5 ++echo "$as_me:16931: checking for va_copy" >&5 + echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 + if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 15782 "configure" ++#line 16938 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -15796,16 +16952,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15799: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16955: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15802: \$? = $ac_status" >&5 ++ echo "$as_me:16958: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15805: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15808: \$? = $ac_status" >&5 ++ echo "$as_me:16964: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_va_copy=yes + else +@@ -15815,21 +16971,21 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15818: result: $cf_cv_have_va_copy" >&5 ++echo "$as_me:16974: result: $cf_cv_have_va_copy" >&5 + echo "${ECHO_T}$cf_cv_have_va_copy" >&6 + + test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF + #define HAVE_VA_COPY 1 + EOF + +-echo "$as_me:15825: checking for __va_copy" >&5 ++echo "$as_me:16981: checking for __va_copy" >&5 + echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 + if test "${cf_cv_have___va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 15832 "configure" ++#line 16988 "configure" + #include "confdefs.h" + + #include <stdarg.h> +@@ -15846,16 +17002,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17005: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15852: \$? = $ac_status" >&5 ++ echo "$as_me:17008: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15855: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15858: \$? = $ac_status" >&5 ++ echo "$as_me:17014: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes + else +@@ -15865,20 +17021,20 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:15868: result: $cf_cv_have___va_copy" >&5 ++echo "$as_me:17024: result: $cf_cv_have___va_copy" >&5 + echo "${ECHO_T}$cf_cv_have___va_copy" >&6 + + test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF + #define HAVE___VA_COPY 1 + EOF + +-echo "$as_me:15875: checking for pid_t" >&5 ++echo "$as_me:17031: checking for pid_t" >&5 + echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 + if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15881 "configure" ++#line 17037 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -15893,16 +17049,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17052: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15899: \$? = $ac_status" >&5 ++ echo "$as_me:17055: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15902: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17058: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15905: \$? = $ac_status" >&5 ++ echo "$as_me:17061: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +@@ -15912,7 +17068,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:15915: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:17071: result: $ac_cv_type_pid_t" >&5 + echo "${ECHO_T}$ac_cv_type_pid_t" >&6 + if test $ac_cv_type_pid_t = yes; then + : +@@ -15927,23 +17083,23 @@ + for ac_header in unistd.h vfork.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:15930: checking for $ac_header" >&5 ++echo "$as_me:17086: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15936 "configure" ++#line 17092 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:15940: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:17096: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:15946: \$? = $ac_status" >&5 ++ echo "$as_me:17102: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -15962,7 +17118,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:15965: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:17121: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -15975,13 +17131,13 @@ + for ac_func in fork vfork + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:15978: checking for $ac_func" >&5 ++echo "$as_me:17134: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15984 "configure" ++#line 17140 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -16004,7 +17160,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -16012,16 +17168,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17171: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16018: \$? = $ac_status" >&5 ++ echo "$as_me:17174: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16021: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17177: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16024: \$? = $ac_status" >&5 ++ echo "$as_me:17180: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -16031,7 +17187,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:16034: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:17190: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -16043,7 +17199,7 @@ + + ac_cv_func_fork_works=$ac_cv_func_fork + if test "x$ac_cv_func_fork" = xyes; then +- echo "$as_me:16046: checking for working fork" >&5 ++ echo "$as_me:17202: checking for working fork" >&5 + echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + if test "${ac_cv_func_fork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16066,15 +17222,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17225: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16072: \$? = $ac_status" >&5 ++ echo "$as_me:17228: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16074: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16077: \$? = $ac_status" >&5 ++ echo "$as_me:17233: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fork_works=yes + else +@@ -16086,7 +17242,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:16089: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:17245: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -16100,12 +17256,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:16103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:17259: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} + fi + ac_cv_func_vfork_works=$ac_cv_func_vfork + if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:16108: checking for working vfork" >&5 ++ echo "$as_me:17264: checking for working vfork" >&5 + echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + if test "${ac_cv_func_vfork_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16114,7 +17270,7 @@ + ac_cv_func_vfork_works=cross + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16117 "configure" ++#line 17273 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include <stdio.h> +@@ -16211,15 +17367,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16214: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17370: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16217: \$? = $ac_status" >&5 ++ echo "$as_me:17373: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17375: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16222: \$? = $ac_status" >&5 ++ echo "$as_me:17378: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -16231,13 +17387,13 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:16234: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:17390: result: $ac_cv_func_vfork_works" >&5 + echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 + + fi; + if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:16240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:17396: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi + +@@ -16264,7 +17420,7 @@ + + # special check for test/ditto.c + +-echo "$as_me:16267: checking for openpty in -lutil" >&5 ++echo "$as_me:17423: checking for openpty in -lutil" >&5 + echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 + if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16272,7 +17428,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lutil $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16275 "configure" ++#line 17431 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16291,16 +17447,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17450: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16297: \$? = $ac_status" >&5 ++ echo "$as_me:17453: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16300: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17456: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16303: \$? = $ac_status" >&5 ++ echo "$as_me:17459: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes + else +@@ -16311,7 +17467,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16314: result: $ac_cv_lib_util_openpty" >&5 ++echo "$as_me:17470: result: $ac_cv_lib_util_openpty" >&5 + echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 + if test $ac_cv_lib_util_openpty = yes; then + cf_cv_lib_util=yes +@@ -16319,7 +17475,7 @@ + cf_cv_lib_util=no + fi + +-echo "$as_me:16322: checking for openpty header" >&5 ++echo "$as_me:17478: checking for openpty header" >&5 + echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 + if test "${cf_cv_func_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16330,7 +17486,7 @@ + for cf_header in pty.h libutil.h util.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 16333 "configure" ++#line 17489 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -16347,16 +17503,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16350: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17506: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16353: \$? = $ac_status" >&5 ++ echo "$as_me:17509: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16356: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16359: \$? = $ac_status" >&5 ++ echo "$as_me:17515: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_func_openpty=$cf_header +@@ -16374,7 +17530,7 @@ + LIBS="$cf_save_LIBS" + + fi +-echo "$as_me:16377: result: $cf_cv_func_openpty" >&5 ++echo "$as_me:17533: result: $cf_cv_func_openpty" >&5 + echo "${ECHO_T}$cf_cv_func_openpty" >&6 + + if test "$cf_cv_func_openpty" != no ; then +@@ -16426,7 +17582,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 16429 "configure" ++#line 17585 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -16438,16 +17594,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16444: \$? = $ac_status" >&5 ++ echo "$as_me:17600: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16447: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17603: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16450: \$? = $ac_status" >&5 ++ echo "$as_me:17606: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -16464,7 +17620,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:16467: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:17623: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -16498,7 +17654,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:16501: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:17657: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -16509,23 +17665,23 @@ + fi + esac + +-echo "$as_me:16512: checking for db.h" >&5 ++echo "$as_me:17668: checking for db.h" >&5 + echo $ECHO_N "checking for db.h... $ECHO_C" >&6 + if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16518 "configure" ++#line 17674 "configure" + #include "confdefs.h" + #include <db.h> + _ACEOF +-if { (eval echo "$as_me:16522: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:17678: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:16528: \$? = $ac_status" >&5 ++ echo "$as_me:17684: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16544,11 +17700,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16547: result: $ac_cv_header_db_h" >&5 ++echo "$as_me:17703: result: $ac_cv_header_db_h" >&5 + echo "${ECHO_T}$ac_cv_header_db_h" >&6 + if test $ac_cv_header_db_h = yes; then + +-echo "$as_me:16551: checking for version of db" >&5 ++echo "$as_me:17707: checking for version of db" >&5 + echo $ECHO_N "checking for version of db... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16559,10 +17715,10 @@ + for cf_db_version in 1 2 3 4 5 + do + +-echo "${as_me:-configure}:16562: testing checking for db version $cf_db_version ..." 1>&5 ++echo "${as_me:-configure}:17718: testing checking for db version $cf_db_version ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 16565 "configure" ++#line 17721 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -16592,16 +17748,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17751: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16598: \$? = $ac_status" >&5 ++ echo "$as_me:17754: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16601: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17757: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16604: \$? = $ac_status" >&5 ++ echo "$as_me:17760: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_hashed_db_version=$cf_db_version +@@ -16615,16 +17771,16 @@ + done + + fi +-echo "$as_me:16618: result: $cf_cv_hashed_db_version" >&5 ++echo "$as_me:17774: result: $cf_cv_hashed_db_version" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 + + if test "$cf_cv_hashed_db_version" = unknown ; then +- { { echo "$as_me:16622: error: Cannot determine version of db" >&5 ++ { { echo "$as_me:17778: error: Cannot determine version of db" >&5 + echo "$as_me: error: Cannot determine version of db" >&2;} + { (exit 1); exit 1; }; } + else + +-echo "$as_me:16627: checking for db libraries" >&5 ++echo "$as_me:17783: checking for db libraries" >&5 + echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 + if test "${cf_cv_hashed_db_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16638,10 +17794,10 @@ + LIBS="-l$cf_db_libs $LIBS" + fi + +-echo "${as_me:-configure}:16641: testing checking for library "$cf_db_libs" ..." 1>&5 ++echo "${as_me:-configure}:17797: testing checking for library "$cf_db_libs" ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 16644 "configure" ++#line 17800 "configure" + #include "confdefs.h" + + $ac_includes_default +@@ -16696,16 +17852,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16699: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17855: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16702: \$? = $ac_status" >&5 ++ echo "$as_me:17858: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16705: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17861: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16708: \$? = $ac_status" >&5 ++ echo "$as_me:17864: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + if test -n "$cf_db_libs" ; then +@@ -16725,11 +17881,11 @@ + done + + fi +-echo "$as_me:16728: result: $cf_cv_hashed_db_libs" >&5 ++echo "$as_me:17884: result: $cf_cv_hashed_db_libs" >&5 + echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 + + if test "$cf_cv_hashed_db_libs" = unknown ; then +- { { echo "$as_me:16732: error: Cannot determine library for db" >&5 ++ { { echo "$as_me:17888: error: Cannot determine library for db" >&5 + echo "$as_me: error: Cannot determine library for db" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_cv_hashed_db_libs" != default ; then +@@ -16739,7 +17895,7 @@ + + else + +- { { echo "$as_me:16742: error: Cannot find db.h" >&5 ++ { { echo "$as_me:17898: error: Cannot find db.h" >&5 + echo "$as_me: error: Cannot find db.h" >&2;} + { (exit 1); exit 1; }; } + +@@ -16754,7 +17910,7 @@ + + # Just in case, check if the C compiler has a bool type. + +-echo "$as_me:16757: checking if we should include stdbool.h" >&5 ++echo "$as_me:17913: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -16762,7 +17918,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 16765 "configure" ++#line 17921 "configure" + #include "confdefs.h" + + int +@@ -16774,23 +17930,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17933: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16780: \$? = $ac_status" >&5 ++ echo "$as_me:17936: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16783: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17939: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16786: \$? = $ac_status" >&5 ++ echo "$as_me:17942: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 16793 "configure" ++#line 17949 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -16806,16 +17962,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17965: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16812: \$? = $ac_status" >&5 ++ echo "$as_me:17968: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16815: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17971: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16818: \$? = $ac_status" >&5 ++ echo "$as_me:17974: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -16829,13 +17985,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:16832: result: yes" >&5 ++then echo "$as_me:17988: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:16834: result: no" >&5 ++else echo "$as_me:17990: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:16838: checking for builtin bool type" >&5 ++echo "$as_me:17994: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_cc_bool_type+set}" = set; then +@@ -16843,7 +17999,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 16846 "configure" ++#line 18002 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -16858,16 +18014,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16861: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18017: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16864: \$? = $ac_status" >&5 ++ echo "$as_me:18020: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16867: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18023: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16870: \$? = $ac_status" >&5 ++ echo "$as_me:18026: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cc_bool_type=1 + else +@@ -16880,9 +18036,9 @@ + fi + + if test "$cf_cv_cc_bool_type" = 1 +-then echo "$as_me:16883: result: yes" >&5 ++then echo "$as_me:18039: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:16885: result: no" >&5 ++else echo "$as_me:18041: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -16904,7 +18060,7 @@ + cf_stdcpp_libname=stdc++ + ;; + esac +-echo "$as_me:16907: checking for library $cf_stdcpp_libname" >&5 ++echo "$as_me:18063: checking for library $cf_stdcpp_libname" >&5 + echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 + if test "${cf_cv_libstdcpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16913,7 +18069,7 @@ + cf_save="$LIBS" + LIBS="-l$cf_stdcpp_libname $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16916 "configure" ++#line 18072 "configure" + #include "confdefs.h" + + #include <strstream.h> +@@ -16929,16 +18085,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16932: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18088: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16935: \$? = $ac_status" >&5 ++ echo "$as_me:18091: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16938: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18094: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16941: \$? = $ac_status" >&5 ++ echo "$as_me:18097: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_libstdcpp=yes + else +@@ -16950,12 +18106,12 @@ + LIBS="$cf_save" + + fi +-echo "$as_me:16953: result: $cf_cv_libstdcpp" >&5 ++echo "$as_me:18109: result: $cf_cv_libstdcpp" >&5 + echo "${ECHO_T}$cf_cv_libstdcpp" >&6 + test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" + fi + +- echo "$as_me:16958: checking whether $CXX understands -c and -o together" >&5 ++ echo "$as_me:18114: checking whether $CXX understands -c and -o together" >&5 + echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 + if test "${cf_cv_prog_CXX_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -16971,15 +18127,15 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' +-if { (eval echo "$as_me:16974: \"$ac_try\"") >&5 ++if { (eval echo "$as_me:18130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16977: \$? = $ac_status" >&5 ++ echo "$as_me:18133: \$? = $ac_status" >&5 + (exit $ac_status); } && +- test -f conftest2.$ac_objext && { (eval echo "$as_me:16979: \"$ac_try\"") >&5 ++ test -f conftest2.$ac_objext && { (eval echo "$as_me:18135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16982: \$? = $ac_status" >&5 ++ echo "$as_me:18138: \$? = $ac_status" >&5 + (exit $ac_status); }; + then + eval cf_cv_prog_CXX_c_o=yes +@@ -16990,10 +18146,10 @@ + + fi + if test $cf_cv_prog_CXX_c_o = yes; then +- echo "$as_me:16993: result: yes" >&5 ++ echo "$as_me:18149: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:16996: result: no" >&5 ++ echo "$as_me:18152: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17013,12 +18169,12 @@ + ;; + esac + if test "$GXX" = yes; then +- echo "$as_me:17016: checking for lib$cf_gpp_libname" >&5 ++ echo "$as_me:18172: checking for lib$cf_gpp_libname" >&5 + echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 + cf_save="$LIBS" + LIBS="-l$cf_gpp_libname $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17021 "configure" ++#line 18177 "configure" + #include "confdefs.h" + + #include <$cf_gpp_libname/builtin.h> +@@ -17032,16 +18188,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17035: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18191: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17038: \$? = $ac_status" >&5 ++ echo "$as_me:18194: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17041: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18197: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17044: \$? = $ac_status" >&5 ++ echo "$as_me:18200: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + CXXLIBS="-l$cf_gpp_libname $CXXLIBS" +@@ -17060,7 +18216,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 17063 "configure" ++#line 18219 "configure" + #include "confdefs.h" + + #include <builtin.h> +@@ -17074,16 +18230,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17077: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18233: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17080: \$? = $ac_status" >&5 ++ echo "$as_me:18236: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17083: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18239: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17086: \$? = $ac_status" >&5 ++ echo "$as_me:18242: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cxx_library=yes + CXXLIBS="-l$cf_gpp_libname $CXXLIBS" +@@ -17100,7 +18256,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save" +- echo "$as_me:17103: result: $cf_cxx_library" >&5 ++ echo "$as_me:18259: result: $cf_cxx_library" >&5 + echo "${ECHO_T}$cf_cxx_library" >&6 + fi + +@@ -17116,7 +18272,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return=return +-echo "$as_me:17119: checking how to run the C++ preprocessor" >&5 ++echo "$as_me:18275: checking how to run the C++ preprocessor" >&5 + echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 + if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then +@@ -17133,18 +18289,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 17136 "configure" ++#line 18292 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:17141: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18297: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17147: \$? = $ac_status" >&5 ++ echo "$as_me:18303: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -17167,17 +18323,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 17170 "configure" ++#line 18326 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:17174: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18330: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17180: \$? = $ac_status" >&5 ++ echo "$as_me:18336: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -17214,7 +18370,7 @@ + else + ac_cv_prog_CXXCPP=$CXXCPP + fi +-echo "$as_me:17217: result: $CXXCPP" >&5 ++echo "$as_me:18373: result: $CXXCPP" >&5 + echo "${ECHO_T}$CXXCPP" >&6 + ac_preproc_ok=false + for ac_cxx_preproc_warn_flag in '' yes +@@ -17224,18 +18380,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 17227 "configure" ++#line 18383 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:17232: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18388: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17238: \$? = $ac_status" >&5 ++ echo "$as_me:18394: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -17258,17 +18414,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 17261 "configure" ++#line 18417 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:17265: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18421: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17271: \$? = $ac_status" >&5 ++ echo "$as_me:18427: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -17296,7 +18452,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:17299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 ++ { { echo "$as_me:18455: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -17308,26 +18464,74 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + ac_main_return=return + +-for ac_header in iostream typeinfo ++for ac_header in typeinfo ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:18470: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 18476 "configure" ++#include "confdefs.h" ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:18480: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ egrep -v '^ *\+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:18486: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_cxx_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ eval "$as_ac_Header=no" ++fi ++rm -f conftest.err conftest.$ac_ext ++fi ++echo "$as_me:18505: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<EOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++EOF ++ ++fi ++done ++ ++for ac_header in iostream + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:17314: checking for $ac_header" >&5 ++echo "$as_me:18518: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17320 "configure" ++#line 18524 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:17324: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:18528: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:17330: \$? = $ac_status" >&5 ++ echo "$as_me:18534: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag +@@ -17346,7 +18550,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:17349: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:18553: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -17356,11 +18560,11 @@ + fi + done + +- if test x"$ac_cv_header_iostream" = xyes ; then +- echo "$as_me:17360: checking if iostream uses std-namespace" >&5 ++if test x"$ac_cv_header_iostream" = xyes ; then ++ echo "$as_me:18564: checking if iostream uses std-namespace" >&5 + echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-#line 17363 "configure" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 18567 "configure" + #include "confdefs.h" + + #include <iostream> +@@ -17377,16 +18581,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18584: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17383: \$? = $ac_status" >&5 ++ echo "$as_me:18587: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17386: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18590: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17389: \$? = $ac_status" >&5 ++ echo "$as_me:18593: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_iostream_namespace=yes + else +@@ -17395,17 +18599,17 @@ + cf_iostream_namespace=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:17398: result: $cf_iostream_namespace" >&5 ++ echo "$as_me:18602: result: $cf_iostream_namespace" >&5 + echo "${ECHO_T}$cf_iostream_namespace" >&6 +- if test "$cf_iostream_namespace" = yes ; then +- cat >>confdefs.h <<\EOF ++ if test "$cf_iostream_namespace" = yes ; then ++ cat >>confdefs.h <<\EOF + #define IOSTREAM_NAMESPACE 1 + EOF + +- fi +- fi ++ fi ++fi + +-echo "$as_me:17408: checking if we should include stdbool.h" >&5 ++echo "$as_me:18612: checking if we should include stdbool.h" >&5 + echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 + + if test "${cf_cv_header_stdbool_h+set}" = set; then +@@ -17413,7 +18617,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 17416 "configure" ++#line 18620 "configure" + #include "confdefs.h" + + int +@@ -17425,23 +18629,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18632: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17431: \$? = $ac_status" >&5 ++ echo "$as_me:18635: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17434: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18638: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17437: \$? = $ac_status" >&5 ++ echo "$as_me:18641: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=0 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 17444 "configure" ++#line 18648 "configure" + #include "confdefs.h" + + #ifndef __BEOS__ +@@ -17457,16 +18661,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17460: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18664: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17463: \$? = $ac_status" >&5 ++ echo "$as_me:18667: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17466: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17469: \$? = $ac_status" >&5 ++ echo "$as_me:18673: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_header_stdbool_h=1 + else +@@ -17480,13 +18684,13 @@ + fi + + if test "$cf_cv_header_stdbool_h" = 1 +-then echo "$as_me:17483: result: yes" >&5 ++then echo "$as_me:18687: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:17485: result: no" >&5 ++else echo "$as_me:18689: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:17489: checking for builtin bool type" >&5 ++echo "$as_me:18693: checking for builtin bool type" >&5 + echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 + + if test "${cf_cv_builtin_bool+set}" = set; then +@@ -17494,7 +18698,7 @@ + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 17497 "configure" ++#line 18701 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -17509,16 +18713,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17512: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18716: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17515: \$? = $ac_status" >&5 ++ echo "$as_me:18719: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17518: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17521: \$? = $ac_status" >&5 ++ echo "$as_me:18725: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_builtin_bool=1 + else +@@ -17531,13 +18735,13 @@ + fi + + if test "$cf_cv_builtin_bool" = 1 +-then echo "$as_me:17534: result: yes" >&5 ++then echo "$as_me:18738: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +-else echo "$as_me:17536: result: no" >&5 ++else echo "$as_me:18740: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:17540: checking for size of bool" >&5 ++echo "$as_me:18744: checking for size of bool" >&5 + echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17548,7 +18752,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17551 "configure" ++#line 18755 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -17590,15 +18794,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:17593: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17596: \$? = $ac_status" >&5 ++ echo "$as_me:18800: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:17598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17601: \$? = $ac_status" >&5 ++ echo "$as_me:18805: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -17616,30 +18820,36 @@ + fi + + rm -f cf_test.out +-echo "$as_me:17619: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:18823: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in #(vi + .auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:17625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:18829: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + +-echo "$as_me:17630: checking for special defines needed for etip.h" >&5 ++echo "$as_me:18834: checking for special defines needed for etip.h" >&5 + echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 + cf_save_CXXFLAGS="$CXXFLAGS" + cf_result="none" ++ ++# etip.h includes ncurses.h which includes ncurses_dll.h ++# But ncurses_dll.h is generated - fix here. ++test -d include || mkdir include ++test -f include/ncurses_dll.h || sed -e 's/@NCURSES_WRAP_PREFIX@/'$NCURSES_WRAP_PREFIX'/g' ${srcdir}/include/ncurses_dll.h.in >include/ncurses_dll.h ++ + for cf_math in "" MATH_H + do + for cf_excp in "" MATH_EXCEPTION + do +- CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" ++ CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -Iinclude -I${srcdir}/include" + test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" + test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" + cat >conftest.$ac_ext <<_ACEOF +-#line 17642 "configure" ++#line 18852 "configure" + #include "confdefs.h" + + #include <etip.h.in> +@@ -17653,16 +18863,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18866: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17659: \$? = $ac_status" >&5 ++ echo "$as_me:18869: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17662: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17665: \$? = $ac_status" >&5 ++ echo "$as_me:18875: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$cf_math" && cat >>confdefs.h <<EOF +@@ -17674,7 +18884,7 @@ + EOF + + cf_result="$cf_math $cf_excp" +- break ++ break 2 + + else + echo "$as_me: failed program was:" >&5 +@@ -17683,12 +18893,12 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + done + done +-echo "$as_me:17686: result: $cf_result" >&5 ++echo "$as_me:18896: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + CXXFLAGS="$cf_save_CXXFLAGS" + + if test -n "$CXX"; then +-echo "$as_me:17691: checking if $CXX accepts parameter initialization" >&5 ++echo "$as_me:18901: checking if $CXX accepts parameter initialization" >&5 + echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 + if test "${cf_cv_cpp_param_init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17705,7 +18915,7 @@ + cf_cv_cpp_param_init=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17708 "configure" ++#line 18918 "configure" + #include "confdefs.h" + + class TEST { +@@ -17720,19 +18930,19 @@ + { + value = x; + } +-void main() { } ++int main() { } + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:17727: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17730: \$? = $ac_status" >&5 ++ echo "$as_me:18940: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:17732: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18942: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17735: \$? = $ac_status" >&5 ++ echo "$as_me:18945: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_param_init=yes + else +@@ -17751,7 +18961,7 @@ + ac_main_return=return + + fi +-echo "$as_me:17754: result: $cf_cv_cpp_param_init" >&5 ++echo "$as_me:18964: result: $cf_cv_cpp_param_init" >&5 + echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 + fi + test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF +@@ -17760,7 +18970,7 @@ + + if test -n "$CXX"; then + +-echo "$as_me:17763: checking if $CXX accepts static_cast" >&5 ++echo "$as_me:18973: checking if $CXX accepts static_cast" >&5 + echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 + if test "${cf_cv_cpp_static_cast+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17774,7 +18984,7 @@ + ac_main_return=return + + cat >conftest.$ac_ext <<_ACEOF +-#line 17777 "configure" ++#line 18987 "configure" + #include "confdefs.h" + + class NCursesPanel +@@ -17818,16 +19028,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19031: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17824: \$? = $ac_status" >&5 ++ echo "$as_me:19034: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17827: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19037: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17830: \$? = $ac_status" >&5 ++ echo "$as_me:19040: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_cpp_static_cast=yes + else +@@ -17845,7 +19055,7 @@ + ac_main_return=return + + fi +-echo "$as_me:17848: result: $cf_cv_cpp_static_cast" >&5 ++echo "$as_me:19058: result: $cf_cv_cpp_static_cast" >&5 + echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 + + fi +@@ -17893,7 +19103,7 @@ + else + if test "$cf_cv_header_stdbool_h" = 1 ; then + +-echo "$as_me:17896: checking for size of bool" >&5 ++echo "$as_me:19106: checking for size of bool" >&5 + echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 + if test "${cf_cv_type_of_bool+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17904,7 +19114,7 @@ + cf_cv_type_of_bool=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 17907 "configure" ++#line 19117 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -17946,15 +19156,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:17949: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19159: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17952: \$? = $ac_status" >&5 ++ echo "$as_me:19162: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:17954: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17957: \$? = $ac_status" >&5 ++ echo "$as_me:19167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_of_bool=`cat cf_test.out` + if test -z "$cf_cv_type_of_bool"; then +@@ -17972,25 +19182,25 @@ + fi + + rm -f cf_test.out +-echo "$as_me:17975: result: $cf_cv_type_of_bool" >&5 ++echo "$as_me:19185: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + if test "$cf_cv_type_of_bool" = unknown ; then + case .$NCURSES_BOOL in #(vi + .auto|.) NCURSES_BOOL=unsigned;; + esac +- { echo "$as_me:17981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 ++ { echo "$as_me:19191: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} + cf_cv_type_of_bool=$NCURSES_BOOL + fi + + else +- echo "$as_me:17987: checking for fallback type of bool" >&5 ++ echo "$as_me:19197: checking for fallback type of bool" >&5 + echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 + case "$host_cpu" in #(vi + i?86) cf_cv_type_of_bool=char ;; #(vi + *) cf_cv_type_of_bool=int ;; + esac +- echo "$as_me:17993: result: $cf_cv_type_of_bool" >&5 ++ echo "$as_me:19203: result: $cf_cv_type_of_bool" >&5 + echo "${ECHO_T}$cf_cv_type_of_bool" >&6 + fi + fi +@@ -18019,7 +19229,7 @@ + + if test "$cf_with_ada" != "no" ; then + if test "$with_libtool" != "no"; then +- { echo "$as_me:18022: WARNING: libtool does not support Ada - disabling feature" >&5 ++ { echo "$as_me:19232: WARNING: libtool does not support Ada - disabling feature" >&5 + echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} + cf_with_ada=no + fi +@@ -18030,7 +19240,7 @@ + cf_ada_make=gnatmake + # Extract the first word of "$cf_ada_make", so it can be a program name with args. + set dummy $cf_ada_make; ac_word=$2 +-echo "$as_me:18033: checking for $ac_word" >&5 ++echo "$as_me:19243: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_gnat_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18045,7 +19255,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_gnat_exists="yes" +-echo "$as_me:18048: found $ac_dir/$ac_word" >&5 ++echo "$as_me:19258: found $ac_dir/$ac_word" >&5 + break + done + +@@ -18054,31 +19264,32 @@ + fi + gnat_exists=$ac_cv_prog_gnat_exists + if test -n "$gnat_exists"; then +- echo "$as_me:18057: result: $gnat_exists" >&5 ++ echo "$as_me:19267: result: $gnat_exists" >&5 + echo "${ECHO_T}$gnat_exists" >&6 + else +- echo "$as_me:18060: result: no" >&5 ++ echo "$as_me:19270: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$ac_cv_prog_gnat_exists" = no; then + cf_ada_make= ++ cf_cv_prog_gnat_correct=no + else + +-echo "$as_me:18068: checking for gnat version" >&5 ++echo "$as_me:19279: checking for gnat version" >&5 + echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 + cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` +-echo "$as_me:18073: result: $cf_gnat_version" >&5 ++echo "$as_me:19284: result: $cf_gnat_version" >&5 + echo "${ECHO_T}$cf_gnat_version" >&6 + + case $cf_gnat_version in #(vi +-3.1[1-9]*|3.[2-9]*|[4-9].*) #(vi ++3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) #(vi + cf_cv_prog_gnat_correct=yes + ;; + *) +- { echo "$as_me:18081: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 ++ { echo "$as_me:19292: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} + cf_cv_prog_gnat_correct=no + ;; +@@ -18086,7 +19297,7 @@ + + # Extract the first word of "m4", so it can be a program name with args. + set dummy m4; ac_word=$2 +-echo "$as_me:18089: checking for $ac_word" >&5 ++echo "$as_me:19300: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_M4_exists+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18101,7 +19312,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_M4_exists="yes" +-echo "$as_me:18104: found $ac_dir/$ac_word" >&5 ++echo "$as_me:19315: found $ac_dir/$ac_word" >&5 + break + done + +@@ -18110,10 +19321,10 @@ + fi + M4_exists=$ac_cv_prog_M4_exists + if test -n "$M4_exists"; then +- echo "$as_me:18113: result: $M4_exists" >&5 ++ echo "$as_me:19324: result: $M4_exists" >&5 + echo "${ECHO_T}$M4_exists" >&6 + else +- echo "$as_me:18116: result: no" >&5 ++ echo "$as_me:19327: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -18122,7 +19333,7 @@ + echo Ada95 binding required program m4 not found. Ada95 binding disabled. + fi + if test "$cf_cv_prog_gnat_correct" = yes; then +- echo "$as_me:18125: checking if GNAT works" >&5 ++ echo "$as_me:19336: checking if GNAT works" >&5 + echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + + rm -rf conftest* *~conftest* +@@ -18150,7 +19361,7 @@ + fi + rm -rf conftest* *~conftest* + +- echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5 ++ echo "$as_me:19364: result: $cf_cv_prog_gnat_correct" >&5 + echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + fi +@@ -18159,23 +19370,27 @@ + + ADAFLAGS="$ADAFLAGS -gnatpn" + +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) ++ echo "$as_me:19373: checking optimization options for ADAFLAGS" >&5 ++echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ++ case "$CFLAGS" in ++ *-g*) + + ADAFLAGS="$ADAFLAGS -g" + +- ;; +- esac +- case "$CFLAGS" in +- *-O*) ++ ;; ++ esac ++ case "$CFLAGS" in ++ *-O*) ++ cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[ ].*//'` + +- ADAFLAGS="$ADAFLAGS -O3" ++ ADAFLAGS="$ADAFLAGS $cf_O_flag" + +- ;; +- esac ++ ;; ++ esac ++ echo "$as_me:19390: result: $ADAFLAGS" >&5 ++echo "${ECHO_T}$ADAFLAGS" >&6 + +-echo "$as_me:18178: checking if GNAT supports generics" >&5 ++echo "$as_me:19393: checking if GNAT supports generics" >&5 + echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[1-9]*|[4-9].*) #(vi +@@ -18185,7 +19400,7 @@ + cf_gnat_generics=no + ;; + esac +-echo "$as_me:18188: result: $cf_gnat_generics" >&5 ++echo "$as_me:19403: result: $cf_gnat_generics" >&5 + echo "${ECHO_T}$cf_gnat_generics" >&6 + + if test "$cf_gnat_generics" = yes +@@ -18197,7 +19412,7 @@ + cf_generic_objects= + fi + +-echo "$as_me:18200: checking if GNAT supports SIGINT" >&5 ++echo "$as_me:19415: checking if GNAT supports SIGINT" >&5 + echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 + if test "${cf_cv_gnat_sigint+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18245,7 +19460,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:18248: result: $cf_cv_gnat_sigint" >&5 ++echo "$as_me:19463: result: $cf_cv_gnat_sigint" >&5 + echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 + + if test $cf_cv_gnat_sigint = yes ; then +@@ -18254,7 +19469,7 @@ + USE_GNAT_SIGINT="#" + fi + +-echo "$as_me:18257: checking if GNAT pragma Unreferenced works" >&5 ++echo "$as_me:19472: checking if GNAT pragma Unreferenced works" >&5 + echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 + if test "${cf_cv_pragma_unreferenced+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -18285,7 +19500,7 @@ + rm -rf conftest* *~conftest* + + fi +-echo "$as_me:18288: result: $cf_cv_pragma_unreferenced" >&5 ++echo "$as_me:19503: result: $cf_cv_pragma_unreferenced" >&5 + echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 + + # if the pragma is supported, use it (needed in the Trace code). +@@ -18298,7 +19513,7 @@ + cf_gnat_libraries=no + cf_gnat_projects=no + +-echo "$as_me:18301: checking if GNAT supports project files" >&5 ++echo "$as_me:19516: checking if GNAT supports project files" >&5 + echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 + case $cf_gnat_version in #(vi + 3.[0-9]*) #(vi +@@ -18366,14 +19581,14 @@ + esac + ;; + esac +-echo "$as_me:18369: result: $cf_gnat_projects" >&5 ++echo "$as_me:19584: result: $cf_gnat_projects" >&5 + echo "${ECHO_T}$cf_gnat_projects" >&6 + + if test $cf_gnat_projects = yes + then +- echo "$as_me:18374: checking if GNAT supports libraries" >&5 ++ echo "$as_me:19589: checking if GNAT supports libraries" >&5 + echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 +- echo "$as_me:18376: result: $cf_gnat_libraries" >&5 ++ echo "$as_me:19591: result: $cf_gnat_libraries" >&5 + echo "${ECHO_T}$cf_gnat_libraries" >&6 + fi + +@@ -18393,7 +19608,7 @@ + USE_GNAT_LIBRARIES="#" + fi + +-echo "$as_me:18396: checking for ada-compiler" >&5 ++echo "$as_me:19611: checking for ada-compiler" >&5 + echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 + + # Check whether --with-ada-compiler or --without-ada-compiler was given. +@@ -18404,12 +19619,12 @@ + cf_ada_compiler=gnatmake + fi; + +-echo "$as_me:18407: result: $cf_ada_compiler" >&5 ++echo "$as_me:19622: result: $cf_ada_compiler" >&5 + echo "${ECHO_T}$cf_ada_compiler" >&6 + + cf_ada_package=terminal_interface + +-echo "$as_me:18412: checking for ada-include" >&5 ++echo "$as_me:19627: checking for ada-include" >&5 + echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 + + # Check whether --with-ada-include or --without-ada-include was given. +@@ -18433,7 +19648,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -18445,7 +19660,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:18448: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:19663: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -18454,10 +19669,10 @@ + fi + ADA_INCLUDE="$withval" + +-echo "$as_me:18457: result: $ADA_INCLUDE" >&5 ++echo "$as_me:19672: result: $ADA_INCLUDE" >&5 + echo "${ECHO_T}$ADA_INCLUDE" >&6 + +-echo "$as_me:18460: checking for ada-objects" >&5 ++echo "$as_me:19675: checking for ada-objects" >&5 + echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 + + # Check whether --with-ada-objects or --without-ada-objects was given. +@@ -18481,7 +19696,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -18493,7 +19708,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:18496: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:19711: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -18502,10 +19717,10 @@ + fi + ADA_OBJECTS="$withval" + +-echo "$as_me:18505: result: $ADA_OBJECTS" >&5 ++echo "$as_me:19720: result: $ADA_OBJECTS" >&5 + echo "${ECHO_T}$ADA_OBJECTS" >&6 + +-echo "$as_me:18508: checking if an Ada95 shared-library should be built" >&5 ++echo "$as_me:19723: checking if an Ada95 shared-library should be built" >&5 + echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 + + # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. +@@ -18515,7 +19730,7 @@ + else + with_ada_sharedlib=no + fi; +-echo "$as_me:18518: result: $with_ada_sharedlib" >&5 ++echo "$as_me:19733: result: $with_ada_sharedlib" >&5 + echo "${ECHO_T}$with_ada_sharedlib" >&6 + + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' +@@ -18546,7 +19761,7 @@ + ### chooses to split module lists into libraries. + ### + ### (see CF_LIB_RULES). +-echo "$as_me:18549: checking for library subsets" >&5 ++echo "$as_me:19764: checking for library subsets" >&5 + echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 + LIB_SUBSETS= + +@@ -18587,7 +19802,7 @@ + test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" + test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" + +-echo "$as_me:18590: result: $LIB_SUBSETS" >&5 ++echo "$as_me:19805: result: $LIB_SUBSETS" >&5 + echo "${ECHO_T}$LIB_SUBSETS" >&6 + + ### Construct the list of include-directories to be generated +@@ -18625,7 +19840,7 @@ + fi + + ### Build up pieces for makefile rules +-echo "$as_me:18628: checking default library suffix" >&5 ++echo "$as_me:19843: checking default library suffix" >&5 + echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18636,10 +19851,10 @@ + shared) DFT_ARG_SUFFIX='' ;; + esac + test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" +-echo "$as_me:18639: result: $DFT_ARG_SUFFIX" >&5 ++echo "$as_me:19854: result: $DFT_ARG_SUFFIX" >&5 + echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 + +-echo "$as_me:18642: checking default library-dependency suffix" >&5 ++echo "$as_me:19857: checking default library-dependency suffix" >&5 + echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in #(vi +@@ -18661,11 +19876,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.a' + ;; +@@ -18692,10 +19907,10 @@ + esac + test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" + test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" +-echo "$as_me:18695: result: $DFT_DEP_SUFFIX" >&5 ++echo "$as_me:19910: result: $DFT_DEP_SUFFIX" >&5 + echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 + +-echo "$as_me:18698: checking default object directory" >&5 ++echo "$as_me:19913: checking default object directory" >&5 + echo $ECHO_N "checking default object directory... $ECHO_C" >&6 + + case $DFT_LWR_MODEL in +@@ -18711,12 +19926,12 @@ + DFT_OBJ_SUBDIR='obj_s' ;; + esac + esac +-echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5 ++echo "$as_me:19929: result: $DFT_OBJ_SUBDIR" >&5 + echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 + + # libtool thinks it can make c++ shared libraries (perhaps only g++) + if test "$cf_with_cxx" = yes ; then +-echo "$as_me:18719: checking c++ library-dependency suffix" >&5 ++echo "$as_me:19934: checking c++ library-dependency suffix" >&5 + echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 + if test "$with_libtool" != "no"; then + CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX +@@ -18741,11 +19956,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + CXX_LIB_SUFFIX='.a' + CXX_DEP_SUFFIX=$CXX_LIB_SUFFIX + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + CXX_LIB_SUFFIX='.dll' + CXX_DEP_SUFFIX='.dll.a' + ;; +@@ -18773,7 +19988,7 @@ + test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" + test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" + fi +-echo "$as_me:18776: result: $CXX_LIB_SUFFIX" >&5 ++echo "$as_me:19991: result: $CXX_LIB_SUFFIX" >&5 + echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 + + fi +@@ -18812,9 +20027,11 @@ + TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}" + TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}" + fi +- TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}" ++ TICS_LDFLAGS="-L${LIB_DIR}" ++ TICS_LIBS="-l${TICS_LIB_SUFFIX}" + else +- TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TICS_LDFLAGS="-L${LIB_DIR}" ++ TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + fi + + if test "$with_termlib" != no ; then +@@ -18837,14 +20054,22 @@ + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + TEST_ARG2="${TEST_DEP2}" +- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" ++ TINFO_LDFLAGS="-L${LIB_DIR}" ++ TINFO_LIBS="$TEST_ARGS" + TICS_LIST="$SHLIB_LIST $TEST_ARGS" + SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS" + else + TEST_ARGS="-l${TINFO_ARG_SUFFIX}" + TEST_ARG2="-l${TINFO_ARG_SUFFIX}" +- TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" +- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" ++ if test "x$with_term_driver" != xno ; then ++ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" ++ else ++ TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" ++ TINFO_LIBS="$TEST_ARGS" ++ fi ++ TINFO_LDFLAGS="-L${LIB_DIR}" + SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + fi + else +@@ -18858,7 +20083,8 @@ + TICS_LIST="$SHLIB_LIST" + fi + +- TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TINFO_LDFLAGS="-L${LIB_DIR}" ++ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + fi + + if test "$DFT_LWR_MODEL" = shared ; then +@@ -18882,7 +20108,7 @@ + fi + + # needed for Ada95 +-TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'` ++TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'` + + case $DFT_LWR_MODEL in + normal|debug|profile) +@@ -18900,7 +20126,7 @@ + esac + else + case $cf_cv_system_name in #( +- aix[456]*) #( from ld manpage ++ aix[4-7]*) #( from ld manpage + LDFLAGS_STATIC=-bstatic + LDFLAGS_SHARED=-bdynamic + ;; +@@ -18927,19 +20153,19 @@ + + if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" + then +- echo "$as_me:18930: checking if linker supports switching between static/dynamic" >&5 ++ echo "$as_me:20156: checking if linker supports switching between static/dynamic" >&5 + echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6 + + rm -f libconftest.a + cat >conftest.$ac_ext <<EOF +-#line 18935 "configure" ++#line 20161 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp) { return fflush(fp); } + EOF +- if { (eval echo "$as_me:18939: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:20165: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18942: \$? = $ac_status" >&5 ++ echo "$as_me:20168: \$? = $ac_status" >&5 + (exit $ac_status); } ; then + ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null + ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null +@@ -18950,10 +20176,10 @@ + + LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18953 "configure" ++#line 20179 "configure" + #include "confdefs.h" + +-#line 18956 "configure" ++#line 20182 "configure" + #include <stdio.h> + int cf_ldflags_static(FILE *fp); + +@@ -18968,18 +20194,28 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18971: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20197: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18974: \$? = $ac_status" >&5 ++ echo "$as_me:20200: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18977: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20203: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18980: \$? = $ac_status" >&5 ++ echo "$as_me:20206: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_ldflags_static=yes ++ ++ # some linkers simply ignore the -dynamic ++ case x`file conftest$ac_exeext 2>/dev/null` in #(vi ++ *static*) # (vi ++ cf_ldflags_static=no ++ ;; ++ *) ++ cf_ldflags_static=yes ++ ;; ++ esac ++ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -18990,7 +20226,7 @@ + rm -f libconftest.* + LIBS="$cf_save_LIBS" + +- echo "$as_me:18993: result: $cf_ldflags_static" >&5 ++ echo "$as_me:20229: result: $cf_ldflags_static" >&5 + echo "${ECHO_T}$cf_ldflags_static" >&6 + + if test $cf_ldflags_static != yes +@@ -19006,12 +20242,12 @@ + ;; + esac + +-echo "$as_me:19009: checking where we will install curses.h" >&5 ++echo "$as_me:20245: checking where we will install curses.h" >&5 + echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 + test "$with_overwrite" = no && \ + test "x$includedir" = 'x${prefix}/include' && \ + includedir='${prefix}/include/ncurses'${LIB_SUFFIX} +-echo "$as_me:19014: result: $includedir" >&5 ++echo "$as_me:20250: result: $includedir" >&5 + echo "${ECHO_T}$includedir" >&6 + + ### Resolve a conflict between normal and wide-curses by forcing applications +@@ -19019,7 +20255,7 @@ + if test "$with_overwrite" != no ; then + if test "$NCURSES_LIBUTF8" = 1 ; then + NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' +- { echo "$as_me:19022: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 ++ { echo "$as_me:20258: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} + fi + fi +@@ -19036,7 +20272,7 @@ + ### Construct the list of subdirectories for which we'll customize makefiles + ### with the appropriate compile-rules. + +-echo "$as_me:19039: checking for src modules" >&5 ++echo "$as_me:20275: checking for src modules" >&5 + echo $ECHO_N "checking for src modules... $ECHO_C" >&6 + + # dependencies and linker-arguments for test-programs +@@ -19050,6 +20286,7 @@ + TEST_ARG2="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi + ++PC_MODULES_TO_MAKE="ncurses${DFT_ARG_SUFFIX}" + cf_cv_src_modules= + for cf_dir in $modules_to_build + do +@@ -19096,10 +20333,11 @@ + TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + TEST_ARG2="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARG2" + fi ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ${cf_dir}${DFT_ARG_SUFFIX}" + fi + fi + done +-echo "$as_me:19102: result: $cf_cv_src_modules" >&5 ++echo "$as_me:20340: result: $cf_cv_src_modules" >&5 + echo "${ECHO_T}$cf_cv_src_modules" >&6 + + TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" +@@ -19118,10 +20356,16 @@ + SRC_SUBDIRS="$SRC_SUBDIRS test" + fi + test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc" +-test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++" ++if test "$cf_with_cxx_binding" != no; then ++ PC_MODULES_TO_MAKE="${PC_MODULES_TO_MAKE} ncurses++${DFT_ARG_SUFFIX}" ++ SRC_SUBDIRS="$SRC_SUBDIRS c++" ++fi ++ ++test "x$with_termlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TINFO_ARG_SUFFIX" ++test "x$with_ticlib" != xno && PC_MODULES_TO_MAKE="$PC_MODULES_TO_MAKE $TICS_ARG_SUFFIX" + + ADA_SUBDIRS= +-if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = xyes && test -f $srcdir/Ada95/Makefile.in; then + SRC_SUBDIRS="$SRC_SUBDIRS Ada95" + ADA_SUBDIRS="gen src" + if test "x$cf_with_tests" != "xno" ; then +@@ -19143,7 +20387,7 @@ + + fi + +-if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in" + fi +@@ -19305,7 +20549,7 @@ + + # Extract the first word of "tic", so it can be a program name with args. + set dummy tic; ac_word=$2 +-echo "$as_me:19308: checking for $ac_word" >&5 ++echo "$as_me:20552: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_TIC_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19322,7 +20566,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TIC_PATH="$ac_dir/$ac_word" +- echo "$as_me:19325: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:20569: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -19334,10 +20578,10 @@ + TIC_PATH=$ac_cv_path_TIC_PATH + + if test -n "$TIC_PATH"; then +- echo "$as_me:19337: result: $TIC_PATH" >&5 ++ echo "$as_me:20581: result: $TIC_PATH" >&5 + echo "${ECHO_T}$TIC_PATH" >&6 + else +- echo "$as_me:19340: result: no" >&5 ++ echo "$as_me:20584: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -19345,7 +20589,7 @@ + then + if test "$TIC_PATH" = unknown + then +- { echo "$as_me:19348: WARNING: no tic program found for fallbacks" >&5 ++ { echo "$as_me:20592: WARNING: no tic program found for fallbacks" >&5 + echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} + fi + fi +@@ -19359,11 +20603,6 @@ + ADAHTML_DIR=../../doc/html/ada + + SUB_SCRIPTS= +-case $cf_cv_system_name in #(vi +-*mingw32*) #(vi +- SUB_SCRIPTS="mk-dlls.sh" +- ;; +-esac + + ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile" + ac_config_commands="$ac_config_commands default" +@@ -19446,7 +20685,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:19449: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:20688: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -19578,7 +20817,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20101002, ++configured by $0, generated by GNU Autoconf 2.52.20120811, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -19622,7 +20861,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:19625: error: ambiguous option: $1 ++ { { echo "$as_me:20864: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -19641,7 +20880,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:19644: error: unrecognized option: $1 ++ -*) { { echo "$as_me:20883: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -19660,7 +20899,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20101002, executed with ++This file was extended by $as_me 2.52.20120811, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -19682,10 +20921,11 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" ++ECHO_LD="$ECHO_LD" + LDCONFIG="$LDCONFIG" + LIBTOOL_VERSION="$LIBTOOL_VERSION" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUBSETS="$LIB_SUBSETS" + LIB_SUFFIX="$LIB_SUFFIX" + LIB_TRACING="$LIB_TRACING" +@@ -19707,7 +20947,7 @@ + TINFO_SUFFIX="$TINFO_SUFFIX" + USE_OLD_MAKERULES="$USE_OLD_MAKERULES" + WITH_CURSES_H="$with_curses_h" +-WITH_ECHO="$with_echo" ++WITH_ECHO="${enable_echo:=yes}" + WITH_OVERWRITE="$with_overwrite" + cf_LIST_MODELS="$cf_list_models" + cf_cv_abi_version="$cf_cv_abi_version" +@@ -19717,12 +20957,14 @@ + cf_cv_enable_opaque="$cf_cv_enable_opaque" + cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o + cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o ++cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct + cf_cv_rel_version="$cf_cv_rel_version" + cf_cv_rm_so_locs="$cf_cv_rm_so_locs" + cf_cv_shared_soname='$cf_cv_shared_soname' + cf_cv_shlib_version="$cf_cv_shlib_version" + cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" + cf_cv_system_name="$cf_cv_system_name" ++cf_cv_term_driver="$with_term_driver" + cf_with_ada="$cf_with_ada" + cf_with_cxx_binding="$cf_with_cxx_binding" + cf_with_manpages="$cf_with_manpages" +@@ -19747,7 +20989,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; +- *) { { echo "$as_me:19750: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:20992: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -19806,6 +21048,7 @@ + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t + s,@libexecdir@,$libexecdir,;t t ++s,@datarootdir@,$datarootdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t +@@ -19931,10 +21174,12 @@ + s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t + s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t + s,@INSTALL_LIB@,$INSTALL_LIB,;t t ++s,@RPATH_LIST@,$RPATH_LIST,;t t + s,@cf_ldd_prog@,$cf_ldd_prog,;t t + s,@TERMINFO_SRC@,$TERMINFO_SRC,;t t + s,@FALLBACK_LIST@,$FALLBACK_LIST,;t t + s,@WHICH_XTERM@,$WHICH_XTERM,;t t ++s,@XTERM_KBS@,$XTERM_KBS,;t t + s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t + s,@TERMINFO@,$TERMINFO,;t t + s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t +@@ -19955,6 +21200,7 @@ + s,@TERMINFO_CAPS@,$TERMINFO_CAPS,;t t + s,@NCURSES_OSPEED@,$NCURSES_OSPEED,;t t + s,@NCURSES_CCHARW_MAX@,$NCURSES_CCHARW_MAX,;t t ++s,@NCURSES_TPARM_ARG@,$NCURSES_TPARM_ARG,;t t + s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t + s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t + s,@GENERATED_EXT_FUNCS@,$GENERATED_EXT_FUNCS,;t t +@@ -19972,6 +21218,11 @@ + s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t + s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t + s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t ++s,@ECHO_LT@,$ECHO_LT,;t t ++s,@ECHO_LD@,$ECHO_LD,;t t ++s,@RULE_CC@,$RULE_CC,;t t ++s,@SHOW_CC@,$SHOW_CC,;t t ++s,@ECHO_CC@,$ECHO_CC,;t t + s,@ECHO_LINK@,$ECHO_LINK,;t t + s,@ADAFLAGS@,$ADAFLAGS,;t t + s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t +@@ -20015,12 +21266,14 @@ + s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t + s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t + s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t +-s,@TICS_ARGS@,$TICS_ARGS,;t t ++s,@TICS_LDFLAGS@,$TICS_LDFLAGS,;t t ++s,@TICS_LIBS@,$TICS_LIBS,;t t + s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t + s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t + s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t +-s,@TINFO_ARGS@,$TINFO_ARGS,;t t +-s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t ++s,@TINFO_LDFLAGS@,$TINFO_LDFLAGS,;t t ++s,@TINFO_LIBS@,$TINFO_LIBS,;t t ++s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t + s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t + s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t + s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t +@@ -20032,6 +21285,7 @@ + s,@TEST_DEPS@,$TEST_DEPS,;t t + s,@TEST_ARG2@,$TEST_ARG2,;t t + s,@TEST_DEP2@,$TEST_DEP2,;t t ++s,@PC_MODULES_TO_MAKE@,$PC_MODULES_TO_MAKE,;t t + s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t + s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t + s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t +@@ -20157,7 +21411,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:20160: creating $ac_file" >&5 ++ { echo "$as_me:21414: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -20175,7 +21429,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:20178: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21432: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -20188,7 +21442,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:20191: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:21445: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -20254,7 +21508,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:20257: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:21511: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -20265,7 +21519,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:20268: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:21522: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -20278,7 +21532,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:20281: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:21535: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -20336,7 +21590,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then +- { echo "$as_me:20339: $ac_file is unchanged" >&5 ++ { echo "$as_me:21593: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -20394,25 +21648,20 @@ + if test ! -d $srcdir/$cf_dir; then + continue + elif test -f $srcdir/$cf_dir/programs; then +- $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LINK" $srcdir/$cf_dir/programs >>$cf_dir/Makefile ++ $AWK -f $srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile + fi + done + + fi + +- case $cf_cv_system_name in #(vi +- OS/2*|os2*) #(vi +- LIB_PREFIX='' +- ;; +- *) LIB_PREFIX='lib' +- ;; +- esac + cf_prefix=$LIB_PREFIX + +-if test $cf_cv_shlib_version = cygdll ; then ++case $cf_cv_shlib_version in #(vi ++cygdll|mingw) + TINFO_NAME=$TINFO_ARG_SUFFIX + TINFO_SUFFIX=.dll +-fi ++ ;; ++esac + + if test -n "$TINFO_SUFFIX" ; then + case $TINFO_SUFFIX in +@@ -20461,11 +21710,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + cf_suffix='.a' + cf_depsuf=$cf_suffix + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + cf_suffix='.dll' + cf_depsuf='.dll.a' + ;; +@@ -20549,11 +21798,18 @@ + # cygwin needs import library, and has unique naming convention + # use autodetected ${cf_prefix} for import lib and static lib, but + # use 'cyg' prefix for shared lib. +- if test $cf_cv_shlib_version = cygdll ; then ++ case $cf_cv_shlib_version in #(vi ++ cygdll) #(vi + cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}${cf_cygsuf}" + continue +- fi ++ ;; ++ mingw) ++ cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'` ++ LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/lib${cf_dir}${cf_cygsuf}" ++ continue ++ ;; ++ esac + fi + LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/${cf_prefix}${cf_dir}${cf_suffix}" + done +@@ -20597,7 +21853,7 @@ + mv $cf_dir/Makefile.out $cf_dir/Makefile + + $AWK -f $srcdir/mk-0th.awk \ +- libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" \ ++ libname="${cf_dir}${LIB_SUFFIX}" subsets="$LIB_SUBSETS" ticlib="$TICS_LIB_SUFFIX" termlib="$TINFO_LIB_SUFFIX" \ + $srcdir/$cf_dir/modules >>$cf_dir/Makefile + + for cf_subset in $cf_subsets +@@ -20628,11 +21884,11 @@ + ;; + shared) #(vi + case $cf_cv_system_name in +- aix[56]*) #(vi ++ aix[5-7]*) #(vi + cf_suffix='.a' + cf_depsuf=$cf_suffix + ;; +- cygwin*) #(vi ++ cygwin*|mingw*) #(vi + cf_suffix='.dll' + cf_depsuf='.dll.a' + ;; +@@ -20743,6 +21999,7 @@ + prefix=$cf_prefix \ + suffix=$cf_suffix \ + subset=$cf_subset \ ++ driver=$cf_cv_term_driver \ + SymLink="$LN_S" \ + TermlibRoot=$TINFO_NAME \ + TermlibSuffix=$TINFO_SUFFIX \ +@@ -20979,7 +22236,7 @@ + fi + done + +-if test "x$cf_with_ada" != xno ; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then + if test -z "$USE_OLD_MAKERULES" ; then + $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile + fi +diff -Naur ncurses-5.9.orig/configure.in ncurses-5.9/configure.in +--- ncurses-5.9.orig/configure.in 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/configure.in 2012-08-25 19:58:02.196554389 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,14 +28,14 @@ + dnl + dnl Author: Thomas E. Dickey 1995-on + dnl +-dnl $Id: configure.in,v 1.520 2011/03/28 00:22:26 tom Exp $ ++dnl $Id: configure.in,v 1.552 2012/08/04 14:52:27 tom Exp $ + dnl Process this file with autoconf to produce a configure script. + dnl + dnl See http://invisible-island.net/autoconf/ for additional information. + dnl + dnl --------------------------------------------------------------------------- + AC_PREREQ(2.13.20020210) +-AC_REVISION($Revision: 1.520 $) ++AC_REVISION($Revision: 1.552 $) + AC_INIT(ncurses/base/lib_initscr.c) + AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) + +@@ -58,7 +58,18 @@ + CF_CFG_DEFAULTS + + ### Checks for programs. +-AC_PROG_CC ++AC_ARG_WITH(ada, ++ [ --without-ada suppress check for Ada95, don't build demo], ++ [cf_with_ada=$withval], ++ [cf_with_ada=yes]) ++if test x"$cf_with_ada" = xyes ++then ++ cf_PROG_CC="gnatgcc gcc cc" ++else ++ cf_PROG_CC="gcc cc" ++fi ++ ++AC_PROG_CC($cf_PROG_CC) + CF_GCC_VERSION + + AC_PROG_CPP +@@ -89,14 +100,16 @@ + cf_with_cxx=no; CXX=""; GXX="";])dnl + AC_PROG_CXX + popdef([AC_MSG_ERROR])dnl +- # autoconf 2.5x removed the error - by hardcoding it to g++. ++ # autoconf 2.5x removed the error (hardcoding it to g++, or just blank) + if test "$CXX" = "g++" ; then + AC_PATH_PROG(CXX,g++) + fi +- if test "$CXX" = "g++" ; then +- AC_MSG_WARN(ignoring hardcoded g++) ++ case "x$CXX" in #(vi ++ x|xg++) ++ AC_MSG_WARN([You don't have any C++ compiler, too bad]) + cf_with_cxx=no; CXX=""; GXX=""; +- fi ++ ;; ++ esac + fi + + CF_GXX_VERSION +@@ -116,10 +129,6 @@ + AC_MSG_RESULT($cf_with_cxx_binding) + + AC_MSG_CHECKING(if you want to build with Ada95) +-AC_ARG_WITH(ada, +- [ --without-ada suppress check for Ada95, don't build demo], +- [cf_with_ada=$withval], +- [cf_with_ada=yes]) + AC_MSG_RESULT($cf_with_ada) + + AC_MSG_CHECKING(if you want to install manpages) +@@ -168,28 +177,8 @@ + + # if we find pkg-config, check if we should install the ".pc" files. + CF_PKG_CONFIG +- +-if test "$PKG_CONFIG" != no ; then +- AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) +- +- # Leave this as something that can be overridden in the environment. +- if test -z "$PKG_CONFIG_LIBDIR" ; then +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig +- fi +- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` +- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then +- AC_ARG_ENABLE(pc-files, +- [ --enable-pc-files generate and install .pc files for pkg-config], +- [enable_pc_files=$enableval], +- [enable_pc_files=no]) +- AC_MSG_RESULT($enable_pc_files) +- else +- AC_MSG_RESULT(no) +- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR) +- enable_pc_files=no +- fi +-fi +-AC_SUBST(PKG_CONFIG_LIBDIR) ++CF_WITH_PKG_CONFIG_LIBDIR ++CF_ENABLE_PC_FILES + + AC_MSG_CHECKING(if we should assume mixed-case filenames) + AC_ARG_ENABLE(mixed-case, +@@ -321,9 +310,7 @@ + LIB_DIR=../lib + LIB_2ND=../../lib + +-CF_LIB_PREFIX(cf_prefix) +-LIB_PREFIX=$cf_prefix +-AC_SUBST(LIB_PREFIX) ++CF_WITH_LIB_PREFIX(cf_prefix) + + LIB_SUFFIX= + AC_SUBST(LIB_SUFFIX) +@@ -453,7 +440,6 @@ + esac + AC_SUBST(TERMINFO_SRC) + +-CF_PATHSEP + if test "$use_database" != no ; then + AC_DEFINE(USE_DATABASE) + +@@ -494,6 +480,26 @@ + WHICH_XTERM=$with_xterm_new + AC_SUBST(WHICH_XTERM) + ++AC_MSG_CHECKING(if xterm backspace sends BS or DEL) ++AC_ARG_WITH(xterm-kbs, ++ [ --with-xterm-kbs=XXX specify if xterm backspace sends BS or DEL], ++ [with_xterm_kbs=$withval], ++ [with_xterm_kbs=BS]) ++case x$with_xterm_kbs in ++xyes|xno|xBS|xbs|x8) ++ with_xterm_kbs=BS ++ ;; ++xDEL|xdel|x127) ++ with_xterm_kbs=DEL ++ ;; ++*) ++ with_xterm_kbs=$withval ++ ;; ++esac ++AC_MSG_RESULT($with_xterm_kbs) ++XTERM_KBS=$with_xterm_kbs ++AC_SUBST(XTERM_KBS) ++ + MAKE_TERMINFO= + if test "$use_database" = no ; then + TERMINFO="${datadir}/terminfo" +@@ -721,14 +727,9 @@ + if test "$with_widec" = yes ; then + LIB_SUFFIX="w${LIB_SUFFIX}" + AC_DEFINE(USE_WIDEC_SUPPORT) ++ AC_DEFINE(NCURSES_WIDECHAR) + +- case "$CFLAGS $CPPFLAGS" in #(vi +- *-D_XOPEN_SOURCE=500) #(vi +- ;; +- *) +- CF_PREDEFINE(_XOPEN_SOURCE_EXTENDED) +- ;; +- esac ++ CF_CHECK_WCHAR_H + + # with_overwrite=no + NCURSES_CH_T=cchar_t +@@ -859,6 +860,15 @@ + AC_MSG_RESULT($NCURSES_CCHARW_MAX) + AC_SUBST(NCURSES_CCHARW_MAX) + ++### use option --with-tparm-arg to override tparm's argument type ++AC_MSG_CHECKING(for type of tparm args) ++AC_ARG_WITH(tparm-arg, ++ [ --with-tparm-arg=TYPE override parameter type of tparm], ++ [NCURSES_TPARM_ARG="$withval"], ++ [NCURSES_TPARM_ARG=long]) ++AC_MSG_RESULT($NCURSES_TPARM_ARG) ++AC_SUBST(NCURSES_TPARM_ARG) ++ + ### Enable compiling-in rcs id's + AC_MSG_CHECKING(if RCS identifiers should be compiled-in) + AC_ARG_WITH(rcs-ids, +@@ -883,12 +893,15 @@ + AC_MSG_RESULT($with_ext_funcs) + if test "$with_ext_funcs" = yes ; then + NCURSES_EXT_FUNCS=1 ++ AC_DEFINE(HAVE_ASSUME_DEFAULT_COLORS) + AC_DEFINE(HAVE_CURSES_VERSION) + AC_DEFINE(HAVE_HAS_KEY) + AC_DEFINE(HAVE_RESIZETERM) + AC_DEFINE(HAVE_RESIZE_TERM) + AC_DEFINE(HAVE_TERM_ENTRY_H) + AC_DEFINE(HAVE_USE_DEFAULT_COLORS) ++ AC_DEFINE(HAVE_USE_SCREEN) ++ AC_DEFINE(HAVE_USE_WINDOW) + AC_DEFINE(HAVE_WRESIZE) + AC_DEFINE(NCURSES_EXT_FUNCS) + GENERATED_EXT_FUNCS=generated +@@ -1211,19 +1224,14 @@ + CF_HELP_MESSAGE(Testing/development Options:) + + ### use option --disable-echo to suppress full display compiling commands +-AC_MSG_CHECKING(if you want to display full commands during build) +-AC_ARG_ENABLE(echo, +- [ --enable-echo build: display "compiling" commands (default)], +- [with_echo=$enableval], +- [with_echo=yes]) +-if test "$with_echo" = yes; then ++CF_DISABLE_ECHO ++if test "$enable_echo" = yes; then + ECHO_LINK= + else + ECHO_LINK='@ echo linking $@ ... ;' + test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent" + test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent" + fi +-AC_MSG_RESULT($with_echo) + AC_SUBST(ECHO_LINK) + + ### use option --enable-warnings to turn on all gcc warnings +@@ -1241,6 +1249,7 @@ + fi + fi + CF_GCC_ATTRIBUTES ++CF_ENABLE_STRING_HACKS + + ### use option --enable-assertions to turn on generation of assertion code + AC_MSG_CHECKING(if you want to enable runtime assertions) +@@ -1253,7 +1262,6 @@ + then + if test "$with_assertions" = no + then +- AC_DEFINE(NDEBUG) + CPPFLAGS="$CPPFLAGS -DNDEBUG" + else + CF_ADD_ADAFLAGS(-gnata) +@@ -1344,6 +1352,8 @@ + wctype.h \ + ) + ++CF_GETOPT_HEADER ++ + # check for ISC (this may also define _POSIX_SOURCE) + # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set + if test "$ISC" = yes ; then +@@ -1393,10 +1403,12 @@ + getttynam \ + issetugid \ + poll \ ++putenv \ + remove \ + select \ + setbuf \ + setbuffer \ ++setenv \ + setvbuf \ + sigaction \ + sigvec \ +@@ -1427,6 +1439,7 @@ + AC_FUNC_SETVBUF_REVERSED + fi + AC_TYPE_SIGNAL ++AC_CHECK_TYPE(intptr_t, long) + CF_TYPE_SIGACTION + CF_SIZECHANGE + CF_FUNC_MEMMOVE +@@ -1478,50 +1491,14 @@ + ;; + esac + +- AC_CHECK_HEADERS(iostream typeinfo) +- +- if test x"$ac_cv_header_iostream" = xyes ; then +- AC_MSG_CHECKING(if iostream uses std-namespace) +- AC_TRY_COMPILE([ +-#include <iostream> +-using std::endl; +-using std::cerr;],[ +-cerr << "testing" << endl; +-],[cf_iostream_namespace=yes],[cf_iostream_namespace=no]) +- AC_MSG_RESULT($cf_iostream_namespace) +- if test "$cf_iostream_namespace" = yes ; then +- AC_DEFINE(IOSTREAM_NAMESPACE) +- fi +- fi +- ++ AC_CHECK_HEADERS(typeinfo) ++ CF_CXX_IOSTREAM_NAMESPACE + CF_BOOL_DECL + CF_BOOL_SIZE + CF_ETIP_DEFINES + CF_CPP_PARAM_INIT + CF_CPP_STATIC_CAST +- +- CXX_AR='$(AR)' +- CXX_ARFLAGS='$(ARFLAGS)' +- case $cf_cv_system_name in #(vi +- irix*) #(vi +- if test "$GXX" != yes ; then +- CXX_AR='$(CXX)' +- CXX_ARFLAGS='-ar -o' +- fi +- ;; +- sco3.2v5*) #(vi +- CXXLDFLAGS="-u main" +- ;; +- solaris2*) +- if test "$GXX" != yes ; then +- CXX_AR='$(CXX)' +- CXX_ARFLAGS='-xar -o' +- fi +- ;; +- esac +- AC_SUBST(CXXLDFLAGS) +- AC_SUBST(CXX_AR) +- AC_SUBST(CXX_ARFLAGS) ++ CF_CXX_AR_FLAGS + else + cf_cxx_library=no + cf_cv_builtin_bool=1 +@@ -1595,18 +1572,7 @@ + CF_PROG_GNAT + if test "$cf_cv_prog_gnat_correct" = yes; then + CF_ADD_ADAFLAGS(-gnatpn) +- +- # make ADAFLAGS consistent with CFLAGS +- case "$CFLAGS" in +- *-g*) +- CF_ADD_ADAFLAGS(-g) +- ;; +- esac +- case "$CFLAGS" in +- *-O*) +- CF_ADD_ADAFLAGS(-O3) +- ;; +- esac ++ CF_FIXUP_ADAFLAGS + + CF_GNAT_GENERICS + CF_GNAT_SIGINT +@@ -1739,14 +1705,17 @@ + TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}" + TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}" + fi +- TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}" ++ TICS_LDFLAGS="-L${LIB_DIR}" ++ TICS_LIBS="-l${TICS_LIB_SUFFIX}" + else +- TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TICS_LDFLAGS="-L${LIB_DIR}" ++ TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + fi + AC_SUBST(TICS_ARG_SUFFIX) + AC_SUBST(TICS_DEP_SUFFIX) + AC_SUBST(TICS_LIB_SUFFIX) +-AC_SUBST(TICS_ARGS) ++AC_SUBST(TICS_LDFLAGS) ++AC_SUBST(TICS_LIBS) + + if test "$with_termlib" != no ; then + +@@ -1768,14 +1737,22 @@ + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + TEST_ARG2="${TEST_DEP2}" +- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" ++ TINFO_LDFLAGS="-L${LIB_DIR}" ++ TINFO_LIBS="$TEST_ARGS" + TICS_LIST="$SHLIB_LIST $TEST_ARGS" + SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS" + else + TEST_ARGS="-l${TINFO_ARG_SUFFIX}" + TEST_ARG2="-l${TINFO_ARG_SUFFIX}" +- TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" +- TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS" ++ if test "x$with_term_driver" != xno ; then ++ TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TICS_LIBS="$TICS_LIBS -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" ++ else ++ TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" ++ TINFO_LIBS="$TEST_ARGS" ++ fi ++ TINFO_LDFLAGS="-L${LIB_DIR}" + SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}" + fi + else +@@ -1789,7 +1766,8 @@ + TICS_LIST="$SHLIB_LIST" + fi + +- TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}" ++ TINFO_LDFLAGS="-L${LIB_DIR}" ++ TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}" + fi + + if test "$DFT_LWR_MODEL" = shared ; then +@@ -1804,7 +1782,8 @@ + AC_SUBST(TINFO_ARG_SUFFIX) + AC_SUBST(TINFO_DEP_SUFFIX) + AC_SUBST(TINFO_LIB_SUFFIX) +-AC_SUBST(TINFO_ARGS) ++AC_SUBST(TINFO_LDFLAGS) ++AC_SUBST(TINFO_LIBS) + + if test "$with_dlsym" = yes ; then + CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl) +@@ -1815,8 +1794,8 @@ + fi + + # needed for Ada95 +-TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'` +-AC_SUBST(TINFO_ARGS2) ++TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'` ++AC_SUBST(TINFO_LDFLAGS2) + + case $DFT_LWR_MODEL in + normal|debug|profile) +@@ -1857,7 +1836,7 @@ + + CF_SRC_MODULES($modules_to_build) + +-if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then + SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses${DFT_ARG_SUFFIX}-config:Ada95/gen/adacurses-config.in" + SUB_MAKEFILES="$SUB_MAKEFILES man/adacurses${DFT_ARG_SUFFIX}-config.1:man/MKada_config.in" + fi +@@ -1918,11 +1897,6 @@ + AC_SUBST(ADAHTML_DIR) + + SUB_SCRIPTS= +-case $cf_cv_system_name in #(vi +-*mingw32*) #(vi +- SUB_SCRIPTS="mk-dlls.sh" +- ;; +-esac + + AC_OUTPUT( \ + include/MKterm.h.awk \ +@@ -1934,11 +1908,11 @@ + $SUB_MAKEFILES \ + Makefile,[ + if test "x$cf_with_tests" != xno ; then +- CF_PRG_RULES([$srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LINK"], test) ++ CF_PRG_RULES([$srcdir/test/mk-test.awk INSTALL=no ECHO_LINK="$ECHO_LD"], test) + fi + CF_LIB_RULES($SRC_SUBDIRS) + +-if test "x$cf_with_ada" != xno ; then ++if test "x$cf_with_ada" = "xyes" && test "x$cf_cv_prog_gnat_correct" = "xyes"; then + if test -z "$USE_OLD_MAKERULES" ; then + $AWK -f $srcdir/Ada95/mk-1st.awk <$srcdir/Ada95/src/modules >>Ada95/src/Makefile + fi +@@ -1950,10 +1924,11 @@ + AWK="$AWK" + DFT_ARG_SUFFIX="$DFT_ARG_SUFFIX" + DFT_LWR_MODEL="$DFT_LWR_MODEL" +-ECHO_LINK="$ECHO_LINK" ++ECHO_LD="$ECHO_LD" + LDCONFIG="$LDCONFIG" + LIBTOOL_VERSION="$LIBTOOL_VERSION" + LIB_NAME="$LIB_NAME" ++LIB_PREFIX="$LIB_PREFIX" + LIB_SUBSETS="$LIB_SUBSETS" + LIB_SUFFIX="$LIB_SUFFIX" + LIB_TRACING="$LIB_TRACING" +@@ -1975,7 +1950,7 @@ + TINFO_SUFFIX="$TINFO_SUFFIX" + USE_OLD_MAKERULES="$USE_OLD_MAKERULES" + WITH_CURSES_H="$with_curses_h" +-WITH_ECHO="$with_echo" ++WITH_ECHO="${enable_echo:=yes}" + WITH_OVERWRITE="$with_overwrite" + cf_LIST_MODELS="$cf_list_models" + cf_cv_abi_version="$cf_cv_abi_version" +@@ -1985,12 +1960,14 @@ + cf_cv_enable_opaque="$cf_cv_enable_opaque" + cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o + cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o ++cf_cv_prog_gnat_correct=$cf_cv_prog_gnat_correct + cf_cv_rel_version="$cf_cv_rel_version" + cf_cv_rm_so_locs="$cf_cv_rm_so_locs" + cf_cv_shared_soname='$cf_cv_shared_soname' + cf_cv_shlib_version="$cf_cv_shlib_version" + cf_cv_shlib_version_infix="$cf_cv_shlib_version_infix" + cf_cv_system_name="$cf_cv_system_name" ++cf_cv_term_driver="$with_term_driver" + cf_with_ada="$cf_with_ada" + cf_with_cxx_binding="$cf_with_cxx_binding" + cf_with_manpages="$cf_with_manpages" +diff -Naur ncurses-5.9.orig/dist.mk ncurses-5.9/dist.mk +--- ncurses-5.9.orig/dist.mk 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/dist.mk 2012-08-25 19:58:02.359886951 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -25,7 +25,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: dist.mk,v 1.810 2011/04/04 22:42:20 tom Exp $ ++# $Id: dist.mk,v 1.886 2012/08/11 15:55:23 tom Exp $ + # Makefile for creating ncurses distributions. + # + # This only needs to be used directly as a makefile by developers, but +@@ -37,7 +37,7 @@ + # These define the major/minor/patch versions of ncurses. + NCURSES_MAJOR = 5 + NCURSES_MINOR = 9 +-NCURSES_PATCH = 20110404 ++NCURSES_PATCH = 20120811 + + # We don't append the patch to the version, since this only applies to releases + VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) +diff -Naur ncurses-5.9.orig/doc/html/man/adacurses-config.1.html ncurses-5.9/doc/html/man/adacurses-config.1.html +--- ncurses-5.9.orig/doc/html/man/adacurses-config.1.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/adacurses-config.1.html 2012-08-25 19:58:00.273230151 +0000 +@@ -83,7 +83,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/captoinfo.1m.html ncurses-5.9/doc/html/man/captoinfo.1m.html +--- ncurses-5.9.orig/doc/html/man/captoinfo.1m.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/captoinfo.1m.html 2012-08-25 19:58:00.273230151 +0000 +@@ -208,7 +208,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + </PRE> +diff -Naur ncurses-5.9.orig/doc/html/man/clear.1.html ncurses-5.9/doc/html/man/clear.1.html +--- ncurses-5.9.orig/doc/html/man/clear.1.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/clear.1.html 2012-08-25 19:58:00.273230151 +0000 +@@ -69,7 +69,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/curs_termcap.3x.html ncurses-5.9/doc/html/man/curs_termcap.3x.html +--- ncurses-5.9.orig/doc/html/man/curs_termcap.3x.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/curs_termcap.3x.html 2012-08-25 19:58:00.276563468 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_termcap.3x,v 1.26 2010/12/04 18:38:55 tom Exp @ ++ * @Id: curs_termcap.3x,v 1.27 2011/10/15 21:11:24 tom Exp @ + --> + <HTML> + <HEAD> +@@ -79,39 +79,57 @@ + bilities of entries for which a terminfo entry has been + compiled. + +- The <STRONG>tgetent</STRONG> routine loads the entry for <EM>name</EM>. It returns +- 1 on success, 0 if there is no such entry, and -1 if the +- terminfo database could not be found. The emulation ig- +- nores the buffer pointer <EM>bp</EM>. ++ The <STRONG>tgetent</STRONG> routine loads the entry for <EM>name</EM>. It returns: ++ ++ 1 on success, ++ ++ 0 if there is no such entry (or that it is a generic ++ type, having too little information for curses ap- ++ plications to run), and ++ ++ -1 if the terminfo database could not be found. ++ ++ This differs from the <EM>termcap</EM> library in two ways: ++ ++ - The emulation ignores the buffer pointer <EM>bp</EM>. The ++ <EM>termcap</EM> library would store a copy of the terminal ++ description in the area referenced by this pointer. ++ However, ncurses stores its terminal descriptions in ++ compiled binary form, which is not the same thing. ++ ++ - There is a difference in return codes. The <EM>termcap</EM> ++ library does not check if the terminal description ++ is marked with the <EM>generic</EM> capability, or if the ++ terminal description has cursor-addressing. + + The <STRONG>tgetflag</STRONG> routine gets the boolean entry for <EM>id</EM>, or ze- + ro if it is not available. + +- The <STRONG>tgetnum</STRONG> routine gets the numeric entry for <EM>id</EM>, or -1 ++ The <STRONG>tgetnum</STRONG> routine gets the numeric entry for <EM>id</EM>, or -1 + if it is not available. + +- The <STRONG>tgetstr</STRONG> routine returns the string entry for <EM>id</EM>, or +- zero if it is not available. Use <STRONG>tputs</STRONG> to output the re- +- turned string. The return value will also be copied to +- the buffer pointed to by <EM>area</EM>, and the <EM>area</EM> value will be ++ The <STRONG>tgetstr</STRONG> routine returns the string entry for <EM>id</EM>, or ++ zero if it is not available. Use <STRONG>tputs</STRONG> to output the re- ++ turned string. The return value will also be copied to ++ the buffer pointed to by <EM>area</EM>, and the <EM>area</EM> value will be + updated to point past the null ending this value. + + Only the first two characters of the <STRONG>id</STRONG> parameter of <STRONG>tget-</STRONG> + <STRONG>flag</STRONG>, <STRONG>tgetnum</STRONG> and <STRONG>tgetstr</STRONG> are compared in lookups. + +- The <STRONG>tgoto</STRONG> routine instantiates the parameters into the +- given capability. The output from this routine is to be ++ The <STRONG>tgoto</STRONG> routine instantiates the parameters into the ++ given capability. The output from this routine is to be + passed to <STRONG>tputs</STRONG>. + +- The <STRONG>tputs</STRONG> routine is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> ++ The <STRONG>tputs</STRONG> routine is described on the <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG> + manual page. It can retrieve capabilities by either term- + cap or terminfo name. + + The variables <STRONG>PC</STRONG>, <STRONG>UP</STRONG> and <STRONG>BC</STRONG> are set by <STRONG>tgetent</STRONG> to the ter- + minfo entry's data for <STRONG>pad_char</STRONG>, <STRONG>cursor_up</STRONG> and +- <STRONG>backspace_if_not_bs</STRONG>, respectively. <STRONG>UP</STRONG> is not used by ++ <STRONG>backspace_if_not_bs</STRONG>, respectively. <STRONG>UP</STRONG> is not used by + ncurses. <STRONG>PC</STRONG> is used in the <STRONG>tdelay_output</STRONG> function. <STRONG>BC</STRONG> is +- used in the <STRONG>tgoto</STRONG> emulation. The variable <STRONG>ospeed</STRONG> is set ++ used in the <STRONG>tgoto</STRONG> emulation. The variable <STRONG>ospeed</STRONG> is set + by ncurses in a system-specific coding to reflect the ter- + minal speed. + +@@ -119,7 +137,7 @@ + </PRE> + <H2>RETURN VALUE</H2><PRE> + Except where explicitly noted, routines that return an in- +- teger return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 only specifies ++ teger return <STRONG>ERR</STRONG> upon failure and <STRONG>OK</STRONG> (SVr4 only specifies + "an integer value other than <STRONG>ERR</STRONG>") upon successful comple- + tion. + +@@ -129,48 +147,48 @@ + </PRE> + <H2>BUGS</H2><PRE> + If you call <STRONG>tgetstr</STRONG> to fetch <STRONG>ca</STRONG> or any other parameterized +- string, be aware that it will be returned in terminfo no- ++ string, be aware that it will be returned in terminfo no- + tation, not the older and not-quite-compatible termcap no- +- tation. This will not cause problems if all you do with +- it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand terminfo- +- style strings as terminfo. (The <STRONG>tgoto</STRONG> function, if con- +- figured to support termcap, will check if the string is +- indeed terminfo-style by looking for "%p" parameters or +- "$<..>" delays, and invoke a termcap-style parser if the ++ tation. This will not cause problems if all you do with ++ it is call <STRONG>tgoto</STRONG> or <STRONG>tparm</STRONG>, which both expand terminfo- ++ style strings as terminfo. (The <STRONG>tgoto</STRONG> function, if con- ++ figured to support termcap, will check if the string is ++ indeed terminfo-style by looking for "%p" parameters or ++ "$<..>" delays, and invoke a termcap-style parser if the + string does not appear to be terminfo). + +- Because terminfo conventions for representing padding in +- string capabilities differ from termcap's, <STRONG>tputs("50");</STRONG> +- will put out a literal "50" rather than busy-waiting for ++ Because terminfo conventions for representing padding in ++ string capabilities differ from termcap's, <STRONG>tputs("50");</STRONG> ++ will put out a literal "50" rather than busy-waiting for + 50 milliseconds. Cope with it. + +- Note that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> +- string. One consequence of this is that termcap applica- +- tions assume me (terminfo <STRONG>sgr0</STRONG>) does not reset the alter- +- nate character set. This implementation checks for, and ++ Note that termcap has nothing analogous to terminfo's <STRONG>sgr</STRONG> ++ string. One consequence of this is that termcap applica- ++ tions assume me (terminfo <STRONG>sgr0</STRONG>) does not reset the alter- ++ nate character set. This implementation checks for, and + modifies the data shown to the termcap interface to accom- + modate termcap's limitation in this respect. + + + </PRE> + <H2>PORTABILITY</H2><PRE> +- The XSI Curses standard, Issue 4 describes these func- +- tions. However, they are marked TO BE WITHDRAWN and may ++ The XSI Curses standard, Issue 4 describes these func- ++ tions. However, they are marked TO BE WITHDRAWN and may + be removed in future versions. + +- Neither the XSI Curses standard nor the SVr4 man pages +- documented the return values of <STRONG>tgetent</STRONG> correctly, though +- all three were in fact returned ever since SVr1. In par- +- ticular, an omission in the XSI Curses documentation has +- been misinterpreted to mean that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG> or ++ Neither the XSI Curses standard nor the SVr4 man pages ++ documented the return values of <STRONG>tgetent</STRONG> correctly, though ++ all three were in fact returned ever since SVr1. In par- ++ ticular, an omission in the XSI Curses documentation has ++ been misinterpreted to mean that <STRONG>tgetent</STRONG> returns <STRONG>OK</STRONG> or + <STRONG>ERR</STRONG>. Because the purpose of these functions is to provide +- compatibility with the <EM>termcap</EM> library, that is a defect ++ compatibility with the <EM>termcap</EM> library, that is a defect + in XCurses, Issue 4, Version 2 rather than in ncurses. + +- External variables are provided for support of certain +- termcap applications. However, termcap applications' use ++ External variables are provided for support of certain ++ termcap applications. However, termcap applications' use + of those variables is poorly documented, e.g., not distin- +- guishing between input and output. In particular, some ++ guishing between input and output. In particular, some + applications are reported to declare and/or modify <STRONG>ospeed</STRONG>. + + +diff -Naur ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html ncurses-5.9/doc/html/man/curs_terminfo.3x.html +--- ncurses-5.9.orig/doc/html/man/curs_terminfo.3x.html 2012-08-25 19:57:59.359901137 +0000 ++++ ncurses-5.9/doc/html/man/curs_terminfo.3x.html 2012-08-25 19:58:00.276563468 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1999-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_terminfo.3x,v 1.35 2010/12/04 18:38:55 tom Exp @ ++ * @Id: curs_terminfo.3x,v 1.36 2011/12/17 23:31:40 tom Exp @ + --> + <HTML> + <HEAD> +@@ -258,11 +258,11 @@ + + Routines that return pointers always return <STRONG>NULL</STRONG> on error. + +- X/Open defines no error conditions. In this implementa- ++ X/Open defines no error conditions. In this implementa- + tion + + <STRONG>del_curterm</STRONG> +- returns an error if its terminal parameter is ++ returns an error if its terminal parameter is + null. + + <STRONG>putp</STRONG> calls <STRONG>tputs</STRONG>, returning the same error-codes. +@@ -272,23 +272,23 @@ + <STRONG>tupterm</STRONG> returns an error. + + <STRONG>setupterm</STRONG> +- returns an error if it cannot allocate enough ++ returns an error if it cannot allocate enough + memory, or create the initial windows (stdscr, +- curscr, newscr). Other error conditions are ++ curscr, newscr). Other error conditions are + documented above. + + <STRONG>tputs</STRONG> +- returns an error if the string parameter is +- null. It does not detect I/O errors: X/Open +- states that <STRONG>tputs</STRONG> ignores the return value of ++ returns an error if the string parameter is ++ null. It does not detect I/O errors: X/Open ++ states that <STRONG>tputs</STRONG> ignores the return value of + the output function <EM>putc</EM>. + + + </PRE> + <H2>NOTES</H2><PRE> +- The <STRONG>setupterm</STRONG> routine should be used in place of <STRONG>setterm</STRONG>. +- It may be useful when you want to test for terminal capa- +- bilities without committing to the allocation of storage ++ The <STRONG>setupterm</STRONG> routine should be used in place of <STRONG>setterm</STRONG>. ++ It may be useful when you want to test for terminal capa- ++ bilities without committing to the allocation of storage + involved in <STRONG>initscr</STRONG>. + + Note that <STRONG>vidattr</STRONG> and <STRONG>vidputs</STRONG> may be macros. +@@ -296,58 +296,58 @@ + + </PRE> + <H2>PORTABILITY</H2><PRE> +- The function <STRONG>setterm</STRONG> is not described by X/Open and must +- be considered non-portable. All other functions are as ++ The function <STRONG>setterm</STRONG> is not described by X/Open and must ++ be considered non-portable. All other functions are as + described by X/Open. + +- <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>. +- This is not part of X/Open Curses, but is assumed by some ++ <STRONG>setupterm</STRONG> copies the terminal name to the array <STRONG>ttytype</STRONG>. ++ This is not part of X/Open Curses, but is assumed by some + applications. + +- In System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type +- and returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>. We have chosen to implement the ++ In System V Release 4, <STRONG>set_curterm</STRONG> has an <STRONG>int</STRONG> return type ++ and returns <STRONG>OK</STRONG> or <STRONG>ERR</STRONG>. We have chosen to implement the + X/Open Curses semantics. + + In System V Release 4, the third argument of <STRONG>tputs</STRONG> has the + type <STRONG>int</STRONG> <STRONG>(*putc)(char)</STRONG>. + + At least one implementation of X/Open Curses (Solaris) re- +- turns a value other than OK/ERR from <STRONG>tputs</STRONG>. That returns ++ turns a value other than OK/ERR from <STRONG>tputs</STRONG>. That returns + the length of the string, and does no error-checking. + +- X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number of pa- +- rameters, rather than a variable argument list. This im- +- plementation uses a variable argument list, but can be +- configured to use the fixed-parameter list. Portable ap- +- plications should provide 9 parameters after the format; ++ X/Open Curses prototypes <STRONG>tparm</STRONG> with a fixed number of pa- ++ rameters, rather than a variable argument list. This im- ++ plementation uses a variable argument list, but can be ++ configured to use the fixed-parameter list. Portable ap- ++ plications should provide 9 parameters after the format; + zeroes are fine for this purpose. + + In response to comments by Thomas E. Dickey, X/Open Curses + Issue 7 proposed the <STRONG>tiparam</STRONG> function in mid-2009. + +- X/Open notes that after calling <STRONG>mvcur</STRONG>, the curses state +- may not match the actual terminal state, and that an ap- +- plication should touch and refresh the window before re- ++ X/Open notes that after calling <STRONG>mvcur</STRONG>, the curses state ++ may not match the actual terminal state, and that an ap- ++ plication should touch and refresh the window before re- + suming normal curses calls. Both ncurses and System V Re- + lease 4 curses implement <STRONG>mvcur</STRONG> using the SCREEN data allo- + cated in either <STRONG>initscr</STRONG> or <STRONG>newterm</STRONG>. So though it is docu- +- mented as a terminfo function, <STRONG>mvcur</STRONG> is really a curses ++ mented as a terminfo function, <STRONG>mvcur</STRONG> is really a curses + function which is not well specified. + +- X/Open states that the old location must be given for +- <STRONG>mvcur</STRONG>. This implementation allows the caller to use -1's +- for the old ordinates. In that case, the old location is ++ X/Open states that the old location must be given for ++ <STRONG>mvcur</STRONG>. This implementation allows the caller to use -1's ++ for the old ordinates. In that case, the old location is + unknown. + +- Extended terminal capability names, e.g., as defined by +- <STRONG>tic</STRONG> <STRONG>-x</STRONG>, are not stored in the arrays described in this ++ Extended terminal capability names, e.g., as defined by ++ <STRONG>tic</STRONG> <STRONG>-x</STRONG>, are not stored in the arrays described in this + section. + + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG>curs_term-</STRONG> +- <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>, ++ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG>curs_term-</STRONG> ++ <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, <STRONG><A HREF="term_variables.3x.html">term_variables(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>, + <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + + +diff -Naur ncurses-5.9.orig/doc/html/man/curs_util.3x.html ncurses-5.9/doc/html/man/curs_util.3x.html +--- ncurses-5.9.orig/doc/html/man/curs_util.3x.html 2012-08-25 19:57:59.359901137 +0000 ++++ ncurses-5.9/doc/html/man/curs_util.3x.html 2012-08-25 19:58:00.276563468 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: curs_util.3x,v 1.32 2010/12/04 18:38:55 tom Exp @ ++ * @Id: curs_util.3x,v 1.33 2011/12/17 23:31:30 tom Exp @ + --> + <HTML> + <HEAD> +diff -Naur ncurses-5.9.orig/doc/html/man/form.3x.html ncurses-5.9/doc/html/man/form.3x.html +--- ncurses-5.9.orig/doc/html/man/form.3x.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/form.3x.html 2012-08-25 19:58:00.276563468 +0000 +@@ -243,7 +243,7 @@ + + </PRE> + <H2>SEE ALSO</H2><PRE> +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/infocmp.1m.html ncurses-5.9/doc/html/man/infocmp.1m.html +--- ncurses-5.9.orig/doc/html/man/infocmp.1m.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/infocmp.1m.html 2012-08-25 19:58:00.276563468 +0000 +@@ -2,7 +2,7 @@ + <!-- + * t + **************************************************************************** +- * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: infocmp.1m,v 1.46 2010/12/04 18:40:45 tom Exp @ ++ * @Id: infocmp.1m,v 1.50 2011/12/17 23:15:19 tom Exp @ + --> + <HTML> + <HEAD> +@@ -53,7 +53,7 @@ + + </PRE> + <H2>SYNOPSIS</H2><PRE> +- <STRONG>infocmp</STRONG> [<STRONG>-1CEFGILTUVcdegilnpqrtux</STRONG>] ++ <STRONG>infocmp</STRONG> [<STRONG>-1CDEFGIKLTUVcdegilnpqrtux</STRONG>] + [<STRONG>-v</STRONG> <EM>n</EM>] [<STRONG>-s</STRONG> <STRONG>d</STRONG>| <STRONG>i</STRONG>| <STRONG>l</STRONG>| <STRONG>c</STRONG>] [<STRONG>-R</STRONG> <STRONG>subset</STRONG>] + [<STRONG>-w</STRONG> <EM>width</EM>] [<STRONG>-A</STRONG> <EM>directory</EM>] [<STRONG>-B</STRONG> <EM>directory</EM>] + [<EM>termname</EM>...] +@@ -107,6 +107,7 @@ + <STRONG>-L</STRONG> use the long C variable name listed in <<STRONG>term.h</STRONG>> + <STRONG>-C</STRONG> use the <STRONG>termcap</STRONG> names + <STRONG>-r</STRONG> when using <STRONG>-C</STRONG>, put out all capabilities in <STRONG>termcap</STRONG> form ++ <STRONG>-K</STRONG> modifies the <STRONG>-C</STRONG> option, improving BSD-compatibility. + + If no <EM>termnames</EM> are given, the environment variable <STRONG>TERM</STRONG> + will be used for the terminal name. +@@ -129,7 +130,11 @@ + only those variables which were part of <STRONG>termcap</STRONG> will nor- + mally be output. Specifying the <STRONG>-r</STRONG> option will take off + this restriction, allowing all capabilities to be output +- in <EM>termcap</EM> form. ++ in <EM>termcap</EM> form. Normally you would use both the <STRONG>-C</STRONG> and ++ <STRONG>-r</STRONG> options. The actual format used incorporates some ++ improvements for escaped characters from terminfo format. ++ For a stricter BSD-compatible translation, use the <STRONG>-K</STRONG> ++ option rather than <STRONG>-C</STRONG>. + + Note that because padding is collected to the beginning of + the capability, not all capabilities are output. Manda- +@@ -173,9 +178,9 @@ + <EM>termname</EM> entries contains a value for it. A capability's + value gets printed if the value in the first <EM>termname</EM> is + not found in any of the other <EM>termname</EM> entries, or if the +- first of the other <EM>termname</EM> entries that has this capabil- +- ity gives a different value for the capability than that +- in the first <EM>termname</EM>. ++ first of the other <EM>termname</EM> entries that has this ++ capability gives a different value for the capability than ++ that in the first <EM>termname</EM>. + + The order of the other <EM>termname</EM> entries is significant. + Since the terminfo compiler <STRONG>tic</STRONG> does a left-to-right scan +@@ -214,14 +219,20 @@ + different people. + + <STRONG>Other</STRONG> <STRONG>Options</STRONG> +- <STRONG>-1</STRONG> causes the fields to be printed out one to a line. +- Otherwise, the fields will be printed several to a ++ <STRONG>-0</STRONG> causes the fields to be printed on one line, without ++ wrapping. ++ ++ <STRONG>-1</STRONG> causes the fields to be printed out one to a line. ++ Otherwise, the fields will be printed several to a + line to a maximum width of 60 characters. + +- <STRONG>-a</STRONG> tells <STRONG>infocmp</STRONG> to retain commented-out capabilities +- rather than discarding them. Capabilities are com- ++ <STRONG>-a</STRONG> tells <STRONG>infocmp</STRONG> to retain commented-out capabilities ++ rather than discarding them. Capabilities are com- + mented by prefixing them with a period. + ++ <STRONG>-D</STRONG> tells <STRONG>infocmp</STRONG> to print the database locations that it ++ knows about, and exit. ++ + <STRONG>-E</STRONG> Dump the capabilities of the given terminal as + tables, needed in the C initializer for a TERMTYPE + structure (the terminal capability structure in the +@@ -233,8 +244,8 @@ + + Before ncurses 5.0, the split between the <STRONG>-e</STRONG> and <STRONG>-E</STRONG> + options was not needed; but support for extended +- names required making the arrays of terminal capabil- +- ities separate from the TERMTYPE structure. ++ names required making the arrays of terminal ++ capabilities separate from the TERMTYPE structure. + + <STRONG>-e</STRONG> Dump the capabilities of the given terminal as a C + initializer for a TERMTYPE structure (the terminal +@@ -299,6 +310,7 @@ + ISO US G1 enable US chars for G1 + ----------------------------------------- + DECPAM application keypad mode ++ + DECPNM normal keypad mode + DECANSI enter ANSI mode + ----------------------------------------- +@@ -310,7 +322,6 @@ + DEC[+-]CKM application cursor keys + DEC[+-]ANM set VT52 mode + DEC[+-]COLM 132-column mode +- + DEC[+-]SCLM smooth scroll + DEC[+-]SCNM reverse video mode + DEC[+-]OM origin mode +@@ -404,12 +415,13 @@ + + </PRE> + <H2>EXTENSIONS</H2><PRE> +- The <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG> +- and <STRONG>-t</STRONG> options are not supported in SVr4 curses. ++ The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-E</STRONG>, <STRONG>-F</STRONG>, <STRONG>-G</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-i</STRONG>, ++ <STRONG>-l</STRONG>, <STRONG>-p</STRONG>, <STRONG>-q</STRONG> and <STRONG>-t</STRONG> options are not supported in SVr4 ++ curses. + + The <STRONG>-r</STRONG> option's notion of `termcap' capabilities is System +- V Release 4's. Actual BSD curses versions will have a +- more restricted set. To see only the 4.4BSD set, use <STRONG>-r</STRONG> ++ V Release 4's. Actual BSD curses versions will have a ++ more restricted set. To see only the 4.4BSD set, use <STRONG>-r</STRONG> + <STRONG>-RBSD</STRONG>. + + +@@ -420,10 +432,10 @@ + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, ++ <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + </PRE> +diff -Naur ncurses-5.9.orig/doc/html/man/infotocap.1m.html ncurses-5.9/doc/html/man/infotocap.1m.html +--- ncurses-5.9.orig/doc/html/man/infotocap.1m.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/infotocap.1m.html 2012-08-25 19:58:00.276563468 +0000 +@@ -94,7 +94,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + </PRE> +diff -Naur ncurses-5.9.orig/doc/html/man/menu.3x.html ncurses-5.9/doc/html/man/menu.3x.html +--- ncurses-5.9.orig/doc/html/man/menu.3x.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/menu.3x.html 2012-08-25 19:58:00.279896785 +0000 +@@ -226,7 +226,7 @@ + + </PRE> + <H2>SEE ALSO</H2><PRE> +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/ncurses.3x.html ncurses-5.9/doc/html/man/ncurses.3x.html +--- ncurses-5.9.orig/doc/html/man/ncurses.3x.html 2012-08-25 19:57:59.359901137 +0000 ++++ ncurses-5.9/doc/html/man/ncurses.3x.html 2012-08-25 19:58:00.279896785 +0000 +@@ -28,7 +28,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: ncurses.3x,v 1.103 2011/02/05 23:21:29 tom Exp @ ++ * @Id: ncurses.3x,v 1.106 2011/12/17 23:19:59 tom Exp @ + --> + <HTML> + <HEAD> +@@ -63,7 +63,7 @@ + sonable optimization. This implementation is ``new + curses'' (ncurses) and is the approved replacement for + 4.4BSD classic curses, which has been discontinued. This +- describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + The <STRONG>ncurses</STRONG> library emulates the curses library of System + V Release 4 UNIX, and XPG4 (X/Open Portability Guide) +@@ -757,9 +757,12 @@ + pletion, unless otherwise noted in the routine descrip- + tions. + +- All macros return the value of the <STRONG>w</STRONG> version, except ++ As a general rule, routines check for null pointers passed ++ as parameters, and handle this as an error. ++ ++ All macros return the value of the <STRONG>w</STRONG> version, except + <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>, <STRONG>getbegyx</STRONG>, and <STRONG>getmaxyx</STRONG>. The +- return values of <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>, <STRONG>getbegyx</STRONG>, ++ return values of <STRONG>setscrreg</STRONG>, <STRONG>wsetscrreg</STRONG>, <STRONG>getyx</STRONG>, <STRONG>getbegyx</STRONG>, + and <STRONG>getmaxyx</STRONG> are undefined (i.e., these should not be used + as the right-hand side of assignment statements). + +@@ -773,46 +776,46 @@ + important ones have been already discussed in detail. + + BAUDRATE +- The debugging library checks this environment symbol ++ The debugging library checks this environment symbol + when the application has redirected output to a file. +- The symbol's numeric value is used for the baudrate. ++ The symbol's numeric value is used for the baudrate. + If no value is found, <STRONG>ncurses</STRONG> uses 9600. This allows +- testers to construct repeatable test-cases that take ++ testers to construct repeatable test-cases that take + into account costs that depend on baudrate. + + CC When set, change occurrences of the command_character +- (i.e., the <STRONG>cmdch</STRONG> capability) of the loaded terminfo +- entries to the value of this symbol. Very few ter- ++ (i.e., the <STRONG>cmdch</STRONG> capability) of the loaded terminfo ++ entries to the value of this symbol. Very few ter- + minfo entries provide this feature. + +- Because this name is also used in development envi- +- ronments to represent the C compiler's name, <STRONG>ncurses</STRONG> ++ Because this name is also used in development envi- ++ ronments to represent the C compiler's name, <STRONG>ncurses</STRONG> + ignores it if it does not happen to be a single char- + acter. + + COLUMNS + Specify the width of the screen in characters. +- Applications running in a windowing environment usu- +- ally are able to obtain the width of the window in +- which they are executing. If neither the <STRONG>COLUMNS</STRONG> +- value nor the terminal's screen size is available, +- <STRONG>ncurses</STRONG> uses the size which may be specified in the ++ Applications running in a windowing environment usu- ++ ally are able to obtain the width of the window in ++ which they are executing. If neither the <STRONG>COLUMNS</STRONG> ++ value nor the terminal's screen size is available, ++ <STRONG>ncurses</STRONG> uses the size which may be specified in the + terminfo database (i.e., the <STRONG>cols</STRONG> capability). + +- It is important that your application use a correct +- size for the screen. This is not always possible +- because your application may be running on a host +- which does not honor NAWS (Negotiations About Window +- Size), or because you are temporarily running as +- another user. However, setting <STRONG>COLUMNS</STRONG> and/or <STRONG>LINES</STRONG> ++ It is important that your application use a correct ++ size for the screen. This is not always possible ++ because your application may be running on a host ++ which does not honor NAWS (Negotiations About Window ++ Size), or because you are temporarily running as ++ another user. However, setting <STRONG>COLUMNS</STRONG> and/or <STRONG>LINES</STRONG> + overrides the library's use of the screen size + obtained from the operating system. + +- Either <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> symbols may be specified +- independently. This is mainly useful to circumvent +- legacy misfeatures of terminal descriptions, e.g., ++ Either <STRONG>COLUMNS</STRONG> or <STRONG>LINES</STRONG> symbols may be specified ++ independently. This is mainly useful to circumvent ++ legacy misfeatures of terminal descriptions, e.g., + xterm which commonly specifies a 65 line screen. For +- best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified ++ best results, <STRONG>lines</STRONG> and <STRONG>cols</STRONG> should not be specified + in a terminal description for terminals which are run + as emulations. + +@@ -821,35 +824,35 @@ + the screen size. + + ESCDELAY +- Specifies the total time, in milliseconds, for which +- ncurses will await a character sequence, e.g., a +- function key. The default value, 1000 milliseconds, ++ Specifies the total time, in milliseconds, for which ++ ncurses will await a character sequence, e.g., a ++ function key. The default value, 1000 milliseconds, + is enough for most uses. However, it is made a vari- + able to accommodate unusual applications. + + The most common instance where you may wish to change +- this value is to work with slow hosts, e.g., running +- on a network. If the host cannot read characters +- rapidly enough, it will have the same effect as if +- the terminal did not send characters rapidly enough. ++ this value is to work with slow hosts, e.g., running ++ on a network. If the host cannot read characters ++ rapidly enough, it will have the same effect as if ++ the terminal did not send characters rapidly enough. + The library will still see a timeout. + +- Note that xterm mouse events are built up from char- +- acter sequences received from the xterm. If your ++ Note that xterm mouse events are built up from char- ++ acter sequences received from the xterm. If your + application makes heavy use of multiple-clicking, you +- may wish to lengthen this default value because the +- timeout applies to the composed multi-click event as ++ may wish to lengthen this default value because the ++ timeout applies to the composed multi-click event as + well as the individual clicks. + +- In addition to the environment variable, this imple- +- mentation provides a global variable with the same ++ In addition to the environment variable, this imple- ++ mentation provides a global variable with the same + name. Portable applications should not rely upon the +- presence of ESCDELAY in either form, but setting the +- environment variable rather than the global variable +- does not create problems when compiling an applica- ++ presence of ESCDELAY in either form, but setting the ++ environment variable rather than the global variable ++ does not create problems when compiling an applica- + tion. + +- HOME Tells <STRONG>ncurses</STRONG> where your home directory is. That is ++ HOME Tells <STRONG>ncurses</STRONG> where your home directory is. That is + where it may read and write auxiliary terminal + descriptions: + +@@ -857,12 +860,12 @@ + $HOME/.terminfo + + LINES +- Like COLUMNS, specify the height of the screen in +- characters. See COLUMNS for a detailed description. ++ Like COLUMNS, specify the height of the screen in ++ characters. See COLUMNS for a detailed description. + + MOUSE_BUTTONS_123 + This applies only to the OS/2 EMX port. It specifies +- the order of buttons on the mouse. OS/2 numbers a ++ the order of buttons on the mouse. OS/2 numbers a + 3-button mouse inconsistently from other platforms: + + 1 = left +@@ -870,109 +873,109 @@ + 3 = middle. + + This symbol lets you customize the mouse. The symbol +- must be three numeric digits 1-3 in any order, e.g., +- 123 or 321. If it is not specified, <STRONG>ncurses</STRONG> uses ++ must be three numeric digits 1-3 in any order, e.g., ++ 123 or 321. If it is not specified, <STRONG>ncurses</STRONG> uses + 132. + + NCURSES_ASSUMED_COLORS +- Override the compiled-in assumption that the termi- +- nal's default colors are white-on-black (see +- <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>). You may set the foreground and +- background color values with this environment vari- +- able by proving a 2-element list: foreground,back- +- ground. For example, to tell ncurses to not assume +- anything about the colors, set this to "-1,-1". To +- make it green-on-black, set it to "2,0". Any posi- ++ Override the compiled-in assumption that the termi- ++ nal's default colors are white-on-black (see ++ <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>). You may set the foreground and ++ background color values with this environment vari- ++ able by proving a 2-element list: foreground,back- ++ ground. For example, to tell ncurses to not assume ++ anything about the colors, set this to "-1,-1". To ++ make it green-on-black, set it to "2,0". Any posi- + tive value from zero to the terminfo <STRONG>max_colors</STRONG> value + is allowed. + + NCURSES_GPM_TERMS +- This applies only to ncurses configured to use the ++ This applies only to ncurses configured to use the + GPM interface. + + If present, the environment variable is a list of one +- or more terminal names against which the TERM envi- +- ronment variable is matched. Setting it to an empty +- value disables the GPM interface; using the built-in ++ or more terminal names against which the TERM envi- ++ ronment variable is matched. Setting it to an empty ++ value disables the GPM interface; using the built-in + support for xterm, etc. + +- If the environment variable is absent, ncurses will ++ If the environment variable is absent, ncurses will + attempt to open GPM if TERM contains "linux". + + NCURSES_NO_HARD_TABS +- <STRONG>Ncurses</STRONG> may use tabs as part of the cursor movement +- optimization. In some cases, your terminal driver +- may not handle these properly. Set this environment ++ <STRONG>Ncurses</STRONG> may use tabs as part of the cursor movement ++ optimization. In some cases, your terminal driver ++ may not handle these properly. Set this environment + variable to disable the feature. You can also adjust + your <STRONG>stty</STRONG> settings to avoid the problem. + + NCURSES_NO_MAGIC_COOKIES + Some terminals use a magic-cookie feature which +- requires special handling to make highlighting and +- other video attributes display properly. You can +- suppress the highlighting entirely for these termi- +- nals by setting this environment variable. ++ requires special handling to make highlighting and ++ other video attributes display properly. You can ++ suppress the highlighting entirely for these ++ terminals by setting this environment variable. + + NCURSES_NO_PADDING +- Most of the terminal descriptions in the terminfo +- database are written for real "hardware" terminals. +- Many people use terminal emulators which run in a +- windowing environment and use curses-based applica- +- tions. Terminal emulators can duplicate all of the ++ Most of the terminal descriptions in the terminfo ++ database are written for real "hardware" terminals. ++ Many people use terminal emulators which run in a ++ windowing environment and use curses-based applica- ++ tions. Terminal emulators can duplicate all of the + important aspects of a hardware terminal, but they do +- not have the same limitations. The chief limitation +- of a hardware terminal from the standpoint of your ++ not have the same limitations. The chief limitation ++ of a hardware terminal from the standpoint of your + application is the management of dataflow, i.e., tim- + ing. Unless a hardware terminal is interfaced into a +- terminal concentrator (which does flow control), it +- (or your application) must manage dataflow, prevent- +- ing overruns. The cheapest solution (no hardware ++ terminal concentrator (which does flow control), it ++ (or your application) must manage dataflow, prevent- ++ ing overruns. The cheapest solution (no hardware + cost) is for your program to do this by pausing after +- operations that the terminal does slowly, such as ++ operations that the terminal does slowly, such as + clearing the display. + +- As a result, many terminal descriptions (including +- the vt100) have delay times embedded. You may wish +- to use these descriptions, but not want to pay the ++ As a result, many terminal descriptions (including ++ the vt100) have delay times embedded. You may wish ++ to use these descriptions, but not want to pay the + performance penalty. + +- Set the NCURSES_NO_PADDING symbol to disable all but +- mandatory padding. Mandatory padding is used as a ++ Set the NCURSES_NO_PADDING symbol to disable all but ++ mandatory padding. Mandatory padding is used as a + part of special control sequences such as <EM>flash</EM>. + + NCURSES_NO_SETBUF +- Normally <STRONG>ncurses</STRONG> enables buffered output during ter- +- minal initialization. This is done (as in SVr4 +- curses) for performance reasons. For testing pur- ++ Normally <STRONG>ncurses</STRONG> enables buffered output during ter- ++ minal initialization. This is done (as in SVr4 ++ curses) for performance reasons. For testing pur- + poses, both of <STRONG>ncurses</STRONG> and certain applications, this + feature is made optional. Setting the + NCURSES_NO_SETBUF variable disables output buffering, +- leaving the output in the original (usually line ++ leaving the output in the original (usually line + buffered) mode. + + NCURSES_NO_UTF8_ACS + During initialization, the <STRONG>ncurses</STRONG> library checks for +- special cases where VT100 line-drawing (and the cor- +- responding alternate character set capabilities) +- described in the terminfo are known to be missing. +- Specifically, when running in a UTF-8 locale, the +- Linux console emulator and the GNU screen program +- ignore these. Ncurses checks the TERM environment +- variable for these. For other special cases, you +- should set this environment variable. Doing this +- tells ncurses to use Unicode values which correspond ++ special cases where VT100 line-drawing (and the cor- ++ responding alternate character set capabilities) ++ described in the terminfo are known to be missing. ++ Specifically, when running in a UTF-8 locale, the ++ Linux console emulator and the GNU screen program ++ ignore these. Ncurses checks the TERM environment ++ variable for these. For other special cases, you ++ should set this environment variable. Doing this ++ tells ncurses to use Unicode values which correspond + to the VT100 line-drawing glyphs. That works for the + special cases cited, and is likely to work for termi- + nal emulators. + +- When setting this variable, you should set it to a +- nonzero value. Setting it to zero (or to a nonnum- +- ber) disables the special check for "linux" and ++ When setting this variable, you should set it to a ++ nonzero value. Setting it to zero (or to a nonnum- ++ ber) disables the special check for "linux" and + "screen". + +- As an alternative to the environment variable, +- ncurses checks for an extended terminfo capability +- <STRONG>U8</STRONG>. This is a numeric capability which can be com- ++ As an alternative to the environment variable, ++ ncurses checks for an extended terminfo capability ++ <STRONG>U8</STRONG>. This is a numeric capability which can be com- + piled using <STRONG>tic</STRONG> <STRONG>-x</STRONG>. For example + + # linux console, if patched to provide working +@@ -985,43 +988,43 @@ + U8#1, use=xterm, + + The name "U8" is chosen to be two characters, to per- +- mit it to be used by applications that use ncurses' ++ mit it to be used by applications that use ncurses' + termcap interface. + + NCURSES_TRACE +- During initialization, the <STRONG>ncurses</STRONG> debugging library +- checks the NCURSES_TRACE symbol. If it is defined, ++ During initialization, the <STRONG>ncurses</STRONG> debugging library ++ checks the NCURSES_TRACE symbol. If it is defined, + to a numeric value, <STRONG>ncurses</STRONG> calls the <STRONG>trace</STRONG> function, + using that value as the argument. + +- The argument values, which are defined in <STRONG>curses.h</STRONG>, +- provide several types of information. When running +- with traces enabled, your application will write the ++ The argument values, which are defined in <STRONG>curses.h</STRONG>, ++ provide several types of information. When running ++ with traces enabled, your application will write the + file <STRONG>trace</STRONG> to the current directory. + +- TERM Denotes your terminal type. Each terminal type is ++ TERM Denotes your terminal type. Each terminal type is + distinct, though many are similar. + + TERMCAP + If the <STRONG>ncurses</STRONG> library has been configured with <EM>term-</EM> +- <EM>cap</EM> support, <STRONG>ncurses</STRONG> will check for a terminal's ++ <EM>cap</EM> support, <STRONG>ncurses</STRONG> will check for a terminal's + description in termcap form if it is not available in + the terminfo database. + +- The TERMCAP symbol contains either a terminal +- description (with newlines stripped out), or a file +- name telling where the information denoted by the +- TERM symbol exists. In either case, setting it +- directs <STRONG>ncurses</STRONG> to ignore the usual place for this ++ The TERMCAP symbol contains either a terminal ++ description (with newlines stripped out), or a file ++ name telling where the information denoted by the ++ TERM symbol exists. In either case, setting it ++ directs <STRONG>ncurses</STRONG> to ignore the usual place for this + information, e.g., /etc/termcap. + + TERMINFO + Overrides the directory in which <STRONG>ncurses</STRONG> searches for + your terminal description. This is the simplest, but +- not the only way to change the list of directories. ++ not the only way to change the list of directories. + The complete list of directories in order follows: + +- <STRONG>o</STRONG> the last directory to which <STRONG>ncurses</STRONG> wrote, if ++ <STRONG>o</STRONG> the last directory to which <STRONG>ncurses</STRONG> wrote, if + any, is searched first + + <STRONG>o</STRONG> the directory specified by the TERMINFO symbol +@@ -1030,62 +1033,70 @@ + + <STRONG>o</STRONG> directories listed in the TERMINFO_DIRS symbol + +- <STRONG>o</STRONG> one or more directories whose names are config- ++ <STRONG>o</STRONG> one or more directories whose names are config- + ured and compiled into the ncurses library, e.g., + /usr/share/terminfo + + TERMINFO_DIRS +- Specifies a list of directories to search for termi- +- nal descriptions. The list is separated by colons +- (i.e., ":") on Unix, semicolons on OS/2 EMX. All of ++ Specifies a list of directories to search for termi- ++ nal descriptions. The list is separated by colons ++ (i.e., ":") on Unix, semicolons on OS/2 EMX. All of + the terminal descriptions are in terminfo form, which +- makes a subdirectory named for the first letter of ++ makes a subdirectory named for the first letter of + the terminal names therein. + ++ If <STRONG>ncurses</STRONG> is built with a hashed database, then each ++ entry in this list can also be the path of the corre- ++ sponding database file. ++ ++ If <STRONG>ncurses</STRONG> is built with a support for reading term- ++ cap files directly, then an entry in this list may be ++ the path of a termcap file. ++ + TERMPATH +- If TERMCAP does not hold a file name then <STRONG>ncurses</STRONG> +- checks the TERMPATH symbol. This is a list of file- +- names separated by spaces or colons (i.e., ":") on ++ If TERMCAP does not hold a file name then <STRONG>ncurses</STRONG> ++ checks the TERMPATH symbol. This is a list of file- ++ names separated by spaces or colons (i.e., ":") on + Unix, semicolons on OS/2 EMX. If the TERMPATH symbol +- is not set, <STRONG>ncurses</STRONG> looks in the files /etc/termcap, +- /usr/share/misc/termcap and $HOME/.termcap, in that ++ is not set, <STRONG>ncurses</STRONG> looks in the files /etc/termcap, ++ /usr/share/misc/termcap and $HOME/.termcap, in that + order. + +- The library may be configured to disregard the following +- variables when the current user is the superuser (root), +- or if the application uses setuid or setgid permissions: ++ The library may be configured to disregard the following ++ variables when the current user is the superuser (root), ++ or if the application uses setuid or setgid permissions: + $TERMINFO, $TERMINFO_DIRS, $TERMPATH, as well as $HOME. + + + </PRE> + <H2>ALTERNATE CONFIGURATIONS</H2><PRE> +- Several different configurations are possible, depending +- on the configure script options used when building +- <STRONG>ncurses</STRONG>. There are a few main options whose effects are ++ Several different configurations are possible, depending ++ on the configure script options used when building ++ <STRONG>ncurses</STRONG>. There are a few main options whose effects are + visible to the applications developer using <STRONG>ncurses</STRONG>: + + --disable-overwrite +- The standard include for <STRONG>ncurses</STRONG> is as noted in <STRONG>SYN-</STRONG> ++ The standard include for <STRONG>ncurses</STRONG> is as noted in <STRONG>SYN-</STRONG> + <STRONG>OPSIS</STRONG>: + + <STRONG>#include</STRONG> <STRONG><curses.h></STRONG> + +- This option is used to avoid filename conflicts when +- <STRONG>ncurses</STRONG> is not the main implementation of curses of +- the computer. If <STRONG>ncurses</STRONG> is installed disabling +- overwrite, it puts its headers in a subdirectory, ++ This option is used to avoid filename conflicts when ++ <STRONG>ncurses</STRONG> is not the main implementation of curses of ++ the computer. If <STRONG>ncurses</STRONG> is installed disabling ++ overwrite, it puts its headers in a subdirectory, + e.g., + + <STRONG>#include</STRONG> <STRONG><ncurses/curses.h></STRONG> + +- It also omits a symbolic link which would allow you ++ It also omits a symbolic link which would allow you + to use <STRONG>-lcurses</STRONG> to build executables. + + --enable-widec +- The configure script renames the library and (if the +- <STRONG>--disable-overwrite</STRONG> option is used) puts the header ++ The configure script renames the library and (if the ++ <STRONG>--disable-overwrite</STRONG> option is used) puts the header + files in a different subdirectory. All of the +- library names have a "w" appended to them, i.e., ++ library names have a "w" appended to them, i.e., + instead of + + <STRONG>-lncurses</STRONG> +@@ -1095,16 +1106,16 @@ + <STRONG>-lncursesw</STRONG> + + You must also define <STRONG>_XOPEN_SOURCE_EXTENDED</STRONG> when com- +- piling for the wide-character library to use the +- extended (wide-character) functions. The <STRONG>curses.h</STRONG> +- file which is installed for the wide-character +- library is designed to be compatible with the normal ++ piling for the wide-character library to use the ++ extended (wide-character) functions. The <STRONG>curses.h</STRONG> ++ file which is installed for the wide-character ++ library is designed to be compatible with the normal + library's header. Only the size of the <STRONG>WINDOW</STRONG> struc- +- ture differs, and very few applications require more +- than a pointer to <STRONG>WINDOW</STRONG>s. If the headers are +- installed allowing overwrite, the wide-character +- library's headers should be installed last, to allow +- applications to be built using either library from ++ ture differs, and very few applications require more ++ than a pointer to <STRONG>WINDOW</STRONG>s. If the headers are ++ installed allowing overwrite, the wide-character ++ library's headers should be installed last, to allow ++ applications to be built using either library from + the same set of headers. + + --with-shared +@@ -1114,16 +1125,16 @@ + --with-debug + + --with-profile +- The shared and normal (static) library names differ +- by their suffixes, e.g., <STRONG>libncurses.so</STRONG> and +- <STRONG>libncurses.a</STRONG>. The debug and profiling libraries add +- a "_g" and a "_p" to the root names respectively, ++ The shared and normal (static) library names differ ++ by their suffixes, e.g., <STRONG>libncurses.so</STRONG> and ++ <STRONG>libncurses.a</STRONG>. The debug and profiling libraries add ++ a "_g" and a "_p" to the root names respectively, + e.g., <STRONG>libncurses_g.a</STRONG> and <STRONG>libncurses_p.a</STRONG>. + + --with-trace +- The <STRONG>trace</STRONG> function normally resides in the debug ++ The <STRONG>trace</STRONG> function normally resides in the debug + library, but it is sometimes useful to configure this +- in the shared library. Configure scripts should ++ in the shared library. Configure scripts should + check for the function's existence rather than assum- + ing it is always in the debug library. + +@@ -1131,14 +1142,14 @@ + </PRE> + <H2>FILES</H2><PRE> + /usr/share/tabset +- directory containing initialization files for the ++ directory containing initialization files for the + terminal capability database /usr/share/terminfo ter- + minal capability database + + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> and related pages whose names begin "curs_" ++ <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> and related pages whose names begin "curs_" + for detailed routine descriptions. + <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG> + +@@ -1148,52 +1159,61 @@ + The <STRONG>ncurses</STRONG> library can be compiled with an option + (<STRONG>-DUSE_GETCAP</STRONG>) that falls back to the old-style /etc/term- + cap file if the terminal setup code cannot find a terminfo +- entry corresponding to <STRONG>TERM</STRONG>. Use of this feature is not +- recommended, as it essentially includes an entire termcap +- compiler in the <STRONG>ncurses</STRONG> startup code, at significant cost ++ entry corresponding to <STRONG>TERM</STRONG>. Use of this feature is not ++ recommended, as it essentially includes an entire termcap ++ compiler in the <STRONG>ncurses</STRONG> startup code, at significant cost + in core and startup cycles. + +- The <STRONG>ncurses</STRONG> library includes facilities for capturing +- mouse events on certain terminals (including xterm). See ++ The <STRONG>ncurses</STRONG> library includes facilities for capturing ++ mouse events on certain terminals (including xterm). See + the <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG> manual page for details. + +- The <STRONG>ncurses</STRONG> library includes facilities for responding to +- window resizing events, e.g., when running in an xterm. +- See the <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for +- details. In addition, the library may be configured with ++ The <STRONG>ncurses</STRONG> library includes facilities for responding to ++ window resizing events, e.g., when running in an xterm. ++ See the <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG> and <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG> manual pages for ++ details. In addition, the library may be configured with + a SIGWINCH handler. + +- The <STRONG>ncurses</STRONG> library extends the fixed set of function key +- capabilities of terminals by allowing the application +- designer to define additional key sequences at runtime. ++ The <STRONG>ncurses</STRONG> library extends the fixed set of function key ++ capabilities of terminals by allowing the application ++ designer to define additional key sequences at runtime. + See the <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG> <STRONG><A HREF="key_defined.3x.html">key_defined(3x)</A></STRONG>, and <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG> man- + ual pages for details. + + The <STRONG>ncurses</STRONG> library can exploit the capabilities of termi- +- nals which implement the ISO-6429 SGR 39 and SGR 49 con- ++ nals which implement the ISO-6429 SGR 39 and SGR 49 con- + trols, which allow an application to reset the terminal to +- its original foreground and background colors. From the +- users' perspective, the application is able to draw col- +- ored text on a background whose color is set indepen- +- dently, providing better control over color contrasts. ++ its original foreground and background colors. From the ++ users' perspective, the application is able to draw col- ++ ored text on a background whose color is set indepen- ++ dently, providing better control over color contrasts. + See the <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG> manual page for details. + +- The <STRONG>ncurses</STRONG> library includes a function for directing +- application output to a printer attached to the terminal ++ The <STRONG>ncurses</STRONG> library includes a function for directing ++ application output to a printer attached to the terminal + device. See the <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG> manual page for details. + + + </PRE> + <H2>PORTABILITY</H2><PRE> +- The <STRONG>ncurses</STRONG> library is intended to be BASE-level confor- ++ The <STRONG>ncurses</STRONG> library is intended to be BASE-level confor- + mant with XSI Curses. The EXTENDED XSI Curses functional- + ity (including color support) is supported. + +- A small number of local differences (that is, individual +- differences between the XSI Curses and <STRONG>ncurses</STRONG> calls) are +- described in <STRONG>PORTABILITY</STRONG> sections of the library man ++ A small number of local differences (that is, individual ++ differences between the XSI Curses and <STRONG>ncurses</STRONG> calls) are ++ described in <STRONG>PORTABILITY</STRONG> sections of the library man + pages. + ++ Unlike other implementations, this one checks parameters ++ such as pointers to WINDOW structures to ensure they are ++ not null. The main reason for providing this behavior is ++ to guard against programmer error. The standard interface ++ does not provide a way for the library to tell an applica- ++ tion which of several possible errors were detected. ++ Relying on this (or some other) extension will adversely ++ affect the portability of curses applications. ++ + This implementation also contains several extensions: + + <STRONG>o</STRONG> The routine <STRONG>has_key</STRONG> is not part of XPG4, nor is it +diff -Naur ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html ncurses-5.9/doc/html/man/ncurses5-config.1.html +--- ncurses-5.9.orig/doc/html/man/ncurses5-config.1.html 2012-08-25 19:57:59.359901137 +0000 ++++ ncurses-5.9/doc/html/man/ncurses5-config.1.html 2012-08-25 19:58:00.279896785 +0000 +@@ -105,7 +105,8 @@ + + <STRONG>--terminfo-dirs</STRONG> + echos the $TERMINFO_DIRS directory list, e.g., +- /usr/local/ncurses/lib/terminfo:/usr/share/terminfo ++ /usr/local/ncurses/share/terminfo:/usr/share/ter- ++ minfo + + <STRONG>--termpath</STRONG> + echos the $TERMPATH termcap list, if support for +@@ -118,7 +119,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/panel.3x.html ncurses-5.9/doc/html/man/panel.3x.html +--- ncurses-5.9.orig/doc/html/man/panel.3x.html 2012-08-25 19:57:59.359901137 +0000 ++++ ncurses-5.9/doc/html/man/panel.3x.html 2012-08-25 19:58:00.283230103 +0000 +@@ -218,7 +218,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_variables.3x.html">curs_variables(3x)</A></STRONG>, + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + </PRE> +diff -Naur ncurses-5.9.orig/doc/html/man/tabs.1.html ncurses-5.9/doc/html/man/tabs.1.html +--- ncurses-5.9.orig/doc/html/man/tabs.1.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/tabs.1.html 2012-08-25 19:58:00.283230103 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tabs.1,v 1.8 2010/12/04 18:40:45 tom Exp @ ++ * @Id: tabs.1,v 1.9 2011/12/17 23:31:59 tom Exp @ + --> + <HTML> + <HEAD> +@@ -156,7 +156,7 @@ + <H2>SEE ALSO</H2><PRE> + <STRONG><A HREF="tset.1.html">tset(1)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/term.7.html ncurses-5.9/doc/html/man/term.7.html +--- ncurses-5.9.orig/doc/html/man/term.7.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/term.7.html 2012-08-25 19:58:00.283230103 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: term.7,v 1.22 2010/12/04 18:41:07 tom Exp @ ++ * @Id: term.7,v 1.23 2011/12/17 23:32:17 tom Exp @ + --> + <HTML> + <HEAD> +diff -Naur ncurses-5.9.orig/doc/html/man/term_variables.3x.html ncurses-5.9/doc/html/man/term_variables.3x.html +--- ncurses-5.9.orig/doc/html/man/term_variables.3x.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/term_variables.3x.html 2012-08-25 19:58:00.283230103 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: term_variables.3x,v 1.2 2010/12/04 18:38:55 tom Exp @ ++ * @Id: term_variables.3x,v 1.3 2011/12/17 23:31:50 tom Exp @ + --> + <HTML> + <HEAD> +diff -Naur ncurses-5.9.orig/doc/html/man/terminfo.5.html ncurses-5.9/doc/html/man/terminfo.5.html +--- ncurses-5.9.orig/doc/html/man/terminfo.5.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/terminfo.5.html 2012-08-25 19:58:00.286563421 +0000 +@@ -34,7 +34,7 @@ + **************************************************************************** + * @Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp @ + * Head of terminfo man page ends here +- * @Id: terminfo.tail,v 1.53 2010/12/04 18:38:55 tom Exp @ ++ * @Id: terminfo.tail,v 1.55 2011/12/17 23:19:59 tom Exp @ + * Beginning of terminfo.tail file + * This file is part of ncurses. + * See "terminfo.head" for copyright. +@@ -78,7 +78,7 @@ + nals by giving a set of capabilities which they have, by + specifying how to perform screen operations, and by speci- + fying padding requirements and initialization sequences. +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + Entries in <EM>terminfo</EM> consist of a sequence of `,' separated + fields (embedded commas may be escaped with a backslash or +@@ -989,13 +989,14 @@ + bottom margins to + #1, #2 + +- The XSI Curses standard added these. They are some +- post-4.1 versions of System V curses, e.g., Solaris 2.5 +- and IRIX 6.x. The <STRONG>ncurses</STRONG> termcap names for them are +- invented; according to the XSI Curses standard, they have +- no termcap names. If your compiled terminfo entries use +- these, they may not be binary-compatible with System V +- terminfo entries after SVr4.1; beware! ++ The XSI Curses standard added these hardcopy capabili- ++ ties. They were used in some post-4.1 versions of System ++ V curses, e.g., Solaris 2.5 and IRIX 6.x. Except for <STRONG>YI</STRONG>, ++ the <STRONG>ncurses</STRONG> termcap names for them are invented. Accord- ++ ing to the XSI Curses standard, they have no termcap ++ names. If your compiled terminfo entries use these, they ++ may not be binary-compatible with System V terminfo ++ entries after SVr4.1; beware! + + + <STRONG>Variable</STRONG> <STRONG>Cap-</STRONG> <STRONG>TCap</STRONG> <STRONG>Description</STRONG> +@@ -1015,13 +1016,15 @@ + set_a_attributes sgr1 sA Define second set of + video attributes + #1-#6 +- set_pglen_inch slengthsL YI Set page length +- to #1 hundredth of +- an inch ++ set_pglen_inch slengthYI Set page length to ++ #1 hundredth of an ++ inch (some implemen- ++ tations use sL for ++ termcap). + + <STRONG>A</STRONG> <STRONG>Sample</STRONG> <STRONG>Entry</STRONG> + The following entry, describing an ANSI-standard terminal, +- is representative of what a <STRONG>terminfo</STRONG> entry for a modern ++ is representative of what a <STRONG>terminfo</STRONG> entry for a modern + terminal typically looks like. + + ansi|ansi/pc-term compatible with color, +@@ -1045,180 +1048,181 @@ + sgr0=\E[0;10m, tbc=\E[2g, u6=\E[%d;%dR, u7=\E[6n, + u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%p1%dd, + +- Entries may continue onto multiple lines by placing white +- space at the beginning of each line except the first. +- Comments may be included on lines beginning with ``#''. ++ Entries may continue onto multiple lines by placing white ++ space at the beginning of each line except the first. ++ Comments may be included on lines beginning with ``#''. + Capabilities in <EM>terminfo</EM> are of three types: Boolean capa- + bilities which indicate that the terminal has some partic- +- ular feature, numeric capabilities giving the size of the +- terminal or the size of particular delays, and string +- capabilities, which give a sequence which can be used to ++ ular feature, numeric capabilities giving the size of the ++ terminal or the size of particular delays, and string ++ capabilities, which give a sequence which can be used to + perform particular terminal operations. + + + <STRONG>Types</STRONG> <STRONG>of</STRONG> <STRONG>Capabilities</STRONG> +- All capabilities have names. For instance, the fact that +- ANSI-standard terminals have <EM>automatic</EM> <EM>margins</EM> (i.e., an +- automatic return and line-feed when the end of a line is +- reached) is indicated by the capability <STRONG>am</STRONG>. Hence the ++ All capabilities have names. For instance, the fact that ++ ANSI-standard terminals have <EM>automatic</EM> <EM>margins</EM> (i.e., an ++ automatic return and line-feed when the end of a line is ++ reached) is indicated by the capability <STRONG>am</STRONG>. Hence the + description of ansi includes <STRONG>am</STRONG>. Numeric capabilities are +- followed by the character `#' and then a positive value. +- Thus <STRONG>cols</STRONG>, which indicates the number of columns the ter- +- minal has, gives the value `80' for ansi. Values for ++ followed by the character `#' and then a positive value. ++ Thus <STRONG>cols</STRONG>, which indicates the number of columns the ter- ++ minal has, gives the value `80' for ansi. Values for + numeric capabilities may be specified in decimal, octal or +- hexadecimal, using the C programming language conventions ++ hexadecimal, using the C programming language conventions + (e.g., 255, 0377 and 0xff or 0xFF). + +- Finally, string valued capabilities, such as <STRONG>el</STRONG> (clear to ++ Finally, string valued capabilities, such as <STRONG>el</STRONG> (clear to + end of line sequence) are given by the two-character code, +- an `=', and then a string ending at the next following ++ an `=', and then a string ending at the next following + `,'. + +- A number of escape sequences are provided in the string ++ A number of escape sequences are provided in the string + valued capabilities for easy encoding of characters there. +- Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character, <STRONG>^x</STRONG> maps to a +- control-x for any appropriate x, and the sequences <STRONG>\n</STRONG> <STRONG>\l</STRONG> +- <STRONG>\r</STRONG> <STRONG>\t</STRONG> <STRONG>\b</STRONG> <STRONG>\f</STRONG> <STRONG>\s</STRONG> give a newline, line-feed, return, tab, ++ Both <STRONG>\E</STRONG> and <STRONG>\e</STRONG> map to an ESCAPE character, <STRONG>^x</STRONG> maps to a ++ control-x for any appropriate x, and the sequences <STRONG>\n</STRONG> <STRONG>\l</STRONG> ++ <STRONG>\r</STRONG> <STRONG>\t</STRONG> <STRONG>\b</STRONG> <STRONG>\f</STRONG> <STRONG>\s</STRONG> give a newline, line-feed, return, tab, + backspace, form-feed, and space. Other escapes include <STRONG>\^</STRONG> +- for <STRONG>^</STRONG>, <STRONG>\\</STRONG> for <STRONG>\</STRONG>, <STRONG>\</STRONG>, for comma, <STRONG>\:</STRONG> for <STRONG>:</STRONG>, and <STRONG>\0</STRONG> for null. +- (<STRONG>\0</STRONG> will produce \200, which does not terminate a string ++ for <STRONG>^</STRONG>, <STRONG>\\</STRONG> for <STRONG>\</STRONG>, <STRONG>\</STRONG>, for comma, <STRONG>\:</STRONG> for <STRONG>:</STRONG>, and <STRONG>\0</STRONG> for null. ++ (<STRONG>\0</STRONG> will produce \200, which does not terminate a string + but behaves as a null character on most terminals, provid- +- ing CS7 is specified. See <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>.) Finally, characters ++ ing CS7 is specified. See <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>.) Finally, characters + may be given as three octal digits after a <STRONG>\</STRONG>. + +- A delay in milliseconds may appear anywhere in a string +- capability, enclosed in $<..> brackets, as in <STRONG>el</STRONG>=\EK$<5>, +- and padding characters are supplied by <EM>tputs</EM> to provide +- this delay. The delay must be a number with at most one ++ A delay in milliseconds may appear anywhere in a string ++ capability, enclosed in $<..> brackets, as in <STRONG>el</STRONG>=\EK$<5>, ++ and padding characters are supplied by <EM>tputs</EM> to provide ++ this delay. The delay must be a number with at most one + decimal place of precision; it may be followed by suffixes +- `*' or '/' or both. A `*' indicates that the padding +- required is proportional to the number of lines affected +- by the operation, and the amount given is the per- +- affected-unit padding required. (In the case of insert ++ `*' or '/' or both. A `*' indicates that the padding ++ required is proportional to the number of lines affected ++ by the operation, and the amount given is the per- ++ affected-unit padding required. (In the case of insert + character, the factor is still the number of <EM>lines</EM> +- affected.) Normally, padding is advisory if the device +- has the <STRONG>xon</STRONG> capability; it is used for cost computation +- but does not trigger delays. A `/' suffix indicates that +- the padding is mandatory and forces a delay of the given +- number of milliseconds even on devices for which <STRONG>xon</STRONG> is ++ affected.) Normally, padding is advisory if the device ++ has the <STRONG>xon</STRONG> capability; it is used for cost computation ++ but does not trigger delays. A `/' suffix indicates that ++ the padding is mandatory and forces a delay of the given ++ number of milliseconds even on devices for which <STRONG>xon</STRONG> is + present to indicate flow control. + +- Sometimes individual capabilities must be commented out. +- To do this, put a period before the capability name. For ++ Sometimes individual capabilities must be commented out. ++ To do this, put a period before the capability name. For + example, see the second <STRONG>ind</STRONG> in the example above. + + + <STRONG>Fetching</STRONG> <STRONG>Compiled</STRONG> <STRONG>Descriptions</STRONG> +- If the environment variable TERMINFO is set, it is inter- +- preted as the pathname of a directory containing the com- ++ If the environment variable TERMINFO is set, it is inter- ++ preted as the pathname of a directory containing the com- + piled description you are working on. Only that directory + is searched. + +- If TERMINFO is not set, the <STRONG>ncurses</STRONG> version of the ter- +- minfo reader code will instead look in the directory +- <STRONG>$HOME/.terminfo</STRONG> for a compiled description. If it fails +- to find one there, and the environment variable TER- +- MINFO_DIRS is set, it will interpret the contents of that +- variable as a list of colon- separated directories to be +- searched (an empty entry is interpreted as a command to +- search <EM>/usr/share/terminfo</EM>). If no description is found +- in any of the TERMINFO_DIRS directories, the fetch fails. ++ If TERMINFO is not set, the <STRONG>ncurses</STRONG> version of the ter- ++ minfo reader code will instead look in the directory ++ <STRONG>$HOME/.terminfo</STRONG> for a compiled description. If it fails ++ to find one there, and the environment variable TER- ++ MINFO_DIRS is set, it will interpret the contents of that ++ variable as a list of colon- separated directories (or ++ database files) to be searched (an empty entry is inter- ++ preted as a command to search <EM>/usr/share/terminfo</EM>). If no ++ description is found in any of the TERMINFO_DIRS directo- ++ ries, the fetch fails. + +- If neither TERMINFO nor TERMINFO_DIRS is set, the last +- place tried will be the system terminfo directory, ++ If neither TERMINFO nor TERMINFO_DIRS is set, the last ++ place tried will be the system terminfo directory, + <EM>/usr/share/terminfo</EM>. + +- (Neither the <STRONG>$HOME/.terminfo</STRONG> lookups nor TERMINFO_DIRS +- extensions are supported under stock System V ter- ++ (Neither the <STRONG>$HOME/.terminfo</STRONG> lookups nor TERMINFO_DIRS ++ extensions are supported under stock System V ter- + minfo/curses.) + + + <STRONG>Preparing</STRONG> <STRONG>Descriptions</STRONG> +- We now outline how to prepare descriptions of terminals. +- The most effective way to prepare a terminal description +- is by imitating the description of a similar terminal in +- <EM>terminfo</EM> and to build up a description gradually, using ++ We now outline how to prepare descriptions of terminals. ++ The most effective way to prepare a terminal description ++ is by imitating the description of a similar terminal in ++ <EM>terminfo</EM> and to build up a description gradually, using + partial descriptions with <EM>vi</EM> or some other screen-oriented +- program to check that they are correct. Be aware that a ++ program to check that they are correct. Be aware that a + very unusual terminal may expose deficiencies in the abil- +- ity of the <EM>terminfo</EM> file to describe it or bugs in the ++ ity of the <EM>terminfo</EM> file to describe it or bugs in the + screen-handling code of the test program. + +- To get the padding for insert line right (if the terminal ++ To get the padding for insert line right (if the terminal + manufacturer did not document it) a severe test is to edit +- a large file at 9600 baud, delete 16 or so lines from the +- middle of the screen, then hit the `u' key several times +- quickly. If the terminal messes up, more padding is usu- +- ally needed. A similar test can be used for insert char- ++ a large file at 9600 baud, delete 16 or so lines from the ++ middle of the screen, then hit the `u' key several times ++ quickly. If the terminal messes up, more padding is usu- ++ ally needed. A similar test can be used for insert char- + acter. + + + <STRONG>Basic</STRONG> <STRONG>Capabilities</STRONG> +- The number of columns on each line for the terminal is +- given by the <STRONG>cols</STRONG> numeric capability. If the terminal is +- a CRT, then the number of lines on the screen is given by ++ The number of columns on each line for the terminal is ++ given by the <STRONG>cols</STRONG> numeric capability. If the terminal is ++ a CRT, then the number of lines on the screen is given by + the <STRONG>lines</STRONG> capability. If the terminal wraps around to the +- beginning of the next line when it reaches the right mar- ++ beginning of the next line when it reaches the right mar- + gin, then it should have the <STRONG>am</STRONG> capability. If the termi- +- nal can clear its screen, leaving the cursor in the home +- position, then this is given by the <STRONG>clear</STRONG> string capabil- +- ity. If the terminal overstrikes (rather than clearing a +- position when a character is struck over) then it should +- have the <STRONG>os</STRONG> capability. If the terminal is a printing +- terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>. +- (<STRONG>os</STRONG> applies to storage scope terminals, such as TEKTRONIX +- 4010 series, as well as hard copy and APL terminals.) If ++ nal can clear its screen, leaving the cursor in the home ++ position, then this is given by the <STRONG>clear</STRONG> string capabil- ++ ity. If the terminal overstrikes (rather than clearing a ++ position when a character is struck over) then it should ++ have the <STRONG>os</STRONG> capability. If the terminal is a printing ++ terminal, with no soft copy unit, give it both <STRONG>hc</STRONG> and <STRONG>os</STRONG>. ++ (<STRONG>os</STRONG> applies to storage scope terminals, such as TEKTRONIX ++ 4010 series, as well as hard copy and APL terminals.) If + there is a code to move the cursor to the left edge of the + current row, give this as <STRONG>cr</STRONG>. (Normally this will be car- +- riage return, control M.) If there is a code to produce ++ riage return, control M.) If there is a code to produce + an audible signal (bell, beep, etc) give this as <STRONG>bel</STRONG>. + +- If there is a code to move the cursor one position to the +- left (such as backspace) that capability should be given +- as <STRONG>cub1</STRONG>. Similarly, codes to move to the right, up, and ++ If there is a code to move the cursor one position to the ++ left (such as backspace) that capability should be given ++ as <STRONG>cub1</STRONG>. Similarly, codes to move to the right, up, and + down should be given as <STRONG>cuf1</STRONG>, <STRONG>cuu1</STRONG>, and <STRONG>cud1</STRONG>. These local +- cursor motions should not alter the text they pass over, +- for example, you would not normally use `<STRONG>cuf1</STRONG>= ' because ++ cursor motions should not alter the text they pass over, ++ for example, you would not normally use `<STRONG>cuf1</STRONG>= ' because + the space would erase the character moved over. + +- A very important point here is that the local cursor +- motions encoded in <EM>terminfo</EM> are undefined at the left and +- top edges of a CRT terminal. Programs should never +- attempt to backspace around the left edge, unless <STRONG>bw</STRONG> is ++ A very important point here is that the local cursor ++ motions encoded in <EM>terminfo</EM> are undefined at the left and ++ top edges of a CRT terminal. Programs should never ++ attempt to backspace around the left edge, unless <STRONG>bw</STRONG> is + given, and never attempt to go up locally off the top. In +- order to scroll text up, a program will go to the bottom ++ order to scroll text up, a program will go to the bottom + left corner of the screen and send the <STRONG>ind</STRONG> (index) string. + + To scroll text down, a program goes to the top left corner +- of the screen and sends the <STRONG>ri</STRONG> (reverse index) string. +- The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG> are undefined when not on their ++ of the screen and sends the <STRONG>ri</STRONG> (reverse index) string. ++ The strings <STRONG>ind</STRONG> and <STRONG>ri</STRONG> are undefined when not on their + respective corners of the screen. + + Parameterized versions of the scrolling sequences are <STRONG>indn</STRONG> + and <STRONG>rin</STRONG> which have the same semantics as <STRONG>ind</STRONG> and <STRONG>ri</STRONG> except +- that they take one parameter, and scroll that many lines. +- They are also undefined except at the appropriate edge of ++ that they take one parameter, and scroll that many lines. ++ They are also undefined except at the appropriate edge of + the screen. + +- The <STRONG>am</STRONG> capability tells whether the cursor sticks at the +- right edge of the screen when text is output, but this ++ The <STRONG>am</STRONG> capability tells whether the cursor sticks at the ++ right edge of the screen when text is output, but this + does not necessarily apply to a <STRONG>cuf1</STRONG> from the last column. +- The only local motion which is defined from the left edge +- is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge will +- move to the right edge of the previous row. If <STRONG>bw</STRONG> is not +- given, the effect is undefined. This is useful for draw- +- ing a box around the edge of the screen, for example. If +- the terminal has switch selectable automatic margins, the +- <EM>terminfo</EM> file usually assumes that this is on; i.e., <STRONG>am</STRONG>. +- If the terminal has a command which moves to the first +- column of the next line, that command can be given as <STRONG>nel</STRONG> +- (newline). It does not matter if the command clears the +- remainder of the current line, so if the terminal has no +- <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to craft a working <STRONG>nel</STRONG> ++ The only local motion which is defined from the left edge ++ is if <STRONG>bw</STRONG> is given, then a <STRONG>cub1</STRONG> from the left edge will ++ move to the right edge of the previous row. If <STRONG>bw</STRONG> is not ++ given, the effect is undefined. This is useful for draw- ++ ing a box around the edge of the screen, for example. If ++ the terminal has switch selectable automatic margins, the ++ <EM>terminfo</EM> file usually assumes that this is on; i.e., <STRONG>am</STRONG>. ++ If the terminal has a command which moves to the first ++ column of the next line, that command can be given as <STRONG>nel</STRONG> ++ (newline). It does not matter if the command clears the ++ remainder of the current line, so if the terminal has no ++ <STRONG>cr</STRONG> and <STRONG>lf</STRONG> it may still be possible to craft a working <STRONG>nel</STRONG> + out of one or both of them. + + These capabilities suffice to describe hard-copy and +- "glass-tty" terminals. Thus the model 33 teletype is ++ "glass-tty" terminals. Thus the model 33 teletype is + described as + + 33|tty33|tty|model 33 teletype, +@@ -1232,21 +1236,21 @@ + + + <STRONG>Parameterized</STRONG> <STRONG>Strings</STRONG> +- Cursor addressing and other strings requiring parameters +- in the terminal are described by a parameterized string +- capability, with <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG> like escapes <STRONG>%x</STRONG> in it. For +- example, to address the cursor, the <STRONG>cup</STRONG> capability is ++ Cursor addressing and other strings requiring parameters ++ in the terminal are described by a parameterized string ++ capability, with <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG> like escapes <STRONG>%x</STRONG> in it. For ++ example, to address the cursor, the <STRONG>cup</STRONG> capability is + given, using two parameters: the row and column to address + to. (Rows and columns are numbered from zero and refer to + the physical screen visible to the user, not to any unseen +- memory.) If the terminal has memory relative cursor ++ memory.) If the terminal has memory relative cursor + addressing, that can be indicated by <STRONG>mrcup</STRONG>. + +- The parameter mechanism uses a stack and special <STRONG>%</STRONG> codes +- to manipulate it. Typically a sequence will push one of +- the parameters onto the stack and then print it in some +- format. Print (e.g., "%d") is a special case. Other +- operations, including "%t" pop their operand from the ++ The parameter mechanism uses a stack and special <STRONG>%</STRONG> codes ++ to manipulate it. Typically a sequence will push one of ++ the parameters onto the stack and then print it in some ++ format. Print (e.g., "%d") is a special case. Other ++ operations, including "%t" pop their operand from the + stack. It is noted that more complex operations are often + necessary, e.g., in the <STRONG>sgr</STRONG> string. + +@@ -1256,8 +1260,8 @@ + %% outputs `%' + + %<EM>[[</EM>:<EM>]flags][width[.precision]][</EM>doxXs<EM>]</EM> +- as in <STRONG>printf</STRONG>, flags are [-+#] and space. Use a `:' +- to allow the next character to be a `-' flag, avoid- ++ as in <STRONG>printf</STRONG>, flags are [-+#] and space. Use a `:' ++ to allow the next character to be a `-' flag, avoid- + ing interpreting "%-" as an operator. + + %c print pop() like %c in <STRONG>printf</STRONG> +@@ -1279,11 +1283,11 @@ + %g[A-Z] + get static variable [a-z] and push it + +- The terms "static" and "dynamic" are misleading. +- Historically, these are simply two different sets of +- variables, whose values are not reset between calls +- to <STRONG>tparm</STRONG>. However, that fact is not documented in +- other implementations. Relying on it will adversely ++ The terms "static" and "dynamic" are misleading. ++ Historically, these are simply two different sets of ++ variables, whose values are not reset between calls ++ to <STRONG>tparm</STRONG>. However, that fact is not documented in ++ other implementations. Relying on it will adversely + impact portability to other implementations. + + %'<EM>c</EM>' char constant <EM>c</EM> +@@ -1307,16 +1311,16 @@ + logical AND and OR operations (for conditionals) + + %! %~ +- unary operations (logical and bit complement): ++ unary operations (logical and bit complement): + push(op pop()) + + %i add 1 to first two parameters (for ANSI terminals) + + %? <EM>expr</EM> %t <EM>thenpart</EM> %e <EM>elsepart</EM> %; +- This forms an if-then-else. The %e <EM>elsepart</EM> is +- optional. Usually the %? <EM>expr</EM> part pushes a value +- onto the stack, and %t pops it from the stack, test- +- ing if it is nonzero (true). If it is zero (false), ++ This forms an if-then-else. The %e <EM>elsepart</EM> is ++ optional. Usually the %? <EM>expr</EM> part pushes a value ++ onto the stack, and %t pops it from the stack, test- ++ ing if it is nonzero (true). If it is zero (false), + control passes to the %e (else) part. + + It is possible to form else-if's a la Algol 68: +@@ -1325,282 +1329,282 @@ + where ci are conditions, bi are bodies. + + Use the <STRONG>-f</STRONG> option of <STRONG>tic</STRONG> or <STRONG>infocmp</STRONG> to see the struc- +- ture of if-then-else's. Some strings, e.g., <STRONG>sgr</STRONG> can ++ ture of if-then-else's. Some strings, e.g., <STRONG>sgr</STRONG> can + be very complicated when written on one line. The <STRONG>-f</STRONG> +- option splits the string into lines with the parts ++ option splits the string into lines with the parts + indented. + + Binary operations are in postfix form with the operands in +- the usual order. That is, to get x-5 one would use +- "%gx%{5}%-". %P and %g variables are persistent across ++ the usual order. That is, to get x-5 one would use ++ "%gx%{5}%-". %P and %g variables are persistent across + escape-string evaluations. + + Consider the HP2645, which, to get to row 3 and column 12, +- needs to be sent \E&a12c03Y padded for 6 milliseconds. +- Note that the order of the rows and columns is inverted +- here, and that the row and column are printed as two dig- ++ needs to be sent \E&a12c03Y padded for 6 milliseconds. ++ Note that the order of the rows and columns is inverted ++ here, and that the row and column are printed as two dig- + its. Thus its <STRONG>cup</STRONG> capability is "cup=6\E&%p2%2dc%p1%2dY". + + The Microterm ACT-IV needs the current row and column sent +- preceded by a <STRONG>^T</STRONG>, with the row and column simply encoded +- in binary, "cup=^T%p1%c%p2%c". Terminals which use "%c" +- need to be able to backspace the cursor (<STRONG>cub1</STRONG>), and to ++ preceded by a <STRONG>^T</STRONG>, with the row and column simply encoded ++ in binary, "cup=^T%p1%c%p2%c". Terminals which use "%c" ++ need to be able to backspace the cursor (<STRONG>cub1</STRONG>), and to + move the cursor up one line on the screen (<STRONG>cuu1</STRONG>). This is +- necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> +- and <STRONG>\r</STRONG>, as the system may change or discard them. (The +- library routines dealing with terminfo set tty modes so ++ necessary because it is not always safe to transmit <STRONG>\n</STRONG> <STRONG>^D</STRONG> ++ and <STRONG>\r</STRONG>, as the system may change or discard them. (The ++ library routines dealing with terminfo set tty modes so + that tabs are never expanded, so \t is safe to send. This + turns out to be essential for the Ann Arbor 4080.) + + A final example is the LSI ADM-3a, which uses row and col- + umn offset by a blank character, thus "cup=\E=%p1%' +- '%+%c%p2%' '%+%c". After sending `\E=', this pushes the +- first parameter, pushes the ASCII value for a space (32), +- adds them (pushing the sum on the stack in place of the +- two previous values) and outputs that value as a charac- +- ter. Then the same is done for the second parameter. ++ '%+%c%p2%' '%+%c". After sending `\E=', this pushes the ++ first parameter, pushes the ASCII value for a space (32), ++ adds them (pushing the sum on the stack in place of the ++ two previous values) and outputs that value as a charac- ++ ter. Then the same is done for the second parameter. + More complex arithmetic is possible using the stack. + + + <STRONG>Cursor</STRONG> <STRONG>Motions</STRONG> + If the terminal has a fast way to home the cursor (to very +- upper left corner of screen) then this can be given as +- <STRONG>home</STRONG>; similarly a fast way of getting to the lower left- +- hand corner can be given as <STRONG>ll</STRONG>; this may involve going up +- with <STRONG>cuu1</STRONG> from the home position, but a program should +- never do this itself (unless <STRONG>ll</STRONG> does) because it can make +- no assumption about the effect of moving up from the home +- position. Note that the home position is the same as ++ upper left corner of screen) then this can be given as ++ <STRONG>home</STRONG>; similarly a fast way of getting to the lower left- ++ hand corner can be given as <STRONG>ll</STRONG>; this may involve going up ++ with <STRONG>cuu1</STRONG> from the home position, but a program should ++ never do this itself (unless <STRONG>ll</STRONG> does) because it can make ++ no assumption about the effect of moving up from the home ++ position. Note that the home position is the same as + addressing to (0,0): to the top left corner of the screen, +- not of memory. (Thus, the \EH sequence on HP terminals ++ not of memory. (Thus, the \EH sequence on HP terminals + cannot be used for <STRONG>home</STRONG>.) + + If the terminal has row or column absolute cursor address- +- ing, these can be given as single parameter capabilities ++ ing, these can be given as single parameter capabilities + <STRONG>hpa</STRONG> (horizontal position absolute) and <STRONG>vpa</STRONG> (vertical posi- + tion absolute). Sometimes these are shorter than the more +- general two parameter sequence (as with the hp2645) and +- can be used in preference to <STRONG>cup</STRONG>. If there are +- parameterized local motions (e.g., move <EM>n</EM> spaces to the +- right) these can be given as <STRONG>cud</STRONG>, <STRONG>cub</STRONG>, <STRONG>cuf</STRONG>, and <STRONG>cuu</STRONG> with a +- single parameter indicating how many spaces to move. +- These are primarily useful if the terminal does not have +- <STRONG>cup</STRONG>, such as the TEKTRONIX 4025. ++ general two parameter sequence (as with the hp2645) and ++ can be used in preference to <STRONG>cup</STRONG>. If there are parameter- ++ ized local motions (e.g., move <EM>n</EM> spaces to the right) ++ these can be given as <STRONG>cud</STRONG>, <STRONG>cub</STRONG>, <STRONG>cuf</STRONG>, and <STRONG>cuu</STRONG> with a single ++ parameter indicating how many spaces to move. These are ++ primarily useful if the terminal does not have <STRONG>cup</STRONG>, such ++ as the TEKTRONIX 4025. + + If the terminal needs to be in a special mode when running + a program that uses these capabilities, the codes to enter +- and exit this mode can be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>. This +- arises, for example, from terminals like the Concept with +- more than one page of memory. If the terminal has only +- memory relative cursor addressing and not screen relative ++ and exit this mode can be given as <STRONG>smcup</STRONG> and <STRONG>rmcup</STRONG>. This ++ arises, for example, from terminals like the Concept with ++ more than one page of memory. If the terminal has only ++ memory relative cursor addressing and not screen relative + cursor addressing, a one screen-sized window must be fixed +- into the terminal for cursor addressing to work properly. ++ into the terminal for cursor addressing to work properly. + This is also used for the TEKTRONIX 4025, where <STRONG>smcup</STRONG> sets +- the command character to be the one used by terminfo. If +- the <STRONG>smcup</STRONG> sequence will not restore the screen after an ++ the command character to be the one used by terminfo. If ++ the <STRONG>smcup</STRONG> sequence will not restore the screen after an + <STRONG>rmcup</STRONG> sequence is output (to the state prior to outputting + <STRONG>rmcup</STRONG>), specify <STRONG>nrrmc</STRONG>. + + + <STRONG>Area</STRONG> <STRONG>Clears</STRONG> + If the terminal can clear from the current position to the +- end of the line, leaving the cursor where it is, this ++ end of the line, leaving the cursor where it is, this + should be given as <STRONG>el</STRONG>. If the terminal can clear from the +- beginning of the line to the current position inclusive, +- leaving the cursor where it is, this should be given as +- <STRONG>el1</STRONG>. If the terminal can clear from the current position +- to the end of the display, then this should be given as +- <STRONG>ed</STRONG>. <STRONG>Ed</STRONG> is only defined from the first column of a line. +- (Thus, it can be simulated by a request to delete a large ++ beginning of the line to the current position inclusive, ++ leaving the cursor where it is, this should be given as ++ <STRONG>el1</STRONG>. If the terminal can clear from the current position ++ to the end of the display, then this should be given as ++ <STRONG>ed</STRONG>. <STRONG>Ed</STRONG> is only defined from the first column of a line. ++ (Thus, it can be simulated by a request to delete a large + number of lines, if a true <STRONG>ed</STRONG> is not available.) + + + <STRONG>Insert/delete</STRONG> <STRONG>line</STRONG> <STRONG>and</STRONG> <STRONG>vertical</STRONG> <STRONG>motions</STRONG> +- If the terminal can open a new blank line before the line +- where the cursor is, this should be given as <STRONG>il1</STRONG>; this is +- done only from the first position of a line. The cursor ++ If the terminal can open a new blank line before the line ++ where the cursor is, this should be given as <STRONG>il1</STRONG>; this is ++ done only from the first position of a line. The cursor + must then appear on the newly blank line. If the terminal +- can delete the line which the cursor is on, then this +- should be given as <STRONG>dl1</STRONG>; this is done only from the first +- position on the line to be deleted. Versions of <STRONG>il1</STRONG> and +- <STRONG>dl1</STRONG> which take a single parameter and insert or delete ++ can delete the line which the cursor is on, then this ++ should be given as <STRONG>dl1</STRONG>; this is done only from the first ++ position on the line to be deleted. Versions of <STRONG>il1</STRONG> and ++ <STRONG>dl1</STRONG> which take a single parameter and insert or delete + that many lines can be given as <STRONG>il</STRONG> and <STRONG>dl</STRONG>. + +- If the terminal has a settable scrolling region (like the +- vt100) the command to set this can be described with the +- <STRONG>csr</STRONG> capability, which takes two parameters: the top and ++ If the terminal has a settable scrolling region (like the ++ vt100) the command to set this can be described with the ++ <STRONG>csr</STRONG> capability, which takes two parameters: the top and + bottom lines of the scrolling region. The cursor position + is, alas, undefined after using this command. + +- It is possible to get the effect of insert or delete line ++ It is possible to get the effect of insert or delete line + using <STRONG>csr</STRONG> on a properly chosen region; the <STRONG>sc</STRONG> and <STRONG>rc</STRONG> (save +- and restore cursor) commands may be useful for ensuring +- that your synthesized insert/delete string does not move +- the cursor. (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library does this +- synthesis automatically, so you need not compose ++ and restore cursor) commands may be useful for ensuring ++ that your synthesized insert/delete string does not move ++ the cursor. (Note that the <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> library does this ++ synthesis automatically, so you need not compose + insert/delete strings for an entry with <STRONG>csr</STRONG>). + + Yet another way to construct insert and delete might be to +- use a combination of index with the memory-lock feature +- found on some terminals (like the HP-700/90 series, which ++ use a combination of index with the memory-lock feature ++ found on some terminals (like the HP-700/90 series, which + however also has insert/delete). + +- Inserting lines at the top or bottom of the screen can +- also be done using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a +- true insert/delete line, and is often faster even on ter- ++ Inserting lines at the top or bottom of the screen can ++ also be done using <STRONG>ri</STRONG> or <STRONG>ind</STRONG> on many terminals without a ++ true insert/delete line, and is often faster even on ter- + minals with those features. + +- The boolean <STRONG>non_dest_scroll_region</STRONG> should be set if each +- scrolling window is effectively a view port on a screen- +- sized canvas. To test for this capability, create a +- scrolling region in the middle of the screen, write some- +- thing to the bottom line, move the cursor to the top of ++ The boolean <STRONG>non_dest_scroll_region</STRONG> should be set if each ++ scrolling window is effectively a view port on a screen- ++ sized canvas. To test for this capability, create a ++ scrolling region in the middle of the screen, write some- ++ thing to the bottom line, move the cursor to the top of + the region, and do <STRONG>ri</STRONG> followed by <STRONG>dl1</STRONG> or <STRONG>ind</STRONG>. If the data +- scrolled off the bottom of the region by the <STRONG>ri</STRONG> re- +- appears, then scrolling is non-destructive. System V and +- XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>, and <STRONG>rin</STRONG> will simu- +- late destructive scrolling; their documentation cautions +- you not to define <STRONG>csr</STRONG> unless this is true. This <STRONG>curses</STRONG> ++ scrolled off the bottom of the region by the <STRONG>ri</STRONG> re- ++ appears, then scrolling is non-destructive. System V and ++ XSI Curses expect that <STRONG>ind</STRONG>, <STRONG>ri</STRONG>, <STRONG>indn</STRONG>, and <STRONG>rin</STRONG> will simu- ++ late destructive scrolling; their documentation cautions ++ you not to define <STRONG>csr</STRONG> unless this is true. This <STRONG>curses</STRONG> + implementation is more liberal and will do explicit erases + after scrolling if <STRONG>ndstr</STRONG> is defined. + + If the terminal has the ability to define a window as part +- of memory, which all commands affect, it should be given ++ of memory, which all commands affect, it should be given + as the parameterized string <STRONG>wind</STRONG>. The four parameters are +- the starting and ending lines in memory and the starting ++ the starting and ending lines in memory and the starting + and ending columns in memory, in that order. + +- If the terminal can retain display memory above, then the +- <STRONG>da</STRONG> capability should be given; if display memory can be +- retained below, then <STRONG>db</STRONG> should be given. These indicate +- that deleting a line or scrolling may bring non-blank +- lines up from below or that scrolling back with <STRONG>ri</STRONG> may ++ If the terminal can retain display memory above, then the ++ <STRONG>da</STRONG> capability should be given; if display memory can be ++ retained below, then <STRONG>db</STRONG> should be given. These indicate ++ that deleting a line or scrolling may bring non-blank ++ lines up from below or that scrolling back with <STRONG>ri</STRONG> may + bring down non-blank lines. + + + <STRONG>Insert/Delete</STRONG> <STRONG>Character</STRONG> +- There are two basic kinds of intelligent terminals with +- respect to insert/delete character which can be described +- using <EM>terminfo.</EM> The most common insert/delete character +- operations affect only the characters on the current line +- and shift characters off the end of the line rigidly. +- Other terminals, such as the Concept 100 and the Perkin +- Elmer Owl, make a distinction between typed and untyped +- blanks on the screen, shifting upon an insert or delete +- only to an untyped blank on the screen which is either +- eliminated, or expanded to two untyped blanks. You can +- determine the kind of terminal you have by clearing the +- screen and then typing text separated by cursor motions. +- Type "abc def" using local cursor motions (not spaces) ++ There are two basic kinds of intelligent terminals with ++ respect to insert/delete character which can be described ++ using <EM>terminfo.</EM> The most common insert/delete character ++ operations affect only the characters on the current line ++ and shift characters off the end of the line rigidly. ++ Other terminals, such as the Concept 100 and the Perkin ++ Elmer Owl, make a distinction between typed and untyped ++ blanks on the screen, shifting upon an insert or delete ++ only to an untyped blank on the screen which is either ++ eliminated, or expanded to two untyped blanks. You can ++ determine the kind of terminal you have by clearing the ++ screen and then typing text separated by cursor motions. ++ Type "abc def" using local cursor motions (not spaces) + between the "abc" and the "def". Then position the cursor +- before the "abc" and put the terminal in insert mode. If +- typing characters causes the rest of the line to shift ++ before the "abc" and put the terminal in insert mode. If ++ typing characters causes the rest of the line to shift + rigidly and characters to fall off the end, then your ter- +- minal does not distinguish between blanks and untyped +- positions. If the "abc" shifts over to the "def" which +- then move together around the end of the current line and +- onto the next as you insert, you have the second type of +- terminal, and should give the capability <STRONG>in</STRONG>, which stands ++ minal does not distinguish between blanks and untyped ++ positions. If the "abc" shifts over to the "def" which ++ then move together around the end of the current line and ++ onto the next as you insert, you have the second type of ++ terminal, and should give the capability <STRONG>in</STRONG>, which stands + for "insert null". While these are two logically separate +- attributes (one line versus multi-line insert mode, and +- special treatment of untyped spaces) we have seen no ter- ++ attributes (one line versus multi-line insert mode, and ++ special treatment of untyped spaces) we have seen no ter- + minals whose insert mode cannot be described with the sin- + gle attribute. + +- Terminfo can describe both terminals which have an insert ++ Terminfo can describe both terminals which have an insert + mode, and terminals which send a simple sequence to open a +- blank position on the current line. Give as <STRONG>smir</STRONG> the +- sequence to get into insert mode. Give as <STRONG>rmir</STRONG> the +- sequence to leave insert mode. Now give as <STRONG>ich1</STRONG> any ++ blank position on the current line. Give as <STRONG>smir</STRONG> the ++ sequence to get into insert mode. Give as <STRONG>rmir</STRONG> the ++ sequence to leave insert mode. Now give as <STRONG>ich1</STRONG> any + sequence needed to be sent just before sending the +- character to be inserted. Most terminals with a true +- insert mode will not give <STRONG>ich1</STRONG>; terminals which send a ++ character to be inserted. Most terminals with a true ++ insert mode will not give <STRONG>ich1</STRONG>; terminals which send a + sequence to open a screen position should give it here. + +- If your terminal has both, insert mode is usually prefer- +- able to <STRONG>ich1</STRONG>. Technically, you should not give both +- unless the terminal actually requires both to be used in +- combination. Accordingly, some non-curses applications +- get confused if both are present; the symptom is doubled ++ If your terminal has both, insert mode is usually prefer- ++ able to <STRONG>ich1</STRONG>. Technically, you should not give both ++ unless the terminal actually requires both to be used in ++ combination. Accordingly, some non-curses applications ++ get confused if both are present; the symptom is doubled + characters in an update using insert. This requirement is + now rare; most <STRONG>ich</STRONG> sequences do not require previous smir, + and most smir insert modes do not require <STRONG>ich1</STRONG> before each +- character. Therefore, the new <STRONG>curses</STRONG> actually assumes +- this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> as ++ character. Therefore, the new <STRONG>curses</STRONG> actually assumes ++ this is the case and uses either <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> or <STRONG>ich</STRONG>/<STRONG>ich1</STRONG> as + appropriate (but not both). If you have to write an entry +- to be used under new curses for a terminal old enough to ++ to be used under new curses for a terminal old enough to + need both, include the <STRONG>rmir</STRONG>/<STRONG>smir</STRONG> sequences in <STRONG>ich1</STRONG>. + + If post insert padding is needed, give this as a number of +- milliseconds in <STRONG>ip</STRONG> (a string option). Any other sequence +- which may need to be sent after an insert of a single ++ milliseconds in <STRONG>ip</STRONG> (a string option). Any other sequence ++ which may need to be sent after an insert of a single + character may also be given in <STRONG>ip</STRONG>. If your terminal needs + both to be placed into an `insert mode' and a special code +- to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> +- and <STRONG>ich1</STRONG> can be given, and both will be used. The <STRONG>ich</STRONG> ++ to precede each inserted character, then both <STRONG>smir</STRONG>/<STRONG>rmir</STRONG> ++ and <STRONG>ich1</STRONG> can be given, and both will be used. The <STRONG>ich</STRONG> + capability, with one parameter, <EM>n</EM>, will repeat the effects + of <STRONG>ich1</STRONG> <EM>n</EM> times. + + If padding is necessary between characters typed while not +- in insert mode, give this as a number of milliseconds ++ in insert mode, give this as a number of milliseconds + padding in <STRONG>rmp</STRONG>. + +- It is occasionally necessary to move around while in +- insert mode to delete characters on the same line (e.g., +- if there is a tab after the insertion position). If your +- terminal allows motion while in insert mode you can give +- the capability <STRONG>mir</STRONG> to speed up inserting in this case. +- Omitting <STRONG>mir</STRONG> will affect only speed. Some terminals ++ It is occasionally necessary to move around while in ++ insert mode to delete characters on the same line (e.g., ++ if there is a tab after the insertion position). If your ++ terminal allows motion while in insert mode you can give ++ the capability <STRONG>mir</STRONG> to speed up inserting in this case. ++ Omitting <STRONG>mir</STRONG> will affect only speed. Some terminals + (notably Datamedia's) must not have <STRONG>mir</STRONG> because of the way + their insert mode works. + +- Finally, you can specify <STRONG>dch1</STRONG> to delete a single charac- +- ter, <STRONG>dch</STRONG> with one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> +- and delete mode by giving <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit +- delete mode (any mode the terminal needs to be placed in ++ Finally, you can specify <STRONG>dch1</STRONG> to delete a single charac- ++ ter, <STRONG>dch</STRONG> with one parameter, <EM>n</EM>, to delete <EM>n</EM> <EM>characters,</EM> ++ and delete mode by giving <STRONG>smdc</STRONG> and <STRONG>rmdc</STRONG> to enter and exit ++ delete mode (any mode the terminal needs to be placed in + for <STRONG>dch1</STRONG> to work). + +- A command to erase <EM>n</EM> characters (equivalent to outputting +- <EM>n</EM> blanks without moving the cursor) can be given as <STRONG>ech</STRONG> ++ A command to erase <EM>n</EM> characters (equivalent to outputting ++ <EM>n</EM> blanks without moving the cursor) can be given as <STRONG>ech</STRONG> + with one parameter. + + + <STRONG>Highlighting,</STRONG> <STRONG>Underlining,</STRONG> <STRONG>and</STRONG> <STRONG>Visible</STRONG> <STRONG>Bells</STRONG> + If your terminal has one or more kinds of display +- attributes, these can be represented in a number of dif- ++ attributes, these can be represented in a number of dif- + ferent ways. You should choose one display form as <EM>stand-</EM> + <EM>out</EM> <EM>mode</EM>, representing a good, high contrast, easy-on-the- +- eyes, format for highlighting error messages and other +- attention getters. (If you have a choice, reverse video +- plus half-bright is good, or reverse video alone.) The +- sequences to enter and exit standout mode are given as +- <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, respectively. If the code to change into +- or out of standout mode leaves one or even two blank +- spaces on the screen, as the TVI 912 and Teleray 1061 do, ++ eyes, format for highlighting error messages and other ++ attention getters. (If you have a choice, reverse video ++ plus half-bright is good, or reverse video alone.) The ++ sequences to enter and exit standout mode are given as ++ <STRONG>smso</STRONG> and <STRONG>rmso</STRONG>, respectively. If the code to change into ++ or out of standout mode leaves one or even two blank ++ spaces on the screen, as the TVI 912 and Teleray 1061 do, + then <STRONG>xmc</STRONG> should be given to tell how many spaces are left. + +- Codes to begin underlining and end underlining can be +- given as <STRONG>smul</STRONG> and <STRONG>rmul</STRONG> respectively. If the terminal has +- a code to underline the current character and move the ++ Codes to begin underlining and end underlining can be ++ given as <STRONG>smul</STRONG> and <STRONG>rmul</STRONG> respectively. If the terminal has ++ a code to underline the current character and move the + cursor one space to the right, such as the Microterm Mime, + this can be given as <STRONG>uc</STRONG>. + +- Other capabilities to enter various highlighting modes +- include <STRONG>blink</STRONG> (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> +- (dim or half-bright) <STRONG>invis</STRONG> (blanking or invisible text) +- <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG> (turn off <EM>all</EM> +- attribute modes) <STRONG>smacs</STRONG> (enter alternate character set +- mode) and <STRONG>rmacs</STRONG> (exit alternate character set mode). +- Turning on any of these modes singly may or may not turn ++ Other capabilities to enter various highlighting modes ++ include <STRONG>blink</STRONG> (blinking) <STRONG>bold</STRONG> (bold or extra bright) <STRONG>dim</STRONG> ++ (dim or half-bright) <STRONG>invis</STRONG> (blanking or invisible text) ++ <STRONG>prot</STRONG> (protected) <STRONG>rev</STRONG> (reverse video) <STRONG>sgr0</STRONG> (turn off <EM>all</EM> ++ attribute modes) <STRONG>smacs</STRONG> (enter alternate character set ++ mode) and <STRONG>rmacs</STRONG> (exit alternate character set mode). ++ Turning on any of these modes singly may or may not turn + off other modes. + +- If there is a sequence to set arbitrary combinations of +- modes, this should be given as <STRONG>sgr</STRONG> (set attributes), tak- +- ing 9 parameters. Each parameter is either 0 or nonzero, ++ If there is a sequence to set arbitrary combinations of ++ modes, this should be given as <STRONG>sgr</STRONG> (set attributes), tak- ++ ing 9 parameters. Each parameter is either 0 or nonzero, + as the corresponding attribute is on or off. The 9 param- +- eters are, in order: standout, underline, reverse, blink, +- dim, bold, blank, protect, alternate character set. Not +- all modes need be supported by <STRONG>sgr</STRONG>, only those for which ++ eters are, in order: standout, underline, reverse, blink, ++ dim, bold, blank, protect, alternate character set. Not ++ all modes need be supported by <STRONG>sgr</STRONG>, only those for which + corresponding separate attribute commands exist. + + For example, the DEC vt220 supports most of the modes: +@@ -1619,22 +1623,22 @@ + p8 protect not used + p9 altcharset ^O (off) ^N (on) + +- We begin each escape sequence by turning off any existing +- modes, since there is no quick way to determine whether ++ We begin each escape sequence by turning off any existing ++ modes, since there is no quick way to determine whether + they are active. Standout is set up to be the combination +- of reverse and bold. The vt220 terminal has a protect +- mode, though it is not commonly used in sgr because it +- protects characters on the screen from the host's era- +- sures. The altcharset mode also is different in that it +- is either ^O or ^N, depending on whether it is off or on. +- If all modes are turned on, the resulting sequence is ++ of reverse and bold. The vt220 terminal has a protect ++ mode, though it is not commonly used in sgr because it ++ protects characters on the screen from the host's era- ++ sures. The altcharset mode also is different in that it ++ is either ^O or ^N, depending on whether it is off or on. ++ If all modes are turned on, the resulting sequence is + \E[0;1;4;5;7;8m^N. + +- Some sequences are common to different modes. For exam- +- ple, ;7 is output when either p1 or p3 is true, that is, ++ Some sequences are common to different modes. For exam- ++ ple, ;7 is output when either p1 or p3 is true, that is, + if either standout or reverse modes are turned on. + +- Writing out the above sequences, along with their depen- ++ Writing out the above sequences, along with their depen- + dencies yields + + +@@ -1644,9 +1648,9 @@ + ;1 if p1 or p6 %?%p1%p6%|%t;1%; + ;4 if p2 %?%p2%|%t;4%; + ;5 if p4 %?%p4%|%t;5%; +- + ;7 if p1 or p3 %?%p1%p3%|%t;7%; + ;8 if p7 %?%p7%|%t;8%; ++ + m always m + ^N or ^O if p9 ^N, else ^O %?%p9%t^N%e^O%; + +@@ -1655,76 +1659,75 @@ + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%; + %?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + +- Remember that if you specify sgr, you must also specify +- sgr0. Also, some implementations rely on sgr being given +- if sgr0 is, Not all terminfo entries necessarily have an +- sgr string, however. Many terminfo entries are derived +- from termcap entries which have no sgr string. The only +- drawback to adding an sgr string is that termcap also +- assumes that sgr0 does not exit alternate character set ++ Remember that if you specify sgr, you must also specify ++ sgr0. Also, some implementations rely on sgr being given ++ if sgr0 is, Not all terminfo entries necessarily have an ++ sgr string, however. Many terminfo entries are derived ++ from termcap entries which have no sgr string. The only ++ drawback to adding an sgr string is that termcap also ++ assumes that sgr0 does not exit alternate character set + mode. + +- Terminals with the ``magic cookie'' glitch (<STRONG>xmc</STRONG>) deposit +- special ``cookies'' when they receive mode-setting +- sequences, which affect the display algorithm rather than +- having extra bits for each character. Some terminals, +- such as the HP 2621, automatically leave standout mode +- when they move to a new line or the cursor is addressed. +- Programs using standout mode should exit standout mode +- before moving the cursor or sending a newline, unless the +- <STRONG>msgr</STRONG> capability, asserting that it is safe to move in ++ Terminals with the ``magic cookie'' glitch (<STRONG>xmc</STRONG>) deposit ++ special ``cookies'' when they receive mode-setting ++ sequences, which affect the display algorithm rather than ++ having extra bits for each character. Some terminals, ++ such as the HP 2621, automatically leave standout mode ++ when they move to a new line or the cursor is addressed. ++ Programs using standout mode should exit standout mode ++ before moving the cursor or sending a newline, unless the ++ <STRONG>msgr</STRONG> capability, asserting that it is safe to move in + standout mode, is present. + +- If the terminal has a way of flashing the screen to indi- +- cate an error quietly (a bell replacement) then this can ++ If the terminal has a way of flashing the screen to indi- ++ cate an error quietly (a bell replacement) then this can + be given as <STRONG>flash</STRONG>; it must not move the cursor. + +- If the cursor needs to be made more visible than normal ++ If the cursor needs to be made more visible than normal + when it is not on the bottom line (to make, for example, a +- non-blinking underline into an easier to find block or ++ non-blinking underline into an easier to find block or + blinking underline) give this sequence as <STRONG>cvvis</STRONG>. If there +- is a way to make the cursor completely invisible, give ++ is a way to make the cursor completely invisible, give + that as <STRONG>civis</STRONG>. The capability <STRONG>cnorm</STRONG> should be given which + undoes the effects of both of these modes. + + If your terminal correctly generates underlined characters +- (with no special codes needed) even though it does not +- overstrike, then you should give the capability <STRONG>ul</STRONG>. If a +- character overstriking another leaves both characters on ++ (with no special codes needed) even though it does not ++ overstrike, then you should give the capability <STRONG>ul</STRONG>. If a ++ character overstriking another leaves both characters on + the screen, specify the capability <STRONG>os</STRONG>. If overstrikes are +- erasable with a blank, then this should be indicated by ++ erasable with a blank, then this should be indicated by + giving <STRONG>eo</STRONG>. + + + <STRONG>Keypad</STRONG> <STRONG>and</STRONG> <STRONG>Function</STRONG> <STRONG>Keys</STRONG> + If the terminal has a keypad that transmits codes when the +- keys are pressed, this information can be given. Note ++ keys are pressed, this information can be given. Note + that it is not possible to handle terminals where the key- + pad only works in local (this applies, for example, to the +- unshifted HP 2621 keys). If the keypad can be set to +- transmit or not transmit, give these codes as <STRONG>smkx</STRONG> and ++ unshifted HP 2621 keys). If the keypad can be set to ++ transmit or not transmit, give these codes as <STRONG>smkx</STRONG> and + <STRONG>rmkx</STRONG>. Otherwise the keypad is assumed to always transmit. +- The codes sent by the left arrow, right arrow, up arrow, +- down arrow, and home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> +- <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG> respectively. If there are func- +- tion keys such as f0, f1, ..., f10, the codes they send +- can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>. If these keys have +- labels other than the default f0 through f10, the labels +- can be given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>. The codes +- transmitted by certain other special keys can be given: +- <STRONG>kll</STRONG> (home down), <STRONG>kbs</STRONG> (backspace), <STRONG>ktbc</STRONG> (clear all tabs), +- <STRONG>kctab</STRONG> (clear the tab stop in this column), <STRONG>kclr</STRONG> (clear +- screen or erase key), <STRONG>kdch1</STRONG> (delete character), <STRONG>kdl1</STRONG> +- (delete line), <STRONG>krmir</STRONG> (exit insert mode), <STRONG>kel</STRONG> (clear to end +- of line), <STRONG>ked</STRONG> (clear to end of screen), <STRONG>kich1</STRONG> (insert +- character or enter insert mode), <STRONG>kil1</STRONG> (insert line), <STRONG>knp</STRONG> +- (next page), <STRONG>kpp</STRONG> (previous page), <STRONG>kind</STRONG> (scroll for- +- ward/down), <STRONG>kri</STRONG> (scroll backward/up), <STRONG>khts</STRONG> (set a tab stop +- in this column). In addition, if the keypad has a 3 by 3 +- array of keys including the four arrow keys, the other +- five keys can be given as <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>, <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>. +- These keys are useful when the effects of a 3 by 3 direc- +- tional pad are needed. ++ The codes sent by the left arrow, right arrow, up arrow, ++ down arrow, and home keys can be given as <STRONG>kcub1,</STRONG> <STRONG>kcuf1,</STRONG> ++ <STRONG>kcuu1,</STRONG> <STRONG>kcud1,</STRONG> and <STRONG>khome</STRONG> respectively. If there are func- ++ tion keys such as f0, f1, ..., f10, the codes they send ++ can be given as <STRONG>kf0,</STRONG> <STRONG>kf1,</STRONG> <STRONG>...,</STRONG> <STRONG>kf10</STRONG>. If these keys have ++ labels other than the default f0 through f10, the labels ++ can be given as <STRONG>lf0,</STRONG> <STRONG>lf1,</STRONG> <STRONG>...,</STRONG> <STRONG>lf10</STRONG>. The codes transmit- ++ ted by certain other special keys can be given: <STRONG>kll</STRONG> (home ++ down), <STRONG>kbs</STRONG> (backspace), <STRONG>ktbc</STRONG> (clear all tabs), <STRONG>kctab</STRONG> ++ (clear the tab stop in this column), <STRONG>kclr</STRONG> (clear screen or ++ erase key), <STRONG>kdch1</STRONG> (delete character), <STRONG>kdl1</STRONG> (delete line), ++ <STRONG>krmir</STRONG> (exit insert mode), <STRONG>kel</STRONG> (clear to end of line), <STRONG>ked</STRONG> ++ (clear to end of screen), <STRONG>kich1</STRONG> (insert character or enter ++ insert mode), <STRONG>kil1</STRONG> (insert line), <STRONG>knp</STRONG> (next page), <STRONG>kpp</STRONG> ++ (previous page), <STRONG>kind</STRONG> (scroll forward/down), <STRONG>kri</STRONG> (scroll ++ backward/up), <STRONG>khts</STRONG> (set a tab stop in this column). In ++ addition, if the keypad has a 3 by 3 array of keys includ- ++ ing the four arrow keys, the other five keys can be given ++ as <STRONG>ka1</STRONG>, <STRONG>ka3</STRONG>, <STRONG>kb2</STRONG>, <STRONG>kc1</STRONG>, and <STRONG>kc3</STRONG>. These keys are useful ++ when the effects of a 3 by 3 directional pad are needed. + + Strings to program function keys can be given as <STRONG>pfkey</STRONG>, + <STRONG>pfloc</STRONG>, and <STRONG>pfx</STRONG>. A string to program screen labels should +@@ -1914,7 +1917,6 @@ + lantern symbol ACS_LANTERN # i + large plus or crossover ACS_PLUS + n + less-than-or-equal-to ACS_LEQUAL < y +- + lower left corner ACS_LLCORNER + m + lower right corner ACS_LRCORNER + j + not-equal ACS_NEQUAL ! | +@@ -1926,6 +1928,7 @@ + solid square block ACS_BLOCK # 0 + tee pointing down ACS_TTEE + w + tee pointing left ACS_RTEE + u ++ + tee pointing right ACS_LTEE + t + tee pointing up ACS_BTEE + v + upper left corner ACS_ULCORNER + l +diff -Naur ncurses-5.9.orig/doc/html/man/tic.1m.html ncurses-5.9/doc/html/man/tic.1m.html +--- ncurses-5.9.orig/doc/html/man/tic.1m.html 2012-08-25 19:57:59.356567819 +0000 ++++ ncurses-5.9/doc/html/man/tic.1m.html 2012-08-25 19:58:00.289896739 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tic.1m,v 1.47 2010/12/04 18:38:55 tom Exp @ ++ * @Id: tic.1m,v 1.53 2011/12/17 23:13:19 tom Exp @ + --> + <HTML> + <HEAD> +@@ -52,84 +52,124 @@ + + </PRE> + <H2>SYNOPSIS</H2><PRE> +- <STRONG>tic</STRONG> [<STRONG>-1CGILNTUVacfgrstx</STRONG>] [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-R</STRONG> <EM>subset</EM>] +- [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM> ++ <STRONG>tic</STRONG> [<STRONG>-01CDGIKLNTUVacfgrstx</STRONG>] [<STRONG>-e</STRONG> <EM>names</EM>] [<STRONG>-o</STRONG> <EM>dir</EM>] [<STRONG>-R</STRONG> <EM>sub-</EM> ++ <EM>set</EM>] [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-w</STRONG>[<EM>n</EM>]] <EM>file</EM> + + + </PRE> + <H2>DESCRIPTION</H2><PRE> +- The command <STRONG>tic</STRONG> translates a <STRONG>terminfo</STRONG> file from source ++ The <STRONG>tic</STRONG> command translates a <STRONG>terminfo</STRONG> file from source + format into compiled format. The compiled format is nec- + essary for use with the library routines in <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>. + +- The results are normally placed in the system terminfo +- directory <STRONG>/usr/share/terminfo</STRONG>. There are two ways to +- change this behavior. +- +- First, you may override the system default by setting the +- variable <STRONG>TERMINFO</STRONG> in your shell environment to a valid +- (existing) directory name. +- +- Secondly, if <STRONG>tic</STRONG> cannot get access to <EM>/usr/share/terminfo</EM> +- or your TERMINFO directory, it looks for the directory +- <EM>$HOME/.terminfo</EM>; if that directory exists, the entry is +- placed there. ++ As described in <STRONG><A HREF="term.5.html">term(5)</A></STRONG>, the database may be either a ++ directory tree (one file per terminal entry) or a hashed ++ database (one record per entry). The <STRONG>tic</STRONG> writes only one ++ type of entry, depending on how it was built: ++ ++ <STRONG>o</STRONG> For directory trees, the top-level directory, e.g., ++ /usr/share/terminfo, specifies the location of the ++ database. ++ ++ <STRONG>o</STRONG> For hashed databases, a filename is needed. If the ++ given file is not found by that name, but can be found ++ by adding the suffix ".db", then that is used. ++ ++ The default name for the hashed database is the same ++ as the default directory name (only adding a ".db" ++ suffix). ++ ++ The results are normally placed in the system terminfo ++ database <STRONG>/usr/share/terminfo</STRONG>. The compiled terminal ++ description can be placed in a different terminfo ++ database. There are two ways to achieve this: ++ ++ <STRONG>o</STRONG> First, you may override the system default by setting ++ the variable <STRONG>TERMINFO</STRONG> in your shell environment to a ++ valid database location, e.g., an existing directory ++ (for directory trees) or valid location for a hashed ++ database. ++ ++ <STRONG>o</STRONG> Secondly, if <STRONG>tic</STRONG> cannot write in <EM>/usr/share/terminfo</EM> ++ or the location specified using your TERMINFO vari- ++ able, it looks for the directory <EM>$HOME/.terminfo</EM> (or ++ hashed database <EM>$HOME/.terminfo.db)</EM>; if that location ++ exists, the entry is placed there. + + Libraries that read terminfo entries are expected to check +- for a TERMINFO directory first, look at <EM>$HOME/.terminfo</EM> if +- TERMINFO is not set, and finally look in <EM>/usr/share/ter-</EM> +- <EM>minfo</EM>. ++ for a location specified with the TERMINFO variable first, ++ look at <EM>$HOME/.terminfo</EM> if TERMINFO is not set, and ++ finally look in <EM>/usr/share/terminfo</EM>. ++ ++ <STRONG>-0</STRONG> restricts the output to a single line + + <STRONG>-1</STRONG> restricts the output to a single column + + <STRONG>-a</STRONG> tells <STRONG>tic</STRONG> to retain commented-out capabilities + rather than discarding them. Capabilities are com- +- mented by prefixing them with a period. This sets +- the <STRONG>-x</STRONG> option, because it treats the commented-out +- entries as user-defined names. If the source is +- termcap, accept the 2-character names required by ++ mented by prefixing them with a period. This sets ++ the <STRONG>-x</STRONG> option, because it treats the commented-out ++ entries as user-defined names. If the source is ++ termcap, accept the 2-character names required by + version 6. Otherwise these are ignored. + +- <STRONG>-C</STRONG> Force source translation to termcap format. Note: +- this differs from the <STRONG>-C</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> in ++ <STRONG>-C</STRONG> Force source translation to termcap format. Note: ++ this differs from the <STRONG>-C</STRONG> option of <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> in + that it does not merely translate capability names, +- but also translates terminfo strings to termcap ++ but also translates terminfo strings to termcap + format. Capabilities that are not translatable are +- left in the entry under their terminfo names but +- commented out with two preceding dots. ++ left in the entry under their terminfo names but ++ commented out with two preceding dots. The actual ++ format used incorporates some improvements for ++ escaped characters from terminfo format. For a ++ stricter BSD-compatible translation, add the <STRONG>-K</STRONG> ++ option. + +- <STRONG>-c</STRONG> tells <STRONG>tic</STRONG> to only check <EM>file</EM> for errors, including +- syntax problems and bad use links. If you specify ++ <STRONG>-c</STRONG> tells <STRONG>tic</STRONG> to only check <EM>file</EM> for errors, including ++ syntax problems and bad use links. If you specify + <STRONG>-C</STRONG> (<STRONG>-I</STRONG>) with this option, the code will print warn- + ings about entries which, after use resolution, are +- more than 1023 (4096) bytes long. Due to a fixed +- buffer length in older termcap libraries (and a +- documented limit in terminfo), these entries may +- cause core dumps. ++ more than 1023 (4096) bytes long. Due to a fixed ++ buffer length in older termcap libraries, as well ++ as buggy checking for the buffer length (and a doc- ++ umented limit in terminfo), these entries may cause ++ core dumps with other implementations. ++ ++ <STRONG>-D</STRONG> tells <STRONG>tic</STRONG> to print the database locations that it ++ knows about, and exit. The first location shown is ++ the one to which it would write compiled terminal ++ descriptions. If <STRONG>tic</STRONG> is not able to find a ++ writable database location according to the rules ++ summarized above, it will print a diagnostic and ++ exit with an error rather than printing a list of ++ database locations. + + <STRONG>-e</STRONG> <EM>names</EM> +- Limit writes and translations to the following +- comma-separated list of terminals. If any name or ++ Limit writes and translations to the following ++ comma-separated list of terminals. If any name or + alias of a terminal matches one of the names in the +- list, the entry will be written or translated as +- normal. Otherwise no output will be generated for ++ list, the entry will be written or translated as ++ normal. Otherwise no output will be generated for + it. The option value is interpreted as a file con- +- taining the list if it contains a '/'. (Note: +- depending on how tic was compiled, this option may ++ taining the list if it contains a '/'. (Note: ++ depending on how tic was compiled, this option may + require <STRONG>-I</STRONG> or <STRONG>-C</STRONG>.) + + <STRONG>-f</STRONG> Display complex terminfo strings which contain +- if/then/else/endif expressions indented for read- ++ if/then/else/endif expressions indented for read- + ability. + +- <STRONG>-G</STRONG> Display constant literals in decimal form rather ++ <STRONG>-G</STRONG> Display constant literals in decimal form rather + than their character equivalents. + +- <STRONG>-g</STRONG> Display constant character literals in quoted form ++ <STRONG>-g</STRONG> Display constant character literals in quoted form + rather than their decimal equivalents. + + <STRONG>-I</STRONG> Force source translation to terminfo format. + ++ <STRONG>-K</STRONG> Suppress some longstanding ncurses extensions to ++ termcap format, e.g., "\s" for space. ++ + <STRONG>-L</STRONG> Force source translation to terminfo format using + the long C variable names listed in <<STRONG>term.h</STRONG>> + +@@ -137,78 +177,79 @@ + from termcap to terminfo, the compiler makes a num- + ber of assumptions about the defaults of string + capabilities <STRONG>reset1_string</STRONG>, <STRONG>carriage_return</STRONG>, <STRONG>cur-</STRONG> +- <STRONG>sor_left</STRONG>, <STRONG>cursor_down</STRONG>, <STRONG>scroll_forward</STRONG>, <STRONG>tab</STRONG>, <STRONG>new-</STRONG> +- <STRONG>line</STRONG>, <STRONG>key_backspace</STRONG>, <STRONG>key_left</STRONG>, and <STRONG>key_down</STRONG>, then +- attempts to use obsolete termcap capabilities to +- deduce correct values. It also normally suppresses +- output of obsolete termcap capabilities such as <STRONG>bs</STRONG>. +- This option forces a more literal translation that +- also preserves the obsolete capabilities. ++ <STRONG>sor_left</STRONG>, <STRONG>cursor_down</STRONG>, <STRONG>scroll_forward</STRONG>, <STRONG>tab</STRONG>, ++ <STRONG>newline</STRONG>, <STRONG>key_backspace</STRONG>, <STRONG>key_left</STRONG>, and <STRONG>key_down</STRONG>, ++ then attempts to use obsolete termcap capabilities ++ to deduce correct values. It also normally sup- ++ presses output of obsolete termcap capabilities ++ such as <STRONG>bs</STRONG>. This option forces a more literal ++ translation that also preserves the obsolete capa- ++ bilities. + +- <STRONG>-o</STRONG><EM>dir</EM> Write compiled entries to given directory. Over- +- rides the TERMINFO environment variable. ++ <STRONG>-o</STRONG><EM>dir</EM> Write compiled entries to given database location. ++ Overrides the TERMINFO environment variable. + + <STRONG>-R</STRONG><EM>subset</EM> +- Restrict output to a given subset. This option is +- for use with archaic versions of terminfo like ++ Restrict output to a given subset. This option is ++ for use with archaic versions of terminfo like + those on SVr1, Ultrix, or HP/UX that do not support +- the full set of SVR4/XSI Curses terminfo; and out- ++ the full set of SVR4/XSI Curses terminfo; and out- + right broken ports like AIX 3.x that have their own +- extensions incompatible with SVr4/XSI. Available ++ extensions incompatible with SVr4/XSI. Available + subsets are "SVr1", "Ultrix", "HP", "BSD" and + "AIX"; see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for details. + +- <STRONG>-r</STRONG> Force entry resolution (so there are no remaining +- tc capabilities) even when doing translation to +- termcap format. This may be needed if you are +- preparing a termcap file for a termcap library +- (such as GNU termcap through version 1.3 or BSD ++ <STRONG>-r</STRONG> Force entry resolution (so there are no remaining ++ tc capabilities) even when doing translation to ++ termcap format. This may be needed if you are ++ preparing a termcap file for a termcap library ++ (such as GNU termcap through version 1.3 or BSD + termcap through 4.3BSD) that does not handle multi- + ple tc capabilities per entry. + +- <STRONG>-s</STRONG> Summarize the compile by showing the directory into +- which entries are written, and the number of +- entries which are compiled. ++ <STRONG>-s</STRONG> Summarize the compile by showing the database loca- ++ tion into which entries are written, and the number ++ of entries which are compiled. + + <STRONG>-T</STRONG> eliminates size-restrictions on the generated text. +- This is mainly useful for testing and analysis, +- since the compiled descriptions are limited (e.g., ++ This is mainly useful for testing and analysis, ++ since the compiled descriptions are limited (e.g., + 1023 for termcap, 4096 for terminfo). + +- <STRONG>-t</STRONG> tells <STRONG>tic</STRONG> to discard commented-out capabilities. ++ <STRONG>-t</STRONG> tells <STRONG>tic</STRONG> to discard commented-out capabilities. + Normally when translating from terminfo to termcap, + untranslatable capabilities are commented-out. + +- <STRONG>-U</STRONG> tells <STRONG>tic</STRONG> to not post-process the data after parsing +- the source file. Normally, it infers data which is +- commonly missing in older terminfo data, or in term- ++ <STRONG>-U</STRONG> tells <STRONG>tic</STRONG> to not post-process the data after parsing ++ the source file. Normally, it infers data which is ++ commonly missing in older terminfo data, or in term- + caps. + + <STRONG>-V</STRONG> reports the version of ncurses which was used in this + program, and exits. + +- <STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan- +- dard error trace information showing <STRONG>tic</STRONG>'s progress. +- The optional parameter <EM>n</EM> is a number from 1 to 10, +- inclusive, indicating the desired level of detail of +- information. If <EM>n</EM> is omitted, the default level is +- 1. If <EM>n</EM> is specified and greater than 1, the level ++ <STRONG>-v</STRONG><EM>n</EM> specifies that (verbose) output be written to stan- ++ dard error trace information showing <STRONG>tic</STRONG>'s progress. ++ The optional parameter <EM>n</EM> is a number from 1 to 10, ++ inclusive, indicating the desired level of detail of ++ information. If <EM>n</EM> is omitted, the default level is ++ 1. If <EM>n</EM> is specified and greater than 1, the level + of detail is increased. + +- <STRONG>-w</STRONG><EM>n</EM> specifies the width of the output. The parameter is ++ <STRONG>-w</STRONG><EM>n</EM> specifies the width of the output. The parameter is + optional. If it is omitted, it defaults to 60. + + <STRONG>-x</STRONG> Treat unknown capabilities as user-defined. That is, +- if you supply a capability name which <STRONG>tic</STRONG> does not ++ if you supply a capability name which <STRONG>tic</STRONG> does not + recognize, it will infer its type (boolean, number or +- string) from the syntax and make an extended table ++ string) from the syntax and make an extended table + entry for that. User-defined capability strings +- whose name begins with ``k'' are treated as function ++ whose name begins with ``k'' are treated as function + keys. + +- <EM>file</EM> contains one or more <STRONG>terminfo</STRONG> terminal descriptions ++ <EM>file</EM> contains one or more <STRONG>terminfo</STRONG> terminal descriptions + in source format [see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>]. Each description +- in the file describes the capabilities of a particu- ++ in the file describes the capabilities of a particu- + lar terminal. + + The debug flag levels are as follows: +@@ -228,73 +269,73 @@ + 9 All values computed in construction of the hash ta- + ble + +- If the debug level <EM>n</EM> is not given, it is taken to be one. ++ If the debug level <EM>n</EM> is not given, it is taken to be one. + + All but one of the capabilities recognized by <STRONG>tic</STRONG> are doc- + umented in <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. The exception is the <STRONG>use</STRONG> capabil- + ity. + +- When a <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM> field is discovered in a terminal +- entry currently being compiled, <STRONG>tic</STRONG> reads in the binary +- from <STRONG>/usr/share/terminfo</STRONG> to complete the entry. (Entries +- created from <EM>file</EM> will be used first. If the environment +- variable <STRONG>TERMINFO</STRONG> is set, that directory is searched +- instead of <STRONG>/usr/share/terminfo</STRONG>.) <STRONG>tic</STRONG> duplicates the capa- +- bilities in <EM>entry</EM>-<EM>name</EM> for the current entry, with the +- exception of those capabilities that explicitly are ++ When a <STRONG>use</STRONG>=<EM>entry</EM>-<EM>name</EM> field is discovered in a terminal ++ entry currently being compiled, <STRONG>tic</STRONG> reads in the binary ++ from <STRONG>/usr/share/terminfo</STRONG> to complete the entry. (Entries ++ created from <EM>file</EM> will be used first. If the environment ++ variable <STRONG>TERMINFO</STRONG> is set, that database location is ++ searched instead of <STRONG>/usr/share/terminfo</STRONG>.) <STRONG>tic</STRONG> duplicates ++ the capabilities in <EM>entry</EM>-<EM>name</EM> for the current entry, with ++ the exception of those capabilities that explicitly are + defined in the current entry. + +- When an entry, e.g., <STRONG>entry_name_1</STRONG>, contains a +- <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM> field, any canceled capabilities in +- <EM>entry</EM>_<EM>name</EM>_<EM>2</EM> must also appear in <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG> ++ When an entry, e.g., <STRONG>entry_name_1</STRONG>, contains a ++ <STRONG>use=</STRONG><EM>entry</EM>_<EM>name</EM>_<EM>2</EM> field, any canceled capabilities in ++ <EM>entry</EM>_<EM>name</EM>_<EM>2</EM> must also appear in <STRONG>entry_name_1</STRONG> before <STRONG>use=</STRONG> + for these capabilities to be canceled in <STRONG>entry_name_1</STRONG>. + +- If the environment variable <STRONG>TERMINFO</STRONG> is set, the compiled ++ If the environment variable <STRONG>TERMINFO</STRONG> is set, the compiled + results are placed there instead of <STRONG>/usr/share/terminfo</STRONG>. + + Total compiled entries cannot exceed 4096 bytes. The name +- field cannot exceed 512 bytes. Terminal names exceeding +- the maximum alias length (32 characters on systems with ++ field cannot exceed 512 bytes. Terminal names exceeding ++ the maximum alias length (32 characters on systems with + long filenames, 14 characters otherwise) will be truncated +- to the maximum alias length and a warning message will be ++ to the maximum alias length and a warning message will be + printed. + + + </PRE> + <H2>COMPATIBILITY</H2><PRE> +- There is some evidence that historic <STRONG>tic</STRONG> implementations +- treated description fields with no whitespace in them as +- additional aliases or short names. This <STRONG>tic</STRONG> does not do +- that, but it does warn when description fields may be +- treated that way and check them for dangerous characters. ++ There is some evidence that historic <STRONG>tic</STRONG> implementations ++ treated description fields with no whitespace in them as ++ additional aliases or short names. This <STRONG>tic</STRONG> does not do ++ that, but it does warn when description fields may be ++ treated that way and check them for dangerous characters. + + + </PRE> + <H2>EXTENSIONS</H2><PRE> + Unlike the stock SVr4 <STRONG>tic</STRONG> command, this implementation can +- actually compile termcap sources. In fact, entries in +- terminfo and termcap syntax can be mixed in a single +- source file. See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for the list of termcap ++ actually compile termcap sources. In fact, entries in ++ terminfo and termcap syntax can be mixed in a single ++ source file. See <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG> for the list of termcap + names taken to be equivalent to terminfo names. + +- The SVr4 manual pages are not clear on the resolution +- rules for <STRONG>use</STRONG> capabilities. This implementation of <STRONG>tic</STRONG> ++ The SVr4 manual pages are not clear on the resolution ++ rules for <STRONG>use</STRONG> capabilities. This implementation of <STRONG>tic</STRONG> + will find <STRONG>use</STRONG> targets anywhere in the source file, or any- +- where in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is +- defined), or in the user's <EM>$HOME/.terminfo</EM> directory (if +- it exists), or (finally) anywhere in the system's file +- tree of compiled entries. ++ where in the file tree rooted at <STRONG>TERMINFO</STRONG> (if <STRONG>TERMINFO</STRONG> is ++ defined), or in the user's <EM>$HOME/.terminfo</EM> database (if it ++ exists), or (finally) anywhere in the system's file tree ++ of compiled entries. + +- The error messages from this <STRONG>tic</STRONG> have the same format as +- GNU C error messages, and can be parsed by GNU Emacs's ++ The error messages from this <STRONG>tic</STRONG> have the same format as ++ GNU C error messages, and can be parsed by GNU Emacs's + compile facility. + +- The <STRONG>-C</STRONG>, <STRONG>-G</STRONG>, <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, <STRONG>-o</STRONG>, <STRONG>-r</STRONG>, +- <STRONG>-s</STRONG>, <STRONG>-t</STRONG> and <STRONG>-x</STRONG> options are not supported under SVr4. The +- SVr4 <STRONG>-c</STRONG> mode does not report bad use links. ++ The <STRONG>-0</STRONG>, <STRONG>-1</STRONG>, <STRONG>-C</STRONG>, <STRONG>-G</STRONG>, <STRONG>-I</STRONG>, <STRONG>-N</STRONG>, <STRONG>-R</STRONG>, <STRONG>-T</STRONG>, <STRONG>-V</STRONG>, <STRONG>-a</STRONG>, <STRONG>-e</STRONG>, <STRONG>-f</STRONG>, <STRONG>-g</STRONG>, ++ <STRONG>-o</STRONG>, <STRONG>-r</STRONG>, <STRONG>-s</STRONG>, <STRONG>-t</STRONG> and <STRONG>-x</STRONG> options are not supported under ++ SVr4. The SVr4 <STRONG>-c</STRONG> mode does not report bad use links. + +- System V does not compile entries to or read entries from +- your <EM>$HOME/.terminfo</EM> directory unless TERMINFO is explic- ++ System V does not compile entries to or read entries from ++ your <EM>$HOME/.terminfo</EM> database unless TERMINFO is explic- + itly set to it. + + +@@ -306,10 +347,10 @@ + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, +- <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. ++ <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>, ++ <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>. <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + </PRE> +diff -Naur ncurses-5.9.orig/doc/html/man/toe.1m.html ncurses-5.9/doc/html/man/toe.1m.html +--- ncurses-5.9.orig/doc/html/man/toe.1m.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/toe.1m.html 2012-08-25 19:58:00.289896739 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: toe.1m,v 1.23 2010/12/04 18:40:45 tom Exp @ ++ * @Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp @ + --> + <HTML> + <HEAD> +@@ -52,7 +52,7 @@ + + </PRE> + <H2>SYNOPSIS</H2><PRE> +- <STRONG>toe</STRONG> [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-ahuUV</STRONG>] <EM>file...</EM> ++ <STRONG>toe</STRONG> [<STRONG>-v</STRONG>[<EM>n</EM>]] [<STRONG>-ahsuUV</STRONG>] <EM>file...</EM> + + + </PRE> +@@ -71,6 +71,14 @@ + ncurses would search, rather than only the first + one that it finds. + ++ If the <STRONG>-s</STRONG> is also given, <STRONG>toe</STRONG> adds a column to the ++ report, showing (like <STRONG><A HREF="conflict.1.html">conflict(1)</A></STRONG>) which entries ++ which belong to a given terminal database. An "*" ++ marks entries which differ, and "+" marks equiva- ++ lent entries. ++ ++ <STRONG>-s</STRONG> sort the output by the entry names. ++ + <STRONG>-u</STRONG> <EM>file</EM> + says to write a report to the standard output, + listing dependencies in the given terminfo/termcap +@@ -111,7 +119,7 @@ + <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>, <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>, + <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/tput.1.html ncurses-5.9/doc/html/man/tput.1.html +--- ncurses-5.9.orig/doc/html/man/tput.1.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/tput.1.html 2012-08-25 19:58:00.289896739 +0000 +@@ -2,7 +2,7 @@ + <!-- + * t + **************************************************************************** +- * Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tput.1,v 1.29 2010/12/04 18:41:07 tom Exp @ ++ * @Id: tput.1,v 1.31 2011/12/25 01:37:53 tom Exp @ + --> + <HTML> + <HEAD> +@@ -319,16 +319,28 @@ + <EM>name</EM> support. Other implementations of <STRONG>tput</STRONG> on SVr4-based + systems such as Solaris, IRIX64 and HPUX as well as others + such as AIX and Tru64 provide support for <EM>capname</EM> +- operands. A few platforms such as FreeBSD and NetBSD rec- +- ognize termcap names rather than terminfo capability names +- in their respective <STRONG>tput</STRONG> commands. ++ operands. ++ ++ A few platforms such as FreeBSD and NetBSD recognize term- ++ cap names rather than terminfo capability names in their ++ respective <STRONG>tput</STRONG> commands. ++ ++ Most implementations which provide support for <EM>capname</EM> ++ operands use the <EM>tparm</EM> function to expand parameters in ++ it. That function expects a mixture of numeric and string ++ parameters, requiring <STRONG>tput</STRONG> to know which type to use. ++ This implementation uses a table to determine that for the ++ standard <EM>capname</EM> operands, and an internal library func- ++ tion to analyze nonstandard <EM>capname</EM> operands. Other ++ implementations may simply guess that an operand contain- ++ ing only digits is intended to be a number. + + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>. ++ <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="curs_termcap.3x.html">curs_termcap(3x)</A></STRONG>. + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/man/tset.1.html ncurses-5.9/doc/html/man/tset.1.html +--- ncurses-5.9.orig/doc/html/man/tset.1.html 2012-08-25 19:57:59.363234455 +0000 ++++ ncurses-5.9/doc/html/man/tset.1.html 2012-08-25 19:58:00.289896739 +0000 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + <!-- + **************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + * sale, use or other dealings in this Software without prior written * + * authorization. * + **************************************************************************** +- * @Id: tset.1,v 1.25 2010/12/04 18:38:55 tom Exp @ ++ * @Id: tset.1,v 1.27 2011/12/17 23:20:35 tom Exp @ + --> + <HTML> + <HEAD> +@@ -116,8 +116,9 @@ + + The options are as follows: + +- <STRONG>-c</STRONG> Set control characters and modes. <STRONG>-e</STRONG> Set the erase +- character to <EM>ch</EM>. ++ <STRONG>-c</STRONG> Set control characters and modes. ++ ++ <STRONG>-e</STRONG> Set the erase character to <EM>ch</EM>. + + <STRONG>-I</STRONG> Do not send the terminal or tab initialization + strings to the terminal. +@@ -126,51 +127,51 @@ + + <STRONG>-k</STRONG> Set the line kill character to <EM>ch</EM>. + +- <STRONG>-m</STRONG> Specify a mapping from a port type to a terminal. ++ <STRONG>-m</STRONG> Specify a mapping from a port type to a terminal. + See the section <STRONG>TERMINAL</STRONG> <STRONG>TYPE</STRONG> <STRONG>MAPPING</STRONG> for more infor- + mation. + +- <STRONG>-Q</STRONG> Do not display any values for the erase, interrupt ++ <STRONG>-Q</STRONG> Do not display any values for the erase, interrupt + and line kill characters. Normally <STRONG>tset</STRONG> displays the +- values for control characters which differ from the ++ values for control characters which differ from the + system's default values. + +- <STRONG>-q</STRONG> The terminal type is displayed to the standard out- +- put, and the terminal is not initialized in any way. ++ <STRONG>-q</STRONG> The terminal type is displayed to the standard out- ++ put, and the terminal is not initialized in any way. + The option `-' by itself is equivalent but archaic. + + <STRONG>-r</STRONG> Print the terminal type to the standard error output. + +- <STRONG>-s</STRONG> Print the sequence of shell commands to initialize ++ <STRONG>-s</STRONG> Print the sequence of shell commands to initialize + the environment variable <STRONG>TERM</STRONG> to the standard output. +- See the section <STRONG>SETTING</STRONG> <STRONG>THE</STRONG> <STRONG>ENVIRONMENT</STRONG> for details. ++ See the section <STRONG>SETTING</STRONG> <STRONG>THE</STRONG> <STRONG>ENVIRONMENT</STRONG> for details. + + <STRONG>-V</STRONG> reports the version of ncurses which was used in this + program, and exits. + +- <STRONG>-w</STRONG> Resize the window to match the size deduced via ++ <STRONG>-w</STRONG> Resize the window to match the size deduced via + <STRONG>setupterm</STRONG>. Normally this has no effect, unless + <STRONG>setupterm</STRONG> is not able to detect the window size. + + The arguments for the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> options may either be +- entered as actual characters or by using the `hat' nota- +- tion, i.e., control-h may be specified as ``^H'' or ++ entered as actual characters or by using the `hat' nota- ++ tion, i.e., control-h may be specified as ``^H'' or + ``^h''. + + + </PRE> + <H2>SETTING THE ENVIRONMENT</H2><PRE> +- It is often desirable to enter the terminal type and +- information about the terminal's capabilities into the ++ It is often desirable to enter the terminal type and ++ information about the terminal's capabilities into the + shell's environment. This is done using the <STRONG>-s</STRONG> option. + + When the <STRONG>-s</STRONG> option is specified, the commands to enter the +- information into the shell's environment are written to +- the standard output. If the <STRONG>SHELL</STRONG> environmental variable ++ information into the shell's environment are written to ++ the standard output. If the <STRONG>SHELL</STRONG> environmental variable + ends in ``csh'', the commands are for <STRONG>csh</STRONG>, otherwise, they +- are for <STRONG>sh</STRONG>. Note, the <STRONG>csh</STRONG> commands set and unset the +- shell variable <STRONG>noglob</STRONG>, leaving it unset. The following +- line in the <STRONG>.login</STRONG> or <STRONG>.profile</STRONG> files will initialize the ++ are for <STRONG>sh</STRONG>. Note, the <STRONG>csh</STRONG> commands set and unset the ++ shell variable <STRONG>noglob</STRONG>, leaving it unset. The following ++ line in the <STRONG>.login</STRONG> or <STRONG>.profile</STRONG> files will initialize the + environment correctly: + + eval `tset -s options ... ` +@@ -180,107 +181,107 @@ + <H2>TERMINAL TYPE MAPPING</H2><PRE> + When the terminal is not hardwired into the system (or the + current system information is incorrect) the terminal type +- derived from the <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental +- variable is often something generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>, +- or <STRONG>unknown</STRONG>. When <STRONG>tset</STRONG> is used in a startup script it is +- often desirable to provide information about the type of ++ derived from the <EM>/etc/ttys</EM> file or the <STRONG>TERM</STRONG> environmental ++ variable is often something generic like <STRONG>network</STRONG>, <STRONG>dialup</STRONG>, ++ or <STRONG>unknown</STRONG>. When <STRONG>tset</STRONG> is used in a startup script it is ++ often desirable to provide information about the type of + terminal used on such ports. + +- The purpose of the <STRONG>-m</STRONG> option is to map from some set of +- conditions to a terminal type, that is, to tell <STRONG>tset</STRONG> ``If +- I'm on this port at a particular speed, guess that I'm on ++ The purpose of the <STRONG>-m</STRONG> option is to map from some set of ++ conditions to a terminal type, that is, to tell <STRONG>tset</STRONG> ``If ++ I'm on this port at a particular speed, guess that I'm on + that kind of terminal''. + + The argument to the <STRONG>-m</STRONG> option consists of an optional port + type, an optional operator, an optional baud rate specifi- + cation, an optional colon (``:'') character and a terminal +- type. The port type is a string (delimited by either the ++ type. The port type is a string (delimited by either the + operator or the colon character). The operator may be any + combination of ``>'', ``<'', ``@'', and ``!''; ``>'' means +- greater than, ``<'' means less than, ``@'' means equal to ++ greater than, ``<'' means less than, ``@'' means equal to + and ``!'' inverts the sense of the test. The baud rate is +- specified as a number and is compared with the speed of +- the standard error output (which should be the control ++ specified as a number and is compared with the speed of ++ the standard error output (which should be the control + terminal). The terminal type is a string. + + If the terminal type is not specified on the command line, +- the <STRONG>-m</STRONG> mappings are applied to the terminal type. If the +- port type and baud rate match the mapping, the terminal +- type specified in the mapping replaces the current type. +- If more than one mapping is specified, the first applica- ++ the <STRONG>-m</STRONG> mappings are applied to the terminal type. If the ++ port type and baud rate match the mapping, the terminal ++ type specified in the mapping replaces the current type. ++ If more than one mapping is specified, the first applica- + ble mapping is used. + +- For example, consider the following mapping: ++ For example, consider the following mapping: + <STRONG>dialup>9600:vt100</STRONG>. The port type is dialup , the operator +- is >, the baud rate specification is 9600, and the termi- ++ is >, the baud rate specification is 9600, and the termi- + nal type is vt100. The result of this mapping is to spec- + ify that if the terminal type is <STRONG>dialup</STRONG>, and the baud rate +- is greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> will ++ is greater than 9600 baud, a terminal type of <STRONG>vt100</STRONG> will + be used. + + If no baud rate is specified, the terminal type will match + any baud rate. If no port type is specified, the terminal +- type will match any port type. For example, <STRONG>-m</STRONG> ++ type will match any port type. For example, <STRONG>-m</STRONG> + <STRONG>dialup:vt100</STRONG> <STRONG>-m</STRONG> <STRONG>:?xterm</STRONG> will cause any dialup port, + regardless of baud rate, to match the terminal type vt100, +- and any non-dialup port type to match the terminal type +- ?xterm. Note, because of the leading question mark, the +- user will be queried on a default port as to whether they ++ and any non-dialup port type to match the terminal type ++ ?xterm. Note, because of the leading question mark, the ++ user will be queried on a default port as to whether they + are actually using an xterm terminal. + +- No whitespace characters are permitted in the <STRONG>-m</STRONG> option +- argument. Also, to avoid problems with meta-characters, +- it is suggested that the entire <STRONG>-m</STRONG> option argument be +- placed within single quote characters, and that <STRONG>csh</STRONG> users +- insert a backslash character (``\'') before any exclama- ++ No whitespace characters are permitted in the <STRONG>-m</STRONG> option ++ argument. Also, to avoid problems with meta-characters, ++ it is suggested that the entire <STRONG>-m</STRONG> option argument be ++ placed within single quote characters, and that <STRONG>csh</STRONG> users ++ insert a backslash character (``\'') before any exclama- + tion marks (``!''). + + + </PRE> + <H2>HISTORY</H2><PRE> +- The <STRONG>tset</STRONG> command appeared in BSD 3.0. The <STRONG>ncurses</STRONG> imple- +- mentation was lightly adapted from the 4.4BSD sources for ++ The <STRONG>tset</STRONG> command appeared in BSD 3.0. The <STRONG>ncurses</STRONG> imple- ++ mentation was lightly adapted from the 4.4BSD sources for + a terminfo environment by Eric S. Raymond <esr@snark.thyr- + sus.com>. + + + </PRE> + <H2>COMPATIBILITY</H2><PRE> +- The <STRONG>tset</STRONG> utility has been provided for backward-compati- +- bility with BSD environments (under most modern UNIXes, +- <STRONG>/etc/inittab</STRONG> and <STRONG><A HREF="getty.1.html">getty(1)</A></STRONG> can set <STRONG>TERM</STRONG> appropriately for +- each dial-up line; this obviates what was <STRONG>tset</STRONG>'s most +- important use). This implementation behaves like 4.4BSD ++ The <STRONG>tset</STRONG> utility has been provided for backward-compati- ++ bility with BSD environments (under most modern UNIXes, ++ <STRONG>/etc/inittab</STRONG> and <STRONG><A HREF="getty.1.html">getty(1)</A></STRONG> can set <STRONG>TERM</STRONG> appropriately for ++ each dial-up line; this obviates what was <STRONG>tset</STRONG>'s most ++ important use). This implementation behaves like 4.4BSD + tset, with a few exceptions specified here. + +- The <STRONG>-S</STRONG> option of BSD tset no longer works; it prints an ++ The <STRONG>-S</STRONG> option of BSD tset no longer works; it prints an + error message to stderr and dies. The <STRONG>-s</STRONG> option only sets +- <STRONG>TERM</STRONG>, not <STRONG>TERMCAP</STRONG>. Both these changes are because the +- <STRONG>TERMCAP</STRONG> variable is no longer supported under terminfo- ++ <STRONG>TERM</STRONG>, not <STRONG>TERMCAP</STRONG>. Both these changes are because the ++ <STRONG>TERMCAP</STRONG> variable is no longer supported under terminfo- + based <STRONG>ncurses</STRONG>, which makes <STRONG>tset</STRONG> <STRONG>-S</STRONG> useless (we made it die + noisily rather than silently induce lossage). + +- There was an undocumented 4.4BSD feature that invoking ++ There was an undocumented 4.4BSD feature that invoking + tset via a link named `TSET` (or via any other name begin- +- ning with an upper-case letter) set the terminal to use ++ ning with an upper-case letter) set the terminal to use + upper-case only. This feature has been omitted. + +- The <STRONG>-A</STRONG>, <STRONG>-E</STRONG>, <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were deleted from the +- <STRONG>tset</STRONG> utility in 4.4BSD. None of them were documented in +- 4.3BSD and all are of limited utility at best. The <STRONG>-a</STRONG>, ++ The <STRONG>-A</STRONG>, <STRONG>-E</STRONG>, <STRONG>-h</STRONG>, <STRONG>-u</STRONG> and <STRONG>-v</STRONG> options were deleted from the ++ <STRONG>tset</STRONG> utility in 4.4BSD. None of them were documented in ++ 4.3BSD and all are of limited utility at best. The <STRONG>-a</STRONG>, + <STRONG>-d</STRONG>, and <STRONG>-p</STRONG> options are similarly not documented or useful, +- but were retained as they appear to be in widespread use. +- It is strongly recommended that any usage of these three +- options be changed to use the <STRONG>-m</STRONG> option instead. The <STRONG>-n</STRONG> +- option remains, but has no effect. The <STRONG>-adnp</STRONG> options are ++ but were retained as they appear to be in widespread use. ++ It is strongly recommended that any usage of these three ++ options be changed to use the <STRONG>-m</STRONG> option instead. The <STRONG>-n</STRONG> ++ option remains, but has no effect. The <STRONG>-adnp</STRONG> options are + therefore omitted from the usage summary above. + +- It is still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> +- options without arguments, although it is strongly recom- +- mended that such usage be fixed to explicitly specify the ++ It is still permissible to specify the <STRONG>-e</STRONG>, <STRONG>-i</STRONG>, and <STRONG>-k</STRONG> ++ options without arguments, although it is strongly recom- ++ mended that such usage be fixed to explicitly specify the + character. + +- As of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies ++ As of 4.4BSD, executing <STRONG>tset</STRONG> as <STRONG>reset</STRONG> no longer implies + the <STRONG>-Q</STRONG> option. Also, the interaction between the - option + and the <EM>terminal</EM> argument in some historic implementations + of <STRONG>tset</STRONG> has been removed. +@@ -294,7 +295,7 @@ + tells <STRONG>tset</STRONG> whether to initialize <STRONG>TERM</STRONG> using <STRONG>sh</STRONG> or <STRONG>csh</STRONG> + syntax. + +- TERM Denotes your terminal type. Each terminal type is ++ TERM Denotes your terminal type. Each terminal type is + distinct, though many are similar. + + TERMCAP +@@ -307,7 +308,7 @@ + </PRE> + <H2>FILES</H2><PRE> + /etc/ttys +- system port name to terminal type mapping database ++ system port name to terminal type mapping database + (BSD versions only). + + /usr/share/terminfo +@@ -316,10 +317,10 @@ + + </PRE> + <H2>SEE ALSO</H2><PRE> +- <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>, <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>, ter- ++ <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>, <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>, <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>, ter- + <STRONG><A HREF="minfo.5.html">minfo(5)</A></STRONG>, <STRONG><A HREF="ttys.5.html">ttys(5)</A></STRONG>, <STRONG><A HREF="environ.7.html">environ(7)</A></STRONG> + +- This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20110404). ++ This describes <STRONG>ncurses</STRONG> version 5.9 (patch 20120107). + + + +diff -Naur ncurses-5.9.orig/doc/html/ncurses-intro.html ncurses-5.9/doc/html/ncurses-intro.html +--- ncurses-5.9.orig/doc/html/ncurses-intro.html 2012-08-25 19:57:59.366567772 +0000 ++++ ncurses-5.9/doc/html/ncurses-intro.html 2012-08-25 19:58:01.293225327 +0000 +@@ -1,8 +1,8 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> + <!-- +- $Id: ncurses-intro.html,v 1.44 2010/12/04 16:46:22 tom Exp $ ++ $Id: ncurses-intro.html,v 1.45 2012/04/28 21:39:17 Paul.Waring Exp $ + **************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -431,6 +431,7 @@ + Here is a sample program to motivate the discussion: + + <PRE> ++#include <stdlib.h> + #include <curses.h> + #include <signal.h> + +diff -Naur ncurses-5.9.orig/doc/ncurses-intro.doc ncurses-5.9/doc/ncurses-intro.doc +--- ncurses-5.9.orig/doc/ncurses-intro.doc 2012-08-25 19:57:59.373234406 +0000 ++++ ncurses-5.9/doc/ncurses-intro.doc 2012-08-25 19:58:01.296558645 +0000 +@@ -333,6 +333,7 @@ + + Here is a sample program to motivate the discussion: + #include <curses.h> ++#include <curses.h> + #include <signal.h> + + static void finish(int sig); +diff -Naur ncurses-5.9.orig/form/Makefile.in ncurses-5.9/form/Makefile.in +--- ncurses-5.9.orig/form/Makefile.in 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/Makefile.in 2012-08-25 19:57:59.963231616 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.53 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.54 2011/08/07 15:46:50 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -102,6 +102,7 @@ + SHLIB_DIRS = -L../lib + SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ + ++RPATH_LIST = @RPATH_LIST@ + MK_SHARED_LIB = @MK_SHARED_LIB@ + + NCURSES_MAJOR = @NCURSES_MAJOR@ +diff -Naur ncurses-5.9.orig/form/fld_arg.c ncurses-5.9/form/fld_arg.c +--- ncurses-5.9.orig/form/fld_arg.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_arg.c 2012-08-25 19:58:01.703223389 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_arg.c,v 1.12 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_arg.c,v 1.13 2012/06/10 00:27:49 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -71,7 +71,7 @@ + + if (typ != 0 && make_arg != (void *)0) + { +- typ->status |= _HAS_ARGS; ++ SetStatus(typ, _HAS_ARGS); + typ->makearg = make_arg; + typ->copyarg = copy_arg; + typ->freearg = free_arg; +diff -Naur ncurses-5.9.orig/form/fld_def.c ncurses-5.9/form/fld_def.c +--- ncurses-5.9.orig/form/fld_def.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_def.c 2012-08-25 19:58:00.973226841 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_def.c,v 1.38 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_def.c,v 1.40 2012/03/11 00:37:16 tom Exp $") + + /* this can't be readonly */ + static FIELD default_field = +@@ -65,8 +65,7 @@ + NCURSES_FIELD_EXTENSION + }; + +-NCURSES_EXPORT_VAR(FIELD *) +-_nc_Default_Field = &default_field; ++NCURSES_EXPORT_VAR(FIELD *) _nc_Default_Field = &default_field; + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -186,10 +185,12 @@ + { + if ((typ->status & _LINKED_TYPE) != 0) + { +- assert(argp != 0); +- _nc_Free_Argument(typ->left, argp->left); +- _nc_Free_Argument(typ->right, argp->right); +- free(argp); ++ if (argp != 0) ++ { ++ _nc_Free_Argument(typ->left, argp->left); ++ _nc_Free_Argument(typ->right, argp->right); ++ free(argp); ++ } + } + else + { +@@ -293,14 +294,14 @@ + { + T((T_CREATE("field %p"), (void *)New_Field)); + *New_Field = default_field; +- New_Field->rows = rows; +- New_Field->cols = cols; ++ New_Field->rows = (short) rows; ++ New_Field->cols = (short) cols; + New_Field->drows = rows + nrow; + New_Field->dcols = cols; +- New_Field->frow = frow; +- New_Field->fcol = fcol; ++ New_Field->frow = (short) frow; ++ New_Field->fcol = (short) fcol; + New_Field->nrow = nrow; +- New_Field->nbuf = nbuf; ++ New_Field->nbuf = (short) nbuf; + New_Field->link = New_Field; + + #if USE_WIDEC_SUPPORT +diff -Naur ncurses-5.9.orig/form/fld_dup.c ncurses-5.9/form/fld_dup.c +--- ncurses-5.9.orig/form/fld_dup.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_dup.c 2012-08-25 19:58:00.973226841 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_dup.c,v 1.13 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_dup.c,v 1.14 2012/03/11 00:37:16 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -60,8 +60,8 @@ + { + T((T_CREATE("field %p"), (void *)New_Field)); + *New_Field = *_nc_Default_Field; +- New_Field->frow = frow; +- New_Field->fcol = fcol; ++ New_Field->frow = (short) frow; ++ New_Field->fcol = (short) fcol; + New_Field->link = New_Field; + New_Field->rows = field->rows; + New_Field->cols = field->cols; +diff -Naur ncurses-5.9.orig/form/fld_ftchoice.c ncurses-5.9/form/fld_ftchoice.c +--- ncurses-5.9.orig/form/fld_ftchoice.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/form/fld_ftchoice.c 2012-08-25 19:58:01.703223389 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_ftchoice.c,v 1.12 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_ftchoice.c,v 1.13 2012/06/10 00:27:49 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -56,7 +56,7 @@ + if (!typ || !next_choice || !prev_choice) + RETURN(E_BAD_ARGUMENT); + +- typ->status |= _HAS_CHOICE; ++ SetStatus(typ, _HAS_CHOICE); + #if NCURSES_INTEROP_FUNCS + typ->enum_next.onext = next_choice; + typ->enum_prev.oprev = prev_choice; +diff -Naur ncurses-5.9.orig/form/fld_ftlink.c ncurses-5.9/form/fld_ftlink.c +--- ncurses-5.9.orig/form/fld_ftlink.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_ftlink.c 2012-08-25 19:58:01.703223389 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_ftlink.c,v 1.14 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_ftlink.c,v 1.15 2012/06/10 00:27:49 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -62,11 +62,11 @@ + { + T((T_CREATE("fieldtype %p"), (void *)nftyp)); + *nftyp = *_nc_Default_FieldType; +- nftyp->status |= _LINKED_TYPE; ++ SetStatus(nftyp, _LINKED_TYPE); + if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS)) +- nftyp->status |= _HAS_ARGS; ++ SetStatus(nftyp, _HAS_ARGS); + if ((type1->status & _HAS_CHOICE) || (type2->status & _HAS_CHOICE)) +- nftyp->status |= _HAS_CHOICE; ++ SetStatus(nftyp, _HAS_CHOICE); + nftyp->left = type1; + nftyp->right = type2; + type1->ref++; +diff -Naur ncurses-5.9.orig/form/fld_just.c ncurses-5.9/form/fld_just.c +--- ncurses-5.9.orig/form/fld_just.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_just.c 2012-08-25 19:58:00.973226841 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_just.c,v 1.12 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_just.c,v 1.13 2012/03/11 00:37:16 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -59,7 +59,7 @@ + Normalize_Field(field); + if (field->just != just) + { +- field->just = just; ++ field->just = (short) just; + res = _nc_Synchronize_Attributes(field); + } + else +diff -Naur ncurses-5.9.orig/form/fld_link.c ncurses-5.9/form/fld_link.c +--- ncurses-5.9.orig/form/fld_link.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_link.c 2012-08-25 19:58:00.976560158 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_link.c,v 1.12 2010/01/23 21:14:35 tom Exp $") ++MODULE_ID("$Id: fld_link.c,v 1.13 2012/03/11 00:37:16 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -61,8 +61,8 @@ + { + T((T_CREATE("field %p"), (void *)New_Field)); + *New_Field = *_nc_Default_Field; +- New_Field->frow = frow; +- New_Field->fcol = fcol; ++ New_Field->frow = (short) frow; ++ New_Field->fcol = (short) fcol; + + New_Field->link = field->link; + field->link = New_Field; +diff -Naur ncurses-5.9.orig/form/fld_max.c ncurses-5.9/form/fld_max.c +--- ncurses-5.9.orig/form/fld_max.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_max.c 2012-08-25 19:58:01.706556707 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_max.c,v 1.10 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fld_max.c,v 1.12 2012/06/10 00:21:24 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -62,13 +62,13 @@ + RETURN(E_BAD_ARGUMENT); + } + field->maxgrow = maxgrow; +- field->status &= ~_MAY_GROW; ++ ClrStatus(field, _MAY_GROW); + if (!(field->opts & O_STATIC)) + { + if ((maxgrow == 0) || + (single_line_field && (field->dcols < maxgrow)) || + (!single_line_field && (field->drows < maxgrow))) +- field->status |= _MAY_GROW; ++ SetStatus(field, _MAY_GROW); + } + } + RETURN(E_OK); +diff -Naur ncurses-5.9.orig/form/fld_move.c ncurses-5.9/form/fld_move.c +--- ncurses-5.9.orig/form/fld_move.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_move.c 2012-08-25 19:58:00.976560158 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_move.c,v 1.10 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fld_move.c,v 1.11 2012/03/11 00:37:16 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -56,8 +56,8 @@ + if (field->form) + RETURN(E_CONNECTED); + +- field->frow = frow; +- field->fcol = fcol; ++ field->frow = (short) frow; ++ field->fcol = (short) fcol; + RETURN(E_OK); + } + +diff -Naur ncurses-5.9.orig/form/fld_page.c ncurses-5.9/form/fld_page.c +--- ncurses-5.9.orig/form/fld_page.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_page.c 2012-08-25 19:58:01.706556707 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_page.c,v 1.10 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fld_page.c,v 1.12 2012/06/10 00:12:47 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -54,9 +54,9 @@ + RETURN(E_CONNECTED); + + if (new_page_flag) +- field->status |= _NEWPAGE; ++ SetStatus(field, _NEWPAGE); + else +- field->status &= ~_NEWPAGE; ++ ClrStatus(field, _NEWPAGE); + + RETURN(E_OK); + } +diff -Naur ncurses-5.9.orig/form/fld_stat.c ncurses-5.9/form/fld_stat.c +--- ncurses-5.9.orig/form/fld_stat.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fld_stat.c 2012-08-25 19:58:01.706556707 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fld_stat.c,v 1.12 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fld_stat.c,v 1.14 2012/06/10 00:13:09 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -51,9 +51,9 @@ + Normalize_Field(field); + + if (status) +- field->status |= _CHANGED; ++ SetStatus(field, _CHANGED); + else +- field->status &= ~_CHANGED; ++ ClrStatus(field, _CHANGED); + + RETURN(E_OK); + } +diff -Naur ncurses-5.9.orig/form/form.priv.h ncurses-5.9/form/form.priv.h +--- ncurses-5.9.orig/form/form.priv.h 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/form.priv.h 2012-08-25 19:58:00.976560158 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,11 +30,11 @@ + * Author: Juergen Pfeifer, 1995,1997 * + ****************************************************************************/ + +-/* $Id: form.priv.h,v 0.32 2009/11/07 21:26:43 tom Exp $ */ ++/* $Id: form.priv.h,v 0.33 2012/03/11 00:37:46 tom Exp $ */ + + #ifndef FORM_PRIV_H + #define FORM_PRIV_H 1 +- ++/* *INDENT-OFF*/ + #include "curses.priv.h" + #include "mf_common.h" + +@@ -119,7 +119,7 @@ + + /* Calculate the total size of all buffers for this field */ + #define Total_Buffer_Size(field) \ +- ( (Buffer_Length(field) + 1) * (1+(field)->nbuf) * sizeof(FIELD_CELL) ) ++ ( (size_t)(Buffer_Length(field) + 1) * (size_t)(1+(field)->nbuf) * sizeof(FIELD_CELL) ) + + /* Logic to determine whether or not a field is single lined */ + #define Single_Line_Field(field) \ +@@ -293,5 +293,6 @@ + result = ((*buffer || (l < width)) ? FALSE : TRUE); \ + } + #endif ++/* *INDENT-ON*/ + + #endif /* FORM_PRIV_H */ +diff -Naur ncurses-5.9.orig/form/frm_def.c ncurses-5.9/form/frm_def.c +--- ncurses-5.9.orig/form/frm_def.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/frm_def.c 2012-08-25 19:58:00.976560158 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_def.c,v 1.25 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: frm_def.c,v 1.26 2012/03/11 00:37:16 tom Exp $") + + /* this can't be readonly */ + static FORM default_form = +@@ -199,14 +199,14 @@ + for (j = 0; j < field_cnt; j++) + { + if (j == 0) +- pg->pmin = j; ++ pg->pmin = (short) j; + else + { + if (fields[j]->status & _NEWPAGE) + { +- pg->pmax = j - 1; ++ pg->pmax = (short) (j - 1); + pg++; +- pg->pmin = j; ++ pg->pmin = (short) j; + } + } + +@@ -214,14 +214,14 @@ + maximum_col_in_field = fields[j]->fcol + fields[j]->cols; + + if (form->rows < maximum_row_in_field) +- form->rows = maximum_row_in_field; ++ form->rows = (short) maximum_row_in_field; + if (form->cols < maximum_col_in_field) +- form->cols = maximum_col_in_field; ++ form->cols = (short) maximum_col_in_field; + } + +- pg->pmax = field_cnt - 1; +- form->maxfield = field_cnt; +- form->maxpage = page_nr; ++ pg->pmax = (short) (field_cnt - 1); ++ form->maxfield = (short) field_cnt; ++ form->maxpage = (short) page_nr; + + /* Sort fields on form pages */ + for (page_nr = 0; page_nr < form->maxpage; page_nr++) +@@ -230,8 +230,8 @@ + + for (j = form->page[page_nr].pmin; j <= form->page[page_nr].pmax; j++) + { +- fields[j]->index = j; +- fields[j]->page = page_nr; ++ fields[j]->index = (short) j; ++ fields[j]->page = (short) page_nr; + fld = Insert_Field_By_Position(fields[j], fld); + } + if (fld) +diff -Naur ncurses-5.9.orig/form/frm_driver.c ncurses-5.9/form/frm_driver.c +--- ncurses-5.9.orig/form/frm_driver.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/frm_driver.c 2012-08-25 19:58:02.019888557 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_driver.c,v 1.98 2010/05/01 21:11:43 tom Exp $") ++MODULE_ID("$Id: frm_driver.c,v 1.102 2012/07/21 23:23:08 tom Exp $") + + /*---------------------------------------------------------------------------- + This is the core module of the form library. It contains the majority +@@ -172,7 +172,7 @@ + instead of a derived window because it contains invisible parts. + This is true for non-public fields and for scrollable fields. */ + #define Has_Invisible_Parts(field) \ +- (!((field)->opts & O_PUBLIC) || \ ++ (!((unsigned)(field)->opts & O_PUBLIC) || \ + Is_Scroll_Field(field)) + + /* Logic to decide whether or not a field needs justification */ +@@ -180,7 +180,7 @@ + (((field)->just != NO_JUSTIFICATION) && \ + (Single_Line_Field(field)) && \ + (((field)->dcols == (field)->cols) && \ +- ((field)->opts & O_STATIC)) ) ++ ((unsigned)(field)->opts & O_STATIC))) + + /* Logic to determine whether or not a dynamic field may still grow */ + #define Growable(field) ((field)->status & _MAY_GROW) +@@ -188,13 +188,13 @@ + /* Macro to set the attributes for a fields window */ + #define Set_Field_Window_Attributes(field,win) \ + ( wbkgdset((win),(chtype)((field)->pad | (field)->back)), \ +- (void) wattrset((win),(field)->fore) ) ++ (void) wattrset((win), (int)(field)->fore) ) + + /* Logic to decide whether or not a field really appears on the form */ + #define Field_Really_Appears(field) \ + ((field->form) &&\ + (field->form->status & _POSTED) &&\ +- (field->opts & O_VISIBLE) &&\ ++ ((unsigned)field->opts & O_VISIBLE) &&\ + (field->page == field->form->curpage)) + + /* Logic to determine whether or not we are on the first position in the +@@ -601,8 +601,8 @@ + { + if (form->status & _WINDOW_MODIFIED) + { +- form->status &= ~_WINDOW_MODIFIED; +- form->status |= _FCHECK_REQUIRED; ++ ClrStatus(form, _WINDOW_MODIFIED); ++ SetStatus(form, _FCHECK_REQUIRED); + Window_To_Buffer(form, form->current); + wmove(form->w, form->currow, form->curcol); + } +@@ -653,7 +653,7 @@ + growth = Minimum(field->maxgrow - field->dcols, growth); + field->dcols += growth; + if (field->dcols == field->maxgrow) +- field->status &= ~_MAY_GROW; ++ ClrStatus(field, _MAY_GROW); + } + else + { +@@ -662,7 +662,7 @@ + growth = Minimum(field->maxgrow - field->drows, growth); + field->drows += growth; + if (field->drows == field->maxgrow) +- field->status &= ~_MAY_GROW; ++ ClrStatus(field, _MAY_GROW); + } + /* drows, dcols changed, so we get really the new buffer length */ + new_buflen = Buffer_Length(field); +@@ -674,7 +674,7 @@ + field->drows = old_drows; + if ((single_line_field && (field->dcols != field->maxgrow)) || + (!single_line_field && (field->drows != field->maxgrow))) +- field->status |= _MAY_GROW; ++ SetStatus(field, _MAY_GROW); + } + else + { +@@ -753,7 +753,7 @@ + (field->dcols != field->maxgrow)) || + (!single_line_field && + (field->drows != field->maxgrow))) +- field->status |= _MAY_GROW; ++ SetStatus(field, _MAY_GROW); + free(newbuf); + } + } +@@ -860,7 +860,7 @@ + field = form->current; + formwin = Get_Form_Window(form); + +- if (field->opts & O_PUBLIC) ++ if ((unsigned)field->opts & O_PUBLIC) + { + if (Is_Scroll_Field(field)) + { +@@ -897,19 +897,19 @@ + if (form->currow < form->toprow) + { + form->toprow = form->currow; +- field->status |= _NEWTOP; ++ SetStatus(field, _NEWTOP); + } + if (form->currow >= row_after_bottom) + { + form->toprow = form->currow - field->rows + 1; +- field->status |= _NEWTOP; ++ SetStatus(field, _NEWTOP); + } + if (field->status & _NEWTOP) + { + /* means we have to copy whole range */ + first_modified_row = form->toprow; + first_unmodified_row = first_modified_row + field->rows; +- field->status &= ~_NEWTOP; ++ ClrStatus(field, _NEWTOP); + } + else + { +@@ -1111,27 +1111,27 @@ + return E_SYSTEM_ERROR; + else + { +- if (field->opts & O_VISIBLE) ++ if ((unsigned)field->opts & O_VISIBLE) + { + Set_Field_Window_Attributes(field, win); + } + else + { +- (void)wattrset(win, WINDOW_ATTRS(fwin)); ++ (void)wattrset(win, (int)WINDOW_ATTRS(fwin)); + } + werase(win); + } + + if (!bEraseFlag) + { +- if (field->opts & O_PUBLIC) ++ if ((unsigned)field->opts & O_PUBLIC) + { + if (Justification_Allowed(field)) + Perform_Justification(field, win); + else + Buffer_To_Window(field, win); + } +- field->status &= ~_NEWTOP; ++ ClrStatus(field, _NEWTOP); + } + wsyncup(win); + delwin(win); +@@ -1170,18 +1170,18 @@ + form->currow = form->curcol = form->toprow = form->begincol = 0; + werase(form->w); + +- if ((field->opts & O_PUBLIC) && Justification_Allowed(field)) ++ if (((unsigned)field->opts & O_PUBLIC) && Justification_Allowed(field)) + Undo_Justification(field, form->w); + else + Buffer_To_Window(field, form->w); + +- field->status |= _NEWTOP; ++ SetStatus(field, _NEWTOP); + res = _nc_Refresh_Current_Field(form); + } + else + res = Display_Field(field); + } +- field->status |= _CHANGED; ++ SetStatus(field, _CHANGED); + return (res); + } + +@@ -1256,7 +1256,7 @@ + werase(form->w); + wmove(form->w, form->currow, form->curcol); + +- if (field->opts & O_PUBLIC) ++ if ((unsigned)field->opts & O_PUBLIC) + { + if (Justification_Allowed(field)) + Undo_Justification(field, form->w); +@@ -1272,7 +1272,7 @@ + field->rows - 1, field->cols - 1, 0); + wsyncup(formwin); + Buffer_To_Window(field, form->w); +- field->status |= _NEWTOP; /* fake refresh to paint all */ ++ SetStatus(field, _NEWTOP); /* fake refresh to paint all */ + _nc_Refresh_Current_Field(form); + } + } +@@ -1326,34 +1326,34 @@ + field->opts = oldopts; + returnCode(E_CURRENT); + } +- if ((form->curpage == field->page)) ++ if (form->curpage == field->page) + { +- if (changed_opts & O_VISIBLE) ++ if ((unsigned)changed_opts & O_VISIBLE) + { +- if (newopts & O_VISIBLE) ++ if ((unsigned)newopts & O_VISIBLE) + res = Display_Field(field); + else + res = Erase_Field(field); + } + else + { +- if ((changed_opts & O_PUBLIC) && +- (newopts & O_VISIBLE)) ++ if (((unsigned)changed_opts & O_PUBLIC) && ++ ((unsigned)newopts & O_VISIBLE)) + res = Display_Field(field); + } + } + } + } + +- if (changed_opts & O_STATIC) ++ if ((unsigned)changed_opts & O_STATIC) + { + bool single_line_field = Single_Line_Field(field); + int res2 = E_OK; + +- if (newopts & O_STATIC) ++ if ((unsigned)newopts & O_STATIC) + { + /* the field becomes now static */ +- field->status &= ~_MAY_GROW; ++ ClrStatus(field, _MAY_GROW); + /* if actually we have no hidden columns, justification may + occur again */ + if (single_line_field && +@@ -1371,7 +1371,7 @@ + (single_line_field && (field->dcols < field->maxgrow)) || + (!single_line_field && (field->drows < field->maxgrow))) + { +- field->status |= _MAY_GROW; ++ SetStatus(field, _MAY_GROW); + /* a field with justification now changes its behavior, + so we must redisplay it */ + if (single_line_field && +@@ -1424,18 +1424,18 @@ + !(form->status & _POSTED)) + { + if ((form->w) && +- (field->opts & O_VISIBLE) && ++ ((unsigned)field->opts & O_VISIBLE) && + (field->form->curpage == field->page)) + { + _nc_Refresh_Current_Field(form); +- if (field->opts & O_PUBLIC) ++ if ((unsigned)field->opts & O_PUBLIC) + { + if (field->drows > field->rows) + { + if (form->toprow == 0) +- field->status &= ~_NEWTOP; ++ ClrStatus(field, _NEWTOP); + else +- field->status |= _NEWTOP; ++ SetStatus(field, _NEWTOP); + } + else + { +@@ -1469,7 +1469,7 @@ + delwin(form->w); + form->w = new_window; + +- form->status &= ~_WINDOW_MODIFIED; ++ ClrStatus(form, _WINDOW_MODIFIED); + Set_Field_Window_Attributes(field, form->w); + + if (Has_Invisible_Parts(field)) +@@ -1998,7 +1998,7 @@ + { + res = fct(form); + if (res == E_OK) +- form->current->status |= _NEWTOP; ++ SetStatus(form, _NEWTOP); + } + return (res); + } +@@ -2430,7 +2430,7 @@ + int result = E_REQUEST_DENIED; + bool Last_Row = ((field->drows - 1) == form->currow); + +- if ((field->opts & O_WRAP) && /* wrapping wanted */ ++ if (((unsigned)field->opts & O_WRAP) && /* wrapping wanted */ + (!Single_Line_Field(field)) && /* must be multi-line */ + (There_Is_No_Room_For_A_Char_In_Line(form)) && /* line is full */ + (!Last_Row || Growable(field))) /* there are more lines */ +@@ -2513,7 +2513,7 @@ + editable fields. + */ + if ((fct == FE_Delete_Previous) && +- (form->opts & O_BS_OVERLOAD) && ++ ((unsigned)form->opts & O_BS_OVERLOAD) && + First_Position_In_Current_Field(form)) + { + res = Inter_Field_Navigation(FN_Previous_Field, form); +@@ -2522,7 +2522,7 @@ + { + if (fct == FE_New_Line) + { +- if ((form->opts & O_NL_OVERLOAD) && ++ if (((unsigned)form->opts & O_NL_OVERLOAD) && + First_Position_In_Current_Field(form)) + { + res = Inter_Field_Navigation(FN_Next_Field, form); +@@ -2534,11 +2534,11 @@ + else + { + /* From now on, everything must be editable */ +- if (form->current->opts & O_EDIT) ++ if ((unsigned)form->current->opts & O_EDIT) + { + res = fct(form); + if (res == E_OK) +- form->status |= _WINDOW_MODIFIED; ++ SetStatus(form, _WINDOW_MODIFIED); + } + } + } +@@ -2571,7 +2571,7 @@ + if (Last_Row && + (!(Growable(field) && !Single_Line_Field(field)))) + { +- if (!(form->opts & O_NL_OVERLOAD)) ++ if (!((unsigned)form->opts & O_NL_OVERLOAD)) + returnCode(E_REQUEST_DENIED); + wmove(form->w, form->currow, form->curcol); + wclrtoeol(form->w); +@@ -2579,7 +2579,7 @@ + handled in the generic routine. The reason is, + that FN_Next_Field may fail, but the form is + definitively changed */ +- form->status |= _WINDOW_MODIFIED; ++ SetStatus(form, _WINDOW_MODIFIED); + returnCode(Inter_Field_Navigation(FN_Next_Field, form)); + } + else +@@ -2595,7 +2595,7 @@ + wclrtoeol(form->w); + form->currow++; + form->curcol = 0; +- form->status |= _WINDOW_MODIFIED; ++ SetStatus(form, _WINDOW_MODIFIED); + returnCode(E_OK); + } + } +@@ -2605,7 +2605,7 @@ + if (Last_Row && + !(Growable(field) && !Single_Line_Field(field))) + { +- if (!(form->opts & O_NL_OVERLOAD)) ++ if (!((unsigned)form->opts & O_NL_OVERLOAD)) + returnCode(E_REQUEST_DENIED); + returnCode(Inter_Field_Navigation(FN_Next_Field, form)); + } +@@ -2627,7 +2627,7 @@ + wmove(form->w, form->currow, form->curcol); + winsertln(form->w); + myADDNSTR(form->w, bp, (int)(t - bp)); +- form->status |= _WINDOW_MODIFIED; ++ SetStatus(form, _WINDOW_MODIFIED); + returnCode(E_OK); + } + } +@@ -2926,7 +2926,7 @@ + EM_Overlay_Mode(FORM *form) + { + T((T_CALLED("EM_Overlay_Mode(%p)"), (void *)form)); +- form->status |= _OVLMODE; ++ SetStatus(form, _OVLMODE); + returnCode(E_OK); + } + +@@ -2942,7 +2942,7 @@ + EM_Insert_Mode(FORM *form) + { + T((T_CALLED("EM_Insert_Mode(%p)"), (void *)form)); +- form->status &= ~_OVLMODE; ++ ClrStatus(form, _OVLMODE); + returnCode(E_OK); + } + +@@ -3111,7 +3111,7 @@ + { + if (typ) + { +- if (field->opts & O_NULLOK) ++ if ((unsigned)field->opts & O_NULLOK) + { + FIELD_CELL *bp = field->buf; + +@@ -3168,12 +3168,12 @@ + + Synchronize_Buffer(form); + if ((form->status & _FCHECK_REQUIRED) || +- (!(field->opts & O_PASSOK))) ++ (!((unsigned)field->opts & O_PASSOK))) + { + if (!Check_Field(form, field->type, field, (TypeArgument *)(field->arg))) + return FALSE; +- form->status &= ~_FCHECK_REQUIRED; +- field->status |= _CHANGED; ++ ClrStatus(form, _FCHECK_REQUIRED); ++ SetStatus(field, _CHANGED); + Synchronize_Linked_Fields(field); + } + return TRUE; +@@ -3273,14 +3273,15 @@ + do + { + field = (field == last_on_page) ? first : field + 1; +- if (((*field)->opts & O_VISIBLE)) ++ if (((unsigned)(*field)->opts & O_VISIBLE)) + break; + } + while (proposed != (*field)); + + proposed = *field; + +- if ((proposed == *last_on_page) && !(proposed->opts & O_VISIBLE)) ++ if ((proposed == *last_on_page) && ++ !((unsigned)proposed->opts & O_VISIBLE)) + { + /* This means, there is also no visible field on the page. + So we propose the first one and hope the very best... +@@ -3816,11 +3817,11 @@ + FIELD *last_field, *field_on_page; + + werase(Get_Form_Window(form)); +- form->curpage = page; ++ form->curpage = (short)page; + last_field = field_on_page = form->field[form->page[page].smin]; + do + { +- if (field_on_page->opts & O_VISIBLE) ++ if ((unsigned)field_on_page->opts & O_VISIBLE) + if ((res = Display_Field(field_on_page)) != E_OK) + return (res); + field_on_page = field_on_page->snext; +@@ -3999,13 +4000,13 @@ + int result = E_REQUEST_DENIED; + + T((T_CALLED("Data_Entry(%p,%s)"), (void *)form, _tracechtype((chtype)c))); +- if ((field->opts & O_EDIT) ++ if (((unsigned)field->opts & O_EDIT) + #if FIX_FORM_INACTIVE_BUG +- && (field->opts & O_ACTIVE) ++ && ((unsigned)field->opts & O_ACTIVE) + #endif + ) + { +- if ((field->opts & O_BLANK) && ++ if (((unsigned)field->opts & O_BLANK) && + First_Position_In_Current_Field(form) && + !(form->status & _FCHECK_REQUIRED) && + !(form->status & _WINDOW_MODIFIED)) +@@ -4035,8 +4036,8 @@ + bool End_Of_Field = (((field->drows - 1) == form->currow) && + ((field->dcols - 1) == form->curcol)); + +- form->status |= _WINDOW_MODIFIED; +- if (End_Of_Field && !Growable(field) && (field->opts & O_AUTOSKIP)) ++ SetStatus(form, _WINDOW_MODIFIED); ++ if (End_Of_Field && !Growable(field) && ((unsigned)field->opts & O_AUTOSKIP)) + result = Inter_Field_Navigation(FN_Next_Field, form); + else + { +@@ -4228,7 +4229,10 @@ + + if ((c >= MIN_FORM_COMMAND && c <= MAX_FORM_COMMAND) && + ((bindings[c - MIN_FORM_COMMAND].keycode & Key_Mask) == c)) +- BI = &(bindings[c - MIN_FORM_COMMAND]); ++ { ++ TR(TRACE_CALLS, ("form_request %s", form_request_name(c))); ++ BI = &(bindings[c - MIN_FORM_COMMAND]); ++ } + + if (BI) + { +@@ -4246,7 +4250,7 @@ + NULL /* Choice Request is generic */ + }; + size_t nMethods = (sizeof(Generic_Methods) / sizeof(Generic_Methods[0])); +- size_t method = (BI->keycode >> ID_Shft) & 0xffff; /* see ID_Mask */ ++ size_t method = (size_t) ((BI->keycode >> ID_Shft) & 0xffff); /* see ID_Mask */ + + if ((method >= nMethods) || !(BI->cmd)) + res = E_SYSTEM_ERROR; +@@ -4255,9 +4259,13 @@ + Generic_Method fct = Generic_Methods[method]; + + if (fct) +- res = fct(BI->cmd, form); ++ { ++ res = fct(BI->cmd, form); ++ } + else +- res = (BI->cmd) (form); ++ { ++ res = (BI->cmd) (form); ++ } + } + } + #ifdef NCURSES_MOUSE_VERSION +@@ -4401,14 +4409,14 @@ + if (!field || !value || ((buffer < 0) || (buffer > field->nbuf))) + RETURN(E_BAD_ARGUMENT); + +- len = Buffer_Length(field); ++ len = (unsigned)Buffer_Length(field); + + if (Growable(field)) + { + /* for a growable field we must assume zero terminated strings, because + somehow we have to detect the length of what should be copied. + */ +- unsigned int vlen = strlen(value); ++ unsigned vlen = (unsigned)strlen(value); + + if (vlen > len) + { +@@ -4438,7 +4446,7 @@ + delwin(field->working); + field->working = newpad(1, Buffer_Length(field) + 1); + } +- len = Buffer_Length(field); ++ len = (unsigned)Buffer_Length(field); + wclear(field->working); + (void)mvwaddstr(field->working, 0, 0, value); + +@@ -4450,8 +4458,8 @@ + { + for (i = 0; i < (unsigned)field->drows; ++i) + { +- (void)mvwin_wchnstr(field->working, 0, i * field->dcols, +- widevalue + (i * field->dcols), ++ (void)mvwin_wchnstr(field->working, 0, (int)i * field->dcols, ++ widevalue + ((int)i * field->dcols), + field->dcols); + } + for (i = 0; i < len; ++i) +@@ -4512,7 +4520,7 @@ + { + #if USE_WIDEC_SUPPORT + FIELD_CELL *data = Address_Of_Nth_Buffer(field, buffer); +- unsigned need = 0; ++ size_t need = 0; + int size = Buffer_Length(field); + int n; + +@@ -4613,7 +4621,7 @@ + { + result[need] = wch; + } +- passed += status; ++ passed += (size_t) status; + ++need; + } + else +@@ -4633,7 +4641,7 @@ + break; + result = typeCalloc(wchar_t, need); + +- *lengthp = need; ++ *lengthp = (int)need; + if (result == 0) + break; + } +diff -Naur ncurses-5.9.orig/form/frm_hook.c ncurses-5.9/form/frm_hook.c +--- ncurses-5.9.orig/form/frm_hook.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/frm_hook.c 2012-08-25 19:58:00.979893475 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,13 +32,13 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_hook.c,v 1.15 2010/01/23 21:12:08 tom Exp $") ++MODULE_ID("$Id: frm_hook.c,v 1.16 2012/03/11 00:37:16 tom Exp $") + + /* "Template" macro to generate function to set application specific hook */ + #define GEN_HOOK_SET_FUNCTION( typ, name ) \ + NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook func)\ + {\ +- T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), form, func));\ ++ T((T_CALLED("set_" #typ"_"#name"(%p,%p)"), (void *) form, func));\ + (Normalize_Form( form ) -> typ ## name) = func ;\ + RETURN(E_OK);\ + } +diff -Naur ncurses-5.9.orig/form/frm_opts.c ncurses-5.9/form/frm_opts.c +--- ncurses-5.9.orig/form/frm_opts.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/frm_opts.c 2012-08-25 19:58:01.713223341 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_opts.c,v 1.15 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: frm_opts.c,v 1.16 2012/06/09 20:29:33 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -49,7 +49,7 @@ + { + T((T_CALLED("set_form_opts(%p,%d)"), (void *)form, opts)); + +- opts &= ALL_FORM_OPTS; ++ opts &= (Form_Options) ALL_FORM_OPTS; + if (opts & ~ALL_FORM_OPTS) + RETURN(E_BAD_ARGUMENT); + else +@@ -89,7 +89,7 @@ + { + T((T_CALLED("form_opts_on(%p,%d)"), (void *)form, opts)); + +- opts &= ALL_FORM_OPTS; ++ opts &= (Form_Options) ALL_FORM_OPTS; + if (opts & ~ALL_FORM_OPTS) + RETURN(E_BAD_ARGUMENT); + else +@@ -114,7 +114,7 @@ + { + T((T_CALLED("form_opts_off(%p,%d)"), (void *)form, opts)); + +- opts &= ALL_FORM_OPTS; ++ opts &= (Form_Options) ALL_FORM_OPTS; + if (opts & ~ALL_FORM_OPTS) + RETURN(E_BAD_ARGUMENT); + else +diff -Naur ncurses-5.9.orig/form/frm_page.c ncurses-5.9/form/frm_page.c +--- ncurses-5.9.orig/form/frm_page.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/form/frm_page.c 2012-08-25 19:58:01.716556658 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_page.c,v 1.11 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: frm_page.c,v 1.12 2012/06/10 00:28:04 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -58,7 +58,7 @@ + + if (!(form->status & _POSTED)) + { +- form->curpage = page; ++ form->curpage = (short)page; + form->current = _nc_First_Active_Field(form); + } + else +diff -Naur ncurses-5.9.orig/form/frm_post.c ncurses-5.9/form/frm_post.c +--- ncurses-5.9.orig/form/frm_post.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/frm_post.c 2012-08-25 19:58:01.716556658 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_post.c,v 1.10 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: frm_post.c,v 1.11 2012/06/10 00:27:49 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnform +@@ -77,7 +77,7 @@ + if ((err = _nc_Set_Form_Page(form, page, form->current)) != E_OK) + RETURN(err); + +- form->status |= _POSTED; ++ SetStatus(form, _POSTED); + + Call_Hook(form, forminit); + Call_Hook(form, fieldinit); +@@ -117,7 +117,7 @@ + werase(Get_Form_Window(form)); + delwin(form->w); + form->w = (WINDOW *)0; +- form->status &= ~_POSTED; ++ ClrStatus(form, _POSTED); + RETURN(E_OK); + } + +diff -Naur ncurses-5.9.orig/form/frm_req_name.c ncurses-5.9/form/frm_req_name.c +--- ncurses-5.9.orig/form/frm_req_name.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/form/frm_req_name.c 2012-08-25 19:58:02.023221875 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: frm_req_name.c,v 1.17 2009/10/10 16:17:01 tom Exp $") ++MODULE_ID("$Id: frm_req_name.c,v 1.18 2012/07/21 23:17:23 tom Exp $") + + static const char *request_names[MAX_FORM_COMMAND - MIN_FORM_COMMAND + 1] = + { +@@ -144,23 +144,26 @@ + /* because the table is so small, it doesn't really hurt + to run sequentially through it. + */ +- unsigned int i = 0; +- char buf[16]; ++ size_t i = 0; ++ char buf[16]; /* longest name is 10 chars */ + + T((T_CALLED("form_request_by_name(%s)"), _nc_visbuf(str))); + +- if (str) ++ if (str != 0 && (i = strlen(str)) != 0) + { +- strncpy(buf, str, sizeof(buf)); +- while ((i < sizeof(buf)) && (buf[i] != '\0')) ++ if (i > sizeof(buf) - 2) ++ i = sizeof(buf) - 2; ++ memcpy(buf, str, i); ++ buf[i] = '\0'; ++ ++ for (i = 0; buf[i] != '\0'; ++i) + { + buf[i] = (char)toupper(UChar(buf[i])); +- i++; + } + + for (i = 0; i < A_SIZE; i++) + { +- if (strncmp(request_names[i], buf, sizeof(buf)) == 0) ++ if (strcmp(request_names[i], buf) == 0) + returnCode(MIN_FORM_COMMAND + (int)i); + } + } +diff -Naur ncurses-5.9.orig/form/fty_generic.c ncurses-5.9/form/fty_generic.c +--- ncurses-5.9.orig/form/fty_generic.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fty_generic.c 2012-08-25 19:58:01.716556658 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fty_generic.c,v 1.5 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fty_generic.c,v 1.6 2012/06/10 00:27:49 tom Exp $") + + /* + * This is not a full implementation of a field type, but adds some +@@ -119,7 +119,7 @@ + if (res) + { + *res = *_nc_Default_FieldType; +- res->status |= (_HAS_ARGS | _GENERIC); ++ SetStatus(res, (_HAS_ARGS | _GENERIC)); + res->fieldcheck.gfcheck = field_check; + res->charcheck.gccheck = char_check; + res->genericarg = Generic_This_Type; +diff -Naur ncurses-5.9.orig/form/fty_int.c ncurses-5.9/form/fty_int.c +--- ncurses-5.9.orig/form/fty_int.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/form/fty_int.c 2012-08-25 19:58:00.906560490 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fty_int.c,v 1.25 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fty_int.c,v 1.26 2012/02/23 10:02:15 tom Exp $") + + #if USE_WIDEC_SUPPORT + #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c))) +@@ -233,7 +233,8 @@ + } + if (result) + { +- sprintf(buf, "%.*ld", (prec > 0 ? prec : 0), val); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%.*ld", (prec > 0 ? prec : 0), val); + set_field_buffer(field, 0, buf); + } + } +diff -Naur ncurses-5.9.orig/form/fty_num.c ncurses-5.9/form/fty_num.c +--- ncurses-5.9.orig/form/fty_num.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/form/fty_num.c 2012-08-25 19:58:00.906560490 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + + #include "form.priv.h" + +-MODULE_ID("$Id: fty_num.c,v 1.28 2010/01/23 21:14:36 tom Exp $") ++MODULE_ID("$Id: fty_num.c,v 1.29 2012/02/23 10:02:15 tom Exp $") + + #if HAVE_LOCALE_H + #include <locale.h> +@@ -271,7 +271,8 @@ + } + if (result) + { +- sprintf(buf, "%.*f", (prec > 0 ? prec : 0), val); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%.*f", (prec > 0 ? prec : 0), val); + set_field_buffer(field, 0, buf); + } + } +diff -Naur ncurses-5.9.orig/include/Caps ncurses-5.9/include/Caps +--- ncurses-5.9.orig/include/Caps 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/Caps 2012-08-25 19:57:59.973231570 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -29,7 +29,7 @@ + # Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 + # and: Eric S. Raymond <esr@snark.thyrsus.com> + # +-# $Id: Caps,v 1.37 2010/12/04 18:47:13 tom Exp $ ++# $Id: Caps,v 1.38 2011/10/15 23:10:18 tom Exp $ + # + # This is the master termcap/terminfo capability table. + # +@@ -738,11 +738,13 @@ + #%.ad + #% + #%.in .8i +-#%The XSI Curses standard added these. They are some post-4.1 +-#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x. +-#%The \fBncurses\fR termcap names for them are invented; according to the +-#%XSI Curses standard, they have no termcap names. If your compiled terminfo +-#%entries use these, they may not be binary-compatible with System V terminfo ++#%The XSI Curses standard added these hardcopy capabilities. ++#%They were used in some post-4.1 versions of System V curses, ++#%e.g., Solaris 2.5 and IRIX 6.x. ++#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented. ++#%According to the XSI Curses standard, they have no termcap names. ++#%If your compiled terminfo entries use these, ++#%they may not be binary-compatible with System V terminfo + #%entries after SVr4.1; beware! + #% + #%.na +@@ -760,7 +762,7 @@ + enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode + enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode + set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6 +-set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch ++set_pglen_inch slength str YI - - ----- Set page length to #1 hundredth of an inch (some implementations use sL for termcap). + #%.TE + #%.ad + # +diff -Naur ncurses-5.9.orig/include/Caps.aix4 ncurses-5.9/include/Caps.aix4 +--- ncurses-5.9.orig/include/Caps.aix4 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/Caps.aix4 2012-08-25 19:57:59.973231570 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 2001-2006,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Thomas Dickey + # +-# $Id: Caps.aix4,v 1.8 2010/12/04 18:47:13 tom Exp $ ++# $Id: Caps.aix4,v 1.9 2011/10/15 23:19:16 tom Exp $ + # + # This is an adaptation of ncurses' termcap/terminfo capability table, which + # is designed to align with AIX 4.x's terminfo. +@@ -840,11 +840,13 @@ + #%.ad + #% + #%.in .8i +-#%The XSI Curses standard added these. They are some post-4.1 +-#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x. +-#%The \fBncurses\fR termcap names for them are invented; according to the +-#%XSI Curses standard, they have no termcap names. If your compiled terminfo +-#%entries use these, they may not be binary-compatible with System V terminfo ++#%The XSI Curses standard added these hardcopy capabilities. ++#%They were used in some post-4.1 versions of System V curses, ++#%e.g., Solaris 2.5 and IRIX 6.x. ++#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented. ++#%According to the XSI Curses standard, they have no termcap names. ++#%If your compiled terminfo entries use these, ++#%they may not be binary-compatible with System V terminfo + #%entries after SVr4.1; beware! + #% + #%.na +@@ -862,7 +864,7 @@ + enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode + enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode + set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6 +-set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch ++set_pglen_inch slength str YI - - ----- Set page length to #1 hundredth of an inch (some implementations use sL for termcap). + #%.TE + #%.ad + # +diff -Naur ncurses-5.9.orig/include/Caps.hpux11 ncurses-5.9/include/Caps.hpux11 +--- ncurses-5.9.orig/include/Caps.hpux11 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/Caps.hpux11 2012-08-25 19:57:59.976564888 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 2002-2006,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2002-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Thomas Dickey + # +-# $Id: Caps.hpux11,v 1.5 2010/12/04 18:47:13 tom Exp $ ++# $Id: Caps.hpux11,v 1.6 2011/10/15 23:20:04 tom Exp $ + # + # This is an adaptation of ncurses' termcap/terminfo capability table, which + # is designed to align with HPUX 11.x's terminfo. +@@ -746,11 +746,13 @@ + #%.ad + #% + #%.in .8i +-#%The XSI Curses standard added these. They are some post-4.1 +-#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x. +-#%The \fBncurses\fR termcap names for them are invented; according to the +-#%XSI Curses standard, they have no termcap names. If your compiled terminfo +-#%entries use these, they may not be binary-compatible with System V terminfo ++#%The XSI Curses standard added these hardcopy capabilities. ++#%They were used in some post-4.1 versions of System V curses, ++#%e.g., Solaris 2.5 and IRIX 6.x. ++#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented. ++#%According to the XSI Curses standard, they have no termcap names. ++#%If your compiled terminfo entries use these, ++#%they may not be binary-compatible with System V terminfo + #%entries after SVr4.1; beware! + #% + #%.na +@@ -761,7 +763,7 @@ + #%lw25 lw6 lw2 lw20. + #%\fBVariable Cap- TCap Description\fR + #%\fBString name Code\fR +-set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch ++set_pglen_inch slength str YI - - ----- Set page length to #1 hundredth of an inch (some implementations use sL for termcap). + enter_horizontal_hl_mode ehhlm str Xh - - ----- Enter horizontal highlight mode + enter_left_hl_mode elhlm str Xl - - ----- Enter left highlight mode + enter_low_hl_mode elohlm str Xo - - ----- Enter low highlight mode +diff -Naur ncurses-5.9.orig/include/Caps.keys ncurses-5.9/include/Caps.keys +--- ncurses-5.9.orig/include/Caps.keys 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/Caps.keys 2012-08-25 19:57:59.979898205 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 2001-2006,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -29,7 +29,7 @@ + # Author: Thomas Dickey + # and: Ilya Zakharevich + # +-# $Id: Caps.keys,v 1.4 2010/12/04 18:47:13 tom Exp $ ++# $Id: Caps.keys,v 1.5 2011/10/15 23:19:52 tom Exp $ + # + # This is an adaptation of ncurses' termcap/terminfo capability table, which + # is illustrates an experimental extension to describe alt-, shift- and +@@ -828,11 +828,13 @@ + #%.ad + #% + #%.in .8i +-#%The XSI Curses standard added these. They are some post-4.1 +-#%versions of System V curses, e.g., Solaris 2.5 and IRIX 6.x. +-#%The \fBncurses\fR termcap names for them are invented; according to the +-#%XSI Curses standard, they have no termcap names. If your compiled terminfo +-#%entries use these, they may not be binary-compatible with System V terminfo ++#%The XSI Curses standard added these hardcopy capabilities. ++#%They were used in some post-4.1 versions of System V curses, ++#%e.g., Solaris 2.5 and IRIX 6.x. ++#%Except for \fBYI\fP, the \fBncurses\fR termcap names for them are invented. ++#%According to the XSI Curses standard, they have no termcap names. ++#%If your compiled terminfo entries use these, ++#%they may not be binary-compatible with System V terminfo + #%entries after SVr4.1; beware! + #% + #%.na +@@ -850,7 +852,7 @@ + enter_top_hl_mode ethlm str Xt - - ----- Enter top highlight mode + enter_vertical_hl_mode evhlm str Xv - - ----- Enter vertical highlight mode + set_a_attributes sgr1 str sA - - ----- Define second set of video attributes #1-#6 +-set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch ++set_pglen_inch slength str YI - - ----- Set page length to #1 hundredth of an inch (some implementations use sL for termcap). + #%.TE + #%.ad + # +diff -Naur ncurses-5.9.orig/include/Caps.osf1r5 ncurses-5.9/include/Caps.osf1r5 +--- ncurses-5.9.orig/include/Caps.osf1r5 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/Caps.osf1r5 2012-08-25 19:57:59.983231522 +0000 +@@ -1,5 +1,5 @@ + ############################################################################## +-# Copyright (c) 2002-2006,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2002-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # + # Author: Thomas Dickey + # +-# $Id: Caps.osf1r5,v 1.5 2010/12/04 18:47:13 tom Exp $ ++# $Id: Caps.osf1r5,v 1.6 2011/10/15 22:52:09 tom Exp $ + # + # This is an adaptation of ncurses' termcap/terminfo capability table, which + # is designed to align with OSF/1 version 5 (Tru64) terminfo. +@@ -769,7 +769,7 @@ + xoff_character xoffc str XF - - ----- XOFF character + xon_character xonc str XN - - ----- XON character + zero_motion zerom str Zx - - ----- No motion for subsequent character +-set_pglen_inch slength str sL - - ----- YI Set page length to #1 hundredth of an inch ++set_pglen_inch slength str YI - - ----- Set page length to #1 hundredth of an inch (some implementations use sL for termcap). + enter_horizontal_hl_mode ehhlm str Xh - - ----- Enter horizontal highlight mode + enter_left_hl_mode elhlm str Xl - - ----- Enter left highlight mode + enter_low_hl_mode elohlm str Xo - - ----- Enter low highlight mode +diff -Naur ncurses-5.9.orig/include/MKterm.h.awk.in ncurses-5.9/include/MKterm.h.awk.in +--- ncurses-5.9.orig/include/MKterm.h.awk.in 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/MKterm.h.awk.in 2012-08-25 19:57:59.983231522 +0000 +@@ -1,7 +1,7 @@ + # vile:awkmode + BEGIN { + print "/****************************************************************************" +- print " * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *" ++ print " * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. *" + print " * *" + print " * Permission is hereby granted, free of charge, to any person obtaining a *" + print " * copy of this software and associated documentation files (the *" +@@ -34,7 +34,7 @@ + print "/* and: Thomas E. Dickey 1995-on */" + print "/****************************************************************************/" + print "" +- print "/* $Id: MKterm.h.awk.in,v 1.58 2010/01/09 19:53:26 tom Exp $ */" ++ print "/* $Id: MKterm.h.awk.in,v 1.60 2011/06/25 20:51:00 tom Exp $ */" + print "" + print "/*" + print "** term.h -- Definition of struct term" +@@ -93,41 +93,6 @@ + print "#include <termio.h>" + print "#define TTY struct termio" + print "" +- print "/* Add definitions to make termio look like termios." +- print " * But ifdef it, since there are some implementations" +- print " * that try to do this for us in a fake <termio.h>." +- print " */" +- print "#ifndef TCSANOW" +- print "#define TCSANOW TCSETA" +- print "#endif" +- print "#ifndef TCSADRAIN" +- print "#define TCSADRAIN TCSETAW" +- print "#endif" +- print "#ifndef TCSAFLUSH" +- print "#define TCSAFLUSH TCSETAF" +- print "#endif" +- print "#ifndef tcsetattr" +- print "#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)" +- print "#endif" +- print "#ifndef tcgetattr" +- print "#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)" +- print "#endif" +- print "#ifndef cfgetospeed" +- print "#define cfgetospeed(t) ((t)->c_cflag & CBAUD)" +- print "#endif" +- print "#ifndef TCIFLUSH " +- print "#define TCIFLUSH 0" +- print "#endif" +- print "#ifndef TCOFLUSH " +- print "#define TCOFLUSH 1" +- print "#endif" +- print "#ifndef TCIOFLUSH " +- print "#define TCIOFLUSH 2" +- print "#endif" +- print "#ifndef tcflush" +- print "#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)" +- print "#endif" +- print "" + print "#else /* !HAVE_TERMIO_H */" + print "" + print "#if __MINGW32__" +diff -Naur ncurses-5.9.orig/include/curses.h.in ncurses-5.9/include/curses.h.in +--- ncurses-5.9.orig/include/curses.h.in 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/curses.h.in 2012-08-25 19:58:02.046555098 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + * and: Thomas E. Dickey 1996-on * + ****************************************************************************/ + +-/* $Id: curses.h.in,v 1.220 2011/01/22 19:47:20 tom Exp $ */ ++/* $Id: curses.h.in,v 1.232 2012/07/28 18:17:43 tom Exp $ */ + + #ifndef __NCURSES_H + #define __NCURSES_H +@@ -129,6 +129,13 @@ + #define NCURSES_TPARM_VARARGS @NCURSES_TPARM_VARARGS@ + + /* ++ * Control type used for tparm's arguments. While X/Open equates long and ++ * char* values, this is not always workable for 64-bit platforms. ++ */ ++#undef NCURSES_TPARM_ARG ++#define NCURSES_TPARM_ARG @NCURSES_TPARM_ARG@ ++ ++/* + * NCURSES_CH_T is used in building the library, but not used otherwise in + * this header file, since that would make the normal/wide-character versions + * of the header incompatible. +@@ -151,15 +158,21 @@ + + /* + * With XPG4, you must define _XOPEN_SOURCE_EXTENDED, it is redundant (or +- * conflicting) when _XOPEN_SOURCE is 500 or greater. ++ * conflicting) when _XOPEN_SOURCE is 500 or greater. If NCURSES_WIDECHAR is ++ * not already defined, e.g., if the platform relies upon nonstandard feature ++ * test macros, define it at this point if the standard feature test macros ++ * indicate that it should be defined. + */ +-#undef NCURSES_WIDECHAR +-#if defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5) +-#define NCURSES_WIDECHAR ++#ifndef NCURSES_WIDECHAR ++#if defined(_XOPEN_SOURCE_EXTENDED) || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500)) ++#define NCURSES_WIDECHAR 1 ++#else ++#define NCURSES_WIDECHAR 0 + #endif ++#endif /* NCURSES_WIDECHAR */ + + #include <stdarg.h> /* we need va_list */ +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + #include <stddef.h> /* we want wchar_t */ + #endif + +@@ -250,7 +263,7 @@ + extern NCURSES_EXPORT_VAR(chtype) acs_map[]; + #endif + +-#define NCURSES_ACS(c) (acs_map[NCURSES_CAST(unsigned char,c)]) ++#define NCURSES_ACS(c) (acs_map[NCURSES_CAST(unsigned char,(c))]) + + /* VT100 symbols begin here */ + #define ACS_ULCORNER NCURSES_ACS('l') /* upper left corner */ +@@ -342,7 +355,7 @@ + + typedef chtype attr_t; /* ...must be at least as wide as chtype */ + +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + + #if @NCURSES_LIBUTF8@ + #ifdef mblen /* libutf8.h defines it w/o undefining first */ +@@ -366,7 +379,7 @@ + /* + * cchar_t stores an array of CCHARW_MAX wide characters. The first is + * normally a spacing character. The others are non-spacing. If those +- * (spacing and nonspacing) do not fill the array, a null L'\0' follows. ++ * (spacing and nonspacing) do not fill the array, a null L'\0' follows. + * Otherwise, a null is assumed to follow when extracting via getcchar(). + */ + #define CCHARW_MAX @NCURSES_CCHARW_MAX@ +@@ -434,7 +447,7 @@ + + NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */ + +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + cchar_t _bkgrnd; /* current background char/attribute pair */ + #if @NCURSES_EXT_COLORS@ + int _color; /* current color-pair for non-space character */ +@@ -757,6 +770,7 @@ + extern NCURSES_EXPORT(int) ungetch (int); /* implemented */ + extern NCURSES_EXPORT(int) untouchwin (WINDOW *); /* generated */ + extern NCURSES_EXPORT(void) use_env (bool); /* implemented */ ++extern NCURSES_EXPORT(void) use_tioctl (bool); /* implemented */ + extern NCURSES_EXPORT(int) vidattr (chtype); /* implemented */ + extern NCURSES_EXPORT(int) vidputs (chtype, NCURSES_OUTC); /* implemented */ + extern NCURSES_EXPORT(int) vline (chtype, int); /* generated */ +@@ -832,7 +846,7 @@ + #if NCURSES_TPARM_VARARGS + extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...); /* special */ + #else +-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long); /* special */ ++extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG,NCURSES_TPARM_ARG); /* special */ + extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...); /* special */ + #endif + +@@ -854,7 +868,7 @@ + /* + * vid_attr() was implemented originally based on a draft of X/Open curses. + */ +-#ifndef NCURSES_WIDECHAR ++#if !NCURSES_WIDECHAR + #define vid_attr(a,pair,opts) vidattr(a) + #endif + +@@ -994,6 +1008,7 @@ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(typeahead) (SCREEN*, int); /* implemented:SP_FUNC */ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(ungetch) (SCREEN*, int); /* implemented:SP_FUNC */ + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_env) (SCREEN*, bool); /* implemented:SP_FUNC */ ++extern NCURSES_EXPORT(void) NCURSES_SP_NAME(use_tioctl) (SCREEN*, bool); /* implemented:SP_FUNC */ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidattr) (SCREEN*, chtype); /* implemented:SP_FUNC */ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(vidputs) (SCREEN*, chtype, NCURSES_SP_OUTC); /* implemented:SP_FUNC */ + #if @NCURSES_EXT_FUNCS@ +@@ -1084,7 +1099,7 @@ + */ + + #define wgetstr(w, s) wgetnstr(w, s, -1) +-#define getnstr(s, n) wgetnstr(stdscr, s, n) ++#define getnstr(s, n) wgetnstr(stdscr, s, (n)) + + #define setterm(term) setupterm(term, 1, (int *)0) + +@@ -1115,7 +1130,7 @@ + #define wattroff(win,at) wattr_off(win, NCURSES_CAST(attr_t, at), NULL) + + #if !NCURSES_OPAQUE +-#if defined(NCURSES_WIDECHAR) && @NCURSES_EXT_COLORS@ ++#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@ + #define wattrset(win,at) ((win) \ + ? ((win)->_color = PAIR_NUMBER(at), \ + (win)->_attrs = NCURSES_CAST(attr_t, at), \ +@@ -1137,15 +1152,15 @@ + + #define box(win, v, h) wborder(win, v, v, h, h, 0, 0, 0, 0) + #define border(ls, rs, ts, bs, tl, tr, bl, br) wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br) +-#define hline(ch, n) whline(stdscr, ch, n) +-#define vline(ch, n) wvline(stdscr, ch, n) ++#define hline(ch, n) whline(stdscr, ch, (n)) ++#define vline(ch, n) wvline(stdscr, ch, (n)) + + #define winstr(w, s) winnstr(w, s, -1) + #define winchstr(w, s) winchnstr(w, s, -1) + #define winsstr(w, s) winsnstr(w, s, -1) + + #if !NCURSES_OPAQUE +-#define redrawwin(win) wredrawln(win, 0, (win)->_maxy+1) ++#define redrawwin(win) wredrawln(win, 0, ((win) ? (win)->_maxy+1 : -1)) + #endif /* NCURSES_OPAQUE */ + + #define waddstr(win,str) waddnstr(win,str,-1) +@@ -1154,55 +1169,55 @@ + /* + * These apply to the first 256 color pairs. + */ +-#define COLOR_PAIR(n) NCURSES_BITS(n, 0) +-#define PAIR_NUMBER(a) (NCURSES_CAST(int,((NCURSES_CAST(unsigned long,a) & A_COLOR) >> NCURSES_ATTR_SHIFT))) ++#define COLOR_PAIR(n) NCURSES_BITS((n), 0) ++#define PAIR_NUMBER(a) (NCURSES_CAST(int,((NCURSES_CAST(unsigned long,(a)) & A_COLOR) >> NCURSES_ATTR_SHIFT))) + + /* + * pseudo functions for standard screen + */ + +-#define addch(ch) waddch(stdscr,ch) +-#define addchnstr(str,n) waddchnstr(stdscr,str,n) +-#define addchstr(str) waddchstr(stdscr,str) +-#define addnstr(str,n) waddnstr(stdscr,str,n) +-#define addstr(str) waddnstr(stdscr,str,-1) +-#define attroff(at) wattroff(stdscr,at) +-#define attron(at) wattron(stdscr,at) +-#define attrset(at) wattrset(stdscr,at) +-#define attr_get(ap,cp,o) wattr_get(stdscr,ap,cp,o) +-#define attr_off(a,o) wattr_off(stdscr,a,o) +-#define attr_on(a,o) wattr_on(stdscr,a,o) +-#define attr_set(a,c,o) wattr_set(stdscr,a,c,o) +-#define bkgd(ch) wbkgd(stdscr,ch) +-#define bkgdset(ch) wbkgdset(stdscr,ch) +-#define chgat(n,a,c,o) wchgat(stdscr,n,a,c,o) ++#define addch(ch) waddch(stdscr,(ch)) ++#define addchnstr(str,n) waddchnstr(stdscr,(str),(n)) ++#define addchstr(str) waddchstr(stdscr,(str)) ++#define addnstr(str,n) waddnstr(stdscr,(str),(n)) ++#define addstr(str) waddnstr(stdscr,(str),-1) ++#define attroff(at) wattroff(stdscr,(at)) ++#define attron(at) wattron(stdscr,(at)) ++#define attrset(at) wattrset(stdscr,(at)) ++#define attr_get(ap,cp,o) wattr_get(stdscr,(ap),(cp),(o)) ++#define attr_off(a,o) wattr_off(stdscr,(a),(o)) ++#define attr_on(a,o) wattr_on(stdscr,(a),(o)) ++#define attr_set(a,c,o) wattr_set(stdscr,(a),(c),(o)) ++#define bkgd(ch) wbkgd(stdscr,(ch)) ++#define bkgdset(ch) wbkgdset(stdscr,(ch)) ++#define chgat(n,a,c,o) wchgat(stdscr,(n),(a),(c),(o)) + #define clear() wclear(stdscr) + #define clrtobot() wclrtobot(stdscr) + #define clrtoeol() wclrtoeol(stdscr) +-#define color_set(c,o) wcolor_set(stdscr,c,o) ++#define color_set(c,o) wcolor_set(stdscr,(c),(o)) + #define delch() wdelch(stdscr) + #define deleteln() winsdelln(stdscr,-1) +-#define echochar(c) wechochar(stdscr,c) ++#define echochar(c) wechochar(stdscr,(c)) + #define erase() werase(stdscr) + #define getch() wgetch(stdscr) +-#define getstr(str) wgetstr(stdscr,str) ++#define getstr(str) wgetstr(stdscr,(str)) + #define inch() winch(stdscr) +-#define inchnstr(s,n) winchnstr(stdscr,s,n) +-#define inchstr(s) winchstr(stdscr,s) +-#define innstr(s,n) winnstr(stdscr,s,n) +-#define insch(c) winsch(stdscr,c) +-#define insdelln(n) winsdelln(stdscr,n) ++#define inchnstr(s,n) winchnstr(stdscr,(s),(n)) ++#define inchstr(s) winchstr(stdscr,(s)) ++#define innstr(s,n) winnstr(stdscr,(s),(n)) ++#define insch(c) winsch(stdscr,(c)) ++#define insdelln(n) winsdelln(stdscr,(n)) + #define insertln() winsdelln(stdscr,1) +-#define insnstr(s,n) winsnstr(stdscr,s,n) +-#define insstr(s) winsstr(stdscr,s) +-#define instr(s) winstr(stdscr,s) +-#define move(y,x) wmove(stdscr,y,x) ++#define insnstr(s,n) winsnstr(stdscr,(s),(n)) ++#define insstr(s) winsstr(stdscr,(s)) ++#define instr(s) winstr(stdscr,(s)) ++#define move(y,x) wmove(stdscr,(y),(x)) + #define refresh() wrefresh(stdscr) +-#define scrl(n) wscrl(stdscr,n) +-#define setscrreg(t,b) wsetscrreg(stdscr,t,b) ++#define scrl(n) wscrl(stdscr,(n)) ++#define setscrreg(t,b) wsetscrreg(stdscr,(t),(b)) + #define standend() wstandend(stdscr) + #define standout() wstandout(stdscr) +-#define timeout(delay) wtimeout(stdscr,delay) ++#define timeout(delay) wtimeout(stdscr,(delay)) + #define wdeleteln(win) winsdelln(win,-1) + #define winsertln(win) winsdelln(win,1) + +@@ -1210,70 +1225,75 @@ + * mv functions + */ + +-#define mvwaddch(win,y,x,ch) (wmove(win,y,x) == ERR ? ERR : waddch(win,ch)) +-#define mvwaddchnstr(win,y,x,str,n) (wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,n)) +-#define mvwaddchstr(win,y,x,str) (wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,-1)) +-#define mvwaddnstr(win,y,x,str,n) (wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,n)) +-#define mvwaddstr(win,y,x,str) (wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,-1)) +-#define mvwdelch(win,y,x) (wmove(win,y,x) == ERR ? ERR : wdelch(win)) +-#define mvwchgat(win,y,x,n,a,c,o) (wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o)) +-#define mvwgetch(win,y,x) (wmove(win,y,x) == ERR ? ERR : wgetch(win)) +-#define mvwgetnstr(win,y,x,str,n) (wmove(win,y,x) == ERR ? ERR : wgetnstr(win,str,n)) +-#define mvwgetstr(win,y,x,str) (wmove(win,y,x) == ERR ? ERR : wgetstr(win,str)) +-#define mvwhline(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : whline(win,c,n)) +-#define mvwinch(win,y,x) (wmove(win,y,x) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win)) +-#define mvwinchnstr(win,y,x,s,n) (wmove(win,y,x) == ERR ? ERR : winchnstr(win,s,n)) +-#define mvwinchstr(win,y,x,s) (wmove(win,y,x) == ERR ? ERR : winchstr(win,s)) +-#define mvwinnstr(win,y,x,s,n) (wmove(win,y,x) == ERR ? ERR : winnstr(win,s,n)) +-#define mvwinsch(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : winsch(win,c)) +-#define mvwinsnstr(win,y,x,s,n) (wmove(win,y,x) == ERR ? ERR : winsnstr(win,s,n)) +-#define mvwinsstr(win,y,x,s) (wmove(win,y,x) == ERR ? ERR : winsstr(win,s)) +-#define mvwinstr(win,y,x,s) (wmove(win,y,x) == ERR ? ERR : winstr(win,s)) +-#define mvwvline(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : wvline(win,c,n)) +- +-#define mvaddch(y,x,ch) mvwaddch(stdscr,y,x,ch) +-#define mvaddchnstr(y,x,str,n) mvwaddchnstr(stdscr,y,x,str,n) +-#define mvaddchstr(y,x,str) mvwaddchstr(stdscr,y,x,str) +-#define mvaddnstr(y,x,str,n) mvwaddnstr(stdscr,y,x,str,n) +-#define mvaddstr(y,x,str) mvwaddstr(stdscr,y,x,str) +-#define mvchgat(y,x,n,a,c,o) mvwchgat(stdscr,y,x,n,a,c,o) +-#define mvdelch(y,x) mvwdelch(stdscr,y,x) +-#define mvgetch(y,x) mvwgetch(stdscr,y,x) +-#define mvgetnstr(y,x,str,n) mvwgetnstr(stdscr,y,x,str,n) +-#define mvgetstr(y,x,str) mvwgetstr(stdscr,y,x,str) +-#define mvhline(y,x,c,n) mvwhline(stdscr,y,x,c,n) +-#define mvinch(y,x) mvwinch(stdscr,y,x) +-#define mvinchnstr(y,x,s,n) mvwinchnstr(stdscr,y,x,s,n) +-#define mvinchstr(y,x,s) mvwinchstr(stdscr,y,x,s) +-#define mvinnstr(y,x,s,n) mvwinnstr(stdscr,y,x,s,n) +-#define mvinsch(y,x,c) mvwinsch(stdscr,y,x,c) +-#define mvinsnstr(y,x,s,n) mvwinsnstr(stdscr,y,x,s,n) +-#define mvinsstr(y,x,s) mvwinsstr(stdscr,y,x,s) +-#define mvinstr(y,x,s) mvwinstr(stdscr,y,x,s) +-#define mvvline(y,x,c,n) mvwvline(stdscr,y,x,c,n) ++#define mvwaddch(win,y,x,ch) (wmove((win),(y),(x)) == ERR ? ERR : waddch((win),(ch))) ++#define mvwaddchnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),(n))) ++#define mvwaddchstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddchnstr((win),(str),-1)) ++#define mvwaddnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),(n))) ++#define mvwaddstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : waddnstr((win),(str),-1)) ++#define mvwdelch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wdelch(win)) ++#define mvwchgat(win,y,x,n,a,c,o) (wmove((win),(y),(x)) == ERR ? ERR : wchgat((win),(n),(a),(c),(o))) ++#define mvwgetch(win,y,x) (wmove((win),(y),(x)) == ERR ? ERR : wgetch(win)) ++#define mvwgetnstr(win,y,x,str,n) (wmove((win),(y),(x)) == ERR ? ERR : wgetnstr((win),(str),(n))) ++#define mvwgetstr(win,y,x,str) (wmove((win),(y),(x)) == ERR ? ERR : wgetstr((win),(str))) ++#define mvwhline(win,y,x,c,n) (wmove((win),(y),(x)) == ERR ? ERR : whline((win),(c),(n))) ++#define mvwinch(win,y,x) (wmove((win),(y),(x)) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win)) ++#define mvwinchnstr(win,y,x,s,n) (wmove((win),(y),(x)) == ERR ? ERR : winchnstr((win),(s),(n))) ++#define mvwinchstr(win,y,x,s) (wmove((win),(y),(x)) == ERR ? ERR : winchstr((win),(s))) ++#define mvwinnstr(win,y,x,s,n) (wmove((win),(y),(x)) == ERR ? ERR : winnstr((win),(s),(n))) ++#define mvwinsch(win,y,x,c) (wmove((win),(y),(x)) == ERR ? ERR : winsch((win),(c))) ++#define mvwinsnstr(win,y,x,s,n) (wmove((win),(y),(x)) == ERR ? ERR : winsnstr((win),(s),(n))) ++#define mvwinsstr(win,y,x,s) (wmove((win),(y),(x)) == ERR ? ERR : winsstr((win),(s))) ++#define mvwinstr(win,y,x,s) (wmove((win),(y),(x)) == ERR ? ERR : winstr((win),(s))) ++#define mvwvline(win,y,x,c,n) (wmove((win),(y),(x)) == ERR ? ERR : wvline((win),(c),(n))) ++ ++#define mvaddch(y,x,ch) mvwaddch(stdscr,(y),(x),(ch)) ++#define mvaddchnstr(y,x,str,n) mvwaddchnstr(stdscr,(y),(x),(str),(n)) ++#define mvaddchstr(y,x,str) mvwaddchstr(stdscr,(y),(x),(str)) ++#define mvaddnstr(y,x,str,n) mvwaddnstr(stdscr,(y),(x),(str),(n)) ++#define mvaddstr(y,x,str) mvwaddstr(stdscr,(y),(x),(str)) ++#define mvchgat(y,x,n,a,c,o) mvwchgat(stdscr,(y),(x),(n),(a),(c),(o)) ++#define mvdelch(y,x) mvwdelch(stdscr,(y),(x)) ++#define mvgetch(y,x) mvwgetch(stdscr,(y),(x)) ++#define mvgetnstr(y,x,str,n) mvwgetnstr(stdscr,(y),(x),(str),(n)) ++#define mvgetstr(y,x,str) mvwgetstr(stdscr,(y),(x),(str)) ++#define mvhline(y,x,c,n) mvwhline(stdscr,(y),(x),(c),(n)) ++#define mvinch(y,x) mvwinch(stdscr,(y),(x)) ++#define mvinchnstr(y,x,s,n) mvwinchnstr(stdscr,(y),(x),(s),(n)) ++#define mvinchstr(y,x,s) mvwinchstr(stdscr,(y),(x),(s)) ++#define mvinnstr(y,x,s,n) mvwinnstr(stdscr,(y),(x),(s),(n)) ++#define mvinsch(y,x,c) mvwinsch(stdscr,(y),(x),(c)) ++#define mvinsnstr(y,x,s,n) mvwinsnstr(stdscr,(y),(x),(s),(n)) ++#define mvinsstr(y,x,s) mvwinsstr(stdscr,(y),(x),(s)) ++#define mvinstr(y,x,s) mvwinstr(stdscr,(y),(x),(s)) ++#define mvvline(y,x,c,n) mvwvline(stdscr,(y),(x),(c),(n)) + + /* + * Some wide-character functions can be implemented without the extensions. + */ + #if !NCURSES_OPAQUE +-#define getbkgd(win) ((win)->_bkgd) ++#define getbkgd(win) ((win) ? ((win)->_bkgd) : 0) + #endif /* NCURSES_OPAQUE */ + + #define slk_attr_off(a,v) ((v) ? ERR : slk_attroff(a)) + #define slk_attr_on(a,v) ((v) ? ERR : slk_attron(a)) + + #if !NCURSES_OPAQUE +-#if defined(NCURSES_WIDECHAR) && @NCURSES_EXT_COLORS@ +-#define wattr_set(win,a,p,opts) ((win)->_attrs = ((a) & ~A_COLOR), \ +- (win)->_color = (p), \ ++#if NCURSES_WIDECHAR && @NCURSES_EXT_COLORS@ ++#define wattr_set(win,a,p,opts) (((win) \ ++ ? ((win)->_attrs = ((a) & ~A_COLOR), \ ++ (win)->_color = (p)) \ ++ : OK), \ + OK) +-#define wattr_get(win,a,p,opts) ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \ +- (void)((p) != (void *)0 && (*(p) = (short)(win)->_color)), \ ++#define wattr_get(win,a,p,opts) ((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \ ++ (void)(((p) != (void *)0) ? (*(p) = (win) ? (short)(win)->_color : 0) : OK), \ + OK) + #else +-#define wattr_set(win,a,p,opts) ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p)), OK) +-#define wattr_get(win,a,p,opts) ((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \ +- (void)((p) != (void *)0 && (*(p) = (short)PAIR_NUMBER((win)->_attrs))), \ ++#define wattr_set(win,a,p,opts) (((win) \ ++ ? ((win)->_attrs = (((a) & ~A_COLOR) | (attr_t)COLOR_PAIR(p))) \ ++ : OK), \ ++ OK) ++#define wattr_get(win,a,p,opts) ((void)(((a) != (void *)0) ? (*(a) = (win) ? (win)->_attrs : 0) : OK), \ ++ (void)(((p) != (void *)0) ? (*(p) = (win) ? (short)PAIR_NUMBER((win)->_attrs) : 0) : OK), \ + OK) + #endif + #endif /* NCURSES_OPAQUE */ +@@ -1291,7 +1311,7 @@ + * Export fallback function for use in C++ binding. + */ + #if !@HAVE_VSSCANF@ +-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c) ++#define vsscanf(a,b,c) _nc_vsscanf((a),(b),(c)) + NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list); + #endif + +diff -Naur ncurses-5.9.orig/include/curses.tail ncurses-5.9/include/curses.tail +--- ncurses-5.9.orig/include/curses.tail 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/curses.tail 2012-08-25 19:57:59.986564839 +0000 +@@ -1,4 +1,4 @@ +-/* $Id: curses.tail,v 1.20 2010/03/28 19:10:55 tom Exp $ */ ++/* $Id: curses.tail,v 1.21 2011/10/29 20:03:22 tom Exp $ */ + /* + * vile:cmode: + * This file is part of ncurses, designed to be appended after curses.h.in +@@ -133,7 +133,7 @@ + extern NCURSES_EXPORT(char *) _tracechar (int); + extern NCURSES_EXPORT(char *) _tracechtype (chtype); + extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype); +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + #define _tracech_t _tracecchar_t + extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *); + #define _tracech_t2 _tracecchar_t2 +diff -Naur ncurses-5.9.orig/include/curses.wide ncurses-5.9/include/curses.wide +--- ncurses-5.9.orig/include/curses.wide 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/curses.wide 2012-08-25 19:58:02.046555098 +0000 +@@ -1,4 +1,4 @@ +-/* $Id: curses.wide,v 1.42 2010/03/30 00:39:41 tom Exp $ */ ++/* $Id: curses.wide,v 1.45 2012/07/28 18:10:02 tom Exp $ */ + /* + * vile:cmode: + * This file is part of ncurses, designed to be appended after curses.h.in +@@ -6,11 +6,11 @@ + */ + #define _XOPEN_CURSES 1 + +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + + extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs; + +-#define NCURSES_WACS(c) (&_nc_wacs[(unsigned char)c]) ++#define NCURSES_WACS(c) (&_nc_wacs[NCURSES_CAST(unsigned char,(c))]) + + #define WACS_BSSB NCURSES_WACS('l') + #define WACS_SSBB NCURSES_WACS('m') +@@ -230,77 +230,77 @@ + /* + * XSI curses macros for XPG4 conformance. + */ +-#define add_wch(c) wadd_wch(stdscr,c) +-#define add_wchnstr(str,n) wadd_wchnstr(stdscr,str,n) +-#define add_wchstr(str) wadd_wchstr(stdscr,str) +-#define addnwstr(wstr,n) waddnwstr(stdscr,wstr,n) +-#define addwstr(wstr) waddwstr(stdscr,wstr) +-#define bkgrnd(c) wbkgrnd(stdscr,c) +-#define bkgrndset(c) wbkgrndset(stdscr,c) +-#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,l,r,t,b,tl,tr,bl,br) +-#define box_set(w,v,h) wborder_set(w,v,v,h,h,0,0,0,0) +-#define echo_wchar(c) wecho_wchar(stdscr,c) +-#define get_wch(c) wget_wch(stdscr,c) +-#define get_wstr(t) wget_wstr(stdscr,t) +-#define getbkgrnd(wch) wgetbkgrnd(stdscr,wch) +-#define getn_wstr(t,n) wgetn_wstr(stdscr,t,n) +-#define hline_set(c,n) whline_set(stdscr,c,n) +-#define in_wch(c) win_wch(stdscr,c) +-#define in_wchnstr(c,n) win_wchnstr(stdscr,c,n) +-#define in_wchstr(c) win_wchstr(stdscr,c) +-#define innwstr(c,n) winnwstr(stdscr,c,n) +-#define ins_nwstr(t,n) wins_nwstr(stdscr,t,n) +-#define ins_wch(c) wins_wch(stdscr,c) +-#define ins_wstr(t) wins_wstr(stdscr,t) +-#define inwstr(c) winwstr(stdscr,c) +-#define vline_set(c,n) wvline_set(stdscr,c,n) +-#define wadd_wchstr(win,str) wadd_wchnstr(win,str,-1) +-#define waddwstr(win,wstr) waddnwstr(win,wstr,-1) +-#define wget_wstr(w,t) wgetn_wstr(w,t,-1) +-#define win_wchstr(w,c) win_wchnstr(w,c,-1) +-#define wins_wstr(w,t) wins_nwstr(w,t,-1) ++#define add_wch(c) wadd_wch(stdscr,(c)) ++#define add_wchnstr(str,n) wadd_wchnstr(stdscr,(str),(n)) ++#define add_wchstr(str) wadd_wchstr(stdscr,(str)) ++#define addnwstr(wstr,n) waddnwstr(stdscr,(wstr),(n)) ++#define addwstr(wstr) waddwstr(stdscr,(wstr)) ++#define bkgrnd(c) wbkgrnd(stdscr,(c)) ++#define bkgrndset(c) wbkgrndset(stdscr,(c)) ++#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,(l),(r),(t),(b),tl,tr,bl,br) ++#define box_set(w,v,h) wborder_set((w),(v),(v),(h),(h),0,0,0,0) ++#define echo_wchar(c) wecho_wchar(stdscr,(c)) ++#define get_wch(c) wget_wch(stdscr,(c)) ++#define get_wstr(t) wget_wstr(stdscr,(t)) ++#define getbkgrnd(wch) wgetbkgrnd(stdscr,(wch)) ++#define getn_wstr(t,n) wgetn_wstr(stdscr,(t),(n)) ++#define hline_set(c,n) whline_set(stdscr,(c),(n)) ++#define in_wch(c) win_wch(stdscr,(c)) ++#define in_wchnstr(c,n) win_wchnstr(stdscr,(c),(n)) ++#define in_wchstr(c) win_wchstr(stdscr,(c)) ++#define innwstr(c,n) winnwstr(stdscr,(c),(n)) ++#define ins_nwstr(t,n) wins_nwstr(stdscr,(t),(n)) ++#define ins_wch(c) wins_wch(stdscr,(c)) ++#define ins_wstr(t) wins_wstr(stdscr,(t)) ++#define inwstr(c) winwstr(stdscr,(c)) ++#define vline_set(c,n) wvline_set(stdscr,(c),(n)) ++#define wadd_wchstr(win,str) wadd_wchnstr((win),(str),-1) ++#define waddwstr(win,wstr) waddnwstr((win),(wstr),-1) ++#define wget_wstr(w,t) wgetn_wstr((w),(t),-1) ++#define win_wchstr(w,c) win_wchnstr((w),(c),-1) ++#define wins_wstr(w,t) wins_nwstr((w),(t),-1) + + #if !NCURSES_OPAQUE +-#define wgetbkgrnd(win,wch) (*wch = win->_bkgrnd, OK) ++#define wgetbkgrnd(win,wch) ((win) ? (*(wch) = (win)->_bkgrnd) : *(wch), OK) + #endif + +-#define mvadd_wch(y,x,c) mvwadd_wch(stdscr,y,x,c) +-#define mvadd_wchnstr(y,x,s,n) mvwadd_wchnstr(stdscr,y,x,s,n) +-#define mvadd_wchstr(y,x,s) mvwadd_wchstr(stdscr,y,x,s) +-#define mvaddnwstr(y,x,wstr,n) mvwaddnwstr(stdscr,y,x,wstr,n) +-#define mvaddwstr(y,x,wstr) mvwaddwstr(stdscr,y,x,wstr) +-#define mvget_wch(y,x,c) mvwget_wch(stdscr,y,x,c) +-#define mvget_wstr(y,x,t) mvwget_wstr(stdscr,y,x,t) +-#define mvgetn_wstr(y,x,t,n) mvwgetn_wstr(stdscr,y,x,t,n) +-#define mvhline_set(y,x,c,n) mvwhline_set(stdscr,y,x,c,n) +-#define mvin_wch(y,x,c) mvwin_wch(stdscr,y,x,c) +-#define mvin_wchnstr(y,x,c,n) mvwin_wchnstr(stdscr,y,x,c,n) +-#define mvin_wchstr(y,x,c) mvwin_wchstr(stdscr,y,x,c) +-#define mvinnwstr(y,x,c,n) mvwinnwstr(stdscr,y,x,c,n) +-#define mvins_nwstr(y,x,t,n) mvwins_nwstr(stdscr,y,x,t,n) +-#define mvins_wch(y,x,c) mvwins_wch(stdscr,y,x,c) +-#define mvins_wstr(y,x,t) mvwins_wstr(stdscr,y,x,t) +-#define mvinwstr(y,x,c) mvwinwstr(stdscr,y,x,c) +-#define mvvline_set(y,x,c,n) mvwvline_set(stdscr,y,x,c,n) +- +-#define mvwadd_wch(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : wadd_wch(win,c)) +-#define mvwadd_wchnstr(win,y,x,s,n) (wmove(win,y,x) == ERR ? ERR : wadd_wchnstr(win,s,n)) +-#define mvwadd_wchstr(win,y,x,s) (wmove(win,y,x) == ERR ? ERR : wadd_wchstr(win,s)) +-#define mvwaddnwstr(win,y,x,wstr,n) (wmove(win,y,x) == ERR ? ERR : waddnwstr(win,wstr,n)) +-#define mvwaddwstr(win,y,x,wstr) (wmove(win,y,x) == ERR ? ERR : waddwstr(win,wstr)) +-#define mvwget_wch(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : wget_wch(win,c)) +-#define mvwget_wstr(win,y,x,t) (wmove(win,y,x) == ERR ? ERR : wget_wstr(win,t)) +-#define mvwgetn_wstr(win,y,x,t,n) (wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,n)) +-#define mvwhline_set(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : whline_set(win,c,n)) +-#define mvwin_wch(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : win_wch(win,c)) +-#define mvwin_wchnstr(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : win_wchnstr(win,c,n)) +-#define mvwin_wchstr(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : win_wchstr(win,c)) +-#define mvwinnwstr(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : winnwstr(win,c,n)) +-#define mvwins_nwstr(win,y,x,t,n) (wmove(win,y,x) == ERR ? ERR : wins_nwstr(win,t,n)) +-#define mvwins_wch(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : wins_wch(win,c)) +-#define mvwins_wstr(win,y,x,t) (wmove(win,y,x) == ERR ? ERR : wins_wstr(win,t)) +-#define mvwinwstr(win,y,x,c) (wmove(win,y,x) == ERR ? ERR : winwstr(win,c)) +-#define mvwvline_set(win,y,x,c,n) (wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n)) ++#define mvadd_wch(y,x,c) mvwadd_wch(stdscr,(y),(x),(c)) ++#define mvadd_wchnstr(y,x,s,n) mvwadd_wchnstr(stdscr,(y),(x),(s),(n)) ++#define mvadd_wchstr(y,x,s) mvwadd_wchstr(stdscr,(y),(x),(s)) ++#define mvaddnwstr(y,x,wstr,n) mvwaddnwstr(stdscr,(y),(x),(wstr),(n)) ++#define mvaddwstr(y,x,wstr) mvwaddwstr(stdscr,(y),(x),(wstr)) ++#define mvget_wch(y,x,c) mvwget_wch(stdscr,(y),(x),(c)) ++#define mvget_wstr(y,x,t) mvwget_wstr(stdscr,(y),(x),(t)) ++#define mvgetn_wstr(y,x,t,n) mvwgetn_wstr(stdscr,(y),(x),(t),(n)) ++#define mvhline_set(y,x,c,n) mvwhline_set(stdscr,(y),(x),(c),(n)) ++#define mvin_wch(y,x,c) mvwin_wch(stdscr,(y),(x),(c)) ++#define mvin_wchnstr(y,x,c,n) mvwin_wchnstr(stdscr,(y),(x),(c),(n)) ++#define mvin_wchstr(y,x,c) mvwin_wchstr(stdscr,(y),(x),(c)) ++#define mvinnwstr(y,x,c,n) mvwinnwstr(stdscr,(y),(x),(c),(n)) ++#define mvins_nwstr(y,x,t,n) mvwins_nwstr(stdscr,(y),(x),(t),(n)) ++#define mvins_wch(y,x,c) mvwins_wch(stdscr,(y),(x),(c)) ++#define mvins_wstr(y,x,t) mvwins_wstr(stdscr,(y),(x),(t)) ++#define mvinwstr(y,x,c) mvwinwstr(stdscr,(y),(x),(c)) ++#define mvvline_set(y,x,c,n) mvwvline_set(stdscr,(y),(x),(c),(n)) ++ ++#define mvwadd_wch(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : wadd_wch((win),(c))) ++#define mvwadd_wchnstr(win,y,x,s,n) (wmove(win,(y),(x)) == ERR ? ERR : wadd_wchnstr((win),(s),(n))) ++#define mvwadd_wchstr(win,y,x,s) (wmove(win,(y),(x)) == ERR ? ERR : wadd_wchstr((win),(s))) ++#define mvwaddnwstr(win,y,x,wstr,n) (wmove(win,(y),(x)) == ERR ? ERR : waddnwstr((win),(wstr),(n))) ++#define mvwaddwstr(win,y,x,wstr) (wmove(win,(y),(x)) == ERR ? ERR : waddwstr((win),(wstr))) ++#define mvwget_wch(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : wget_wch((win),(c))) ++#define mvwget_wstr(win,y,x,t) (wmove(win,(y),(x)) == ERR ? ERR : wget_wstr((win),(t))) ++#define mvwgetn_wstr(win,y,x,t,n) (wmove(win,(y),(x)) == ERR ? ERR : wgetn_wstr((win),(t),(n))) ++#define mvwhline_set(win,y,x,c,n) (wmove(win,(y),(x)) == ERR ? ERR : whline_set((win),(c),(n))) ++#define mvwin_wch(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : win_wch((win),(c))) ++#define mvwin_wchnstr(win,y,x,c,n) (wmove(win,(y),(x)) == ERR ? ERR : win_wchnstr((win),(c),(n))) ++#define mvwin_wchstr(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : win_wchstr((win),(c))) ++#define mvwinnwstr(win,y,x,c,n) (wmove(win,(y),(x)) == ERR ? ERR : winnwstr((win),(c),(n))) ++#define mvwins_nwstr(win,y,x,t,n) (wmove(win,(y),(x)) == ERR ? ERR : wins_nwstr((win),(t),(n))) ++#define mvwins_wch(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : wins_wch((win),(c))) ++#define mvwins_wstr(win,y,x,t) (wmove(win,(y),(x)) == ERR ? ERR : wins_wstr((win),(t))) ++#define mvwinwstr(win,y,x,c) (wmove(win,(y),(x)) == ERR ? ERR : winwstr((win),(c))) ++#define mvwvline_set(win,y,x,c,n) (wmove(win,(y),(x)) == ERR ? ERR : wvline_set((win),(c),(n))) + + #endif /* NCURSES_NOMACROS */ + +diff -Naur ncurses-5.9.orig/include/headers ncurses-5.9/include/headers +--- ncurses-5.9.orig/include/headers 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/headers 2012-08-25 19:58:02.046555098 +0000 +@@ -1,6 +1,6 @@ +-# $Id: headers,v 1.10 2009/09/05 17:46:30 tom Exp $ ++# $Id: headers,v 1.12 2012/07/28 22:41:34 Roumen.Petrov Exp $ + ############################################################################## +-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -29,14 +29,23 @@ + # + # Author: Thomas E. Dickey 1996-on + # +-term.h + curses.h + unctrl.h +-termcap.h + ncurses_dll.h ++ ++# Support for termcap (and tic, etc.), which can be a separate library ++@ termlib ++term.h ++termcap.h ++ ++# Headers used only for tic, other programs using internal interfaces + @ ticlib + $(srcdir)/tic.h + $(srcdir)/term_entry.h + $(srcdir)/nc_tparm.h + ++# Porting ++@ port_win32con ++$(srcdir)/ncurses_mingw.h ++ + # vile:makemode +diff -Naur ncurses-5.9.orig/include/nc_alloc.h ncurses-5.9/include/nc_alloc.h +--- ncurses-5.9.orig/include/nc_alloc.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/nc_alloc.h 2012-08-25 19:57:59.989898157 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,10 +29,11 @@ + /**************************************************************************** + * Author: Thomas E. Dickey 1996-on * + ****************************************************************************/ +-/* $Id: nc_alloc.h,v 1.18 2010/11/20 22:59:49 tom Exp $ */ ++/* $Id: nc_alloc.h,v 1.19 2011/10/22 16:54:57 tom Exp $ */ + + #ifndef NC_ALLOC_included + #define NC_ALLOC_included 1 ++/* *INDENT-OFF* */ + + #ifdef __cplusplus + extern "C" { +@@ -101,12 +102,14 @@ + /* entries.c */ + extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void); + +-#define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type)) +-#define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type)) +-#define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type)) ++#define typeMalloc(type,elts) (type *)malloc((size_t)(elts)*sizeof(type)) ++#define typeCalloc(type,elts) (type *)calloc((size_t)(elts),sizeof(type)) ++#define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (size_t)(elts)*sizeof(type)) + + #ifdef __cplusplus + } + #endif + ++/* *INDENT-ON* */ ++ + #endif /* NC_ALLOC_included */ +diff -Naur ncurses-5.9.orig/include/nc_string.h ncurses-5.9/include/nc_string.h +--- ncurses-5.9.orig/include/nc_string.h 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/include/nc_string.h 2012-08-25 19:58:00.906560490 +0000 +@@ -0,0 +1,77 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++ ++#ifndef STRING_HACKS_H ++#define STRING_HACKS_H 1 ++ ++#include <ncurses_cfg.h> ++ ++/* ++ * $Id: nc_string.h,v 1.3 2012/02/23 10:21:17 tom Exp $ ++ * ++ * String-hacks. Use these macros to stifle warnings on (presumably) correct ++ * uses of strcat, strcpy and sprintf. ++ * ++ * By the way - ++ * A fundamental limitation of the interfaces (and frequent issue in bug ++ * reports using these functions) is that sizes are passed as unsigned values ++ * (with associated sign-extension problems), limiting their effectiveness ++ * when checking for buffer overflow. ++ */ ++ ++#ifdef __cplusplus ++#define NCURSES_VOID /* nothing */ ++#else ++#define NCURSES_VOID (void) ++#endif ++ ++#if USE_STRING_HACKS && HAVE_STRLCAT ++#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),(n)) ++#else ++#define _nc_STRCAT(d,s,n) NCURSES_VOID strcat((d),(s)) ++#endif ++ ++#if USE_STRING_HACKS && HAVE_STRLCPY ++#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),(n)) ++#else ++#define _nc_STRCPY(d,s,n) NCURSES_VOID strcpy((d),(s)) ++#endif ++ ++#if USE_STRING_HACKS && HAVE_SNPRINTF ++#define _nc_SPRINTF NCURSES_VOID snprintf ++#define _nc_SLIMIT(n) (n), ++#else ++#define _nc_SPRINTF NCURSES_VOID sprintf ++#define _nc_SLIMIT(n) /* nothing */ ++#endif ++ ++#endif /* STRING_HACKS_H */ +diff -Naur ncurses-5.9.orig/include/nc_termios.h ncurses-5.9/include/nc_termios.h +--- ncurses-5.9.orig/include/nc_termios.h 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/include/nc_termios.h 2012-08-25 19:57:59.989898157 +0000 +@@ -0,0 +1,171 @@ ++/**************************************************************************** ++ * Copyright (c) 2011 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2011 * ++ ****************************************************************************/ ++ ++/* $Id: nc_termios.h,v 1.2 2011/06/25 20:44:05 tom Exp $ */ ++ ++#ifndef NC_TERMIOS_included ++#define NC_TERMIOS_included 1 ++ ++#if HAVE_TERMIOS_H && HAVE_TCGETATTR ++ ++#else /* !HAVE_TERMIOS_H */ ++ ++#if HAVE_TERMIO_H ++ ++/* Add definitions to make termio look like termios. ++ * But ifdef it, since there are some implementations ++ * that try to do this for us in a fake <termio.h>. ++ */ ++#ifndef TCSADRAIN ++#define TCSADRAIN TCSETAW ++#endif ++#ifndef TCSAFLUSH ++#define TCSAFLUSH TCSETAF ++#endif ++#ifndef tcsetattr ++#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg) ++#endif ++#ifndef tcgetattr ++#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg) ++#endif ++#ifndef cfgetospeed ++#define cfgetospeed(t) ((t)->c_cflag & CBAUD) ++#endif ++#ifndef TCIFLUSH ++#define TCIFLUSH 0 ++#endif ++#ifndef tcflush ++#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg) ++#endif ++ ++#else /* !HAVE_TERMIO_H */ ++ ++#if __MINGW32__ ++ ++/* c_cc chars */ ++#define VINTR 0 ++#define VQUIT 1 ++#define VERASE 2 ++#define VKILL 3 ++#define VEOF 4 ++#define VTIME 5 ++#define VMIN 6 ++ ++/* c_iflag bits */ ++#define ISTRIP 0000040 ++#define INLCR 0000100 ++#define IGNCR 0000200 ++#define ICRNL 0000400 ++#define BRKINT 0000002 ++#define PARMRK 0000010 ++#define IXON 0002000 ++#define IGNBRK 0000001 ++#define IGNPAR 0000004 ++#define INPCK 0000020 ++#define IXOFF 0010000 ++ ++/* c_oflag bits */ ++#define OPOST 0000001 ++ ++/* c_cflag bit meaning */ ++#define CBAUD 0010017 ++#define CSIZE 0000060 ++#define CS8 0000060 ++#define B0 0000000 ++#define B50 0000001 ++#define B75 0000002 ++#define B110 0000003 ++#define B134 0000004 ++#define B150 0000005 ++#define B200 0000006 ++#define B300 0000007 ++#define B600 0000010 ++#define B1200 0000011 ++#define B1800 0000012 ++#define B2400 0000013 ++#define B4800 0000014 ++#define B9600 0000015 ++#define CLOCAL 0004000 ++#define CREAD 0000200 ++#define CSTOPB 0000100 ++#define HUPCL 0002000 ++#define PARENB 0000400 ++#define PARODD 0001000 ++ ++/* c_lflag bits */ ++#define ECHO 0000010 ++#define ECHONL 0000100 ++#define ISIG 0000001 ++#define IEXTEN 0100000 ++#define ICANON 0000002 ++#define NOFLSH 0000200 ++#define ECHOE 0000020 ++#define ECHOK 0000040 ++ ++/* tcflush() */ ++#define TCIFLUSH 0 ++ ++/* tcsetattr uses these */ ++#define TCSADRAIN 1 ++ ++/* ioctls */ ++#define TCGETA 0x5405 ++#define TCFLSH 0x540B ++#define TIOCGWINSZ 0x5413 ++ ++#ifndef cfgetospeed ++#define cfgetospeed(t) ((t)->c_cflag & CBAUD) ++#endif ++ ++#ifndef tcsetattr ++#define tcsetattr(fd, cmd, arg) _nc_mingw_ioctl(fd, cmd, arg) ++#endif ++ ++#ifndef tcgetattr ++#define tcgetattr(fd, arg) _nc_mingw_ioctl(fd, TCGETA, arg) ++#endif ++ ++#ifndef tcflush ++#define tcflush(fd, arg) _nc_mingw_ioctl(fd, TCFLSH, arg) ++#endif ++ ++#undef ttyname ++#define ttyname(fd) NULL ++ ++#else ++ ++#endif /* __MINGW32__ */ ++#endif /* HAVE_TERMIO_H */ ++ ++#endif /* HAVE_TERMIOS_H */ ++ ++#endif /* NC_TERMIOS_included */ +diff -Naur ncurses-5.9.orig/include/nc_tparm.h ncurses-5.9/include/nc_tparm.h +--- ncurses-5.9.orig/include/nc_tparm.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/nc_tparm.h 2012-08-25 19:58:00.829894185 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,7 +30,7 @@ + * Author: Thomas E. Dickey 2006 * + ****************************************************************************/ + +-/* $Id: nc_tparm.h,v 1.5 2010/12/25 20:27:22 tom Exp $ */ ++/* $Id: nc_tparm.h,v 1.6 2012/02/18 21:34:42 tom Exp $ */ + + #ifndef NC_TPARM_included + #define NC_TPARM_included 1 +@@ -40,8 +40,12 @@ + * assumption of the varargs code. + */ + #ifndef TPARM_ARG ++#ifdef NCURSES_TPARM_ARG ++#define TPARM_ARG NCURSES_TPARM_ARG ++#else + #define TPARM_ARG long + #endif ++#endif /* TPARAM_ARG */ + + #define TPARM_N(n) (TPARM_ARG)(n) + +diff -Naur ncurses-5.9.orig/include/ncurses_defs ncurses-5.9/include/ncurses_defs +--- ncurses-5.9.orig/include/ncurses_defs 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/ncurses_defs 2012-08-25 19:58:01.933222301 +0000 +@@ -1,6 +1,6 @@ +-# $Id: ncurses_defs,v 1.46 2011/03/22 09:17:59 tom Exp $ ++# $Id: ncurses_defs,v 1.54 2012/07/14 21:03:29 tom Exp $ + ############################################################################## +-# Copyright (c) 2000-2010,2011 Free Software Foundation, Inc. # ++# Copyright (c) 2000-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -34,6 +34,7 @@ + BROKEN_LINKER + BSD_TPUTS + CC_HAS_PROTOS ++CGETENT_CONST /* nothing */ + CPP_HAS_PARAM_INIT + CURSES_ACS_ARRAY acs_map + CURSES_WACS_ARRAY _nc_wacs +@@ -41,6 +42,7 @@ + ETIP_NEEDS_MATH_H + GCC_NORETURN /* nothing */ + GCC_UNUSED /* nothing */ ++HAVE_ASSUME_DEFAULT_COLORS + HAVE_BIG_CORE + HAVE_BSD_CGETENT + HAVE_BSD_SIGNAL_H +@@ -102,6 +104,7 @@ + HAVE_POLL + HAVE_POLL_H + HAVE_PURIFY ++HAVE_PUTENV + HAVE_PUTWC + HAVE_PUTWIN 1 + HAVE_REGEXPR_H_FUNCS +@@ -115,6 +118,7 @@ + HAVE_SELECT + HAVE_SETBUF + HAVE_SETBUFFER ++HAVE_SETENV + HAVE_SETUPTERM 1 + HAVE_SETVBUF + HAVE_SGTTY_H +@@ -123,7 +127,11 @@ + HAVE_SIZECHANGE + HAVE_SLK_COLOR + HAVE_SLK_INIT 1 ++HAVE_SNPRINTF ++HAVE_STDINT_H + HAVE_STRDUP ++HAVE_STRLCAT ++HAVE_STRLCPY + HAVE_STRSTR + HAVE_SYMLINK + HAVE_SYS_BSDTYPES_H +@@ -153,9 +161,12 @@ + HAVE_TYPEINFO + HAVE_TYPE_ATTR_T + HAVE_TYPE_SIGACTION ++HAVE_UNCTRL_H 1 + HAVE_UNISTD_H + HAVE_UNLINK + HAVE_USE_DEFAULT_COLORS ++HAVE_USE_SCREEN ++HAVE_USE_WINDOW + HAVE_VFSCANF + HAVE_VSNPRINTF + HAVE_VSSCANF +@@ -176,6 +187,7 @@ + NCURSES_EXT_FUNCS + NCURSES_NO_PADDING + NCURSES_PATHSEP ':' ++NCURSES_WIDECHAR + NEED_PTEM_H + NO_LEAKS + PURE_TERMINFO +@@ -205,6 +217,7 @@ + USE_SAFE_SPRINTF + USE_SCROLL_HINTS + USE_SIGWINCH ++USE_STRING_HACKS + USE_SYMLINKS + USE_SYSMOUSE + USE_TERMCAP +diff -Naur ncurses-5.9.orig/include/ncurses_mingw.h ncurses-5.9/include/ncurses_mingw.h +--- ncurses-5.9.orig/include/ncurses_mingw.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/ncurses_mingw.h 2012-08-25 19:57:59.993231475 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -31,10 +31,10 @@ + * * + ****************************************************************************/ + +-/* $Id: ncurses_mingw.h,v 1.1 2008/12/14 19:22:16 juergen Exp $ */ ++/* $Id: ncurses_mingw.h,v 1.2 2011/06/25 20:51:00 tom Exp $ */ + + /* +- * This is a placholder up to now and describes what needs to be implemented ++ * This is a placeholder up to now and describes what needs to be implemented + * to support I/O to external terminals with ncurses on the Windows OS. + */ + +@@ -67,98 +67,8 @@ + speed_t c_ospeed; /* c_ospeed */ + }; + +-/* c_cc chars */ +-#define VINTR 0 +-#define VQUIT 1 +-#define VERASE 2 +-#define VKILL 3 +-#define VEOF 4 +-#define VTIME 5 +-#define VMIN 6 +- +-/* c_iflag bits */ +-#define ISTRIP 0000040 +-#define INLCR 0000100 +-#define IGNCR 0000200 +-#define ICRNL 0000400 +-#define BRKINT 0000002 +-#define PARMRK 0000010 +-#define IXON 0002000 +-#define IGNBRK 0000001 +-#define IGNPAR 0000004 +-#define INPCK 0000020 +-#define IXOFF 0010000 +- +-/* c_oflag bits */ +-#define OPOST 0000001 +- +-/* c_cflag bit meaning */ +-#define CBAUD 0010017 +-#define CSIZE 0000060 +-#define CS8 0000060 +-#define B0 0000000 +-#define B50 0000001 +-#define B75 0000002 +-#define B110 0000003 +-#define B134 0000004 +-#define B150 0000005 +-#define B200 0000006 +-#define B300 0000007 +-#define B600 0000010 +-#define B1200 0000011 +-#define B1800 0000012 +-#define B2400 0000013 +-#define B4800 0000014 +-#define B9600 0000015 +-#define CLOCAL 0004000 +-#define CREAD 0000200 +-#define CSTOPB 0000100 +-#define HUPCL 0002000 +-#define PARENB 0000400 +-#define PARODD 0001000 +- +-/* c_lflag bits */ +-#define ECHO 0000010 +-#define ECHONL 0000100 +-#define ISIG 0000001 +-#define IEXTEN 0100000 +-#define ICANON 0000002 +-#define NOFLSH 0000200 +-#define ECHOE 0000020 +-#define ECHOK 0000040 +- +-/* tcflush() */ +-#define TCIFLUSH 0 +- +-/* tcsetattr uses these */ +-#define TCSADRAIN 1 +- +-/* ioctls */ +-#define TCGETA 0x5405 +-#define TCFLSH 0x540B +-#define TIOCGWINSZ 0x5413 +- + extern int _nc_mingw_ioctl(int fd, long int request, struct termios* arg); + extern void _nc_set_term_driver(void* term); + +-#ifndef cfgetospeed +-#define cfgetospeed(t) ((t)->c_cflag & CBAUD) +-#endif +- +-#ifndef tcsetattr +-#define tcsetattr(fd, cmd, arg) _nc_mingw_ioctl(fd, cmd, arg) +-#endif +- +-#ifndef tcgetattr +-#define tcgetattr(fd, arg) _nc_mingw_ioctl(fd, TCGETA, arg) +-#endif +- +-#ifndef tcflush +-#define tcflush(fd, arg) _nc_mingw_ioctl(fd, TCFLSH, arg) +-#endif +- +-#undef ttyname +-#define ttyname(fd) NULL +- +-#endif +-#endif ++#endif /* _NC_MINGWH */ ++#endif /* __MINGW32__ */ +diff -Naur ncurses-5.9.orig/include/term_entry.h ncurses-5.9/include/term_entry.h +--- ncurses-5.9.orig/include/term_entry.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/term_entry.h 2012-08-25 19:58:00.956560253 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,7 +32,7 @@ + * and: Thomas E. Dickey 1998-on * + ****************************************************************************/ + +-/* $Id: term_entry.h,v 1.37 2009/07/11 16:52:29 tom Exp $ */ ++/* $Id: term_entry.h,v 1.41 2012/02/29 11:57:03 tom Exp $ */ + + /* + * term_entry.h -- interface to entry-manipulation code +@@ -47,6 +47,24 @@ + + #include <term.h> + ++/* db_iterator.c */ ++typedef enum { ++ dbdTIC = 0, ++#if USE_DATABASE ++ dbdEnvOnce, ++ dbdHome, ++ dbdEnvList, ++ dbdCfgList, ++ dbdCfgOnce, ++#endif ++#if USE_TERMCAP ++ dbdEnvOnce2, ++ dbdEnvList2, ++ dbdCfgList2, ++#endif ++ dbdLAST ++} DBDIRS; ++ + #define MAX_USES 32 + #define MAX_CROSSLINKS 16 + +@@ -132,7 +150,7 @@ + + /* alloc_ttype.c: elementary allocation code */ + extern NCURSES_EXPORT(void) _nc_align_termtype (TERMTYPE *, TERMTYPE *); +-extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, TERMTYPE *); ++extern NCURSES_EXPORT(void) _nc_copy_termtype (TERMTYPE *, const TERMTYPE *); + + /* free_ttype.c: elementary allocation code */ + extern NCURSES_EXPORT(void) _nc_free_termtype (TERMTYPE *); +diff -Naur ncurses-5.9.orig/include/tic.h ncurses-5.9/include/tic.h +--- ncurses-5.9.orig/include/tic.h 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/include/tic.h 2012-08-25 19:58:01.036559874 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,14 +33,14 @@ + ****************************************************************************/ + + /* +- * $Id: tic.h,v 1.65 2009/08/08 17:52:46 tom Exp $ ++ * $Id: tic.h,v 1.69 2012/03/17 18:22:10 tom Exp $ + * tic.h - Global variables and structures for the terminfo + * compiler. + */ + + #ifndef __TIC_H + #define __TIC_H +- ++/* *INDENT-OFF* */ + #ifdef __cplusplus + extern "C" { + #endif +@@ -224,6 +224,12 @@ + + #define NOTFOUND ((struct name_table_entry *) 0) + ++/* ++ * The casts are required for correct sign-propagation with systems such as ++ * AIX, IRIX64, Solaris which default to unsigned characters. The C standard ++ * leaves this detail unspecified. ++ */ ++ + /* out-of-band values for representing absent capabilities */ + #define ABSENT_BOOLEAN ((signed char)-1) /* 255 */ + #define ABSENT_NUMERIC (-1) +@@ -248,6 +254,8 @@ + #define TERMINFO "/usr/share/terminfo" + #endif + ++#ifdef NCURSES_TERM_ENTRY_H_incl ++ + /* access.c */ + extern NCURSES_EXPORT(unsigned) _nc_pathlast (const char *); + extern NCURSES_EXPORT(bool) _nc_is_abs_path (const char *); +@@ -270,6 +278,7 @@ + extern NCURSES_EXPORT_VAR(int) _nc_curr_col; + extern NCURSES_EXPORT_VAR(int) _nc_curr_line; + extern NCURSES_EXPORT_VAR(int) _nc_syntax; ++extern NCURSES_EXPORT_VAR(int) _nc_strict_bsd; + extern NCURSES_EXPORT_VAR(long) _nc_comment_end; + extern NCURSES_EXPORT_VAR(long) _nc_comment_start; + extern NCURSES_EXPORT_VAR(long) _nc_curr_file_pos; +@@ -314,23 +323,6 @@ + extern const char * _nc_progname; + + /* db_iterator.c */ +-typedef enum { +- dbdTIC = 0, +-#if USE_DATABASE +- dbdEnvOnce, +- dbdHome, +- dbdEnvList, +- dbdCfgList, +- dbdCfgOnce, +-#endif +-#if USE_TERMCAP +- dbdEnvOnce2, +- dbdEnvList2, +- dbdCfgList2, +-#endif +- dbdLAST +-} DBDIRS; +- + extern NCURSES_EXPORT(const char *) _nc_next_db(DBDIRS *, int *); + extern NCURSES_EXPORT(const char *) _nc_tic_dir (const char *); + extern NCURSES_EXPORT(void) _nc_first_db(DBDIRS *, int *); +@@ -339,8 +331,11 @@ + /* write_entry.c */ + extern NCURSES_EXPORT(int) _nc_tic_written (void); + ++#endif /* NCURSES_TERM_ENTRY_H_incl */ ++ + #ifdef __cplusplus + } + #endif + ++/* *INDENT-ON* */ + #endif /* __TIC_H */ +diff -Naur ncurses-5.9.orig/man/Makefile.in ncurses-5.9/man/Makefile.in +--- ncurses-5.9.orig/man/Makefile.in 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/Makefile.in 2012-08-25 19:58:02.359886951 +0000 +@@ -1,4 +1,4 @@ +-# $Id: Makefile.in,v 1.45 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.46 2012/08/11 21:31:56 tom Exp $ + ############################################################################## + # Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. # + # # +@@ -41,6 +41,7 @@ + srcdir = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + mandir = @mandir@ + +diff -Naur ncurses-5.9.orig/man/curs_getch.3x ncurses-5.9/man/curs_getch.3x +--- ncurses-5.9.orig/man/curs_getch.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/curs_getch.3x 2012-08-25 19:58:01.893222491 +0000 +@@ -1,6 +1,6 @@ + '\" t + .\"*************************************************************************** +-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_getch.3x,v 1.36 2011/01/22 19:38:51 tom Exp $ ++.\" $Id: curs_getch.3x,v 1.37 2012/07/07 20:04:56 tom Exp $ + .TH curs_getch 3X "" + .na + .hy 0 +@@ -237,14 +237,14 @@ + All routines return the integer \fBERR\fR upon failure and an integer value + other than \fBERR\fR (\fBOK\fR in the case of ungetch()) upon successful + completion. +-.RS ++.RS 3 + .TP 5 + \fBungetch\fP +-returns an error ++returns ERR + if there is no more room in the FIFO. +-.TP 5 ++.TP + \fBwgetch\fP +-returns an error ++returns ERR + if the window pointer is null, or + if its timeout expires without having any data. + .RE +diff -Naur ncurses-5.9.orig/man/curs_inopts.3x ncurses-5.9/man/curs_inopts.3x +--- ncurses-5.9.orig/man/curs_inopts.3x 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/man/curs_inopts.3x 2012-08-25 19:58:01.296558645 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_inopts.3x,v 1.15 2010/12/04 18:40:45 tom Exp $ ++.\" $Id: curs_inopts.3x,v 1.17 2012/04/28 19:09:15 tom Exp $ + .TH curs_inopts 3X "" + .na + .hy 0 +@@ -223,6 +223,42 @@ + left the echo bit on at initialization, but the BSD \fBraw\fR call turned it + off as a side-effect. For best portability, set echo or noecho explicitly + just after initialization, even if your program remains in cooked mode. ++.PP ++When \fBkeypad\fP is first enabled, ++ncurses loads the key-definitions for the current terminal description. ++If the terminal description includes extended string capabilities, ++e.g., from using the \fB\-x\fP option of @TIC@, ++then ncurses also defines keys for the capabilities whose names ++begin with "k". ++The corresponding keycodes are generated and (depending on previous ++loads of terminal descriptions) may differ from one execution of a ++program to the next. ++The generated keycodes are recognized by the \fBkeyname\fP function ++(which will then return a name beginning with "k" denoting the ++terminfo capability name rather than "K", used for curses key-names). ++On the other hand, an application can use \fBdefine_key\fP to establish ++a specific keycode for a given string. ++This makes it possible for an application to check for an extended ++capability's presence with \fItigetstr\fP, ++and reassign the keycode to match its own needs. ++.PP ++Low-level applications can use \fBtigetstr\fP to obtain the definition ++of any particular string capability. ++Higher-level applications which use the curses \fBwgetch\fP ++and similar functions to return keycodes rely upon the order in which ++the strings are loaded. ++If more than one key definition has the same string value, ++then \fBwgetch\fP can return only one keycode. ++Most curses implementations (including ncurses) ++load key definitions in the order ++defined by the array of string capability names. ++The last key to be loaded determines the keycode which will be returned. ++In ncurses, you may also have extended capabilities interpreted as ++key definitions. ++These are loaded after the predefined keys, ++and if a capability's value is the same as a previously-loaded ++key definition, ++the later definition is the one used. + .SH NOTES + Note that \fBecho\fR, \fBnoecho\fR, \fBhalfdelay\fR, \fBintrflush\fR, + \fBmeta\fR, \fBnodelay\fR, \fBnotimeout\fR, \fBnoqiflush\fR, +@@ -233,4 +269,9 @@ + respectively. Mixing raw/noraw and cbreak/nocbreak calls leads to tty driver + control states that are hard to predict or understand; it is not recommended. + .SH SEE ALSO +-\fBcurses\fR(3X), \fBcurs_getch\fR(3X), \fBcurs_initscr\fR(3X), \fBtermio\fR(7) ++\fBcurses\fR(3X), ++\fBcurs_getch\fR(3X), ++\fBcurs_initscr\fR(3X), ++\fBcurs_util\fR(3X), ++\fBdefine_key\fR(3X), ++\fBtermio\fR(7) +diff -Naur ncurses-5.9.orig/man/curs_termcap.3x ncurses-5.9/man/curs_termcap.3x +--- ncurses-5.9.orig/man/curs_termcap.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/curs_termcap.3x 2012-08-25 19:57:59.993231475 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_termcap.3x,v 1.26 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: curs_termcap.3x,v 1.27 2011/10/15 21:11:24 tom Exp $ + .TH curs_termcap 3X "" + .na + .hy 0 +@@ -77,9 +77,37 @@ + terminfo entry has been compiled. + .PP + The \fBtgetent\fR routine loads the entry for \fIname\fR. +-It returns 1 on success, 0 if there is no such entry, and \-1 if the +-terminfo database could not be found. ++It returns: ++.RS 3 ++.TP 3 ++1 ++on success, ++.TP 3 ++0 ++if there is no such entry ++(or that it is a generic type, having too little information for curses ++applications to run), and ++.TP 3 ++\-1 ++if the terminfo database could not be found. ++.RE ++.PP ++This differs from the \fItermcap\fP library in two ways: ++.RS 3 ++.TP 3 ++- + The emulation ignores the buffer pointer \fIbp\fR. ++The \fItermcap\fP library would store a copy of the terminal ++description in the area referenced by this pointer. ++However, ncurses stores its terminal descriptions in compiled ++binary form, which is not the same thing. ++.TP 3 ++- ++There is a difference in return codes. ++The \fItermcap\fP library does not check if the terminal ++description is marked with the \fIgeneric\fP capability, ++or if the terminal description has cursor-addressing. ++.RE + .PP + The \fBtgetflag\fR routine gets the boolean entry for \fIid\fR, + or zero if it is not available. +diff -Naur ncurses-5.9.orig/man/curs_terminfo.3x ncurses-5.9/man/curs_terminfo.3x +--- ncurses-5.9.orig/man/curs_terminfo.3x 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/man/curs_terminfo.3x 2012-08-25 19:57:59.996564793 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1999-2008,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1999-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_terminfo.3x,v 1.35 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: curs_terminfo.3x,v 1.36 2011/12/17 23:31:40 tom Exp $ + .TH curs_terminfo 3X "" + .ds n 5 + .na +@@ -346,7 +346,7 @@ + This implementation allows the caller to use \-1's for the old ordinates. + In that case, the old location is unknown. + .PP +-Extended terminal capability names, e.g., as defined by \fBtic\ \-x\fP, ++Extended terminal capability names, e.g., as defined by \fB@TIC@\ \-x\fP, + are not stored in the arrays described in this section. + .SH SEE ALSO + \fBcurses\fR(3X), +diff -Naur ncurses-5.9.orig/man/curs_threads.3x ncurses-5.9/man/curs_threads.3x +--- ncurses-5.9.orig/man/curs_threads.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/curs_threads.3x 2012-08-25 19:58:01.483224428 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2008,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 2008-2010,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_threads.3x,v 1.18 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: curs_threads.3x,v 1.19 2012/05/26 17:03:26 tom Exp $ + .TH curs_threads 3X "" + .de bP + .IP \(bu 4 +@@ -51,9 +51,9 @@ + .br + \fBint set_tabsize(int size);\fR + .br +-\fBint use_screen(SCREEN *scr, NCURSES_WINDOW_CB func, void *data);\fR ++\fBint use_screen(SCREEN *scr, NCURSES_SCREEN_CB func, void *data);\fR + .br +-\fBint use_window(WINDOW *win, NCURSES_SCREEN_CB func, void *data);\fR ++\fBint use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data);\fR + .br + .SH DESCRIPTION + This implementation can be configured to provide rudimentary support +diff -Naur ncurses-5.9.orig/man/curs_util.3x ncurses-5.9/man/curs_util.3x +--- ncurses-5.9.orig/man/curs_util.3x 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/man/curs_util.3x 2012-08-25 19:58:02.023221875 +0000 +@@ -1,5 +1,6 @@ ++'\" t + .\"*************************************************************************** +-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: curs_util.3x,v 1.32 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: curs_util.3x,v 1.36 2012/07/21 18:51:10 tom Exp $ + .TH curs_util 3X "" + .de bP + .IP \(bu 4 +@@ -44,6 +45,7 @@ + \fBputwin\fR, + \fBunctrl\fR, + \fBuse_env\fR, ++\fBuse_tioctl\fR, + \fBwunctrl\fR \- miscellaneous \fBcurses\fR utility routines + .ad + .hy +@@ -64,6 +66,8 @@ + .br + \fBvoid use_env(bool f);\fR + .br ++\fBvoid use_tioctl(bool f);\fR ++.br + \fBint putwin(WINDOW *win, FILE *filep);\fR + .br + \fBWINDOW *getwin(FILE *filep);\fR +@@ -123,16 +127,70 @@ + The limitation arises because the \fBfilter\fP routine modifies the + in-memory copy of the terminal information. + .PP +-The \fBuse_env\fR routine, if used, is called before \fBinitscr\fR or +-\fBnewterm\fR are called. When called with \fBFALSE\fR as an +-argument, the values of \fBlines\fR and \fBcolumns\fR specified in the +-\fIterminfo\fR database will be used, even if environment variables +-\fBLINES\fR and \fBCOLUMNS\fR (used by default) are set, or if +-\fBcurses\fR is running in a window (in which case default behavior +-would be to use the window size if \fBLINES\fR and \fBCOLUMNS\fR are +-not set). +-Note that setting \fBLINES\fR or \fBCOLUMNS\fR overrides the +-corresponding size which may be obtained from the operating system. ++The \fBuse_env\fR routine, if used, ++should be called before \fBinitscr\fR or ++\fBnewterm\fR are called ++(because those compute the screen size). ++It modifies the way \fBncurses\fP treats environment variables ++when determining the screen size. ++.bP ++Normally ncurses looks first at the terminal database for the screen size. ++.IP ++If \fBuse_env\fP was called with \fBFALSE\fP for parameter, ++it stops here unless ++If \fBuse_tioctl\fP was also called with \fBTRUE\fP for parameter. ++.bP ++Then it asks for the screen size via operating system calls. ++If successful, ++it overrides the values from the terminal database. ++.bP ++Finally (unless \fBuse_env\fP was called with \fBFALSE\fP parameter), ++ncurses examines the \fBLINES\fR or \fBCOLUMNS\fR environment variables, ++using a value in those to override the results ++from the operating system or terminal database. ++.IP ++Ncurses also updates the screen size in response to SIGWINCH, ++unless overridden by the \fBLINES\fR or \fBCOLUMNS\fR environment variables, ++.PP ++The \fBuse_tioctl\fR routine, if used, ++should be called before \fBinitscr\fR or \fBnewterm\fR are called ++(because those compute the screen size). ++After \fBuse_tioctl\fR is called with \fBTRUE\fR as an argument, ++ncurses modifies the last step in its computation of screen size as follows: ++.bP ++checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables ++are set to a number greater than zero. ++.bP ++for each, ncurses updates the corresponding environment variable ++with the value that it has obtained via operating system call ++or from the terminal database. ++.bP ++ncurses re-fetches the value of the environment variables so that ++it is still the environment variables which set the screen size. ++.PP ++The \fBuse_env\fP and \fBuse_tioctl\fP routines combine as ++summarized here: ++.TS ++center tab(/); ++l l l ++_ _ _ ++lw7 lw7 lw40. ++\fIuse_env\fR/\fIuse_tioctl\fR/\fISummary\fR ++TRUE/FALSE/T{ ++This is the default behavior. ++ncurses uses operating system calls ++unless overridden by $LINES or $COLUMNS environment variables. ++T} ++TRUE/TRUE/T{ ++ncurses updates $LINES and $COLUMNS based on operating system calls. ++T} ++FALSE/TRUE/T{ ++ncurses ignores $LINES and $COLUMNS, uses operating system calls to obtain size. ++T} ++FALSE/FALSE/T{ ++ncurses relies on the terminal database to determine size. ++T} ++.TE + .PP + The \fBputwin\fR routine writes all data associated with window \fIwin\fR into + the file to which \fIfilep\fR points. This information can be later retrieved +@@ -224,7 +282,7 @@ + .PP + The \fBkeyname\fP function may return the names of user-defined + string capabilities which are defined in the terminfo entry via the \fB\-x\fP +-option of \fBtic\fP. ++option of \fB@TIC@\fP. + This implementation automatically assigns at run-time keycodes to + user-defined strings which begin with "k". + The keycodes start at KEY_MAX, but are not guaranteed to be +@@ -233,8 +291,8 @@ + The \fBuse_extended_names\fP function controls whether this data is + loaded when the terminal description is read by the library. + .PP +-The \fBnofilter\fP routine is specific to ncurses. +-It was not supported on Version 7, BSD or System V implementations. ++The \fBnofilter\fP and \fBuse_tioctl\fP routines are specific to ncurses. ++They were not supported on Version 7, BSD or System V implementations. + It is recommended that any code depending on ncurses extensions + be conditioned using NCURSES_VERSION. + .SH SEE ALSO +diff -Naur ncurses-5.9.orig/man/infocmp.1m ncurses-5.9/man/infocmp.1m +--- ncurses-5.9.orig/man/infocmp.1m 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/man/infocmp.1m 2012-08-25 19:58:01.486557746 +0000 +@@ -1,6 +1,6 @@ + '\" t + .\"*************************************************************************** +-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: infocmp.1m,v 1.46 2010/12/04 18:40:45 tom Exp $ ++.\" $Id: infocmp.1m,v 1.51 2012/05/26 21:32:01 tom Exp $ + .TH @INFOCMP@ 1M "" + .ds n 5 + .ds d @TERMINFO@ +@@ -37,10 +37,12 @@ + \fB@INFOCMP@\fR [\fB\-\ + 1\ + C\ ++D\ + E\ + F\ + G\ + I\ ++K\ + L\ + T\ + U\ +@@ -69,32 +71,40 @@ + \fB@INFOCMP@\fR can be used to compare a binary \fBterminfo\fR entry with other + terminfo entries, rewrite a \fBterminfo\fR description to take advantage of the + \fBuse=\fR terminfo field, or print out a \fBterminfo\fR description from the +-binary file (\fBterm\fR) in a variety of formats. In all cases, the boolean ++binary file (\fBterm\fR) in a variety of formats. ++In all cases, the boolean + fields will be printed first, followed by the numeric fields, followed by the + string fields. + .SS Default Options + If no options are specified and zero or one \fItermnames\fR are specified, the +-\fB\-I\fR option will be assumed. If more than one \fItermname\fR is specified, ++\fB\-I\fR option will be assumed. ++If more than one \fItermname\fR is specified, + the \fB\-d\fR option will be assumed. + .SS Comparison Options [\-d] [\-c] [\-n] + \fB@INFOCMP@\fR compares the \fBterminfo\fR description of the first terminal + \fItermname\fR with each of the descriptions given by the entries for the other +-terminal's \fItermnames\fR. If a capability is defined for only one of the ++terminal's \fItermnames\fR. ++If a capability is defined for only one of the + terminals, the value returned will depend on the type of the capability: + \fBF\fR for boolean variables, \fB\-1\fR for integer variables, and \fBNULL\fR + for string variables. + .PP + The \fB\-d\fR option produces a list of each capability that is different +-between two entries. This option is useful to show the difference between two ++between two entries. ++This option is useful to show the difference between two + entries, created by different people, for the same or similar terminals. + .PP + The \fB\-c\fR option produces a list of each capability that is common between +-two entries. Capabilities that are not set are ignored. This option can be ++two or more entries. ++Capabilities that are not set are ignored. ++This option can be + used as a quick check to see if the \fB\-u\fR option is worth using. + .PP +-The \fB\-n\fR option produces a list of each capability that is in neither +-entry. If no \fItermnames\fR are given, the environment variable \fBTERM\fR +-will be used for both of the \fItermnames\fR. This can be used as a quick ++The \fB\-n\fR option produces a list of each capability that is in none of ++the given entries. ++If no \fItermnames\fR are given, the environment variable \fBTERM\fR ++will be used for both of the \fItermnames\fR. ++This can be used as a quick + check to see if anything was left out of a description. + .SS Source Listing Options [\-I] [\-L] [\-C] [\-r] + The \fB\-I\fR, \fB\-L\fR, and \fB\-C\fR options will produce a source listing for +@@ -107,6 +117,7 @@ + \fB\-L\fR/use the long C variable name listed in <\fBterm.h\fR> + \fB\-C\fR/use the \fBtermcap\fR names + \fB\-r\fR/when using \fB\-C\fR, put out all capabilities in \fBtermcap\fR form ++\fB\-K\fR/modifies the \fB\-C\fP option, improving BSD-compatibility. + .TE + .PP + If no \fItermnames\fR are given, the environment variable \fBTERM\fR will be +@@ -114,26 +125,38 @@ + .PP + The source produced by the \fB\-C\fR option may be used directly as a + \fBtermcap\fR entry, but not all parameterized strings can be changed to +-the \fBtermcap\fR format. \fB@INFOCMP@\fR will attempt to convert most of the ++the \fBtermcap\fR format. ++\fB@INFOCMP@\fR will attempt to convert most of the + parameterized information, and anything not converted will be plainly marked in +-the output and commented out. These should be edited by hand. ++the output and commented out. ++These should be edited by hand. + .PP + All padding information for strings will be collected together and placed +-at the beginning of the string where \fBtermcap\fR expects it. Mandatory ++at the beginning of the string where \fBtermcap\fR expects it. ++Mandatory + padding (padding information with a trailing '/') will become optional. + .PP + All \fBtermcap\fR variables no longer supported by \fBterminfo\fR, but which +-are derivable from other \fBterminfo\fR variables, will be output. Not all ++are derivable from other \fBterminfo\fR variables, will be output. ++Not all + \fBterminfo\fR capabilities will be translated; only those variables which were +-part of \fBtermcap\fR will normally be output. Specifying the \fB\-r\fR option ++part of \fBtermcap\fR will normally be output. ++Specifying the \fB\-r\fR option + will take off this restriction, allowing all capabilities to be output in + \fItermcap\fR form. ++Normally you would use both the \fB\-C\fP and \fB\-r\fP options. ++The actual format used incorporates some improvements for escaped characters ++from terminfo format. ++For a stricter BSD-compatible translation, use the \fB\-K\fR option ++rather than \fB\-C\fP. + .PP + Note that because padding is collected to the beginning of the capability, not +-all capabilities are output. Mandatory padding is not supported. Because ++all capabilities are output. ++Mandatory padding is not supported. ++Because + \fBtermcap\fR strings are not as flexible, it is not always possible to convert +-a \fBterminfo\fR string capability into an equivalent \fBtermcap\fR format. A +-subsequent conversion of the \fBtermcap\fR file back into \fBterminfo\fR format ++a \fBterminfo\fR string capability into an equivalent \fBtermcap\fR format. ++A subsequent conversion of the \fBtermcap\fR file back into \fBterminfo\fR format + will not necessarily reproduce the original \fBterminfo\fR + source. + .PP +@@ -156,27 +179,33 @@ + .SS Use= Option [\-u] + The \fB\-u\fR option produces a \fBterminfo\fR source description of the first + terminal \fItermname\fR which is relative to the sum of the descriptions given +-by the entries for the other terminals \fItermnames\fR. It does this by ++by the entries for the other terminals \fItermnames\fR. ++It does this by + analyzing the differences between the first \fItermname\fR and the other + \fItermnames\fR and producing a description with \fBuse=\fR fields for the +-other terminals. In this manner, it is possible to retrofit generic terminfo +-entries into a terminal's description. Or, if two similar terminals exist, but ++other terminals. ++In this manner, it is possible to retrofit generic terminfo ++entries into a terminal's description. ++Or, if two similar terminals exist, but + were coded at different times or by different people so that each description + is a full description, using \fB@INFOCMP@\fR will show what can be done to change + one description to be relative to the other. + .PP + A capability will get printed with an at-sign (@) if it no longer exists in the + first \fItermname\fR, but one of the other \fItermname\fR entries contains a +-value for it. A capability's value gets printed if the value in the first ++value for it. ++A capability's value gets printed if the value in the first + \fItermname\fR is not found in any of the other \fItermname\fR entries, or if + the first of the other \fItermname\fR entries that has this capability gives a + different value for the capability than that in the first \fItermname\fR. + .PP +-The order of the other \fItermname\fR entries is significant. Since the +-terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities, ++The order of the other \fItermname\fR entries is significant. ++Since the ++terminfo compiler \fB@TIC@\fR does a left-to-right scan of the capabilities, + specifying two \fBuse=\fR entries that contain differing entries for the same + capabilities will produce different results depending on the order that the +-entries are given in. \fB@INFOCMP@\fR will flag any such inconsistencies between ++entries are given in. ++\fB@INFOCMP@\fR will flag any such inconsistencies between + the other \fItermname\fR entries as they are found. + .PP + Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that +@@ -187,29 +216,43 @@ + .PP + Another error that does not cause incorrect compiled files, but will slow down + the compilation time, is specifying extra \fBuse=\fR fields that are +-superfluous. \fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that ++superfluous. ++\fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that + were not needed. + .SS Changing Databases [\-A \fIdirectory\fR] [\-B \fIdirectory\fR] + The location of the compiled \fBterminfo\fR database is taken from the +-environment variable \fBTERMINFO\fR . If the variable is not defined, or the ++environment variable \fBTERMINFO\fR\ . ++If the variable is not defined, or the + terminal is not found in that location, the system \fBterminfo\fR database, +-in \fB@TERMINFO@\fR, will be used. The options \fB\-A\fR +-and \fB\-B\fR may be used to override this location. The \fB\-A\fR option will ++in \fB@TERMINFO@\fR, will be used. ++The options \fB\-A\fR ++and \fB\-B\fR may be used to override this location. ++The \fB\-A\fR option will + set \fBTERMINFO\fR for the first \fItermname\fR and the \fB\-B\fR option will +-set \fBTERMINFO\fR for the other \fItermnames\fR. With this, it is possible to ++set \fBTERMINFO\fR for the other \fItermnames\fR. ++With this, it is possible to + compare descriptions for a terminal with the same name located in two different +-databases. This is useful for comparing descriptions for the same terminal ++databases. ++This is useful for comparing descriptions for the same terminal + created by different people. + .SS Other Options + .TP 5 ++\fB\-0\fR ++causes the fields to be printed on one line, without wrapping. ++.TP 5 + \fB\-1\fR +-causes the fields to be printed out one to a line. Otherwise, ++causes the fields to be printed out one to a line. ++Otherwise, + the fields will be printed several to a line to a maximum width + of 60 characters. + .TP + \fB\-a\fR + tells \fB@INFOCMP@\fP to retain commented-out capabilities rather than discarding +-them. Capabilities are commented by prefixing them with a period. ++them. ++Capabilities are commented by prefixing them with a period. ++.TP ++\fB\-D\fR ++tells \fB@INFOCMP@\fP to print the database locations that it knows about, and exit. + .TP 5 + \fB\-E\fR + Dump the capabilities of the given terminal as tables, needed in +@@ -231,12 +274,15 @@ + for a given terminal type. + .TP 5 + \fB\-F\fR +-compare terminfo files. This assumes that two following arguments are +-filenames. The files are searched for pairwise matches between ++compare terminfo files. ++This assumes that two following arguments are filenames. ++The files are searched for pairwise matches between + entries, with two entries considered to match if any of their names do. + The report printed to standard output lists entries with no matches in +-the other file, and entries with more than one match. For entries +-with exactly one match it includes a difference report. Normally, ++the other file, and entries with more than one match. ++For entries ++with exactly one match it includes a difference report. ++Normally, + to reduce the volume of the report, use references are + not resolved before looking for differences, but resolution can be forced + by also specifying \fB\-r\fR. +@@ -255,14 +301,17 @@ + .TP 5 + \fB\-i\fR + Analyze the initialization (\fBis1\fR, \fBis2\fR, \fBis3\fR), and reset +-(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR), strings in the entry. For each string, the ++(\fBrs1\fR, \fBrs2\fR, \fBrs3\fR), strings in the entry. ++For each string, the + code tries to analyze it into actions in terms of the other capabilities in the + entry, certain X3.64/ISO 6429/ECMA\-48 capabilities, and certain DEC VT-series + private modes (the set of recognized special sequences has been selected for +-completeness over the existing terminfo database). Each report line consists ++completeness over the existing terminfo database). ++Each report line consists + of the capability name, followed by a colon and space, followed by a printable + expansion of the capability string with sections matching recognized actions +-translated into {}-bracketed descriptions. Here is a list of the DEC/ANSI ++translated into {}-bracketed descriptions. ++Here is a list of the DEC/ANSI + special sequences recognized: + i. + .TS +@@ -308,7 +357,8 @@ + .sp + It also recognizes a SGR action corresponding to ANSI/ISO 6429/ECMA Set + Graphics Rendition, with the values NORMAL, BOLD, UNDERLINE, BLINK, and +-REVERSE. All but NORMAL may be prefixed with `+' (turn on) or `\-' (turn off). ++REVERSE. ++All but NORMAL may be prefixed with `+' (turn on) or `\-' (turn off). + .PP + An SGR0 designates an empty highlight sequence (equivalent to {SGR:NORMAL}). + .TP 5 +@@ -323,12 +373,15 @@ + "\-" for absent capabilities, "@" for canceled rather than "NULL". + .TP 5 + \fB\-R\fR\fIsubset\fR +-Restrict output to a given subset. This option is for use with archaic ++Restrict output to a given subset. ++This option is for use with archaic + versions of terminfo like those on SVr1, Ultrix, or HP/UX that do not support + the full set of SVR4/XSI Curses terminfo; and variants such as AIX +-that have their own extensions incompatible with SVr4/XSI. Available terminfo ++that have their own extensions incompatible with SVr4/XSI. ++Available terminfo + subsets are "SVr1", "Ultrix", "HP", and "AIX"; see \fBterminfo\fR(\*n) for +-details. You can also choose the subset "BSD" which selects only capabilities ++details. ++You can also choose the subset "BSD" which selects only capabilities + with termcap equivalents recognized by 4.4BSD. + .TP + \fB\-s \fR\fI[d|i|l|c]\fR +@@ -362,7 +415,7 @@ + descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo). + .TP + \fB\-t\fR +-tells \fBtic\fP to discard commented-out capabilities. ++tells \fB@TIC@\fP to discard commented-out capabilities. + Normally when translating from terminfo to termcap, + untranslatable capabilities are commented-out. + .TP 5 +@@ -385,13 +438,15 @@ + \fB\-x\fR + print information for user-defined capabilities. + These are extensions to the terminfo repertoire which can be loaded +-using the \fB\-x\fR option of \fBtic\fP. ++using the \fB\-x\fR option of \fB@TIC@\fP. + .SH FILES + .TP 20 + \*d + Compiled terminal description database. + .SH EXTENSIONS + The ++\fB\-0\fR, ++\fB\-1\fR, + \fB\-E\fR, + \fB\-F\fR, + \fB\-G\fR, +@@ -410,7 +465,8 @@ + options are not supported in SVr4 curses. + .PP + The \fB\-r\fR option's notion of `termcap' capabilities is System V Release 4's. +-Actual BSD curses versions will have a more restricted set. To see only the ++Actual BSD curses versions will have a more restricted set. ++To see only the + 4.4BSD set, use \fB\-r\fR \fB\-RBSD\fR. + .SH BUGS + The \fB\-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode. +diff -Naur ncurses-5.9.orig/man/ncurses.3x ncurses-5.9/man/ncurses.3x +--- ncurses-5.9.orig/man/ncurses.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/ncurses.3x 2012-08-25 19:58:01.936555619 +0000 +@@ -1,6 +1,6 @@ + '\" t + .\"*************************************************************************** +-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: ncurses.3x,v 1.103 2011/02/05 23:21:29 tom Exp $ ++.\" $Id: ncurses.3x,v 1.107 2012/07/14 21:13:06 tom Exp $ + .hy 0 + .TH ncurses 3X "" + .de bP +@@ -108,9 +108,9 @@ + .sp + Before a \fBcurses\fR program is run, the tab stops of the terminal + should be set and its initialization strings, if defined, must be output. +-This can be done by executing the \fBtput init\fR command ++This can be done by executing the \fB@TPUT@ init\fR command + after the shell environment variable \fBTERM\fR has been exported. +-\fBtset(1)\fR is usually responsible for doing this. ++\fB@TSET@(1)\fR is usually responsible for doing this. + [See \fBterminfo\fR(\*n) for further details.] + .PP + The \fBncurses\fR library permits manipulation of data structures, +@@ -637,6 +637,7 @@ + use_env/\fBcurs_util\fR(3X) + use_extended_names/\fBcurs_extend\fR(3X)* + use_legacy_coding/\fBlegacy_coding\fR(3X)* ++use_tioctl/\fBcurs_util\fR(3X) + vid_attr/\fBcurs_terminfo\fR(3X) + vid_puts/\fBcurs_terminfo\fR(3X) + vidattr/\fBcurs_terminfo\fR(3X) +@@ -734,6 +735,9 @@ + integer value other than \fBERR\fR upon successful completion, unless + otherwise noted in the routine descriptions. + .PP ++As a general rule, routines check for null pointers passed as parameters, ++and handle this as an error. ++.PP + All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR, + \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR. + The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and +@@ -786,7 +790,9 @@ + a terminal description for terminals which are run as emulations. + .IP + Use the \fBuse_env\fR function to disable all use of external environment +-(including system calls) to determine the screen size. ++(but not including system calls) to determine the screen size. ++Use the \fBuse_tioctl\fR function to update \fBCOLUMNS\fP or \fBLINES\fP ++to match the screen size obtained from system calls or the terminal database. + .TP 5 + ESCDELAY + Specifies the total time, in milliseconds, for which ncurses will +@@ -933,7 +939,7 @@ + .IP + As an alternative to the environment variable, + ncurses checks for an extended terminfo capability \fBU8\fP. +-This is a numeric capability which can be compiled using \fBtic\ \-x\fP. ++This is a numeric capability which can be compiled using \fB@TIC@\ \-x\fP. + For example + .RS 5 + .sp +@@ -1004,6 +1010,13 @@ + The list is separated by colons (i.e., ":") on Unix, semicolons on OS/2 EMX. + All of the terminal descriptions are in terminfo form, which makes + a subdirectory named for the first letter of the terminal names therein. ++.IP ++If \fBncurses\fP is built with a hashed database, ++then each entry in this list can also be the path of the corresponding ++database file. ++.IP ++If \fBncurses\fP is built with a support for reading termcap files ++directly, then an entry in this list may be the path of a termcap file. + .TP 5 + TERMPATH + If TERMCAP does not hold a file name then \fBncurses\fR checks +@@ -1144,6 +1157,15 @@ + the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR + sections of the library man pages. + .PP ++Unlike other implementations, this one checks parameters such as pointers ++to WINDOW structures to ensure they are not null. ++The main reason for providing this behavior is to guard against programmer ++error. ++The standard interface does not provide a way for the library ++to tell an application which of several possible errors were detected. ++Relying on this (or some other) extension will adversely affect the ++portability of curses applications. ++.PP + This implementation also contains several extensions: + .bP + The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4. +diff -Naur ncurses-5.9.orig/man/resizeterm.3x ncurses-5.9/man/resizeterm.3x +--- ncurses-5.9.orig/man/resizeterm.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/resizeterm.3x 2012-08-25 19:58:01.893222491 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + .\" + .\" Author: Thomas E. Dickey 1996-2005 + .\" +-.\" $Id: resizeterm.3x,v 1.14 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: resizeterm.3x,v 1.15 2012/07/07 18:38:21 tom Exp $ + .TH resizeterm 3X "" + .SH NAME + \fBis_term_resized\fR, +@@ -86,8 +86,6 @@ + the operating system. + Thus, even if a SIGWINCH is received, + no screen size change may be recorded. +-In that case, no \fBKEY_RESIZE\fP is queued for the next call to \fBgetch\fP; +-an \fBERR\fP will be returned instead. + .SH SEE ALSO + \fBcurs_variables\fR(3X), + \fBwresize\fR(3X). +diff -Naur ncurses-5.9.orig/man/tabs.1 ncurses-5.9/man/tabs.1 +--- ncurses-5.9.orig/man/tabs.1 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/man/tabs.1 2012-08-25 19:57:59.999898111 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,19 +26,19 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tabs.1,v 1.8 2010/12/04 18:40:45 tom Exp $ ++.\" $Id: tabs.1,v 1.9 2011/12/17 23:31:59 tom Exp $ + .TH @TABS@ 1 "" + .ds n 5 + .SH NAME +-\fBtabs\fR \- set tabs on a terminal ++\fB@TABS@\fR \- set tabs on a terminal + .SH SYNOPSIS +-\fBtabs\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR ++\fB@TABS@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR + .br + .SH DESCRIPTION + .PP +-The \fBtabs\fP program clears and sets tab-stops on the terminal. ++The \fB@TABS@\fP program clears and sets tab-stops on the terminal. + This uses the terminfo \fIclear_all_tabs\fP and \fIset_tab\fP capabilities. +-If either is absent, \fBtabs\fP is unable to clear/set tab-stops. ++If either is absent, \fB@TABS@\fP is unable to clear/set tab-stops. + The terminal should be configured to use hard tabs, e.g., + .sp + .RS +@@ -48,8 +48,8 @@ + .SS General Options + .TP 5 + .BI \-T "name" +-Tell \fBtabs\fP which terminal type to use. +-If this option is not given, \fBtabs\fP will use the \fB$TERM\fP ++Tell \fB@TABS@\fP which terminal type to use. ++If this option is not given, \fB@TABS@\fP will use the \fB$TERM\fP + environment variable. + If that is not set, it will use the \fIansi+tabs\fP entry. + .TP 5 +@@ -59,10 +59,10 @@ + The second data line shows the actual tab-stops, marked with asterisks. + .TP 5 + .B \-n +-This option tells \fBtabs\fP to check the options and run any debugging ++This option tells \fB@TABS@\fP to check the options and run any debugging + option, but not to modify the terminal settings. + .PP +-The \fBtabs\fP program processes a single list of tab stops. ++The \fB@TABS@\fP program processes a single list of tab stops. + The last option to be processed which defines a list is the one that + determines the list to be processed. + .SS Implicit Lists +diff -Naur ncurses-5.9.orig/man/term.7 ncurses-5.9/man/term.7 +--- ncurses-5.9.orig/man/term.7 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/man/term.7 2012-08-25 19:57:59.999898111 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: term.7,v 1.22 2010/12/04 18:41:07 tom Exp $ ++.\" $Id: term.7,v 1.23 2011/12/17 23:32:17 tom Exp $ + .TH term 7 + .ds n 5 + .ds d @TERMINFO@ +@@ -55,7 +55,7 @@ + are in fact using a VT100-superset console, terminal, or terminal emulator.) + .PP + In any case, you are free to override the system \fBTERM\fR setting to your +-taste in your shell profile. The \fBtset\fP(1) utility may be of assistance; ++taste in your shell profile. The \fB@TSET@\fP(1) utility may be of assistance; + you can give it a set of rules for deducing or requesting a terminal type based + on the tty device and baud rate. + .PP +diff -Naur ncurses-5.9.orig/man/term_variables.3x ncurses-5.9/man/term_variables.3x +--- ncurses-5.9.orig/man/term_variables.3x 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/term_variables.3x 2012-08-25 19:57:59.999898111 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: term_variables.3x,v 1.2 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: term_variables.3x,v 1.3 2011/12/17 23:31:50 tom Exp $ + .TH term_variables 3X "" + .ds n 5 + .na +@@ -110,7 +110,7 @@ + Alternatively, one can save the return value from \fBnewterm\fP + or \fBsetupterm\fP to reuse in \fBset_term\fP. + .SS Terminfo Names +-The \fBtic\fP(1) and \fBinfocmp\fP(1) programs use lookup tables for ++The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for + the long and short names of terminfo capabilities, + as well as the corresponding names for termcap capabilities. + These are available to other applications, +diff -Naur ncurses-5.9.orig/man/terminfo.head ncurses-5.9/man/terminfo.head +--- ncurses-5.9.orig/man/terminfo.head 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/terminfo.head 2012-08-25 19:58:00.956560253 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,10 +26,13 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: terminfo.head,v 1.18 2010/07/31 16:08:48 tom Exp $ ++.\" $Id: terminfo.head,v 1.19 2012/03/01 09:51:23 tom Exp $ + .TH terminfo 5 "" "" "File Formats" + .ds n 5 + .ds d @TERMINFO@ ++.de bP ++.IP \(bu 4 ++.. + .SH NAME + terminfo \- terminal capability data base + .SH SYNOPSIS +diff -Naur ncurses-5.9.orig/man/terminfo.tail ncurses-5.9/man/terminfo.tail +--- ncurses-5.9.orig/man/terminfo.tail 2012-08-25 19:57:59.386567678 +0000 ++++ ncurses-5.9/man/terminfo.tail 2012-08-25 19:58:00.956560253 +0000 +@@ -1,4 +1,4 @@ +-.\" $Id: terminfo.tail,v 1.53 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: terminfo.tail,v 1.57 2012/03/01 12:02:54 tom Exp $ + .\" Beginning of terminfo.tail file + .\" This file is part of ncurses. + .\" See "terminfo.head" for copyright. +@@ -75,14 +75,29 @@ + \fB^x\fR maps to a control-x for any appropriate x, and the sequences + \fB\en \el \er \et \eb \ef \es\fR give + a newline, line-feed, return, tab, backspace, form-feed, and space. +-Other escapes include \fB\e^\fR for \fB^\fR, ++Other escapes include ++.bP ++\fB\e^\fR for \fB^\fR, ++.bP + \fB\e\e\fR for \fB\e\fR, ++.bP + \fB\e\fR, for comma, ++.bP + \fB\e:\fR for \fB:\fR, ++.bP + and \fB\e0\fR for null. +-(\fB\e0\fR will produce \e200, which does not terminate a string but behaves ++.IP ++\fB\e0\fR will produce \e200, which does not terminate a string but behaves + as a null character on most terminals, providing CS7 is specified. +-See stty(1).) ++See stty(1). ++.IP ++The reason for this quirk is to maintain binary compatibility of the ++compiled terminfo files with other implementations, ++e.g., the SVr4 systems, which document this. ++Compiled terminfo files use null-terminated strings, with no lengths. ++Modifying this would require a new binary format, ++which would not work with other implementations. ++.PP + Finally, characters may be given as three octal digits after a \fB\e\fR. + .PP + A delay in milliseconds may appear anywhere in a string capability, enclosed in +@@ -125,8 +140,8 @@ + for a compiled description. + If it fails to find one there, and the environment variable TERMINFO_DIRS is + set, it will interpret the contents of that variable as a list of colon- +-separated directories to be searched (an empty entry is interpreted as a +-command to search \fI\*d\fR). ++separated directories (or database files) to be searched ++(an empty entry is interpreted as a command to search \fI\*d\fR). + If no description is found in any of the + TERMINFO_DIRS directories, the fetch fails. + .PP +@@ -397,7 +412,7 @@ + .IP + where c\di\u are conditions, b\di\u are bodies. + .IP +-Use the \fB\-f\fP option of \fBtic\fP or \fB@INFOCMP@\fP to see ++Use the \fB\-f\fP option of \fB@TIC@\fP or \fB@INFOCMP@\fP to see + the structure of if-then-else's. + Some strings, e.g., \fBsgr\fP can be very complicated when written + on one line. +@@ -593,6 +608,7 @@ + a distinction between typed and untyped blanks on the screen, shifting + upon an insert or delete only to an untyped blank on the screen which is + either eliminated, or expanded to two untyped blanks. ++.PP + You can determine the + kind of terminal you have by clearing the screen and then typing + text separated by cursor motions. +@@ -608,6 +624,7 @@ + current line and onto the next as you insert, you have the second type of + terminal, and should give the capability \fBin\fR, which stands for + \*(lqinsert null\*(rq. ++.PP + While these are two logically separate attributes (one line versus multi-line + insert mode, and special treatment of untyped spaces) we have seen no + terminals whose insert mode cannot be described with the single attribute. +@@ -974,7 +991,7 @@ + .B it + is given, showing the number of spaces the tabs are set to. + This is normally used by the +-.IR tset ++.IR @TSET@ + command to determine whether to set the mode for hardware tab expansion, + and whether to set the tab stops. + If the terminal has tab stops that can be saved in non-volatile memory, +@@ -1570,19 +1587,15 @@ + backslash-newline pairs, which \fBtgetent()\fP strips out while reading it. + Some termcap libraries strip off the final newline, too (GNU termcap does not). + Now suppose: +-.TP 5 +-* ++.bP + a termcap entry before expansion is more than 1023 bytes long, +-.TP 5 +-* ++.bP + and the application has only allocated a 1k buffer, +-.TP 5 +-* ++.bP + and the termcap library (like the one in BSD/OS 1.1 and GNU) reads + the whole entry into the buffer, no matter what its length, to see + if it is the entry it wants, +-.TP 5 +-* ++.bP + and \fBtgetent()\fP is searching for a terminal type that either is the + long entry, appears in the termcap file after the long entry, or + does not appear in the file at all (so that \fBtgetent()\fP has to search +diff -Naur ncurses-5.9.orig/man/tic.1m ncurses-5.9/man/tic.1m +--- ncurses-5.9.orig/man/tic.1m 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/tic.1m 2012-08-25 19:58:01.059893097 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,19 +26,25 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tic.1m,v 1.47 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: tic.1m,v 1.55 2012/03/24 21:21:05 tom Exp $ + .TH @TIC@ 1M "" + .ds n 5 + .ds d @TERMINFO@ ++.de bP ++.IP \(bu 4 ++.. + .SH NAME +-\fBtic\fR \- the \fIterminfo\fR entry-description compiler ++\fB@TIC@\fR \- the \fIterminfo\fR entry-description compiler + .SH SYNOPSIS +-\fBtic\fR ++\fB@TIC@\fR + [\fB\-\ ++0\ + 1\ + C\ ++D\ + G\ + I\ ++K\ + L\ + N\ + T\ +@@ -61,31 +67,67 @@ + \fIfile\fR + .br + .SH DESCRIPTION +-The command \fBtic\fR translates a \fBterminfo\fR file from source ++The \fB@TIC@\fR command translates a \fBterminfo\fR file from source + format into compiled format. + The compiled format is necessary for use with + the library routines in \fBncurses\fR(3X). + .PP +-The results are normally placed in the system terminfo +-directory \fB\*d\fR. +-There are two ways to change this behavior. +-.PP +-First, you may override the system default by setting the variable +-\fBTERMINFO\fR in your shell environment to a valid (existing) directory name. +-.PP +-Secondly, if \fBtic\fR cannot get access to \fI\*d\fR or your TERMINFO +-directory, it looks for the directory \fI$HOME/.terminfo\fR; if that directory +-exists, the entry is placed there. +-.PP +-Libraries that read terminfo entries are expected to check for a TERMINFO +-directory first, look at \fI$HOME/.terminfo\fR if TERMINFO is not set, and +-finally look in \fI\*d\fR. ++As described in \fBterm\fR(\*n), the database may be either a directory ++tree (one file per terminal entry) or a hashed database (one record per entry). ++The \fB@TIC@\fR command writes only one type of entry, ++depending on how it was built: ++.bP ++For directory trees, the top-level directory, e.g., /usr/share/terminfo, ++specifies the location of the database. ++.bP ++For hashed databases, a filename is needed. ++If the given file is not found by that name, ++but can be found by adding the suffix ".db", ++then that is used. ++.IP ++The default name for the hashed database is the same as the ++default directory name (only adding a ".db" suffix). ++.PP ++In either case (directory or hashed database), ++\fB@TIC@\fP will create the container if it does not exist. ++For a directory, this would be the "terminfo" leaf, ++versus a "terminfo.db" file. ++.PP ++The results are normally placed in the system terminfo database \fB\*d\fR. ++The compiled terminal description can be placed ++in a different terminfo database. ++There are two ways to achieve this: ++.bP ++First, you may override the system default either by ++using the \fB\-o\fP option, ++or by setting the variable \fBTERMINFO\fR ++in your shell environment to a valid database location. ++.bP ++Secondly, if \fB@TIC@\fR cannot write in \fI\*d\fR ++or the location specified using your TERMINFO variable, ++it looks for the directory \fI$HOME/.terminfo\fR ++(or hashed database \fI$HOME/.terminfo.db)\fR; ++if that location exists, the entry is placed there. ++.PP ++Libraries that read terminfo entries are expected to check for ++.bP ++a location specified with the TERMINFO variable first, ++.bP ++look in \fI$HOME/.terminfo\fR if TERMINFO is not set, next ++.bP ++directories listed in the TERMINFO_DIRS symbol, and ++.bP ++finally look in the system terminfo database (\fI\*d\fR). ++.SS OPTIONS ++.TP ++\fB\-0\fR ++restricts the output to a single line + .TP + \fB\-1\fR + restricts the output to a single column + .TP + \fB\-a\fR +-tells \fBtic\fP to retain commented-out capabilities rather than discarding ++tells \fB@TIC@\fP to retain commented-out capabilities rather than discarding + them. + Capabilities are commented by prefixing them with a period. + This sets the \fB\-x\fR option, because it treats the commented-out +@@ -101,16 +143,30 @@ + Capabilities + that are not translatable are left in the entry under their terminfo names + but commented out with two preceding dots. ++The actual format used incorporates some improvements for escaped characters ++from terminfo format. ++For a stricter BSD-compatible translation, add the \fB\-K\fR option. + .TP + \fB\-c\fR +-tells \fBtic\fP to only check \fIfile\fR for errors, including syntax problems and ++tells \fB@TIC@\fP to only check \fIfile\fR for errors, including syntax problems and + bad use links. + If you specify \fB\-C\fR (\fB\-I\fR) with this option, the code + will print warnings about entries which, after use resolution, are more than + 1023 (4096) bytes long. +-Due to a fixed buffer length in older termcap +-libraries (and a documented limit in terminfo), these entries may cause core +-dumps. ++Due to a fixed buffer length in older termcap libraries, ++as well as buggy checking for the buffer length ++(and a documented limit in terminfo), ++these entries may cause core ++dumps with other implementations. ++.TP ++\fB\-D\fR ++tells \fB@TIC@\fP to print the database locations that it knows about, and exit. ++The first location shown is the one to which it would write compiled ++terminal descriptions. ++If \fB@TIC@\fP is not able to find a writable database location ++according to the rules summarized above, ++it will print a diagnostic and exit with an error rather than ++printing a list of database locations. + .TP + \fB\-e \fR\fInames\fR + Limit writes and translations to the following comma-separated list of +@@ -137,6 +193,10 @@ + \fB\-I\fR + Force source translation to terminfo format. + .TP ++\fB\-K\fR ++Suppress some longstanding ncurses extensions to termcap format, ++e.g., "\\s" for space. ++.TP + \fB\-L\fR + Force source translation to terminfo format + using the long C variable names listed in <\fBterm.h\fR> +@@ -155,9 +215,8 @@ + obsolete capabilities. + .TP + \fB\-o\fR\fIdir\fR +-Write compiled entries to given directory. +-Overrides the TERMINFO environment +-variable. ++Write compiled entries to given database location. ++Overrides the TERMINFO environment variable. + .TP + \fB\-R\fR\fIsubset\fR + Restrict output to a given subset. +@@ -177,7 +236,7 @@ + tc capabilities per entry. + .TP + \fB\-s\fR +-Summarize the compile by showing the directory into which entries ++Summarize the compile by showing the database location into which entries + are written, and the number of entries which are compiled. + .TP + \fB\-T\fR +@@ -186,12 +245,12 @@ + descriptions are limited (e.g., 1023 for termcap, 4096 for terminfo). + .TP + \fB\-t\fR +-tells \fBtic\fP to discard commented-out capabilities. ++tells \fB@TIC@\fP to discard commented-out capabilities. + Normally when translating from terminfo to termcap, + untranslatable capabilities are commented-out. + .TP 5 + \fB\-U\fR +-tells \fBtic\fP to not post-process the data after parsing the source file. ++tells \fB@TIC@\fP to not post-process the data after parsing the source file. + Normally, it infers data which is commonly missing in older terminfo data, + or in termcaps. + .TP +@@ -200,31 +259,13 @@ + .TP + \fB\-v\fR\fIn\fR + specifies that (verbose) output be written to standard error trace +-information showing \fBtic\fR's progress. ++information showing \fB@TIC@\fR's progress. + The optional parameter \fIn\fR is a number from 1 to 10, inclusive, + indicating the desired level of detail of information. + If \fIn\fR is omitted, the default level is 1. + If \fIn\fR is specified and greater than 1, the level of + detail is increased. +-.TP +-\fB\-w\fR\fIn\fR +-specifies the width of the output. +-The parameter is optional. +-If it is omitted, it defaults to 60. +-.TP +-\fB\-x\fR +-Treat unknown capabilities as user-defined. +-That is, if you supply a capability name which \fBtic\fP does not recognize, +-it will infer its type (boolean, number or string) from the syntax and +-make an extended table entry for that. +-User-defined capability strings +-whose name begins with ``k'' are treated as function keys. +-.TP +-\fIfile\fR +-contains one or more \fBterminfo\fR terminal descriptions in source +-format [see \fBterminfo\fR(\*n)]. +-Each description in the file +-describes the capabilities of a particular terminal. ++.RS + .PP + The debug flag levels are as follows: + .TP +@@ -250,19 +291,44 @@ + All values computed in construction of the hash table + .LP + If the debug level \fIn\fR is not given, it is taken to be one. ++.RE ++.TP ++\fB\-w\fR\fIn\fR ++specifies the width of the output. ++The parameter is optional. ++If it is omitted, it defaults to 60. ++.TP ++\fB\-x\fR ++Treat unknown capabilities as user-defined. ++That is, if you supply a capability name which \fB@TIC@\fP does not recognize, ++it will infer its type (boolean, number or string) from the syntax and ++make an extended table entry for that. ++User-defined capability strings ++whose name begins with ``k'' are treated as function keys. ++.SS PARAMETERS ++.TP ++\fIfile\fR ++contains one or more \fBterminfo\fR terminal descriptions in source ++format [see \fBterminfo\fR(\*n)]. ++Each description in the file ++describes the capabilities of a particular terminal. ++.IP ++If \fIfile\fR is ``-'', then the data is read from the standard input. ++The \fIfile\fR parameter may also be the path of a character-device. ++.SS PROCESSING + .PP +-All but one of the capabilities recognized by \fBtic\fR are documented ++All but one of the capabilities recognized by \fB@TIC@\fR are documented + in \fBterminfo\fR(\*n). + The exception is the \fBuse\fR capability. + .PP + When a \fBuse\fR=\fIentry\fR\-\fIname\fR field is discovered in a +-terminal entry currently being compiled, \fBtic\fR reads in the binary ++terminal entry currently being compiled, \fB@TIC@\fR reads in the binary + from \fB\*d\fR to complete the entry. + (Entries created from + \fIfile\fR will be used first. + If the environment variable +-\fBTERMINFO\fR is set, that directory is searched instead of +-\fB\*d\fR.) \fBtic\fR duplicates the capabilities in ++\fBTERMINFO\fR is set, that database location is searched instead of ++\fB\*d\fR.) \fB@TIC@\fR duplicates the capabilities in + \fIentry\fR\-\fIname\fR for the current entry, with the exception of + those capabilities that explicitly are defined in the current entry. + .PP +@@ -272,9 +338,6 @@ + \fBentry_name_1\fR before \fBuse=\fR for these capabilities to be + canceled in \fBentry_name_1\fR. + .PP +-If the environment variable \fBTERMINFO\fR is set, the compiled +-results are placed there instead of \fB\*d\fR. +-.PP + Total compiled entries cannot exceed 4096 bytes. + The name field cannot + exceed 512 bytes. +@@ -282,14 +345,14 @@ + (32 characters on systems with long filenames, 14 characters otherwise) + will be truncated to the maximum alias length and a warning message will be printed. + .SH COMPATIBILITY +-There is some evidence that historic \fBtic\fR implementations treated ++There is some evidence that historic \fB@TIC@\fR implementations treated + description fields with no whitespace in them as additional aliases or + short names. +-This \fBtic\fR does not do that, but it does warn when ++This \fB@TIC@\fR does not do that, but it does warn when + description fields may be treated that way and check them for dangerous + characters. + .SH EXTENSIONS +-Unlike the stock SVr4 \fBtic\fR command, this implementation can actually ++Unlike the stock SVr4 \fB@TIC@\fR command, this implementation can actually + compile termcap sources. + In fact, entries in terminfo and termcap syntax can + be mixed in a single source file. +@@ -298,16 +361,20 @@ + .PP + The SVr4 manual pages are not clear on the resolution rules for \fBuse\fR + capabilities. +-This implementation of \fBtic\fR will find \fBuse\fR targets anywhere ++This implementation of \fB@TIC@\fR will find \fBuse\fR targets anywhere + in the source file, or anywhere in the file tree rooted at \fBTERMINFO\fR (if +-\fBTERMINFO\fR is defined), or in the user's \fI$HOME/.terminfo\fR directory +-(if it exists), or (finally) anywhere in the system's file tree of ++\fBTERMINFO\fR is defined), ++or in the user's \fI$HOME/.terminfo\fR database ++(if it exists), ++or (finally) anywhere in the system's file tree of + compiled entries. + .PP +-The error messages from this \fBtic\fR have the same format as GNU C ++The error messages from this \fB@TIC@\fR have the same format as GNU C + error messages, and can be parsed by GNU Emacs's compile facility. + .PP + The ++\fB\-0\fR, ++\fB\-1\fR, + \fB\-C\fR, + \fB\-G\fR, + \fB\-I\fR, +@@ -329,7 +396,7 @@ + The SVr4 \fB\-c\fR mode does not report bad use links. + .PP + System V does not compile entries to or read entries from your +-\fI$HOME/.terminfo\fR directory unless TERMINFO is explicitly set to it. ++\fI$HOME/.terminfo\fR database unless TERMINFO is explicitly set to it. + .SH FILES + .TP 5 + \fB\*d/?/*\fR +@@ -340,6 +407,7 @@ + \fB@INFOTOCAP@\fR(1M), + \fB@TOE@\fR(1M), + \fBcurses\fR(3X), ++\fBterm\fR(\*n). + \fBterminfo\fR(\*n). + .PP + This describes \fBncurses\fR +diff -Naur ncurses-5.9.orig/man/toe.1m ncurses-5.9/man/toe.1m +--- ncurses-5.9.orig/man/toe.1m 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/man/toe.1m 2012-08-25 19:58:00.176563939 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,19 +26,19 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: toe.1m,v 1.23 2010/12/04 18:40:45 tom Exp $ ++.\" $Id: toe.1m,v 1.26 2012/01/01 00:40:51 tom Exp $ + .TH @TOE@ 1M "" + .ds n 5 + .ds d @TERMINFO@ + .SH NAME +-\fBtoe\fR \- table of (terminfo) entries ++\fB@TOE@\fR \- table of (terminfo) entries + .SH SYNOPSIS +-\fBtoe\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahuUV\fR] \fIfile...\fR ++\fB@TOE@\fR [\fB\-v\fR[\fIn\fR]] [\fB\-ahsuUV\fR] \fIfile...\fR + .br + .SH DESCRIPTION + .PP + With no options, +-\fBtoe\fR lists all available terminal types by primary name ++\fB@TOE@\fR lists all available terminal types by primary name + with descriptions. + File arguments specify the directories to be scanned; if no + such arguments are given, +@@ -52,6 +52,15 @@ + \fB\-a\fR + report on all of the terminal databases which ncurses would search, + rather than only the first one that it finds. ++.IP ++If the \fB\-s\fR is also given, \fB@TOE@\fR ++adds a column to the report, ++showing (like \fBconflict\fP(1)) which entries which ++belong to a given terminal database. ++An "*" marks entries which differ, and "+" marks equivalent entries. ++.TP ++\fB\-s\fR ++sort the output by the entry names. + .TP + \fB\-u\fR \fIfile\fR + says to write a report to the standard output, +@@ -78,7 +87,7 @@ + .TP + \fB\-v\fR\fIn\fR + specifies that (verbose) output be written to standard error, +-showing \fBtoe\fR's progress. ++showing \fB@TOE@\fR's progress. + The optional parameter \fIn\fR is a number from 1 to 10, + interpreted as for \fB@TIC@\fR(1M). + .TP +diff -Naur ncurses-5.9.orig/man/tput.1 ncurses-5.9/man/tput.1 +--- ncurses-5.9.orig/man/tput.1 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/tput.1 2012-08-25 19:58:01.936555619 +0000 +@@ -1,6 +1,6 @@ + '\" t + .\"*************************************************************************** +-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -27,7 +27,7 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tput.1,v 1.29 2010/12/04 18:41:07 tom Exp $ ++.\" $Id: tput.1,v 1.32 2012/07/14 21:06:45 tom Exp $ + .TH @TPUT@ 1 "" + .ds d @TERMINFO@ + .ds n 1 +@@ -77,11 +77,12 @@ + and the \fIcapname\fR associated with each, see \fBterminfo\fR(5). + .TP + \fB\-T\fR\fItype\fR +-indicates the \fItype\fR of terminal. Normally this option is ++indicates the \fItype\fR of terminal. ++Normally this option is + unnecessary, because the default is taken from the environment +-variable \fBTERM\fR. If \fB\-T\fR is specified, then the shell +-variables \fBLINES\fR and \fBCOLUMNS\fR will be ignored,and the +-operating system will not be queried for the actual screen size. ++variable \fBTERM\fR. ++If \fB\-T\fR is specified, then the shell ++variables \fBLINES\fR and \fBCOLUMNS\fR will also be ignored. + .TP + \fIcapname\fR + indicates the capability from the \fBterminfo\fR database. When +@@ -159,7 +160,7 @@ + .PP + If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the + same effect as \fB@TPUT@ reset\fR. +-See \fBtset\fR for comparison, which has similar behavior. ++See \fB@TSET@\fR for comparison, which has similar behavior. + .SH EXAMPLES + .TP 5 + \fB@TPUT@ init\fR +@@ -275,7 +276,7 @@ + .PP + Any other exit code indicates an error; see the DIAGNOSTICS section. + .SH DIAGNOSTICS +-\fBtput\fR prints the following error messages and sets the corresponding exit ++\fB@TPUT@\fR prints the following error messages and sets the corresponding exit + codes. + .PP + .ne 15 +@@ -303,17 +304,29 @@ + .PP + X/Open documents only the operands for \fBclear\fP, \fBinit\fP and \fBreset\fP. + In this implementation, \fBclear\fP is part of the \fIcapname\fR support. +-Other implementations of \fBtput\fP on ++Other implementations of \fB@TPUT@\fP on + SVr4-based systems such as Solaris, IRIX64 and HPUX + as well as others such as AIX and Tru64 + provide support for \fIcapname\fR operands. ++.PP + A few platforms such as FreeBSD and NetBSD recognize termcap names rather +-than terminfo capability names in their respective \fBtput\fP commands. ++than terminfo capability names in their respective \fB@TPUT@\fP commands. ++.PP ++Most implementations which provide support for \fIcapname\fR operands ++use the \fItparm\fP function to expand parameters in it. ++That function expects a mixture of numeric and string parameters, ++requiring \fB@TPUT@\fP to know which type to use. ++This implementation uses a table to determine that for ++the standard \fIcapname\fR operands, and an internal library ++function to analyze nonstandard \fIcapname\fR operands. ++Other implementations may simply guess that an operand containing only digits ++is intended to be a number. + .SH SEE ALSO + \fB@CLEAR@\fR(1), + \fBstty\fR(1), + \fBtabs\fR(\*n), +-\fBterminfo\fR(5). ++\fBterminfo\fR(5), ++\fBcurs_termcap\fR(3X). + .PP + This describes \fBncurses\fR + version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@). +diff -Naur ncurses-5.9.orig/man/tset.1 ncurses-5.9/man/tset.1 +--- ncurses-5.9.orig/man/tset.1 2012-08-25 19:57:59.389900995 +0000 ++++ ncurses-5.9/man/tset.1 2012-08-25 19:58:00.003231428 +0000 +@@ -1,5 +1,5 @@ + .\"*************************************************************************** +-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + .\" * + .\" Permission is hereby granted, free of charge, to any person obtaining a * + .\" copy of this software and associated documentation files (the * +@@ -26,12 +26,12 @@ + .\" authorization. * + .\"*************************************************************************** + .\" +-.\" $Id: tset.1,v 1.25 2010/12/04 18:38:55 tom Exp $ ++.\" $Id: tset.1,v 1.27 2011/12/17 23:20:35 tom Exp $ + .TH @TSET@ 1 "" + .SH NAME +-\fBtset\fR, \fBreset\fR \- terminal initialization ++\fB@TSET@\fR, \fBreset\fR \- terminal initialization + .SH SYNOPSIS +-\fBtset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] ++\fB@TSET@\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] + .br + \fBreset\fR [\fB\-IQVcqrsw\fR] [\fB\-\fR] [\fB\-e\fR \fIch\fR] [\fB\-i\fR \fIch\fR] [\fB\-k\fR \fIch\fR] [\fB\-m\fR \fImapping\fR] [\fIterminal\fR] + .SH DESCRIPTION +@@ -72,7 +72,7 @@ + versus the other initialization. + If neither option is given, both are assumed. + .PP +-When invoked as \fBreset\fR, \fBtset\fR sets cooked and echo modes, ++When invoked as \fBreset\fR, \fB@TSET@\fR sets cooked and echo modes, + turns off cbreak and raw modes, turns on newline translation and + resets any unset special characters to their default values before + doing the terminal initialization described above. This is useful +@@ -89,6 +89,7 @@ + .TP 5 + .B \-c + Set control characters and modes. ++.TP 5 + .B \-e + Set the erase character to \fIch\fR. + .TP +@@ -109,7 +110,7 @@ + .TP + .B \-Q + Do not display any values for the erase, interrupt and line kill characters. +-Normally \fBtset\fR displays the values for control characters which ++Normally \fB@TSET@\fR displays the values for control characters which + differ from the system's default values. + .TP + .B \-q +@@ -152,19 +153,19 @@ + \fBnoglob\fR, leaving it unset. The following line in the \fB.login\fR + or \fB.profile\fR files will initialize the environment correctly: + .sp +- eval \`tset \-s options ... \` ++ eval \`@TSET@ \-s options ... \` + . + .SH TERMINAL TYPE MAPPING + When the terminal is not hardwired into the system (or the current + system information is incorrect) the terminal type derived from the + \fI/etc/ttys\fR file or the \fBTERM\fR environmental variable is often + something generic like \fBnetwork\fR, \fBdialup\fR, or \fBunknown\fR. +-When \fBtset\fR is used in a startup script it is often desirable to ++When \fB@TSET@\fR is used in a startup script it is often desirable to + provide information about the type of terminal used on such ports. + .PP + The purpose of the \fB\-m\fR option is to map + from some set of conditions to a terminal type, that is, to +-tell \fBtset\fR ++tell \fB@TSET@\fR + ``If I'm on this port at a particular speed, guess that I'm on that + kind of terminal''. + .PP +@@ -207,20 +208,20 @@ + and that \fBcsh\fR users insert a backslash character (``\e'') before + any exclamation marks (``!''). + .SH HISTORY +-The \fBtset\fR command appeared in BSD 3.0. The \fBncurses\fR implementation ++The \fB@TSET@\fR command appeared in BSD 3.0. The \fBncurses\fR implementation + was lightly adapted from the 4.4BSD sources for a terminfo environment by Eric + S. Raymond <esr@snark.thyrsus.com>. + .SH COMPATIBILITY +-The \fBtset\fR utility has been provided for backward-compatibility with BSD ++The \fB@TSET@\fR utility has been provided for backward-compatibility with BSD + environments (under most modern UNIXes, \fB/etc/inittab\fR and \fIgetty\fR(1) + can set \fBTERM\fR appropriately for each dial-up line; this obviates what was +-\fBtset\fR's most important use). This implementation behaves like 4.4BSD ++\fB@TSET@\fR's most important use). This implementation behaves like 4.4BSD + tset, with a few exceptions specified here. + .PP + The \fB\-S\fR option of BSD tset no longer works; it prints an error message to stderr + and dies. The \fB\-s\fR option only sets \fBTERM\fR, not \fBTERMCAP\fP. Both these + changes are because the \fBTERMCAP\fR variable is no longer supported under +-terminfo-based \fBncurses\fR, which makes \fBtset \-S\fR useless (we made it die ++terminfo-based \fBncurses\fR, which makes \fB@TSET@ \-S\fR useless (we made it die + noisily rather than silently induce lossage). + .PP + There was an undocumented 4.4BSD feature that invoking tset via a link named +@@ -228,7 +229,7 @@ + terminal to use upper-case only. This feature has been omitted. + .PP + The \fB\-A\fR, \fB\-E\fR, \fB\-h\fR, \fB\-u\fR and \fB\-v\fR +-options were deleted from the \fBtset\fR ++options were deleted from the \fB@TSET@\fR + utility in 4.4BSD. + None of them were documented in 4.3BSD and all are + of limited utility at best. +@@ -243,14 +244,14 @@ + arguments, although it is strongly recommended that such usage be fixed to + explicitly specify the character. + .PP +-As of 4.4BSD, executing \fBtset\fR as \fBreset\fR no longer implies the \fB\-Q\fR ++As of 4.4BSD, executing \fB@TSET@\fR as \fBreset\fR no longer implies the \fB\-Q\fR + option. Also, the interaction between the \- option and the \fIterminal\fR +-argument in some historic implementations of \fBtset\fR has been removed. ++argument in some historic implementations of \fB@TSET@\fR has been removed. + .SH ENVIRONMENT +-The \fBtset\fR command uses these environment variables: ++The \fB@TSET@\fR command uses these environment variables: + .TP 5 + SHELL +-tells \fBtset\fP whether to initialize \fBTERM\fP using \fBsh\fP or ++tells \fB@TSET@\fP whether to initialize \fBTERM\fP using \fBsh\fP or + \fBcsh\fP syntax. + .TP 5 + TERM +@@ -260,7 +261,7 @@ + TERMCAP + may denote the location of a termcap database. + If it is not an absolute pathname, e.g., begins with a `/', +-\fBtset\fP removes the variable from the environment before looking ++\fB@TSET@\fP removes the variable from the environment before looking + for the terminal description. + .SH FILES + .TP 5 +diff -Naur ncurses-5.9.orig/menu/Makefile.in ncurses-5.9/menu/Makefile.in +--- ncurses-5.9.orig/menu/Makefile.in 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/Makefile.in 2012-08-25 19:58:00.003231428 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.55 2011/08/07 15:46:50 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -102,6 +102,7 @@ + SHLIB_DIRS = -L../lib + SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ + ++RPATH_LIST = @RPATH_LIST@ + MK_SHARED_LIB = @MK_SHARED_LIB@ + + NCURSES_MAJOR = @NCURSES_MAJOR@ +diff -Naur ncurses-5.9.orig/menu/m_attribs.c ncurses-5.9/menu/m_attribs.c +--- ncurses-5.9.orig/menu/m_attribs.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_attribs.c 2012-08-25 19:58:00.979893475 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_attribs.c,v 1.16 2010/01/23 21:16:54 tom Exp $") ++MODULE_ID("$Id: m_attribs.c,v 1.17 2012/03/10 23:43:41 tom Exp $") + + /* Macro to redraw menu if it is posted and changed */ + #define Refresh_Menu(menu) \ +@@ -51,7 +51,7 @@ + #define GEN_MENU_ATTR_SET_FCT( name ) \ + NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU* menu, chtype attr) \ + {\ +- T((T_CALLED("set_menu_" #name "(%p,%s)"), menu, _traceattr(attr))); \ ++ T((T_CALLED("set_menu_" #name "(%p,%s)"), (void *) menu, _traceattr(attr))); \ + if (!(attr==A_NORMAL || (attr & A_ATTRIBUTES)==attr))\ + RETURN(E_BAD_ARGUMENT);\ + if (menu && ( menu -> name != attr))\ +diff -Naur ncurses-5.9.orig/menu/m_driver.c ncurses-5.9/menu/m_driver.c +--- ncurses-5.9.orig/menu/m_driver.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_driver.c 2012-08-25 19:58:00.983226792 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_driver.c,v 1.29 2010/01/23 21:20:10 tom Exp $") ++MODULE_ID("$Id: m_driver.c,v 1.31 2012/03/10 23:43:41 tom Exp $") + + /* Macros */ + +@@ -47,7 +47,7 @@ + + /* Add a new character to the match pattern buffer */ + #define Add_Character_To_Pattern(menu,ch) \ +- { (menu)->pattern[((menu)->pindex)++] = (ch);\ ++ { (menu)->pattern[((menu)->pindex)++] = (char) (ch);\ + (menu)->pattern[(menu)->pindex] = '\0'; } + + /*--------------------------------------------------------------------------- +@@ -537,7 +537,11 @@ + result = E_UNKNOWN_COMMAND; + } + +- if (E_OK == result) ++ if (item == 0) ++ { ++ result = E_BAD_STATE; ++ } ++ else if (E_OK == result) + { + /* Adjust the top row if it turns out that the current item unfortunately + doesn't appear in the menu window */ +diff -Naur ncurses-5.9.orig/menu/m_format.c ncurses-5.9/menu/m_format.c +--- ncurses-5.9.orig/menu/m_format.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_format.c 2012-08-25 19:58:01.719889976 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_format.c,v 1.16 2010/01/23 21:20:10 tom Exp $") ++MODULE_ID("$Id: m_format.c,v 1.18 2012/06/09 23:54:02 tom Exp $") + + #define minimum(a,b) ((a)<(b) ? (a): (b)) + +@@ -81,8 +81,8 @@ + if (menu->pattern) + Reset_Pattern(menu); + +- menu->frows = rows; +- menu->fcols = cols; ++ menu->frows = (short)rows; ++ menu->fcols = (short)cols; + + assert(rows > 0 && cols > 0); + total_rows = (menu->nitems - 1) / cols + 1; +@@ -90,21 +90,21 @@ + minimum(menu->nitems, cols) : + (menu->nitems - 1) / total_rows + 1; + +- menu->rows = total_rows; +- menu->cols = total_cols; +- menu->arows = minimum(total_rows, rows); ++ menu->rows = (short)total_rows; ++ menu->cols = (short)total_cols; ++ menu->arows = (short)minimum(total_rows, rows); + menu->toprow = 0; + menu->curitem = *(menu->items); + assert(menu->curitem); +- menu->status |= _LINK_NEEDED; ++ SetStatus(menu, _LINK_NEEDED); + _nc_Calculate_Item_Length_and_Width(menu); + } + else + { + if (rows > 0) +- _nc_Default_Menu.frows = rows; ++ _nc_Default_Menu.frows = (short)rows; + if (cols > 0) +- _nc_Default_Menu.fcols = cols; ++ _nc_Default_Menu.fcols = (short)cols; + } + + RETURN(E_OK); +diff -Naur ncurses-5.9.orig/menu/m_global.c ncurses-5.9/menu/m_global.c +--- ncurses-5.9.orig/menu/m_global.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_global.c 2012-08-25 19:58:01.719889976 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_global.c,v 1.25 2010/01/23 21:20:10 tom Exp $") ++MODULE_ID("$Id: m_global.c,v 1.27 2012/06/10 00:09:15 tom Exp $") + + static char mark[] = "-"; + /* *INDENT-OFF* */ +@@ -117,17 +117,17 @@ + assert(menu && menu->items); + for (items = menu->items; *items; items++) + { +- check = _nc_Calculate_Text_Width(&((*items)->name)); ++ check = (unsigned)_nc_Calculate_Text_Width(&((*items)->name)); + if (check > MaximumNameLength) + MaximumNameLength = check; + +- check = _nc_Calculate_Text_Width(&((*items)->description)); ++ check = (unsigned)_nc_Calculate_Text_Width(&((*items)->description)); + if (check > MaximumDescriptionLength) + MaximumDescriptionLength = check; + } + +- menu->namelen = MaximumNameLength; +- menu->desclen = MaximumDescriptionLength; ++ menu->namelen = (short)MaximumNameLength; ++ menu->desclen = (short)MaximumDescriptionLength; + T(("ComputeMaximum_NameDesc_Lengths %d,%d", menu->namelen, menu->desclen)); + } + +@@ -195,7 +195,7 @@ + { + (*item)->value = FALSE; + } +- (*item)->index = ItemCount++; ++ (*item)->index = (short)ItemCount++; + (*item)->imenu = menu; + } + } +@@ -206,7 +206,7 @@ + if (ItemCount != 0) + { + menu->items = items; +- menu->nitems = ItemCount; ++ menu->nitems = (short)ItemCount; + ComputeMaximum_NameDesc_Lengths(menu); + if ((menu->pattern = typeMalloc(char, (unsigned)(1 + menu->namelen)))) + { +@@ -256,7 +256,7 @@ + T((T_CALLED("_nc_menu_text_width(%p)"), (const void *)item)); + if (result != 0 && item->str != 0) + { +- int count = mbstowcs(0, item->str, 0); ++ int count = (int)mbstowcs(0, item->str, 0); + wchar_t *temp = 0; + + if (count > 0 +@@ -343,7 +343,7 @@ + + assert(menu); + +- menu->height = 1 + menu->spc_rows * (menu->arows - 1); ++ menu->height = (short)(1 + menu->spc_rows * (menu->arows - 1)); + + l = calculate_actual_width(menu, TRUE); + l += menu->marklen; +@@ -354,10 +354,10 @@ + l += menu->spc_desc; + } + +- menu->itemlen = l; ++ menu->itemlen = (short)l; + l *= menu->cols; + l += (menu->cols - 1) * menu->spc_cols; /* for the padding between the columns */ +- menu->width = l; ++ menu->width = (short)l; + + T(("_nc_CalculateItem_Length_and_Width columns %d, item %d, width %d", + menu->cols, +@@ -388,7 +388,7 @@ + int Last_in_Column; + bool cycle = (menu->opt & O_NONCYCLIC) ? FALSE : TRUE; + +- menu->status &= ~_LINK_NEEDED; ++ ClrStatus(menu, _LINK_NEEDED); + + if (menu->opt & O_ROWMAJOR) + { +@@ -431,8 +431,8 @@ + (cycle ? menu->items[(row + 1) < menu->rows ? + Number_Of_Items - 1 : col] : + (ITEM *) 0); +- item->x = col; +- item->y = row; ++ item->x = (short)col; ++ item->y = (short)row; + if (++col == Number_Of_Columns) + { + row++; +@@ -482,8 +482,8 @@ + (ITEM *) 0 + ); + +- item->x = col; +- item->y = row; ++ item->x = (short)col; ++ item->y = (short)row; + if ((++row) == Number_Of_Rows) + { + col++; +@@ -568,7 +568,7 @@ + + cur_item = menu->curitem; + assert(cur_item); +- menu->toprow = new_toprow; ++ menu->toprow = (short)new_toprow; + menu->curitem = new_current_item; + + if (mterm_called) +@@ -590,7 +590,7 @@ + } + else + { /* if we are not posted, this is quite simple */ +- menu->toprow = new_toprow; ++ menu->toprow = (short)new_toprow; + menu->curitem = new_current_item; + } + } +diff -Naur ncurses-5.9.orig/menu/m_hook.c ncurses-5.9/menu/m_hook.c +--- ncurses-5.9.orig/menu/m_hook.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_hook.c 2012-08-25 19:58:00.983226792 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,13 +37,13 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_hook.c,v 1.15 2010/01/23 21:16:54 tom Exp $") ++MODULE_ID("$Id: m_hook.c,v 1.16 2012/03/10 23:43:41 tom Exp $") + + /* "Template" macro to generate function to set application specific hook */ + #define GEN_HOOK_SET_FUNCTION( typ, name ) \ + NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook func )\ + {\ +- T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), menu, func));\ ++ T((T_CALLED("set_" #typ "_" #name "(%p,%p)"), (void *) menu, func));\ + (Normalize_Menu(menu) -> typ ## name = func );\ + RETURN(E_OK);\ + } +diff -Naur ncurses-5.9.orig/menu/m_item_new.c ncurses-5.9/menu/m_item_new.c +--- ncurses-5.9.orig/menu/m_item_new.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_item_new.c 2012-08-25 19:58:01.719889976 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -44,7 +44,7 @@ + #endif + #endif + +-MODULE_ID("$Id: m_item_new.c,v 1.30 2010/01/23 21:20:11 tom Exp $") ++MODULE_ID("$Id: m_item_new.c,v 1.33 2012/06/09 23:55:15 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnmenu +@@ -62,7 +62,7 @@ + int result = TRUE; + + #if USE_WIDEC_SUPPORT +- int count = mbstowcs(0, s, 0); ++ int count = (int)mbstowcs(0, s, 0); + wchar_t *temp = 0; + + assert(s); +@@ -127,13 +127,13 @@ + { + *item = _nc_Default_Item; /* hope we have struct assignment */ + +- item->name.length = strlen(name); ++ item->name.length = (unsigned short)strlen(name); + item->name.str = name; + + if (description && (*description != '\0') && + Is_Printable_String(description)) + { +- item->description.length = strlen(description); ++ item->description.length = (unsigned short)strlen(description); + item->description.str = description; + } + else +@@ -195,12 +195,12 @@ + NCURSES_EXPORT(int) + set_menu_mark(MENU * menu, const char *mark) + { +- unsigned l; ++ short l; + + T((T_CALLED("set_menu_mark(%p,%s)"), (void *)menu, _nc_visbuf(mark))); + + if (mark && (*mark != '\0') && Is_Printable_String(mark)) +- l = strlen(mark); ++ l = (short)strlen(mark); + else + l = 0; + +@@ -213,7 +213,7 @@ + { + /* If the menu is already posted, the geometry is fixed. Then + we can only accept a mark with exactly the same length */ +- if (menu->marklen != (int)l) ++ if (menu->marklen != l) + RETURN(E_BAD_ARGUMENT); + } + menu->marklen = l; +@@ -222,14 +222,13 @@ + menu->mark = strdup(mark); + if (menu->mark) + { +- strcpy(menu->mark, mark); + if (menu != &_nc_Default_Menu) +- menu->status |= _MARK_ALLOCATED; ++ SetStatus(menu, _MARK_ALLOCATED); + } + else + { + menu->mark = old_mark; +- menu->marklen = (old_mark != 0) ? strlen(old_mark) : 0; ++ menu->marklen = (short)((old_mark != 0) ? strlen(old_mark) : 0); + RETURN(E_SYSTEM_ERROR); + } + } +diff -Naur ncurses-5.9.orig/menu/m_pad.c ncurses-5.9/menu/m_pad.c +--- ncurses-5.9.orig/menu/m_pad.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_pad.c 2012-08-25 19:58:00.983226792 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_pad.c,v 1.12 2010/01/23 21:20:10 tom Exp $") ++MODULE_ID("$Id: m_pad.c,v 1.13 2012/03/10 23:43:41 tom Exp $") + + /* Macro to redraw menu if it is posted and changed */ + #define Refresh_Menu(menu) \ +@@ -69,7 +69,7 @@ + RETURN(E_BAD_ARGUMENT); + + Normalize_Menu(menu); +- menu->pad = pad; ++ menu->pad = (unsigned char)pad; + + if (do_refresh) + Refresh_Menu(menu); +diff -Naur ncurses-5.9.orig/menu/m_post.c ncurses-5.9/menu/m_post.c +--- ncurses-5.9.orig/menu/m_post.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_post.c 2012-08-25 19:58:01.723223294 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_post.c,v 1.29 2010/05/01 19:18:27 tom Exp $") ++MODULE_ID("$Id: m_post.c,v 1.31 2012/06/09 23:54:35 tom Exp $") + + /*--------------------------------------------------------------------------- + | Facility : libnmenu +@@ -67,7 +67,7 @@ + - it is a onevalued menu and it is the current item + - or it has a selection value + */ +- wattron(menu->win, menu->back); ++ wattron(menu->win, (int)menu->back); + if (item->value || (item == menu->curitem)) + { + if (menu->marklen) +@@ -79,13 +79,13 @@ + item. */ + if (!(menu->opt & O_ONEVALUE) && item->value && item != menu->curitem) + { +- wattron(menu->win, menu->fore); ++ wattron(menu->win, (int)menu->fore); + isfore = TRUE; + } + waddstr(menu->win, menu->mark); + if (isfore) + { +- wattron(menu->win, menu->fore); ++ wattron(menu->win, (int)menu->fore); + isfore = FALSE; + } + } +@@ -93,7 +93,7 @@ + else /* otherwise we have to wipe out the marker area */ + for (ch = ' ', i = menu->marklen; i > 0; i--) + waddch(menu->win, ch); +- wattroff(menu->win, menu->back); ++ wattroff(menu->win, (int)menu->back); + count += menu->marklen; + + /* First we have to calculate the attribute depending on selectability +@@ -101,19 +101,19 @@ + */ + if (!(item->opt & O_SELECTABLE)) + { +- wattron(menu->win, menu->grey); ++ wattron(menu->win, (int)menu->grey); + isgrey = TRUE; + } + else + { + if (item->value || item == menu->curitem) + { +- wattron(menu->win, menu->fore); ++ wattron(menu->win, (int)menu->fore); + isfore = TRUE; + } + else + { +- wattron(menu->win, menu->back); ++ wattron(menu->win, (int)menu->back); + isback = TRUE; + } + } +@@ -158,10 +158,10 @@ + assert(cx >= 0 && cy >= 0); + getyx(menu->win, ncy, ncx); + if (isgrey) +- wattroff(menu->win, menu->grey); ++ wattroff(menu->win, (int)menu->grey); + else if (isfore) +- wattroff(menu->win, menu->fore); +- wattron(menu->win, menu->back); ++ wattroff(menu->win, (int)menu->fore); ++ wattron(menu->win, (int)menu->back); + for (j = 1; j < menu->spc_rows; j++) + { + if ((item_y + j) < getmaxy(menu->win)) +@@ -175,17 +175,17 @@ + } + wmove(menu->win, ncy, ncx); + if (!isback) +- wattroff(menu->win, menu->back); ++ wattroff(menu->win, (int)menu->back); + } + } + + /* Remove attributes */ + if (isfore) +- wattroff(menu->win, menu->fore); ++ wattroff(menu->win, (int)menu->fore); + if (isback) +- wattroff(menu->win, menu->back); ++ wattroff(menu->win, (int)menu->back); + if (isgrey) +- wattroff(menu->win, menu->grey); ++ wattroff(menu->win, (int)menu->grey); + } + + /*--------------------------------------------------------------------------- +@@ -225,7 +225,7 @@ + { + _nc_Post_Item(menu, hitem); + +- wattron(menu->win, menu->back); ++ wattron(menu->win, (int)menu->back); + if (((hitem = hitem->right) != lasthor) && hitem) + { + int i, j, cy, cx; +@@ -244,7 +244,7 @@ + } + } + while (hitem && (hitem != lasthor)); +- wattroff(menu->win, menu->back); ++ wattroff(menu->win, (int)menu->back); + + item = item->down; + y += menu->spc_rows; +@@ -305,7 +305,7 @@ + else + RETURN(E_NOT_CONNECTED); + +- menu->status |= _POSTED; ++ SetStatus(menu, _POSTED); + + if (!(menu->opt & O_ONEVALUE)) + { +@@ -369,7 +369,7 @@ + delwin(menu->win); + menu->win = (WINDOW *)0; + +- menu->status &= ~_POSTED; ++ ClrStatus(menu, _POSTED); + + RETURN(E_OK); + } +diff -Naur ncurses-5.9.orig/menu/m_req_name.c ncurses-5.9/menu/m_req_name.c +--- ncurses-5.9.orig/menu/m_req_name.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_req_name.c 2012-08-25 19:58:02.023221875 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_req_name.c,v 1.21 2009/10/10 16:17:23 tom Exp $") ++MODULE_ID("$Id: m_req_name.c,v 1.22 2012/07/21 23:27:32 tom Exp $") + + static const char *request_names[MAX_MENU_COMMAND - MIN_MENU_COMMAND + 1] = + { +@@ -99,23 +99,26 @@ + /* because the table is so small, it doesn't really hurt + to run sequentially through it. + */ +- unsigned int i = 0; ++ size_t i = 0; + char buf[16]; + + T((T_CALLED("menu_request_by_name(%s)"), _nc_visbuf(str))); + +- if (str) ++ if (str != 0 && (i = strlen(str)) != 0) + { +- strncpy(buf, str, sizeof(buf)); +- while ((i < sizeof(buf)) && (buf[i] != '\0')) ++ if (i > sizeof(buf) - 2) ++ i = sizeof(buf) - 2; ++ memcpy(buf, str, i); ++ buf[i] = '\0'; ++ ++ for (i = 0; buf[i] != '\0'; ++i) + { + buf[i] = (char)toupper(UChar(buf[i])); +- i++; + } + + for (i = 0; i < A_SIZE; i++) + { +- if (strncmp(request_names[i], buf, sizeof(buf)) == 0) ++ if (strcmp(request_names[i], buf) == 0) + returnCode(MIN_MENU_COMMAND + (int)i); + } + } +diff -Naur ncurses-5.9.orig/menu/m_spacing.c ncurses-5.9/menu/m_spacing.c +--- ncurses-5.9.orig/menu/m_spacing.c 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/m_spacing.c 2012-08-25 19:58:00.986560110 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2004,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include "menu.priv.h" + +-MODULE_ID("$Id: m_spacing.c,v 1.18 2010/01/23 21:20:10 tom Exp $") ++MODULE_ID("$Id: m_spacing.c,v 1.19 2012/03/10 23:43:41 tom Exp $") + + #define MAX_SPC_DESC ((TABSIZE) ? (TABSIZE) : 8) + #define MAX_SPC_COLS ((TABSIZE) ? (TABSIZE) : 8) +@@ -70,9 +70,9 @@ + ((s_col < 0) || (s_col > MAX_SPC_COLS))) + RETURN(E_BAD_ARGUMENT); + +- m->spc_desc = s_desc ? s_desc : 1; +- m->spc_rows = s_row ? s_row : 1; +- m->spc_cols = s_col ? s_col : 1; ++ m->spc_desc = (short)(s_desc ? s_desc : 1); ++ m->spc_rows = (short)(s_row ? s_row : 1); ++ m->spc_cols = (short)(s_col ? s_col : 1); + _nc_Calculate_Item_Length_and_Width(m); + + RETURN(E_OK); +diff -Naur ncurses-5.9.orig/menu/menu.priv.h ncurses-5.9/menu/menu.priv.h +--- ncurses-5.9.orig/menu/menu.priv.h 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/menu.priv.h 2012-08-25 19:58:00.986560110 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,7 +30,7 @@ + * Author: Juergen Pfeifer, 1995,1997 * + ****************************************************************************/ + +-/* $Id: menu.priv.h,v 1.23 2009/02/28 21:02:57 juergen Exp $ */ ++/* $Id: menu.priv.h,v 1.24 2012/03/10 23:43:41 tom Exp $ */ + + /*************************************************************************** + * Module menu.priv.h * +@@ -39,6 +39,7 @@ + + #ifndef MENU_PRIV_H_incl + #define MENU_PRIV_H_incl 1 ++/* *INDENT-OFF* */ + + #include "curses.priv.h" + #include "mf_common.h" +@@ -99,10 +100,11 @@ + */ + #define Adjust_Current_Item(menu,row,item) \ + { if ((item)->y < row) \ +- row = (item)->y;\ +- if ( (item)->y >= (row + (menu)->arows) )\ +- row = ( (item)->y < ((menu)->rows - row) ) ? \ +- (item)->y : (menu)->rows - (menu)->arows;\ ++ row = (short) (item)->y; \ ++ if ( (item)->y >= (row + (menu)->arows) ) \ ++ row = (short) (( (item)->y < ((menu)->rows - row) ) \ ++ ? (item)->y \ ++ : (menu)->rows - (menu)->arows); \ + _nc_New_TopRow_and_CurrentItem(menu,row,item); } + + /* Reset the match pattern buffer */ +@@ -152,5 +154,6 @@ + #define returnMenuOpts(code) return code + + #endif /* TRACE/!TRACE */ ++/* *INDENT-ON* */ + + #endif /* MENU_PRIV_H_incl */ +diff -Naur ncurses-5.9.orig/menu/mf_common.h ncurses-5.9/menu/mf_common.h +--- ncurses-5.9.orig/menu/mf_common.h 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/menu/mf_common.h 2012-08-25 19:58:01.723223294 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2004,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,7 +30,7 @@ + * Author: Juergen Pfeifer, 1995,1997 * + ****************************************************************************/ + +-/* $Id: mf_common.h,v 0.22 2005/11/26 15:26:52 tom Exp $ */ ++/* $Id: mf_common.h,v 0.24 2012/06/10 00:06:54 tom Exp $ */ + + /* Common internal header for menu and form library */ + +@@ -63,10 +63,9 @@ + #if USE_RCS_IDS + #define MODULE_ID(id) static const char Ident[] = id; + #else +-#define MODULE_ID(id) /*nothing*/ ++#define MODULE_ID(id) /*nothing */ + #endif + +- + /* Maximum regular 8-bit character code */ + #define MAX_REGULAR_CHARACTER (0xff) + +@@ -80,16 +79,19 @@ + #endif + + /* The few common values in the status fields for menus and forms */ +-#define _POSTED (0x01U) /* menu or form is posted */ +-#define _IN_DRIVER (0x02U) /* menu or form is processing hook routine */ ++#define _POSTED (0x01U) /* menu or form is posted */ ++#define _IN_DRIVER (0x02U) /* menu or form is processing hook routine */ ++ ++#define SetStatus(target,mask) (target)->status |= (unsigned short) (mask) ++#define ClrStatus(target,mask) (target)->status = (unsigned short) (target->status & (~mask)) + + /* Call object hook */ + #define Call_Hook( object, handler ) \ + if ( (object) != 0 && ((object)->handler) != (void *) 0 )\ + {\ +- (object)->status |= _IN_DRIVER;\ ++ SetStatus(object, _IN_DRIVER);\ + (object)->handler(object);\ +- (object)->status &= ~_IN_DRIVER;\ ++ ClrStatus(object, _IN_DRIVER);\ + } + + #endif /* MF_COMMON_H_incl */ +diff -Naur ncurses-5.9.orig/misc/Makefile.in ncurses-5.9/misc/Makefile.in +--- ncurses-5.9.orig/misc/Makefile.in 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/misc/Makefile.in 2012-08-25 19:58:02.359886951 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.56 2011/02/21 01:09:31 tom Exp $ ++# $Id: Makefile.in,v 1.60 2012/08/11 21:31:56 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -56,6 +56,7 @@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ + libdir = @libdir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + + tabsetdir = $(datadir)/tabset +@@ -120,7 +121,8 @@ + + run_tic.sed : + WHICH_XTERM=@WHICH_XTERM@ \ +- ticdir=${ticdir} \ ++ XTERM_KBS=@XTERM_KBS@ \ ++ datadir=${datadir} \ + $(SHELL) $(srcdir)/gen_edit.sh >$@ + + $(DESTDIR)$(bindir) \ +@@ -139,7 +141,7 @@ + + uninstall.libs : + -rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG) +-@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' ++@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done' + + tags : + +diff -Naur ncurses-5.9.orig/misc/gen-pkgconfig.in ncurses-5.9/misc/gen-pkgconfig.in +--- ncurses-5.9.orig/misc/gen-pkgconfig.in 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/misc/gen-pkgconfig.in 2012-08-25 19:58:00.176563939 +0000 +@@ -1,7 +1,7 @@ + #!@SHELL@ +-# $Id: gen-pkgconfig.in,v 1.8 2010/02/06 22:12:07 Miroslav.Lichvar Exp $ ++# $Id: gen-pkgconfig.in,v 1.14 2012/01/01 01:48:23 tom Exp $ + ############################################################################## +-# Copyright (c) 2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2009-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -28,7 +28,7 @@ + # authorization. # + ############################################################################## + # +-# Author: Thomas E. Dickey, 2009 ++# Author: Thomas E. Dickey + # + # The complete configure script for ncurses is the ncurses5-config (or similar + # name, depending on the flavor, e.g., ncursesw5-config, ncurses6-config, etc). +@@ -63,63 +63,48 @@ + MENU_LIBRARY="${MENU_NAME}@DFT_ARG_SUFFIX@" + FORM_LIBRARY="${FORM_NAME}@DFT_ARG_SUFFIX@" + +-SUB_LIBRARY_REQ=${SUB_LIBRARY} +-if test $TINFO_NAME = $LIB_NAME ; then +- SUB_LIBRARY_REQ= ++if test "$includedir" = "/usr/include" ; then ++ CFLAGS= ++else ++ CFLAGS="-I\${includedir}" + fi + +-for lib in ../lib/* +-do +- name=`basename $lib` +- if test "$name" = "*" ; then +- break +- fi +- +- root=`basename $name "$DFT_DEP_SUFFIX"` +- if test "$name" = "$root" ; then +- root=`basename $name "$CXX_LIB_SUFFIX"` +- if test "$name" = "$root" ; then +- continue +- fi +- fi ++if test "$libdir" = "/usr/lib" ; then ++ LDFLAGS= ++else ++ LDFLAGS="-L\${libdir}" ++fi + +- name=`echo "$name" | sed -e 's/^lib//' -e 's/\..*$//'` ++for name in @PC_MODULES_TO_MAKE@ ++do ++ name="${name}" + + desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@" ++ reqs= ++ + if test $name = $MAIN_LIBRARY ; then +- reqs=$SUB_LIBRARY_REQ + desc="$desc library" + elif test $name = $SUB_LIBRARY ; then +- reqs= + desc="$desc terminal interface library" + elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then +- reqs="$PANEL_LIBRARY $MENU_LIBRARY $FORM_LIBRARY $MAIN_LIBRARY $SUB_LIBRARY_REQ" ++ reqs="$PANEL_LIBRARY, $MENU_LIBRARY, $FORM_LIBRARY, $MAIN_LIBRARY" + desc="$desc add-on library" + else +- reqs="$MAIN_LIBRARY $SUB_LIBRARY_REQ" ++ reqs="$MAIN_LIBRARY" + desc="$desc add-on library" + fi + +- if test "$includedir" = "/usr/include" ; then +- cflags= +- else +- cflags="-I\${includedir}" +- fi +- +- if test "$libdir" = "/usr/lib" ; then +- libs= +- else +- libs="-L\${libdir}" +- fi +- libs="$libs -l$name" +- +- # add dependencies that pkg-config cannot guess about +- if test -z "$reqs" ; then +- libs="$libs @LIBS@" ++ if test $name != $SUB_LIBRARY && test $SUB_LIBRARY != $MAIN_LIBRARY ; then ++ if test $name != $TINFO_NAME ; then ++ test -n "$reqs" && reqs="$reqs, " ++ reqs="${reqs}${SUB_LIBRARY}" ++ fi + fi + + echo "** creating ${name}.pc" + cat >${name}.pc <<EOF ++# vile:makemode ++ + prefix=$show_prefix + exec_prefix=$show_exec_prefix + libdir=$show_libdir +@@ -130,10 +115,13 @@ + Name: $name + Description: $desc + Version: \${version} +-Requires: $reqs +-Libs: $libs +-Cflags: $cflags ++URL: http://invisible-island.net/ncurses ++Requires.private: $reqs ++Libs: $LDFLAGS -l$name ++Libs.private: @LIBS@ ++Cflags: $CFLAGS + EOF +- # pr -f ${name}.pc ++ ++ #pr -f ${name}.pc + done + # vile:shmode +diff -Naur ncurses-5.9.orig/misc/gen_edit.sh ncurses-5.9/misc/gen_edit.sh +--- ncurses-5.9.orig/misc/gen_edit.sh 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/misc/gen_edit.sh 2012-08-25 19:58:01.183225848 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + ############################################################################## +-# Copyright (c) 2004 Free Software Foundation, Inc. # ++# Copyright (c) 2004-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -29,7 +29,7 @@ + # + # Author: Thomas E. Dickey + # +-# $Id: gen_edit.sh,v 1.1 2004/07/11 15:01:29 tom Exp $ ++# $Id: gen_edit.sh,v 1.5 2012/04/01 15:04:37 tom Exp $ + # Generate a sed-script for converting the terminfo.src to the form which will + # be installed. + # +@@ -37,22 +37,82 @@ + # The leaf directory names (lib, tabset, terminfo) + # + +-: ${ticdir=@TERMINFO@} +-: ${xterm_new=@WHICH_XTERM@} ++linux_dft=linux2.2 ++ ++: ${datadir=/usr/share} ++: ${WHICH_LINUX=$linux_dft} ++: ${WHICH_XTERM=xterm-new} ++: ${XTERM_KBS=BS} + + # If we're not installing into /usr/share/, we'll have to adjust the location + # of the tabset files in terminfo.src (which are in a parallel directory). +-TABSET=`echo $ticdir | sed -e 's%/terminfo$%/tabset%'` ++TABSET=${datadir}/tabset + if test "x$TABSET" != "x/usr/share/tabset" ; then + cat <<EOF + s%/usr/share/tabset%$TABSET%g + EOF + fi + +-if test "$xterm_new" != "xterm-new" ; then ++if test "$WHICH_XTERM" != "xterm-new" ; then ++echo "** using $WHICH_XTERM terminal description for XTerm entry" >&2 + cat <<EOF + /^# This is xterm for ncurses/,/^$/{ + s/use=xterm-new,/use=$WHICH_XTERM,/ + } + EOF + fi ++ ++if test "$XTERM_KBS" != "BS" ; then ++echo "** using DEL for XTerm backspace-key" >&2 ++cat <<EOF ++/^xterm+kbs|fragment for backspace key/,/^#/{ ++ s/kbs=^H,/kbs=^?,/ ++} ++EOF ++fi ++ ++# Work around incompatibities built into Linux console. The 2.6 series added ++# a patch to fixup the SI/SO behavior, which is closer to vt100, but the older ++# kernels do not recognize those controls. All of the kernels recognize the ++# older flavor of rmacs/smacs, but beginning in the late 1990s, changes made ++# as part of implementing UTF-8 prevent using those for line-drawing when the ++# console is in UTF-8 mode. Taking into account the fact that it took about ++# ten years to provide (and distribute) the 2.6 series' change for SI/SO, the ++# default remains "linux2.2". ++case x$WHICH_LINUX in #(vi ++xauto) ++ system=`uname -s 2>/dev/null` ++ if test "x$system" = xLinux ++ then ++ case x`uname -r` in ++ x1.*) ++ WHICH_LINUX=linux-c ++ ;; ++ x2.[0-4]*) ++ WHICH_LINUX=linux2.2 ++ ;; ++ *) ++ WHICH_LINUX=linux3.0 ++ ;; ++ esac ++ else ++ WHICH_LINUX=$linux_dft ++ fi ++ ;; ++xlinux*) ++ # allow specific setting ++ ;; ++*) ++ WHICH_LINUX=$linux_dft ++ ;; ++esac ++ ++if test $WHICH_LINUX != $linux_dft ++then ++echo "** using $WHICH_LINUX terminal description for Linux console" >&2 ++cat <<EOF ++/^# This is Linux console for ncurses/,/^$/{ ++ s/use=$linux_dft,/use=$WHICH_LINUX,/ ++} ++EOF ++fi +diff -Naur ncurses-5.9.orig/misc/ncurses-config.in ncurses-5.9/misc/ncurses-config.in +--- ncurses-5.9.orig/misc/ncurses-config.in 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/misc/ncurses-config.in 2012-08-25 19:58:02.363220268 +0000 +@@ -1,5 +1,5 @@ + #!@SHELL@ +-# $Id: ncurses-config.in,v 1.25 2011/03/19 22:43:38 tom Exp $ ++# $Id: ncurses-config.in,v 1.28 2012/08/11 21:45:20 tom Exp $ + ############################################################################## + # Copyright (c) 2006-2010,2011 Free Software Foundation, Inc. # + # # +@@ -36,11 +36,13 @@ + bindir="@bindir@" + includedir="@includedir@" + libdir="@libdir@" ++datarootdir="@datarootdir@" + datadir="@datadir@" + mandir="@mandir@" + + THIS="@LIB_NAME@@DFT_ARG_SUFFIX@" + TINFO_LIB="@TINFO_ARG_SUFFIX@" ++RPATH_LIST="@RPATH_LIST@" + + LANG=C; export LANG + LANGUAGE=C; export LANGUAGE +@@ -83,13 +85,19 @@ + ENDECHO + ;; + --libs) ++ if test "$libdir" = /usr/lib ++ then ++ LIBDIR= ++ else ++ LIBDIR=-L$libdir ++ fi + if test @TINFO_NAME@ = @LIB_NAME@ ; then + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ ++ $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ + ENDECHO + else + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO +- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ ++ $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@ + ENDECHO + fi + ;; +@@ -163,4 +171,5 @@ + esac + shift + done ++# vi:ts=4 sw=4 + # vile:shmode +diff -Naur ncurses-5.9.orig/misc/run_tic.in ncurses-5.9/misc/run_tic.in +--- ncurses-5.9.orig/misc/run_tic.in 2012-08-25 19:57:59.429900806 +0000 ++++ ncurses-5.9/misc/run_tic.in 2012-08-25 19:58:02.363220268 +0000 +@@ -1,5 +1,5 @@ + #!@SHELL@ +-# $Id: run_tic.in,v 1.32 2011/02/23 23:30:15 tom Exp $ ++# $Id: run_tic.in,v 1.33 2012/08/11 21:45:47 tom Exp $ + ############################################################################## + # Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # +@@ -48,6 +48,7 @@ + : ${bindir:=@bindir@} + : ${top_srcdir:=@top_srcdir@} + : ${srcdir:=@srcdir@} ++: ${datarootdir:=@datarootdir@} + : ${datadir:=@datadir@} + : ${TIC_PATH:=@TIC_PATH@} + : ${ticdir:=@TERMINFO@} +diff -Naur ncurses-5.9.orig/misc/terminfo.src ncurses-5.9/misc/terminfo.src +--- ncurses-5.9.orig/misc/terminfo.src 2012-08-25 19:57:59.426567488 +0000 ++++ ncurses-5.9/misc/terminfo.src 2012-08-25 19:58:02.389886808 +0000 +@@ -6,8 +6,8 @@ + # Report bugs and new terminal descriptions to + # bug-ncurses@gnu.org + # +-# $Revision: 1.383 $ +-# $Date: 2011/02/20 20:46:53 $ ++# $Revision: 1.466 $ ++# $Date: 2012/08/11 15:27:54 $ + # + # The original header is preserved below for reference. It is noted that there + # is a "newer" version which differs in some cosmetic details (but actually +@@ -321,7 +321,7 @@ + # DEL and ^C are hardcoded to act as kill characters. + # ^D acts as a line break (just like newline). + # It also interprets +-# \033];xxx\007 ++# \033];xxx\007 + # for compatibility with xterm -TD + 9term|Plan9 terminal emulator for X, + am, +@@ -376,11 +376,19 @@ + dim=\E[2m, + sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;%;%?%p7%t8;%;m, + use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul, +-ansi+pp|ansi printer port, +- mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, + ansi+csr|ansi scroll-region plus cursor save & restore, + csr=\E[%i%p1%d;%p2%dr, rc=\E8, sc=\E7, + ++# The normal (ANSI) flavor of "media copy" building block asserts that ++# characters sent to the printer do not echo on the screen. DEC terminals ++# can also be put into autoprinter mode, where each line is sent to the ++# printer as you move off that line, e.g., by a carriage return. ++ansi+pp|ansi printer port, ++ mc5i, ++ mc0=\E[i, mc4=\E[4i, mc5=\E[5i, ++dec+pp|DEC autoprinter mode, ++ mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i, ++ + # The IBM PC alternate character set. Plug this into any Intel console entry. + # We use \E[11m for rmacs rather than \E[12m so the <acsc> string can use the + # ROM graphics for control characters such as the diamond, up- and down-arrow. +@@ -456,9 +464,10 @@ + cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A, + dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX, +- hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, +- indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT, rmam=\E[?7l, sc=\E7, +- smam=\E[?7h, tbc=\E[g, vpa=\E[%i%p1%dd, ++ hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ++ il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT, ++ rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g, ++ vpa=\E[%i%p1%dd, + + #### ANSI/ECMA-48 terminals and terminal emulators + # +@@ -488,7 +497,7 @@ + # ansi-mtabs adds relative addressing and minimal tab support + ansi-mtabs|any ansi terminal with pessimistic assumptions, + it#8, +- ht=^I, use=ansi+local1, use=ansi-mini, ++ ht=^I, use=ansi-mini, use=ansi+local1, + + # ANSI X3.64 from emory!mlhhh (Hugh Hansard) via BRL + # +@@ -690,9 +699,7 @@ + use=ansi.sysk, + + #### ANSI console types +-# + +-############################################################################# + # + # Atari ST terminals. + # From Guido Flohr <gufl0000@stud.uni-sb.de>. +@@ -909,7 +916,7 @@ + khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, + kspd=^Z, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l, + rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7, +- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, ++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;11%;m, + smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g, + vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr, + use=ecma+color, +@@ -936,10 +943,30 @@ + # The 2.2.x kernels add a private mode that sets the cursor type; use that to + # get a block cursor for cvvis. + # reported by Frank Heckenbach <frank@g-n-u.de>. +-linux|linux console, ++linux2.2|linux 2.2.x console, + civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c, + cvvis=\E[?25h\E[?8c, use=linux-c-nc, + ++# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here: ++# http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html ++# Using SI/SO has the drawback that it confuses screen. SCS would work. ++# However, SCS is buggy (see comment in Debian #515609) -TD ++# Further, this breaks longstanding workarounds for Linux console's line ++# drawing (see Debian 665959) -TD ++linux2.6|linux 2.6.x console, ++ rmacs=^O, ++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;, ++ sgr0=\E[m\017, smacs=^N, use=linux2.2, ++ ++# The 3.0 kernel adds support for clearing scrollback buffer (capability E3). ++# It is the same as xterm's erase-saved-lines feature. ++linux3.0|linux 3.0 kernels, ++ E3=\E[3;J, use=linux2.6, ++ ++# This is Linux console for ncurses. ++linux|linux console, ++ use=linux2.2, ++ + # Subject: linux 2.6.26 vt back_color_erase + # Changes to the Linux console driver broke bce model as reported in + # https://bugzilla.novell.com/show_bug.cgi?id=418613 +@@ -947,7 +974,7 @@ + # http://lkml.org/lkml/2008/4/26/305 + # http://groups.google.com/group/fa.linux.kernel/browse_thread/thread/87f98338f0d636bb/aa96e8b86cee0d1e?lnk=st&q=#aa96e8b86cee0d1e + linux2.6.26|linux console w/o bce, +- bce@, use=linux, ++ bce@, use=linux2.6, + + # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file + linux-nic|linux with ich/ich1 suppressed for non-curses programs, +@@ -1024,7 +1051,7 @@ + kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, + kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, + kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=^M^J, +- op=\E49;39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m, ++ op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m, + rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m, + +@@ -1053,6 +1080,24 @@ + dim=\E[2m, invis=\E[8m, op=\E[37;40m, rmso=\E[27m, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=mach, + ++# From: Samuel Thibault ++# Source: git://git.sv.gnu.org/hurd/gnumach.git ++# Files: i386/i386at/kd.c ++# ++# Added nel, hpa, sgr and removed rmacs, smacs based on source -TD ++mach-gnu|GNU Mach, ++ acsc=+>\,<-\^.v0\333`+a\261f\370g\361h\260i#j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, ++ dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX, ++ el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@, ++ indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT, ++ sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m, ++ use=mach, ++ ++mach-gnu-color|Mach Console with ANSI color, ++ colors#8, pairs#64, ++ op=\E[37;40m, rmso=\E[27m, setab=\E[4%p1%dm, ++ setaf=\E[3%p1%dm, use=mach-gnu, ++ + # From: Marcus Brinkmann + # http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/hurd/hurd/console/ + # +@@ -1183,7 +1228,7 @@ + civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr, + cvvis=\E[=2c, mgc=\E[=r, oc=\E[51m, op=\E[50m, + rep=\E[%p1%d;%p2%db, rmm=\E[=11L, +- sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, ++ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%e;10%;m, + smgb=\E[=1;0m, smgbp=\E[=1;%i%p1%dm, + smglp=\E[=2;%i%p1%dm, smgr=\E[=3;0m, + smgrp=\E[=3;%i%p1%dm, smgt=\E[=0;0m, +@@ -1649,6 +1694,56 @@ + qansi-w|QNX ansi for windows, + xvpa, use=qansi-m, + ++#### OpenBSD consoles ++# ++# From: Alexei Malinin <Alexei.Malinin@mail.ru>; October, 2011. ++# ++# The following terminal descriptions for the AMD/Intel PC console ++# were prepared based on information contained in the OpenBSD-4.9 ++# termtypes.master and wscons(4) & vga(4) manuals (2010, November). ++# ++# Added bce based on testing with tack -TD ++# Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD ++# Changed kbs to DEL and removed keys that duplicate stty settings -TD ++# ++pccon+keys|OpenBSD PC keyboard keys, ++ kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ++ kdch1=\E[3~, kend=\E[8~, kent=^M, kf1=\E[11~, kf10=\E[21~, ++ kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, ++ kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, ++ kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, ++ krfr=^R, ++pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console, ++ acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o, ++ sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, ++pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console, ++ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, ++ enacs=\E)0$<5>, rmacs=\E(B$<5>, ++ sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>, ++ sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>, ++pccon+colors|ANSI colors for OpenBSD PC console, ++ bce, ++ colors#8, pairs#64, ++ op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, ++pccon+base|base capabilities for OpenBSD PC console, ++ am, km, mc5i, msgr, npc, nxon, xenl, xon, ++ cols#80, it#8, lines#24, ++ bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP, ++ dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, ++ el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ++ il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l, ++ rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m, ++ tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, ++pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics, ++ use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys, ++pccon0|OpenBSD PC console with simple ASCII pseudographics, ++ use=pccon0-m, use=pccon+colors, ++pccon-m|OpenBSD PC console without colors, ++ use=pccon+base, use=pccon+sgr+acs, use=pccon+keys, ++pccon|OpenBSD PC console, ++ use=pccon-m, use=pccon+colors, ++ + #### NetBSD consoles + # + # pcvt termcap database entries (corresponding to release 3.31) +@@ -1786,7 +1881,7 @@ + ofcons|DNARD OpenFirmware console, + bw, + cols#80, lines#30, +- bel=^G, blink=\2337;2m, bold=\2331m, clear=^L, cr=^M, ++ bel=^G, blink=\2335m, bold=\2331m, clear=^L, cr=^M, + cub=\233%p1%dD, cub1=\233D, cud=\233%p1%dB, cud1=\233B, + cuf=\233%p1%dC, cuf1=\233C, cup=\233%i%p1%d;%p2%dH, + cuu=\233%p1%dA, cuu1=\233A, dch=\233%p1%dP, dch1=\233P, +@@ -1798,8 +1893,8 @@ + kf4=\2330x, kf5=\2330t, kf6=\2330u, kf7=\2330q, kf8=\2330r, + kf9=\2330p, knp=\233/, kpp=\233?, nel=^M^J, rev=\2337m, + rmso=\2330m, rmul=\2330m, +- sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m, +- sgr0=\2330m, ++ sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t2%;%?%p7%t8%;%?%p1%p3%|%t;7%;m, ++ sgr0=\2330m, smso=\2337m, smul=\2334m, + + # NetBSD "wscons" emulator in vt220 mode. + # This entry is based on the NetBSD termcap entry, correcting the ncv value. +@@ -1816,7 +1911,8 @@ + wsvt25|NetBSD wscons in 25 line DEC VT220 mode, + bce, msgr, + colors#8, cols#80, it#8, lines#25, ncv#2, pairs#64, +- is2=\E[r\E[25;1H, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, ++ civis=\E[?25l, cnorm=\E[?25h, is2=\E[r\E[25;1H, ++ kdch1=\E[3~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~, + kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, + kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec, +@@ -2377,8 +2473,9 @@ + # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping. + # PF1--PF4 are used as F1--F4. + # ++# added msgr -TD + vt220-old|vt200-old|DEC VT220 in vt100 emulation mode, +- OTbs, OTpt, am, mir, xenl, xon, ++ OTbs, OTpt, am, mir, msgr, xenl, xon, + cols#80, lines#24, vt#3, + OTnl=^J, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -2404,8 +2501,15 @@ + # A much better description of the VT200/220; used to be vt220-8 + # changed rmacs/smacs from shift-in/shift-out to vt200-old's explicit G0/G1 + # designation to accommodate bug in pcvt -TD ++# ++# Here's a picture of the VT220 editing keypad: ++# +--------+--------+--------+ ++# | Find | Insert | Remove | ++# +--------+--------+--------+ ++# | Select | Prev | Next | ++# +--------+--------+--------+ + vt220|vt200|dec vt220, +- OTbs, am, mc5i, mir, msgr, xenl, xon, ++ OTbs, am, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M, +@@ -2418,19 +2522,20 @@ + ich=\E[%p1%d@, if=/usr/share/tabset/vt100, + il=\E[%p1%dL, il1=\E[L, ind=\ED, + is2=\E[?7h\E[>\E[?1h\E F\E[?4l, kbs=^H, kcub1=\E[D, +- kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, +- kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, +- kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, +- kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, +- kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, khlp=\E[28~, +- kich1=\E[2~, knp=\E[6~, kpp=\E[5~, krdo=\E[29~, kslt=\E[4~, +- lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[i, mc4=\E[4i, +- mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, +- rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, +- rmul=\E[24m, rs1=\E[?3l, sc=\E7, ++ kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, ++ kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, ++ kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, ++ kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, ++ kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, ++ khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, ++ krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, ++ nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>, ++ rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, ++ rs1=\E[?3l, sc=\E7, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, + sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, +- smso=\E[7m, smul=\E[4m, tbc=\E[3g, ++ smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+pp, ++ use=ansi+enq, + vt220-w|vt200-w|DEC vt220 in wide mode, + cols#132, + rs3=\E[?3h, use=vt220, +@@ -2449,16 +2554,16 @@ + il=\233%p1%dL, il1=\233L, ind=\ED, + is2=\233?7h\233>\233?1h\E F\233?4l, kbs=^H, + kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A, +- kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~, +- kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~, +- kf19=\23333~, kf2=\EOQ, kf20=\23334~, kf3=\EOR, kf4=\EOS, +- kf6=\23317~, kf7=\23318~, kf8=\23319~, kf9=\23320~, +- kfnd=\2331~, khlp=\23328~, khome=\233H, kich1=\2332~, +- knp=\2336~, kpp=\2335~, krdo=\23329~, kslt=\2334~, lf1=pf1, +- lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, +- nel=\EE, rc=\E8, rev=\2337m, ri=\EM, rmacs=\E(B, +- rmam=\233?7l, rmir=\2334l, rmso=\23327m, rmul=\23324m, +- rs1=\233?3l, sc=\E7, ++ kdch1=\2333~, kf1=\EOP, kf10=\23321~, kf11=\23323~, ++ kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~, ++ kf18=\23332~, kf19=\23333~, kf2=\EOQ, kf20=\23334~, ++ kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, kf8=\23319~, ++ kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\233H, ++ kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~, ++ kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i, ++ mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM, ++ rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m, ++ rmul=\23324m, rs1=\233?3l, sc=\E7, + sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, + sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h, + smso=\2337m, smul=\2334m, tbc=\2333g, +@@ -2495,8 +2600,9 @@ + # + # From: Alexander Latzko <latzko@marsenius.rutgers.edu>, 30 Dec 1996 + # (Added vt100 <rc>,<sc> to quiet a tic warning -- esr) ++# added msgr -TD + vt200-js|vt220-js|dec vt200 series with jump scroll, +- am, ++ am, msgr, + cols#80, + bel=^G, clear=\E[H\E[J, cr=^M, csr=\E[%i%p1%d;%p2%dr, + cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, +@@ -2534,7 +2640,7 @@ + # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995 + # (vt320: uncommented <fsl> --esr) + vt320|vt300|dec vt320 7 bit terminal, +- am, eslok, hs, mir, msgr, xenl, ++ am, hs, mir, msgr, xenl, + cols#80, lines#24, wsl#80, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, +@@ -2543,9 +2649,8 @@ + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, +- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$}, +- home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, +- il1=\E[L, ind=\ED, ++ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ++ hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED, + is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H, + kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~, +@@ -2553,8 +2658,7 @@ + kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, + kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, + kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I, +- kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, mc0=\E[i, mc4=\E[?4i, +- mc5=\E[?5i, nel=\EE, rc=\E8, rev=\E[7m, ++ kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m, + rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B, + rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m, + rmul=\E[m, +@@ -2563,7 +2667,7 @@ + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, + sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, +- tsl=\E[1$}\E[H\E[K, use=vt220+keypad, ++ use=dec+pp, use=vt220+keypad, use=dec+sl, use=ansi+enq, + vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy, + am@, + is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H, +@@ -2673,33 +2777,38 @@ + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, + sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, +- tsl=\E[2$~\E[1$}\E[1;%dH, ++ tsl=\E[2$~\E[1$}\E[1;%dH, use=dec+sl, + + # (vt420: I removed <kf0>, it collided with <kf10>. I also restored + # a missing <sc> -- esr) ++# add msgr and other capabilities from vt220 -TD + vt420|DEC VT420, +- am, mir, xenl, xon, +- cols#80, lines#24, vt#3, ++ am, mir, msgr, xenl, xon, ++ cols#80, it#8, lines#24, vt#3, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, +- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr, +- cub1=^H, cud1=\E[B, cuf1=\E[C, +- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, +- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, +- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, +- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, +- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, +- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, +- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, +- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, +- kslt=\E[4~, rc=\E8, rev=\E[7m$<2>, +- rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>, +- rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, ++ bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l, ++ clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, ++ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA, cuu1=\E[A, ++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ++ ech=\E[%p1%dX, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K, ++ enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I, ++ hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300, ++ il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[1;24r\E[24;1H, ++ is3=\E[?67h\E[64;1"p, kbs=^H, kcub1=\E[D, kcud1=\E[B, ++ kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, ++ kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~, ++ kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, kfnd=\E[1~, ++ kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, nel=\EE, ++ rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, ++ ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>, + rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, +- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, ++ rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sc=\E7, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, +- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, +- smkx=\E=, smso=\E[7m, smul=\E[4m, ++ sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h, ++ smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, ++ use=ansi+pp, use=dec+sl, use=ansi+enq, + + # DEC VT220 and up support DECUDK (user-defined keys). DECUDK (i.e., pfx) + # takes two parameters, the key and the string. Translating the key is +@@ -2772,58 +2881,11 @@ + # terminal mode is being used. If Set-Up has been disabled or + # assigned to an unknown key, Set-Up may be entered by pressing + # [F3] as the first key after power up, regardless of keyboard type. +-# (vt520: I added <rmam>/<smam> based on the init string, also <sc> -- esr) + vt520|DEC VT520, +- am, mir, xenl, xon, +- cols#80, lines#24, vt#3, +- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, +- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr, +- cub1=^H, cud1=\E[B, cuf1=\E[C, +- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, +- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, +- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, +- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, +- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, +- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, +- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, +- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, +- kslt=\E[4~, +- pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\, +- rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, +- ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, +- rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, +- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, +- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, +- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, +- smso=\E[7m, smul=\E[4m, ++ use=ansi+rca, use=vt420, use=ansi+tabs, + +-# (vt525: I added <rmam>/<smam> based on the init string; +-# removed <rmso>=\E[m, <rmul>=\E[m, added <sc> -- esr) + vt525|DEC VT525, +- am, mir, xenl, xon, +- cols#80, lines#24, vt#3, +- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, +- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr, +- cub1=^H, cud1=\E[B, cuf1=\E[C, +- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P, +- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I, +- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED, +- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H, +- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, +- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR, +- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~, +- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, +- kslt=\E[4~, +- pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\, +- rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300, +- ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, +- rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, +- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7, +- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>, +- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h, +- smso=\E[7m, smul=\E[4m, ++ use=vt520, + + #### VT100 emulations + # +@@ -2887,7 +2949,7 @@ + # the default behavior -TD + + putty|PuTTY terminal emulator, +- am, bce, bw, ccc, hs, mir, msgr, xenl, xon, XT, ++ am, bce, bw, ccc, mir, msgr, xenl, xon, XT, + colors#8, it#8, ncv#22, pairs#64, U8#1, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, +@@ -2897,11 +2959,10 @@ + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, + dch=\E[%p1%dP, dch1=\E[P, + dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G\342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e%p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G\342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@%e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E%%G\340\202\242\E%%@%e%p1%c%;, +- dl=\E[%p1%dM, dl1=\E[M, dsl=\E]0;\007, ech=\E[%p1%dX, +- ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, +- flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, hpa=\E[%i%p1%dG, +- ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J, +- indn=\E[%p1%dS, ++ dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, ++ el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ++ hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ++ ind=^J, indn=\E[%p1%dS, + initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x, + is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R, + kb2=\E[G, kbs=\177, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, +@@ -2922,7 +2983,8 @@ + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h, + smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, +- tbc=\E[3g, tsl=\E]0;, vpa=\E[%i%p1%dd, use=vt102+enq, ++ tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J, use=vt102+enq, ++ use=xterm+sl, + vt100-putty|Reset PuTTY to pure vt100, + rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p, + use=vt100, +@@ -2937,6 +2999,28 @@ + kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, + kf9=\EOX, use=putty, + ++# Unlike xterm-sco, this leaves kmous ambiguous with kf1. ++# ++# Use modifiers to obtain function keys past 12: ++# F1-F12 - normal ++# F13-F24 - shift ++# F25-F36 - control/alt ++# F37-F48 - control/shift ++# ++putty-sco|putty with SCO function keys, ++ kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ++ kdch1=\177, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W, ++ kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b, ++ kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f, ++ kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k, ++ kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O, ++ kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t, ++ kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y, ++ kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\, ++ kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{, ++ kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H, ++ kich1=\E[L, knp=\E[G, kpp=\E[I, use=putty, ++ + # This entry is for Tera Term Pro version 2.3, for MS-Windows 95/NT written by + # T. Teranishi dated Mar 10, 1998. It is a free software terminal emulator + # (communication program) which supports: +@@ -3091,7 +3175,8 @@ + kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E, + smso=\E[7m, + +-#### X terminal emulators ++######## X TERMINAL EMULATORS ++#### XTERM + # + # You can add the following line to your .Xdefaults to change the terminal type + # set by the xterms you start up to my-xterm: +@@ -3154,7 +3239,7 @@ + # added khome/kend, hts based on the R6 xterm code - TD + # (khome/kend do not actually work in X11R5 or X11R6, but many people use this + # for compatibility with other emulators). +-xterm-r6|xterm-old|xterm X11R6 version, ++xterm-r6|xterm X11R6 version, + OTbs, am, km, mir, msgr, xenl, + cols#80, it#8, lines#24, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +@@ -3180,10 +3265,12 @@ + sgr0=\E[m, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + use=vt100+enq, ++xterm-old|antique xterm version, ++ use=xterm-r6, + # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. + # The name has been changed and some aliases have been removed. + xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), +- OTbs, am, bce, km, mir, msgr, xenl, ++ OTbs, am, bce, km, mir, msgr, xenl, XT, + cols#80, it#8, lines#24, ncv@, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, +@@ -3227,13 +3314,13 @@ + # xterm to use terminfo-based descriptions with the titeInhibit resource. + # -- the distribution contained incorrect khome/kend values -TD + xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System), +- mc5i, + blink=\E[5m, ich1@, invis=\E[8m, + is2=\E[!p\E[?3;4l\E[4l\E>, kdch1=\E[3~, kfnd@, kslt@, +- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, rmcup=\E[?1047l\E[?1048l, +- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, ++ rmcup=\E[?1047l\E[?1048l, rs1=\Ec, ++ rs2=\E[!p\E[?3;4l\E[4l\E>, + sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, +- smcup=\E[?1048h\E[?1047h, use=xterm-xf86-v33, ++ smcup=\E[?1048h\E[?1047h, use=ansi+pp, ++ use=xterm-xf86-v33, + + # This version was released in XFree86 4.0. + xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System), +@@ -3274,12 +3361,14 @@ + # This version reflects the current xterm features. + xterm-new|modern xterm terminal emulator, + npc, +- indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, +- kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE, +- kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, +- kend=\EOF, kent=\EOM, khome=\EOH, kich1=\E[2~, kmous=\E[M, +- knp=\E[6~, kpp=\E[5~, rin=\E[%p1%dT, use=xterm+pcfkeys, ++ indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM, ++ rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux, + use=xterm-basic, ++ ++# This fragment is for people who cannot agree on what the backspace key ++# should send. ++xterm+kbs|fragment for backspace key, ++ kbs=^H, + # + # This fragment describes as much of XFree86 xterm's "pc-style" function + # keys as will fit into terminfo's 60 function keys. +@@ -3445,7 +3534,7 @@ + # + # This chunk is used for building the VT220/Sun/PC keyboard variants. + xterm-basic|modern xterm terminal emulator - common, +- OTbs, am, bce, km, mc5i, mir, msgr, xenl, AX, ++ OTbs, am, bce, km, mir, msgr, xenl, AX, XT, + colors#8, cols#80, it#8, lines#24, pairs#64, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, +@@ -3457,19 +3546,20 @@ + dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, + flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG, + ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, +- ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H, +- kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, +- memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, +- rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l, +- rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, +- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, +- setab=\E[4%p1%dm, setaf=\E[3%p1%dm, ++ ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, ++ kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, ++ rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, ++ rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, ++ rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, ++ rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm, ++ setaf=\E[3%p1%dm, + setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, + setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h, + smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m, +- smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq, ++ smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, E3=\E[3;J, ++ use=ansi+pp, use=xterm+kbs, use=vt100+enq, + + # From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997 + # In retrospect, something like xterm-r6 was intended here -TD +@@ -3527,6 +3617,28 @@ + xterm-1003|testing xterm-mouse, + XM=\E[?1003%?%p1%{1}%=%th%el%;, use=xterm-new, + ++# This chunk is based on suggestions by Ailin Nemui and Nicholas Marriott, who ++# asked for some of xterm's advanced features to be added to its terminfo ++# entry. It defines extended capabilities not found in standard terminfo or ++# termcap. These are useful in tmux, for instance, hence the name. ++# ++# One caveat in adding extended capabilities in ncurses is that if the names ++# are longer than two characters, then they will not be visible through the ++# termcap interface. ++# ++# Ms modifies the selection/clipboard. Its parameters are ++# p1 = the storage unit (clipboard, selection or cut buffer) ++# p2 = the base64-encoded clipboard content. ++# ++# Ss is used to set the cursor style as described by the DECSCUSR ++# function to a block or underline. ++# Se resets the cursor style to the terminal power-on default. ++# ++# Cs and Cr set and reset the cursor colour. ++xterm+tmux|advanced xterm features used in tmux, ++ Cr=\E]112\007, Cs=\E]12;%p1%s\007, ++ Ms=\E]52;%p1%s;%p2%s\007, Se=\E[2 q, Ss=\E[%p1%d q, ++ + # This is another variant, for XFree86 4.0 xterm (T.Dickey) + # This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color. + # To use it, your decTerminalID resource must be set to 200 or above. +@@ -3552,8 +3664,8 @@ + hpa=\233%i%p1%dG, ht=^I, hts=\210, ich=\233%p1%d@, + il=\233%p1%dL, il1=\233L, ind=^J, invis=\2338m, + is2=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8, +- ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kbs=^H, +- kc1=\217q, kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B, ++ ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kc1=\217q, ++ kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B, + kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\2334~, + kent=\217M, kf1=\23311~, kf10=\23321~, kf11=\23323~, + kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~, +@@ -3575,6 +3687,7 @@ + smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=, + smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR, + u7=\E[6n, u8=\233[?1;2c, u9=\E[c, vpa=\233%i%p1%dd, ++ use=xterm+kbs, + + xterm-hp|xterm with hpterm function keys, + kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, +@@ -3621,8 +3734,9 @@ + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, clear=\EH\EJ, cr=^M, cub1=\ED, cud1=\EB, cuf1=\EC, + cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK, +- home=\EH, ht=^I, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB, +- kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF, ++ home=\EH, ht=^I, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC, ++ kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF, ++ use=xterm+kbs, + + xterm-noapp|xterm with cursor keys in normal mode, + rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp, +@@ -3640,25 +3754,68 @@ + xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode, + U8#1, use=xterm, + +-# These entries allow access to the X titlebar and icon name as a status line. +-# Note that twm (and possibly window managers descended from it such as tvtwm, +-# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess +-# with it. ++# These building-blocks allow access to the X titlebar and icon name as a ++# status line. There are a few problems in using them in entries: ++# ++# a) tsl should have a parameter to denote the column on which to transfer to ++# the status line. ++# b) the "0" code for xterm updates both icon-title and window title. Some ++# window managers such as twm (and possibly window managers descended from ++# it such as tvtwm, ctwm, and vtwm) track windows by icon-name. Thus, you ++# don't want to mess with icon-name when using those window managers. + xterm+sl|access X title line and icon name, + hs, +- wsl#40, +- dsl=\E]0;\007, fsl=^G, tsl=\E]0;, use=xterm, ++ dsl=\E]0;\007, fsl=^G, tsl=\E]0;, + xterm+sl-twm|access X title line (pacify twm-descended window managers), + hs, +- wsl#40, +- dsl=\E]2;\007, fsl=^G, tsl=\E]2;, use=xterm, ++ dsl=\E]2;\007, fsl=^G, tsl=\E]2;, ++ ++# In contrast, this block can be used for a DEC vt320 and up. There are two ++# controls used. ++# ++# DECSASD (select active status display) ++# \E[0$} Main display ++# \E[1$} Status line ++# ++# DECSSDT (select status line type) ++# \E[0$~ No status line ++# \E[1$~ Indicator status line ++# \E[2$~ Host-writable status line ++# ++# The building block assumes that the terminal always shows something at the ++# status line (either the indicator, or status line). That is because if no ++# status line is used, then the terminal makes that line part of the user ++# window, changing its size without notice. ++# ++# Because there is no "esl" (enable status line) capability, the "tsl" ++# capability ensures that the status line is host-writable. A DEC terminal ++# will clear the status line when changing from indicator to host-writable ++# mode. ++# ++# Once on the status line, the row part of cursor addressing is ignored. Since ++# tsl expects a parameter (to specify the column), the shortest addressing that ++# can be used for this purpose is HPA, e.g., \E[5d to go to column 5. ++# ++dec+sl|DEC VTxx status line, ++ eslok, hs, ++ dsl=\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$}\E[%i%p1%d`, + + # + # The following xterm variants don't depend on your base version + # + # xterm with bold instead of underline + xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold, ++ sgr=%?%p9%t\016%e\017%;B\E[0%?%p6%t;1%;%?%p2%t;1%;%?%p1%p3%|%t;7%;m, + smso=\E[7m, smul=\E[1m, use=xterm-old, ++ ++# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file ++xterm-nic|xterm with ich/ich1 suppressed for non-curses programs, ++ ich@, ich1@, use=xterm, ++# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996 ++xterm1|xterm terminal emulator ignoring the alternate screen buffer, ++ rmcup@, smcup@, use=xterm, ++ ++#### KTERM + # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr) + # (kterm should not invoke DEC Graphics as the alternate character set + # -- Kenji Rikitake) +@@ -3676,12 +3833,51 @@ + tsl=\E[?E\E[?%i%p1%dT, use=xterm-r6, use=ecma+color, + kterm-color|kterm-co|kterm with ANSI colors, + ncv@, use=kterm, use=ecma+color, +-# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file +-xterm-nic|xterm with ich/ich1 suppressed for non-curses programs, +- ich@, ich1@, use=xterm, +-# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996 +-xterm1|xterm terminal emulator ignoring the alternate screen buffer, +- rmcup@, smcup@, use=xterm, ++ ++#### Other XTERM ++# These (xtermc and xtermm) are distributed with Solaris. They refer to a ++# variant of xterm which is apparently no longer supported, but are interesting ++# because they illustrate SVr4 curses mouse controls - T.Dickey ++xtermm|xterm terminal emulator (monocrome), ++ OTbs, am, km, mir, msgr, xenl, ++ btns#3, cols#80, it#8, lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, ++ bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, ++ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, ++ el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY, ++ home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, ++ il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD, ++ kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy, ++ kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, ++ kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_, ++ knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM, ++ rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m, ++ rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, ++ rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, ++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, ++ sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1, ++ smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys, ++ ++xtermc|xterm terminal emulator (color), ++ colors#8, ncv#7, pairs#64, ++ op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, ++ setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, ++ setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, ++ use=xtermm, ++ ++# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995 ++# Here's a termcap entry I've been using for xterm_color, which comes ++# with BSD/OS 2.0, and the X11R6 contrib tape too I think. Besides the ++# color stuff, I also have a status line defined as the window manager ++# title bar. [I have translated it to terminfo -- ESR] ++xterm-pcolor|xterm with color used for highlights and status line, ++ wsl#40, ++ bold=\E[1;43m, rev=\E[7;34m, ++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1%t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m, ++ smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6, + + # This describes the capabilities of color_xterm, an xterm variant from + # before ECMA-64 color support was folded into the main-line xterm release. +@@ -3729,6 +3925,32 @@ + ncv@, + op=\E[m, use=xterm-r6, use=klone+color, + ++# This entry describes an xterm with Sun-style function keys enabled ++# via the X resource setting "xterm*sunFunctionKeys:true" ++# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same. ++# The <kf13>...<kf20> keys are L3-L10. We don't set <kf16=\E[197z> ++# because we want it to be seen as <kcpy>. ++# The <kf31>...<kf45> keys are R1-R15. We treat some of these in accordance ++# with their Sun keyboard labels instead. ++# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996 ++xterm-sun|xterm with sunFunctionKeys true, ++ kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB, ++ kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z, ++ kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z, ++ kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z, ++ kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z, ++ kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z, ++ kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z, ++ kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z, ++ kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z, ++ kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z, ++ kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z, ++ kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z, ++ use=xterm-basic, ++xterms-sun|small (80x24) xterm with sunFunctionKeys true, ++ cols#80, lines#24, use=xterm-sun, ++ ++#### GNOME (VTE) + # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0 + gnome-rh62|Gnome terminal, + bce, +@@ -3782,7 +4004,7 @@ + # + # bce and msgr are repaired. + gnome-rh90|GNOME Terminal, +- bce, msgr, ++ bce, msgr, XT, + hpa=\E[%i%p1%dG, kDC=\E[3;2~, kLFT=\EO2D, kRIT=\EO2C, + kb2=\E[E, kcbt=\E[Z, kend=\EOF, khome=\EOH, tbc=\E[3g, + vpa=\E[%i%p1%dd, use=xterm+pcf0, use=xterm+pcfkeys, +@@ -3867,6 +4089,7 @@ + xfce|Xfce Terminal, + use=vte, + ++#### Other GNOME + # Multi-Gnome-Terminal 1.6.2 + # + # This does not use VTE, and does have different behavior (compare xfce and +@@ -3874,6 +4097,7 @@ + mgt|Multi GNOME Terminal, + indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333, + ++#### KDE + # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce + # or not is debatable). + kvt|KDE terminal, +@@ -3922,7 +4146,7 @@ + ncv@, + bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h, + ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l, +- hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1@, ++ hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1=\E[3~, + kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@, + kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@, + kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, rmam=\E[?7l, +@@ -3932,11 +4156,10 @@ + sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd, + use=ecma+color, use=xterm-r6, + konsole-linux|KDE console window with linux keyboard, +- kdch1=\E[3~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, +- kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, +- kf2=\E[[B, kf20@, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, +- kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, +- use=konsole-base, ++ kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@, ++ kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\E[[B, kf20@, ++ kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, ++ kf8=\E[19~, kf9=\E[20~, use=konsole-base, + konsole-solaris|KDE console window with Solaris keyboard, + kbs=^H, kend=\E[4~, khome=\E[1~, use=konsole-vt100, + # KDE's "XFree86 3.x.x" keyboard is based on reading the xterm terminfo rather +@@ -3972,6 +4195,7 @@ + konsole-256color|KDE console window with xterm 256-colors, + initc@, use=xterm+256color, use=konsole, + ++#### MLTERM + # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD + # + # It is nominally a vt102 emulator, with features borrowed from rxvt and +@@ -4037,6 +4261,7 @@ + mlterm-256color|mlterm 3.0 with xterm 256-colors, + use=xterm+256color, use=rxvt, + ++#### RXVT + # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 + # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 + # Notes: +@@ -4208,6 +4433,7 @@ + rxvt-16color|xterm with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++#### MRXVT + # mrxvt 0.5.4 + # + # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which +@@ -4225,6 +4451,7 @@ + mrxvt-256color|multitabbed rxvt with 256 colors, + use=xterm+256color, use=mrxvt, + ++#### ETERM + # From: Michael Jennings <mej@valinux.com> + # + # Eterm 0.9.3 +@@ -4270,11 +4497,13 @@ + Eterm-88color|Eterm with 88 colors, + use=xterm+88color, use=Eterm, + ++#### ATERM + # Based on rxvt 2.4.8, it has a few differences in key bindings + aterm|AfterStep terminal, + XT, + kbs=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt, + ++#### XITERM + # xiterm 0.5-5.2 + # This is not based on xterm's source... + # vttest shows several problems with keyboard, cursor-movements. +@@ -4283,48 +4512,8 @@ + km@, + kbs=\177, kdch1=\E[3~, use=klone+color, use=xterm-r6, + +-# These (xtermc and xtermm) are distributed with Solaris. They refer to a +-# variant of xterm which is apparently no longer supported, but are interesting +-# because they illustrate SVr4 curses mouse controls - T.Dickey +-xtermm|xterm terminal emulator (monocrome), +- OTbs, am, km, mir, msgr, xenl, +- btns#3, cols#80, it#8, lines#24, +- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, +- bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M, +- csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D, +- cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, +- cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, +- el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY, +- home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@, +- il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD, +- kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy, +- kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU, +- kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_, +- knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM, +- rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m, +- rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, +- rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, +- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, +- sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1, +- smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys, +- +-xtermc|xterm terminal emulator (color), +- colors#8, ncv#7, pairs#64, +- op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, +- setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, +- setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, +- use=xtermm, +- +-# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995 +-# Here's a termcap entry I've been using for xterm_color, which comes +-# with BSD/OS 2.0, and the X11R6 contrib tape too I think. Besides the +-# color stuff, I also have a status line defined as the window manager +-# title bar. [I have translated it to terminfo -- ESR] +-xterm-pcolor|xterm with color used for highlights and status line, +- bold=\E[1m\E[43m, rev=\E[7m\E[34m, smso=\E[7m\E[31m, +- smul=\E[4m\E[42m, use=xterm+sl, use=xterm-r6, + ++#### HPTERM + # HP ships this (HPUX 9 and 10), except for the pb#9600 which was merged in + # from BSD termcap. (hpterm: added empty <acsc>, we have no idea what ACS + # chars look like --esr) +@@ -4357,31 +4546,7 @@ + initp=\E&v%p2%da%p3%db%p4%dc%p5%dx%p6%dy%p7%dz%p1%dI, + op=\E&v0S, scp=\E&v%p1%dS, use=hpterm, + +-# This entry describes an xterm with Sun-style function keys enabled +-# via the X resource setting "xterm*sunFunctionKeys:true" +-# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same. +-# The <kf13>...<kf20> keys are L3-L10. We don't set <kf16=\E[197z> +-# because we want it to be seen as <kcpy>. +-# The <kf31>...<kf45> keys are R1-R15. We treat some of these in accordance +-# with their Sun keyboard labels instead. +-# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996 +-xterm-sun|xterm with sunFunctionKeys true, +- kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB, +- kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z, +- kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z, +- kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z, +- kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z, +- kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z, +- kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z, +- kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z, +- kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z, +- kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z, +- kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z, +- kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z, +- use=xterm-basic, +-xterms-sun|small (80x24) xterm with sunFunctionKeys true, +- cols#80, lines#24, use=xterm-sun, +- ++#### EMU + # This is for the extensible terminal emulator on the X11R6 contrib tape. + # It corresponds to emu's internal emulation: + # emu -term emu +@@ -4443,6 +4608,8 @@ + sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr0=\E[m, smacs=^N, smcup=\E[?1l\E=, smkx=\E=, + smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g, ++ ++#### MVTERM + # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI, + # print interface, ANSI X3.64 colour escape sequences, etc. Newsgroup postings + # indicate that it emulates more than one terminal, but incompletely. +@@ -4477,7 +4644,7 @@ + smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, + tsl=\E[?E\E[?%i%p1%dT, use=vt100+fnkeys, + +-### MTERM ++#### MTERM + # + # This application is available by email from <mouse@Rodents.Montreal.QC.CA>. + # +@@ -4598,6 +4765,123 @@ + kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr, + ++#### SIMPLETERM ++# st.suckless.org ++# st-0.1.1 ++# ++# Note: the original terminfo description uses leading blank to persuade ++# ncurses to use "st" as its name. Proper fix for that is to use "st" as an ++# alias. ++# ++# Reading the code shows it should work for aixterm 16-colors ++# - added st-16color ++# ++# Using tack: ++# - set eo (erase-overstrike) ++# - set xenl ++# - tbc doesn't work ++# - hts works ++# - cbt doesn't work ++# - shifted cursor-keys send sequences like rxvt ++# - sgr referred to unimplemented "invis" mode. ++# Fixes: add eo and xenl per tack, remove nonworking cbt, hts and tbc, invis ++simpleterm|st| simpleterm, ++ am, eo, mir, msgr, ul, xenl, ++ colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64, ++ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, ++ bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, ++ cnorm=\E[?12l\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, ++ cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ++ dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, ++ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@, ++ il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, kbs=\177, ++ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ++ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, ++ kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ++ khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8, ++ rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7, ++ setab=\E[4%p1%dm, setaf=\E[3%p1%dm, ++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m, ++ sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m, ++st-16color|simpleterm with 16-colors, ++ use=ibm+16color, use=simpleterm, ++# 256 colors "works", but when running xterm's test-scripts, some garbage is ++# shown in the titlebar. ++st-256color|simpleterm with 256 colors, ++ ccc@, ++ initc@, use=xterm+256color, use=simpleterm, ++ ++### TERMINATOR ++# http://software.jessies.org/terminator/ ++# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit ++# Debian/current -TD (2011/8/20) ++# ++# There are some packaging problems: ++# a) using Java, the program starts off using 50Mb, and climbs from there, ++# up to 114Mb after testing (no scrollback). ++# b) it insists on reinstalling its terminal description in $HOME/.terminfo ++# (two copies, just in case the host happens to be Mac OS X). ++# I deleted this after testing with tack. ++# ++# Issues/features found with tack: ++# a) tbc does not work (implying that hts also is broken). ++# Comparing with the tabs utility shows a problem with the last tabstop on ++# a line. ++# b) has xterm-style shifted function-key strings ++# meta also is used, but control is ignored. ++# c) has xterm-style modifiers for cursor keys (shift, control, shift+control, meta) ++# d) some combinations of shift/control send xterm-style sequences for ++# insert/delete/home/end. ++# e) numeric keypad sends only numbers (compare with vttest). ++# f) meta mode (km) is not implemented. ++# ++# Issues found with ncurses test-program: ++# a) bce is inconsistently implemented ++# b) widths of Unicode values above 256 do not always agree with wcwidth. ++# ++# Checked with vttest, found low degree of compatibility there. ++# ++# Checked with xterm's scripts, found that the 256-color palette is fixed. ++# ++# Fixes: ++# a) add sgr string ++# b) corrected sgr0 to reset alternate character set ++# c) modified smacs/rmacs to use SCS rather than SI/SO ++# d) removed bce ++# e) removed km ++terminator|Terminator no line wrap, ++ eo, mir, msgr, xenl, xon, ++ colors#256, cols#80, it#8, lines#24, lm#0, pairs#32767, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, ++ bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J, ++ cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr, ++ cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, ++ cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, ++ cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P, ++ dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\007, ed=\E[J, el=\E[K, ++ el1=\E[1K, enacs=\E(B\E)0, flash=^G, fsl=^G, home=\E[H, ++ hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ++ ind=^J, is1=\E[?47l\E=\E[?1l, ++ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H, ++ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, ++ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, ++ kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, ++ kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ++ khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, ++ op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, ++ rmcup=\E[?47l\E8, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, ++ rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H, ++ rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>, ++ s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm, ++ setaf=\E[38;5;%p1%dm, ++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%;m%?%p9%t\E(0%e\E(B%;, ++ sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h, ++ smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1, ++ vpa=\E[%i%p1%dd, ++ + ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS + # + +@@ -4780,7 +5064,7 @@ + bce@, bw, + invis@, kIC@, kNXT@, kPRV@, meml@, memu@, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m, +- use=screen+fkeys, use=xterm-new, ++ E3@, use=screen+fkeys, use=xterm-new, + # xterm-r6 does not really support khome/kend unless it is propped up by + # the translations resource. + screen.xterm-r6|screen customized for X11R6 xterm, +@@ -4920,18 +5204,18 @@ + # sequences for setting the window-title. So you must use tsl and fsl in + # pairs, since the latter ends the string that is loaded to the window-title. + ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in vt220-8 mode, +- am, hs, km, mir, msgr, xenl, ++ am, km, mir, msgr, xenl, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, +- dsl=\E]0;\007, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, +- flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, ht=^I, hts=\EH, +- ich=\E[%p1%d@, if=/usr/share/tabset/vt100, +- il=\E[%p1%dL, il1=\E[L, ind=\n$<150*>, ++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, ++ el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[?5h\E[?5l, ++ home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ++ if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L, ++ ind=\n$<150*>, + is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kbs=^H, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~, +@@ -4945,8 +5229,8 @@ + rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sc=\E7, + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;, + sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7, +- smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]0;, +- u8=\E[?62;1;6c, use=ansi+enq, ++ smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, ++ u8=\E[?62;1;6c, use=xterm+sl, use=ansi+enq, + ncsa|NCSA Telnet 2.7 for Macintosh in vt220-8 mode, + use=ncsa-m, use=klone+color, + ncsa-ns|NCSA Telnet 2.7 for Macintosh in vt220-8 mode, +@@ -5064,10 +5348,10 @@ + kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, kf2=\E[225z, + kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z, + kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z, +- knp=\E[222z, kopt=\E[194z, kpp=\E[216z, kres=\E[193z, +- kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@, rs2=\E[s, +- sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, smso=\E[7m, +- u8=\E[1t, u9=\E[11t, ++ kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z, ++ kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@, ++ rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, ++ smso=\E[7m, u8=\E[1t, u9=\E[11t, + # On some versions of CGSIX framebuffer firmware (SparcStation 5), <il1>/<il> + # flake out on the last line. Unfortunately, without them the terminal has no + # way to scroll. +@@ -5077,6 +5361,10 @@ + sun|sun1|sun2|Sun Microsystems Inc. workstation console, + use=sun-il, + ++sun+sl|Sun Workstation window status line, ++ hs, ++ dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l, ++ + # From: <john@ucbrenoir> Tue Sep 24 13:14:44 1985 + sun-s|Sun Microsystems Workstation window with status line, + hs, +@@ -5131,10 +5419,11 @@ + sun-color|Sun Microsystems Workstation console with color support (IA systems), + colors#8, ncv#3, pairs#64, + cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC, +- cuu=\E[%p1%dA, home=\E[H, op=\E[0m, setab=\E[4%p1%dm, +- setaf=\E[3%p1%dm, ++ cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s, ++ setab=\E[4%p1%dm, setaf=\E[3%p1%dm, + setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, + setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m, ++ sgr=\E[0%?%p1;1%;%?%p3%;7%;m, sgr0=\E[m, smso=\E[1m, + use=sun, + + #### Iris consoles +@@ -5405,7 +5694,7 @@ + #### Non-Unix Consoles + # + +-### EMX termcap.dat compatibility modes ++#### EMX termcap.dat compatibility modes + # + # Also (possibly only EMX, so we don't put it in ansi.sys, etc): set the + # no_color_video to inform the application that standout(1), underline(2) +@@ -5544,7 +5833,7 @@ + rmacs=\E[10m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, + rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, + sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm, +- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, ++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m, + sgr0=\E[0;10m, smacs=\E[11m, smcup=\E7\E[?47h, + smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];, + vpa=\E[%i%p1%dd, use=vt102+enq, +@@ -5579,7 +5868,7 @@ + rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l, + rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7, + setab=\E[4%p1%dm, setaf=\E[3%p1%dm, +- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, ++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m, + sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq, + +@@ -5825,7 +6114,7 @@ + ht=^I, hts=\EH$<2/>, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H, + kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED$<5/>, +- rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/lib/tabset/vt100, ++ rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100, + ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>, + rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, + sgr0=\E[m$<2/>, smso=\E[7m$<2/>, smul=\E[4m$<2/>, +@@ -5968,7 +6257,7 @@ + # :cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r: + # :XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\ + # :HL=^AP\r:SP=\E[i:\ +-# :IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\ ++# :IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T: + altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V, + blink=\E[5p, ri=\EM, sgr0=\E[p, use=altos2, + altos4|alt4|altos-4|altos IV, +@@ -6183,7 +6472,7 @@ + da, db, + lm#0, pb#19200, + ed=\ED\EJ$<500>\EC, indn=\E&r%p1%dD, ip=$<4>, +- is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk+cr, ++ is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk-cr, + use=hp+labels, use=scrhp, + + # This entry is for sysline. It allocates a 23 line window with +@@ -6384,7 +6673,7 @@ + hp2622|hp2622a|hp 2622, + da, db, + lm#0, pb#19200, +- is2=\E&dj@\r, use=hp+pfk+cr, use=hp+labels, use=scrhp, ++ is2=\E&dj@\r, use=hp+pfk-cr, use=hp+labels, use=scrhp, + + # The 2623 is a 2622 with extra graphics hardware. + hp2623|hp2623a|hp 2623, +@@ -7088,6 +7377,9 @@ + # What seems to be going on here is that this entry was designed so that + # the normal highlight is bold and standout is dim plus something else + # (reverse-video maybe? But then, are there two <rev> sequences?) ++# ++# Added kdch1, kil1, kdl1 based on screenshot -TD: ++# http://www.vintagecomputer.net/qume/qvt-108/qume_qvt-108_keyboard.jpg + qvt101+|qvt101p|qume qvt 101 PLUS product, + am, bw, hs, ul, + cols#80, lines#24, xmc#0, +@@ -7096,11 +7388,11 @@ + dch1=\EW, dl1=\ER, dsl=\Eg\Ef\r, ed=\EY, el=\ET, + flash=\Eb$<200>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1, + ich1=\EQ, il1=\EE, ind=^J, invis@, kbs=^H, kcbt=\EI, kcub1=^H, +- kcud1=^J, kcuf1=^L, kcuu1=^K, kdl1=\ER, ked=\EY, kel=\ET, +- kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, +- kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, +- khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@, rmso=\E(, +- smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr, ++ kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY, ++ kel=\ET, kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r, ++ kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, ++ kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@, ++ rmso=\E(, smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr, + qvt102|qume qvt 102, + cnorm=\E., use=qvt101, + # (qvt103: added <rmam>/<smam> based on init string -- esr) +@@ -8212,8 +8504,8 @@ + rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l, + rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=13.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee \Ex0\0\0\Ex1\0\0\Ex2\0\0\Ex3\0\0\Ex4\0\0\E1, + rs3=\E[=19h\E.3\E9\E0O\0\0\0\0\0\E0o\0\0\0\0\0\E0J\177\0\0\0\0, +- sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p9%t\E$%e\E%%%;, +- sgr0=\EG0, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er, ++ sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p8%t\E&%;%?%p9%t\E$%e\E%%%;, ++ sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er, + smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O, + tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0, + +@@ -9980,7 +10272,7 @@ + pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM, + rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, + sc=\E7, +- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, ++ sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m, + tsl=\E7\E[25;%p1%{1}%+%dH, + +@@ -10078,7 +10370,7 @@ + pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV, + rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l, + rmkx=\E[19;0j\E[21;1j\212, rmln=\E|, +- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, ++ sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h, + smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g, + tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd, +@@ -10284,7 +10576,7 @@ + rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l, + rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|, + rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7, +- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, ++ sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h, + smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m, + smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH, +@@ -10681,7 +10973,7 @@ + ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l, + rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m, + rs2=\Ec\E[?3l, sc=\E7, +- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, ++ sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;, + sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h, + smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m, + tsl=\E7\E[25;%i%p1%dx, +@@ -10741,7 +11033,7 @@ + mc5=\E[?5i, nel=^M^J, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8, + rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m, + rmul=\E[m, rs2=\Ec, sc=\E7, +- sgr=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m, ++ sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7%;m, + sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, + att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines, + lines#24, use=att630, +@@ -11391,7 +11683,7 @@ + rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, + rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\, + rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7, +- sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, ++ sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m, + sgr0=\E[m, + smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\, + smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, +@@ -11401,13 +11693,13 @@ + blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m, + is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m, + rs1=\E[H\E[7m\E[J$<156>, +- sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m, ++ sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%t7;%;%?%p7%t8;%;m\016, + sgr0=\E[7m\016, smso=\E[m, smul=\E[4;7m, + # Ambassador with the DEC option, for partial vt100 compatibility. + aaa+dec|ann arbor ambassador in dec vt100 mode, + acsc=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}, + csr=\E[%i%p1%d;%p2%dr, enacs=\E(0, rmacs=^N, +- sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;, ++ sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;, + smacs=^O, + aaa-18|ann arbor ambassador/18 lines, + lines#18, +@@ -11574,7 +11866,7 @@ + blink=\E[5;7m, bold=\E[1;7m, home=\E[H, invis=\E[7;8m, + is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m, + rs1=\E[H\E[7m\E[J, +- sgr=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m, ++ sgr=\E[%?%p6%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p1%!%t7;%;%?%p7%t8;%;m, + sgr0=\E[7m, smso=\E[m, smul=\E[4;7m, + + #### Applied Digital Data Systems (adds) +@@ -12416,7 +12708,7 @@ + # and mc5= should use the \E[?4i and \E[?5i strings instead). + + hds200|Human Designed Systems HDS200, +- am, bw, eslok, hs, km, mc5i, mir, msgr, xenl, xon, ++ am, bw, eslok, hs, km, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, lm#0, + acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G, + blink=\E[0;5m, bold=\E[0;1m, cbt=\E[Z, civis=\E[6+{, +@@ -12445,13 +12737,12 @@ + kf51=^\051\r, kf52=^\052\r, kf53=^\053\r, kf6=^\006\r, + kf7=^\007\r, kf8=^\008\r, kf9=^\009\r, khome=\E[H, + kind=\E[T, knp=\E[U, kpp=\E[V, kri=\E[S, ll=\E[H\E[A, +- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\E[E, rc=\E8, +- rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[m\017, +- rmul=\E[m\017, sc=\E7, ++ nel=\E[E, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l, ++ rmso=\E[m\017, rmul=\E[m\017, sc=\E7, + sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m, + smul=\E[0;4m, tbc=\E[3g, tsl=\E[2!w\E[%i%p1%dG, +- vpa=\E[%i%p1%dd, ++ vpa=\E[%i%p1%dd, use=ansi+pp, + + # <ht> through <el> included to specify padding needed in raw mode. + # (avt-ns: added empty <acsc> to suppress a tic warning --esr) +@@ -12478,10 +12769,11 @@ + ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n, + rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{, + sc=\E7, +- sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m, +- sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r, +- smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, +- tbc=\E[3g, vpa=\E[%p1%{1}%+%dd, ++ sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e\016%;$<1>, ++ sgr0=\E[m\016$<1>, smacs=\017$<1>, ++ smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h, ++ smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g, ++ vpa=\E[%p1%{1}%+%dd, + avt-rv-ns|concept avt in reverse video mode/no status line, + flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h, + use=avt-ns, +@@ -12763,7 +13055,6 @@ + # backspace on all terminals. This is not so in DG mode. + # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the + # grounds that there is no matching ":ml:" +-# fixed garbled ":k9=\E[00\:z:" capability -- esr) + dg460-ansi|Data General Dasher 460 in ANSI-mode, + OTbs, am, msgr, ul, + cols#80, it#8, lines#24, +@@ -12774,10 +13065,12 @@ + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, + kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z, + kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z, +- kf8=\E[009z, kf9=\E[010z, khome=\E[H, lf0=f1, lf1=f2, lf2=f3, +- lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, rev=\E[7m, +- ri=\E[T, rmso=\E[m, rmul=\E[05, sgr0=\E[m, smso=\E[7m, +- smul=\E[4m, ++ kf8=\E[009z, kf9=\E[00\:z, khome=\E[H, lf0=f1, lf1=f2, ++ lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, ++ mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05, ++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m, ++ sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u6=\E[%d;%dR, ++ u7=\E[6n, u8=\E[5n, u9=\E[0n, + # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official) + # Data General 605x + # Ought to work for a Model 6242, Type D210 as well as a 605x. +@@ -12824,7 +13117,7 @@ + cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K, + el1=\E[1K, home=\E[H, ind=^J, is1=\E[<0;<1;<4l, + ll=\E[H\E[A, nel=^J, rev=\E[7m, rmso=\E[m, rmul=\E[m, +- sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m, ++ sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|%p6%|%t7;%;m, + sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=dgkeys+7b, + + # DASHER D210 series terminals in DG mode. +@@ -13026,7 +13319,7 @@ + is2=\E[3;2;2;1;1;1v\E(B\E)4\017, mc4=\E[4i, mc5=\E[5i, + ri=\EM, rmacs=\E)4\017, rs1=\Ec\E[<2h, + rs2=\E[4;0;2;1;1;1v\E(B\E)4, +- sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m\E)%?%p9%t6\016%e4\017%;, ++ sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5%|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;, + sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211, + + # Initialization string 2 sets: +@@ -13196,12 +13489,12 @@ + # + d470c|d470|Data General DASHER D470C, + is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h, +- sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;, ++ sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;, + use=dg+color, use=d460, + + d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode, + is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h, +- sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm%?%p9%t\016%e\017%;, ++ sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;, + use=dg+color, use=d460-7b, + + # Initialization string 2 sets: +@@ -13757,7 +14050,7 @@ + sb2|sb3|fixed superbee, + xsb@, use=superbee, + +-#### Beehive Medical Electronics ++#### Beehive Medical Electronics + # + # Steve Seymour <srseymour@mindspring.com> writes (Wed, 03 Feb 1999): + # Regarding your question though; Beehive terminals weren't made by Harris. +@@ -14224,6 +14517,8 @@ + sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, + sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, ++# "Megapel" refers to the display adapter, which was used with the IBM RT ++# aka IBM 6150. + ibm5081|hft|IBM Megapel Color display, + acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B, + s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154, +@@ -14578,7 +14873,7 @@ + is1=\EC\E.3\EDF\EV1\Eg\E[0ZZ, nel=^_, rev=\E[4ZZ, + rmir=\Er, rmso=\E[%gh%{4}%^%Ph%gh%dZZ, + rmul=\E[%gh%{8}%^%Ph%gh%dZZ, rs2=\Eo1, +- sgr=\E[%{0}%?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;ZZ, ++ sgr=\E[%'0'%?%p1%t%'8'%|%;%?%p2%t%'8'%|%;%?%p3%t%'4'%|%;%?%p4%t%'2'%|%;%?%p7%t%'1'%|%;%cZZ, + sgr0=\E[0ZZ, smir=\Eq, smso=\E[8ZZ, smul=\E[8ZZ, tbc=\E3, + icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols, + rs2=\Eo1, use=icl6404, +@@ -14895,7 +15190,7 @@ + # (esr: commented out <smacs>/<rmacs> because there's no <acsc>) + # + prism9|p9|P9|MDC Prism-9 in ANSII mode, +- am, bw, hs, mc5i, msgr, xenl, xon, ++ am, bw, hs, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, wsl#72, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l, + clear=^L, cnorm=\E[<4h, cr=^M, csr=\E[%i%p1%d;%p2%d%%v, +@@ -14911,14 +15206,15 @@ + kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~, + kf18=\E[32~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~, + kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, +- khome=\E[H, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=^M^J, +- prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m, +- ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, ++ khome=\E[H, nel=^M^J, prot=\E[32%{, rc=\E[%z, ++ rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l, ++ rmso=\E[27m, rmul=\E[24m, + rs2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N, + sc=\E[%y, +- sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;, ++ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?%p8%t\E[32%%{%;%?%p9%t\016%e\017%;, + sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd, ++ use=ansi+pp, + + # p9-w: Prism-9 in 132 column mode + # -------------------------------- +@@ -15282,7 +15578,7 @@ + rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m, + rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>, + sc=\E7, +- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>, ++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h, + smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g, + tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, use=vt220+keypad, +@@ -15339,7 +15635,7 @@ + rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, + rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>, + sc=\E7, +- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>, ++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, +@@ -15395,7 +15691,7 @@ + rmul=\E[24m, + rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>, + sc=\E7, +- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>, ++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>, + sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h, + smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, + tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, +@@ -15785,7 +16081,7 @@ + # Manufactured in the early/mid eighties, behaves almost the same as a + # Televideo 950. Take a 950, change its cabinet for a more 80s-ish one (but + # keep the same keyboard layout), add an optional 25-line mode, replace the DIP +-# switches with a menu and remove the "lock line" feature (ESC ! 1 and ESC ! ++# switches with a menu and remove the "lock line" feature (ESC ! 1 and ESC ! + # 2), here is the NDR 9500. Even the line-lock, albeit disabled, is + # recognized: if you type in "ESC !", the next (third) character is not + # echoed, showing that the terminal was actually waiting for a parameter! +@@ -15809,7 +16105,7 @@ + pfloc=\E|%{48}%p1%+%c2%p2\031, + pfx=\E|%{48}%p1%+%c1%p2\031, prot=\E), ri=\Ej, + rmacs=\E%%, rmir=\Er, rmso=\E(, rmxon=^N, +- sgr=\E%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;, ++ sgr=\EG0\E%%%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;, + sgr0=\EG0\E%%\E(, smacs=\E$, smir=\Eq, smso=\E), smxon=^O, + tbc=\E3, tsl=\Eg\Ef\011%p1%{32}%+%c, .kbs=^H, + +@@ -16279,7 +16575,7 @@ + kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, + rev=\E%!1\E[7m$<2>\E%!0, ri=\EI, + rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0, +- sgr=\E%%!1\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>\E%%!0, ++ sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0, + sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0, + smul=\E%!1\E[4m$<2>\E%!0, + # Tektronix 4207 with sysline. In the ancestral termcap file this was 4107-s; +@@ -16466,9 +16762,10 @@ + clear=\E[2J\E[H, cr=^M, cub=\E[%p1%dD, cub1=\E[D, + cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, +- dch1=\E[1P, dim=\E[=1;<6m, dl1=\E[1M, ech=\E%p1%dX, +- ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I, +- ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, ind=\ED, ++ dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M, ++ ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, ++ home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, ++ ind=\ED, + initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3%e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=%t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<%tA?%e%p2%{500}%<%tC8%e%p2%{625}%<%tD4%e%p2%{750}%<%tE1%e%p2%{875}%<%tE\:%eF4%;%?%p3%{125}%<%t0%e%p3%{250}%<%tA2%e%p3%{375}%<%tA?%e%p3%{500}%<%tC8%e%p3%{625}%<%tD4%e%p3%{750}%<%tE1%e%p3%{875}%<%tE\:%eF4%;%?%p4%{125}%<%t0%e%p4%{250}%<%tA2%e%p4%{375}%<%tA?%e%p4%{500}%<%tC8%e%p4%{625}%<%tD4%e%p4%{750}%<%tE1%e%p4%{875}%<%tE\:%eF4%;\E%%!1, + invis=\E[=6;<5, is1=\E%!0\ETM1\E%!1\E[m, kbs=^H, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOA, +@@ -16639,7 +16936,7 @@ + kf9=\250, khome=\E[H, kich1=\E[^H, knp=\E[U, kpp=\E[V, + ll=\E[24;1H, nel=^M, rev=\E[7m, ri=\E[T\E[A, + rin=\E[%p1%dT\E[%p1%dA, rmso=\E[m, rmul=\E[m, +- sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m, ++ sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t30;40%;m, + sgr0=\E[m, smso=\E[7m, smul=\E[4m, + + #### Apple II +@@ -16885,6 +17182,8 @@ + # + # echo "$TERM_PROGRAM" "$TERM_PROGRAM_VERSION" + # ++# For Apple_Terminal v309+, use "nsterm-256color" (or "nsterm-bce") ++# + # For Apple_Terminal v200+, use "nsterm-16color" (a.k.a. "nsterm") + # + # For Apple_Terminal v71+/v100+, use "nsterm-bce". +@@ -17101,6 +17400,7 @@ + sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + sgr0=\E[m\017, smacs=^N, use=nsterm+7, + ++# compare with xterm+sl-twm + nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support, + hs, + wsl#50, +@@ -17186,6 +17486,10 @@ + # and it is still not settable from the preferences dialog. This is + # tracked under rdar://problem/7365108 and rdar://problem/7365134 + # in Apple's bug reporter. ++# ++# In OS X 10.7 (Leopard) the TERM which can be set in the preferences dialog ++# defaults to xterm-color. Alternative selections are ansi, dtterm, rxvt, ++# vt52, vt100, vt102 and xterm. + nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5, + bw@, mir, npc, + civis=\E[?25l, cnorm=\E[?25h, dch=\E[%p1%dP, dch1=\E[P, +@@ -17197,10 +17501,10 @@ + kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[H, + knp=\E[6~, kpp=\E[5~, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, + smcup=\E7\E[?47h, smir=\E[4h, vpa=\E[%i%p1%dd, +- use=nsterm-c-s-acs, ++ kLFT5=\E[5D, kRIT5=\E[5C, use=nsterm-c-s-acs, + + # The versions of Terminal.app in Mac OS X version 10.3.x seem to have +-# the background color erase bug. The newer version 240.2 in Mac OS X ++# the background color erase feature. The newer version 240.2 in Mac OS X + # version 10.5 does not. + # + # This entry is based on newsgroup comments by Alain Bench, Christian Ebert, +@@ -17212,12 +17516,40 @@ + # defaults write com.apple.Terminal TermCapString nsterm-bce + # + # and that it is not set in Terminal's preferences dialog. ++# ++# Modified for OS X 10.8, omitting bw based on testing with tack -TD ++# ++# Notes: ++# * The terminal description matches the default settings. ++# * The keyboard is configurable via a dialog. ++# * By default khome, kend, knext and kprev are honored only with a ++# shift-modifier. ++# * There are bindings for control left/right arrow (but not up/down). ++# Added those to nsterm-16color, which is the version used for OS X 10.6 ++# * "Allow VT100 application keypage mode" is by default disabled. ++# There is no way to press keypad-comma unless application mode is enabled ++# and used. ++# * 132-column mode stopped working during vttest's tests. Consider it broken. ++# * CHT, REP, SU, SD are buggy. ++# * ECH works (also in Leopard), but is not used here for compatibility. ++# * The terminal preferences dialog replaces xterm-color by xterm-16color and ++# xterm-256color. However, it adds "nsterm", so it is possible to use the ++# nsterm entry from this file to override the MacPorts (20110404) or ++# system (20081102) copy of this file. + nsterm-bce|AppKit Terminal.app v71+/v100.1.8+ with Mac OS X version 10.3/10.4 (bce), +- bce, bw, use=nsterm-16color, ++ bce, use=nsterm-16color, ++ ++# This is tested with OS X 10.8 (Mountain Lion), 2012/08/11 ++# TERM_PROGRAM_VERSION=309 ++# Earlier reports state that these differences also apply to OS X 10.7 (Lion), ++# TERM_PROGRAM_VERSION=303 ++nsterm-256color|Terminal.app in OS X 10.8, ++ ccc@, ++ initc@, use=xterm+256color, use=nsterm-bce, + + # This is an alias which should always point to the "current" version + nsterm|Apple_Terminal|AppKit Terminal.app, +- use=nsterm-16color, ++ use=nsterm-256color, + + # iTerm.app from http://iterm.sourceforge.net/ is an alternative (and + # more featureful) terminal emulator for Mac OS X. It is similar +@@ -17752,6 +18084,23 @@ + # See + # http://www.minix3.org/manpages/man4/console.4.html + minix|minix console (v3), ++ acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376, ++ kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, ++ kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~, ++ kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~, ++ kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~, ++ kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~, ++ kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~, ++ kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~, ++ kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~, ++ kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~, ++ kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~, ++ kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~, ++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, ++ kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@, ++ use=minix-3.0, ++ ++minix-3.0|minix console (v3.0), + use=ecma+color, use=minix-1.7, + + # See +@@ -17792,7 +18141,7 @@ + am, use=minix-old, + + pc-minix|minix console on an Intel box, +- use=klone+acs, use=minix, ++ use=klone+acs, use=minix-3.0, + + # According to the Coherent 2.3 manual, the PC console is similar + # to a z19. The differences seem to be (1) 25 lines, (2) no status +@@ -18195,6 +18544,7 @@ + use=tws-generic, + dku7202|BULL Questar 200 DKU7202 (colour/character attributes), + blink=\E[0;2;4m, dim=\E[0;5m, ht=^I, is3=\E[?3h\Eb, ++ sgr=\E[0%?%p1%t;2;4;5;7%;%?%p3%t;7%;%?%p2%t;2%;%?%p4%t;2;4%;%?%p5%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;, + smso=\E[0;4;5;7m, smul=\E[0;2m, use=tws-generic, + + #=========================================================# +@@ -18274,7 +18624,7 @@ + + # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310 + bq300|Bull vt320 ISO Latin 1 80 columns terminal, +- am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon, ++ am, eo, eslok, hs, km, mir, msgr, xenl, xon, + cols#80, it#8, lines#24, vt#3, wsl#80, + acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l, +@@ -18298,14 +18648,14 @@ + kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, + khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~, + krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, +- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, +- ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l, +- rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p, +- rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7, ++ nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l, ++ rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, ++ rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, ++ sc=\E7, + sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;, + sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h, + smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m, +- smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, ++ smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+pp, + bq300-rv|Bull vt320 reverse 80 columns, + flash=\E[?5l$<50>\E[?5h, + is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l, +@@ -18383,12 +18733,12 @@ + csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D, + cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C, + cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A, +- dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, ++ dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M, + dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J, + el=\233K, el1=\2331K, enacs=\E(B\E)0, + flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H, +- ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, ind=\ED, +- is1=\E[63;2"p\E[2h, ++ ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L, ++ ind=\ED, is1=\E[63;2"p\E[2h, + is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l, + is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w, + ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s, +@@ -18401,11 +18751,12 @@ + khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~, + krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, + lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, +- rev=\2337m, ri=\EM, rmacs=^O, rmam=\233?7l, rmcup=\233?7h, +- rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m, +- rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7, ++ rev=\2337m, ri=\EM, rmacs=\E(B, rmam=\233?7l, ++ rmcup=\233?7h, rmir=\2334l, rmkx=\233?1l\E>, ++ rmso=\23327m, rmul=\23324m, rs1=\E[!p, rs2=\E[?3l, ++ s0ds=\E(B, s1ds=\E(0, sc=\E7, + sgr=\233%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;, +- sgr0=\2330m\E(B, smacs=^N, smam=\233?7h, ++ sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, + smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m, + smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~, + bq300-8rv|Bull vt320 8-bit reverse mode 80 columns, +@@ -19010,14 +19361,14 @@ + cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM, +- dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, home=\E[H, +- ht=^I, hts=\EH, if=/usr/share/tabset/vt100, il=\E[%p1%dL, +- ind=\ED, kbs=^H, kclr=\E[J, kcub1=\EOD, kcud1=\EOB, +- kcuf1=\EOC, kcuu1=\EOA, ked=\E[J, kf0=\E[~, kf1=\EOS, +- kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ, +- kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7, +- nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM, rmcup=\E[?7h, +- rmso=\E[m, rmul=\E[m, ++ dl1=\E[M, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, ++ home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100, ++ il=\E[%p1%dL, il1=\E[L, ind=\ED, kbs=^H, kclr=\E[J, ++ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ked=\E[J, ++ kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, ++ kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help, ++ mc0=\E#7, nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM, ++ rmcup=\E[?7h, rmso=\E[m, rmul=\E[m, + rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m, + sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m, + tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K, +@@ -20217,9 +20568,9 @@ + sgr0=\EX, smacs=\EF, smso=\ET, + env230|envision230|envision 230 graphics terminal, + xenl@, +- mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, +- sgr=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>, +- use=vt100, ++ enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@, ++ sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>, ++ sgr0=\E[0m$<2>, smacs@, use=vt100, + # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic + # coupler attached, the whole rig fitting in a suitcase and more or less + # portable. Hot stuff for c.1977 :-) -- esr +@@ -20274,7 +20625,7 @@ + rmacs=\EH^C, rmam=\Ed., rmcup=, rmir=\Er, rmln=\EA11, + rmxon=\Ec20, rs1=\E~!\E~4$<150>, rs2=\EeF$<150>, + rs3=\EwG\Ee($<150>, +- sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, ++ sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c, + sgr0=\E(\EH\003\EG0\EcD, smacs=\EH^B, smam=\Ed/, + smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177, + smir=\Eq, smln=\EA10, smxon=\Ec21, tbc=\E0, tsl=\Ez(, +@@ -21011,11 +21362,108 @@ + # CF for civis and CO for cvvis. Finally, they define a boolean :ct: + # that flags color terminals. + # ++# Extensions added after ncurses 5.0 generally use the "-x" option of tic and ++# infocmp to manipulate user-definable capabilities. Those that are intended ++# for use in either terminfo or termcap use 2-character names. Extended ++# function keys do not use 2-character names, and are available only with ++# terminfo. ++# ++# As of mid-2012, no other terminfo/termcap implementation than ncurses ++# supports this extension; termcap libraries can as noted above make limited ++# use of the feature. ++# ++# ncurses makes explicit checks for a few user-definable capabilities: AX, U8, ++# XM. ++# ++# SCREEN Extensions: ++# ++# The screen program uses the termcap interface. It recognizes a few useful ++# nonstandard capabilities. Those are used in this file. ++# ++# AX (bool) Does understand ANSI set default fg/bg color (\E[39m / ++# \E[49m). ++# G0 (bool) Terminal can deal with ISO 2022 font selection sequences. ++# E0 (str) Switch charset 'G0' back to standard charset. ++# S0 (str) Switch charset 'G0' to the specified charset. ++# XT (bool) Terminal understands special xterm sequences (OSC, mouse ++# tracking). ++# ++# AX is relatively straightforward; it is interpreted by ncurses to say that ++# SGR 39/49 reset the terminal's foreground and background colors to their ++# "default". ++# ++# XT is harder, since screen's manpage does not give more details. For that, ++# we must read screen's source-code. When XT is set, screen assumes ++# ++# a) OSC 1 sets the title string, e.g., for the icon. Recent versions of ++# screen may also set the terminal's name, which is (for xterm) distinct ++# from the icon name. ++# b) OSC 20 sets the background pixmap. This is an rxvt feature. ++# c) OSC 39 and OSC 49 set the default foreground/background colors. Again ++# this is an rxvt feature. ++# d) certain mode settings enable the mouse: 9, 1000, 1001, 1002, 1003. ++# These are from xterm, although xterm accepts mouse codes that may not be ++# recognized by screen, e.g., 1005, 1006. ++# e) colors beyond 0..7 are implemented by xterm's aixterm-like 16-color ++# sequence. However, because screen uses only termcap, the values returned ++# by Af/Ab are not usable because they rely on expressions that termcap ++# does not support. Therefore, screen uses a hardcoded string to work ++# around the limitation. ++# f) all entries named "*xterm*" or "*rxvt*" have the bce flag set. ++# ++# The other ISO-2022 features are rarely used, but provided here to make ++# screen's termcap features available. ++# ++# XTERM Extensions: ++# ++# Most of the xterm extensions are for function-keys. Since patch #94 (in ++# 1999), xterm has supported shift/control/alt/meta modifiers which produce ++# additional function-key strings. Some other developers copied the feature, ++# though they did not follow xterm's lead in patch #167 (in 2002), to make ++# these key definitions less ambiguous. ++# ++# A few terminals provide similar functionality (sending distinct keys when ++# a modifier is used), including rxvt. ++# ++# These are the extended keys defined in this file: ++# ++# kDC3 kDC4 kDC5 kDC6 kDC7 kDN kDN3 kDN4 kDN5 kDN6 kDN7 kEND3 kEND4 kEND5 kEND6 ++# kEND7 kHOM3 kHOM4 kHOM5 kHOM6 kHOM7 kIC3 kIC4 kIC5 kIC6 kIC7 kLFT3 kLFT4 ++# kLFT5 kLFT6 kLFT7 kNXT3 kNXT4 kNXT5 kNXT6 kNXT7 kPRV3 kPRV4 kPRV5 kPRV6 kPRV7 ++# kRIT3 kRIT4 kRIT5 kRIT6 kRIT7 kUP kUP3 kUP4 kUP5 kUP6 kUP7 ka2 kb1 kb3 kc2 ++# ++# Here are the other xterm-related extensions which are used in this file: ++# ++# Cr is a string capability which resets the cursor color ++# Cs is a string capability which sets the cursor color to a given value. ++# The single string parameter is the color name/number, according to the ++# implementation. ++# Ms modifies the selection/clipboard. Its parameters are ++# p1 = the storage unit (clipboard, selection or cut buffer) ++# p2 = the base64-encoded clipboard content. ++# Se resets the cursor style to the terminal power-on default. ++# Ss is a string capability with one numeric parameter. It is used to set the ++# cursor style as described by the DECSCUSR function to a block or ++# underline. ++# XM is a string capability which overrides ncurses's built-in string which ++# enables xterm mouse mode. ++# ++# Miscellaneous extensions: ++# ++# gsbom/grbom are used to enable/disable real bold (not intensity bright) mode. ++# This was implemented for the Hurd. ++# E3 clears the terminal's scrollback buffer. This was implemented in the ++# Linux 3.0 kernel as a security feature. It matches a feature which was ++# added in xterm patch #107. ++# U8 is a numeric capability which denotes a terminal emulator which does not ++# support VT100 SI/SO when processing UTF-8 encoding. Set this to a nonzero ++# value to enable it. ++# + ######## CHANGE HISTORY + # + # The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94. +-# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses +-# project. ++# Releases 9 and 10 (up until the release of ncurses 4.2 in 1998) were ++# maintained by Eric S. Raymond as part of the ncurses project. + # + # This file contains all the capability information present in John Kunze's + # last version of the termcap master file, except as noted in the change +@@ -21115,7 +21563,7 @@ + # * Replaced HP entries up to hpsub with purpose-built ones. + # * Blank rmir/smir/rmdc/smdc capabilities removed. + # * Small fixes merged in from SCO entries for lpr, fos, tvi910+, tvi924. +-# 9.4.8 (Fri Apr 7 09:36:34 EDT 199): ++# 9.4.8 (Fri Apr 7 09:36:34 EDT 1995): + # * Replaced the Ann Arbor entries with SCO's, the init strings are + # more efficient (but the entries otherwise identical). + # * Added dg211 from Shuford archive. +@@ -22224,7 +22672,7 @@ + # * add screen.rxvt -TD + # + # 2008-04-28 +-# * add screen+fkeys (prompted by Debian # 478094) -TD ++# * add screen+fkeys (prompted by Debian #478094) -TD + # + # 2008-06-28 + # * add screen.mlterm -TD +@@ -22354,6 +22802,139 @@ + # * add xterm-utf8 as a demo of the U8 feature -TD + # + # 2011-02-20 +-# * add cons25-debian entry (Brian M Carlson, Debina #607662). ++# * add cons25-debian entry (Brian M Carlson, Debian #607662). ++# ++# 2011-06-11 ++# * update minix entry to minix 3.2 (Thomas Cort). ++# ++# 2011-07-09 ++# * fix inconsistent tabset path in pcmw (Todd C. Miller). ++# * remove a backslash which continued comment, obscuring altos3 ++# definition with OpenBSD toolset (Nicholas Marriott). ++# ++# 2011-07-16 ++# * add/use xterm+tmux chunk from xterm #271 -TD ++# * resync xterm-new entry from xterm #271 -TD ++# * add E3 extended capability to linux-basic (Miroslav Lichvar) ++# * add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD ++# * add SI/SO change to linux2.6 entry (Debian #515609) -TD ++# ++# 2011-07-21 ++# * add kich1 to sun (Yuri Pankov) ++# * use bold rather than reverse for smso in sun-color (Yuri Pankov). ++# ++# 2011-08-06 ++# * corrected k9 in dg460-ansi, add other features based on manuals -TD ++# ++# 2011-08-20 ++# * minor cleanup of X-terminal emulator section -TD ++# * add terminator entry -TD ++# * add simpleterm entry -TD ++# ++# 2011-09-10 ++# * add xterm+kbs fragment from xterm #272 -TD ++# ++# 2011-11-12 ++# * add pccon entries for OpenBSD console (Alexei Malinin) ++# ++# 2011-12-17 ++# * corrected old changelog comments -TD ++# ++# 2011-11-24 ++# * add putty-sco -TD ++# ++# 2012-01-28 ++# * add mach-gnu (Samuel Thibault) ++# * add mach-gnu-color, tweaks to mach-gnu -TD ++# * make sgr for sun-color agree with smso -TD ++# * make sgr for prism9 agree with other caps -TD ++# * make sgr for icl6404 agree with other caps -TD ++# * make sgr for ofcons agree with other caps -TD ++# * make sgr for att5410v1, att4415, att620 agree with other caps -TD ++# * make sgr for aaa-unk, aaa-rv agree with other caps -TD ++# * make sgr for avt-ns agree with other caps -TD ++# ++# 2012-02-11 ++# * make sgr for xterm-pcolor agree with other caps -TD ++# * make sgr for att5425 agree with other caps -TD ++# * make sgr for att630 agree with other caps -TD ++# * make sgr for linux entries agree with other caps -TD ++# * make sgr for tvi9065 agree with other caps -TD ++# * make sgr for ncr260vt200an agree with other caps -TD ++# * make sgr for ncr160vt100pp agree with other caps -TD ++# * make sgr for ncr260vt300an agree with other caps -TD ++# * make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD ++# * make sgr for cygwin, cygwinDBG agree with other caps -TD ++# ++# 2012-03-31 ++# * correct order of use-clauses in st-256color -TD ++# ++# 2012-04-01 ++# * revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD ++# ++# 2012-04-14 ++# * document all of the user-defined capabilities in one place -TD ++# * add XT to some places to improve usefulness for other applications ++# than screen, which would like to pretend that xterm's title is ++# a status-line. -TD ++# * change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review ++# of ordering and overrides -TD ++# ++# 2012-04-21 ++# * add msgr to vt420, similar DEC vtXXX entries -TD ++# * add several missing vt420 capabilities from vt220 -TD ++# * factor out ansi+pp from several entries -TD ++# * change xterm+sl and xterm+sl-twm to include only the status-line ++# capabilities and not "use=xterm", making them more generally useful ++# as building-blocks -TD ++# * add dec+sl building block, as example -TD ++# ++# 2012-04-28 ++# * fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD ++# * add eslok flag to dec+sl -TD ++# * dec+sl applies to vt320 and up -TD ++# * drop wsl width from xterm+sl -TD ++# * reuse xterm+sl in putty and nsca-m -TD ++# * add ansi+tabs to vt520 -TD ++# * add ansi+enq to vt220-vt520 -TD ++# ++# 2012-05-05 ++# * remove p6 (bold) from opus3n1+ for consistency -TD ++# * remove acs stuff from env230 per clues in Ingres termcap -TD ++# * modify env230 sgr/sgr0 to match other capabilities -TD ++# * modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD ++# * make sgr for dku7202 agree with other caps -TD ++# * make sgr for ibmpc agree with other caps -TD ++# * make sgr for tek4107 agree with other caps -TD ++# * make sgr for ndr9500 agree with other caps -TD ++# * make sgr for sco-ansi agree with other caps -TD ++# * make sgr for d410 agree with other caps -TD ++# * make sgr for d210 agree with other caps -TD ++# * make sgr for d470c, d470c-7b agree with other caps -TD ++# ++# 2012-05-12 ++# * rewrite vt520 entry based on vt420 -TD ++# * corrected 'op' for bterm (report by Samuel Thibault) -TD ++# ++# 2012-06-02 ++# * add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord, ++# analysis by Martin Husemann). ++# * add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by ++# Onno van der Linden). ++# * add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD ++# * add kdch1, etc., to qvt108 -TD ++# * add dl1/il1 to some entries based on dl/il values -TD ++# * add dl to simpleterm -TD ++# ++# 2012-06-10 ++# * modify some older xterm entries to align with xterm source -TD ++# * separate "xterm-old" alias from "xterm-r6" -TD ++# ++# 2012-07-28 ++# * add E3 to xterm-basic and putty -TD ++# ++# 2012-08-11 ++# * add nsterm-256color, make this the default nsterm -TD ++# * remove bw from nsterm-bce, per testing with tack -TD + # + ######## SHANTIH! SHANTIH! SHANTIH! +diff -Naur ncurses-5.9.orig/mk-0th.awk ncurses-5.9/mk-0th.awk +--- ncurses-5.9.orig/mk-0th.awk 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/mk-0th.awk 2012-08-25 19:58:01.856555996 +0000 +@@ -1,6 +1,6 @@ +-# $Id: mk-0th.awk,v 1.18 2010/01/09 21:45:41 tom Exp $ ++# $Id: mk-0th.awk,v 1.22 2012/06/30 20:56:11 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2005,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -34,14 +34,62 @@ + # Variables: + # libname (library name, e.g., "ncurses", "panel", "forms", "menus") + # subsets (is used here to decide if wide-character code is used) ++# ticlib (library name for libtic, e.g., "tic") ++# termlib (library name for libtinfo, e.g., "tinfo") + # ++function make_lintlib(name,sources) { ++ print "" ++ print "clean ::" ++ printf "\trm -f llib-l%s.*\n", name ++ print "" ++ print "realclean ::" ++ printf "\trm -f llib-l%s\n", name ++ print "" ++ printf "llib-l%s : %s\n", name, sources ++ printf "\tcproto -a -l -DNCURSES_ENABLE_STDBOOL_H=0 -DLINT $(CPPFLAGS) %s >$@\n", sources ++ print "" ++ print "lintlib ::" ++ printf "\tsh $(srcdir)/../misc/makellib %s $(CPPFLAGS)\n", name ++ print "" ++ print "lint ::" ++ printf "\t$(LINT) $(LINT_OPTS) $(CPPFLAGS) %s $(LINT_LIBS)\n", sources ++} ++ ++# A blank in "subsets" indicates a split-off of the library into a separate ++# file, e.g., for libtic or libtinfo. They are all logical parts of the same ++# library. ++function which_library() { ++ if ( ( which == "ticlib" ) && ( subsets ~ /ticlib / ) ) { ++ return ticlib; ++ } else if ( ( which == "termlib" || which == "ext_tinfo" ) && ( subsets ~ /[[:space:]]base/ ) ) { ++ return termlib; ++ } else { ++ return libname; ++ } ++} ++ ++function show_list(name, len, list) { ++ if ( len > 0 ) { ++ printf "\n%s_SRC =", toupper(name); ++ for (n = 0; n < len; ++n) ++ printf " \\\n\t%s", list[n]; ++ print ""; ++ make_lintlib(name, sprintf("$(%s_SRC)", toupper(name))); ++ } ++} ++ + BEGIN { + which = libname; + using = 0; + found = 0; ++ count_ticlib = 0; ++ count_termlib = 0; ++ count_library = 0; + } + /^@/ { + which = $0; ++ sub(/^@[[:blank:]]+/, "", which); ++ sub(/[[:blank:]]+$/, "", which); + } + !/^[@#]/ { + if (using == 0) +@@ -50,6 +98,10 @@ + print "# generated by mk-0th.awk" + printf "# libname: %s\n", libname + printf "# subsets: %s\n", subsets ++ if ( libname ~ /ncurses/ ) { ++ printf "# ticlib: %s\n", ticlib ++ printf "# termlib: %s\n", termlib ++ } + print "" + print ".SUFFIXES: .c .cc .h .i .ii" + print ".c.i :" +@@ -80,9 +132,18 @@ + found = 2 + } + if ( libname == "c++" || libname == "c++w" ) { +- printf " \\\n\t%s/%s.cc", $3, $1 ++ srcname = sprintf("%s/%s.cc", $3, $1); ++ printf " \\\n\t%s", srcname; + } else if ( widechar == 1 || $3 != "$(wide)" ) { +- printf " \\\n\t%s/%s.c", $3, $1 ++ srcname = sprintf("%s/%s.c", $3, $1); ++ printf " \\\n\t%s", srcname; ++ if ( which_library() == libname ) { ++ list_library[count_library++] = srcname; ++ } else if ( which_library() == ticlib ) { ++ list_ticlib[count_ticlib++] = srcname; ++ } else { ++ list_termlib[count_termlib++] = srcname; ++ } + } + } + } +@@ -91,22 +152,11 @@ + if ( found == 1 ) + { + print "" +- printf "# Producing llib-l%s is time-consuming, so there's no direct-dependency for\n", libname +- print "# it in the lintlib rule. We'll only remove in the cleanest setup." +- print "clean ::" +- printf "\trm -f llib-l%s.*\n", libname +- print "" +- print "realclean ::" +- printf "\trm -f llib-l%s\n", libname +- print "" +- printf "llib-l%s : $(C_SRC)\n", libname +- printf "\tcproto -a -l -DNCURSES_ENABLE_STDBOOL_H=0 -DLINT $(CPPFLAGS) $(C_SRC) >$@\n" +- print "" +- print "lintlib :" +- printf "\tsh $(srcdir)/../misc/makellib %s $(CPPFLAGS)", libname +- print "" +- print "lint :" +- print "\t$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(C_SRC) $(LINT_LIBS)" ++ printf "# Producing llib-l%s is time-consuming, so there's no direct-dependency for\n", libname; ++ print "# it in the lintlib rule. We'll only remove in the cleanest setup."; ++ show_list(libname, count_library, list_library); ++ show_list(ticlib, count_ticlib, list_ticlib); ++ show_list(termlib, count_termlib, list_termlib); + } + else + { +@@ -115,3 +165,4 @@ + print "\t@echo no action needed" + } + } ++# vile:ts=4 sw=4 +diff -Naur ncurses-5.9.orig/mk-1st.awk ncurses-5.9/mk-1st.awk +--- ncurses-5.9.orig/mk-1st.awk 2012-08-25 19:57:59.396567629 +0000 ++++ ncurses-5.9/mk-1st.awk 2012-08-25 19:58:00.906560490 +0000 +@@ -1,6 +1,6 @@ +-# $Id: mk-1st.awk,v 1.85 2010/08/07 20:42:30 Gabriele.Balducci Exp $ ++# $Id: mk-1st.awk,v 1.88 2012/02/25 20:22:09 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -38,6 +38,7 @@ + # prefix (e.g., "lib", for Unix-style libraries) + # suffix (e.g., "_g.a", for debug libraries) + # subset ("none", "base", "base+ext_funcs" or "termlib", etc.) ++# driver ("yes" or "no", depends on --enable-term-driver) + # ShlibVer ("rel", "abi" or "auto", to augment DoLinks variable) + # ShlibVerInfix ("yes" or "no", determines location of version #) + # SymLink ("ln -s", etc) +@@ -69,7 +70,7 @@ + } + # see imp_name + function imp_name_of(a_name) { +- if (ShlibVerInfix == "cygdll") { ++ if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "mingw") { + result = sprintf("%s%s%s.a", prefix, a_name, suffix); + } else { + result = ""; +@@ -80,6 +81,8 @@ + function abi_name_of(a_name) { + if (ShlibVerInfix == "cygdll") { + result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix); ++ } else if (ShlibVerInfix == "mingw") { ++ result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix); + } else if (ShlibVerInfix == "yes") { + result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix); + } else { +@@ -91,6 +94,8 @@ + function rel_name_of(a_name) { + if (ShlibVerInfix == "cygdll") { + result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix); ++ } else if (ShlibVerInfix == "mingw") { ++ result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix); + } else if (ShlibVerInfix == "yes") { + result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix); + } else { +@@ -107,7 +112,7 @@ + } else { + if ( ShlibVer == "rel" ) { + result = rel_name_of(a_name); +- } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) { ++ } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "mingw" ) { + result = abi_name_of(a_name); + } else { + result = lib_name_of(a_name); +@@ -148,7 +153,7 @@ + printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list + } + function sharedlinks(directory) { +- if ( ShlibVer != "auto" && ShlibVer != "cygdll" ) { ++ if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "mingw" ) { + printf "\tcd %s && (", directory + if ( DoLinks == "reverse" ) { + if ( ShlibVer == "rel" ) { +@@ -181,6 +186,11 @@ + dst_libs = sprintf("%s/%s", directory, end_name); + printf "%s : \\\n", dst_libs + printf "\t\t%s \\\n", directory ++ if (subset == "ticlib" && driver == "yes" ) { ++ base = name; ++ sub(/^tic/, "ncurses", base); # workaround for "w" ++ printf "\t\t%s/%s \\\n", directory, end_name_of(base); ++ } + if (subset ~ /^base/ || subset == "ticlib" ) { + save_suffix = suffix + sub(/^[^.]\./,".",suffix) +@@ -242,6 +252,7 @@ + printf "# prefix: %s\n", prefix + printf "# suffix: %s\n", suffix + printf "# subset: %s\n", subset ++ printf "# driver: %s\n", driver + printf "# ShlibVer: %s\n", ShlibVer + printf "# ShlibVerInfix: %s\n", ShlibVerInfix + printf "# SymLink: %s\n", SymLink +@@ -316,7 +327,7 @@ + print "install \\" + print "install.libs \\" + +- if ( ShlibVer == "cygdll" ) { ++ if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { + + dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)"; + printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs +@@ -337,7 +348,7 @@ + + if ( overwrite == "yes" && name == "ncurses" ) + { +- if ( ShlibVer == "cygdll" ) { ++ if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { + ovr_name = sprintf("libcurses%s.a", suffix) + printf "\t@echo linking %s to %s\n", imp_name, ovr_name + printf "\tcd $(DESTDIR)$(libdir) && (" +@@ -358,7 +369,7 @@ + print "uninstall \\" + print "uninstall.libs \\" + printf "uninstall.%s ::\n", name +- if ( ShlibVer == "cygdll" ) { ++ if ( ShlibVer == "cygdll" || ShlibVer == "mingw") { + + printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name + printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name +@@ -371,11 +382,7 @@ + removelinks("$(DESTDIR)$(libdir)") + if ( overwrite == "yes" && name == "ncurses" ) + { +- if ( ShlibVer == "cygdll" ) { +- ovr_name = sprintf("libcurses%s.a", suffix) +- } else { +- ovr_name = sprintf("libcurses%s", suffix) +- } ++ ovr_name = sprintf("libcurses%s", suffix) + printf "\t-@rm -f $(DESTDIR)$(libdir)/%s\n", ovr_name + } + } +@@ -396,12 +403,13 @@ + end_name = lib_name; + printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS + if ( is_ticlib() ) { +- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version ++ which_list = "TICS_LIST"; + } else if ( is_termlib() ) { +- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version ++ which_list = "TINFO_LIST"; + } else { +- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version ++ which_list = "SHLIB_LIST"; + } ++ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", compile, lib_name, OBJS, libtool_version, which_list + print "" + print "install \\" + print "install.libs \\" +diff -Naur ncurses-5.9.orig/ncurses/Makefile.in ncurses-5.9/ncurses/Makefile.in +--- ncurses-5.9.orig/ncurses/Makefile.in 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/Makefile.in 2012-08-25 19:58:02.389886808 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.130 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.133 2012/08/11 21:31:56 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -64,6 +64,7 @@ + bindir = @bindir@ + libdir = @libdir@ + includedir = @includedir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + + LIBTOOL = @LIBTOOL@ +@@ -125,6 +126,7 @@ + TINFO_LIST = $(SHLIB_DIRS) @TINFO_LIST@ + TICS_LIST = $(SHLIB_DIRS) @TICS_LIST@ + ++RPATH_LIST = @RPATH_LIST@ + MK_SHARED_LIB = @MK_SHARED_LIB@ + + NCURSES_MAJOR = @NCURSES_MAJOR@ +@@ -282,21 +284,21 @@ + sh -e $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@ + + captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS) +- @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS) ++ @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS) + + hardscroll$x : $(serial)/hardscroll.c $(TEST_DEPS) +- @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS) ++ @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS) + + hashmap$x : $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_DEPS) +- @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS) ++ @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS) + + lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \ + ../@DFT_OBJ_SUBDIR@/dump_entry$o +- @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS) ++ @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS) + + link_test$x : ./link_test.c $(TEST_DEPS) \ + ../@DFT_OBJ_SUBDIR@/link_test$o +- @ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS) ++ @ECHO_LD@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS) + + ../@DFT_OBJ_SUBDIR@/dump_entry$o: + cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o +diff -Naur ncurses-5.9.orig/ncurses/base/MKkeyname.awk ncurses-5.9/ncurses/base/MKkeyname.awk +--- ncurses-5.9.orig/ncurses/base/MKkeyname.awk 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/MKkeyname.awk 2012-08-25 19:58:00.906560490 +0000 +@@ -1,6 +1,6 @@ +-# $Id: MKkeyname.awk,v 1.45 2010/12/19 01:36:14 tom Exp $ ++# $Id: MKkeyname.awk,v 1.47 2012/02/22 22:35:41 tom Exp $ + ############################################################################## +-# Copyright (c) 1999-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1999-2010,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -100,17 +100,18 @@ + print " if (MyTable[c] == 0) {" + print " int cc = c;" + print " p = name;" ++ print "#define P_LIMIT (sizeof(name) - (size_t) (p - name))" + print " if (cc >= 128 && (sp == 0 || sp->_use_meta)) {" +- print " strcpy(p, \"M-\");" ++ print " _nc_STRCPY(p, \"M-\", P_LIMIT);" + print " p += 2;" + print " cc -= 128;" + print " }" + print " if (cc < 32)" +- print " sprintf(p, \"^%c\", cc + '@');" ++ print " _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"^%c\", cc + '@');" + print " else if (cc == 127)" +- print " strcpy(p, \"^?\");" ++ print " _nc_STRCPY(p, \"^?\", P_LIMIT);" + print " else" +- print " sprintf(p, \"%c\", cc);" ++ print " _nc_SPRINTF(p, _nc_SLIMIT(P_LIMIT) \"%c\", cc);" + print " MyTable[c] = strdup(name);" + print " }" + print " result = MyTable[c];" +diff -Naur ncurses-5.9.orig/ncurses/base/MKlib_gen.sh ncurses-5.9/ncurses/base/MKlib_gen.sh +--- ncurses-5.9.orig/ncurses/base/MKlib_gen.sh 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/MKlib_gen.sh 2012-08-25 19:58:00.019898016 +0000 +@@ -2,7 +2,7 @@ + # + # MKlib_gen.sh -- generate sources from curses.h macro definitions + # +-# ($Id: MKlib_gen.sh,v 1.43 2011/01/22 19:47:29 tom Exp $) ++# ($Id: MKlib_gen.sh,v 1.46 2011/06/04 19:14:08 tom Exp $) + # + ############################################################################## + # Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # +@@ -410,10 +410,45 @@ + print "#undef vwprintw" + } + /^DECLARATIONS/ {start = 1; next;} +- {if (start) print \$0;} ++ { ++ if (start) { ++ if ( "$USE" == "generated" ) { ++ print \$0; ++ } else if ( \$0 ~ /^[{}]?\$/ ) { ++ print \$0; ++ } else if ( \$0 ~ /;/ ) { ++ print \$0; ++ } else { ++ calls[start] = \$0; ++ print \$0; ++ start++; ++ } ++ } ++ } + END { + if ( "$USE" != "generated" ) { +- print "int main(void) { return 0; }" ++ print "int main(void)" ++ print "{" ++ for (n = 1; n < start; ++n) { ++ value = calls[n]; ++ if ( value !~ /P_POUNDC/ ) { ++ gsub(/[[:blank:]]+/," ",value); ++ sub(/^[[:alnum:]_]+ /,"",value); ++ sub(/^\* /,"",value); ++ gsub(/[[:alnum:]_]+ \* /,"",value); ++ gsub(/ (const) /," ",value); ++ gsub(/ (int|short|attr_t|chtype|wchar_t|NCURSES_BOOL|NCURSES_OUTC|NCURSES_OUTC_sp|va_list) /," ",value); ++ gsub(/ void /,"",value); ++ sub(/^/,"call_",value); ++ gsub(/ (a[[:digit:]]|z) /, " 0 ", value); ++ gsub(/ int[[:blank:]]*[(][^)]+[)][(][^)]+[)]/, "0", value); ++ printf "\t%s;\n", value; ++ } else { ++ print value; ++ } ++ } ++ print " return 0;" ++ print "}" + } + } + EOF1 +@@ -422,6 +457,8 @@ + #include <ncurses_cfg.h> + #undef NCURSES_NOMACROS + #include <curses.h> ++#include <term.h> ++#include <unctrl.h> + + DECLARATIONS + +diff -Naur ncurses-5.9.orig/ncurses/base/MKunctrl.awk ncurses-5.9/ncurses/base/MKunctrl.awk +--- ncurses-5.9.orig/ncurses/base/MKunctrl.awk 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/MKunctrl.awk 2012-08-25 19:58:01.723223294 +0000 +@@ -1,6 +1,6 @@ +-# $Id: MKunctrl.awk,v 1.26 2009/07/04 22:05:15 Clemens.Ladisch Exp $ ++# $Id: MKunctrl.awk,v 1.27 2012/06/09 20:29:33 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -140,7 +140,7 @@ + } else { + stringname = "unctrl" + } +- print "\tint check = ChCharOf(ch);" ++ print "\tint check = (int) ChCharOf(ch);" + print "\tconst char *result;" + print "" + print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {" +diff -Naur ncurses-5.9.orig/ncurses/base/keybound.c ncurses-5.9/ncurses/base/keybound.c +--- ncurses-5.9.orig/ncurses/base/keybound.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/keybound.c 2012-08-25 19:58:00.019898016 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1999-2006,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,7 +33,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: keybound.c,v 1.10 2009/10/24 22:15:47 tom Exp $") ++MODULE_ID("$Id: keybound.c,v 1.11 2011/10/22 16:47:05 tom Exp $") + + /* + * Returns the count'th string definition which is associated with the +@@ -46,7 +46,10 @@ + + T((T_CALLED("keybound(%p, %d,%d)"), (void *) SP_PARM, code, count)); + if (SP_PARM != 0 && code >= 0) { +- result = _nc_expand_try(SP_PARM->_keytry, (unsigned) code, &count, 0); ++ result = _nc_expand_try(SP_PARM->_keytry, ++ (unsigned) code, ++ &count, ++ (size_t) 0); + } + returnPtr(result); + } +diff -Naur ncurses-5.9.orig/ncurses/base/keyok.c ncurses-5.9/ncurses/base/keyok.c +--- ncurses-5.9.orig/ncurses/base/keyok.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/keyok.c 2012-08-25 19:58:00.019898016 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,7 +33,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: keyok.c,v 1.10 2009/10/24 22:15:47 tom Exp $") ++MODULE_ID("$Id: keyok.c,v 1.12 2011/10/22 17:03:22 tom Exp $") + + /* + * Enable (or disable) ncurses' interpretation of a keycode by adding (or +@@ -50,37 +50,41 @@ + { + int code = ERR; + +- T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag)); ++ if (HasTerminal(SP_PARM)) { ++ T((T_CALLED("keyok(%p, %d,%d)"), (void *) SP_PARM, c, flag)); + #ifdef USE_TERM_DRIVER +- code = CallDriver_2(sp, kyOk, c, flag); ++ code = CallDriver_2(sp, kyOk, c, flag); + #else +- T((T_CALLED("keyok(%d,%d)"), c, flag)); +- if (c >= 0) { +- int count = 0; +- char *s; +- unsigned ch = (unsigned) c; +- +- if (flag) { +- while ((s = _nc_expand_try(SP_PARM->_key_ok, ch, &count, 0)) != 0 +- && _nc_remove_key(&(SP_PARM->_key_ok), ch)) { +- code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch); +- free(s); +- count = 0; +- if (code != OK) +- break; +- } +- } else { +- while ((s = _nc_expand_try(SP_PARM->_keytry, ch, &count, 0)) != 0 +- && _nc_remove_key(&(SP_PARM->_keytry), ch)) { +- code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch); +- free(s); +- count = 0; +- if (code != OK) +- break; ++ T((T_CALLED("keyok(%d,%d)"), c, flag)); ++ if (c >= 0) { ++ int count = 0; ++ char *s; ++ unsigned ch = (unsigned) c; ++ ++ if (flag) { ++ while ((s = _nc_expand_try(SP_PARM->_key_ok, ++ ch, &count, (size_t) 0)) != 0 ++ && _nc_remove_key(&(SP_PARM->_key_ok), ch)) { ++ code = _nc_add_to_try(&(SP_PARM->_keytry), s, ch); ++ free(s); ++ count = 0; ++ if (code != OK) ++ break; ++ } ++ } else { ++ while ((s = _nc_expand_try(SP_PARM->_keytry, ++ ch, &count, (size_t) 0)) != 0 ++ && _nc_remove_key(&(SP_PARM->_keytry), ch)) { ++ code = _nc_add_to_try(&(SP_PARM->_key_ok), s, ch); ++ free(s); ++ count = 0; ++ if (code != OK) ++ break; ++ } + } + } +- } + #endif ++ } + returnCode(code); + } + +diff -Naur ncurses-5.9.orig/ncurses/base/lib_addch.c ncurses-5.9/ncurses/base/lib_addch.c +--- ncurses-5.9.orig/ncurses/base/lib_addch.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_addch.c 2012-08-25 19:58:00.023231334 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + #include <curses.priv.h> + #include <ctype.h> + +-MODULE_ID("$Id: lib_addch.c,v 1.124 2010/04/24 22:41:05 tom Exp $") ++MODULE_ID("$Id: lib_addch.c,v 1.125 2011/10/22 16:51:31 tom Exp $") + + static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT); + +@@ -209,7 +209,8 @@ + buffer[WINDOW_EXT(win, addch_used)] = '\0'; + if ((len = (int) mbrtowc(&result, + buffer, +- WINDOW_EXT(win, addch_used), &state)) > 0) { ++ (size_t) WINDOW_EXT(win, addch_used), ++ &state)) > 0) { + attr_t attrs = AttrOf(CHDEREF(ch)); + if_EXT_COLORS(int pair = GetPair(CHDEREF(ch))); + SetChar(CHDEREF(ch), result, attrs); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_addstr.c ncurses-5.9/ncurses/base/lib_addstr.c +--- ncurses-5.9.orig/ncurses/base/lib_addstr.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_addstr.c 2012-08-25 19:58:00.023231334 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -44,7 +44,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_addstr.c,v 1.51 2010/12/19 01:22:58 tom Exp $") ++MODULE_ID("$Id: lib_addstr.c,v 1.52 2011/05/28 23:02:09 tom Exp $") + + NCURSES_EXPORT(int) + waddnstr(WINDOW *win, const char *astr, int n) +@@ -119,8 +119,10 @@ + _nc_wchstrlen(const cchar_t *s) + { + int result = 0; +- while (CharOf(s[result]) != L'\0') { +- result++; ++ if (s != 0) { ++ while (CharOf(s[result]) != L'\0') { ++ result++; ++ } + } + return result; + } +diff -Naur ncurses-5.9.orig/ncurses/base/lib_bkgd.c ncurses-5.9/ncurses/base/lib_bkgd.c +--- ncurses-5.9.orig/ncurses/base/lib_bkgd.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_bkgd.c 2012-08-25 19:58:00.986560110 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_bkgd.c,v 1.43 2011/01/22 19:47:37 tom Exp $") ++MODULE_ID("$Id: lib_bkgd.c,v 1.45 2012/03/10 21:20:18 tom Exp $") + + /* + * Set the window's background information. +@@ -118,16 +118,16 @@ + { + int code = ERR; + int x, y; +- NCURSES_CH_T new_bkgd = CHDEREF(ch); + + T((T_CALLED("wbkgd(%p,%s)"), (void *) win, _tracech_t(ch))); + + if (win) { ++ NCURSES_CH_T new_bkgd = CHDEREF(ch); + NCURSES_CH_T old_bkgrnd; + wgetbkgrnd(win, &old_bkgrnd); + + (void) wbkgrndset(win, CHREF(new_bkgd)); +- (void) wattrset(win, AttrOf(win->_nc_bkgd)); ++ (void) wattrset(win, (int) AttrOf(win->_nc_bkgd)); + + for (y = 0; y <= win->_maxy; y++) { + for (x = 0; x <= win->_maxx; x++) { +diff -Naur ncurses-5.9.orig/ncurses/base/lib_color.c ncurses-5.9/ncurses/base/lib_color.c +--- ncurses-5.9.orig/ncurses/base/lib_color.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_color.c 2012-08-25 19:58:01.726556612 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -45,7 +45,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_color.c,v 1.98 2010/04/24 22:57:53 tom Exp $") ++MODULE_ID("$Id: lib_color.c,v 1.105 2012/06/09 20:34:11 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define CanChange InfoOf(SP_PARM).canchange +@@ -331,6 +331,13 @@ + default_bg(NCURSES_SP_ARG), + NCURSES_SP_NAME(_nc_outch)); + } ++#if !NCURSES_EXT_COLORS ++ /* ++ * Without ext-colors, we cannot represent more than 256 color pairs. ++ */ ++ if (maxpairs > 256) ++ maxpairs = 256; ++#endif + + if (maxpairs > 0 && maxcolors > 0) { + SP_PARM->_pair_limit = maxpairs; +@@ -383,10 +390,10 @@ + + /* This function was originally written by Daniel Weaver <danw@znyx.com> */ + static void +-rgb2hls(short r, short g, short b, short *h, short *l, short *s) ++rgb2hls(int r, int g, int b, short *h, short *l, short *s) + /* convert RGB to HLS system */ + { +- short min, max, t; ++ int min, max, t; + + if ((min = g < r ? g : r) > b) + min = b; +@@ -416,7 +423,7 @@ + else + t = (short) (360 + ((r - g) * 60) / (max - min)); + +- *h = t % 360; ++ *h = (short) (t % 360); + } + + /* +@@ -439,7 +446,7 @@ + + previous = SP_PARM->_color_pairs[pair]; + #if NCURSES_EXT_FUNCS +- if (SP_PARM->_default_color) { ++ if (SP_PARM->_default_color || SP_PARM->_assumed_color) { + bool isDefault = FALSE; + bool wasDefault = FALSE; + int default_pairs = SP_PARM->_default_pairs; +@@ -498,8 +505,9 @@ + { + if ((f < 0) || !OkColorHi(f) + || (b < 0) || !OkColorHi(b) +- || (pair < 1)) ++ || (pair < 1)) { + returnCode(ERR); ++ } + } + + /* +@@ -628,8 +636,15 @@ + NCURSES_EXPORT(bool) + NCURSES_SP_NAME(can_change_color) (NCURSES_SP_DCL) + { ++ int result = FALSE; ++ + T((T_CALLED("can_change_color(%p)"), (void *) SP_PARM)); +- returnCode((CanChange != 0) ? TRUE : FALSE); ++ ++ if (HasTerminal(SP_PARM) && (CanChange != 0)) { ++ result = TRUE; ++ } ++ ++ returnCode(result); + } + + #if NCURSES_SP_FUNCS +@@ -643,20 +658,22 @@ + NCURSES_EXPORT(bool) + NCURSES_SP_NAME(has_colors) (NCURSES_SP_DCL0) + { +- int code; ++ int code = FALSE; + + (void) SP_PARM; + T((T_CALLED("has_colors()"))); ++ if (HasTerminal(SP_PARM)) { + #ifdef USE_TERM_DRIVER +- code = HasColor; ++ code = HasColor; + #else +- code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) +- && (((set_foreground != NULL) +- && (set_background != NULL)) +- || ((set_a_foreground != NULL) +- && (set_a_background != NULL)) +- || set_color_pair)) ? TRUE : FALSE); ++ code = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) ++ && (((set_foreground != NULL) ++ && (set_background != NULL)) ++ || ((set_a_foreground != NULL) ++ && (set_a_background != NULL)) ++ || set_color_pair)) ? TRUE : FALSE); + #endif ++ } + returnCode(code); + } + +@@ -731,8 +748,8 @@ + if (!ValidPair(pair)) { + result = ERR; + } else { +- NCURSES_COLOR_T fg = FORE_OF(SP_PARM->_color_pairs[pair]); +- NCURSES_COLOR_T bg = BACK_OF(SP_PARM->_color_pairs[pair]); ++ NCURSES_COLOR_T fg = (NCURSES_COLOR_T) FORE_OF(SP_PARM->_color_pairs[pair]); ++ NCURSES_COLOR_T bg = (NCURSES_COLOR_T) BACK_OF(SP_PARM->_color_pairs[pair]); + + #if NCURSES_EXT_FUNCS + if (fg == COLOR_DEFAULT) +@@ -765,9 +782,9 @@ + + NCURSES_EXPORT(void) + NCURSES_SP_NAME(_nc_do_color) (NCURSES_SP_DCLx +- short old_pair, +- short pair, +- bool reverse, ++ int old_pair, ++ int pair, ++ int reverse, + NCURSES_SP_OUTC outc) + { + #ifdef USE_TERM_DRIVER +@@ -793,7 +810,7 @@ + + if (old_pair >= 0 + && SP_PARM != 0 +- && pair_content(old_pair, &old_fg, &old_bg) != ERR) { ++ && pair_content((short) old_pair, &old_fg, &old_bg) != ERR) { + if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) + || (isDefaultColor(bg) && !isDefaultColor(old_bg))) { + #if NCURSES_EXT_FUNCS +@@ -847,7 +864,7 @@ + + #if NCURSES_SP_FUNCS + NCURSES_EXPORT(void) +-_nc_do_color(short old_pair, short pair, bool reverse, NCURSES_OUTC outc) ++_nc_do_color(int old_pair, int pair, int reverse, NCURSES_OUTC outc) + { + SetSafeOutcWrapper(outc); + NCURSES_SP_NAME(_nc_do_color) (CURRENT_SCREEN, +diff -Naur ncurses-5.9.orig/ncurses/base/lib_dft_fgbg.c ncurses-5.9/ncurses/base/lib_dft_fgbg.c +--- ncurses-5.9.orig/ncurses/base/lib_dft_fgbg.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_dft_fgbg.c 2012-08-25 19:58:00.023231334 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_dft_fgbg.c,v 1.25 2009/10/24 22:15:00 tom Exp $") ++MODULE_ID("$Id: lib_dft_fgbg.c,v 1.26 2011/04/23 18:28:18 tom Exp $") + + /* + * Modify the behavior of color-pair 0 so that the library doesn't assume that +@@ -80,6 +80,7 @@ + SP_PARM->_default_bg = isDefaultColor(bg) ? COLOR_DEFAULT : (bg & C_MASK); + if (SP_PARM->_color_pairs != 0) { + bool save = SP_PARM->_default_color; ++ SP_PARM->_assumed_color = TRUE; + SP_PARM->_default_color = TRUE; + init_pair(0, (short) fg, (short) bg); + SP_PARM->_default_color = save; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_flash.c ncurses-5.9/ncurses/base/lib_flash.c +--- ncurses-5.9.orig/ncurses/base/lib_flash.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_flash.c 2012-08-25 19:58:00.023231334 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -46,7 +46,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_flash.c,v 1.11 2009/10/24 22:02:14 tom Exp $") ++MODULE_ID("$Id: lib_flash.c,v 1.12 2011/05/28 21:53:45 tom Exp $") + + /* + * flash() +@@ -66,15 +66,17 @@ + if (SP_PARM != 0) + res = CallDriver_1(SP_PARM, doBeepOrFlash, FALSE); + #else +- /* FIXME: should make sure that we are not in altchar mode */ +- if (flash_screen) { +- TPUTS_TRACE("flash_screen"); +- res = putp(flash_screen); +- _nc_flush(); +- } else if (bell) { +- TPUTS_TRACE("bell"); +- res = putp(bell); +- _nc_flush(); ++ if (HasTerminal(SP_PARM)) { ++ /* FIXME: should make sure that we are not in altchar mode */ ++ if (flash_screen) { ++ TPUTS_TRACE("flash_screen"); ++ res = putp(flash_screen); ++ _nc_flush(); ++ } else if (bell) { ++ TPUTS_TRACE("bell"); ++ res = putp(bell); ++ _nc_flush(); ++ } + } + #endif + returnCode(res); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_freeall.c ncurses-5.9/ncurses/base/lib_freeall.c +--- ncurses-5.9.orig/ncurses/base/lib_freeall.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_freeall.c 2012-08-25 19:58:00.023231334 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + extern int malloc_errfd; /* FIXME */ + #endif + +-MODULE_ID("$Id: lib_freeall.c,v 1.59 2010/01/23 17:57:43 tom Exp $") ++MODULE_ID("$Id: lib_freeall.c,v 1.60 2011/10/22 16:34:50 tom Exp $") + + /* + * Free all ncurses data. This is used for testing only (there's no practical +@@ -100,7 +100,7 @@ + + (void) _nc_printf_string(0, empty_va); + #ifdef TRACE +- (void) _nc_trace_buf(-1, 0); ++ (void) _nc_trace_buf(-1, (size_t) 0); + #endif + #if USE_WIDEC_SUPPORT + FreeIfNeeded(_nc_wacs); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_getch.c ncurses-5.9/ncurses/base/lib_getch.c +--- ncurses-5.9.orig/ncurses/base/lib_getch.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_getch.c 2012-08-25 19:58:02.199887706 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_getch.c,v 1.121 2010/12/25 23:24:04 tom Exp $") ++MODULE_ID("$Id: lib_getch.c,v 1.125 2012/08/04 17:11:37 tom Exp $") + + #include <fifo_defs.h> + +@@ -133,7 +133,7 @@ + int rc; + + #ifdef USE_TERM_DRIVER +- rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay); ++ rc = TCBOf(sp)->drv->testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl)); + #else + #if USE_SYSMOUSE + if ((sp->_mouse_type == M_SYSMOUSE) +@@ -163,7 +163,7 @@ + static NCURSES_INLINE int + fifo_peek(SCREEN *sp) + { +- int ch = sp->_fifo[peek]; ++ int ch = (peek >= 0) ? sp->_fifo[peek] : ERR; + TR(TRACE_IEVENT, ("peeking at %d", peek)); + + p_inc(); +@@ -173,15 +173,16 @@ + static NCURSES_INLINE int + fifo_pull(SCREEN *sp) + { +- int ch; +- ch = sp->_fifo[head]; ++ int ch = (head >= 0) ? sp->_fifo[head] : ERR; ++ + TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head)); + + if (peek == head) { + h_inc(); + peek = head; +- } else ++ } else { + h_inc(); ++ } + + #ifdef TRACE + if (USE_TRACEF(TRACE_IEVENT)) { +@@ -200,7 +201,7 @@ + int mask = 0; + + (void) mask; +- if (tail == -1) ++ if (tail < 0) + return ERR; + + #ifdef HIDE_EINTR +@@ -257,6 +258,13 @@ + n = 1; + } else + #endif ++#if USE_KLIBC_KBD ++ if (isatty(sp->_ifd) && sp->_cbreak) { ++ ch = _read_kbd(0, 1, !sp->_raw); ++ n = (ch == -1) ? -1 : 1; ++ sp->_extended_key = (ch == 0); ++ } else ++#endif + { /* Can block... */ + #ifdef USE_TERM_DRIVER + int buf; +@@ -270,7 +278,7 @@ + # endif + _nc_globals.read_thread = pthread_self(); + # endif +- n = (int) read(sp->_ifd, &c2, 1); ++ n = (int) read(sp->_ifd, &c2, (size_t) 1); + #if USE_PTHREADS_EINTR + _nc_globals.read_thread = 0; + #endif +@@ -569,7 +577,7 @@ + * + * If carriage return is defined as a function key in the + * terminfo, e.g., kent, then Solaris may return either ^J (or ^M +- * if nonl() is set) or KEY_ENTER depending on the echo() mode. ++ * if nonl() is set) or KEY_ENTER depending on the echo() mode. + * We echo before translating carriage return based on nonl(), + * since the visual result simply moves the cursor to column 0. + * +@@ -709,10 +717,11 @@ + + if (ptr->value != 0) { /* sequence terminated */ + TR(TRACE_IEVENT, ("end of sequence")); +- if (peek == tail) ++ if (peek == tail) { + fifo_clear(sp); +- else ++ } else { + head = peek; ++ } + return (ptr->value); + } + +diff -Naur ncurses-5.9.orig/ncurses/base/lib_getstr.c ncurses-5.9/ncurses/base/lib_getstr.c +--- ncurses-5.9.orig/ncurses/base/lib_getstr.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_getstr.c 2012-08-25 19:58:00.026564651 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -40,14 +40,14 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_getstr.c,v 1.29 2009/10/24 21:59:02 tom Exp $") ++MODULE_ID("$Id: lib_getstr.c,v 1.30 2011/10/22 16:31:35 tom Exp $") + + /* + * This wipes out the last character, no matter whether it was a tab, control + * or other character, and handles reverse wraparound. + */ + static char * +-WipeOut(WINDOW *win, int y, int x, char *first, char *last, bool echoed) ++WipeOut(WINDOW *win, int y, int x, char *first, char *last, int echoed) + { + if (last > first) { + *--last = '\0'; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_instr.c ncurses-5.9/ncurses/base/lib_instr.c +--- ncurses-5.9.orig/ncurses/base/lib_instr.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_instr.c 2012-08-25 19:58:00.026564651 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,7 +41,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_instr.c,v 1.17 2009/10/24 22:55:45 tom Exp $") ++MODULE_ID("$Id: lib_instr.c,v 1.18 2011/10/22 16:31:35 tom Exp $") + + NCURSES_EXPORT(int) + winnstr(WINDOW *win, char *str, int n) +@@ -78,7 +78,7 @@ + if (getcchar(cell, wch, &attrs, &pair, 0) == OK) { + + init_mb(state); +- n3 = wcstombs(0, wch, 0); ++ n3 = wcstombs(0, wch, (size_t) 0); + if (!isEILSEQ(n3) && (n3 != 0)) { + if (((int) n3 + i) > n) { + done = TRUE; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_mouse.c ncurses-5.9/ncurses/base/lib_mouse.c +--- ncurses-5.9.orig/ncurses/base/lib_mouse.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_mouse.c 2012-08-25 19:58:02.023221875 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -84,7 +84,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mouse.c,v 1.121 2011/01/22 19:47:47 tom Exp $") ++MODULE_ID("$Id: lib_mouse.c,v 1.139 2012/07/21 23:30:50 tom Exp $") + + #include <tic.h> + +@@ -120,6 +120,17 @@ + #endif + #endif /* use_SYSMOUSE */ + ++#if USE_KLIBC_MOUSE ++#include <sys/socket.h> ++#define pipe(handles) socketpair(AF_LOCAL, SOCK_STREAM, 0, handles) ++#define DosWrite(hfile, pbuffer, cbwrite, pcbactual) \ ++ write(hfile, pbuffer, cbwrite) ++#define DosExit(action, result ) /* do nothing */ ++#define DosCreateThread(ptid, pfn, param, flag, cbStack) \ ++ (*(ptid) = _beginthread(pfn, NULL, cbStack, \ ++ (void *)param), (*(ptid) == -1)) ++#endif ++ + #define MY_TRACE TRACE_ICALLS|TRACE_IEVENT + + #define MASK_RELEASE(x) (mmask_t) NCURSES_MOUSE_MASK(x, 001) +@@ -148,6 +159,9 @@ + #define INVALID_EVENT -1 + #define NORMAL_EVENT 0 + ++#define ValidEvent(ep) ((ep)->id != INVALID_EVENT) ++#define Invalidate(ep) (ep)->id = INVALID_EVENT ++ + #if USE_GPM_SUPPORT + + #ifndef LIBGPM_SONAME +@@ -211,7 +225,7 @@ + char buf[6]; + unsigned long ignore; + +- strncpy(buf, key_mouse, 3); /* should be "\033[M" */ ++ strcpy(buf, "\033[M"); /* should be the same as key_mouse */ + buf[3] = ' ' + (button - 1) + (down ? 0 : 0x40); + buf[4] = ' ' + x - LEFT_COL + 1; + buf[5] = ' ' + y - TOP_ROW + 1; +@@ -219,7 +233,11 @@ + } + + static void ++#if USE_KLIBC_MOUSE ++mouse_server(void *param) ++#else + mouse_server(unsigned long param) ++#endif + { + SCREEN *sp = (SCREEN *) param; + unsigned short fWait = MOU_WAIT; +@@ -245,7 +263,8 @@ + /* sit and wait on the event queue */ + rc = MouReadEventQue(&mouev, &fWait, hmou); + if (rc) { +- sprintf(err, "Error reading mouse queue, rc=%lu.\r\n", rc); ++ _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err)) ++ "Error reading mouse queue, rc=%lu.\r\n", rc); + break; + } + if (!sp->_emxmouse_activated) +@@ -271,9 +290,11 @@ + finish: + oldstate = mouev.fs; + } +- } else +- sprintf(err, "Error setting event mask, buttons=%d, rc=%lu.\r\n", +- nbuttons, rc); ++ } else { ++ _nc_SPRINTF(err, _nc_SLIMIT(sizeof(err)) ++ "Error setting event mask, buttons=%d, rc=%lu.\r\n", ++ nbuttons, rc); ++ } + + DosWrite(2, err, strlen(err), &rc); + MouClose(hmou); +@@ -376,11 +397,19 @@ + + #if USE_GPM_SUPPORT + static bool +-allow_gpm_mouse(void) ++allow_gpm_mouse(SCREEN *sp) + { + bool result = FALSE; + +- /* GPM does printf's without checking if stdout is a terminal */ ++#if USE_WEAK_SYMBOLS ++ /* Danger Robinson: do not use dlopen for libgpm if already loaded */ ++ if ((Gpm_Wgetch)) { ++ if (!sp->_mouse_gpm_loaded) { ++ T(("GPM library was already dlopen'd, not by us")); ++ } ++ } else ++#endif ++ /* GPM does printf's without checking if stdout is a terminal */ + if (isatty(fileno(stdout))) { + char *list = getenv("NCURSES_GPM_TERMS"); + char *env = getenv("TERM"); +@@ -506,7 +535,7 @@ + + /* Try gpm first, because gpm may be configured to run in xterm */ + #if USE_GPM_SUPPORT +- if (allow_gpm_mouse()) { ++ if (allow_gpm_mouse(sp)) { + if (!sp->_mouse_gpm_loaded) { + #ifdef HAVE_LIBDL + load_gpm_library(sp); +@@ -673,7 +702,7 @@ + + sp->_mouse_eventp = FirstEV(sp); + for (i = 0; i < EV_MAX; i++) +- sp->_mouse_events[i].id = INVALID_EVENT; ++ Invalidate(sp->_mouse_events + i); + + initialize_mousetype(sp); + +@@ -750,6 +779,7 @@ + eventp->bstate |= BUTTON3_RELEASED; + break; + default: ++ eventp->bstate |= REPORT_MOUSE_POSITION; + break; + } + +@@ -830,7 +860,6 @@ + + if (sp->_mouse_type == M_XTERM) { + unsigned char kbuf[4]; +- mmask_t prev; + size_t grabbed; + int res; + +@@ -896,35 +925,51 @@ + + /* processing code goes here */ + eventp->bstate = 0; +- prev = PREV(eventp)->bstate; + + #if USE_EMX_MOUSE + #define PRESS_POSITION(n) \ +- eventp->bstate = MASK_PRESS(n); \ +- if (kbuf[0] & 0x40) \ +- eventp->bstate = MASK_RELEASE(n) ++ do { \ ++ eventp->bstate = MASK_PRESS(n); \ ++ sp->_mouse_bstate |= MASK_PRESS(n); \ ++ if (kbuf[0] & 0x40) { \ ++ eventp->bstate = MASK_RELEASE(n); \ ++ sp->_mouse_bstate &= ~MASK_PRESS(n); \ ++ } \ ++ } while (0) + #else + #define PRESS_POSITION(n) \ +- eventp->bstate = (mmask_t) (prev & MASK_PRESS(n) \ +- ? REPORT_MOUSE_POSITION \ +- : MASK_PRESS(n)) ++ do { \ ++ eventp->bstate = (mmask_t) (sp->_mouse_bstate & MASK_PRESS(n) \ ++ ? REPORT_MOUSE_POSITION \ ++ : MASK_PRESS(n)); \ ++ sp->_mouse_bstate |= MASK_PRESS(n); \ ++ } while (0) + #endif + + switch (kbuf[0] & 0x3) { + case 0x0: +- if (kbuf[0] & 64) ++ if ((kbuf[0] & 96) == 96) { + eventp->bstate = MASK_PRESS(4); +- else ++ /* Do not record in sp->_mouse_bstate; there will be no ++ * corresponding release event. ++ */ ++ } else { + PRESS_POSITION(1); ++ } + break; + + case 0x1: ++ if ((kbuf[0] & 96) == 96) { + #if NCURSES_MOUSE_VERSION == 2 +- if (kbuf[0] & 64) + eventp->bstate = MASK_PRESS(5); +- else ++ /* See comment above for button 4 */ ++#else ++ /* Ignore this event as it is not a true press of the button */ ++ eventp->bstate = REPORT_MOUSE_POSITION; + #endif ++ } else { + PRESS_POSITION(2); ++ } + break; + + case 0x2: +@@ -939,12 +984,13 @@ + * release, we can infer the button actually released by looking at + * the previous event. + */ +- if (prev & (BUTTON_PRESSED | BUTTON_RELEASED)) { ++ if (sp->_mouse_bstate & BUTTON_PRESSED) { + eventp->bstate = BUTTON_RELEASED; + for (b = 1; b <= MAX_BUTTONS; ++b) { +- if (!(prev & MASK_PRESS(b))) ++ if (!(sp->_mouse_bstate & MASK_PRESS(b))) + eventp->bstate &= ~MASK_RELEASE(b); + } ++ sp->_mouse_bstate = 0; + } else { + /* + * XFree86 xterm will return a stream of release-events to +@@ -985,7 +1031,7 @@ + } + + static void +-mouse_activate(SCREEN *sp, bool on) ++mouse_activate(SCREEN *sp, int on) + { + if (!on && !sp->_mouse_initialized) + return; +@@ -994,7 +1040,7 @@ + return; + + if (on) { +- ++ sp->_mouse_bstate = 0; + switch (sp->_mouse_type) { + case M_XTERM: + #if NCURSES_EXT_FUNCS +@@ -1074,10 +1120,13 @@ + /* parse a run of atomic mouse events into a gesture */ + { + MEVENT *eventp = sp->_mouse_eventp; +- MEVENT *ep, *runp, *next, *prev = PREV(eventp); ++ MEVENT *next, *ep; ++ MEVENT *first_valid = NULL; ++ MEVENT *first_invalid = NULL; + int n; + int b; + bool merge; ++ bool endLoop; + + TR(MY_TRACE, ("_nc_mouse_parse(%d) called", runcount)); + +@@ -1094,7 +1143,8 @@ + * + * It's possible that the run may not resolve to a single event (for + * example, if the user quadruple-clicks). If so, leading events +- * in the run are ignored. ++ * in the run are ignored if user does not call getmouse in a loop (getting ++ * them from newest to older). + * + * Note that this routine is independent of the format of the specific + * format of the pointing-device's reports. We can use it to parse +@@ -1102,79 +1152,110 @@ + * button basis, as long as the device-dependent mouse code puts stuff + * on the queue in MEVENT format. + */ +- if (runcount == 1) { +- TR(MY_TRACE, +- ("_nc_mouse_parse: returning simple mouse event %s at slot %ld", +- _nc_tracemouse(sp, prev), +- (long) IndexEV(sp, prev))); +- return (prev->id >= NORMAL_EVENT) +- ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE) +- : FALSE; +- } + +- /* find the start of the run */ +- runp = eventp; +- for (n = runcount; n > 0; n--) { +- runp = PREV(runp); ++ /* ++ * Reset all events that were not set, in case the user sometimes calls ++ * getmouse only once and other times until there are no more events in ++ * queue. ++ * ++ * This also allows reaching the beginning of the run. ++ */ ++ ep = eventp; ++ for (n = runcount; n < EV_MAX; n++) { ++ Invalidate(ep); ++ ep = NEXT(ep); + } + + #ifdef TRACE + if (USE_TRACEF(TRACE_IEVENT)) { + _trace_slot(sp, "before mouse press/release merge:"); + _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", +- RunParams(sp, eventp, runp), ++ RunParams(sp, eventp, ep), + runcount); + _nc_unlock_global(tracef); + } + #endif /* TRACE */ + + /* first pass; merge press/release pairs */ +- do { +- merge = FALSE; +- for (ep = runp; (next = NEXT(ep)) != eventp; ep = next) { ++ endLoop = FALSE; ++ while (!endLoop) { ++ next = NEXT(ep); ++ if (next == eventp) { ++ /* Will end the loop, but compact before */ ++ endLoop = TRUE; ++ } else { + + #define MASK_CHANGED(x) (!(ep->bstate & MASK_PRESS(x)) \ + == !(next->bstate & MASK_RELEASE(x))) + +- if (ep->x == next->x && ep->y == next->y ++ if (ValidEvent(ep) && ValidEvent(next) ++ && ep->x == next->x && ep->y == next->y + && (ep->bstate & BUTTON_PRESSED) +- && MASK_CHANGED(1) +- && MASK_CHANGED(2) +- && MASK_CHANGED(3) +- && MASK_CHANGED(4) +-#if NCURSES_MOUSE_VERSION == 2 +- && MASK_CHANGED(5) +-#endif +- ) { ++ && (!(next->bstate & BUTTON_PRESSED))) { ++ bool changed = TRUE; ++ + for (b = 1; b <= MAX_BUTTONS; ++b) { +- if ((sp->_mouse_mask & MASK_CLICK(b)) +- && (ep->bstate & MASK_PRESS(b))) { +- ep->bstate &= ~MASK_PRESS(b); +- ep->bstate |= MASK_CLICK(b); +- merge = TRUE; ++ if (!MASK_CHANGED(b)) { ++ changed = FALSE; ++ break; ++ } ++ } ++ ++ if (changed) { ++ merge = FALSE; ++ for (b = 1; b <= MAX_BUTTONS; ++b) { ++ if ((sp->_mouse_mask & MASK_CLICK(b)) ++ && (ep->bstate & MASK_PRESS(b))) { ++ next->bstate &= ~MASK_RELEASE(b); ++ next->bstate |= MASK_CLICK(b); ++ merge = TRUE; ++ } ++ } ++ if (merge) { ++ Invalidate(ep); + } + } +- if (merge) +- next->id = INVALID_EVENT; + } + } +- } while +- (merge); + ++ /* Compact valid events */ ++ if (!ValidEvent(ep)) { ++ if ((first_valid != NULL) && (first_invalid == NULL)) { ++ first_invalid = ep; ++ } ++ } else { ++ if (first_valid == NULL) { ++ first_valid = ep; ++ } else if (first_invalid != NULL) { ++ *first_invalid = *ep; ++ Invalidate(ep); ++ first_invalid = NEXT(first_invalid); ++ } ++ } ++ ++ ep = next; ++ } ++ ++ if (first_invalid != NULL) { ++ eventp = first_invalid; ++ } + #ifdef TRACE + if (USE_TRACEF(TRACE_IEVENT)) { + _trace_slot(sp, "before mouse click merge:"); +- _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", +- RunParams(sp, eventp, runp), +- runcount); +- _nc_unlock_global(tracef); ++ if (first_valid == NULL) { ++ _tracef("_nc_mouse_parse: no valid event"); ++ } else { ++ _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", ++ RunParams(sp, eventp, first_valid), ++ runcount); ++ _nc_unlock_global(tracef); ++ } + } + #endif /* TRACE */ + + /* +- * Second pass; merge click runs. At this point, click events are +- * each followed by one invalid event. We merge click events +- * forward in the queue. ++ * Second pass; merge click runs. We merge click events forward in the ++ * queue. For example, double click can be changed to triple click. + * + * NOTE: There is a problem with this design! If the application + * allows enough click events to pile up in the circular queue so +@@ -1187,87 +1268,102 @@ + * but the timer element would have to have sub-second resolution, + * which would get us into portability trouble. + */ +- do { +- MEVENT *follower; +- +- merge = FALSE; +- for (ep = runp; (next = NEXT(ep)) != eventp; ep = next) +- if (ep->id != INVALID_EVENT) { +- if (next->id != INVALID_EVENT) +- continue; +- follower = NEXT(next); +- if (follower->id == INVALID_EVENT) +- continue; +- +- /* merge click events forward */ +- if ((ep->bstate & BUTTON_CLICKED) +- && (follower->bstate & BUTTON_CLICKED)) { +- for (b = 1; b <= MAX_BUTTONS; ++b) { +- if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b)) +- && (follower->bstate & MASK_CLICK(b))) { +- follower->bstate &= ~MASK_CLICK(b); +- follower->bstate |= MASK_DOUBLE_CLICK(b); +- merge = TRUE; +- } ++ first_invalid = NULL; ++ endLoop = (first_valid == NULL); ++ ep = first_valid; ++ while (!endLoop) { ++ next = NEXT(ep); ++ ++ if (next == eventp) { ++ /* Will end the loop, but check event type and compact before */ ++ endLoop = TRUE; ++ } else if (!ValidEvent(next)) { ++ continue; ++ } else { ++ /* merge click events forward */ ++ if ((ep->bstate & BUTTON_CLICKED) ++ && (next->bstate & BUTTON_CLICKED)) { ++ merge = FALSE; ++ for (b = 1; b <= MAX_BUTTONS; ++b) { ++ if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b)) ++ && (ep->bstate & MASK_CLICK(b)) ++ && (next->bstate & MASK_CLICK(b))) { ++ next->bstate &= ~MASK_CLICK(b); ++ next->bstate |= MASK_DOUBLE_CLICK(b); ++ merge = TRUE; + } +- if (merge) +- ep->id = INVALID_EVENT; + } ++ if (merge) { ++ Invalidate(ep); ++ } ++ } + +- /* merge double-click events forward */ +- if ((ep->bstate & BUTTON_DOUBLE_CLICKED) +- && (follower->bstate & BUTTON_CLICKED)) { +- for (b = 1; b <= MAX_BUTTONS; ++b) { +- if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b)) +- && (follower->bstate & MASK_CLICK(b))) { +- follower->bstate &= ~MASK_CLICK(b); +- follower->bstate |= MASK_TRIPLE_CLICK(b); +- merge = TRUE; +- } ++ /* merge double-click events forward */ ++ if ((ep->bstate & BUTTON_DOUBLE_CLICKED) ++ && (next->bstate & BUTTON_CLICKED)) { ++ merge = FALSE; ++ for (b = 1; b <= MAX_BUTTONS; ++b) { ++ if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b)) ++ && (ep->bstate & MASK_DOUBLE_CLICK(b)) ++ && (next->bstate & MASK_CLICK(b))) { ++ next->bstate &= ~MASK_CLICK(b); ++ next->bstate |= MASK_TRIPLE_CLICK(b); ++ merge = TRUE; + } +- if (merge) +- ep->id = INVALID_EVENT; ++ } ++ if (merge) { ++ Invalidate(ep); + } + } +- } while +- (merge); ++ } + +-#ifdef TRACE +- if (USE_TRACEF(TRACE_IEVENT)) { +- _trace_slot(sp, "before mouse event queue compaction:"); +- _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", +- RunParams(sp, eventp, runp), +- runcount); +- _nc_unlock_global(tracef); +- } +-#endif /* TRACE */ ++ /* Discard event if it does not match event mask */ ++ if (!(ep->bstate & sp->_mouse_mask2)) { ++ Invalidate(ep); ++ } + +- /* +- * Now try to throw away trailing events flagged invalid, or that +- * don't match the current event mask. +- */ +- for (; runcount; prev = PREV(eventp), runcount--) +- if (prev->id == INVALID_EVENT || !(prev->bstate & sp->_mouse_mask)) { +- sp->_mouse_eventp = eventp = prev; ++ /* Compact valid events */ ++ if (!ValidEvent(ep)) { ++ if (ep == first_valid) { ++ first_valid = next; ++ } else if (first_invalid == NULL) { ++ first_invalid = ep; ++ } ++ } else if (first_invalid != NULL) { ++ *first_invalid = *ep; ++ Invalidate(ep); ++ first_invalid = NEXT(first_invalid); + } ++ ++ ep = next; ++ } ++ ++ if (first_invalid == NULL) { ++ first_invalid = eventp; ++ } ++ sp->_mouse_eventp = first_invalid; ++ + #ifdef TRACE +- if (USE_TRACEF(TRACE_IEVENT)) { +- _trace_slot(sp, "after mouse event queue compaction:"); +- _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", +- RunParams(sp, eventp, runp), +- runcount); +- _nc_unlock_global(tracef); ++ if (first_valid != NULL) { ++ if (USE_TRACEF(TRACE_IEVENT)) { ++ _trace_slot(sp, "after mouse event queue compaction:"); ++ _tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d", ++ RunParams(sp, first_invalid, first_valid), ++ runcount); ++ _nc_unlock_global(tracef); ++ } ++ for (ep = first_valid; ep != first_invalid; ep = NEXT(ep)) { ++ if (ValidEvent(ep)) ++ TR(MY_TRACE, ++ ("_nc_mouse_parse: returning composite mouse event %s at slot %ld", ++ _nc_tracemouse(sp, ep), ++ (long) IndexEV(sp, ep))); ++ } + } +- for (ep = runp; ep != eventp; ep = NEXT(ep)) +- if (ep->id != INVALID_EVENT) +- TR(MY_TRACE, +- ("_nc_mouse_parse: returning composite mouse event %s at slot %ld", +- _nc_tracemouse(sp, ep), +- (long) IndexEV(sp, ep))); + #endif /* TRACE */ + + /* after all this, do we have a valid event? */ +- return (PREV(eventp)->id != INVALID_EVENT); ++ return ValidEvent(PREV(first_invalid)); + } + + static void +@@ -1359,7 +1455,16 @@ + /* compute the current-event pointer */ + MEVENT *prev = PREV(eventp); + +- if (prev->id != INVALID_EVENT) { ++ /* ++ * Discard events not matching mask (there could be still some if ++ * _nc_mouse_parse was not called, e.g., when _nc_mouse_inline returns ++ * false). ++ */ ++ while (ValidEvent(prev) && (!(prev->bstate & SP_PARM->_mouse_mask2))) { ++ Invalidate(prev); ++ prev = PREV(prev); ++ } ++ if (ValidEvent(prev)) { + /* copy the event we find there */ + *aevent = *prev; + +@@ -1367,9 +1472,16 @@ + _nc_tracemouse(SP_PARM, prev), + (long) IndexEV(SP_PARM, prev))); + +- prev->id = INVALID_EVENT; /* so the queue slot becomes free */ +- SP_PARM->_mouse_eventp = PREV(prev); ++ Invalidate(prev); /* so the queue slot becomes free */ ++ SP_PARM->_mouse_eventp = prev; + result = OK; ++ } else { ++ /* Reset the provided event */ ++ aevent->bstate = 0; ++ Invalidate(aevent); ++ aevent->x = 0; ++ aevent->y = 0; ++ aevent->z = 0; + } + } + returnCode(result); +@@ -1420,6 +1532,7 @@ + /* set the mouse event mask */ + { + mmask_t result = 0; ++ int b; + + T((T_CALLED("mousemask(%p,%#lx,%p)"), + (void *) SP_PARM, +@@ -1447,6 +1560,22 @@ + mouse_activate(SP_PARM, (bool) (result != 0)); + + SP_PARM->_mouse_mask = result; ++ SP_PARM->_mouse_mask2 = result; ++ ++ /* ++ * Make a mask corresponding to the states we will need to ++ * retain (temporarily) while building up the state that the ++ * user asked for. ++ */ ++ for (b = 1; b <= MAX_BUTTONS; ++b) { ++ if (SP_PARM->_mouse_mask2 & MASK_TRIPLE_CLICK(b)) ++ SP_PARM->_mouse_mask2 |= MASK_DOUBLE_CLICK(b); ++ if (SP_PARM->_mouse_mask2 & MASK_DOUBLE_CLICK(b)) ++ SP_PARM->_mouse_mask2 |= MASK_CLICK(b); ++ if (SP_PARM->_mouse_mask2 & MASK_CLICK(b)) ++ SP_PARM->_mouse_mask2 |= (MASK_PRESS(b) | ++ MASK_RELEASE(b)); ++ } + } + } + } +diff -Naur ncurses-5.9.orig/ncurses/base/lib_newterm.c ncurses-5.9/ncurses/base/lib_newterm.c +--- ncurses-5.9.orig/ncurses/base/lib_newterm.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_newterm.c 2012-08-25 19:58:00.393229583 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,17 +42,13 @@ + + #include <curses.priv.h> + +-#if SVR4_TERMIO && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif +- + #ifndef CUR + #define CUR SP_TERMTYPE + #endif + + #include <tic.h> + +-MODULE_ID("$Id: lib_newterm.c,v 1.86 2010/05/20 23:25:18 tom Exp $") ++MODULE_ID("$Id: lib_newterm.c,v 1.88 2012/01/21 19:21:29 KO.Myung-Hun Exp $") + + #ifdef USE_TERM_DRIVER + #define NumLabels InfoOf(SP_PARM).numlabels +@@ -283,7 +279,8 @@ + NCURSES_SP_NAME(typeahead) (NCURSES_SP_ARGx fileno(_ifp)); + #ifdef TERMIOS + SP_PARM->_use_meta = ((new_term->Ottyb.c_cflag & CSIZE) == CS8 && +- !(new_term->Ottyb.c_iflag & ISTRIP)); ++ !(new_term->Ottyb.c_iflag & ISTRIP)) || ++ USE_KLIBC_KBD; + #else + SP_PARM->_use_meta = FALSE; + #endif +diff -Naur ncurses-5.9.orig/ncurses/base/lib_newwin.c ncurses-5.9/ncurses/base/lib_newwin.c +--- ncurses-5.9.orig/ncurses/base/lib_newwin.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_newwin.c 2012-08-25 19:58:00.026564651 +0000 +@@ -43,7 +43,7 @@ + #include <curses.priv.h> + #include <stddef.h> + +-MODULE_ID("$Id: lib_newwin.c,v 1.69 2011/03/07 21:58:17 tom Exp $") ++MODULE_ID("$Id: lib_newwin.c,v 1.71 2011/05/28 21:32:51 tom Exp $") + + #define window_is(name) ((sp)->_##name == win) + +@@ -141,7 +141,11 @@ + T((T_CALLED("newwin(%p, %d,%d,%d,%d)"), (void *) SP_PARM, num_lines, num_columns, + begy, begx)); + +- if (begy < 0 || begx < 0 || num_lines < 0 || num_columns < 0) ++ if (begy < 0 ++ || begx < 0 ++ || num_lines < 0 ++ || num_columns < 0 ++ || SP_PARM == 0) + returnWin(0); + + if (num_lines == 0) +@@ -235,10 +239,15 @@ + NCURSES_EXPORT(WINDOW *) + subwin(WINDOW *w, int l, int c, int y, int x) + { ++ WINDOW *result = 0; ++ + T((T_CALLED("subwin(%p, %d, %d, %d, %d)"), (void *) w, l, c, y, x)); +- T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx)); ++ if (w != 0) { ++ T(("parent has begy = %ld, begx = %ld", (long) w->_begy, (long) w->_begx)); + +- returnWin(derwin(w, l, c, y - w->_begy, x - w->_begx)); ++ result = derwin(w, l, c, y - w->_begy, x - w->_begx); ++ } ++ returnWin(result); + } + + static bool +diff -Naur ncurses-5.9.orig/ncurses/base/lib_printw.c ncurses-5.9/ncurses/base/lib_printw.c +--- ncurses-5.9.orig/ncurses/base/lib_printw.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_printw.c 2012-08-25 19:58:00.986560110 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_printw.c,v 1.20 2009/10/24 22:07:03 tom Exp $") ++MODULE_ID("$Id: lib_printw.c,v 1.22 2012/03/10 20:47:33 tom Exp $") + + NCURSES_EXPORT(int) + printw(const char *fmt,...) +@@ -48,10 +48,12 @@ + int code; + + #ifdef TRACE +- va_start(argp, fmt); ++ va_list argq; ++ begin_va_copy(argq, argp); ++ va_start(argq, fmt); + T((T_CALLED("printw(%s%s)"), +- _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- va_end(argp); ++ _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ end_va_copy(argq); + #endif + + va_start(argp, fmt); +@@ -68,10 +70,12 @@ + int code; + + #ifdef TRACE +- va_start(argp, fmt); ++ va_list argq; ++ begin_va_copy(argq, argp); ++ va_start(argq, fmt); + T((T_CALLED("wprintw(%p,%s%s)"), +- (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- va_end(argp); ++ (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ end_va_copy(argq); + #endif + + va_start(argp, fmt); +@@ -88,10 +92,12 @@ + int code; + + #ifdef TRACE +- va_start(argp, fmt); ++ va_list argq; ++ begin_va_copy(argq, argp); ++ va_start(argq, fmt); + T((T_CALLED("mvprintw(%d,%d,%s%s)"), +- y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- va_end(argp); ++ y, x, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ end_va_copy(argq); + #endif + + if ((code = move(y, x)) != ERR) { +@@ -109,10 +115,12 @@ + int code; + + #ifdef TRACE +- va_start(argp, fmt); ++ va_list argq; ++ begin_va_copy(argq, argp); ++ va_start(argq, fmt); + T((T_CALLED("mvwprintw(%d,%d,%p,%s%s)"), +- y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argp))); +- va_end(argp); ++ y, x, (void *) win, _nc_visbuf(fmt), _nc_varargs(fmt, argq))); ++ end_va_copy(argq); + #endif + + if ((code = wmove(win, y, x)) != ERR) { +diff -Naur ncurses-5.9.orig/ncurses/base/lib_refresh.c ncurses-5.9/ncurses/base/lib_refresh.c +--- ncurses-5.9.orig/ncurses/base/lib_refresh.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_refresh.c 2012-08-25 19:58:00.026564651 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_refresh.c,v 1.44 2010/12/19 01:22:58 tom Exp $") ++MODULE_ID("$Id: lib_refresh.c,v 1.45 2011/06/25 19:02:22 Vassili.Courzakis Exp $") + + NCURSES_EXPORT(int) + wrefresh(WINDOW *win) +@@ -90,12 +90,6 @@ + #endif + + T((T_CALLED("wnoutrefresh(%p)"), (void *) win)); +-#ifdef TRACE +- if (USE_TRACEF(TRACE_UPDATE)) { +- _tracedump("...win", win); +- _nc_unlock_global(tracef); +- } +-#endif /* TRACE */ + + /* + * This function will break badly if we try to refresh a pad. +@@ -104,6 +98,13 @@ + || (win->_flags & _ISPAD)) + returnCode(ERR); + ++#ifdef TRACE ++ if (USE_TRACEF(TRACE_UPDATE)) { ++ _tracedump("...win", win); ++ _nc_unlock_global(tracef); ++ } ++#endif /* TRACE */ ++ + /* put them here so "win == 0" won't break our code */ + begx = win->_begx; + begy = win->_begy; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_restart.c ncurses-5.9/ncurses/base/lib_restart.c +--- ncurses-5.9.orig/ncurses/base/lib_restart.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_restart.c 2012-08-25 19:58:00.026564651 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,11 +41,7 @@ + + #include <curses.priv.h> + +-#if SVR4_TERMIO && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif +- +-MODULE_ID("$Id: lib_restart.c,v 1.13 2009/10/24 22:47:43 tom Exp $") ++MODULE_ID("$Id: lib_restart.c,v 1.14 2011/04/16 16:42:10 tom Exp $") + + NCURSES_EXPORT(int) + NCURSES_SP_NAME(restartterm) (NCURSES_SP_DCLx +diff -Naur ncurses-5.9.orig/ncurses/base/lib_scanw.c ncurses-5.9/ncurses/base/lib_scanw.c +--- ncurses-5.9.orig/ncurses/base/lib_scanw.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_scanw.c 2012-08-25 19:58:00.029897968 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2001,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -40,14 +40,14 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_scanw.c,v 1.12 2009/10/24 22:35:14 tom Exp $") ++MODULE_ID("$Id: lib_scanw.c,v 1.13 2011/10/22 16:31:35 tom Exp $") + + NCURSES_EXPORT(int) + vwscanw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp) + { + char buf[BUFSIZ]; + +- if (wgetnstr(win, buf, sizeof(buf) - 1) == ERR) ++ if (wgetnstr(win, buf, (int) sizeof(buf) - 1) == ERR) + return (ERR); + + return (vsscanf(buf, fmt, argp)); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_screen.c ncurses-5.9/ncurses/base/lib_screen.c +--- ncurses-5.9.orig/ncurses/base/lib_screen.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_screen.c 2012-08-25 19:58:00.029897968 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_screen.c,v 1.38 2009/10/24 22:08:55 tom Exp $") ++MODULE_ID("$Id: lib_screen.c,v 1.41 2011/10/22 15:03:11 tom Exp $") + + #define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */ + +@@ -51,8 +51,11 @@ + + T((T_CALLED("getwin(%p)"), (void *) filep)); + ++ if (filep == 0) { ++ returnWin(0); ++ } + clearerr(filep); +- if (fread(&tmp, 1, sizeof(WINDOW), filep) < sizeof(WINDOW) ++ if (fread(&tmp, (size_t) 1, sizeof(WINDOW), filep) < sizeof(WINDOW) + || ferror(filep) + || tmp._maxy == 0 + || tmp._maxy > MAX_SIZE +@@ -110,7 +113,7 @@ + + for (n = 0; n <= nwin->_maxy; n++) { + clearerr(filep); +- if (fread(nwin->_line[n].text, 1, linesize, filep) < linesize ++ if (fread(nwin->_line[n].text, (size_t) 1, linesize, filep) < linesize + || ferror(filep)) { + delwin(nwin); + returnWin(0); +@@ -141,7 +144,7 @@ + size_t len = (size_t) (win->_maxx + 1); + + clearerr(filep); +- if (fwrite(win, sizeof(WINDOW), 1, filep) != 1 ++ if (fwrite(win, sizeof(WINDOW), (size_t) 1, filep) != 1 + || ferror(filep)) + returnCode(code); + +@@ -189,18 +192,20 @@ + NCURSES_EXPORT(int) + scr_dump(const char *file) + { ++ int result; + FILE *fp = 0; + + T((T_CALLED("scr_dump(%s)"), _nc_visbuf(file))); + + if (_nc_access(file, W_OK) < 0 + || (fp = fopen(file, "wb")) == 0) { +- returnCode(ERR); ++ result = ERR; + } else { + (void) putwin(newscr, fp); + (void) fclose(fp); +- returnCode(OK); ++ result = OK; + } ++ returnCode(result); + } + + NCURSES_EXPORT(int) +diff -Naur ncurses-5.9.orig/ncurses/base/lib_scroll.c ncurses-5.9/ncurses/base/lib_scroll.c +--- ncurses-5.9.orig/ncurses/base/lib_scroll.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_scroll.c 2012-08-25 19:58:00.029897968 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -43,13 +43,13 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_scroll.c,v 1.28 2010/12/19 01:48:09 tom Exp $") ++MODULE_ID("$Id: lib_scroll.c,v 1.29 2011/10/22 16:34:50 tom Exp $") + + NCURSES_EXPORT(void) + _nc_scroll_window(WINDOW *win, + int const n, +- NCURSES_SIZE_T const top, +- NCURSES_SIZE_T const bottom, ++ int const top, ++ int const bottom, + NCURSES_CH_T blank) + { + int limit; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_set_term.c ncurses-5.9/ncurses/base/lib_set_term.c +--- ncurses-5.9.orig/ncurses/base/lib_set_term.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_set_term.c 2012-08-25 19:58:01.893222491 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -47,7 +47,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_set_term.c,v 1.138 2010/12/20 00:42:20 tom Exp $") ++MODULE_ID("$Id: lib_set_term.c,v 1.141 2012/07/07 20:37:40 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define MaxColors InfoOf(sp).maxcolors +@@ -284,7 +284,7 @@ + int slines, + int scolumns, + FILE *output, +- bool filtered, ++ int filtered, + int slk_format) + { + char *env; +@@ -619,6 +619,7 @@ + #endif + #if USE_SIZECHANGE + sp->_resize = NCURSES_SP_NAME(resizeterm); ++ sp->_ungetch = safe_ungetch; + #endif + + NewScreen(sp)->_clear = TRUE; +@@ -695,7 +696,7 @@ + _nc_setupscreen(int slines GCC_UNUSED, + int scolumns GCC_UNUSED, + FILE *output, +- bool filtered, ++ int filtered, + int slk_format) + { + SCREEN *sp = 0; +@@ -759,6 +760,7 @@ + int line, + int (*init) (WINDOW *, int)) + { ++ START_TRACE(); + return NCURSES_SP_NAME(_nc_ripoffline) (NCURSES_SP_ARGx + (line < 0) ? -1 : 1, + init); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_slkrefr.c ncurses-5.9/ncurses/base/lib_slkrefr.c +--- ncurses-5.9.orig/ncurses/base/lib_slkrefr.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_slkrefr.c 2012-08-25 19:58:01.726556612 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -43,7 +43,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_slkrefr.c,v 1.26 2010/05/01 19:17:28 tom Exp $") ++MODULE_ID("$Id: lib_slkrefr.c,v 1.27 2012/06/09 20:29:33 tom Exp $") + + #ifdef USE_TERM_DRIVER + #define NumLabels InfoOf(SP_PARM).numlabels +@@ -109,13 +109,13 @@ + slk_paint_info(slk->win); + wmove(slk->win, SLK_LINES(fmt) - 1, slk->ent[i].ent_x); + if (sp->_slk) { +- (void) wattrset(slk->win, AttrOf(sp->_slk->attr)); ++ (void) wattrset(slk->win, (int) AttrOf(sp->_slk->attr)); + } + waddstr(slk->win, slk->ent[i].form_text); + /* if we simulate SLK's, it's looking much more + natural to use the current ATTRIBUTE also + for the label window */ +- (void) wattrset(slk->win, WINDOW_ATTRS(StdScreen(sp))); ++ (void) wattrset(slk->win, (int) WINDOW_ATTRS(StdScreen(sp))); + } + } + slk->ent[i].dirty = FALSE; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_slkset.c ncurses-5.9/ncurses/base/lib_slkset.c +--- ncurses-5.9.orig/ncurses/base/lib_slkset.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/lib_slkset.c 2012-08-25 19:58:00.029897968 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -44,7 +44,7 @@ + #endif + #endif + +-MODULE_ID("$Id: lib_slkset.c,v 1.21 2010/12/25 23:43:58 tom Exp $") ++MODULE_ID("$Id: lib_slkset.c,v 1.22 2011/10/22 16:58:26 tom Exp $") + + NCURSES_EXPORT(int) + NCURSES_SP_NAME(slk_set) (NCURSES_SP_DCLx int i, const char *astr, int format) +@@ -111,8 +111,8 @@ + slk->ent[i].ent_text[numchrs] = '\0'; + + if ((slk->ent[i].form_text = (char *) _nc_doalloc(slk->ent[i].form_text, +- (unsigned) (limit + +- numchrs + 1)) ++ (size_t) (limit + ++ numchrs + 1)) + ) == 0) + returnCode(ERR); + +@@ -131,16 +131,16 @@ + if (offset <= 0) + offset = 0; + else +- memset(slk->ent[i].form_text, ' ', (unsigned) offset); ++ memset(slk->ent[i].form_text, ' ', (size_t) offset); + + memcpy(slk->ent[i].form_text + offset, + slk->ent[i].ent_text, +- (unsigned) numchrs); ++ (size_t) numchrs); + + if (offset < limit) { + memset(slk->ent[i].form_text + offset + numchrs, + ' ', +- (unsigned) (limit - (offset + numcols))); ++ (size_t) (limit - (offset + numcols))); + } + + slk->ent[i].form_text[numchrs - numcols + limit] = 0; +diff -Naur ncurses-5.9.orig/ncurses/base/lib_touch.c ncurses-5.9/ncurses/base/lib_touch.c +--- ncurses-5.9.orig/ncurses/base/lib_touch.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_touch.c 2012-08-25 19:58:01.726556612 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -43,7 +43,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_touch.c,v 1.11 2010/12/19 01:22:58 tom Exp $") ++MODULE_ID("$Id: lib_touch.c,v 1.12 2012/06/09 20:29:33 tom Exp $") + + NCURSES_EXPORT(bool) + is_linetouched(WINDOW *win, int line) +@@ -84,7 +84,7 @@ + for (i = y; i < y + n; i++) { + if (i > win->_maxy) + break; +- win->_line[i].firstchar = changed ? 0 : _NOCHANGE; ++ win->_line[i].firstchar = (NCURSES_SIZE_T) (changed ? 0 : _NOCHANGE); + win->_line[i].lastchar = (NCURSES_SIZE_T) (changed + ? win->_maxx + : _NOCHANGE); +diff -Naur ncurses-5.9.orig/ncurses/base/lib_ungetch.c ncurses-5.9/ncurses/base/lib_ungetch.c +--- ncurses-5.9.orig/ncurses/base/lib_ungetch.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/lib_ungetch.c 2012-08-25 19:58:02.199887706 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_ungetch.c,v 1.14 2009/10/24 22:12:21 tom Exp $") ++MODULE_ID("$Id: lib_ungetch.c,v 1.16 2012/08/04 17:38:53 tom Exp $") + + #include <fifo_defs.h> + +@@ -64,13 +64,14 @@ + + T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch))); + +- if (tail != -1) { +- if (head == -1) { ++ if (sp != 0 && tail >= 0) { ++ if (head < 0) { + head = 0; + t_inc(); + peek = tail; /* no raw keys */ +- } else ++ } else { + h_dec(); ++ } + + sp->_fifo[head] = ch; + T(("ungetch %s ok", _nc_tracechar(sp, ch))); +diff -Naur ncurses-5.9.orig/ncurses/base/resizeterm.c ncurses-5.9/ncurses/base/resizeterm.c +--- ncurses-5.9.orig/ncurses/base/resizeterm.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/resizeterm.c 2012-08-25 19:58:01.893222491 +0000 +@@ -45,7 +45,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: resizeterm.c,v 1.43 2011/01/10 01:34:49 tom Exp $") ++MODULE_ID("$Id: resizeterm.c,v 1.45 2012/07/07 17:07:23 tom Exp $") + + /* + * If we're trying to be reentrant, do not want any local statics. +@@ -365,58 +365,71 @@ + } + #endif + if (ToLines > screen_lines(SP_PARM)) { +- increase_size(NCURSES_SP_ARGx +- myLines = ToLines, myCols, was_stolen EXTRA_ARGS); ++ result = increase_size(NCURSES_SP_ARGx ++ myLines = ToLines, ++ myCols, ++ was_stolen EXTRA_ARGS); + CurLines = myLines; + CurCols = myCols; + } + +- if (ToCols > screen_columns(SP_PARM)) { +- increase_size(NCURSES_SP_ARGx +- myLines, myCols = ToCols, was_stolen EXTRA_ARGS); ++ if ((result == OK) ++ && (ToCols > screen_columns(SP_PARM))) { ++ result = increase_size(NCURSES_SP_ARGx ++ myLines, ++ myCols = ToCols, ++ was_stolen EXTRA_ARGS); + CurLines = myLines; + CurCols = myCols; + } + +- if (ToLines < myLines || +- ToCols < myCols) { +- decrease_size(NCURSES_SP_ARGx ToLines, ToCols, was_stolen EXTRA_ARGS); ++ if ((result == OK) ++ && (ToLines < myLines || ++ ToCols < myCols)) { ++ result = decrease_size(NCURSES_SP_ARGx ++ ToLines, ++ ToCols, ++ was_stolen EXTRA_ARGS); + } + +- screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines; +- screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols; ++ if (result == OK) { ++ screen_lines(SP_PARM) = (NCURSES_SIZE_T) ToLines; ++ screen_columns(SP_PARM) = (NCURSES_SIZE_T) ToCols; + + #ifdef USE_TERM_DRIVER +- CallDriver_2(SP_PARM, setsize, ToLines, ToCols); ++ CallDriver_2(SP_PARM, setsize, ToLines, ToCols); + #else +- lines = (NCURSES_SIZE_T) ToLines; +- columns = (NCURSES_SIZE_T) ToCols; ++ lines = (NCURSES_SIZE_T) ToLines; ++ columns = (NCURSES_SIZE_T) ToCols; + #endif + +- SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen); ++ SP_PARM->_lines_avail = (NCURSES_SIZE_T) (ToLines - was_stolen); + +- if (SP_PARM->oldhash) { +- FreeAndNull(SP_PARM->oldhash); +- } +- if (SP_PARM->newhash) { +- FreeAndNull(SP_PARM->newhash); +- } ++ if (SP_PARM->oldhash) { ++ FreeAndNull(SP_PARM->oldhash); ++ } ++ if (SP_PARM->newhash) { ++ FreeAndNull(SP_PARM->newhash); ++ } + #ifdef TRACE +- if (USE_TRACEF(TRACE_UPDATE)) { +- SET_LINES(ToLines - was_stolen); +- SET_COLS(ToCols); +- show_window_sizes("after"); +- _nc_unlock_global(tracef); +- } ++ if (USE_TRACEF(TRACE_UPDATE)) { ++ SET_LINES(ToLines - was_stolen); ++ SET_COLS(ToCols); ++ show_window_sizes("after"); ++ _nc_unlock_global(tracef); ++ } + #endif ++ } + } + +- /* +- * Always update LINES, to allow for call from lib_doupdate.c which +- * needs to have the count adjusted by the stolen (ripped off) lines. +- */ +- SET_LINES(ToLines - was_stolen); +- SET_COLS(ToCols); ++ if (result == OK) { ++ /* ++ * Always update LINES, to allow for call from lib_doupdate.c which ++ * needs to have the count adjusted by the stolen (ripped off) lines. ++ */ ++ SET_LINES(ToLines - was_stolen); ++ SET_COLS(ToCols); ++ } + + _nc_nonsp_unlock_global(curses); + +@@ -471,7 +484,6 @@ + result = NCURSES_SP_NAME(resize_term) (NCURSES_SP_ARGx ToLines, ToCols); + + #if USE_SIGWINCH +- safe_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ + clearok(CurScreen(SP_PARM), TRUE); /* screen contents are unknown */ + + /* ripped-off lines are a special case: if we did not lengthen +@@ -501,6 +513,9 @@ + } + #endif + } ++#if USE_SIGWINCH ++ safe_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ ++#endif + } + + returnCode(result); +diff -Naur ncurses-5.9.orig/ncurses/base/safe_sprintf.c ncurses-5.9/ncurses/base/safe_sprintf.c +--- ncurses-5.9.orig/ncurses/base/safe_sprintf.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/safe_sprintf.c 2012-08-25 19:58:00.909893807 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,7 +33,7 @@ + #include <curses.priv.h> + #include <ctype.h> + +-MODULE_ID("$Id: safe_sprintf.c,v 1.24 2010/06/05 22:22:27 tom Exp $") ++MODULE_ID("$Id: safe_sprintf.c,v 1.26 2012/02/22 22:40:24 tom Exp $") + + #if USE_SAFE_SPRINTF + +@@ -109,12 +109,15 @@ + } else if (state == Prec) { + prec = ival; + } +- sprintf(fmt_arg, "%d", ival); ++ _nc_SPRINTF(fmt_arg, ++ _nc_SLIMIT(sizeof(fmt_arg)) ++ "%d", ival); + fmt_len += strlen(fmt_arg); + if ((format = _nc_doalloc(format, fmt_len)) == 0) { + return -1; + } +- strcpy(&format[--f], fmt_arg); ++ --f; ++ _nc_STRCPY(&format[f], fmt_arg, fmt_len - f); + f = strlen(format); + } else if (isalpha(UChar(*fmt))) { + done = TRUE; +@@ -185,13 +188,13 @@ + format[f] = '\0'; + switch (used) { + case 'i': +- sprintf(buffer, format, ival); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, ival); + break; + case 'f': +- sprintf(buffer, format, fval); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, fval); + break; + default: +- sprintf(buffer, format, pval); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, pval); + break; + } + len += (int) strlen(buffer); +diff -Naur ncurses-5.9.orig/ncurses/base/vsscanf.c ncurses-5.9/ncurses/base/vsscanf.c +--- ncurses-5.9.orig/ncurses/base/vsscanf.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/base/vsscanf.c 2012-08-25 19:58:00.909893807 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2004,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -38,7 +38,7 @@ + + #if !HAVE_VSSCANF + +-MODULE_ID("$Id: vsscanf.c,v 1.18 2004/04/03 20:27:02 tom Exp $") ++MODULE_ID("$Id: vsscanf.c,v 1.20 2012/02/22 22:26:58 tom Exp $") + + #if !(HAVE_VFSCANF || HAVE__DOSCAN) + +@@ -293,12 +293,12 @@ + + /* add %n, if the format was not that */ + if (chunk != cAssigned) { +- strcat(my_fmt, "%n"); ++ _nc_STRCAT(my_fmt, "%n", len_fmt); + } + + switch (chunk) { + case cAssigned: +- strcat(my_fmt, "%n"); ++ _nc_STRCAT(my_fmt, "%n", len_fmt); + pointer = &eaten; + break; + case cInt: +diff -Naur ncurses-5.9.orig/ncurses/base/wresize.c ncurses-5.9/ncurses/base/wresize.c +--- ncurses-5.9.orig/ncurses/base/wresize.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/base/wresize.c 2012-08-25 19:58:00.029897968 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,7 +33,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: wresize.c,v 1.34 2010/06/05 22:36:26 tom Exp $") ++MODULE_ID("$Id: wresize.c,v 1.35 2011/05/21 18:55:07 tom Exp $") + + static int + cleanup_lines(struct ldat *data, int length) +@@ -175,9 +175,10 @@ + for (col = 0; col <= ToCols; ++col) + s[col] = win->_nc_bkgd; + } +- } else { +- assert(pline != 0); ++ } else if (pline != 0 && pline[win->_pary + row].text != 0) { + s = &pline[win->_pary + row].text[win->_parx]; ++ } else { ++ s = 0; + } + + if_USE_SCROLL_HINTS(new_lines[row].oldindex = row); +diff -Naur ncurses-5.9.orig/ncurses/build.priv.h ncurses-5.9/ncurses/build.priv.h +--- ncurses-5.9.orig/ncurses/build.priv.h 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/build.priv.h 2012-08-25 19:58:00.909893807 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,9 +30,8 @@ + * Author: Thomas E. Dickey 2010 * + ****************************************************************************/ + +- + /* +- * $Id: build.priv.h,v 1.6 2010/05/22 20:30:35 tom Exp $ ++ * $Id: build.priv.h,v 1.9 2012/02/22 22:17:02 tom Exp $ + * + * build.priv.h + * +@@ -83,6 +82,7 @@ + #define SIZEOF(v) (sizeof(v) / sizeof(v[0])) + + #include <nc_alloc.h> ++#include <nc_string.h> + + /* declare these, to avoid needing term.h */ + #if BROKEN_LINKER || USE_REENTRANT +diff -Naur ncurses-5.9.orig/ncurses/curses.priv.h ncurses-5.9/ncurses/curses.priv.h +--- ncurses-5.9.orig/ncurses/curses.priv.h 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/curses.priv.h 2012-08-25 19:58:01.936555619 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + ****************************************************************************/ + + /* +- * $Id: curses.priv.h,v 1.475 2011/01/22 21:10:19 tom Exp $ ++ * $Id: curses.priv.h,v 1.502 2012/07/14 21:14:30 tom Exp $ + * + * curses.priv.h + * +@@ -65,6 +65,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/stat.h> + + #if HAVE_UNISTD_H + #include <unistd.h> +@@ -111,6 +112,14 @@ + #define USE_FUNC_POLL 0 + #endif + ++#if HAVE_INTTYPES_H ++# include <inttypes.h> ++#else ++# if HAVE_STDINT_H ++# include <stdint.h> ++# endif ++#endif ++ + /* include signal.h before curses.h to work-around defect in glibc 2.1.3 */ + #include <signal.h> + +@@ -135,6 +144,15 @@ + #define USE_EMX_MOUSE 0 + #endif + ++/* kLIBC keyboard/mouse support */ ++#if defined(__OS2__) && defined(__KLIBC__) ++#define USE_KLIBC_KBD 1 ++#define USE_KLIBC_MOUSE 1 ++#else ++#define USE_KLIBC_KBD 0 ++#define USE_KLIBC_MOUSE 0 ++#endif ++ + #define DEFAULT_MAXCLICK 166 + #define EV_MAX 8 /* size of mouse circular event queue */ + +@@ -192,6 +210,18 @@ + #endif + + /* ++ * Either/both S_ISxxx and/or S_IFxxx are defined in sys/types.h; some systems ++ * lack one or the other. ++ */ ++#ifndef S_ISDIR ++#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR) ++#endif ++ ++#ifndef S_ISREG ++#define S_ISREG(mode) ((mode & S_IFMT) == S_IFREG) ++#endif ++ ++/* + * Scroll hints are useless when hashmap is used + */ + #if !USE_SCROLL_HINTS +@@ -208,6 +238,8 @@ + #define if_USE_SCROLL_HINTS(stmt) /*nothing*/ + #endif + ++#include <nc_string.h> ++ + /* + * Options for terminal drivers, etc... + */ +@@ -325,6 +357,7 @@ + #endif + + #include <term.h> ++#include <nc_termios.h> + + /* + * Reduce dependency on cur_term global by using terminfo data from SCREEN's +@@ -365,7 +398,7 @@ + #define if_EXT_COLORS(stmt) stmt + #define SetPair(value,p) SetPair2((value).ext_color, AttrOf(value), p) + #define SetPair2(c,a,p) c = (p), \ +- a = (unColor2(a) | (A_COLOR & ColorPair(oldColor(c)))) ++ a = (unColor2(a) | (A_COLOR & (unsigned) ColorPair(oldColor(c)))) + #define GetPair(value) GetPair2((value).ext_color, AttrOf(value)) + #define GetPair2(c,a) ((c) ? (c) : PairNumber(a)) + #define oldColor(p) (((p) > 255) ? 255 : (p)) +@@ -374,9 +407,9 @@ + #define SameAttrOf(a,b) (AttrOf(a) == AttrOf(b) && GetPair(a) == GetPair(b)) + + #if NCURSES_SP_FUNCS +-#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vid_attr)(sp, attr, pair, 0) ++#define VIDATTR(sp,attr,pair) NCURSES_SP_NAME(vid_attr)(sp, attr, (short) pair, 0) + #else +-#define VIDATTR(sp,attr,pair) vid_attr(attr, pair, 0) ++#define VIDATTR(sp,attr,pair) vid_attr(attr, (short) pair, 0) + #endif + + #else /* !NCURSES_EXT_COLORS */ +@@ -467,6 +500,9 @@ + # endif + # define _declare(name) __extension__ extern __typeof__(name) name + # define weak_symbol(name) _weak_pragma(name) _declare(name) __attribute__((weak)) ++#else ++# undef USE_WEAK_SYMBOLS ++# define USE_WEAK_SYMBOLS 0 + #endif + #endif + +@@ -665,6 +701,9 @@ + #if USE_GPM_SUPPORT + #undef buttons /* term.h defines this, and gpm uses it! */ + #include <gpm.h> ++#if USE_WEAK_SYMBOLS ++weak_symbol(Gpm_Wgetch); ++#endif + + #ifdef HAVE_LIBDL + /* link dynamically to GPM */ +@@ -766,6 +805,11 @@ + #define INIT_TERM_DRIVER() /* nothing */ + #endif + ++typedef struct { ++ const char *name; ++ char *value; ++} ITERATOR_VARS; ++ + /* + * Global data which is not specific to a screen. + */ +@@ -776,7 +820,7 @@ + bool init_signals; + bool init_screen; + +- const char *comp_sourcename; ++ char *comp_sourcename; + char *comp_termtype; + + bool have_tic_directory; +@@ -798,6 +842,12 @@ + int tgetent_index; + long tgetent_sequence; + ++ char *dbd_blob; /* string-heap for dbd_list[] */ ++ char **dbd_list; /* distinct places to look for data */ ++ int dbd_size; /* length of dbd_list[] */ ++ time_t dbd_time; /* cache last updated */ ++ ITERATOR_VARS dbd_vars[dbdLAST]; ++ + #ifndef USE_SP_WINDOWLIST + WINDOWLIST *_nc_windowlist; + #define WindowList(sp) _nc_globals._nc_windowlist +@@ -891,6 +941,7 @@ + const char *_tputs_trace; + #endif + #endif ++ bool use_tioctl; + } NCURSES_PRESCREEN; + + /* +@@ -1015,6 +1066,7 @@ + int _pair_count; /* count of color pairs */ + int _pair_limit; /* actual limit of color-pairs */ + #if NCURSES_EXT_FUNCS ++ bool _assumed_color; /* use assumed colors */ + bool _default_color; /* use default colors */ + bool _has_sgr_39_49; /* has ECMA default color support */ + int _default_fg; /* assumed default foreground */ +@@ -1032,6 +1084,10 @@ + bool _use_rmso; /* true if we may use 'rmso' */ + bool _use_rmul; /* true if we may use 'rmul' */ + ++#if USE_KLIBC_KBD ++ bool _extended_key; /* true if an extended key */ ++#endif ++ + /* + * These data correspond to the state of the idcok() and idlok() + * functions. A caveat is in order here: the XSI and SVr4 +@@ -1055,7 +1111,9 @@ + void (*_mouse_wrap) (SCREEN *); + int _mouse_fd; /* file-descriptor, if any */ + bool _mouse_active; /* true if initialized */ +- mmask_t _mouse_mask; ++ mmask_t _mouse_mask; /* set via mousemask() */ ++ mmask_t _mouse_mask2; /* OR's in press/release bits */ ++ mmask_t _mouse_bstate; + NCURSES_CONST char *_mouse_xtermcap; /* string to enable/disable mouse */ + MEVENT _mouse_events[EV_MAX]; /* hold the last mouse event seen */ + MEVENT *_mouse_eventp; /* next free slot in event queue */ +@@ -1102,6 +1160,7 @@ + */ + #if USE_SIZECHANGE + int (*_resize)(NCURSES_SP_DCLx int y, int x); ++ int (*_ungetch)(SCREEN *, int); + #endif + + /* +@@ -1159,6 +1218,8 @@ + */ + bool _screen_acs_fix; + #endif ++ ++ bool _use_tioctl; + }; + + extern NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain; +@@ -1168,7 +1229,7 @@ + WINDOWLIST *next; + SCREEN *screen; /* screen containing the window */ + WINDOW win; /* WINDOW_EXT() needs to account for offset */ +-#ifdef NCURSES_WIDECHAR ++#if NCURSES_WIDECHAR + char addch_work[(MB_LEN_MAX * 9) + 1]; + unsigned addch_used; /* number of bytes in addch_work[] */ + int addch_x; /* x-position for addch_work[] */ +@@ -1339,7 +1400,7 @@ + putc(PUTC_ch,b); \ + break; \ + } \ +- IGNORE_RC(fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b)); \ ++ IGNORE_RC(fwrite(PUTC_buf, (size_t) PUTC_n, (size_t) 1, b)); \ + } \ + COUNT_OUTCHARS(PUTC_i); \ + } } } while (0) +@@ -1412,25 +1473,25 @@ + + #define CHANGED_CELL(line,col) \ + if (line->firstchar == _NOCHANGE) \ +- line->firstchar = line->lastchar = (NCURSES_SIZE_T) col; \ ++ line->firstchar = line->lastchar = (NCURSES_SIZE_T) (col); \ + else if ((col) < line->firstchar) \ +- line->firstchar = (NCURSES_SIZE_T) col; \ ++ line->firstchar = (NCURSES_SIZE_T) (col); \ + else if ((col) > line->lastchar) \ +- line->lastchar = (NCURSES_SIZE_T) col ++ line->lastchar = (NCURSES_SIZE_T) (col) + + #define CHANGED_RANGE(line,start,end) \ + if (line->firstchar == _NOCHANGE \ + || line->firstchar > (start)) \ +- line->firstchar = (NCURSES_SIZE_T) start; \ ++ line->firstchar = (NCURSES_SIZE_T) (start); \ + if (line->lastchar == _NOCHANGE \ + || line->lastchar < (end)) \ +- line->lastchar = (NCURSES_SIZE_T) end ++ line->lastchar = (NCURSES_SIZE_T) (end) + + #define CHANGED_TO_EOL(line,start,end) \ + if (line->firstchar == _NOCHANGE \ + || line->firstchar > (start)) \ +- line->firstchar = (NCURSES_SIZE_T) start; \ +- line->lastchar = (NCURSES_SIZE_T) end ++ line->firstchar = (NCURSES_SIZE_T) (start); \ ++ line->lastchar = (NCURSES_SIZE_T) (end) + + #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) + +@@ -1528,7 +1589,7 @@ + #define returnVoidPtr(code) TRACE_RETURN(code,void_ptr) + #define returnWin(code) TRACE_RETURN(code,win) + +-extern NCURSES_EXPORT(NCURSES_BOOL) _nc_retrace_bool (NCURSES_BOOL); ++extern NCURSES_EXPORT(NCURSES_BOOL) _nc_retrace_bool (int); + extern NCURSES_EXPORT(NCURSES_CONST void *) _nc_retrace_cvoid_ptr (NCURSES_CONST void *); + extern NCURSES_EXPORT(SCREEN *) _nc_retrace_sp (SCREEN *); + extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *); +@@ -1539,7 +1600,7 @@ + extern NCURSES_EXPORT(chtype) _nc_retrace_chtype (chtype); + extern NCURSES_EXPORT(const char *) _nc_altcharset_name(attr_t, chtype); + extern NCURSES_EXPORT(const char *) _nc_retrace_cptr (const char *); +-extern NCURSES_EXPORT(char) _nc_retrace_char (char); ++extern NCURSES_EXPORT(char) _nc_retrace_char (int); + extern NCURSES_EXPORT(int) _nc_retrace_int (int); + extern NCURSES_EXPORT(int) _nc_retrace_int_attr_t (attr_t); + extern NCURSES_EXPORT(mmask_t) _nc_retrace_mmask_t (SCREEN *, mmask_t); +@@ -1816,12 +1877,31 @@ + extern NCURSES_EXPORT(char *) _nc_get_locale(void); + extern NCURSES_EXPORT(int) _nc_unicode_locale(void); + extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(TERMINAL *); +-extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool); +-extern NCURSES_EXPORT(void) _nc_tinfo_cmdch(TERMINAL *, char); ++extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, int); ++extern NCURSES_EXPORT(void) _nc_tinfo_cmdch(TERMINAL *, int); + + /* lib_set_term.c */ + extern NCURSES_EXPORT(int) _nc_ripoffline(int, int(*)(WINDOW*, int)); + ++/* lib_setup.c */ ++#define ret_error(code, fmt, arg) if (errret) {\ ++ *errret = code;\ ++ returnCode(ERR);\ ++ } else {\ ++ fprintf(stderr, fmt, arg);\ ++ exit(EXIT_FAILURE);\ ++ } ++ ++#define ret_error1(code, fmt, arg) ret_error(code, "'%s': " fmt, arg) ++ ++#define ret_error0(code, msg) if (errret) {\ ++ *errret = code;\ ++ returnCode(ERR);\ ++ } else {\ ++ fprintf(stderr, msg);\ ++ exit(EXIT_FAILURE);\ ++ } ++ + /* lib_tstp.c */ + #if USE_SIGWINCH + extern NCURSES_EXPORT(int) _nc_handle_sigwinch(SCREEN *); +@@ -1875,16 +1955,16 @@ + extern NCURSES_EXPORT(int) _nc_baudrate (int); + extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *); + extern NCURSES_EXPORT(int) _nc_getenv_num (const char *); +-extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool); ++extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, int); + extern NCURSES_EXPORT(int) _nc_ospeed (int); + extern NCURSES_EXPORT(int) _nc_outch (int); + extern NCURSES_EXPORT(int) _nc_putp(const char *, const char *); + extern NCURSES_EXPORT(int) _nc_putp_flush(const char *, const char *); + extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const); +-extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int); + extern NCURSES_EXPORT(int) _nc_setup_tinfo(const char *, TERMTYPE *); ++extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, int, int); + extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *)); +-extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, NCURSES_OUTC); ++extern NCURSES_EXPORT(void) _nc_do_color (int, int, int, NCURSES_OUTC); + extern NCURSES_EXPORT(void) _nc_flush (void); + extern NCURSES_EXPORT(void) _nc_free_and_exit (int) GCC_NORETURN; + extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *); +@@ -1895,8 +1975,9 @@ + extern NCURSES_EXPORT(void) _nc_make_oldhash (int i); + extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot); + extern NCURSES_EXPORT(void) _nc_scroll_optimize (void); +-extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool); +-extern NCURSES_EXPORT(void) _nc_signal_handler (bool); ++extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, int); ++extern NCURSES_EXPORT(void) _nc_setenv_num (const char *, int); ++extern NCURSES_EXPORT(void) _nc_signal_handler (int); + extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *); + extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *); + +@@ -1905,7 +1986,9 @@ + extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void); + extern NCURSES_EXPORT(void) _nc_codes_leaks(void); + extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void); ++extern NCURSES_EXPORT(void) _nc_comp_error_leaks(void); + extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void); ++extern NCURSES_EXPORT(void) _nc_db_iterator_leaks(void); + extern NCURSES_EXPORT(void) _nc_keyname_leaks(void); + extern NCURSES_EXPORT(void) _nc_names_leaks(void); + extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void); +@@ -1914,7 +1997,7 @@ + #if !(defined(USE_TERMLIB) || defined(USE_BUILD_CC)) + extern NCURSES_EXPORT(NCURSES_CH_T) _nc_render (WINDOW *, NCURSES_CH_T); + extern NCURSES_EXPORT(int) _nc_waddch_nosync (WINDOW *, const NCURSES_CH_T); +-extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE_T const, NCURSES_SIZE_T const, NCURSES_CH_T); ++extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, int const, int const, NCURSES_CH_T); + #endif + + #if USE_WIDEC_SUPPORT +@@ -1947,7 +2030,7 @@ + */ + #if USE_WIDEC_SUPPORT + #if HAVE_MBTOWC && HAVE_MBLEN +-#define reset_mbytes(state) IGNORE_RC(mblen(NULL, 0)), IGNORE_RC(mbtowc(NULL, NULL, 0)) ++#define reset_mbytes(state) IGNORE_RC(mblen(NULL, (size_t) 0)), IGNORE_RC(mbtowc(NULL, NULL, (size_t) 0)) + #define count_mbytes(buffer,length,state) mblen(buffer,length) + #define check_mbytes(wch,buffer,length,state) \ + (int) mbtowc(&wch, buffer, length) +@@ -2084,39 +2167,39 @@ + + typedef struct term_driver { + bool isTerminfo; +- bool (*CanHandle)(struct DriverTCB*,const char*,int*); ++ bool (*CanHandle)(struct DriverTCB*, const char*, int*); + void (*init)(struct DriverTCB*); + void (*release)(struct DriverTCB*); + int (*size)(struct DriverTCB*, int* Line, int *Cols); +- int (*sgmode)(struct DriverTCB*, bool setFlag, TTY*); ++ int (*sgmode)(struct DriverTCB*, int setFlag, TTY*); + chtype (*conattr)(struct DriverTCB*); + int (*hwcur)(struct DriverTCB*, int yold, int xold, int y, int x); +- int (*mode)(struct DriverTCB*, bool progFlag, bool defFlag); ++ int (*mode)(struct DriverTCB*, int progFlag, int defFlag); + bool (*rescol)(struct DriverTCB*); + bool (*rescolors)(struct DriverTCB*); +- void (*color)(struct DriverTCB*,bool fore, int color, int(*)(SCREEN*,int)); +- int (*doBeepOrFlash)(struct DriverTCB*, bool); +- void (*initpair)(struct DriverTCB*,short,short,short); +- void (*initcolor)(struct DriverTCB*,short,short,short,short); +- void (*docolor)(struct DriverTCB*,short,short,bool,int(*)(SCREEN*,int)); ++ void (*color)(struct DriverTCB*, int fore, int color, int(*)(SCREEN*, int)); ++ int (*doBeepOrFlash)(struct DriverTCB*, int); ++ void (*initpair)(struct DriverTCB*, int, int, int); ++ void (*initcolor)(struct DriverTCB*, int, int, int, int); ++ void (*docolor)(struct DriverTCB*, int, int, int, int(*)(SCREEN*, int)); + void (*initmouse)(struct DriverTCB*); +- int (*testmouse)(struct DriverTCB*,int); ++ int (*testmouse)(struct DriverTCB*, int EVENTLIST_2nd(_nc_eventlist*)); + void (*setfilter)(struct DriverTCB*); +- void (*hwlabel)(struct DriverTCB*,int,char*); +- void (*hwlabelOnOff)(struct DriverTCB*,bool); ++ void (*hwlabel)(struct DriverTCB*, int, char*); ++ void (*hwlabelOnOff)(struct DriverTCB*, int); + int (*update)(struct DriverTCB*); +- int (*defaultcolors)(struct DriverTCB*,int,int); +- int (*print)(struct DriverTCB*,char*,int); +- int (*getsize)(struct DriverTCB*,int*,int*); +- int (*setsize)(struct DriverTCB*,int,int); +- void (*initacs)(struct DriverTCB*,chtype*,chtype*); ++ int (*defaultcolors)(struct DriverTCB*, int, int); ++ int (*print)(struct DriverTCB*, char*, int); ++ int (*getsize)(struct DriverTCB*, int*, int*); ++ int (*setsize)(struct DriverTCB*, int, int); ++ void (*initacs)(struct DriverTCB*, chtype*, chtype*); + void (*scinit)(SCREEN *); + void (*scexit)(SCREEN *); +- int (*twait)(struct DriverTCB*,int,int,int* EVENTLIST_2nd(_nc_eventlist*)); +- int (*read)(struct DriverTCB*,int*); +- int (*nap)(struct DriverTCB*,int); +- int (*kpad)(struct DriverTCB*, bool); +- int (*kyOk)(struct DriverTCB*, int, bool); ++ int (*twait)(struct DriverTCB*, int, int, int* EVENTLIST_2nd(_nc_eventlist*)); ++ int (*read)(struct DriverTCB*, int*); ++ int (*nap)(struct DriverTCB*, int); ++ int (*kpad)(struct DriverTCB*, int); ++ int (*kyOk)(struct DriverTCB*, int, int); + bool (*kyExist)(struct DriverTCB*, int); + } TERM_DRIVER; + +@@ -2174,7 +2257,7 @@ + */ + #ifdef USE_TERM_DRIVER + extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, TERMINAL *, int *, int *); +-extern NCURSES_EXPORT(int) _nc_setupterm_ex(TERMINAL **, NCURSES_CONST char *, int , int *, bool); ++extern NCURSES_EXPORT(int) _nc_setupterm_ex(TERMINAL **, NCURSES_CONST char *, int , int *, int); + #define TINFO_GET_SIZE(sp, tp, lp, cp) \ + _nc_get_screensize(sp, tp, lp, cp) + #define TINFO_SET_CURTERM(sp, tp) \ +@@ -2250,12 +2333,12 @@ + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scr_restore)(SCREEN*, const char*); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_scrolln)(SCREEN*, int, int, int, int); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_set_tty_mode)(SCREEN*, TTY*); +-extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, bool, int); ++extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_setupscreen)(SCREEN**, int, int, FILE *, int, int); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tgetent)(SCREEN*,char*,const char *); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_tigetnum)(SCREEN*,NCURSES_CONST char*); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vid_attr)(SCREEN *, attr_t, short, void *); + extern NCURSES_EXPORT(int) NCURSES_SP_NAME(_nc_vidputs)(SCREEN*,chtype,int(*) (SCREEN*, int)); +-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_color)(SCREEN*, short, short, bool, NCURSES_SP_OUTC); ++extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_color)(SCREEN*, int, int, int, NCURSES_SP_OUTC); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_do_xmc_glitch)(SCREEN*, attr_t); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_flush)(SCREEN*); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN; +@@ -2271,7 +2354,7 @@ + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_screen_wrap)(SCREEN*); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_scroll_oldhash)(SCREEN*, int n, int top, int bot); + extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_scroll_optimize)(SCREEN*); +-extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_set_buffer)(SCREEN*, FILE *, bool); ++extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_set_buffer)(SCREEN*, FILE *, int); + + extern NCURSES_EXPORT(void) _nc_cookie_init(SCREEN *sp); + +diff -Naur ncurses-5.9.orig/ncurses/fifo_defs.h ncurses-5.9/ncurses/fifo_defs.h +--- ncurses-5.9.orig/ncurses/fifo_defs.h 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/fifo_defs.h 2012-08-25 19:58:02.199887706 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2002,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + /* + * Common macros for lib_getch.c, lib_ungetch.c + * +- * $Id: fifo_defs.h,v 1.6 2008/06/28 15:52:32 tom Exp $ ++ * $Id: fifo_defs.h,v 1.7 2012/08/04 15:59:17 tom Exp $ + */ + + #ifndef FIFO_DEFS_H +@@ -45,14 +45,42 @@ + /* peek points to next uninterpreted character */ + #define peek sp->_fifopeek + +-#define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;} +-#define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;} +-#define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;} +-#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);} +-#define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;} ++#define h_inc() { \ ++ (head >= FIFO_SIZE-1) \ ++ ? head = 0 \ ++ : head++; \ ++ if (head == tail) \ ++ head = -1, tail = 0; \ ++ } ++#define h_dec() { \ ++ (head <= 0) \ ++ ? head = FIFO_SIZE-1 \ ++ : head--; \ ++ if (head == tail) \ ++ tail = -1; \ ++ } ++#define t_inc() { \ ++ (tail >= FIFO_SIZE-1) \ ++ ? tail = 0 \ ++ : tail++; \ ++ if (tail == head) \ ++ tail = -1; \ ++ } ++#define t_dec() { \ ++ (tail <= 0) \ ++ ? tail = FIFO_SIZE-1 \ ++ : tail--; \ ++ if (head == tail) \ ++ fifo_clear(sp); \ ++ } ++#define p_inc() { \ ++ (peek >= FIFO_SIZE-1) \ ++ ? peek = 0 \ ++ : peek++; \ ++ } + +-#define cooked_key_in_fifo() ((head != -1) && (peek != head)) +-#define raw_key_in_fifo() ((head != -1) && (peek != tail)) ++#define cooked_key_in_fifo() ((head >= 0) && (peek != head)) ++#define raw_key_in_fifo() ((head >= 0) && (peek != tail)) + + #undef HIDE_EINTR + +diff -Naur ncurses-5.9.orig/ncurses/llib-lncurses ncurses-5.9/ncurses/llib-lncurses +--- ncurses-5.9.orig/ncurses/llib-lncurses 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/llib-lncurses 2012-08-25 19:58:01.939888937 +0000 +@@ -3369,6 +3369,17 @@ + NCURSES_BOOL f) + { /* void */ } + ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ + #undef _nc_get_screensize + void _nc_get_screensize( + SCREEN *sp, +diff -Naur ncurses-5.9.orig/ncurses/llib-lncursest ncurses-5.9/ncurses/llib-lncursest +--- ncurses-5.9.orig/ncurses/llib-lncursest 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/llib-lncursest 2012-08-25 19:58:01.939888937 +0000 +@@ -3449,6 +3449,17 @@ + NCURSES_BOOL f) + { /* void */ } + ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ + #undef _nc_get_screensize + void _nc_get_screensize( + SCREEN *sp, +diff -Naur ncurses-5.9.orig/ncurses/llib-lncursestw ncurses-5.9/ncurses/llib-lncursestw +--- ncurses-5.9.orig/ncurses/llib-lncursestw 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/llib-lncursestw 2012-08-25 19:58:01.996555329 +0000 +@@ -4234,6 +4234,17 @@ + NCURSES_BOOL f) + { /* void */ } + ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioct ++void use_tioct( ++ NCURSES_BOOL f) ++ { /* void */ } ++ + #undef _nc_get_screensize + void _nc_get_screensize( + SCREEN *sp, +diff -Naur ncurses-5.9.orig/ncurses/llib-lncursesw ncurses-5.9/ncurses/llib-lncursesw +--- ncurses-5.9.orig/ncurses/llib-lncursesw 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/llib-lncursesw 2012-08-25 19:58:01.996555329 +0000 +@@ -4154,6 +4154,17 @@ + NCURSES_BOOL f) + { /* void */ } + ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ + #undef _nc_get_screensize + void _nc_get_screensize( + SCREEN *sp, +diff -Naur ncurses-5.9.orig/ncurses/llib-ltic ncurses-5.9/ncurses/llib-ltic +--- ncurses-5.9.orig/ncurses/llib-ltic 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-ltic 2012-08-25 19:58:01.856555996 +0000 +@@ -0,0 +1,212 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/alloc_entry.c */ ++ ++#include <curses.priv.h> ++#include <tic.h> ++ ++#undef _nc_init_entry ++void _nc_init_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_copy_entry ++ENTRY *_nc_copy_entry( ++ ENTRY *oldp) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_save_str ++char *_nc_save_str( ++ const char *const string) ++ { return(*(char **)0); } ++ ++#undef _nc_wrap_entry ++void _nc_wrap_entry( ++ ENTRY *const ep, ++ NCURSES_BOOL copy_strings) ++ { /* void */ } ++ ++#undef _nc_merge_entry ++void _nc_merge_entry( ++ TERMTYPE *const to, ++ TERMTYPE *const from) ++ { /* void */ } ++ ++/* ./tinfo/captoinfo.c */ ++ ++#include <ctype.h> ++ ++#undef _nc_captoinfo ++char *_nc_captoinfo( ++ const char *cap, ++ const char *s, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++#undef _nc_infotocap ++char *_nc_infotocap( ++ const char *cap, ++ const char *str, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_expand.c */ ++ ++#undef _nc_tic_expand ++char *_nc_tic_expand( ++ const char *srcp, ++ NCURSES_BOOL tic_format, ++ int numbers) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_parse.c */ ++ ++#undef _nc_check_termtype2 ++void (*_nc_check_termtype2)( ++ TERMTYPE *p1, ++ NCURSES_BOOL p2); ++#undef _nc_check_termtype ++void (*_nc_check_termtype)( ++ TERMTYPE *p1); ++ ++#undef _nc_entry_match ++NCURSES_BOOL _nc_entry_match( ++ char *n1, ++ char *n2) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_read_entry_source ++void _nc_read_entry_source( ++ FILE *fp, ++ char *buf, ++ int literal, ++ NCURSES_BOOL silent, ++ NCURSES_BOOL (*hook)( ++ ENTRY *p1)) ++ { /* void */ } ++ ++#undef _nc_resolve_uses2 ++int _nc_resolve_uses2( ++ NCURSES_BOOL fullresolve, ++ NCURSES_BOOL literal) ++ { return(*(int *)0); } ++ ++#undef _nc_resolve_uses ++int _nc_resolve_uses( ++ NCURSES_BOOL fullresolve) ++ { return(*(int *)0); } ++ ++/* ./tinfo/comp_scan.c */ ++ ++#undef _nc_syntax ++int _nc_syntax; ++#undef _nc_strict_bsd ++int _nc_strict_bsd; ++#undef _nc_curr_file_pos ++long _nc_curr_file_pos; ++#undef _nc_comment_start ++long _nc_comment_start; ++#undef _nc_comment_end ++long _nc_comment_end; ++#undef _nc_start_line ++long _nc_start_line; ++#undef _nc_curr_token ++struct token _nc_curr_token; ++#undef _nc_disable_period ++NCURSES_BOOL _nc_disable_period; ++ ++#undef _nc_reset_input ++void _nc_reset_input( ++ FILE *fp, ++ char *buf) ++ { /* void */ } ++ ++#undef _nc_get_token ++int _nc_get_token( ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_trans_string ++int _nc_trans_string( ++ char *ptr, ++ char *last) ++ { return(*(int *)0); } ++ ++#undef _nc_push_token ++void _nc_push_token( ++ int tokclass) ++ { /* void */ } ++ ++#undef _nc_panic_mode ++void _nc_panic_mode( ++ char ch) ++ { /* void */ } ++ ++/* ./tinfo/parse_entry.c */ ++ ++#undef _nc_parse_entry ++int _nc_parse_entry( ++ struct entry *entryp, ++ int literal, ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_capcmp ++int _nc_capcmp( ++ const char *s, ++ const char *t) ++ { return(*(int *)0); } ++ ++typedef struct { ++ const char *from; ++ const char *to; ++} assoc; ++ ++/* ./tinfo/write_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_set_writedir ++void _nc_set_writedir( ++ char *dir) ++ { /* void */ } ++ ++#undef _nc_write_entry ++void _nc_write_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_tic_written ++int _nc_tic_written(void) ++ { return(*(int *)0); } +diff -Naur ncurses-5.9.orig/ncurses/llib-ltictw ncurses-5.9/ncurses/llib-ltictw +--- ncurses-5.9.orig/ncurses/llib-ltictw 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-ltictw 2012-08-25 19:58:01.856555996 +0000 +@@ -0,0 +1,212 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/alloc_entry.c */ ++ ++#include <curses.priv.h> ++#include <tic.h> ++ ++#undef _nc_init_entry ++void _nc_init_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_copy_entry ++ENTRY *_nc_copy_entry( ++ ENTRY *oldp) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_save_str ++char *_nc_save_str( ++ const char *const string) ++ { return(*(char **)0); } ++ ++#undef _nc_wrap_entry ++void _nc_wrap_entry( ++ ENTRY *const ep, ++ NCURSES_BOOL copy_strings) ++ { /* void */ } ++ ++#undef _nc_merge_entry ++void _nc_merge_entry( ++ TERMTYPE *const to, ++ TERMTYPE *const from) ++ { /* void */ } ++ ++/* ./tinfo/captoinfo.c */ ++ ++#include <ctype.h> ++ ++#undef _nc_captoinfo ++char *_nc_captoinfo( ++ const char *cap, ++ const char *s, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++#undef _nc_infotocap ++char *_nc_infotocap( ++ const char *cap, ++ const char *str, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_expand.c */ ++ ++#undef _nc_tic_expand ++char *_nc_tic_expand( ++ const char *srcp, ++ NCURSES_BOOL tic_format, ++ int numbers) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_parse.c */ ++ ++#undef _nc_check_termtype2 ++void (*_nc_check_termtype2)( ++ TERMTYPE *p1, ++ NCURSES_BOOL p2); ++#undef _nc_check_termtype ++void (*_nc_check_termtype)( ++ TERMTYPE *p1); ++ ++#undef _nc_entry_match ++NCURSES_BOOL _nc_entry_match( ++ char *n1, ++ char *n2) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_read_entry_source ++void _nc_read_entry_source( ++ FILE *fp, ++ char *buf, ++ int literal, ++ NCURSES_BOOL silent, ++ NCURSES_BOOL (*hook)( ++ ENTRY *p1)) ++ { /* void */ } ++ ++#undef _nc_resolve_uses2 ++int _nc_resolve_uses2( ++ NCURSES_BOOL fullresolve, ++ NCURSES_BOOL literal) ++ { return(*(int *)0); } ++ ++#undef _nc_resolve_uses ++int _nc_resolve_uses( ++ NCURSES_BOOL fullresolve) ++ { return(*(int *)0); } ++ ++/* ./tinfo/comp_scan.c */ ++ ++#undef _nc_syntax ++int _nc_syntax; ++#undef _nc_strict_bsd ++int _nc_strict_bsd; ++#undef _nc_curr_file_pos ++long _nc_curr_file_pos; ++#undef _nc_comment_start ++long _nc_comment_start; ++#undef _nc_comment_end ++long _nc_comment_end; ++#undef _nc_start_line ++long _nc_start_line; ++#undef _nc_curr_token ++struct token _nc_curr_token; ++#undef _nc_disable_period ++NCURSES_BOOL _nc_disable_period; ++ ++#undef _nc_reset_input ++void _nc_reset_input( ++ FILE *fp, ++ char *buf) ++ { /* void */ } ++ ++#undef _nc_get_token ++int _nc_get_token( ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_trans_string ++int _nc_trans_string( ++ char *ptr, ++ char *last) ++ { return(*(int *)0); } ++ ++#undef _nc_push_token ++void _nc_push_token( ++ int tokclass) ++ { /* void */ } ++ ++#undef _nc_panic_mode ++void _nc_panic_mode( ++ char ch) ++ { /* void */ } ++ ++/* ./tinfo/parse_entry.c */ ++ ++#undef _nc_parse_entry ++int _nc_parse_entry( ++ struct entry *entryp, ++ int literal, ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_capcmp ++int _nc_capcmp( ++ const char *s, ++ const char *t) ++ { return(*(int *)0); } ++ ++typedef struct { ++ const char *from; ++ const char *to; ++} assoc; ++ ++/* ./tinfo/write_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_set_writedir ++void _nc_set_writedir( ++ char *dir) ++ { /* void */ } ++ ++#undef _nc_write_entry ++void _nc_write_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_tic_written ++int _nc_tic_written(void) ++ { return(*(int *)0); } +diff -Naur ncurses-5.9.orig/ncurses/llib-lticw ncurses-5.9/ncurses/llib-lticw +--- ncurses-5.9.orig/ncurses/llib-lticw 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-lticw 2012-08-25 19:58:01.856555996 +0000 +@@ -0,0 +1,212 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/alloc_entry.c */ ++ ++#include <curses.priv.h> ++#include <tic.h> ++ ++#undef _nc_init_entry ++void _nc_init_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_copy_entry ++ENTRY *_nc_copy_entry( ++ ENTRY *oldp) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_save_str ++char *_nc_save_str( ++ const char *const string) ++ { return(*(char **)0); } ++ ++#undef _nc_wrap_entry ++void _nc_wrap_entry( ++ ENTRY *const ep, ++ NCURSES_BOOL copy_strings) ++ { /* void */ } ++ ++#undef _nc_merge_entry ++void _nc_merge_entry( ++ TERMTYPE *const to, ++ TERMTYPE *const from) ++ { /* void */ } ++ ++/* ./tinfo/captoinfo.c */ ++ ++#include <ctype.h> ++ ++#undef _nc_captoinfo ++char *_nc_captoinfo( ++ const char *cap, ++ const char *s, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++#undef _nc_infotocap ++char *_nc_infotocap( ++ const char *cap, ++ const char *str, ++ int const parameterized) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_expand.c */ ++ ++#undef _nc_tic_expand ++char *_nc_tic_expand( ++ const char *srcp, ++ NCURSES_BOOL tic_format, ++ int numbers) ++ { return(*(char **)0); } ++ ++/* ./tinfo/comp_parse.c */ ++ ++#undef _nc_check_termtype2 ++void (*_nc_check_termtype2)( ++ TERMTYPE *p1, ++ NCURSES_BOOL p2); ++#undef _nc_check_termtype ++void (*_nc_check_termtype)( ++ TERMTYPE *p1); ++ ++#undef _nc_entry_match ++NCURSES_BOOL _nc_entry_match( ++ char *n1, ++ char *n2) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_read_entry_source ++void _nc_read_entry_source( ++ FILE *fp, ++ char *buf, ++ int literal, ++ NCURSES_BOOL silent, ++ NCURSES_BOOL (*hook)( ++ ENTRY *p1)) ++ { /* void */ } ++ ++#undef _nc_resolve_uses2 ++int _nc_resolve_uses2( ++ NCURSES_BOOL fullresolve, ++ NCURSES_BOOL literal) ++ { return(*(int *)0); } ++ ++#undef _nc_resolve_uses ++int _nc_resolve_uses( ++ NCURSES_BOOL fullresolve) ++ { return(*(int *)0); } ++ ++/* ./tinfo/comp_scan.c */ ++ ++#undef _nc_syntax ++int _nc_syntax; ++#undef _nc_strict_bsd ++int _nc_strict_bsd; ++#undef _nc_curr_file_pos ++long _nc_curr_file_pos; ++#undef _nc_comment_start ++long _nc_comment_start; ++#undef _nc_comment_end ++long _nc_comment_end; ++#undef _nc_start_line ++long _nc_start_line; ++#undef _nc_curr_token ++struct token _nc_curr_token; ++#undef _nc_disable_period ++NCURSES_BOOL _nc_disable_period; ++ ++#undef _nc_reset_input ++void _nc_reset_input( ++ FILE *fp, ++ char *buf) ++ { /* void */ } ++ ++#undef _nc_get_token ++int _nc_get_token( ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_trans_string ++int _nc_trans_string( ++ char *ptr, ++ char *last) ++ { return(*(int *)0); } ++ ++#undef _nc_push_token ++void _nc_push_token( ++ int tokclass) ++ { /* void */ } ++ ++#undef _nc_panic_mode ++void _nc_panic_mode( ++ char ch) ++ { /* void */ } ++ ++/* ./tinfo/parse_entry.c */ ++ ++#undef _nc_parse_entry ++int _nc_parse_entry( ++ struct entry *entryp, ++ int literal, ++ NCURSES_BOOL silent) ++ { return(*(int *)0); } ++ ++#undef _nc_capcmp ++int _nc_capcmp( ++ const char *s, ++ const char *t) ++ { return(*(int *)0); } ++ ++typedef struct { ++ const char *from; ++ const char *to; ++} assoc; ++ ++/* ./tinfo/write_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_set_writedir ++void _nc_set_writedir( ++ char *dir) ++ { /* void */ } ++ ++#undef _nc_write_entry ++void _nc_write_entry( ++ TERMTYPE *const tp) ++ { /* void */ } ++ ++#undef _nc_tic_written ++int _nc_tic_written(void) ++ { return(*(int *)0); } +diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfo ncurses-5.9/ncurses/llib-ltinfo +--- ncurses-5.9.orig/ncurses/llib-ltinfo 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-ltinfo 2012-08-25 19:58:01.999888649 +0000 +@@ -0,0 +1,1504 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/access.c */ ++ ++#include <curses.priv.h> ++#include <ctype.h> ++#include <tic.h> ++ ++#undef _nc_rootname ++char *_nc_rootname( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_is_abs_path ++NCURSES_BOOL _nc_is_abs_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_pathlast ++unsigned _nc_pathlast( ++ const char *path) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_basename ++char *_nc_basename( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_access ++int _nc_access( ++ const char *path, ++ int mode) ++ { return(*(int *)0); } ++ ++#undef _nc_is_dir_path ++NCURSES_BOOL _nc_is_dir_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_is_file_path ++NCURSES_BOOL _nc_is_file_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_env_access ++int _nc_env_access(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/add_tries.c */ ++ ++#undef _nc_add_to_try ++int _nc_add_to_try( ++ TRIES **tree, ++ const char *str, ++ unsigned code) ++ { return(*(int *)0); } ++ ++/* ./tinfo/alloc_ttype.c */ ++ ++#undef _nc_align_termtype ++void _nc_align_termtype( ++ TERMTYPE *to, ++ TERMTYPE *from) ++ { /* void */ } ++ ++#undef _nc_copy_termtype ++void _nc_copy_termtype( ++ TERMTYPE *dst, ++ const TERMTYPE *src) ++ { /* void */ } ++ ++/* ./codes.c */ ++ ++#undef boolcodes ++char *const boolcodes[] = {0}; ++#undef numcodes ++char *const numcodes[] = {0}; ++#undef strcodes ++char *const strcodes[] = {0}; ++ ++/* ./comp_captab.c */ ++ ++#include <hashsize.h> ++ ++#undef _nc_get_table ++const struct name_table_entry *_nc_get_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct name_table_entry **)0); } ++ ++#undef _nc_get_hash_table ++const HashValue *_nc_get_hash_table( ++ NCURSES_BOOL termcap) ++ { return(*(const HashValue **)0); } ++ ++#undef _nc_get_alias_table ++const struct alias *_nc_get_alias_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct alias **)0); } ++ ++#undef _nc_get_hash_info ++const HashData *_nc_get_hash_info( ++ NCURSES_BOOL termcap) ++ { return(*(const HashData **)0); } ++ ++/* ./tinfo/comp_error.c */ ++ ++#undef _nc_suppress_warnings ++NCURSES_BOOL _nc_suppress_warnings; ++#undef _nc_curr_line ++int _nc_curr_line; ++#undef _nc_curr_col ++int _nc_curr_col; ++ ++#undef _nc_get_source ++const char *_nc_get_source(void) ++ { return(*(const char **)0); } ++ ++#undef _nc_set_source ++void _nc_set_source( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_set_type ++void _nc_set_type( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_get_type ++void _nc_get_type( ++ char *name) ++ { /* void */ } ++ ++#undef _nc_warning ++void _nc_warning( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_err_abort ++void _nc_err_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_syserr_abort ++void _nc_syserr_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++/* ./tinfo/comp_hash.c */ ++ ++#undef _nc_find_entry ++struct name_table_entry const *_nc_find_entry( ++ const char *string, ++ const HashValue *hash_table) ++ { return(*(struct name_table_entry const **)0); } ++ ++#undef _nc_find_type_entry ++struct name_table_entry const *_nc_find_type_entry( ++ const char *string, ++ int type, ++ NCURSES_BOOL termcap) ++ { return(*(struct name_table_entry const **)0); } ++ ++/* ./tinfo/db_iterator.c */ ++ ++#include <time.h> ++ ++#undef _nc_tic_dir ++const char *_nc_tic_dir( ++ const char *path) ++ { return(*(const char **)0); } ++ ++#undef _nc_keep_tic_dir ++void _nc_keep_tic_dir( ++ const char *path) ++ { /* void */ } ++ ++#undef _nc_last_db ++void _nc_last_db(void) ++ { /* void */ } ++ ++#undef _nc_next_db ++const char *_nc_next_db( ++ DBDIRS *state, ++ int *offset) ++ { return(*(const char **)0); } ++ ++#undef _nc_first_db ++void _nc_first_db( ++ DBDIRS *state, ++ int *offset) ++ { /* void */ } ++ ++/* ./tinfo/doalloc.c */ ++ ++#undef _nc_doalloc ++void *_nc_doalloc( ++ void *oldp, ++ size_t amount) ++ { return(*(void **)0); } ++ ++/* ./tinfo/entries.c */ ++ ++#undef _nc_head ++ENTRY *_nc_head; ++#undef _nc_tail ++ENTRY *_nc_tail; ++ ++#undef _nc_free_entry ++void _nc_free_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { /* void */ } ++ ++#undef _nc_free_entries ++void _nc_free_entries( ++ ENTRY *headp) ++ { /* void */ } ++ ++#undef _nc_delink_entry ++ENTRY *_nc_delink_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_leaks_tinfo ++void _nc_leaks_tinfo(void) ++ { /* void */ } ++ ++/* ./fallback.c */ ++ ++#undef _nc_fallback ++const TERMTYPE *_nc_fallback( ++ const char *name) ++ { return(*(const TERMTYPE **)0); } ++ ++/* ./tinfo/free_ttype.c */ ++ ++#undef _nc_free_termtype ++void _nc_free_termtype( ++ TERMTYPE *ptr) ++ { /* void */ } ++ ++#undef _nc_user_definable ++NCURSES_BOOL _nc_user_definable; ++ ++#undef use_extended_names ++int use_extended_names( ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/getenv_num.c */ ++ ++#undef _nc_getenv_num ++int _nc_getenv_num( ++ const char *name) ++ { return(*(int *)0); } ++ ++/* ./tinfo/home_terminfo.c */ ++ ++#undef _nc_home_terminfo ++char *_nc_home_terminfo(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/init_keytry.c */ ++ ++#if 0 ++ ++#include <init_keytry.h> ++ ++#undef _nc_tinfo_fkeys ++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; ++ ++#endif ++ ++#undef _nc_init_keytry ++void _nc_init_keytry( ++ SCREEN *sp) ++ { /* void */ } ++ ++/* ./tinfo/lib_acs.c */ ++ ++#undef acs_map ++chtype acs_map[128]; ++ ++#undef _nc_init_acs_sp ++void _nc_init_acs_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_init_acs ++void _nc_init_acs(void) ++ { /* void */ } ++ ++/* ./tinfo/lib_baudrate.c */ ++ ++#include <termcap.h> ++ ++struct speed { ++ int s; ++ int sp; ++}; ++ ++#undef _nc_baudrate ++int _nc_baudrate( ++ int OSpeed) ++ { return(*(int *)0); } ++ ++#undef _nc_ospeed ++int _nc_ospeed( ++ int BaudRate) ++ { return(*(int *)0); } ++ ++#undef baudrate_sp ++int baudrate_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef baudrate ++int baudrate(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_cur_term.c */ ++ ++#undef cur_term ++TERMINAL *cur_term; ++ ++#undef set_curterm_sp ++TERMINAL *set_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef set_curterm ++TERMINAL *set_curterm( ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef del_curterm_sp ++int del_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef del_curterm ++int del_curterm( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_data.c */ ++ ++#undef stdscr ++WINDOW *stdscr; ++#undef curscr ++WINDOW *curscr; ++#undef newscr ++WINDOW *newscr; ++#undef _nc_screen_chain ++SCREEN *_nc_screen_chain; ++#undef SP ++SCREEN *SP; ++#undef _nc_globals ++NCURSES_GLOBALS _nc_globals; ++#undef _nc_prescreen ++NCURSES_PRESCREEN _nc_prescreen; ++ ++#undef _nc_screen_of ++SCREEN *_nc_screen_of( ++ WINDOW *win) ++ { return(*(SCREEN **)0); } ++ ++/* ./tinfo/lib_has_cap.c */ ++ ++#undef has_ic_sp ++NCURSES_BOOL has_ic_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_ic ++NCURSES_BOOL has_ic(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il_sp ++NCURSES_BOOL has_il_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il ++NCURSES_BOOL has_il(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./tinfo/lib_kernel.c */ ++ ++#undef erasechar_sp ++char erasechar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef erasechar ++char erasechar(void) ++ { return(*(char *)0); } ++ ++#undef killchar_sp ++char killchar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef killchar ++char killchar(void) ++ { return(*(char *)0); } ++ ++#undef flushinp_sp ++int flushinp_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef flushinp ++int flushinp(void) ++ { return(*(int *)0); } ++ ++/* ./lib_keyname.c */ ++ ++struct kn { short offset; int code; }; ++ ++#undef keyname_sp ++char *keyname_sp( ++ SCREEN *sp, ++ int c) ++ { return(*(char **)0); } ++ ++#undef keyname ++char *keyname( ++ int c) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_longname.c */ ++ ++#undef longname ++char *longname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_napms.c */ ++ ++#include <sys/time.h> ++ ++#undef napms_sp ++int napms_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef napms ++int napms( ++ int ms) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_options.c */ ++ ++#undef idlok ++int idlok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef idcok ++void idcok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { /* void */ } ++ ++#undef halfdelay_sp ++int halfdelay_sp( ++ SCREEN *sp, ++ int t) ++ { return(*(int *)0); } ++ ++#undef halfdelay ++int halfdelay( ++ int t) ++ { return(*(int *)0); } ++ ++#undef nodelay ++int nodelay( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef notimeout ++int notimeout( ++ WINDOW *win, ++ NCURSES_BOOL f) ++ { return(*(int *)0); } ++ ++#undef wtimeout ++void wtimeout( ++ WINDOW *win, ++ int delay) ++ { /* void */ } ++ ++#undef keypad ++int keypad( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef meta ++int meta( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef curs_set_sp ++int curs_set_sp( ++ SCREEN *sp, ++ int vis) ++ { return(*(int *)0); } ++ ++#undef curs_set ++int curs_set( ++ int vis) ++ { return(*(int *)0); } ++ ++#undef typeahead_sp ++int typeahead_sp( ++ SCREEN *sp, ++ int fd) ++ { return(*(int *)0); } ++ ++#undef typeahead ++int typeahead( ++ int fd) ++ { return(*(int *)0); } ++ ++#undef has_key_sp ++int has_key_sp( ++ SCREEN *sp, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef has_key ++int has_key( ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_flush_sp ++int _nc_putp_flush_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *value) ++ { return(*(int *)0); } ++ ++#undef _nc_keypad ++int _nc_keypad( ++ SCREEN *sp, ++ int flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_raw.c */ ++ ++#undef raw_sp ++int raw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef raw ++int raw(void) ++ { return(*(int *)0); } ++ ++#undef cbreak_sp ++int cbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef cbreak ++int cbreak(void) ++ { return(*(int *)0); } ++ ++#undef qiflush_sp ++void qiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef qiflush ++void qiflush(void) ++ { /* void */ } ++ ++#undef noraw_sp ++int noraw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef noraw ++int noraw(void) ++ { return(*(int *)0); } ++ ++#undef nocbreak_sp ++int nocbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef nocbreak ++int nocbreak(void) ++ { return(*(int *)0); } ++ ++#undef noqiflush_sp ++void noqiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef noqiflush ++void noqiflush(void) ++ { /* void */ } ++ ++#undef intrflush_sp ++int intrflush_sp( ++ SCREEN *sp, ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef intrflush ++int intrflush( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_setup.c */ ++ ++#include <locale.h> ++#include <sys/ioctl.h> ++#include <langinfo.h> ++ ++#undef ttytype ++char ttytype[256]; ++#undef LINES ++int LINES; ++#undef COLS ++int COLS; ++#undef TABSIZE ++int TABSIZE; ++ ++#undef set_tabsize_sp ++int set_tabsize_sp( ++ SCREEN *sp, ++ int value) ++ { return(*(int *)0); } ++ ++#undef set_tabsize ++int set_tabsize( ++ int value) ++ { return(*(int *)0); } ++ ++#undef _nc_handle_sigwinch ++int _nc_handle_sigwinch( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef use_env_sp ++void use_env_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_env ++void use_env( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef _nc_get_screensize ++void _nc_get_screensize( ++ SCREEN *sp, ++ int *linep, ++ int *colp) ++ { /* void */ } ++ ++#undef _nc_update_screensize ++void _nc_update_screensize( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_setup_tinfo ++int _nc_setup_tinfo( ++ const char *const tn, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++#undef _nc_tinfo_cmdch ++void _nc_tinfo_cmdch( ++ TERMINAL *termp, ++ int proto) ++ { /* void */ } ++ ++#undef _nc_get_locale ++char *_nc_get_locale(void) ++ { return(*(char **)0); } ++ ++#undef _nc_unicode_locale ++int _nc_unicode_locale(void) ++ { return(*(int *)0); } ++ ++#undef _nc_locale_breaks_acs ++int _nc_locale_breaks_acs( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef _nc_setupterm ++int _nc_setupterm( ++ char *tname, ++ int Filedes, ++ int *errret, ++ int reuse) ++ { return(*(int *)0); } ++ ++#undef new_prescr ++SCREEN *new_prescr(void) ++ { return(*(SCREEN **)0); } ++ ++#undef setupterm ++int setupterm( ++ char *tname, ++ int Filedes, ++ int *errret) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_termcap.c */ ++ ++#undef UP ++char *UP; ++#undef BC ++char *BC; ++ ++#undef tgetent_sp ++int tgetent_sp( ++ SCREEN *sp, ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#if 0 ++ ++#include <capdefaults.c> ++ ++#endif ++ ++#undef tgetent ++int tgetent( ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#undef tgetflag_sp ++int tgetflag_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetflag ++int tgetflag( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum_sp ++int tgetnum_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum ++int tgetnum( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetstr_sp ++char *tgetstr_sp( ++ SCREEN *sp, ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++#undef tgetstr ++char *tgetstr( ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_termname.c */ ++ ++#undef termname_sp ++char *termname_sp( ++ SCREEN *sp) ++ { return(*(char **)0); } ++ ++#undef termname ++char *termname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tgoto.c */ ++ ++#undef tgoto ++char *tgoto( ++ const char *string, ++ int x, ++ int y) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ti.c */ ++ ++#undef tigetflag_sp ++int tigetflag_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetflag ++int tigetflag( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum_sp ++int tigetnum_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum ++int tigetnum( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetstr_sp ++char *tigetstr_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(char **)0); } ++ ++#undef tigetstr ++char *tigetstr( ++ char *str) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tparm.c */ ++ ++#undef _nc_tparm_err ++int _nc_tparm_err; ++ ++#undef _nc_tparm_analyze ++int _nc_tparm_analyze( ++ const char *string, ++ char *p_is_s[9], ++ int *popcount) ++ { return(*(int *)0); } ++ ++#undef tparm ++char *tparm( ++ char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiparm ++char *tiparm( ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tputs.c */ ++ ++#undef PC ++char PC; ++#undef ospeed ++short ospeed; ++#undef _nc_nulls_sent ++int _nc_nulls_sent; ++ ++#undef _nc_set_no_padding ++void _nc_set_no_padding( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef delay_output_sp ++int delay_output_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef delay_output ++int delay_output( ++ int ms) ++ { return(*(int *)0); } ++ ++#undef _nc_flush_sp ++void _nc_flush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_flush ++void _nc_flush(void) ++ { /* void */ } ++ ++#undef _nc_outch_sp ++int _nc_outch_sp( ++ SCREEN *sp, ++ int ch) ++ { return(*(int *)0); } ++ ++#undef _nc_outch ++int _nc_outch( ++ int ch) ++ { return(*(int *)0); } ++ ++#undef putp_sp ++int putp_sp( ++ SCREEN *sp, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_sp ++int _nc_putp_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef putp ++int putp( ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp ++int _nc_putp( ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef tputs_sp ++int tputs_sp( ++ SCREEN *sp, ++ const char *string, ++ int affcnt, ++ NCURSES_OUTC_sp outc) ++ { return(*(int *)0); } ++ ++#undef _nc_outc_wrapper ++int _nc_outc_wrapper( ++ SCREEN *sp, ++ int c) ++ { return(*(int *)0); } ++ ++#undef tputs ++int tputs( ++ const char *string, ++ int affcnt, ++ int (*outc)( ++ int p1)) ++ { return(*(int *)0); } ++ ++/* ./trace/lib_trace.c */ ++ ++#undef _nc_tracing ++unsigned _nc_tracing; ++#undef _nc_tputs_trace ++const char *_nc_tputs_trace = {0}; ++#undef _nc_outchars ++long _nc_outchars; ++ ++#undef trace ++void trace( ++ const unsigned int tracelevel) ++ { /* void */ } ++ ++#undef _tracef ++void _tracef( ++ const char *fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_retrace_bool ++NCURSES_BOOL _nc_retrace_bool( ++ int code) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_retrace_char ++char _nc_retrace_char( ++ int code) ++ { return(*(char *)0); } ++ ++#undef _nc_retrace_int ++int _nc_retrace_int( ++ int code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_unsigned ++unsigned _nc_retrace_unsigned( ++ unsigned code) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_retrace_ptr ++char *_nc_retrace_ptr( ++ char *code) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_cptr ++const char *_nc_retrace_cptr( ++ const char *code) ++ { return(*(const char **)0); } ++ ++#undef _nc_retrace_cvoid_ptr ++void *_nc_retrace_cvoid_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_void_ptr ++void *_nc_retrace_void_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_sp ++SCREEN *_nc_retrace_sp( ++ SCREEN *code) ++ { return(*(SCREEN **)0); } ++ ++#undef _nc_retrace_win ++WINDOW *_nc_retrace_win( ++ WINDOW *code) ++ { return(*(WINDOW **)0); } ++ ++/* ./trace/lib_traceatr.c */ ++ ++#undef _traceattr2 ++char *_traceattr2( ++ int bufnum, ++ chtype newmode) ++ { return(*(char **)0); } ++ ++#undef _traceattr ++char *_traceattr( ++ attr_t newmode) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_int_attr_t ++int _nc_retrace_int_attr_t( ++ attr_t code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_attr_t ++attr_t _nc_retrace_attr_t( ++ attr_t code) ++ { return(*(attr_t *)0); } ++ ++#undef _nc_altcharset_name ++const char *_nc_altcharset_name( ++ attr_t attr, ++ chtype ch) ++ { return(*(const char **)0); } ++ ++#undef _tracechtype2 ++char *_tracechtype2( ++ int bufnum, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _tracechtype ++char *_tracechtype( ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_chtype ++chtype _nc_retrace_chtype( ++ chtype code) ++ { return(*(chtype *)0); } ++ ++/* ./trace/lib_tracebits.c */ ++ ++typedef struct { ++ unsigned int val; ++ const char *name; ++} BITNAMES; ++ ++#undef _nc_trace_ttymode ++char *_nc_trace_ttymode( ++ struct termios *tty) ++ { return(*(char **)0); } ++ ++#undef _nc_tracebits ++char *_nc_tracebits(void) ++ { return(*(char **)0); } ++ ++/* ./trace/lib_tracechr.c */ ++ ++#undef _nc_tracechar ++char *_nc_tracechar( ++ SCREEN *sp, ++ int ch) ++ { return(*(char **)0); } ++ ++#undef _tracechar ++char *_tracechar( ++ int ch) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ttyflags.c */ ++ ++#undef _nc_get_tty_mode_sp ++int _nc_get_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_get_tty_mode ++int _nc_get_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode_sp ++int _nc_set_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode ++int _nc_set_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode_sp ++int def_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode ++int def_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode_sp ++int def_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode ++int def_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode_sp ++int reset_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode ++int reset_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode_sp ++int reset_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode ++int reset_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef savetty_sp ++int savetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef savetty ++int savetty(void) ++ { return(*(int *)0); } ++ ++#undef resetty_sp ++int resetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef resetty ++int resetty(void) ++ { return(*(int *)0); } ++ ++/* ./tty/lib_twait.c */ ++ ++#undef _nc_timed_wait ++int _nc_timed_wait( ++ SCREEN *sp, ++ int mode, ++ int milliseconds, ++ int *timeleft) ++ { return(*(int *)0); } ++ ++/* ./tinfo/name_match.c */ ++ ++#undef _nc_first_name ++char *_nc_first_name( ++ const char *const sp) ++ { return(*(char **)0); } ++ ++#undef _nc_name_match ++int _nc_name_match( ++ const char *const namelst, ++ const char *const name, ++ const char *const delim) ++ { return(*(int *)0); } ++ ++/* ./names.c */ ++ ++#undef boolnames ++char *const boolnames[] = {0}; ++#undef boolfnames ++char *const boolfnames[] = {0}; ++#undef numnames ++char *const numnames[] = {0}; ++#undef numfnames ++char *const numfnames[] = {0}; ++#undef strnames ++char *const strnames[] = {0}; ++#undef strfnames ++char *const strfnames[] = {0}; ++ ++/* ./tinfo/read_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_read_termtype ++int _nc_read_termtype( ++ TERMTYPE *ptr, ++ char *buffer, ++ int limit) ++ { return(*(int *)0); } ++ ++#undef _nc_read_file_entry ++int _nc_read_file_entry( ++ const char *const filename, ++ TERMTYPE *ptr) ++ { return(*(int *)0); } ++ ++#undef _nc_read_entry ++int _nc_read_entry( ++ const char *const name, ++ char *const filename, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/read_termcap.c */ ++ ++#include <sys/types.h> ++ ++#undef _nc_read_termcap ++void _nc_read_termcap(void) ++ { /* void */ } ++ ++/* ./tinfo/setbuf.c */ ++ ++#undef _nc_set_buffer_sp ++void _nc_set_buffer_sp( ++ SCREEN *sp, ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++#undef _nc_set_buffer ++void _nc_set_buffer( ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++/* ./tinfo/strings.c */ ++ ++#undef _nc_str_init ++string_desc *_nc_str_init( ++ string_desc *dst, ++ char *src, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_null ++string_desc *_nc_str_null( ++ string_desc *dst, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_copy ++string_desc *_nc_str_copy( ++ string_desc *dst, ++ string_desc *src) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_safe_strcat ++NCURSES_BOOL _nc_safe_strcat( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_safe_strcpy ++NCURSES_BOOL _nc_safe_strcpy( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./trace/trace_buf.c */ ++ ++#undef _nc_trace_buf ++char *_nc_trace_buf( ++ int bufnum, ++ size_t want) ++ { return(*(char **)0); } ++ ++#undef _nc_trace_bufcat ++char *_nc_trace_bufcat( ++ int bufnum, ++ const char *value) ++ { return(*(char **)0); } ++ ++/* ./trace/trace_tries.c */ ++ ++#undef _nc_trace_tries ++void _nc_trace_tries( ++ TRIES *tree) ++ { /* void */ } ++ ++/* ./base/tries.c */ ++ ++#undef _nc_expand_try ++char *_nc_expand_try( ++ TRIES *tree, ++ unsigned code, ++ int *count, ++ size_t len) ++ { return(*(char **)0); } ++ ++#undef _nc_remove_key ++int _nc_remove_key( ++ TRIES **tree, ++ unsigned code) ++ { return(*(int *)0); } ++ ++#undef _nc_remove_string ++int _nc_remove_string( ++ TRIES **tree, ++ const char *string) ++ { return(*(int *)0); } ++ ++/* ./tinfo/trim_sgr0.c */ ++ ++#undef _nc_trim_sgr0 ++char *_nc_trim_sgr0( ++ TERMTYPE *tp) ++ { return(*(char **)0); } ++ ++/* ./unctrl.c */ ++ ++#undef unctrl_sp ++char *unctrl_sp( ++ SCREEN *sp, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef unctrl ++char *unctrl( ++ chtype ch) ++ { return(*(char **)0); } ++ ++/* ./trace/visbuf.c */ ++ ++#undef _nc_visbuf2 ++const char *_nc_visbuf2( ++ int bufnum, ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbuf ++const char *_nc_visbuf( ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbufn ++const char *_nc_visbufn( ++ const char *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf2 ++const char *_nc_viscbuf2( ++ int bufnum, ++ const chtype *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf ++const char *_nc_viscbuf( ++ const chtype *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++/* ./base/define_key.c */ ++ ++#undef define_key_sp ++int define_key_sp( ++ SCREEN *sp, ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef define_key ++int define_key( ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++/* ./tinfo/hashed_db.c */ ++ ++#undef _nc_hashed_db ++void _nc_hashed_db(void) ++ { /* void */ } ++ ++/* ./base/key_defined.c */ ++ ++#undef key_defined_sp ++int key_defined_sp( ++ SCREEN *sp, ++ const char *str) ++ { return(*(int *)0); } ++ ++#undef key_defined ++int key_defined( ++ const char *str) ++ { return(*(int *)0); } ++ ++/* ./base/keybound.c */ ++ ++#undef keybound_sp ++char *keybound_sp( ++ SCREEN *sp, ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++#undef keybound ++char *keybound( ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++/* ./base/keyok.c */ ++ ++#undef keyok_sp ++int keyok_sp( ++ SCREEN *sp, ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef keyok ++int keyok( ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./base/version.c */ ++ ++#undef curses_version ++const char *curses_version(void) ++ { return(*(const char **)0); } +diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfotw ncurses-5.9/ncurses/llib-ltinfotw +--- ncurses-5.9.orig/ncurses/llib-ltinfotw 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-ltinfotw 2012-08-25 19:58:01.999888649 +0000 +@@ -0,0 +1,1646 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/access.c */ ++ ++#include <curses.priv.h> ++#include <ctype.h> ++#include <tic.h> ++ ++#undef _nc_rootname ++char *_nc_rootname( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_is_abs_path ++NCURSES_BOOL _nc_is_abs_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_pathlast ++unsigned _nc_pathlast( ++ const char *path) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_basename ++char *_nc_basename( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_access ++int _nc_access( ++ const char *path, ++ int mode) ++ { return(*(int *)0); } ++ ++#undef _nc_is_dir_path ++NCURSES_BOOL _nc_is_dir_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_is_file_path ++NCURSES_BOOL _nc_is_file_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_env_access ++int _nc_env_access(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/add_tries.c */ ++ ++#undef _nc_add_to_try ++int _nc_add_to_try( ++ TRIES **tree, ++ const char *str, ++ unsigned code) ++ { return(*(int *)0); } ++ ++/* ./tinfo/alloc_ttype.c */ ++ ++#undef _nc_align_termtype ++void _nc_align_termtype( ++ TERMTYPE *to, ++ TERMTYPE *from) ++ { /* void */ } ++ ++#undef _nc_copy_termtype ++void _nc_copy_termtype( ++ TERMTYPE *dst, ++ const TERMTYPE *src) ++ { /* void */ } ++ ++/* ./codes.c */ ++ ++#undef _nc_boolcodes ++char *const *_nc_boolcodes(void) ++ { return(*(char **)0); } ++ ++#undef _nc_numcodes ++char *const *_nc_numcodes(void) ++ { return(*(char **)0); } ++ ++#undef _nc_strcodes ++char *const *_nc_strcodes(void) ++ { return(*(char **)0); } ++ ++/* ./comp_captab.c */ ++ ++#include <hashsize.h> ++ ++#undef _nc_get_table ++const struct name_table_entry *_nc_get_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct name_table_entry **)0); } ++ ++#undef _nc_get_hash_table ++const HashValue *_nc_get_hash_table( ++ NCURSES_BOOL termcap) ++ { return(*(const HashValue **)0); } ++ ++#undef _nc_get_alias_table ++const struct alias *_nc_get_alias_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct alias **)0); } ++ ++#undef _nc_get_hash_info ++const HashData *_nc_get_hash_info( ++ NCURSES_BOOL termcap) ++ { return(*(const HashData **)0); } ++ ++/* ./tinfo/comp_error.c */ ++ ++#undef _nc_suppress_warnings ++NCURSES_BOOL _nc_suppress_warnings; ++#undef _nc_curr_line ++int _nc_curr_line; ++#undef _nc_curr_col ++int _nc_curr_col; ++ ++#undef _nc_get_source ++const char *_nc_get_source(void) ++ { return(*(const char **)0); } ++ ++#undef _nc_set_source ++void _nc_set_source( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_set_type ++void _nc_set_type( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_get_type ++void _nc_get_type( ++ char *name) ++ { /* void */ } ++ ++#undef _nc_warning ++void _nc_warning( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_err_abort ++void _nc_err_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_syserr_abort ++void _nc_syserr_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++/* ./tinfo/comp_hash.c */ ++ ++#undef _nc_find_entry ++struct name_table_entry const *_nc_find_entry( ++ const char *string, ++ const HashValue *hash_table) ++ { return(*(struct name_table_entry const **)0); } ++ ++#undef _nc_find_type_entry ++struct name_table_entry const *_nc_find_type_entry( ++ const char *string, ++ int type, ++ NCURSES_BOOL termcap) ++ { return(*(struct name_table_entry const **)0); } ++ ++/* ./tinfo/db_iterator.c */ ++ ++#include <time.h> ++ ++#undef _nc_tic_dir ++const char *_nc_tic_dir( ++ const char *path) ++ { return(*(const char **)0); } ++ ++#undef _nc_keep_tic_dir ++void _nc_keep_tic_dir( ++ const char *path) ++ { /* void */ } ++ ++#undef _nc_last_db ++void _nc_last_db(void) ++ { /* void */ } ++ ++#undef _nc_next_db ++const char *_nc_next_db( ++ DBDIRS *state, ++ int *offset) ++ { return(*(const char **)0); } ++ ++#undef _nc_first_db ++void _nc_first_db( ++ DBDIRS *state, ++ int *offset) ++ { /* void */ } ++ ++/* ./tinfo/doalloc.c */ ++ ++#undef _nc_doalloc ++void *_nc_doalloc( ++ void *oldp, ++ size_t amount) ++ { return(*(void **)0); } ++ ++/* ./tinfo/entries.c */ ++ ++#undef _nc_head ++ENTRY *_nc_head; ++#undef _nc_tail ++ENTRY *_nc_tail; ++ ++#undef _nc_free_entry ++void _nc_free_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { /* void */ } ++ ++#undef _nc_free_entries ++void _nc_free_entries( ++ ENTRY *headp) ++ { /* void */ } ++ ++#undef _nc_delink_entry ++ENTRY *_nc_delink_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_leaks_tinfo ++void _nc_leaks_tinfo(void) ++ { /* void */ } ++ ++/* ./fallback.c */ ++ ++#undef _nc_fallback ++const TERMTYPE *_nc_fallback( ++ const char *name) ++ { return(*(const TERMTYPE **)0); } ++ ++/* ./tinfo/free_ttype.c */ ++ ++#undef _nc_free_termtype ++void _nc_free_termtype( ++ TERMTYPE *ptr) ++ { /* void */ } ++ ++#undef _nc_user_definable ++NCURSES_BOOL _nc_user_definable; ++ ++#undef use_extended_names ++int use_extended_names( ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/getenv_num.c */ ++ ++#undef _nc_getenv_num ++int _nc_getenv_num( ++ const char *name) ++ { return(*(int *)0); } ++ ++/* ./tinfo/home_terminfo.c */ ++ ++#undef _nc_home_terminfo ++char *_nc_home_terminfo(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/init_keytry.c */ ++ ++#if 0 ++ ++#include <init_keytry.h> ++ ++#undef _nc_tinfo_fkeys ++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; ++ ++#endif ++ ++#undef _nc_init_keytry ++void _nc_init_keytry( ++ SCREEN *sp) ++ { /* void */ } ++ ++/* ./tinfo/lib_acs.c */ ++ ++#undef _nc_acs_map ++chtype *_nc_acs_map(void) ++ { return(*(chtype **)0); } ++ ++#undef _nc_init_acs_sp ++void _nc_init_acs_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_init_acs ++void _nc_init_acs(void) ++ { /* void */ } ++ ++/* ./tinfo/lib_baudrate.c */ ++ ++#include <termcap.h> ++ ++struct speed { ++ int s; ++ int sp; ++}; ++ ++#undef _nc_baudrate ++int _nc_baudrate( ++ int OSpeed) ++ { return(*(int *)0); } ++ ++#undef _nc_ospeed ++int _nc_ospeed( ++ int BaudRate) ++ { return(*(int *)0); } ++ ++#undef baudrate_sp ++int baudrate_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef baudrate ++int baudrate(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_cur_term.c */ ++ ++#undef _nc_get_cur_term_sp ++TERMINAL *_nc_get_cur_term_sp( ++ SCREEN *sp) ++ { return(*(TERMINAL **)0); } ++ ++#undef _nc_get_cur_term ++TERMINAL *_nc_get_cur_term(void) ++ { return(*(TERMINAL **)0); } ++ ++#undef _nc_cur_term ++TERMINAL *_nc_cur_term(void) ++ { return(*(TERMINAL **)0); } ++ ++#undef set_curterm_sp ++TERMINAL *set_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef set_curterm ++TERMINAL *set_curterm( ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef del_curterm_sp ++int del_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef del_curterm ++int del_curterm( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_data.c */ ++ ++#undef _nc_stdscr ++WINDOW *_nc_stdscr(void) ++ { return(*(WINDOW **)0); } ++ ++#undef _nc_curscr ++WINDOW *_nc_curscr(void) ++ { return(*(WINDOW **)0); } ++ ++#undef _nc_newscr ++WINDOW *_nc_newscr(void) ++ { return(*(WINDOW **)0); } ++ ++#undef _nc_screen_chain ++SCREEN *_nc_screen_chain; ++#undef SP ++SCREEN *SP; ++#undef _nc_globals ++NCURSES_GLOBALS _nc_globals; ++#undef _nc_prescreen ++NCURSES_PRESCREEN _nc_prescreen; ++ ++#undef _nc_screen_of ++SCREEN *_nc_screen_of( ++ WINDOW *win) ++ { return(*(SCREEN **)0); } ++ ++#undef _nc_init_pthreads ++void _nc_init_pthreads(void) ++ { /* void */ } ++ ++#undef _nc_mutex_init ++void _nc_mutex_init( ++ pthread_mutex_t *obj) ++ { /* void */ } ++ ++#undef _nc_mutex_lock ++int _nc_mutex_lock( ++ pthread_mutex_t *obj) ++ { return(*(int *)0); } ++ ++#undef _nc_mutex_trylock ++int _nc_mutex_trylock( ++ pthread_mutex_t *obj) ++ { return(*(int *)0); } ++ ++#undef _nc_mutex_unlock ++int _nc_mutex_unlock( ++ pthread_mutex_t *obj) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_has_cap.c */ ++ ++#undef has_ic_sp ++NCURSES_BOOL has_ic_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_ic ++NCURSES_BOOL has_ic(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il_sp ++NCURSES_BOOL has_il_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il ++NCURSES_BOOL has_il(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./tinfo/lib_kernel.c */ ++ ++#undef erasechar_sp ++char erasechar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef erasechar ++char erasechar(void) ++ { return(*(char *)0); } ++ ++#undef killchar_sp ++char killchar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef killchar ++char killchar(void) ++ { return(*(char *)0); } ++ ++#undef flushinp_sp ++int flushinp_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef flushinp ++int flushinp(void) ++ { return(*(int *)0); } ++ ++/* ./lib_keyname.c */ ++ ++struct kn { short offset; int code; }; ++ ++#undef keyname_sp ++char *keyname_sp( ++ SCREEN *sp, ++ int c) ++ { return(*(char **)0); } ++ ++#undef keyname ++char *keyname( ++ int c) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_longname.c */ ++ ++#undef longname_sp ++char *longname_sp( ++ SCREEN *sp) ++ { return(*(char **)0); } ++ ++#undef longname ++char *longname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_napms.c */ ++ ++#undef napms_sp ++int napms_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef napms ++int napms( ++ int ms) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_options.c */ ++ ++#undef idlok ++int idlok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef idcok ++void idcok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { /* void */ } ++ ++#undef halfdelay_sp ++int halfdelay_sp( ++ SCREEN *sp, ++ int t) ++ { return(*(int *)0); } ++ ++#undef halfdelay ++int halfdelay( ++ int t) ++ { return(*(int *)0); } ++ ++#undef nodelay ++int nodelay( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef notimeout ++int notimeout( ++ WINDOW *win, ++ NCURSES_BOOL f) ++ { return(*(int *)0); } ++ ++#undef wtimeout ++void wtimeout( ++ WINDOW *win, ++ int delay) ++ { /* void */ } ++ ++#undef keypad ++int keypad( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef meta ++int meta( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef curs_set_sp ++int curs_set_sp( ++ SCREEN *sp, ++ int vis) ++ { return(*(int *)0); } ++ ++#undef curs_set ++int curs_set( ++ int vis) ++ { return(*(int *)0); } ++ ++#undef typeahead_sp ++int typeahead_sp( ++ SCREEN *sp, ++ int fd) ++ { return(*(int *)0); } ++ ++#undef typeahead ++int typeahead( ++ int fd) ++ { return(*(int *)0); } ++ ++#undef has_key_sp ++int has_key_sp( ++ SCREEN *sp, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef has_key ++int has_key( ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_flush_sp ++int _nc_putp_flush_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *value) ++ { return(*(int *)0); } ++ ++#undef _nc_keypad ++int _nc_keypad( ++ SCREEN *sp, ++ int flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_raw.c */ ++ ++#undef raw_sp ++int raw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef raw ++int raw(void) ++ { return(*(int *)0); } ++ ++#undef cbreak_sp ++int cbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef cbreak ++int cbreak(void) ++ { return(*(int *)0); } ++ ++#undef qiflush_sp ++void qiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef qiflush ++void qiflush(void) ++ { /* void */ } ++ ++#undef noraw_sp ++int noraw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef noraw ++int noraw(void) ++ { return(*(int *)0); } ++ ++#undef nocbreak_sp ++int nocbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef nocbreak ++int nocbreak(void) ++ { return(*(int *)0); } ++ ++#undef noqiflush_sp ++void noqiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef noqiflush ++void noqiflush(void) ++ { /* void */ } ++ ++#undef intrflush_sp ++int intrflush_sp( ++ SCREEN *sp, ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef intrflush ++int intrflush( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_setup.c */ ++ ++#include <locale.h> ++#include <sys/ioctl.h> ++#include <langinfo.h> ++ ++#undef _nc_ttytype ++char *_nc_ttytype(void) ++ { return(*(char **)0); } ++ ++#undef _nc_ptr_Lines ++int *_nc_ptr_Lines( ++ SCREEN *sp) ++ { return(*(int **)0); } ++ ++#undef _nc_LINES ++int _nc_LINES(void) ++ { return(*(int *)0); } ++ ++#undef _nc_ptr_Cols ++int *_nc_ptr_Cols( ++ SCREEN *sp) ++ { return(*(int **)0); } ++ ++#undef _nc_COLS ++int _nc_COLS(void) ++ { return(*(int *)0); } ++ ++#undef _nc_ptr_Tabsize ++int *_nc_ptr_Tabsize( ++ SCREEN *sp) ++ { return(*(int **)0); } ++ ++#undef _nc_TABSIZE ++int _nc_TABSIZE(void) ++ { return(*(int *)0); } ++ ++#undef set_tabsize_sp ++int set_tabsize_sp( ++ SCREEN *sp, ++ int value) ++ { return(*(int *)0); } ++ ++#undef set_tabsize ++int set_tabsize( ++ int value) ++ { return(*(int *)0); } ++ ++#undef _nc_handle_sigwinch ++int _nc_handle_sigwinch( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef use_env_sp ++void use_env_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_env ++void use_env( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef _nc_get_screensize ++void _nc_get_screensize( ++ SCREEN *sp, ++ int *linep, ++ int *colp) ++ { /* void */ } ++ ++#undef _nc_update_screensize ++void _nc_update_screensize( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_setup_tinfo ++int _nc_setup_tinfo( ++ const char *const tn, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++#undef _nc_tinfo_cmdch ++void _nc_tinfo_cmdch( ++ TERMINAL *termp, ++ int proto) ++ { /* void */ } ++ ++#undef _nc_get_locale ++char *_nc_get_locale(void) ++ { return(*(char **)0); } ++ ++#undef _nc_unicode_locale ++int _nc_unicode_locale(void) ++ { return(*(int *)0); } ++ ++#undef _nc_locale_breaks_acs ++int _nc_locale_breaks_acs( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef _nc_setupterm ++int _nc_setupterm( ++ char *tname, ++ int Filedes, ++ int *errret, ++ int reuse) ++ { return(*(int *)0); } ++ ++#undef new_prescr ++SCREEN *new_prescr(void) ++ { return(*(SCREEN **)0); } ++ ++#undef setupterm ++int setupterm( ++ char *tname, ++ int Filedes, ++ int *errret) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_termcap.c */ ++ ++#undef UP ++char *UP; ++#undef BC ++char *BC; ++ ++#undef tgetent_sp ++int tgetent_sp( ++ SCREEN *sp, ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#if 0 ++ ++#include <capdefaults.c> ++ ++#endif ++ ++#undef tgetent ++int tgetent( ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#undef tgetflag_sp ++int tgetflag_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetflag ++int tgetflag( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum_sp ++int tgetnum_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum ++int tgetnum( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetstr_sp ++char *tgetstr_sp( ++ SCREEN *sp, ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++#undef tgetstr ++char *tgetstr( ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_termname.c */ ++ ++#undef termname_sp ++char *termname_sp( ++ SCREEN *sp) ++ { return(*(char **)0); } ++ ++#undef termname ++char *termname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tgoto.c */ ++ ++#undef tgoto ++char *tgoto( ++ const char *string, ++ int x, ++ int y) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ti.c */ ++ ++#undef tigetflag_sp ++int tigetflag_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetflag ++int tigetflag( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum_sp ++int tigetnum_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum ++int tigetnum( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetstr_sp ++char *tigetstr_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(char **)0); } ++ ++#undef tigetstr ++char *tigetstr( ++ char *str) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tparm.c */ ++ ++#undef _nc_tparm_err ++int _nc_tparm_err; ++ ++#undef _nc_tparm_analyze ++int _nc_tparm_analyze( ++ const char *string, ++ char *p_is_s[9], ++ int *popcount) ++ { return(*(int *)0); } ++ ++#undef tparm ++char *tparm( ++ char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiparm ++char *tiparm( ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tputs.c */ ++ ++#undef PC ++char PC; ++#undef ospeed ++short ospeed; ++#undef _nc_nulls_sent ++int _nc_nulls_sent; ++ ++#undef _nc_set_no_padding ++void _nc_set_no_padding( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef delay_output_sp ++int delay_output_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef delay_output ++int delay_output( ++ int ms) ++ { return(*(int *)0); } ++ ++#undef _nc_flush_sp ++void _nc_flush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_flush ++void _nc_flush(void) ++ { /* void */ } ++ ++#undef _nc_outch_sp ++int _nc_outch_sp( ++ SCREEN *sp, ++ int ch) ++ { return(*(int *)0); } ++ ++#undef _nc_outch ++int _nc_outch( ++ int ch) ++ { return(*(int *)0); } ++ ++#undef putp_sp ++int putp_sp( ++ SCREEN *sp, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_sp ++int _nc_putp_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef putp ++int putp( ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp ++int _nc_putp( ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef tputs_sp ++int tputs_sp( ++ SCREEN *sp, ++ const char *string, ++ int affcnt, ++ NCURSES_OUTC_sp outc) ++ { return(*(int *)0); } ++ ++#undef _nc_outc_wrapper ++int _nc_outc_wrapper( ++ SCREEN *sp, ++ int c) ++ { return(*(int *)0); } ++ ++#undef tputs ++int tputs( ++ const char *string, ++ int affcnt, ++ int (*outc)( ++ int p1)) ++ { return(*(int *)0); } ++ ++/* ./trace/lib_trace.c */ ++ ++#undef _nc_tracing ++unsigned _nc_tracing; ++ ++#undef _nc__nc_tputs_trace ++const char *_nc__nc_tputs_trace(void) ++ { return(*(const char **)0); } ++ ++#undef _nc__nc_outchars ++long _nc__nc_outchars(void) ++ { return(*(long *)0); } ++ ++#undef _nc_set_tputs_trace ++void _nc_set_tputs_trace( ++ const char *s) ++ { /* void */ } ++ ++#undef _nc_count_outchars ++void _nc_count_outchars( ++ long increment) ++ { /* void */ } ++ ++#undef trace ++void trace( ++ const unsigned int tracelevel) ++ { /* void */ } ++ ++#undef _tracef ++void _tracef( ++ const char *fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_retrace_bool ++NCURSES_BOOL _nc_retrace_bool( ++ int code) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_retrace_char ++char _nc_retrace_char( ++ int code) ++ { return(*(char *)0); } ++ ++#undef _nc_retrace_int ++int _nc_retrace_int( ++ int code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_unsigned ++unsigned _nc_retrace_unsigned( ++ unsigned code) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_retrace_ptr ++char *_nc_retrace_ptr( ++ char *code) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_cptr ++const char *_nc_retrace_cptr( ++ const char *code) ++ { return(*(const char **)0); } ++ ++#undef _nc_retrace_cvoid_ptr ++void *_nc_retrace_cvoid_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_void_ptr ++void *_nc_retrace_void_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_sp ++SCREEN *_nc_retrace_sp( ++ SCREEN *code) ++ { return(*(SCREEN **)0); } ++ ++#undef _nc_retrace_win ++WINDOW *_nc_retrace_win( ++ WINDOW *code) ++ { return(*(WINDOW **)0); } ++ ++#undef _nc_use_tracef ++int _nc_use_tracef( ++ unsigned mask) ++ { return(*(int *)0); } ++ ++#undef _nc_locked_tracef ++void _nc_locked_tracef( ++ const char *fmt, ++ ...) ++ { /* void */ } ++ ++/* ./trace/lib_traceatr.c */ ++ ++#undef _traceattr2 ++char *_traceattr2( ++ int bufnum, ++ chtype newmode) ++ { return(*(char **)0); } ++ ++#undef _traceattr ++char *_traceattr( ++ attr_t newmode) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_int_attr_t ++int _nc_retrace_int_attr_t( ++ attr_t code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_attr_t ++attr_t _nc_retrace_attr_t( ++ attr_t code) ++ { return(*(attr_t *)0); } ++ ++#undef _nc_altcharset_name ++const char *_nc_altcharset_name( ++ attr_t attr, ++ chtype ch) ++ { return(*(const char **)0); } ++ ++#undef _tracechtype2 ++char *_tracechtype2( ++ int bufnum, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _tracechtype ++char *_tracechtype( ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_chtype ++chtype _nc_retrace_chtype( ++ chtype code) ++ { return(*(chtype *)0); } ++ ++#undef _tracecchar_t2 ++char *_tracecchar_t2( ++ int bufnum, ++ const cchar_t *ch) ++ { return(*(char **)0); } ++ ++#undef _tracecchar_t ++char *_tracecchar_t( ++ const cchar_t *ch) ++ { return(*(char **)0); } ++ ++/* ./trace/lib_tracebits.c */ ++ ++typedef struct { ++ unsigned int val; ++ const char *name; ++} BITNAMES; ++ ++#undef _nc_trace_ttymode ++char *_nc_trace_ttymode( ++ struct termios *tty) ++ { return(*(char **)0); } ++ ++#undef _nc_tracebits ++char *_nc_tracebits(void) ++ { return(*(char **)0); } ++ ++/* ./trace/lib_tracechr.c */ ++ ++#undef _nc_tracechar ++char *_nc_tracechar( ++ SCREEN *sp, ++ int ch) ++ { return(*(char **)0); } ++ ++#undef _tracechar ++char *_tracechar( ++ int ch) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ttyflags.c */ ++ ++#undef _nc_get_tty_mode_sp ++int _nc_get_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_get_tty_mode ++int _nc_get_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode_sp ++int _nc_set_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode ++int _nc_set_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode_sp ++int def_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode ++int def_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode_sp ++int def_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode ++int def_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode_sp ++int reset_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode ++int reset_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode_sp ++int reset_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode ++int reset_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef savetty_sp ++int savetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef savetty ++int savetty(void) ++ { return(*(int *)0); } ++ ++#undef resetty_sp ++int resetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef resetty ++int resetty(void) ++ { return(*(int *)0); } ++ ++/* ./tty/lib_twait.c */ ++ ++#include <sys/time.h> ++ ++#undef _nc_timed_wait ++int _nc_timed_wait( ++ SCREEN *sp, ++ int mode, ++ int milliseconds, ++ int *timeleft) ++ { return(*(int *)0); } ++ ++/* ./tinfo/name_match.c */ ++ ++#undef _nc_first_name ++char *_nc_first_name( ++ const char *const sp) ++ { return(*(char **)0); } ++ ++#undef _nc_name_match ++int _nc_name_match( ++ const char *const namelst, ++ const char *const name, ++ const char *const delim) ++ { return(*(int *)0); } ++ ++/* ./names.c */ ++ ++#undef _nc_boolnames ++char *const *_nc_boolnames(void) ++ { return(*(char **)0); } ++ ++#undef _nc_boolfnames ++char *const *_nc_boolfnames(void) ++ { return(*(char **)0); } ++ ++#undef _nc_numnames ++char *const *_nc_numnames(void) ++ { return(*(char **)0); } ++ ++#undef _nc_numfnames ++char *const *_nc_numfnames(void) ++ { return(*(char **)0); } ++ ++#undef _nc_strnames ++char *const *_nc_strnames(void) ++ { return(*(char **)0); } ++ ++#undef _nc_strfnames ++char *const *_nc_strfnames(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/read_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_read_termtype ++int _nc_read_termtype( ++ TERMTYPE *ptr, ++ char *buffer, ++ int limit) ++ { return(*(int *)0); } ++ ++#undef _nc_read_file_entry ++int _nc_read_file_entry( ++ const char *const filename, ++ TERMTYPE *ptr) ++ { return(*(int *)0); } ++ ++#undef _nc_read_entry ++int _nc_read_entry( ++ const char *const name, ++ char *const filename, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/read_termcap.c */ ++ ++#include <sys/types.h> ++ ++#undef _nc_read_termcap ++void _nc_read_termcap(void) ++ { /* void */ } ++ ++/* ./tinfo/setbuf.c */ ++ ++#undef _nc_set_buffer_sp ++void _nc_set_buffer_sp( ++ SCREEN *sp, ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++#undef _nc_set_buffer ++void _nc_set_buffer( ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++/* ./tinfo/strings.c */ ++ ++#undef _nc_str_init ++string_desc *_nc_str_init( ++ string_desc *dst, ++ char *src, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_null ++string_desc *_nc_str_null( ++ string_desc *dst, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_copy ++string_desc *_nc_str_copy( ++ string_desc *dst, ++ string_desc *src) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_safe_strcat ++NCURSES_BOOL _nc_safe_strcat( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_safe_strcpy ++NCURSES_BOOL _nc_safe_strcpy( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./trace/trace_buf.c */ ++ ++#undef _nc_trace_buf ++char *_nc_trace_buf( ++ int bufnum, ++ size_t want) ++ { return(*(char **)0); } ++ ++#undef _nc_trace_bufcat ++char *_nc_trace_bufcat( ++ int bufnum, ++ const char *value) ++ { return(*(char **)0); } ++ ++/* ./trace/trace_tries.c */ ++ ++#undef _nc_trace_tries ++void _nc_trace_tries( ++ TRIES *tree) ++ { /* void */ } ++ ++/* ./base/tries.c */ ++ ++#undef _nc_expand_try ++char *_nc_expand_try( ++ TRIES *tree, ++ unsigned code, ++ int *count, ++ size_t len) ++ { return(*(char **)0); } ++ ++#undef _nc_remove_key ++int _nc_remove_key( ++ TRIES **tree, ++ unsigned code) ++ { return(*(int *)0); } ++ ++#undef _nc_remove_string ++int _nc_remove_string( ++ TRIES **tree, ++ const char *string) ++ { return(*(int *)0); } ++ ++/* ./tinfo/trim_sgr0.c */ ++ ++#undef _nc_trim_sgr0 ++char *_nc_trim_sgr0( ++ TERMTYPE *tp) ++ { return(*(char **)0); } ++ ++/* ./unctrl.c */ ++ ++#undef unctrl_sp ++char *unctrl_sp( ++ SCREEN *sp, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef unctrl ++char *unctrl( ++ chtype ch) ++ { return(*(char **)0); } ++ ++/* ./trace/visbuf.c */ ++ ++#undef _nc_visbuf2 ++const char *_nc_visbuf2( ++ int bufnum, ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbuf ++const char *_nc_visbuf( ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbufn ++const char *_nc_visbufn( ++ const char *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbuf2 ++const char *_nc_viswbuf2( ++ int bufnum, ++ const wchar_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbuf ++const char *_nc_viswbuf( ++ const wchar_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbufn ++const char *_nc_viswbufn( ++ const wchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswibuf ++const char *_nc_viswibuf( ++ const wint_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf2 ++const char *_nc_viscbuf2( ++ int bufnum, ++ const cchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf ++const char *_nc_viscbuf( ++ const cchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++/* ./base/define_key.c */ ++ ++#undef define_key_sp ++int define_key_sp( ++ SCREEN *sp, ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef define_key ++int define_key( ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++/* ./tinfo/hashed_db.c */ ++ ++#undef _nc_hashed_db ++void _nc_hashed_db(void) ++ { /* void */ } ++ ++/* ./base/key_defined.c */ ++ ++#undef key_defined_sp ++int key_defined_sp( ++ SCREEN *sp, ++ const char *str) ++ { return(*(int *)0); } ++ ++#undef key_defined ++int key_defined( ++ const char *str) ++ { return(*(int *)0); } ++ ++/* ./base/keybound.c */ ++ ++#undef keybound_sp ++char *keybound_sp( ++ SCREEN *sp, ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++#undef keybound ++char *keybound( ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++/* ./base/keyok.c */ ++ ++#undef keyok_sp ++int keyok_sp( ++ SCREEN *sp, ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef keyok ++int keyok( ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./base/version.c */ ++ ++#undef curses_version ++const char *curses_version(void) ++ { return(*(const char **)0); } +diff -Naur ncurses-5.9.orig/ncurses/llib-ltinfow ncurses-5.9/ncurses/llib-ltinfow +--- ncurses-5.9.orig/ncurses/llib-ltinfow 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/ncurses/llib-ltinfow 2012-08-25 19:58:01.999888649 +0000 +@@ -0,0 +1,1537 @@ ++/**************************************************************************** ++ * Copyright (c) 2012 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++ ++/**************************************************************************** ++ * Author: Thomas E. Dickey 2012 * ++ ****************************************************************************/ ++/* LINTLIBRARY */ ++ ++/* ./tinfo/access.c */ ++ ++#include <curses.priv.h> ++#include <ctype.h> ++#include <tic.h> ++ ++#undef _nc_rootname ++char *_nc_rootname( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_is_abs_path ++NCURSES_BOOL _nc_is_abs_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_pathlast ++unsigned _nc_pathlast( ++ const char *path) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_basename ++char *_nc_basename( ++ char *path) ++ { return(*(char **)0); } ++ ++#undef _nc_access ++int _nc_access( ++ const char *path, ++ int mode) ++ { return(*(int *)0); } ++ ++#undef _nc_is_dir_path ++NCURSES_BOOL _nc_is_dir_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_is_file_path ++NCURSES_BOOL _nc_is_file_path( ++ const char *path) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_env_access ++int _nc_env_access(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/add_tries.c */ ++ ++#undef _nc_add_to_try ++int _nc_add_to_try( ++ TRIES **tree, ++ const char *str, ++ unsigned code) ++ { return(*(int *)0); } ++ ++/* ./tinfo/alloc_ttype.c */ ++ ++#undef _nc_align_termtype ++void _nc_align_termtype( ++ TERMTYPE *to, ++ TERMTYPE *from) ++ { /* void */ } ++ ++#undef _nc_copy_termtype ++void _nc_copy_termtype( ++ TERMTYPE *dst, ++ const TERMTYPE *src) ++ { /* void */ } ++ ++/* ./codes.c */ ++ ++#undef boolcodes ++char *const boolcodes[] = {0}; ++#undef numcodes ++char *const numcodes[] = {0}; ++#undef strcodes ++char *const strcodes[] = {0}; ++ ++/* ./comp_captab.c */ ++ ++#include <hashsize.h> ++ ++#undef _nc_get_table ++const struct name_table_entry *_nc_get_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct name_table_entry **)0); } ++ ++#undef _nc_get_hash_table ++const HashValue *_nc_get_hash_table( ++ NCURSES_BOOL termcap) ++ { return(*(const HashValue **)0); } ++ ++#undef _nc_get_alias_table ++const struct alias *_nc_get_alias_table( ++ NCURSES_BOOL termcap) ++ { return(*(const struct alias **)0); } ++ ++#undef _nc_get_hash_info ++const HashData *_nc_get_hash_info( ++ NCURSES_BOOL termcap) ++ { return(*(const HashData **)0); } ++ ++/* ./tinfo/comp_error.c */ ++ ++#undef _nc_suppress_warnings ++NCURSES_BOOL _nc_suppress_warnings; ++#undef _nc_curr_line ++int _nc_curr_line; ++#undef _nc_curr_col ++int _nc_curr_col; ++ ++#undef _nc_get_source ++const char *_nc_get_source(void) ++ { return(*(const char **)0); } ++ ++#undef _nc_set_source ++void _nc_set_source( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_set_type ++void _nc_set_type( ++ const char *const name) ++ { /* void */ } ++ ++#undef _nc_get_type ++void _nc_get_type( ++ char *name) ++ { /* void */ } ++ ++#undef _nc_warning ++void _nc_warning( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_err_abort ++void _nc_err_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_syserr_abort ++void _nc_syserr_abort( ++ const char *const fmt, ++ ...) ++ { /* void */ } ++ ++/* ./tinfo/comp_hash.c */ ++ ++#undef _nc_find_entry ++struct name_table_entry const *_nc_find_entry( ++ const char *string, ++ const HashValue *hash_table) ++ { return(*(struct name_table_entry const **)0); } ++ ++#undef _nc_find_type_entry ++struct name_table_entry const *_nc_find_type_entry( ++ const char *string, ++ int type, ++ NCURSES_BOOL termcap) ++ { return(*(struct name_table_entry const **)0); } ++ ++/* ./tinfo/db_iterator.c */ ++ ++#include <time.h> ++ ++#undef _nc_tic_dir ++const char *_nc_tic_dir( ++ const char *path) ++ { return(*(const char **)0); } ++ ++#undef _nc_keep_tic_dir ++void _nc_keep_tic_dir( ++ const char *path) ++ { /* void */ } ++ ++#undef _nc_last_db ++void _nc_last_db(void) ++ { /* void */ } ++ ++#undef _nc_next_db ++const char *_nc_next_db( ++ DBDIRS *state, ++ int *offset) ++ { return(*(const char **)0); } ++ ++#undef _nc_first_db ++void _nc_first_db( ++ DBDIRS *state, ++ int *offset) ++ { /* void */ } ++ ++/* ./tinfo/doalloc.c */ ++ ++#undef _nc_doalloc ++void *_nc_doalloc( ++ void *oldp, ++ size_t amount) ++ { return(*(void **)0); } ++ ++/* ./tinfo/entries.c */ ++ ++#undef _nc_head ++ENTRY *_nc_head; ++#undef _nc_tail ++ENTRY *_nc_tail; ++ ++#undef _nc_free_entry ++void _nc_free_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { /* void */ } ++ ++#undef _nc_free_entries ++void _nc_free_entries( ++ ENTRY *headp) ++ { /* void */ } ++ ++#undef _nc_delink_entry ++ENTRY *_nc_delink_entry( ++ ENTRY *headp, ++ TERMTYPE *tterm) ++ { return(*(ENTRY **)0); } ++ ++#undef _nc_leaks_tinfo ++void _nc_leaks_tinfo(void) ++ { /* void */ } ++ ++/* ./fallback.c */ ++ ++#undef _nc_fallback ++const TERMTYPE *_nc_fallback( ++ const char *name) ++ { return(*(const TERMTYPE **)0); } ++ ++/* ./tinfo/free_ttype.c */ ++ ++#undef _nc_free_termtype ++void _nc_free_termtype( ++ TERMTYPE *ptr) ++ { /* void */ } ++ ++#undef _nc_user_definable ++NCURSES_BOOL _nc_user_definable; ++ ++#undef use_extended_names ++int use_extended_names( ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/getenv_num.c */ ++ ++#undef _nc_getenv_num ++int _nc_getenv_num( ++ const char *name) ++ { return(*(int *)0); } ++ ++/* ./tinfo/home_terminfo.c */ ++ ++#undef _nc_home_terminfo ++char *_nc_home_terminfo(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/init_keytry.c */ ++ ++#if 0 ++ ++#include <init_keytry.h> ++ ++#undef _nc_tinfo_fkeys ++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; ++ ++#endif ++ ++#undef _nc_init_keytry ++void _nc_init_keytry( ++ SCREEN *sp) ++ { /* void */ } ++ ++/* ./tinfo/lib_acs.c */ ++ ++#undef acs_map ++chtype acs_map[128]; ++ ++#undef _nc_init_acs_sp ++void _nc_init_acs_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_init_acs ++void _nc_init_acs(void) ++ { /* void */ } ++ ++/* ./tinfo/lib_baudrate.c */ ++ ++#include <termcap.h> ++ ++struct speed { ++ int s; ++ int sp; ++}; ++ ++#undef _nc_baudrate ++int _nc_baudrate( ++ int OSpeed) ++ { return(*(int *)0); } ++ ++#undef _nc_ospeed ++int _nc_ospeed( ++ int BaudRate) ++ { return(*(int *)0); } ++ ++#undef baudrate_sp ++int baudrate_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef baudrate ++int baudrate(void) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_cur_term.c */ ++ ++#undef cur_term ++TERMINAL *cur_term; ++ ++#undef set_curterm_sp ++TERMINAL *set_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef set_curterm ++TERMINAL *set_curterm( ++ TERMINAL *termp) ++ { return(*(TERMINAL **)0); } ++ ++#undef del_curterm_sp ++int del_curterm_sp( ++ SCREEN *sp, ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef del_curterm ++int del_curterm( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_data.c */ ++ ++#undef stdscr ++WINDOW *stdscr; ++#undef curscr ++WINDOW *curscr; ++#undef newscr ++WINDOW *newscr; ++#undef _nc_screen_chain ++SCREEN *_nc_screen_chain; ++#undef SP ++SCREEN *SP; ++#undef _nc_globals ++NCURSES_GLOBALS _nc_globals; ++#undef _nc_prescreen ++NCURSES_PRESCREEN _nc_prescreen; ++ ++#undef _nc_screen_of ++SCREEN *_nc_screen_of( ++ WINDOW *win) ++ { return(*(SCREEN **)0); } ++ ++/* ./tinfo/lib_has_cap.c */ ++ ++#undef has_ic_sp ++NCURSES_BOOL has_ic_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_ic ++NCURSES_BOOL has_ic(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il_sp ++NCURSES_BOOL has_il_sp( ++ SCREEN *sp) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef has_il ++NCURSES_BOOL has_il(void) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./tinfo/lib_kernel.c */ ++ ++#undef erasechar_sp ++char erasechar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef erasechar ++char erasechar(void) ++ { return(*(char *)0); } ++ ++#undef killchar_sp ++char killchar_sp( ++ SCREEN *sp) ++ { return(*(char *)0); } ++ ++#undef killchar ++char killchar(void) ++ { return(*(char *)0); } ++ ++#undef flushinp_sp ++int flushinp_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef flushinp ++int flushinp(void) ++ { return(*(int *)0); } ++ ++/* ./lib_keyname.c */ ++ ++struct kn { short offset; int code; }; ++ ++#undef keyname_sp ++char *keyname_sp( ++ SCREEN *sp, ++ int c) ++ { return(*(char **)0); } ++ ++#undef keyname ++char *keyname( ++ int c) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_longname.c */ ++ ++#undef longname ++char *longname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_napms.c */ ++ ++#include <sys/time.h> ++ ++#undef napms_sp ++int napms_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef napms ++int napms( ++ int ms) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_options.c */ ++ ++#undef idlok ++int idlok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef idcok ++void idcok( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { /* void */ } ++ ++#undef halfdelay_sp ++int halfdelay_sp( ++ SCREEN *sp, ++ int t) ++ { return(*(int *)0); } ++ ++#undef halfdelay ++int halfdelay( ++ int t) ++ { return(*(int *)0); } ++ ++#undef nodelay ++int nodelay( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef notimeout ++int notimeout( ++ WINDOW *win, ++ NCURSES_BOOL f) ++ { return(*(int *)0); } ++ ++#undef wtimeout ++void wtimeout( ++ WINDOW *win, ++ int delay) ++ { /* void */ } ++ ++#undef keypad ++int keypad( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef meta ++int meta( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef curs_set_sp ++int curs_set_sp( ++ SCREEN *sp, ++ int vis) ++ { return(*(int *)0); } ++ ++#undef curs_set ++int curs_set( ++ int vis) ++ { return(*(int *)0); } ++ ++#undef typeahead_sp ++int typeahead_sp( ++ SCREEN *sp, ++ int fd) ++ { return(*(int *)0); } ++ ++#undef typeahead ++int typeahead( ++ int fd) ++ { return(*(int *)0); } ++ ++#undef has_key_sp ++int has_key_sp( ++ SCREEN *sp, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef has_key ++int has_key( ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_flush_sp ++int _nc_putp_flush_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *value) ++ { return(*(int *)0); } ++ ++#undef _nc_keypad ++int _nc_keypad( ++ SCREEN *sp, ++ int flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_raw.c */ ++ ++#undef raw_sp ++int raw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef raw ++int raw(void) ++ { return(*(int *)0); } ++ ++#undef cbreak_sp ++int cbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef cbreak ++int cbreak(void) ++ { return(*(int *)0); } ++ ++#undef qiflush_sp ++void qiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef qiflush ++void qiflush(void) ++ { /* void */ } ++ ++#undef noraw_sp ++int noraw_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef noraw ++int noraw(void) ++ { return(*(int *)0); } ++ ++#undef nocbreak_sp ++int nocbreak_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef nocbreak ++int nocbreak(void) ++ { return(*(int *)0); } ++ ++#undef noqiflush_sp ++void noqiflush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef noqiflush ++void noqiflush(void) ++ { /* void */ } ++ ++#undef intrflush_sp ++int intrflush_sp( ++ SCREEN *sp, ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef intrflush ++int intrflush( ++ WINDOW *win, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_setup.c */ ++ ++#include <locale.h> ++#include <sys/ioctl.h> ++#include <langinfo.h> ++ ++#undef ttytype ++char ttytype[256]; ++#undef LINES ++int LINES; ++#undef COLS ++int COLS; ++#undef TABSIZE ++int TABSIZE; ++ ++#undef set_tabsize_sp ++int set_tabsize_sp( ++ SCREEN *sp, ++ int value) ++ { return(*(int *)0); } ++ ++#undef set_tabsize ++int set_tabsize( ++ int value) ++ { return(*(int *)0); } ++ ++#undef _nc_handle_sigwinch ++int _nc_handle_sigwinch( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef use_env_sp ++void use_env_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_env ++void use_env( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl_sp ++void use_tioctl_sp( ++ SCREEN *sp, ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef use_tioctl ++void use_tioctl( ++ NCURSES_BOOL f) ++ { /* void */ } ++ ++#undef _nc_get_screensize ++void _nc_get_screensize( ++ SCREEN *sp, ++ int *linep, ++ int *colp) ++ { /* void */ } ++ ++#undef _nc_update_screensize ++void _nc_update_screensize( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_setup_tinfo ++int _nc_setup_tinfo( ++ const char *const tn, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++#undef _nc_tinfo_cmdch ++void _nc_tinfo_cmdch( ++ TERMINAL *termp, ++ int proto) ++ { /* void */ } ++ ++#undef _nc_get_locale ++char *_nc_get_locale(void) ++ { return(*(char **)0); } ++ ++#undef _nc_unicode_locale ++int _nc_unicode_locale(void) ++ { return(*(int *)0); } ++ ++#undef _nc_locale_breaks_acs ++int _nc_locale_breaks_acs( ++ TERMINAL *termp) ++ { return(*(int *)0); } ++ ++#undef _nc_setupterm ++int _nc_setupterm( ++ char *tname, ++ int Filedes, ++ int *errret, ++ int reuse) ++ { return(*(int *)0); } ++ ++#undef new_prescr ++SCREEN *new_prescr(void) ++ { return(*(SCREEN **)0); } ++ ++#undef setupterm ++int setupterm( ++ char *tname, ++ int Filedes, ++ int *errret) ++ { return(*(int *)0); } ++ ++/* ./tinfo/lib_termcap.c */ ++ ++#undef UP ++char *UP; ++#undef BC ++char *BC; ++ ++#undef tgetent_sp ++int tgetent_sp( ++ SCREEN *sp, ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#if 0 ++ ++#include <capdefaults.c> ++ ++#endif ++ ++#undef tgetent ++int tgetent( ++ char *bufp, ++ const char *name) ++ { return(*(int *)0); } ++ ++#undef tgetflag_sp ++int tgetflag_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetflag ++int tgetflag( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum_sp ++int tgetnum_sp( ++ SCREEN *sp, ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetnum ++int tgetnum( ++ char *id) ++ { return(*(int *)0); } ++ ++#undef tgetstr_sp ++char *tgetstr_sp( ++ SCREEN *sp, ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++#undef tgetstr ++char *tgetstr( ++ char *id, ++ char **area) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_termname.c */ ++ ++#undef termname_sp ++char *termname_sp( ++ SCREEN *sp) ++ { return(*(char **)0); } ++ ++#undef termname ++char *termname(void) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tgoto.c */ ++ ++#undef tgoto ++char *tgoto( ++ const char *string, ++ int x, ++ int y) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ti.c */ ++ ++#undef tigetflag_sp ++int tigetflag_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetflag ++int tigetflag( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum_sp ++int tigetnum_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetnum ++int tigetnum( ++ char *str) ++ { return(*(int *)0); } ++ ++#undef tigetstr_sp ++char *tigetstr_sp( ++ SCREEN *sp, ++ char *str) ++ { return(*(char **)0); } ++ ++#undef tigetstr ++char *tigetstr( ++ char *str) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tparm.c */ ++ ++#undef _nc_tparm_err ++int _nc_tparm_err; ++ ++#undef _nc_tparm_analyze ++int _nc_tparm_analyze( ++ const char *string, ++ char *p_is_s[9], ++ int *popcount) ++ { return(*(int *)0); } ++ ++#undef tparm ++char *tparm( ++ char *string, ++ ...) ++ { return(*(char **)0); } ++ ++#undef tiparm ++char *tiparm( ++ const char *string, ++ ...) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_tputs.c */ ++ ++#undef PC ++char PC; ++#undef ospeed ++short ospeed; ++#undef _nc_nulls_sent ++int _nc_nulls_sent; ++ ++#undef _nc_set_no_padding ++void _nc_set_no_padding( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef delay_output_sp ++int delay_output_sp( ++ SCREEN *sp, ++ int ms) ++ { return(*(int *)0); } ++ ++#undef delay_output ++int delay_output( ++ int ms) ++ { return(*(int *)0); } ++ ++#undef _nc_flush_sp ++void _nc_flush_sp( ++ SCREEN *sp) ++ { /* void */ } ++ ++#undef _nc_flush ++void _nc_flush(void) ++ { /* void */ } ++ ++#undef _nc_outch_sp ++int _nc_outch_sp( ++ SCREEN *sp, ++ int ch) ++ { return(*(int *)0); } ++ ++#undef _nc_outch ++int _nc_outch( ++ int ch) ++ { return(*(int *)0); } ++ ++#undef putp_sp ++int putp_sp( ++ SCREEN *sp, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp_sp ++int _nc_putp_sp( ++ SCREEN *sp, ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef putp ++int putp( ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef _nc_putp ++int _nc_putp( ++ const char *name, ++ const char *string) ++ { return(*(int *)0); } ++ ++#undef tputs_sp ++int tputs_sp( ++ SCREEN *sp, ++ const char *string, ++ int affcnt, ++ NCURSES_OUTC_sp outc) ++ { return(*(int *)0); } ++ ++#undef _nc_outc_wrapper ++int _nc_outc_wrapper( ++ SCREEN *sp, ++ int c) ++ { return(*(int *)0); } ++ ++#undef tputs ++int tputs( ++ const char *string, ++ int affcnt, ++ int (*outc)( ++ int p1)) ++ { return(*(int *)0); } ++ ++/* ./trace/lib_trace.c */ ++ ++#undef _nc_tracing ++unsigned _nc_tracing; ++#undef _nc_tputs_trace ++const char *_nc_tputs_trace = {0}; ++#undef _nc_outchars ++long _nc_outchars; ++ ++#undef trace ++void trace( ++ const unsigned int tracelevel) ++ { /* void */ } ++ ++#undef _tracef ++void _tracef( ++ const char *fmt, ++ ...) ++ { /* void */ } ++ ++#undef _nc_retrace_bool ++NCURSES_BOOL _nc_retrace_bool( ++ int code) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_retrace_char ++char _nc_retrace_char( ++ int code) ++ { return(*(char *)0); } ++ ++#undef _nc_retrace_int ++int _nc_retrace_int( ++ int code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_unsigned ++unsigned _nc_retrace_unsigned( ++ unsigned code) ++ { return(*(unsigned *)0); } ++ ++#undef _nc_retrace_ptr ++char *_nc_retrace_ptr( ++ char *code) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_cptr ++const char *_nc_retrace_cptr( ++ const char *code) ++ { return(*(const char **)0); } ++ ++#undef _nc_retrace_cvoid_ptr ++void *_nc_retrace_cvoid_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_void_ptr ++void *_nc_retrace_void_ptr( ++ void *code) ++ { return(*(void **)0); } ++ ++#undef _nc_retrace_sp ++SCREEN *_nc_retrace_sp( ++ SCREEN *code) ++ { return(*(SCREEN **)0); } ++ ++#undef _nc_retrace_win ++WINDOW *_nc_retrace_win( ++ WINDOW *code) ++ { return(*(WINDOW **)0); } ++ ++/* ./trace/lib_traceatr.c */ ++ ++#undef _traceattr2 ++char *_traceattr2( ++ int bufnum, ++ chtype newmode) ++ { return(*(char **)0); } ++ ++#undef _traceattr ++char *_traceattr( ++ attr_t newmode) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_int_attr_t ++int _nc_retrace_int_attr_t( ++ attr_t code) ++ { return(*(int *)0); } ++ ++#undef _nc_retrace_attr_t ++attr_t _nc_retrace_attr_t( ++ attr_t code) ++ { return(*(attr_t *)0); } ++ ++#undef _nc_altcharset_name ++const char *_nc_altcharset_name( ++ attr_t attr, ++ chtype ch) ++ { return(*(const char **)0); } ++ ++#undef _tracechtype2 ++char *_tracechtype2( ++ int bufnum, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _tracechtype ++char *_tracechtype( ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef _nc_retrace_chtype ++chtype _nc_retrace_chtype( ++ chtype code) ++ { return(*(chtype *)0); } ++ ++#undef _tracecchar_t2 ++char *_tracecchar_t2( ++ int bufnum, ++ const cchar_t *ch) ++ { return(*(char **)0); } ++ ++#undef _tracecchar_t ++char *_tracecchar_t( ++ const cchar_t *ch) ++ { return(*(char **)0); } ++ ++/* ./trace/lib_tracebits.c */ ++ ++typedef struct { ++ unsigned int val; ++ const char *name; ++} BITNAMES; ++ ++#undef _nc_trace_ttymode ++char *_nc_trace_ttymode( ++ struct termios *tty) ++ { return(*(char **)0); } ++ ++#undef _nc_tracebits ++char *_nc_tracebits(void) ++ { return(*(char **)0); } ++ ++/* ./trace/lib_tracechr.c */ ++ ++#undef _nc_tracechar ++char *_nc_tracechar( ++ SCREEN *sp, ++ int ch) ++ { return(*(char **)0); } ++ ++#undef _tracechar ++char *_tracechar( ++ int ch) ++ { return(*(char **)0); } ++ ++/* ./tinfo/lib_ttyflags.c */ ++ ++#undef _nc_get_tty_mode_sp ++int _nc_get_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_get_tty_mode ++int _nc_get_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode_sp ++int _nc_set_tty_mode_sp( ++ SCREEN *sp, ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef _nc_set_tty_mode ++int _nc_set_tty_mode( ++ struct termios *buf) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode_sp ++int def_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_shell_mode ++int def_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode_sp ++int def_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef def_prog_mode ++int def_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode_sp ++int reset_prog_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_prog_mode ++int reset_prog_mode(void) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode_sp ++int reset_shell_mode_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef reset_shell_mode ++int reset_shell_mode(void) ++ { return(*(int *)0); } ++ ++#undef savetty_sp ++int savetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef savetty ++int savetty(void) ++ { return(*(int *)0); } ++ ++#undef resetty_sp ++int resetty_sp( ++ SCREEN *sp) ++ { return(*(int *)0); } ++ ++#undef resetty ++int resetty(void) ++ { return(*(int *)0); } ++ ++/* ./tty/lib_twait.c */ ++ ++#undef _nc_timed_wait ++int _nc_timed_wait( ++ SCREEN *sp, ++ int mode, ++ int milliseconds, ++ int *timeleft) ++ { return(*(int *)0); } ++ ++/* ./tinfo/name_match.c */ ++ ++#undef _nc_first_name ++char *_nc_first_name( ++ const char *const sp) ++ { return(*(char **)0); } ++ ++#undef _nc_name_match ++int _nc_name_match( ++ const char *const namelst, ++ const char *const name, ++ const char *const delim) ++ { return(*(int *)0); } ++ ++/* ./names.c */ ++ ++#undef boolnames ++char *const boolnames[] = {0}; ++#undef boolfnames ++char *const boolfnames[] = {0}; ++#undef numnames ++char *const numnames[] = {0}; ++#undef numfnames ++char *const numfnames[] = {0}; ++#undef strnames ++char *const strnames[] = {0}; ++#undef strfnames ++char *const strfnames[] = {0}; ++ ++/* ./tinfo/read_entry.c */ ++ ++#include <hashed_db.h> ++ ++#undef _nc_read_termtype ++int _nc_read_termtype( ++ TERMTYPE *ptr, ++ char *buffer, ++ int limit) ++ { return(*(int *)0); } ++ ++#undef _nc_read_file_entry ++int _nc_read_file_entry( ++ const char *const filename, ++ TERMTYPE *ptr) ++ { return(*(int *)0); } ++ ++#undef _nc_read_entry ++int _nc_read_entry( ++ const char *const name, ++ char *const filename, ++ TERMTYPE *const tp) ++ { return(*(int *)0); } ++ ++/* ./tinfo/read_termcap.c */ ++ ++#include <sys/types.h> ++ ++#undef _nc_read_termcap ++void _nc_read_termcap(void) ++ { /* void */ } ++ ++/* ./tinfo/setbuf.c */ ++ ++#undef _nc_set_buffer_sp ++void _nc_set_buffer_sp( ++ SCREEN *sp, ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++#undef _nc_set_buffer ++void _nc_set_buffer( ++ FILE *ofp, ++ int buffered) ++ { /* void */ } ++ ++/* ./tinfo/strings.c */ ++ ++#undef _nc_str_init ++string_desc *_nc_str_init( ++ string_desc *dst, ++ char *src, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_null ++string_desc *_nc_str_null( ++ string_desc *dst, ++ size_t len) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_str_copy ++string_desc *_nc_str_copy( ++ string_desc *dst, ++ string_desc *src) ++ { return(*(string_desc **)0); } ++ ++#undef _nc_safe_strcat ++NCURSES_BOOL _nc_safe_strcat( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++#undef _nc_safe_strcpy ++NCURSES_BOOL _nc_safe_strcpy( ++ string_desc *dst, ++ const char *src) ++ { return(*(NCURSES_BOOL *)0); } ++ ++/* ./trace/trace_buf.c */ ++ ++#undef _nc_trace_buf ++char *_nc_trace_buf( ++ int bufnum, ++ size_t want) ++ { return(*(char **)0); } ++ ++#undef _nc_trace_bufcat ++char *_nc_trace_bufcat( ++ int bufnum, ++ const char *value) ++ { return(*(char **)0); } ++ ++/* ./trace/trace_tries.c */ ++ ++#undef _nc_trace_tries ++void _nc_trace_tries( ++ TRIES *tree) ++ { /* void */ } ++ ++/* ./base/tries.c */ ++ ++#undef _nc_expand_try ++char *_nc_expand_try( ++ TRIES *tree, ++ unsigned code, ++ int *count, ++ size_t len) ++ { return(*(char **)0); } ++ ++#undef _nc_remove_key ++int _nc_remove_key( ++ TRIES **tree, ++ unsigned code) ++ { return(*(int *)0); } ++ ++#undef _nc_remove_string ++int _nc_remove_string( ++ TRIES **tree, ++ const char *string) ++ { return(*(int *)0); } ++ ++/* ./tinfo/trim_sgr0.c */ ++ ++#undef _nc_trim_sgr0 ++char *_nc_trim_sgr0( ++ TERMTYPE *tp) ++ { return(*(char **)0); } ++ ++/* ./unctrl.c */ ++ ++#undef unctrl_sp ++char *unctrl_sp( ++ SCREEN *sp, ++ chtype ch) ++ { return(*(char **)0); } ++ ++#undef unctrl ++char *unctrl( ++ chtype ch) ++ { return(*(char **)0); } ++ ++/* ./trace/visbuf.c */ ++ ++#undef _nc_visbuf2 ++const char *_nc_visbuf2( ++ int bufnum, ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbuf ++const char *_nc_visbuf( ++ const char *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_visbufn ++const char *_nc_visbufn( ++ const char *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbuf2 ++const char *_nc_viswbuf2( ++ int bufnum, ++ const wchar_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbuf ++const char *_nc_viswbuf( ++ const wchar_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswbufn ++const char *_nc_viswbufn( ++ const wchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viswibuf ++const char *_nc_viswibuf( ++ const wint_t *buf) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf2 ++const char *_nc_viscbuf2( ++ int bufnum, ++ const cchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++#undef _nc_viscbuf ++const char *_nc_viscbuf( ++ const cchar_t *buf, ++ int len) ++ { return(*(const char **)0); } ++ ++/* ./base/define_key.c */ ++ ++#undef define_key_sp ++int define_key_sp( ++ SCREEN *sp, ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++#undef define_key ++int define_key( ++ const char *str, ++ int keycode) ++ { return(*(int *)0); } ++ ++/* ./tinfo/hashed_db.c */ ++ ++#undef _nc_hashed_db ++void _nc_hashed_db(void) ++ { /* void */ } ++ ++/* ./base/key_defined.c */ ++ ++#undef key_defined_sp ++int key_defined_sp( ++ SCREEN *sp, ++ const char *str) ++ { return(*(int *)0); } ++ ++#undef key_defined ++int key_defined( ++ const char *str) ++ { return(*(int *)0); } ++ ++/* ./base/keybound.c */ ++ ++#undef keybound_sp ++char *keybound_sp( ++ SCREEN *sp, ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++#undef keybound ++char *keybound( ++ int code, ++ int count) ++ { return(*(char **)0); } ++ ++/* ./base/keyok.c */ ++ ++#undef keyok_sp ++int keyok_sp( ++ SCREEN *sp, ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++#undef keyok ++int keyok( ++ int c, ++ NCURSES_BOOL flag) ++ { return(*(int *)0); } ++ ++/* ./base/version.c */ ++ ++#undef curses_version ++const char *curses_version(void) ++ { return(*(const char **)0); } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/MKcaptab.sh ncurses-5.9/ncurses/tinfo/MKcaptab.sh +--- ncurses-5.9.orig/ncurses/tinfo/MKcaptab.sh 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/MKcaptab.sh 2012-08-25 19:58:00.033231285 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + ############################################################################## +-# Copyright (c) 2007-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 2007-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: MKcaptab.sh,v 1.13 2010/12/25 23:43:58 tom Exp $ ++# $Id: MKcaptab.sh,v 1.14 2011/10/22 16:34:50 tom Exp $ + AWK=${1-awk} + OPT1=${2-0} + OPT2=${3-tinfo/MKcaptab.awk} +@@ -99,12 +99,12 @@ + _nc_build_alias(struct alias **actual, + const alias_table_data *source, + const char *strings, +- unsigned tablesize) ++ size_t tablesize) + { + if (*actual == 0) { + *actual = typeCalloc(struct alias, tablesize + 1); + if (*actual != 0) { +- unsigned n; ++ size_t n; + for (n = 0; n < tablesize; ++n) { + add_alias(from); + add_alias(to); +@@ -178,7 +178,7 @@ + static int + compare_tcap_names(const char *a, const char *b) + { +- return !strncmp(a, b, TCAP_LEN); ++ return !strncmp(a, b, (size_t) TCAP_LEN); + } + + static int +diff -Naur ncurses-5.9.orig/ncurses/tinfo/access.c ncurses-5.9/ncurses/tinfo/access.c +--- ncurses-5.9.orig/ncurses/tinfo/access.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/access.c 2012-08-25 19:58:00.913227124 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,11 +33,18 @@ + #include <curses.priv.h> + + #include <ctype.h> +-#include <sys/stat.h> + + #include <tic.h> + +-MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $") ++MODULE_ID("$Id: access.c,v 1.22 2012/02/22 22:34:31 tom Exp $") ++ ++#ifdef __TANDEM ++#define ROOT_UID 65535 ++#endif ++ ++#ifndef ROOT_UID ++#define ROOT_UID 0 ++#endif + + #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c)) + +@@ -108,24 +115,33 @@ + NCURSES_EXPORT(int) + _nc_access(const char *path, int mode) + { +- if (access(path, mode) < 0) { ++ int result; ++ ++ if (path == 0) { ++ result = -1; ++ } else if (access(path, mode) < 0) { + if ((mode & W_OK) != 0 + && errno == ENOENT + && strlen(path) < PATH_MAX) { + char head[PATH_MAX]; +- char *leaf = _nc_basename(strcpy(head, path)); ++ char *leaf; + ++ _nc_STRCPY(head, path, sizeof(head)); ++ leaf = _nc_basename(head); + if (leaf == 0) + leaf = head; + *leaf = '\0'; + if (head == leaf) +- (void) strcpy(head, "."); ++ _nc_STRCPY(head, ".", sizeof(head)); + +- return access(head, R_OK | W_OK | X_OK); ++ result = access(head, R_OK | W_OK | X_OK); ++ } else { ++ result = -1; + } +- return -1; ++ } else { ++ result = 0; + } +- return 0; ++ return result; + } + + NCURSES_EXPORT(bool) +@@ -135,7 +151,7 @@ + struct stat sb; + + if (stat(path, &sb) == 0 +- && (sb.st_mode & S_IFMT) == S_IFDIR) { ++ && S_ISDIR(sb.st_mode)) { + result = TRUE; + } + return result; +@@ -148,7 +164,7 @@ + struct stat sb; + + if (stat(path, &sb) == 0 +- && (sb.st_mode & S_IFMT) == S_IFREG) { ++ && S_ISREG(sb.st_mode)) { + result = TRUE; + } + return result; +@@ -170,6 +186,7 @@ + || getgid() != getegid()) + return FALSE; + #endif +- return getuid() != 0 && geteuid() != 0; /* ...finally, disallow root */ ++ /* ...finally, disallow root */ ++ return (getuid() != ROOT_UID) && (geteuid() != ROOT_UID); + } + #endif +diff -Naur ncurses-5.9.orig/ncurses/tinfo/alloc_entry.c ncurses-5.9/ncurses/tinfo/alloc_entry.c +--- ncurses-5.9.orig/ncurses/tinfo/alloc_entry.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/alloc_entry.c 2012-08-25 19:58:00.913227124 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -47,7 +47,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: alloc_entry.c,v 1.51 2010/12/25 23:06:01 tom Exp $") ++MODULE_ID("$Id: alloc_entry.c,v 1.56 2012/02/22 22:34:31 tom Exp $") + + #define ABSENT_OFFSET -1 + #define CANCELLED_OFFSET -2 +@@ -73,7 +73,7 @@ + #endif + + if (stringbuf == 0) +- stringbuf = (char *) malloc(MAX_STRTAB); ++ stringbuf = (char *) malloc((size_t) MAX_STRTAB); + + #if NCURSES_XNAMES + tp->num_Booleans = BOOLCOUNT; +@@ -131,7 +131,7 @@ + result = (stringbuf + next_free - 1); + } + } else if (next_free + len < MAX_STRTAB) { +- strcpy(&stringbuf[next_free], string); ++ _nc_STRCPY(&stringbuf[next_free], string, MAX_STRTAB); + DEBUG(7, ("Saved string %s", _nc_visbuf(string))); + DEBUG(7, ("at location %d", (int) next_free)); + next_free += len; +@@ -216,16 +216,19 @@ + if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) { + if (n < SIZEOF(offsets)) { + size_t length = 0; ++ size_t offset; + for (i = 0; i < n; i++) { + length += strlen(tp->ext_Names[i]) + 1; + offsets[i] = (int) (tp->ext_Names[i] - stringbuf); + } + if ((tp->ext_str_table = typeMalloc(char, length)) == 0) + _nc_err_abort(MSG_NO_MEMORY); +- for (i = 0, length = 0; i < n; i++) { +- tp->ext_Names[i] = tp->ext_str_table + length; +- strcpy(tp->ext_Names[i], stringbuf + offsets[i]); +- length += strlen(tp->ext_Names[i]) + 1; ++ for (i = 0, offset = 0; i < n; i++) { ++ tp->ext_Names[i] = tp->ext_str_table + offset; ++ _nc_STRCPY(tp->ext_Names[i], ++ stringbuf + offsets[i], ++ length - offset); ++ offset += strlen(tp->ext_Names[i]) + 1; + } + } + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/alloc_ttype.c ncurses-5.9/ncurses/tinfo/alloc_ttype.c +--- ncurses-5.9.orig/ncurses/tinfo/alloc_ttype.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/alloc_ttype.c 2012-08-25 19:58:00.959893570 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1999-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: alloc_ttype.c,v 1.22 2010/12/19 00:24:09 tom Exp $") ++MODULE_ID("$Id: alloc_ttype.c,v 1.24 2012/03/01 01:21:56 tom Exp $") + + #if NCURSES_XNAMES + /* +@@ -473,7 +473,7 @@ + #endif + + NCURSES_EXPORT(void) +-_nc_copy_termtype(TERMTYPE *dst, TERMTYPE *src) ++_nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src) + { + unsigned i; + +@@ -482,13 +482,15 @@ + dst->Numbers = typeMalloc(short, NUM_NUMBERS(dst)); + dst->Strings = typeMalloc(char *, NUM_STRINGS(dst)); + +- /* FIXME: use memcpy for these and similar loops */ +- for_each_boolean(i, dst) +- dst->Booleans[i] = src->Booleans[i]; +- for_each_number(i, dst) +- dst->Numbers[i] = src->Numbers[i]; +- for_each_string(i, dst) +- dst->Strings[i] = src->Strings[i]; ++ memcpy(dst->Booleans, ++ src->Booleans, ++ NUM_BOOLEANS(dst) * sizeof(dst->Booleans[0])); ++ memcpy(dst->Numbers, ++ src->Numbers, ++ NUM_NUMBERS(dst) * sizeof(dst->Numbers[0])); ++ memcpy(dst->Strings, ++ src->Strings, ++ NUM_STRINGS(dst) * sizeof(dst->Strings[0])); + + /* FIXME: we probably should also copy str_table and ext_str_table, + * but tic and infocmp are not written to exploit that (yet). +diff -Naur ncurses-5.9.orig/ncurses/tinfo/captoinfo.c ncurses-5.9/ncurses/tinfo/captoinfo.c +--- ncurses-5.9.orig/ncurses/tinfo/captoinfo.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/captoinfo.c 2012-08-25 19:58:00.913227124 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -93,7 +93,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: captoinfo.c,v 1.58 2010/12/04 20:08:19 tom Exp $") ++MODULE_ID("$Id: captoinfo.c,v 1.72 2012/02/22 22:40:24 tom Exp $") + + #define MAX_PUSHED 16 /* max # args we can push onto the stack */ + +@@ -133,7 +133,7 @@ + _nc_err_abort(MSG_NO_MEMORY); + d = my_string + have; + } +- (void) strcpy(d, s); ++ _nc_STRCPY(d, s, my_length - have); + return d + strlen(d); + } + +@@ -240,6 +240,12 @@ + else if (parm == 2) + parm = 1; + } ++ ++ while (n--) { ++ dp = save_string(dp, "%p"); ++ dp = save_char(dp, '0' + parm); ++ } ++ + if (onstack == parm) { + if (n > 1) { + _nc_warning("string may not be optimal"); +@@ -255,11 +261,6 @@ + + onstack = parm; + +- while (n--) { +- dp = save_string(dp, "%p"); +- dp = save_char(dp, '0' + parm); +- } +- + if (seenn && parm < 3) { + dp = save_string(dp, "%{96}%^"); + } +@@ -469,73 +470,9 @@ + break; + } + break; +-#ifdef REVISIBILIZE +- case '\\': +- dp = save_char(dp, *s++); +- dp = save_char(dp, *s++); +- break; +- case '\n': +- dp = save_string(dp, "\\n"); +- s++; +- break; +- case '\t': +- dp = save_string(dp, "\\t"); +- s++; +- break; +- case '\r': +- dp = save_string(dp, "\\r"); +- s++; +- break; +- case '\200': +- dp = save_string(dp, "\\0"); +- s++; +- break; +- case '\f': +- dp = save_string(dp, "\\f"); +- s++; +- break; +- case '\b': +- dp = save_string(dp, "\\b"); +- s++; +- break; +- case ' ': +- dp = save_string(dp, "\\s"); +- s++; +- break; +- case '^': +- dp = save_string(dp, "\\^"); +- s++; +- break; +- case ':': +- dp = save_string(dp, "\\:"); +- s++; +- break; +- case ',': +- dp = save_string(dp, "\\,"); +- s++; +- break; +- default: +- if (*s == '\033') { +- dp = save_string(dp, "\\E"); +- s++; +- } else if (*s > 0 && *s < 32) { +- dp = save_char(dp, '^'); +- dp = save_char(dp, *s + '@'); +- s++; +- } else if (*s <= 0 || *s >= 127) { +- dp = save_char(dp, '\\'); +- dp = save_char(dp, ((*s & 0300) >> 6) + '0'); +- dp = save_char(dp, ((*s & 0070) >> 3) + '0'); +- dp = save_char(dp, (*s & 0007) + '0'); +- s++; +- } else +- dp = save_char(dp, *s++); +- break; +-#else + default: + dp = save_char(dp, *s++); + break; +-#endif + } + } + +@@ -578,7 +515,7 @@ + { + char buffer[80]; + int tst; +- sprintf(buffer, fmt, ch1, ch2); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) fmt, ch1, ch2); + tst = strlen(buffer) - 1; + assert(len == tst); + } +@@ -598,9 +535,9 @@ + bufptr = save_char(bufptr, c1); + } else { + if (c1 == (c1 & 0x1f)) /* iscntrl() returns T on 255 */ +- (void) strcpy(temp, unctrl((chtype) c1)); ++ _nc_STRCPY(temp, unctrl((chtype) c1), sizeof(temp)); + else +- (void) sprintf(temp, "\\%03o", c1); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "\\%03o", c1); + bufptr = save_string(bufptr, temp); + } + return bufptr; +@@ -646,13 +583,15 @@ + int in0, in1, in2; + char ch1 = 0, ch2 = 0; + char *bufptr = init_string(); ++ char octal[4]; + int len; + bool syntax_error = FALSE; + + /* we may have to move some trailing mandatory padding up front */ + padding = str + strlen(str) - 1; +- if (padding > str && *padding == '>' && *--padding == '/') { +- --padding; ++ if (padding > str && *padding == '>') { ++ if (*--padding == '/') ++ --padding; + while (isdigit(UChar(*padding)) || *padding == '.' || *padding == '*') + padding--; + if (padding > str && *padding == '<' && *--padding == '$') +@@ -663,7 +602,7 @@ + bufptr = save_char(bufptr, *padding++); + } + +- for (; *str && str != trimmed; str++) { ++ for (; *str && ((trimmed == 0) || (str < trimmed)); str++) { + int c1, c2; + char *cp = 0; + +@@ -685,8 +624,72 @@ + } else if (str[1] == ',') { + bufptr = save_char(bufptr, *++str); + } else { ++ int xx1, xx2; ++ + bufptr = save_char(bufptr, *str++); +- bufptr = save_char(bufptr, *str); ++ xx1 = *str; ++ if (_nc_strict_bsd) { ++ if (isdigit(UChar(xx1))) { ++ int pad = 0; ++ ++ if (!isdigit(UChar(str[1]))) ++ pad = 2; ++ else if (str[1] && !isdigit(UChar(str[2]))) ++ pad = 1; ++ ++ /* ++ * Test for "\0", "\00" or "\000" and transform those ++ * into "\200". ++ */ ++ if (xx1 == '0' ++ && ((pad == 2) || (str[1] == '0')) ++ && ((pad >= 1) || (str[2] == '0'))) { ++ xx2 = '2'; ++ } else { ++ xx2 = '0'; ++ pad = 0; /* FIXME - optionally pad to 3 digits */ ++ } ++ while (pad-- > 0) { ++ bufptr = save_char(bufptr, xx2); ++ xx2 = '0'; ++ } ++ } else if (strchr("E\\nrtbf", xx1) == 0) { ++ switch (xx1) { ++ case 'e': ++ xx1 = 'E'; ++ break; ++ case 'l': ++ xx1 = 'n'; ++ break; ++ case 's': ++ bufptr = save_char(bufptr, '0'); ++ bufptr = save_char(bufptr, '4'); ++ xx1 = '0'; ++ break; ++ case ':': ++ /* ++ * Note: termcap documentation claims that ":" ++ * must be escaped as "\072", however the ++ * documentation is incorrect - read the code. ++ * The replacement does not work reliably, ++ * so the advice is not helpful. ++ */ ++ bufptr = save_char(bufptr, '0'); ++ bufptr = save_char(bufptr, '7'); ++ xx1 = '2'; ++ break; ++ default: ++ /* should not happen, but handle this anyway */ ++ _nc_SPRINTF(octal, _nc_SLIMIT(sizeof(octal)) ++ "%03o", UChar(xx1)); ++ bufptr = save_char(bufptr, octal[0]); ++ bufptr = save_char(bufptr, octal[1]); ++ xx1 = octal[2]; ++ break; ++ } ++ } ++ } ++ bufptr = save_char(bufptr, xx1); + } + } else if (str[0] == '$' && str[1] == '<') { /* discard padding */ + str += 2; +@@ -720,13 +723,13 @@ + bufptr = save_tc_inequality(bufptr, c1, c2); + } else if (sscanf(str, "%%?%%{%d}%%>%%t%%'%c'%%+%%;", &c1, &ch2) == 2) { + str = strchr(str, ';'); +- bufptr = save_tc_inequality(bufptr, c1, c2); ++ bufptr = save_tc_inequality(bufptr, c1, ch2); + } else if (sscanf(str, "%%?%%'%c'%%>%%t%%{%d}%%+%%;", &ch1, &c2) == 2) { + str = strchr(str, ';'); +- bufptr = save_tc_inequality(bufptr, c1, c2); ++ bufptr = save_tc_inequality(bufptr, ch1, c2); + } else if (sscanf(str, "%%?%%'%c'%%>%%t%%'%c'%%+%%;", &ch1, &ch2) == 2) { + str = strchr(str, ';'); +- bufptr = save_tc_inequality(bufptr, c1, c2); ++ bufptr = save_tc_inequality(bufptr, ch1, ch2); + } else if ((len = bcd_expression(str)) != 0) { + str += len; + bufptr = save_string(bufptr, "%B"); +@@ -741,15 +744,15 @@ + bufptr = save_tc_char(bufptr, c1); + } + /* FIXME: this "works" for 'delta' */ +- else if (strncmp(str, "%{2}%*%-", 8) == 0) { ++ else if (strncmp(str, "%{2}%*%-", (size_t) 8) == 0) { + str += 7; + bufptr = save_string(bufptr, "%D"); +- } else if (strncmp(str, "%{96}%^", 7) == 0) { ++ } else if (strncmp(str, "%{96}%^", (size_t) 7) == 0) { + str += 6; + if (saw_m++ == 0) { + bufptr = save_string(bufptr, "%n"); + } +- } else if (strncmp(str, "%{127}%^", 8) == 0) { ++ } else if (strncmp(str, "%{127}%^", (size_t) 8) == 0) { + str += 7; + if (saw_n++ == 0) { + bufptr = save_string(bufptr, "%m"); +@@ -772,8 +775,25 @@ + case '8': + case '9': + bufptr = save_char(bufptr, '%'); +- while (isdigit(UChar(*str))) +- bufptr = save_char(bufptr, *str++); ++ ch1 = 0; ++ ch2 = 0; ++ while (isdigit(UChar(*str))) { ++ ch2 = ch1; ++ ch1 = *str++; ++ if (_nc_strict_bsd) { ++ if (ch1 > '3') ++ return 0; ++ } else { ++ bufptr = save_char(bufptr, ch1); ++ } ++ } ++ if (_nc_strict_bsd) { ++ if (ch2 != 0 && ch2 != '0') ++ return 0; ++ if (ch1 < '2') ++ ch1 = 'd'; ++ bufptr = save_char(bufptr, ch1); ++ } + if (strchr("doxX.", *str)) { + if (*str != 'd') /* termcap doesn't have octal, hex */ + return 0; +@@ -794,6 +814,8 @@ + * termcap notation. + */ + case 's': ++ if (_nc_strict_bsd) ++ return 0; + bufptr = save_string(bufptr, "%s"); + break; + +diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_error.c ncurses-5.9/ncurses/tinfo/comp_error.c +--- ncurses-5.9.orig/ncurses/tinfo/comp_error.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/comp_error.c 2012-08-25 19:58:00.913227124 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,7 +41,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: comp_error.c,v 1.31 2007/04/21 23:38:32 tom Exp $") ++MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $") + + NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE; + NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */ +@@ -59,7 +59,8 @@ + NCURSES_EXPORT(void) + _nc_set_source(const char *const name) + { +- SourceName = name; ++ FreeIfNeeded(SourceName); ++ SourceName = strdup(name); + } + + NCURSES_EXPORT(void) +@@ -70,7 +71,7 @@ + if (TermType != 0) { + TermType[0] = '\0'; + if (name) +- strncat(TermType, name, MAX_NAME_SIZE); ++ strncat(TermType, name, (size_t) MAX_NAME_SIZE); + } + } + +@@ -84,7 +85,7 @@ + } + #endif + if (name != 0) +- strcpy(name, TermType != 0 ? TermType : ""); ++ _nc_STRCPY(name, TermType != 0 ? TermType : "", MAX_NAME_SIZE); + } + + static NCURSES_INLINE void +@@ -151,3 +152,12 @@ + exit(EXIT_FAILURE); + #endif + } ++ ++#if NO_LEAKS ++NCURSES_EXPORT(void) ++_nc_comp_error_leaks(void) ++{ ++ FreeAndNull(SourceName); ++ FreeAndNull(TermType); ++} ++#endif +diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_expand.c ncurses-5.9/ncurses/tinfo/comp_expand.c +--- ncurses-5.9.orig/ncurses/tinfo/comp_expand.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/comp_expand.c 2012-08-25 19:58:01.059893097 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: comp_expand.c,v 1.21 2010/01/16 17:11:23 tom Exp $") ++MODULE_ID("$Id: comp_expand.c,v 1.25 2012/03/24 18:37:17 tom Exp $") + + static int + trailing_spaces(const char *src) +@@ -49,6 +49,8 @@ + #define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s)))) + #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s)))) + ++#define P_LIMIT(p) (length - (size_t)(p)) ++ + NCURSES_EXPORT(char *) + _nc_tic_expand(const char *srcp, bool tic_format, int numbers) + { +@@ -61,15 +63,15 @@ + size_t need = (2 + strlen(str)) * 4; + int ch; + +-#if NO_LEAKS + if (srcp == 0) { ++#if NO_LEAKS + if (buffer != 0) { + FreeAndNull(buffer); + length = 0; + } ++#endif + return 0; + } +-#endif + if (buffer == 0 || need > length) { + if ((buffer = typeRealloc(char, length = need, buffer)) == 0) + return 0; +@@ -90,7 +92,8 @@ + && str[1] != '\\' + && REALPRINT(str + 1) + && str[2] == S_QUOTE) { +- sprintf(buffer + bufp, "{%d}", str[1]); ++ _nc_SPRINTF(buffer + bufp, _nc_SLIMIT(P_LIMIT(bufp)) ++ "{%d}", str[1]); + bufp += (int) strlen(buffer + bufp); + str += 2; + } else { +@@ -177,10 +180,12 @@ + #define UnCtl(c) ((c) + '@') + else if (REALCTL(str) && ch != '\\' + && (!islong || isdigit(UChar(str[1])))) { +- (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch)); ++ _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp)) ++ "^%c", UnCtl(ch)); + bufp += 2; + } else { +- (void) sprintf(&buffer[bufp], "\\%03o", ch); ++ _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp)) ++ "\\%03o", ch); + bufp += 4; + } + +diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_parse.c ncurses-5.9/ncurses/tinfo/comp_parse.c +--- ncurses-5.9.orig/ncurses/tinfo/comp_parse.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/comp_parse.c 2012-08-25 19:58:01.233225611 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,15 +35,10 @@ + /* + * comp_parse.c -- parser driver loop and use handling. + * +- * _nc_read_entry_source(FILE *, literal, bool, bool (*hook)()) +- * _nc_resolve_uses2(void) +- * _nc_free_entries(void) +- * + * Use this code by calling _nc_read_entry_source() on as many source + * files as you like (either terminfo or termcap syntax). If you + * want use-resolution, call _nc_resolve_uses2(). To free the list + * storage, do _nc_free_entries(). +- * + */ + + #include <curses.priv.h> +@@ -52,7 +47,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: comp_parse.c,v 1.73 2010/12/25 23:06:37 tom Exp $") ++MODULE_ID("$Id: comp_parse.c,v 1.85 2012/04/14 23:30:10 tom Exp $") + + static void sanity_check2(TERMTYPE *, bool); + NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2; +@@ -61,6 +56,8 @@ + static void sanity_check(TERMTYPE *); + NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check; + ++static void fixup_acsc(TERMTYPE *, int); ++ + static void + enqueue(ENTRY * ep) + /* add an entry to the in-core list */ +@@ -86,16 +83,28 @@ + if (len > MAX_NAME_SIZE) + len = MAX_NAME_SIZE; + (void) strncpy(dst, src, len); +- (void) strcpy(dst + len, "|"); ++ _nc_STRCPY(dst + len, "|", MAX_NAME_SIZE); + src = dst; + } + return src; + } + #define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src) + +-NCURSES_EXPORT(bool) +-_nc_entry_match(char *n1, char *n2) +-/* do any of the aliases in a pair of terminal names match? */ ++#if USE_TERMCAP && NCURSES_XNAMES ++static char * ++skip_index(char *name) ++{ ++ char *bar = strchr(name, '|'); ++ ++ if (bar != 0 && (bar - name) == 2) ++ name = bar + 1; ++ ++ return name; ++} ++#endif ++ ++static bool ++check_collisions(char *n1, char *n2, int counter) + { + char *pstart, *qstart, *pend, *qend; + char nc1[MAX_NAME_SIZE + 2]; +@@ -104,15 +113,98 @@ + n1 = ForceBar(nc1, n1); + n2 = ForceBar(nc2, n2); + +- for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1) +- for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1) ++#if USE_TERMCAP && NCURSES_XNAMES ++ if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) { ++ n1 = skip_index(n1); ++ n2 = skip_index(n2); ++ } ++#endif ++ ++ for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1) { ++ for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1) { + if ((pend - pstart == qend - qstart) +- && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) ++ && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) { ++ if (counter > 0) ++ (void) fprintf(stderr, "Name collision '%.*s' between\n", ++ (int) (pend - pstart), pstart); + return (TRUE); ++ } ++ } ++ } + + return (FALSE); + } + ++static char * ++next_name(char *name) ++{ ++ if (*name != '\0') ++ ++name; ++ return name; ++} ++ ++static char * ++name_ending(char *name) ++{ ++ if (*name == '\0') { ++ name = 0; ++ } else { ++ while (*name != '\0' && *name != '|') ++ ++name; ++ } ++ return name; ++} ++ ++/* ++ * Essentially, find the conflict reported in check_collisions() and remove ++ * it from the second name, unless that happens to be the last alias. ++ */ ++static bool ++remove_collision(char *n1, char *n2) ++{ ++ char *p1 = n1; ++ char *p2 = n2; ++ char *pstart, *qstart, *pend, *qend; ++ bool removed = FALSE; ++ ++#if USE_TERMCAP && NCURSES_XNAMES ++ if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) { ++ p1 = n1 = skip_index(n1); ++ p2 = n2 = skip_index(n2); ++ } ++#else ++ (void) p1; ++#endif ++ ++ for (pstart = n1; (pend = name_ending(pstart)); pstart = next_name(pend)) { ++ for (qstart = n2; (qend = name_ending(qstart)); qstart = next_name(qend)) { ++ if ((pend - pstart == qend - qstart) ++ && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) { ++ if (qstart != p2 || *qend == '|') { ++ if (*qend == '|') ++ ++qend; ++ while ((*qstart++ = *qend++) != '\0') ; ++ fprintf(stderr, "...now\t%s\n", p2); ++ } else { ++ fprintf(stderr, "Cannot remove alias '%.*s'\n", ++ (int) (qend - qstart), qstart); ++ } ++ removed = TRUE; ++ break; ++ } ++ } ++ } ++ ++ return removed; ++} ++ ++/* do any of the aliases in a pair of terminal names match? */ ++NCURSES_EXPORT(bool) ++_nc_entry_match(char *n1, char *n2) ++{ ++ return check_collisions(n1, n2, 0); ++} ++ + /**************************************************************************** + * + * Entry compiler and resolution logic +@@ -198,19 +290,19 @@ + + for_entry_list(rp) { + if (qp > rp +- && _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) { +- matchcount++; +- if (matchcount == 1) { +- (void) fprintf(stderr, "Name collision between %s", +- _nc_first_name(qp->tterm.term_names)); +- multiples++; ++ && check_collisions(qp->tterm.term_names, ++ rp->tterm.term_names, ++ matchcount + 1)) { ++ if (!matchcount++) { ++ (void) fprintf(stderr, "\t%s\n", rp->tterm.term_names); ++ } ++ (void) fprintf(stderr, "and\t%s\n", qp->tterm.term_names); ++ if (!remove_collision(rp->tterm.term_names, ++ qp->tterm.term_names)) { ++ ++multiples; + } +- if (matchcount >= 1) +- (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names)); + } + } +- if (matchcount >= 1) +- (void) putc('\n', stderr); + } + if (multiples > 0) + return (FALSE); +@@ -378,7 +470,34 @@ + for_entry_list(qp) { + _nc_curr_line = (int) qp->startline; + _nc_set_type(_nc_first_name(qp->tterm.term_names)); +- _nc_check_termtype2(&qp->tterm, literal); ++ /* ++ * tic overrides this function pointer to provide more verbose ++ * checking. ++ */ ++ if (_nc_check_termtype2 != sanity_check2) { ++ SCREEN *save_SP = SP; ++ SCREEN fake_sp; ++ TERMINAL fake_tm; ++ TERMINAL *save_tm = cur_term; ++ ++ /* ++ * Setup so that tic can use ordinary terminfo interface ++ * to obtain capability information. ++ */ ++ memset(&fake_sp, 0, sizeof(fake_sp)); ++ memset(&fake_tm, 0, sizeof(fake_tm)); ++ fake_sp._term = &fake_tm; ++ fake_tm.type = qp->tterm; ++ SP = &fake_sp; ++ set_curterm(&fake_tm); ++ ++ _nc_check_termtype2(&qp->tterm, literal); ++ ++ SP = save_SP; ++ set_curterm(save_tm); ++ } else { ++ fixup_acsc(&qp->tterm, literal); ++ } + } + DEBUG(2, ("SANITY CHECK FINISHED")); + } +@@ -403,6 +522,17 @@ + #define CUR tp-> + + static void ++fixup_acsc(TERMTYPE *tp, int literal) ++{ ++ if (!literal) { ++ if (acs_chars == 0 ++ && enter_alt_charset_mode != 0 ++ && exit_alt_charset_mode != 0) ++ acs_chars = strdup(VT_ACSC); ++ } ++} ++ ++static void + sanity_check2(TERMTYPE *tp, bool literal) + { + if (!PRESENT(exit_attribute_mode)) { +@@ -428,10 +558,7 @@ + * prefer to bypass it... + */ + if (!literal) { +- if (acs_chars == 0 +- && enter_alt_charset_mode != 0 +- && exit_alt_charset_mode != 0) +- acs_chars = strdup(VT_ACSC); ++ fixup_acsc(tp, literal); + ANDMISSING(enter_alt_charset_mode, acs_chars); + ANDMISSING(exit_alt_charset_mode, acs_chars); + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/comp_scan.c ncurses-5.9/ncurses/tinfo/comp_scan.c +--- ncurses-5.9.orig/ncurses/tinfo/comp_scan.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/comp_scan.c 2012-08-25 19:58:01.316558550 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -50,7 +50,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: comp_scan.c,v 1.89 2010/12/25 23:06:37 tom Exp $") ++MODULE_ID("$Id: comp_scan.c,v 1.100 2012/04/29 00:20:51 tom Exp $") + + /* + * Maximum length of string capability we'll accept before raising an error. +@@ -61,6 +61,7 @@ + #define iswhite(ch) (ch == ' ' || ch == '\t') + + NCURSES_EXPORT_VAR (int) _nc_syntax = 0; /* termcap or terminfo? */ ++NCURSES_EXPORT_VAR (int) _nc_strict_bsd = 1; /* ncurses extended termcap? */ + NCURSES_EXPORT_VAR (long) _nc_curr_file_pos = 0; /* file offset of current line */ + NCURSES_EXPORT_VAR (long) _nc_comment_start = 0; /* start of comment range before name */ + NCURSES_EXPORT_VAR (long) _nc_comment_end = 0; /* end of comment range before name */ +@@ -127,14 +128,19 @@ + * Returns the final nonblank character on the current input buffer + */ + static int +-last_char(void) ++last_char(int from_end) + { + size_t len = strlen(bufptr); ++ int result = 0; ++ + while (len--) { +- if (!isspace(UChar(bufptr[len]))) +- return bufptr[len]; ++ if (!isspace(UChar(bufptr[len]))) { ++ if (from_end < (int) len) ++ result = bufptr[(int) len - from_end]; ++ break; ++ } + } +- return 0; ++ return result; + } + + /* +@@ -195,7 +201,8 @@ + result = typeRealloc(char, allocated, result); + if (result == 0) + return (EOF); +- bufstart = result; ++ if (bufstart) ++ bufstart = result; + } + if (used == 0) + _nc_curr_file_pos = ftell(yyin); +@@ -212,7 +219,7 @@ + } + } else { + if (used != 0) +- strcat(result, "\n"); ++ _nc_STRCAT(result, "\n", allocated); + } + if ((bufptr = bufstart) != 0) { + used = strlen(bufptr); +@@ -256,12 +263,12 @@ + } + + static void +-push_back(char c) ++push_back(int c) + /* push a character back onto the input stream */ + { + if (bufptr == bufstart) + _nc_syserr_abort("Can't backspace off beginning of line"); +- *--bufptr = c; ++ *--bufptr = (char) c; + _nc_curr_col--; + } + +@@ -299,6 +306,8 @@ + *tok_ptr++ = (char) ch; \ + *tok_ptr = '\0' + ++static char *tok_buf; ++ + /* + * int + * get_token() +@@ -336,15 +345,14 @@ + _nc_get_token(bool silent) + { + static const char terminfo_punct[] = "@%&*!#"; +- static char *tok_buf; + +- char *after_list; +- char *after_name; ++ char *after_name; /* after primary name */ ++ char *after_list; /* after primary and alias list */ + char *numchk; + char *tok_ptr; + char *s; + char numbuf[80]; +- int ch; ++ int ch, c0, c1; + int dot_flag = FALSE; + int type; + long number; +@@ -376,7 +384,6 @@ + if (tok_buf != 0) { + if (_nc_curr_token.tk_name == tok_buf) + _nc_curr_token.tk_name = 0; +- FreeAndNull(tok_buf); + } + return (EOF); + } +@@ -390,6 +397,7 @@ + } + + ch = eat_escaped_newline(ch); ++ _nc_curr_token.tk_valstring = 0; + + #ifdef TRACE + old_line = _nc_curr_line; +@@ -457,7 +465,7 @@ + after_list = tok_ptr; + if (after_name == 0) + after_name = tok_ptr; +- } else if (ch == ':' && last_char() != ',') { ++ } else if (ch == ':' && last_char(0) != ',') { + _nc_syntax = SYN_TERMCAP; + separator = ':'; + break; +@@ -471,12 +479,64 @@ + if (after_name == 0) + break; + /* +- * If we see a comma, we assume this is terminfo unless we +- * subsequently run into a colon. But we don't stop +- * looking for a colon until hitting a newline. This +- * allows commas to be embedded in description fields of +- * either syntax. ++ * We saw a comma, but are not entirely sure this is ++ * terminfo format, since we can still be parsing the ++ * description field (for either syntax). ++ * ++ * A properly formatted termcap line ends with either a ++ * colon, or a backslash after a colon. It is possible ++ * to have a backslash in the middle of a capability, but ++ * then there would be no leading whitespace on the next ++ * line - something we want to discourage. + */ ++ c0 = last_char(0); ++ c1 = last_char(1); ++ if (c1 != ':' && c0 != '\\' && c0 != ':') { ++ bool capability = FALSE; ++ ++ /* ++ * Since it is not termcap, assume the line is terminfo ++ * format. However, the comma can be embedded in a ++ * description field. It also can be a separator ++ * between a description field and a capability. ++ * ++ * Improve the guess by checking if the next word after ++ * the comma does not look like a capability. In that ++ * case, extend the description past the comma. ++ */ ++ for (s = bufptr; isspace(UChar(*s)); ++s) { ++ ; ++ } ++ if (islower(UChar(*s))) { ++ char *name = s; ++ while (isalnum(UChar(*s))) { ++ ++s; ++ } ++ if (*s == '#' || *s == '=' || *s == '@') { ++ /* ++ * Checking solely with syntax allows us to ++ * support extended capabilities with string ++ * values. ++ */ ++ capability = TRUE; ++ } else if (*s == ',') { ++ c0 = *s; ++ *s = '\0'; ++ /* ++ * Otherwise, we can handle predefined boolean ++ * capabilities, still aided by syntax. ++ */ ++ if (_nc_find_entry(name, ++ _nc_get_hash_table(FALSE))) { ++ capability = TRUE; ++ } ++ *s = (char) c0; ++ } ++ } ++ if (capability) { ++ break; ++ } ++ } + } else + ch = eat_escaped_newline(ch); + +@@ -748,7 +808,7 @@ + if (!(is7bits(c) && isprint(c))) { + _nc_warning("Illegal ^ character - '%s'", unctrl(UChar(c))); + } +- if (c == '?') { ++ if (c == '?' && (_nc_syntax != SYN_TERMCAP)) { + *(ptr++) = '\177'; + if (_nc_tracing) + _nc_warning("Allow ^? as synonym for \\177"); +@@ -758,23 +818,29 @@ + *(ptr++) = (char) (c); + } + } else if (c == '\\') { ++ bool strict_bsd = ((_nc_syntax == SYN_TERMCAP) && _nc_strict_bsd); ++ + c = next_char(); + if (c == EOF) + _nc_err_abort(MSG_NO_INPUTS); + +- if (c >= '0' && c <= '7') { ++#define isoctal(c) ((c) >= '0' && (c) <= '7') ++ ++ if (isoctal(c) || (strict_bsd && isdigit(c))) { + number = c - '0'; + for (i = 0; i < 2; i++) { + c = next_char(); + if (c == EOF) + _nc_err_abort(MSG_NO_INPUTS); + +- if (c < '0' || c > '7') { ++ if (!isoctal(c)) { + if (isdigit(c)) { +- _nc_warning("Non-octal digit `%c' in \\ sequence", c); +- /* allow the digit; it'll do less harm */ ++ if (!strict_bsd) { ++ _nc_warning("Non-octal digit `%c' in \\ sequence", c); ++ /* allow the digit; it'll do less harm */ ++ } + } else { +- push_back((char) c); ++ push_back(c); + break; + } + } +@@ -782,21 +848,16 @@ + number = number * 8 + c - '0'; + } + +- if (number == 0) ++ number = UChar(number); ++ if (number == 0 && !strict_bsd) + number = 0200; + *(ptr++) = (char) number; + } else { + switch (c) { + case 'E': +- case 'e': + *(ptr++) = '\033'; + break; + +- case 'a': +- *(ptr++) = '\007'; +- break; +- +- case 'l': + case 'n': + *(ptr++) = '\n'; + break; +@@ -809,10 +870,6 @@ + *(ptr++) = '\010'; + break; + +- case 's': +- *(ptr++) = ' '; +- break; +- + case 'f': + *(ptr++) = '\014'; + break; +@@ -833,16 +890,33 @@ + *(ptr++) = ','; + break; + +- case ':': +- *(ptr++) = ':'; +- break; +- + case '\n': + continue; + + default: +- _nc_warning("Illegal character '%s' in \\ sequence", +- unctrl(UChar(c))); ++ if ((_nc_syntax == SYN_TERMINFO) || !_nc_strict_bsd) { ++ switch (c) { ++ case 'a': ++ c = '\007'; ++ break; ++ case 'e': ++ c = '\033'; ++ break; ++ case 'l': ++ c = '\n'; ++ break; ++ case 's': ++ c = ' '; ++ break; ++ case ':': ++ c = ':'; ++ break; ++ default: ++ _nc_warning("Illegal character '%s' in \\ sequence", ++ unctrl(UChar(c))); ++ break; ++ } ++ } + /* FALLTHRU */ + case '|': + *(ptr++) = (char) c; +@@ -862,7 +936,7 @@ + + if (!ignored) { + if (_nc_curr_col <= 1) { +- push_back((char) c); ++ push_back(c); + c = '\n'; + break; + } +@@ -934,5 +1008,8 @@ + if (pushname != 0) { + FreeAndNull(pushname); + } ++ if (tok_buf != 0) { ++ FreeAndNull(tok_buf); ++ } + } + #endif +diff -Naur ncurses-5.9.orig/ncurses/tinfo/db_iterator.c ncurses-5.9/ncurses/tinfo/db_iterator.c +--- ncurses-5.9.orig/ncurses/tinfo/db_iterator.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/db_iterator.c 2012-08-25 19:58:01.863222632 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,13 +36,142 @@ + + #include <curses.priv.h> + ++#include <time.h> + #include <tic.h> + +-MODULE_ID("$Id: db_iterator.c,v 1.9 2010/12/25 23:00:25 tom Exp $") ++#if USE_HASHED_DB ++#include <hashed_db.h> ++#endif ++ ++MODULE_ID("$Id: db_iterator.c,v 1.34 2012/06/30 16:30:10 tom Exp $") + + #define HaveTicDirectory _nc_globals.have_tic_directory + #define KeepTicDirectory _nc_globals.keep_tic_directory + #define TicDirectory _nc_globals.tic_directory ++#define my_blob _nc_globals.dbd_blob ++#define my_list _nc_globals.dbd_list ++#define my_size _nc_globals.dbd_size ++#define my_time _nc_globals.dbd_time ++#define my_vars _nc_globals.dbd_vars ++ ++static void ++add_to_blob(const char *text, size_t limit) ++{ ++ (void) limit; ++ ++ if (*text != '\0') { ++ char *last = my_blob + strlen(my_blob); ++ if (last != my_blob) ++ *last++ = NCURSES_PATHSEP; ++ _nc_STRCPY(last, text, limit); ++ } ++} ++ ++static bool ++check_existence(const char *name, struct stat *sb) ++{ ++ bool result = FALSE; ++ ++ if (stat(name, sb) == 0 ++ && (S_ISDIR(sb->st_mode) || S_ISREG(sb->st_mode))) { ++ result = TRUE; ++ } ++#if USE_HASHED_DB ++ else if (strlen(name) < PATH_MAX - sizeof(DBM_SUFFIX)) { ++ char temp[PATH_MAX]; ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "%s%s", name, DBM_SUFFIX); ++ if (stat(temp, sb) == 0 && S_ISREG(sb->st_mode)) { ++ result = TRUE; ++ } ++ } ++#endif ++ return result; ++} ++ ++/* ++ * Store the latest value of an environment variable in my_vars[] so we can ++ * detect if one changes, invalidating the cached search-list. ++ */ ++static bool ++update_getenv(const char *name, DBDIRS which) ++{ ++ bool result = FALSE; ++ ++ if (which < dbdLAST) { ++ char *value; ++ ++ if ((value = getenv(name)) == 0 || (value = strdup(value)) == 0) { ++ ; ++ } else if (my_vars[which].name == 0 || strcmp(my_vars[which].name, name)) { ++ FreeIfNeeded(my_vars[which].value); ++ my_vars[which].name = name; ++ my_vars[which].value = value; ++ result = TRUE; ++ } else if ((my_vars[which].value != 0) ^ (value != 0)) { ++ FreeIfNeeded(my_vars[which].value); ++ my_vars[which].value = value; ++ result = TRUE; ++ } else if (value != 0 && strcmp(value, my_vars[which].value)) { ++ FreeIfNeeded(my_vars[which].value); ++ my_vars[which].value = value; ++ result = TRUE; ++ } else { ++ free(value); ++ } ++ } ++ return result; ++} ++ ++static char * ++cache_getenv(const char *name, DBDIRS which) ++{ ++ char *result = 0; ++ ++ (void) update_getenv(name, which); ++ if (which < dbdLAST) { ++ result = my_vars[which].value; ++ } ++ return result; ++} ++ ++/* ++ * The cache expires if at least a second has passed since the initial lookup, ++ * or if one of the environment variables changed. ++ * ++ * Only a few applications use multiple lookups of terminal entries, seems that ++ * aside from bulk I/O such as tic and toe, that leaves interactive programs ++ * which should not be modifying the terminal databases in a way that would ++ * invalidate the search-list. ++ * ++ * The "1-second" is to allow for user-directed changes outside the program. ++ */ ++static bool ++cache_expired(void) ++{ ++ bool result = FALSE; ++ time_t now = time((time_t *) 0); ++ ++ if (now > my_time) { ++ result = TRUE; ++ } else { ++ DBDIRS n; ++ for (n = (DBDIRS) 0; n < dbdLAST; ++n) { ++ if (my_vars[n].name != 0 ++ && update_getenv(my_vars[n].name, n)) { ++ result = TRUE; ++ break; ++ } ++ } ++ } ++ return result; ++} ++ ++static void ++free_cache(void) ++{ ++ FreeAndNull(my_blob); ++ FreeAndNull(my_list); ++} + + /* + * Record the "official" location of the terminfo directory, according to +@@ -51,6 +180,7 @@ + NCURSES_EXPORT(const char *) + _nc_tic_dir(const char *path) + { ++ T(("_nc_tic_dir %s", NonNull(path))); + if (!KeepTicDirectory) { + if (path != 0) { + TicDirectory = path; +@@ -61,7 +191,7 @@ + return _nc_tic_dir(envp); + } + } +- return TicDirectory; ++ return TicDirectory ? TicDirectory : TERMINFO; + } + + /* +@@ -77,61 +207,16 @@ + } + + /* +- * Process the list of :-separated directories, looking for the terminal type. +- * We don't use strtok because it does not show us empty tokens. +- */ +-#define ThisDbList _nc_globals.dbi_list +-#define ThisDbSize _nc_globals.dbi_size +- +-/* + * Cleanup. + */ + NCURSES_EXPORT(void) + _nc_last_db(void) + { +- if (ThisDbList != 0) { +- FreeAndNull(ThisDbList); +- } +- ThisDbSize = 0; +-} +- +-/* The TERMINFO_DIRS value, if defined by the configure script, begins with a +- * ":", which will be interpreted as TERMINFO. +- */ +-static const char * +-next_list_item(const char *source, int *offset) +-{ +- if (source != 0) { +- FreeIfNeeded(ThisDbList); +- ThisDbList = strdup(source); +- ThisDbSize = (int) strlen(source); +- } +- +- if (ThisDbList != 0 && ThisDbSize && *offset < ThisDbSize) { +- static char system_db[] = TERMINFO; +- char *result = ThisDbList + *offset; +- char *marker = strchr(result, NCURSES_PATHSEP); +- +- /* +- * Put a null on the marker if a separator was found. Set the offset +- * to the next position after the marker so we can call this function +- * again, using the data at the offset. +- */ +- if (marker == 0) { +- *offset += (int) strlen(result); +- } else { +- *marker++ = 0; +- *offset = (int) (marker - ThisDbList); +- } +- if (*result == 0 && result != (ThisDbList + ThisDbSize)) +- result = system_db; +- return result; ++ if (my_blob != 0 && cache_expired()) { ++ free_cache(); + } +- return 0; + } + +-#define NEXT_DBD(var, offset) next_list_item((*offset == 0) ? var : 0, offset) +- + /* + * This is a simple iterator which allows the caller to step through the + * possible locations for a terminfo directory. ncurses uses this to find +@@ -141,84 +226,186 @@ + _nc_next_db(DBDIRS * state, int *offset) + { + const char *result; +- char *envp; +- +- while (*state < dbdLAST) { +- DBDIRS next = (DBDIRS) ((int) (*state) + 1); + ++ (void) offset; ++ if ((int) *state < my_size ++ && my_list != 0 ++ && my_list[*state] != 0) { ++ result = my_list[*state]; ++ (*state)++; ++ } else { + result = 0; ++ } ++ if (result != 0) { ++ T(("_nc_next_db %d %s", *state, result)); ++ } ++ return result; ++} ++ ++NCURSES_EXPORT(void) ++_nc_first_db(DBDIRS * state, int *offset) ++{ ++ bool cache_has_expired = FALSE; ++ *state = dbdTIC; ++ *offset = 0; ++ ++ T(("_nc_first_db")); ++ ++ /* build a blob containing all of the strings we will use for a lookup ++ * table. ++ */ ++ if (my_blob == 0 || (cache_has_expired = cache_expired())) { ++ size_t blobsize = 0; ++ const char *values[dbdLAST]; ++ struct stat *my_stat; ++ int j, k; ++ ++ if (cache_has_expired) ++ free_cache(); ++ ++ for (j = 0; j < dbdLAST; ++j) ++ values[j] = 0; ++ ++ /* ++ * This is the first item in the list, and is used only when tic is ++ * writing to the database, as a performance improvement. ++ */ ++ values[dbdTIC] = TicDirectory; + +- switch (*state) { +- case dbdTIC: +- if (HaveTicDirectory) +- result = _nc_tic_dir(0); +- break; + #if USE_DATABASE +- case dbdEnvOnce: +- if (use_terminfo_vars()) { +- if ((envp = getenv("TERMINFO")) != 0) +- result = _nc_tic_dir(envp); +- } +- break; +- case dbdHome: +- if (use_terminfo_vars()) { +- result = _nc_home_terminfo(); +- } +- break; +- case dbdEnvList: +- if (use_terminfo_vars()) { +- if ((result = NEXT_DBD(getenv("TERMINFO_DIRS"), offset)) != 0) +- next = *state; +- } +- break; +- case dbdCfgList: + #ifdef TERMINFO_DIRS +- if ((result = NEXT_DBD(TERMINFO_DIRS, offset)) != 0) +- next = *state; ++ values[dbdCfgList] = TERMINFO_DIRS; ++#endif ++#ifdef TERMINFO ++ values[dbdCfgOnce] = TERMINFO; + #endif +- break; +- case dbdCfgOnce: +-#ifndef TERMINFO_DIRS +- result = TERMINFO; + #endif +- break; +-#endif /* USE_DATABASE */ ++ + #if USE_TERMCAP +- case dbdEnvOnce2: +- if (use_terminfo_vars()) { +- if ((envp = getenv("TERMCAP")) != 0) +- result = _nc_tic_dir(envp); +- } +- break; +- case dbdEnvList2: +- if (use_terminfo_vars()) { +- if ((result = NEXT_DBD(getenv("TERMPATH"), offset)) != 0) +- next = *state; ++ values[dbdCfgList2] = TERMPATH; ++#endif ++ ++ if (use_terminfo_vars()) { ++#if USE_DATABASE ++ values[dbdEnvOnce] = cache_getenv("TERMINFO", dbdEnvOnce); ++ values[dbdHome] = _nc_home_terminfo(); ++ (void) cache_getenv("HOME", dbdHome); ++ values[dbdEnvList] = cache_getenv("TERMINFO_DIRS", dbdEnvList); ++ ++#endif ++#if USE_TERMCAP ++ values[dbdEnvOnce2] = cache_getenv("TERMCAP", dbdEnvOnce2); ++ /* only use $TERMCAP if it is an absolute path */ ++ if (values[dbdEnvOnce2] != 0 ++ && *values[dbdEnvOnce2] != '/') { ++ values[dbdEnvOnce2] = 0; + } +- break; +- case dbdCfgList2: +- if ((result = NEXT_DBD(TERMPATH, offset)) != 0) +- next = *state; +- break; ++ values[dbdEnvList2] = cache_getenv("TERMPATH", dbdEnvList2); + #endif /* USE_TERMCAP */ +- case dbdLAST: +- break; + } +- if (*state != next) { +- *state = next; +- *offset = 0; +- _nc_last_db(); ++ ++ for (j = 0; j < dbdLAST; ++j) { ++ if (values[j] == 0) ++ values[j] = ""; ++ blobsize += 2 + strlen(values[j]); + } +- if (result != 0) { +- return result; ++ ++ my_blob = malloc(blobsize); ++ if (my_blob != 0) { ++ *my_blob = '\0'; ++ for (j = 0; j < dbdLAST; ++j) { ++ add_to_blob(values[j], blobsize); ++ } ++ ++ /* Now, build an array which will be pointers to the distinct ++ * strings in the blob. ++ */ ++ blobsize = 2; ++ for (j = 0; my_blob[j] != '\0'; ++j) { ++ if (my_blob[j] == NCURSES_PATHSEP) ++ ++blobsize; ++ } ++ my_list = typeCalloc(char *, blobsize); ++ my_stat = typeCalloc(struct stat, blobsize); ++ if (my_list != 0 && my_stat != 0) { ++ k = 0; ++ my_list[k++] = my_blob; ++ for (j = 0; my_blob[j] != '\0'; ++j) { ++ if (my_blob[j] == NCURSES_PATHSEP) { ++ my_blob[j] = '\0'; ++ my_list[k++] = &my_blob[j + 1]; ++ } ++ } ++ ++ /* ++ * Eliminate duplicates from the list. ++ */ ++ for (j = 0; my_list[j] != 0; ++j) { ++#ifdef TERMINFO ++ if (*my_list[j] == '\0') ++ my_list[j] = strdup(TERMINFO); ++#endif ++ for (k = 0; k < j; ++k) { ++ if (!strcmp(my_list[j], my_list[k])) { ++ k = j - 1; ++ while ((my_list[j] = my_list[j + 1]) != 0) { ++ ++j; ++ } ++ j = k; ++ break; ++ } ++ } ++ } ++ ++ /* ++ * Eliminate non-existent databases, and those that happen to ++ * be symlinked to another location. ++ */ ++ for (j = 0; my_list[j] != 0; ++j) { ++ bool found = check_existence(my_list[j], &my_stat[j]); ++#if HAVE_LINK ++ if (found) { ++ for (k = 0; k < j; ++k) { ++ if (my_stat[j].st_dev == my_stat[k].st_dev ++ && my_stat[j].st_ino == my_stat[k].st_ino) { ++ found = FALSE; ++ break; ++ } ++ } ++ } ++#endif ++ if (!found) { ++ k = j; ++ while ((my_list[k] = my_list[k + 1]) != 0) { ++ ++k; ++ } ++ --j; ++ } ++ } ++ my_size = j; ++ my_time = time((time_t *) 0); ++ } else { ++ FreeAndNull(my_blob); ++ } ++ free(my_stat); + } + } +- return 0; + } + +-NCURSES_EXPORT(void) +-_nc_first_db(DBDIRS * state, int *offset) ++#if NO_LEAKS ++void ++_nc_db_iterator_leaks(void) + { +- *state = dbdTIC; +- *offset = 0; ++ DBDIRS which; ++ ++ if (my_blob != 0) ++ FreeAndNull(my_blob); ++ if (my_list != 0) ++ FreeAndNull(my_list); ++ for (which = 0; which < dbdLAST; ++which) { ++ my_vars[which].name = 0; ++ FreeIfNeeded(my_vars[which].value); ++ my_vars[which].value = 0; ++ } + } ++#endif +diff -Naur ncurses-5.9.orig/ncurses/tinfo/doalloc.c ncurses-5.9/ncurses/tinfo/doalloc.c +--- ncurses-5.9.orig/ncurses/tinfo/doalloc.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/doalloc.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998,2000 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: doalloc.c,v 1.8 2002/08/31 21:48:11 Philippe.Blain Exp $") ++MODULE_ID("$Id: doalloc.c,v 1.10 2012/02/22 22:34:31 tom Exp $") + + NCURSES_EXPORT(void *) + _nc_doalloc(void *oldp, size_t amount) +@@ -63,9 +63,10 @@ + { + char *dst; + if (src != 0) { +- dst = typeMalloc(char, strlen(src) + 1); ++ size_t need = strlen(src) + 1; ++ dst = typeMalloc(char, need); + if (dst != 0) { +- (void) strcpy(dst, src); ++ _nc_STRCPY(dst, src, need); + } + } else { + dst = 0; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/entries.c ncurses-5.9/ncurses/tinfo/entries.c +--- ncurses-5.9.orig/ncurses/tinfo/entries.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/entries.c 2012-08-25 19:58:01.376558266 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: entries.c,v 1.17 2010/01/23 17:57:43 tom Exp $") ++MODULE_ID("$Id: entries.c,v 1.21 2012/05/05 20:33:44 tom Exp $") + + /**************************************************************************** + * +@@ -96,6 +96,9 @@ + if (last != 0) { + last->next = ep->next; + } ++ if (ep->next != 0) { ++ ep->next->last = last; ++ } + if (ep == _nc_head) { + _nc_head = ep->next; + } +@@ -128,19 +131,21 @@ + _nc_free_entries(_nc_head); + _nc_get_type(0); + _nc_first_name(0); ++ _nc_db_iterator_leaks(); + _nc_keyname_leaks(); + #if BROKEN_LINKER || USE_REENTRANT + _nc_names_leaks(); + _nc_codes_leaks(); + FreeIfNeeded(_nc_prescreen.real_acs_map); + #endif ++ _nc_comp_error_leaks(); + + if ((s = _nc_home_terminfo()) != 0) + free(s); + + #ifdef TRACE + trace(0); +- _nc_trace_buf(-1, 0); ++ _nc_trace_buf(-1, (size_t) 0); + #endif + + #endif /* NO_LEAKS */ +diff -Naur ncurses-5.9.orig/ncurses/tinfo/getenv_num.c ncurses-5.9/ncurses/tinfo/getenv_num.c +--- ncurses-5.9.orig/ncurses/tinfo/getenv_num.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/getenv_num.c 2012-08-25 19:58:01.999888649 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998,2000 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: getenv_num.c,v 1.3 2000/12/10 02:55:07 tom Exp $") ++MODULE_ID("$Id: getenv_num.c,v 1.4 2012/07/14 21:17:19 tom Exp $") + + NCURSES_EXPORT(int) + _nc_getenv_num(const char *name) +@@ -54,3 +54,20 @@ + + return (int) value; + } ++ ++NCURSES_EXPORT(void) ++_nc_setenv_num(const char *name, int value) ++{ ++ if (name != 0 && value >= 0) { ++ char buffer[128]; ++#if HAVE_SETENV ++ sprintf(buffer, "%d", value); ++ setenv(name, buffer, 1); ++#elif HAVE_PUTENV ++ char *s; ++ sprintf(buffer, "%s=%d", name, value); ++ if ((s = strdup(buffer)) != 0) ++ putenv(s); ++#endif ++ } ++} +diff -Naur ncurses-5.9.orig/ncurses/tinfo/hashed_db.c ncurses-5.9/ncurses/tinfo/hashed_db.c +--- ncurses-5.9.orig/ncurses/tinfo/hashed_db.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/hashed_db.c 2012-08-25 19:58:00.036564603 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,12 +36,79 @@ + + #if USE_HASHED_DB + +-MODULE_ID("$Id: hashed_db.c,v 1.14 2008/12/13 20:59:02 tom Exp $") ++MODULE_ID("$Id: hashed_db.c,v 1.15 2011/08/13 21:08:08 tom Exp $") + + #if HASHED_DB_API >= 2 + static DBC *cursor; + #endif + ++typedef struct _myconn { ++ struct _myconn *next; ++ DB *db; ++ char *path; ++ bool modify; ++} MYCONN; ++ ++static MYCONN *connections; ++ ++static void ++cleanup(void) ++{ ++ while (connections != 0) { ++ _nc_db_close(connections->db); ++ } ++} ++ ++static DB * ++find_connection(const char *path, bool modify) ++{ ++ DB *result = 0; ++ MYCONN *p; ++ ++ for (p = connections; p != 0; p = p->next) { ++ if (!strcmp(p->path, path) && p->modify == modify) { ++ result = p->db; ++ break; ++ } ++ } ++ ++ return result; ++} ++ ++static void ++drop_connection(DB * db) ++{ ++ MYCONN *p, *q; ++ ++ for (p = connections, q = 0; p != 0; q = p, p = p->next) { ++ if (p->db == db) { ++ if (q != 0) ++ q->next = p->next; ++ else ++ connections = p->next; ++ free(p->path); ++ free(p); ++ break; ++ } ++ } ++} ++ ++static void ++make_connection(DB * db, const char *path, bool modify) ++{ ++ MYCONN *p = typeCalloc(MYCONN, 1); ++ ++ if (p != 0) { ++ p->db = db; ++ p->path = strdup(path); ++ p->modify = modify; ++ if (p->path != 0) { ++ p->next = connections; ++ connections = p; ++ } ++ } ++} ++ + /* + * Open the database. + */ +@@ -51,50 +118,57 @@ + DB *result = 0; + int code; + ++ if (connections == 0) ++ atexit(cleanup); ++ ++ if ((result = find_connection(path, modify)) == 0) { ++ + #if HASHED_DB_API >= 4 +- db_create(&result, NULL, 0); +- if ((code = result->open(result, +- NULL, +- path, +- NULL, +- DB_HASH, +- modify ? DB_CREATE : DB_RDONLY, +- 0644)) != 0) { +- result = 0; +- } ++ db_create(&result, NULL, 0); ++ if ((code = result->open(result, ++ NULL, ++ path, ++ NULL, ++ DB_HASH, ++ modify ? DB_CREATE : DB_RDONLY, ++ 0644)) != 0) { ++ result = 0; ++ } + #elif HASHED_DB_API >= 3 +- db_create(&result, NULL, 0); +- if ((code = result->open(result, +- path, +- NULL, +- DB_HASH, +- modify ? DB_CREATE : DB_RDONLY, +- 0644)) != 0) { +- result = 0; +- } ++ db_create(&result, NULL, 0); ++ if ((code = result->open(result, ++ path, ++ NULL, ++ DB_HASH, ++ modify ? DB_CREATE : DB_RDONLY, ++ 0644)) != 0) { ++ result = 0; ++ } + #elif HASHED_DB_API >= 2 +- if ((code = db_open(path, +- DB_HASH, +- modify ? DB_CREATE : DB_RDONLY, +- 0644, +- (DB_ENV *) 0, +- (DB_INFO *) 0, +- &result)) != 0) { +- result = 0; +- } ++ if ((code = db_open(path, ++ DB_HASH, ++ modify ? DB_CREATE : DB_RDONLY, ++ 0644, ++ (DB_ENV *) 0, ++ (DB_INFO *) 0, ++ &result)) != 0) { ++ result = 0; ++ } + #else +- if ((result = dbopen(path, +- modify ? (O_CREAT | O_RDWR) : O_RDONLY, +- 0644, +- DB_HASH, +- NULL)) == 0) { +- code = errno; +- } ++ if ((result = dbopen(path, ++ modify ? (O_CREAT | O_RDWR) : O_RDONLY, ++ 0644, ++ DB_HASH, ++ NULL)) == 0) { ++ code = errno; ++ } + #endif +- if (result != 0) { +- T(("opened %s", path)); +- } else { +- T(("cannot open %s: %s", path, strerror(code))); ++ if (result != 0) { ++ make_connection(result, path, modify); ++ T(("opened %s", path)); ++ } else { ++ T(("cannot open %s: %s", path, strerror(code))); ++ } + } + return result; + } +@@ -107,6 +181,7 @@ + { + int result; + ++ drop_connection(db); + #if HASHED_DB_API >= 2 + result = db->close(db, 0); + #else +diff -Naur ncurses-5.9.orig/ncurses/tinfo/home_terminfo.c ncurses-5.9/ncurses/tinfo/home_terminfo.c +--- ncurses-5.9.orig/ncurses/tinfo/home_terminfo.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/home_terminfo.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + #include <curses.priv.h> + #include <tic.h> + +-MODULE_ID("$Id: home_terminfo.c,v 1.12 2010/12/25 23:43:58 tom Exp $") ++MODULE_ID("$Id: home_terminfo.c,v 1.14 2012/02/22 22:40:24 tom Exp $") + + /* ncurses extension...fall back on user's private directory */ + +@@ -57,7 +57,7 @@ + MyBuffer = typeMalloc(char, want); + if (MyBuffer == 0) + _nc_err_abort(MSG_NO_MEMORY); +- (void) sprintf(MyBuffer, PRIVATE_INFO, home); ++ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(want) PRIVATE_INFO, home); + } + } + result = MyBuffer; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_data.c ncurses-5.9/ncurses/tinfo/lib_data.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_data.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_data.c 2012-08-25 19:58:01.999888649 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_data.c,v 1.61 2010/05/15 22:06:56 tom Exp $") ++MODULE_ID("$Id: lib_data.c,v 1.64 2012/07/14 21:01:49 tom Exp $") + + /* + * OS/2's native linker complains if we don't initialize public data when +@@ -125,7 +125,7 @@ + + FALSE, /* have_tic_directory */ + FALSE, /* keep_tic_directory */ +- TERMINFO, /* tic_directory */ ++ 0, /* tic_directory */ + + NULL, /* dbi_list */ + 0, /* dbi_size */ +@@ -142,6 +142,12 @@ + 0, /* tgetent_index */ + 0, /* tgetent_sequence */ + ++ 0, /* dbd_blob */ ++ 0, /* dbd_list */ ++ 0, /* dbd_size */ ++ 0, /* dbd_time */ ++ { { 0, 0 } }, /* dbd_vars */ ++ + #ifndef USE_SP_WINDOWLIST + 0, /* _nc_windowlist */ + #endif +@@ -249,6 +255,7 @@ + NULL, /* _tputs_trace */ + #endif + #endif ++ FALSE, /* use_tioctl */ + }; + /* *INDENT-ON* */ + +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_napms.c ncurses-5.9/ncurses/tinfo/lib_napms.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_napms.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_napms.c 2012-08-25 19:58:01.863222632 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -51,17 +51,21 @@ + #endif + #endif + +-MODULE_ID("$Id: lib_napms.c,v 1.20 2009/11/07 20:37:30 tom Exp $") ++MODULE_ID("$Id: lib_napms.c,v 1.23 2012/06/30 22:08:24 tom Exp $") + + NCURSES_EXPORT(int) + NCURSES_SP_NAME(napms) (NCURSES_SP_DCLx int ms) + { +- (void) SP_PARM; + T((T_CALLED("napms(%d)"), ms)); + + #ifdef USE_TERM_DRIVER +- CallDriver_1(SP_PARM, nap, ms); ++ if (HasTerminal(SP_PARM)) { ++ CallDriver_1(SP_PARM, nap, ms); ++ } + #else /* !USE_TERM_DRIVER */ ++#if NCURSES_SP_FUNCS ++ (void) sp; ++#endif + #if HAVE_NANOSLEEP + { + struct timespec request, remaining; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_options.c ncurses-5.9/ncurses/tinfo/lib_options.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_options.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_options.c 2012-08-25 19:58:00.039897921 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -46,7 +46,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_options.c,v 1.71 2009/10/24 21:56:15 tom Exp $") ++MODULE_ID("$Id: lib_options.c,v 1.72 2011/10/22 16:31:35 tom Exp $") + + NCURSES_EXPORT(int) + idlok(WINDOW *win, bool flag) +@@ -324,7 +324,7 @@ + * the terminal state _before_ switching modes. + */ + NCURSES_EXPORT(int) +-_nc_keypad(SCREEN *sp, bool flag) ++_nc_keypad(SCREEN *sp, int flag) + { + int rc = ERR; + +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_print.c ncurses-5.9/ncurses/tinfo/lib_print.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_print.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_print.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_print.c,v 1.20 2010/06/05 22:18:35 tom Exp $") ++MODULE_ID("$Id: lib_print.c,v 1.23 2012/02/22 22:34:31 tom Exp $") + + NCURSES_EXPORT(int) + NCURSES_SP_NAME(mcprint) (NCURSES_SP_DCLx char *data, int len) +@@ -76,10 +76,10 @@ + return (ERR); + } + +- (void) strcpy(mybuf, switchon); +- memcpy(mybuf + onsize, data, (unsigned) len); ++ _nc_STRCPY(mybuf, switchon, need); ++ memcpy(mybuf + onsize, data, (size_t) len); + if (offsize) +- (void) strcpy(mybuf + onsize + len, prtr_off); ++ _nc_STRCPY(mybuf + onsize + len, prtr_off, need); + + /* + * We're relying on the atomicity of UNIX writes here. The +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_raw.c ncurses-5.9/ncurses/tinfo/lib_raw.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_raw.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_raw.c 2012-08-25 19:58:00.396562900 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -49,11 +49,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_raw.c,v 1.19 2010/04/24 23:49:12 tom Exp $") +- +-#if SVR4_TERMIO && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif ++MODULE_ID("$Id: lib_raw.c,v 1.21 2012/01/21 19:21:29 KO.Myung-Hun Exp $") + + #if HAVE_SYS_TERMIO_H + #include <sys/termio.h> /* needed for ISC */ +@@ -66,6 +62,11 @@ + #define _nc_setmode(mode) /* nothing */ + #endif + ++#if USE_KLIBC_KBD ++#define INCL_KBD ++#include <os2.h> ++#endif ++ + #define COOKED_INPUT (IXON|BRKINT|PARMRK) + + #ifdef TRACE +@@ -100,6 +101,17 @@ + #endif + result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); + if (result == OK) { ++#if USE_KLIBC_KBD ++ KBDINFO kbdinfo; ++ ++ kbdinfo.cb = sizeof(kbdinfo); ++ KbdGetStatus(&kbdinfo, 0); ++ ++ kbdinfo.cb = sizeof(kbdinfo); ++ kbdinfo.fsMask &= ~KEYBOARD_ASCII_MODE; ++ kbdinfo.fsMask |= KEYBOARD_BINARY_MODE; ++ KbdSetStatus(&kbdinfo, 0); ++#endif + SP_PARM->_raw = TRUE; + SP_PARM->_cbreak = 1; + termp->Nttyb = buf; +@@ -218,6 +230,17 @@ + #endif + result = NCURSES_SP_NAME(_nc_set_tty_mode) (NCURSES_SP_ARGx &buf); + if (result == OK) { ++#if USE_KLIBC_KBD ++ KBDINFO kbdinfo; ++ ++ kbdinfo.cb = sizeof(kbdinfo); ++ KbdGetStatus(&kbdinfo, 0); ++ ++ kbdinfo.cb = sizeof(kbdinfo); ++ kbdinfo.fsMask &= ~KEYBOARD_BINARY_MODE; ++ kbdinfo.fsMask |= KEYBOARD_ASCII_MODE; ++ KbdSetStatus(&kbdinfo, 0); ++#endif + SP_PARM->_raw = FALSE; + SP_PARM->_cbreak = 0; + termp->Nttyb = buf; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_setup.c ncurses-5.9/ncurses/tinfo/lib_setup.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_setup.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_setup.c 2012-08-25 19:58:02.026555193 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,21 +37,18 @@ + * Terminal setup routines common to termcap and terminfo: + * + * use_env(bool) ++ * use_tioctl(bool) + * setupterm(char *, int, int *) + */ + + #include <curses.priv.h> + #include <tic.h> /* for MAX_NAME_SIZE */ + +-#if SVR4_TERMIO && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif +- + #if HAVE_LOCALE_H + #include <locale.h> + #endif + +-MODULE_ID("$Id: lib_setup.c,v 1.135 2011/02/06 01:04:21 tom Exp $") ++MODULE_ID("$Id: lib_setup.c,v 1.148 2012/07/21 18:05:41 tom Exp $") + + /**************************************************************************** + * +@@ -225,6 +222,7 @@ + { + T((T_CALLED("use_env(%p,%d)"), (void *) SP_PARM, (int) f)); + #if NCURSES_SP_FUNCS ++ START_TRACE(); + if (IsPreScreen(SP_PARM)) { + SP_PARM->_use_env = f; + } +@@ -234,14 +232,39 @@ + returnVoid; + } + ++NCURSES_EXPORT(void) ++NCURSES_SP_NAME(use_tioctl) (NCURSES_SP_DCLx bool f) ++{ ++ T((T_CALLED("use_tioctl(%p,%d)"), (void *) SP_PARM, (int) f)); ++#if NCURSES_SP_FUNCS ++ START_TRACE(); ++ if (IsPreScreen(SP_PARM)) { ++ SP_PARM->_use_tioctl = f; ++ } ++#else ++ _nc_prescreen.use_tioctl = f; ++#endif ++ returnVoid; ++} ++ + #if NCURSES_SP_FUNCS + NCURSES_EXPORT(void) + use_env(bool f) + { + T((T_CALLED("use_env(%d)"), (int) f)); ++ START_TRACE(); + _nc_prescreen.use_env = f; + returnVoid; + } ++ ++NCURSES_EXPORT(void) ++use_tioctl(bool f) ++{ ++ T((T_CALLED("use_tioctl(%d)"), (int) f)); ++ START_TRACE(); ++ _nc_prescreen.use_tioctl = f; ++ returnVoid; ++} + #endif + + NCURSES_EXPORT(void) +@@ -281,7 +304,7 @@ + *linep = (int) lines; + *colp = (int) columns; + +- if (_nc_prescreen.use_env) { ++ if (_nc_prescreen.use_env || _nc_prescreen.use_tioctl) { + int value; + + #ifdef __EMX__ +@@ -289,7 +312,9 @@ + int screendata[2]; + _scrsize(screendata); + *colp = screendata[0]; +- *linep = screendata[1]; ++ *linep = ((sp != 0 && sp->_filtered) ++ ? 1 ++ : screendata[1]); + T(("EMX screen size: environment LINES = %d COLUMNS = %d", + *linep, *colp)); + } +@@ -315,19 +340,33 @@ + } + #endif /* HAVE_SIZECHANGE */ + +- /* +- * Finally, look for environment variables. +- * +- * Solaris lets users override either dimension with an environment +- * variable. +- */ +- if ((value = _nc_getenv_num("LINES")) > 0) { +- *linep = value; +- T(("screen size: environment LINES = %d", *linep)); +- } +- if ((value = _nc_getenv_num("COLUMNS")) > 0) { +- *colp = value; +- T(("screen size: environment COLUMNS = %d", *colp)); ++ if (_nc_prescreen.use_env) { ++ if (_nc_prescreen.use_tioctl) { ++ /* ++ * If environment variables are used, update them. ++ */ ++ if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) { ++ _nc_setenv_num("LINES", *linep); ++ } ++ if (_nc_getenv_num("COLUMNS") > 0) { ++ _nc_setenv_num("COLUMNS", *colp); ++ } ++ } ++ ++ /* ++ * Finally, look for environment variables. ++ * ++ * Solaris lets users override either dimension with an environment ++ * variable. ++ */ ++ if ((value = _nc_getenv_num("LINES")) > 0) { ++ *linep = value; ++ T(("screen size: environment LINES = %d", *linep)); ++ } ++ if ((value = _nc_getenv_num("COLUMNS")) > 0) { ++ *colp = value; ++ T(("screen size: environment COLUMNS = %d", *colp)); ++ } + } + + /* if we can't get dynamic info about the size, use static */ +@@ -401,8 +440,11 @@ + */ + if (sp != 0 + && sp->_resize != 0) { +- if ((new_lines != old_lines) || (new_cols != old_cols)) ++ if ((new_lines != old_lines) || (new_cols != old_cols)) { + sp->_resize(NCURSES_SP_ARGx new_lines, new_cols); ++ } else if (sp->_sig_winch && (sp->_ungetch != 0)) { ++ sp->_ungetch(SP_PARM, KEY_RESIZE); /* so application can know this */ ++ } + sp->_sig_winch = FALSE; + } + } +@@ -414,22 +456,6 @@ + * + ****************************************************************************/ + +-#define ret_error(code, fmt, arg) if (errret) {\ +- *errret = code;\ +- returnCode(ERR);\ +- } else {\ +- fprintf(stderr, fmt, arg);\ +- exit(EXIT_FAILURE);\ +- } +- +-#define ret_error0(code, msg) if (errret) {\ +- *errret = code;\ +- returnCode(ERR);\ +- } else {\ +- fprintf(stderr, msg);\ +- exit(EXIT_FAILURE);\ +- } +- + #if USE_DATABASE || USE_TERMCAP + /* + * Return 1 if entry found, 0 if not found, -1 if database not accessible, +@@ -467,7 +493,7 @@ + ** and substitute it in for the prototype given in 'command_character'. + */ + void +-_nc_tinfo_cmdch(TERMINAL * termp, char proto) ++_nc_tinfo_cmdch(TERMINAL * termp, int proto) + { + unsigned i; + char CC; +@@ -481,8 +507,8 @@ + if ((tmp = getenv("CC")) != 0 && strlen(tmp) == 1) { + CC = *tmp; + for_each_string(i, &(termp->type)) { +- for (tmp = termp->type.Strings[i]; *tmp; tmp++) { +- if (*tmp == proto) ++ for (tmp = termp->type.Strings[i]; tmp && *tmp; tmp++) { ++ if (UChar(*tmp) == proto) + *tmp = CC; + } + } +@@ -551,7 +577,7 @@ + int value; + int result = 0; + +- if ((env = getenv(env_name)) != 0) { ++ if (getenv(env_name) != 0) { + result = _nc_getenv_num(env_name); + } else if ((value = tigetnum("U8")) >= 0) { + result = value; /* use extension feature */ +@@ -578,7 +604,7 @@ + NCURSES_CONST char *tname, + int Filedes, + int *errret, +- bool reuse) ++ int reuse) + { + #ifdef USE_TERM_DRIVER + TERMINAL_CONTROL_BLOCK *TCB = 0; +@@ -684,7 +710,7 @@ + const TERMTYPE *fallback = _nc_fallback(tname); + + if (fallback) { +- termp->type = *fallback; ++ _nc_copy_termtype(&(termp->type), fallback); + status = TGETENT_YES; + } + } +@@ -694,11 +720,11 @@ + if (status == TGETENT_ERR) { + ret_error0(status, "terminals database is inaccessible\n"); + } else if (status == TGETENT_NO) { +- ret_error(status, "'%s': unknown terminal type.\n", tname); ++ ret_error1(status, "unknown terminal type.\n", tname); + } + } + #if !USE_REENTRANT +- strncpy(ttytype, termp->type.term_names, NAMESIZE - 1); ++ strncpy(ttytype, termp->type.term_names, (size_t) (NAMESIZE - 1)); + ttytype[NAMESIZE - 1] = '\0'; + #endif + +@@ -708,7 +734,7 @@ + set_curterm(termp); + + if (command_character) +- _nc_tinfo_cmdch(termp, *command_character); ++ _nc_tinfo_cmdch(termp, UChar(*command_character)); + + /* + * If an application calls setupterm() rather than initscr() or +@@ -742,10 +768,19 @@ + + #ifndef USE_TERM_DRIVER + if (generic_type) { +- ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname); +- } +- if (hard_copy) { +- ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname); ++ /* ++ * BSD 4.3's termcap contains mis-typed "gn" for wy99. Do a sanity ++ * check before giving up. ++ */ ++ if ((VALID_STRING(cursor_address) ++ || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home))) ++ && VALID_STRING(clear_screen)) { ++ ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname); ++ } else { ++ ret_error1(TGETENT_NO, "I need something more specific.\n", tname); ++ } ++ } else if (hard_copy) { ++ ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname); + } + #endif + returnCode(code); +@@ -798,7 +833,7 @@ + _nc_setupterm(NCURSES_CONST char *tname, + int Filedes, + int *errret, +- bool reuse) ++ int reuse) + { + int res; + TERMINAL *termp; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_termcap.c ncurses-5.9/ncurses/tinfo/lib_termcap.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_termcap.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_termcap.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -48,7 +48,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_termcap.c,v 1.73 2010/12/25 19:27:12 tom Exp $") ++MODULE_ID("$Id: lib_termcap.c,v 1.78 2012/02/22 22:34:31 tom Exp $") + + NCURSES_EXPORT_VAR(char *) UP = 0; + NCURSES_EXPORT_VAR(char *) BC = 0; +@@ -97,7 +97,7 @@ + #ifdef USE_TERM_DRIVER + if (termp == 0 || + !((TERMINAL_CONTROL_BLOCK *) termp)->drv->isTerminfo) +- return (rc); ++ returnCode(rc); + #endif + + /* +@@ -203,10 +203,11 @@ + same_tcname(const char *a, const char *b) + { + fprintf(stderr, "compare(%s,%s)\n", a, b); +- return !strncmp(a, b, 2); ++ return !strncmp(a, b, (size_t) 2); + } ++ + #else +-#define same_tcname(a,b) !strncmp(a,b,2) ++#define same_tcname(a,b) !strncmp(a, b, (size_t) 2) + #endif + + /*************************************************************************** +@@ -351,7 +352,7 @@ + #endif + if (j >= 0) { + result = tp->Strings[j]; +- TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result))); ++ TR(TRACE_DATABASE, ("found match %d: %s", j, _nc_visbuf(result))); + /* setupterm forces canceled strings to null */ + if (VALID_STRING(result)) { + if (result == exit_attribute_mode +@@ -361,7 +362,7 @@ + } + if (area != 0 + && *area != 0) { +- (void) strcpy(*area, result); ++ _nc_STRCPY(*area, result, 1024); + result = *area; + *area += strlen(*area) + 1; + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tgoto.c ncurses-5.9/ncurses/tinfo/lib_tgoto.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_tgoto.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_tgoto.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2000-2006,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 2000-2008,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + #include <ctype.h> + #include <termcap.h> + +-MODULE_ID("$Id: lib_tgoto.c,v 1.13 2008/08/16 19:29:32 tom Exp $") ++MODULE_ID("$Id: lib_tgoto.c,v 1.16 2012/02/24 02:08:08 tom Exp $") + + #if !PURE_TERMINFO + static bool +@@ -159,7 +159,8 @@ + break; + } + if (fmt != 0) { +- sprintf(result + used, fmt, *value++); ++ _nc_SPRINTF(result + used, _nc_SLIMIT(length - used) ++ fmt, *value++); + used += strlen(result + used); + fmt = 0; + } +@@ -174,7 +175,7 @@ + } + if (result != 0) { + if (need_BC) { +- strcpy(result + used, BC); ++ _nc_STRCPY(result + used, BC, length - used); + used += strlen(BC); + } + result[used] = '\0'; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tparm.c ncurses-5.9/ncurses/tinfo/lib_tparm.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_tparm.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_tparm.c 2012-08-25 19:58:00.916560441 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: lib_tparm.c,v 1.82 2011/01/15 22:19:12 tom Exp $") ++MODULE_ID("$Id: lib_tparm.c,v 1.86 2012/02/22 22:40:24 tom Exp $") + + /* + * char * +@@ -143,7 +143,9 @@ + + get_space(s_len + 1); + +- (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s); ++ _nc_SPRINTF(TPS(out_buff) + TPS(out_used), ++ _nc_SLIMIT(TPS(out_size) - TPS(out_used)) ++ fmt, s); + TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used)); + } + +@@ -153,9 +155,11 @@ + if (len < 30) + len = 30; /* actually log10(MAX_INT)+1 */ + +- get_space((unsigned) len + 1); ++ get_space((size_t) len + 1); + +- (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number); ++ _nc_SPRINTF(TPS(out_buff) + TPS(out_used), ++ _nc_SLIMIT(TPS(out_size) - TPS(out_used)) ++ fmt, number); + TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used)); + } + +@@ -164,7 +168,7 @@ + { + if (c == 0) + c = 0200; +- get_space(1); ++ get_space((size_t) 1); + TPS(out_buff)[TPS(out_used)++] = (char) c; + } + +@@ -450,7 +454,7 @@ + } + + static NCURSES_INLINE char * +-tparam_internal(bool use_TPARM_ARG, const char *string, va_list ap) ++tparam_internal(int use_TPARM_ARG, const char *string, va_list ap) + { + char *p_is_s[NUM_PARM]; + TPARM_ARG param[NUM_PARM]; +@@ -522,7 +526,7 @@ + } + #ifdef TRACE + if (USE_TRACEF(TRACE_CALLS)) { +- for (i = 0; i < popcount; i++) { ++ for (i = 0; i < num_args; i++) { + if (p_is_s[i] != 0) + save_text(", %s", _nc_visbuf(p_is_s[i]), 0); + else +@@ -757,7 +761,7 @@ + cp++; + } /* endwhile (*cp) */ + +- get_space(1); ++ get_space((size_t) 1); + TPS(out_buff)[TPS(out_used)] = '\0'; + + T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff)))); +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_tputs.c ncurses-5.9/ncurses/tinfo/lib_tputs.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_tputs.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_tputs.c 2012-08-25 19:58:00.919893759 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -51,7 +51,7 @@ + #include <termcap.h> /* ospeed */ + #include <tic.h> + +-MODULE_ID("$Id: lib_tputs.c,v 1.81 2010/12/20 00:42:50 tom Exp $") ++MODULE_ID("$Id: lib_tputs.c,v 1.84 2012/02/22 22:40:24 tom Exp $") + + NCURSES_EXPORT_VAR(char) PC = 0; /* used by termcap library */ + NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0; /* used by termcap library */ +@@ -145,7 +145,7 @@ + * POSIX says write() is safe in a signal handler, but the + * buffered I/O is not. + */ +- if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, 1) == -1) ++ if (write(fileno(NC_OUTPUT(SP_PARM)), &tmp, (size_t) 1) == -1) + rc = ERR; + } else { + if (putc(ch, NC_OUTPUT(SP_PARM)) == EOF) +@@ -216,9 +216,9 @@ + + if (USE_TRACEF(TRACE_TPUTS)) { + if (outc == NCURSES_SP_NAME(_nc_outch)) +- (void) strcpy(addrbuf, "_nc_outch"); ++ _nc_STRCPY(addrbuf, "_nc_outch", sizeof(addrbuf)); + else +- (void) sprintf(addrbuf, "%p", outc); ++ _nc_SPRINTF(addrbuf, _nc_SLIMIT(sizeof(addrbuf)) "%p", outc); + if (_nc_tputs_trace) { + _tracef("tputs(%s = %s, %d, %s) called", _nc_tputs_trace, + _nc_visbuf(string), affcnt, addrbuf); +diff -Naur ncurses-5.9.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.9/ncurses/tinfo/lib_ttyflags.c +--- ncurses-5.9.orig/ncurses/tinfo/lib_ttyflags.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/lib_ttyflags.c 2012-08-25 19:58:00.396562900 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,7 +41,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_ttyflags.c,v 1.27 2010/12/25 23:43:58 tom Exp $") ++MODULE_ID("$Id: lib_ttyflags.c,v 1.28 2012/01/21 19:21:29 KO.Myung-Hun Exp $") + + NCURSES_EXPORT(int) + NCURSES_SP_NAME(_nc_get_tty_mode) (NCURSES_SP_DCLx TTY * buf) +@@ -105,7 +105,11 @@ + result = CallDriver_2(SP_PARM, sgmode, TRUE, buf); + #else + for (;;) { +- if (SET_TTY(termp->Filedes, buf) != 0) { ++ if ((SET_TTY(termp->Filedes, buf) != 0) ++#if USE_KLIBC_KBD ++ && !isatty(termp->Filedes) ++#endif ++ ) { + if (errno == EINTR) + continue; + if ((errno == ENOTTY) && (SP_PARM != 0)) +diff -Naur ncurses-5.9.orig/ncurses/tinfo/make_hash.c ncurses-5.9/ncurses/tinfo/make_hash.c +--- ncurses-5.9.orig/ncurses/tinfo/make_hash.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/make_hash.c 2012-08-25 19:58:00.919893759 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -44,7 +44,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: make_hash.c,v 1.3 2010/05/22 18:02:50 tom Exp $") ++MODULE_ID("$Id: make_hash.c,v 1.8 2012/02/22 22:40:24 tom Exp $") + + /* + * _nc_make_hash_table() +@@ -261,8 +261,8 @@ + root_name); + printf("{\n"); + for (n = 0; n < CAPTABSIZE; n++) { +- sprintf(buffer, "\"%s\"", +- name_table[n].nte_name); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "\"%s\"", ++ name_table[n].nte_name); + printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n", + buffer, + typenames[name_table[n].nte_type], +diff -Naur ncurses-5.9.orig/ncurses/tinfo/make_keys.c ncurses-5.9/ncurses/tinfo/make_keys.c +--- ncurses-5.9.orig/ncurses/tinfo/make_keys.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/make_keys.c 2012-08-25 19:58:00.043231239 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + #define USE_TERMLIB 1 + #include <build.priv.h> + +-MODULE_ID("$Id: make_keys.c,v 1.19 2010/06/05 22:08:00 tom Exp $") ++MODULE_ID("$Id: make_keys.c,v 1.20 2011/10/22 16:34:50 tom Exp $") + + #include <names.c> + +@@ -76,7 +76,7 @@ + unsigned maxlen = 16; + int scanned; + +- while (fgets(buffer, sizeof(buffer), ifp) != 0) { ++ while (fgets(buffer, (int) sizeof(buffer), ifp) != 0) { + if (*buffer == '#') + continue; + +diff -Naur ncurses-5.9.orig/ncurses/tinfo/name_match.c ncurses-5.9/ncurses/tinfo/name_match.c +--- ncurses-5.9.orig/ncurses/tinfo/name_match.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/name_match.c 2012-08-25 19:58:00.043231239 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,18 +33,30 @@ + #include <curses.priv.h> + #include <tic.h> + +-MODULE_ID("$Id: name_match.c,v 1.18 2008/11/16 00:19:59 juergen Exp $") ++MODULE_ID("$Id: name_match.c,v 1.21 2011/08/13 20:23:12 tom Exp $") + +-/* +- * _nc_first_name(char *names) +- * +- * Extract the primary name from a compiled entry. +- */ + #define FirstName _nc_globals.first_name + ++#if USE_TERMCAP && NCURSES_XNAMES ++static const char * ++skip_index(const char *name) ++{ ++ if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) { ++ const char *bar = strchr(name, '|'); ++ if (bar != 0 && (bar - name) == 2) ++ name = bar + 1; ++ } ++ return name; ++} ++#endif ++ ++/* ++ * Get the primary name from the given name list. For terminfo, this is the ++ * first name. For termcap, this may be the second name, if the first one ++ * happens to be two characters. ++ */ + NCURSES_EXPORT(char *) + _nc_first_name(const char *const sp) +-/* get the first name from the given name list */ + { + unsigned n; + +@@ -59,8 +71,12 @@ + FirstName = typeMalloc(char, MAX_NAME_SIZE + 1); + + if (FirstName != 0) { ++ const char *src = sp; ++#if USE_TERMCAP && NCURSES_XNAMES ++ src = skip_index(sp); ++#endif + for (n = 0; n < MAX_NAME_SIZE; n++) { +- if ((FirstName[n] = sp[n]) == '\0' ++ if ((FirstName[n] = src[n]) == '\0' + || (FirstName[n] == '|')) + break; + } +@@ -71,11 +87,8 @@ + } + + /* +- * int _nc_name_match(namelist, name, delim) +- * +- * Is the given name matched in namelist? ++ * Is the given name matched in namelist? + */ +- + NCURSES_EXPORT(int) + _nc_name_match(const char *const namelst, const char *const name, const char *const delim) + { +diff -Naur ncurses-5.9.orig/ncurses/tinfo/parse_entry.c ncurses-5.9/ncurses/tinfo/parse_entry.c +--- ncurses-5.9.orig/ncurses/tinfo/parse_entry.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/parse_entry.c 2012-08-25 19:58:00.919893759 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -47,7 +47,7 @@ + #include <ctype.h> + #include <tic.h> + +-MODULE_ID("$Id: parse_entry.c,v 1.75 2010/05/01 19:35:09 tom Exp $") ++MODULE_ID("$Id: parse_entry.c,v 1.78 2012/02/22 22:40:24 tom Exp $") + + #ifdef LINT + static short const parametrized[] = +@@ -203,6 +203,8 @@ + { bad_tc_usage = TRUE; \ + _nc_warning("Legacy termcap allows only a trailing tc= clause"); } + ++#define MAX_NUMBER 0x7fff /* positive shorts only */ ++ + NCURSES_EXPORT(int) + _nc_parse_entry(struct entry *entryp, int literal, bool silent) + { +@@ -444,8 +446,12 @@ + break; + + case NUMBER: +- entryp->tterm.Numbers[entry_ptr->nte_index] = +- (short) _nc_curr_token.tk_valnumber; ++ if (_nc_curr_token.tk_valnumber > MAX_NUMBER) { ++ entryp->tterm.Numbers[entry_ptr->nte_index] = MAX_NUMBER; ++ } else { ++ entryp->tterm.Numbers[entry_ptr->nte_index] = ++ (short) _nc_curr_token.tk_valnumber; ++ } + break; + + case STRING: +@@ -654,14 +660,16 @@ + + if (WANTED(carriage_return)) { + if (carriage_return_delay > 0) { +- sprintf(buf, "%s$<%d>", C_CR, carriage_return_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_CR, carriage_return_delay); + carriage_return = _nc_save_str(buf); + } else + carriage_return = _nc_save_str(C_CR); + } + if (WANTED(cursor_left)) { + if (backspace_delay > 0) { +- sprintf(buf, "%s$<%d>", C_BS, backspace_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_BS, backspace_delay); + cursor_left = _nc_save_str(buf); + } else if (backspaces_with_bs == 1) + cursor_left = _nc_save_str(C_BS); +@@ -674,7 +682,8 @@ + cursor_down = linefeed_if_not_lf; + else if (linefeed_is_newline != 1) { + if (new_line_delay > 0) { +- sprintf(buf, "%s$<%d>", C_LF, new_line_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_LF, new_line_delay); + cursor_down = _nc_save_str(buf); + } else + cursor_down = _nc_save_str(C_LF); +@@ -685,7 +694,8 @@ + cursor_down = linefeed_if_not_lf; + else if (linefeed_is_newline != 1) { + if (new_line_delay > 0) { +- sprintf(buf, "%s$<%d>", C_LF, new_line_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_LF, new_line_delay); + scroll_forward = _nc_save_str(buf); + } else + scroll_forward = _nc_save_str(C_LF); +@@ -694,7 +704,8 @@ + if (WANTED(newline)) { + if (linefeed_is_newline == 1) { + if (new_line_delay > 0) { +- sprintf(buf, "%s$<%d>", C_LF, new_line_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_LF, new_line_delay); + newline = _nc_save_str(buf); + } else + newline = _nc_save_str(C_LF); +@@ -736,7 +747,8 @@ + */ + if (WANTED(tab)) { + if (horizontal_tab_delay > 0) { +- sprintf(buf, "%s$<%d>", C_HT, horizontal_tab_delay); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) ++ "%s$<%d>", C_HT, horizontal_tab_delay); + tab = _nc_save_str(buf); + } else + tab = _nc_save_str(C_HT); +diff -Naur ncurses-5.9.orig/ncurses/tinfo/read_entry.c ncurses-5.9/ncurses/tinfo/read_entry.c +--- ncurses-5.9.orig/ncurses/tinfo/read_entry.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/read_entry.c 2012-08-25 19:58:00.919893759 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,7 +41,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: read_entry.c,v 1.108 2011/02/26 15:36:06 tom Exp $") ++MODULE_ID("$Id: read_entry.c,v 1.119 2012/02/22 22:40:24 tom Exp $") + + #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) + +@@ -99,7 +99,7 @@ + if (have > 0) { + if ((int) want > have) + want = (unsigned) have; +- memcpy(dst, src + *offset, want); ++ memcpy(dst, src + *offset, (size_t) want); + *offset += (int) want; + } else { + want = 0; +@@ -107,17 +107,19 @@ + return (int) want; + } + +-#define Read(buf, count) fake_read(buffer, &offset, limit, buf, count) ++#define Read(buf, count) fake_read(buffer, &offset, limit, buf, (unsigned) count) + + #define read_shorts(buf, count) \ +- (Read(buf, (unsigned) (count)*2) == (int) (count)*2) ++ (Read(buf, (count)*2) == (int) (count)*2) + + #define even_boundary(value) \ + if ((value) % 2 != 0) Read(buf, 1) + ++/* ++ * Return TGETENT_YES if read, TGETENT_NO if not found or garbled. ++ */ + NCURSES_EXPORT(int) + _nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit) +-/* return 1 if read, 0 if not found or garbled */ + { + int offset = 0; + int name_size, bool_count, num_count, str_count, str_size; +@@ -173,7 +175,7 @@ + ptr->str_table = string_table; + ptr->term_names = string_table; + if ((have = (unsigned) Read(ptr->term_names, want)) != want) { +- memset(ptr->term_names + have, 0, want - have); ++ memset(ptr->term_names + have, 0, (size_t) (want - have)); + } + ptr->term_names[want] = '\0'; + string_table += (want + 1); +@@ -326,17 +328,18 @@ + ext_str_limit, ptr->ext_str_table + base); + } + +- T(("...done reading terminfo bool %d(%d) num %d(%d) str %d(%d)", +- ptr->num_Booleans, ptr->ext_Booleans, +- ptr->num_Numbers, ptr->ext_Numbers, +- ptr->num_Strings, ptr->ext_Strings)); ++ TR(TRACE_DATABASE, ++ ("...done reading terminfo bool %d(%d) num %d(%d) str %d(%d)", ++ ptr->num_Booleans, ptr->ext_Booleans, ++ ptr->num_Numbers, ptr->ext_Numbers, ++ ptr->num_Strings, ptr->ext_Strings)); + + TR(TRACE_DATABASE, ("extend: num_Booleans:%d", ptr->num_Booleans)); + } else + #endif /* NCURSES_XNAMES */ + { +- T(("...done reading terminfo bool %d num %d str %d", +- bool_count, num_count, str_count)); ++ TR(TRACE_DATABASE, ("...done reading terminfo bool %d num %d str %d", ++ bool_count, num_count, str_count)); + #if NCURSES_XNAMES + TR(TRACE_DATABASE, ("normal: num_Booleans:%d", ptr->num_Booleans)); + #endif +@@ -371,13 +374,13 @@ + + if (_nc_access(filename, R_OK) < 0 + || (fp = fopen(filename, "rb")) == 0) { +- T(("cannot open terminfo %s (errno=%d)", filename, errno)); ++ TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno)); + code = TGETENT_NO; + } else { + if ((limit = (int) fread(buffer, sizeof(char), sizeof(buffer), fp)) + > 0) { + +- T(("read terminfo %s", filename)); ++ TR(TRACE_DATABASE, ("read terminfo %s", filename)); + if ((code = _nc_read_termtype(ptr, buffer, limit)) == TGETENT_NO) { + _nc_free_termtype(ptr); + } +@@ -390,6 +393,58 @@ + return (code); + } + ++#if USE_HASHED_DB ++/* ++ * Return if if we can build the filename of a ".db" file. ++ */ ++static bool ++make_db_filename(char *filename, unsigned limit, const char *const path) ++{ ++ static const char suffix[] = DBM_SUFFIX; ++ ++ unsigned lens = sizeof(suffix) - 1; ++ unsigned size = strlen(path); ++ unsigned test = lens + size; ++ bool result = FALSE; ++ ++ if (test < limit) { ++ if (size >= lens ++ && !strcmp(path + size - lens, suffix)) ++ _nc_STRCPY(filename, path, limit); ++ else ++ _nc_SPRINTF(filename, _nc_SLIMIT(limit) "%s%s", path, suffix); ++ result = TRUE; ++ } ++ return result; ++} ++#endif ++ ++/* ++ * Return true if we can build the name of a filesystem entry. ++ */ ++static bool ++make_dir_filename(char *filename, ++ unsigned limit, ++ const char *const path, ++ const char *name) ++{ ++ bool result = FALSE; ++ ++#if USE_TERMCAP ++ if (_nc_is_dir_path(path)) ++#endif ++ { ++ unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name)); ++ ++ if (need <= limit) { ++ _nc_SPRINTF(filename, _nc_SLIMIT(limit) ++ "%s/" LEAF_FMT "/%s", path, *name, name); ++ result = TRUE; ++ } ++ } ++ return result; ++} ++ + /* + * Build a terminfo pathname and try to read the data. Returns TGETENT_YES on + * success, TGETENT_NO on failure. +@@ -401,101 +456,80 @@ + const char *name, + TERMTYPE *const tp) + { +- int result = TGETENT_NO; +- +- /* +- * If we are looking in a directory, assume the entry is a file under that, +- * according to the normal rules. +- */ +- unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name)); +- if (need <= limit) +- (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name); ++ int code = TGETENT_NO; + +- if (_nc_is_dir_path(path)) +- result = _nc_read_file_entry(filename, tp); + #if USE_HASHED_DB +- else { +- static const char suffix[] = DBM_SUFFIX; +- DB *capdbp; +- unsigned lens = sizeof(suffix) - 1; +- unsigned size = strlen(path); +- unsigned test = lens + size; +- +- if (test < limit) { +- if (size >= lens +- && !strcmp(path + size - lens, suffix)) +- (void) strcpy(filename, path); +- else +- (void) sprintf(filename, "%s%s", path, suffix); ++ DB *capdbp; + +- /* +- * It would be nice to optimize the dbopen/close activity, as +- * done in the cgetent implementation for tc= clauses. However, +- * since we support multiple database locations, we cannot do +- * that. +- */ +- if ((capdbp = _nc_db_open(filename, FALSE)) != 0) { +- DBT key, data; +- int reccnt = 0; +- char *save = strdup(name); +- +- memset(&key, 0, sizeof(key)); +- key.data = save; +- key.size = strlen(save); +- +- /* +- * This lookup could return termcap data, which we do not want. +- * We are looking for compiled (binary) terminfo data. +- * +- * cgetent uses a two-level lookup. On the first it uses the +- * given name to return a record containing only the aliases +- * for an entry. On the second (using that list of aliases as +- * a key), it returns the content of the terminal description. +- * We expect second lookup to return data beginning with the +- * same set of aliases. +- * +- * For compiled terminfo, the list of aliases in the second +- * case will be null-terminated. A termcap entry will not be, +- * and will run on into the description. So we can easily +- * distinguish between the two (source/binary) by checking the +- * lengths. +- */ +- while (_nc_db_get(capdbp, &key, &data) == 0) { +- int used = data.size - 1; +- char *have = (char *) data.data; +- +- if (*have++ == 0) { +- if (data.size > key.size +- && IS_TIC_MAGIC(have)) { +- result = _nc_read_termtype(tp, have, used); +- if (result == TGETENT_NO) { +- _nc_free_termtype(tp); +- } +- } +- break; +- } ++ if (make_db_filename(filename, limit, path) ++ && (capdbp = _nc_db_open(filename, FALSE)) != 0) { + +- /* +- * Just in case we have a corrupt database, do not waste +- * time with it. +- */ +- if (++reccnt >= 3) +- break; +- +- /* +- * Prepare for the second level. +- */ +- key.data = have; +- key.size = used; ++ DBT key, data; ++ int reccnt = 0; ++ char *save = strdup(name); ++ ++ memset(&key, 0, sizeof(key)); ++ key.data = save; ++ key.size = strlen(save); ++ ++ /* ++ * This lookup could return termcap data, which we do not want. We are ++ * looking for compiled (binary) terminfo data. ++ * ++ * cgetent uses a two-level lookup. On the first it uses the given ++ * name to return a record containing only the aliases for an entry. ++ * On the second (using that list of aliases as a key), it returns the ++ * content of the terminal description. We expect second lookup to ++ * return data beginning with the same set of aliases. ++ * ++ * For compiled terminfo, the list of aliases in the second case will ++ * be null-terminated. A termcap entry will not be, and will run on ++ * into the description. So we can easily distinguish between the two ++ * (source/binary) by checking the lengths. ++ */ ++ while (_nc_db_get(capdbp, &key, &data) == 0) { ++ int used = data.size - 1; ++ char *have = (char *) data.data; ++ ++ if (*have++ == 0) { ++ if (data.size > key.size ++ && IS_TIC_MAGIC(have)) { ++ code = _nc_read_termtype(tp, have, used); ++ if (code == TGETENT_NO) { ++ _nc_free_termtype(tp); ++ } + } +- +- _nc_db_close(capdbp); +- free(save); ++ break; + } ++ ++ /* ++ * Just in case we have a corrupt database, do not waste time with ++ * it. ++ */ ++ if (++reccnt >= 3) ++ break; ++ ++ /* ++ * Prepare for the second level. ++ */ ++ key.data = have; ++ key.size = used; + } ++ ++ free(save); ++ } else /* may be either filesystem or flat file */ ++#endif ++ if (make_dir_filename(filename, limit, path, name)) { ++ code = _nc_read_file_entry(filename, tp); ++ } ++#if USE_TERMCAP ++ else if (code != TGETENT_YES) { ++ code = _nc_read_termcap_entry(name, tp); ++ _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) ++ "%.*s", PATH_MAX - 1, _nc_get_source()); + } + #endif +- return result; ++ return code; + } + #endif /* USE_DATABASE */ + +@@ -513,31 +547,35 @@ + { + int code = TGETENT_NO; + +- sprintf(filename, "%.*s", PATH_MAX - 1, name); ++ _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) ++ "%.*s", PATH_MAX - 1, name); ++ + if (strlen(name) == 0 + || strcmp(name, ".") == 0 + || strcmp(name, "..") == 0 + || _nc_pathlast(name) != 0 + || strchr(name, NCURSES_PATHSEP) != 0) { +- T(("illegal or missing entry name '%s'", name)); ++ TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", name)); + } else { + #if USE_DATABASE +- DBDIRS state = dbdTIC; +- int offset = 0; ++ DBDIRS state; ++ int offset; + const char *path; + ++ _nc_first_db(&state, &offset); + while ((path = _nc_next_db(&state, &offset)) != 0) { ++ TR(TRACE_DATABASE, ("_nc_read_tic_entry path=%s, name=%s", path, name)); + code = _nc_read_tic_entry(filename, PATH_MAX, path, name, tp); + if (code == TGETENT_YES) { + _nc_last_db(); + break; + } + } +-#endif +-#if USE_TERMCAP ++#elif USE_TERMCAP + if (code != TGETENT_YES) { + code = _nc_read_termcap_entry(name, tp); +- sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source()); ++ _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX) ++ "%.*s", PATH_MAX - 1, _nc_get_source()); + } + #endif + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/read_termcap.c ncurses-5.9/ncurses/tinfo/read_termcap.c +--- ncurses-5.9.orig/ncurses/tinfo/read_termcap.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/read_termcap.c 2012-08-25 19:58:01.376558266 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -54,10 +54,9 @@ + + #include <ctype.h> + #include <sys/types.h> +-#include <sys/stat.h> + #include <tic.h> + +-MODULE_ID("$Id: read_termcap.c,v 1.74 2010/01/23 17:57:43 tom Exp $") ++MODULE_ID("$Id: read_termcap.c,v 1.87 2012/05/05 19:40:50 tom Exp $") + + #if !PURE_TERMINFO + +@@ -74,7 +73,7 @@ + + if (!use_terminfo_vars() || (result = getenv("TERMPATH")) == 0) + result = TERMPATH; +- T(("TERMPATH is %s", result)); ++ TR(TRACE_DATABASE, ("TERMPATH is %s", result)); + return result; + } + +@@ -162,7 +161,7 @@ + return (-1); + } + gottoprec = 0; +- (void) strcpy(toprec, ent); ++ _nc_STRCPY(toprec, ent, topreclen); + return (0); + } + +@@ -295,7 +294,7 @@ + errno = ENOMEM; + return (TC_SYS_ERR); + } +- (void) strcpy(record, toprec); ++ _nc_STRCPY(record, toprec, topreclen + BFRAG); + rp = record + topreclen + 1; + r_end = rp + BFRAG; + current = in_array; +@@ -384,7 +383,14 @@ + c = *bp++; + if (c == '\n') { + lineno++; +- if (rp == record || *(rp - 1) != '\\') ++ /* ++ * Unlike BSD 4.3, this ignores a backslash at the ++ * end of a comment-line. That makes it consistent ++ * with the rest of ncurses -TD ++ */ ++ if (rp == record ++ || *record == '#' ++ || *(rp - 1) != '\\') + break; + } + *rp++ = c; +@@ -442,8 +448,10 @@ + break; + } + +- if (!foundit) ++ if (!foundit) { ++ free(record); + return (TC_NOT_FOUND); ++ } + } + + /* +@@ -455,7 +463,7 @@ + register int newilen; + unsigned ilen; + int diff, iret, tclen, oline; +- char *icap, *scan, *tc, *tcstart, *tcend; ++ char *icap = 0, *scan, *tc, *tcstart, *tcend; + + /* + * Loop invariants: +@@ -468,8 +476,9 @@ + scan = record; + tc_not_resolved = FALSE; + for (;;) { +- if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) ++ if ((tc = _nc_cgetcap(scan, "tc", '=')) == 0) { + break; ++ } + + /* + * Find end of tc=name and stomp on the trailing `:' +@@ -486,6 +495,7 @@ + tclen = s - tcstart; + tcend = s; + ++ icap = 0; + iret = _nc_getent(&icap, &ilen, &oline, current, db_array, fd, + tc, depth + 1, 0); + newicap = icap; /* Put into a register. */ +@@ -496,12 +506,13 @@ + if (myfd) + (void) close(fd); + free(record); ++ FreeIfNeeded(icap); + return (iret); + } +- if (iret == TC_UNRESOLVED) ++ if (iret == TC_UNRESOLVED) { + tc_not_resolved = TRUE; +- /* couldn't resolve tc */ +- if (iret == TC_NOT_FOUND) { ++ /* couldn't resolve tc */ ++ } else if (iret == TC_NOT_FOUND) { + *(s - 1) = ':'; + scan = s - 1; + tc_not_resolved = TRUE; +@@ -581,8 +592,9 @@ + } + + *cap = record; +- if (tc_not_resolved) ++ if (tc_not_resolved) { + return (TC_UNRESOLVED); ++ } + return (current); + } + +@@ -697,8 +709,6 @@ + #define PVECSIZ 32 /* max number of names in path */ + #define TBUFSIZ (2048*2) + +-static char *tbuf; +- + /* + * On entry, srcp points to a non ':' character which is the beginning of the + * token, if any. We'll try to return a string that doesn't end with a ':'. +@@ -776,18 +786,18 @@ + register char *p; + register char *cp; + char *dummy = NULL; +- char **fname; ++ CGETENT_CONST char **fname; + char *home; + int i; + char pathbuf[PBUFSIZ]; /* holds raw path of filenames */ +- char *pathvec[PVECSIZ]; /* to point to names in pathbuf */ +- char **pvec; /* holds usable tail of path vector */ ++ CGETENT_CONST char *pathvec[PVECSIZ]; /* point to names in pathbuf */ ++ CGETENT_CONST char **pvec; /* holds usable tail of path vector */ + NCURSES_CONST char *termpath; + string_desc desc; + ++ *lineno = 1; + fname = pathvec; + pvec = pathvec; +- tbuf = bp; + p = pathbuf; + cp = use_terminfo_vars()? getenv("TERMCAP") : NULL; + +@@ -812,10 +822,11 @@ + if ((home = getenv("HOME")) != 0 && *home != '\0' + && strchr(home, ' ') == 0 + && strlen(home) < sizeof(temp) - 10) { /* setup path */ +- sprintf(temp, "%s/", home); /* $HOME first */ ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) ++ "%s/", home); /* $HOME first */ + } + /* if no $HOME look in current directory */ +- strcat(temp, ".termcap"); ++ _nc_STRCAT(temp, ".termcap", sizeof(temp)); + _nc_safe_strcat(&desc, temp); + _nc_safe_strcat(&desc, " "); + _nc_safe_strcat(&desc, get_termpath()); +@@ -841,6 +852,9 @@ + } + } + *fname = 0; /* mark end of vector */ ++#if !HAVE_BSD_CGETENT ++ (void) _nc_cgetset(0); ++#endif + if (_nc_is_abs_path(cp)) { + if (_nc_cgetset(cp) < 0) { + return (TC_SYS_ERR); +@@ -853,6 +867,7 @@ + * empty fields, and mistakenly use the last valid cap entry instead of + * the first (breaks tc= includes) + */ ++ *bp = '\0'; + if (i >= 0) { + char *pd, *ps, *tok; + int endflag = FALSE; +@@ -932,7 +947,7 @@ + if (count < MAXPATHS + && _nc_access(path, R_OK) == 0) { + termpaths[count++] = path; +- T(("Adding termpath %s", path)); ++ TR(TRACE_DATABASE, ("Adding termpath %s", path)); + } + termpaths[count] = 0; + if (save != 0) +@@ -956,13 +971,13 @@ + static char *source; + static int lineno; + +- T(("read termcap entry for %s", tn)); ++ TR(TRACE_DATABASE, ("read termcap entry for %s", tn)); + + if (strlen(tn) == 0 + || strcmp(tn, ".") == 0 + || strcmp(tn, "..") == 0 + || _nc_pathlast(tn) != 0) { +- T(("illegal or missing entry name '%s'", tn)); ++ TR(TRACE_DATABASE, ("illegal or missing entry name '%s'", tn)); + return TGETENT_NO; + } + +@@ -980,7 +995,7 @@ + _nc_curr_line = lineno; + _nc_set_source(source); + } +- _nc_read_entry_source((FILE *) 0, tc, FALSE, FALSE, NULLHOOK); ++ _nc_read_entry_source((FILE *) 0, tc, FALSE, TRUE, NULLHOOK); + #else + /* + * Here is what the 4.4BSD termcap(3) page prescribes: +@@ -1027,7 +1042,9 @@ + normal = FALSE; + } else if (_nc_name_match(tc, tn, "|:")) { /* treat as a capability file */ + use_buffer = TRUE; +- (void) sprintf(tc_buf, "%.*s\n", (int) sizeof(tc_buf) - 2, tc); ++ _nc_SPRINTF(tc_buf, ++ _nc_SLIMIT(sizeof(tc_buf)) ++ "%.*s\n", (int) sizeof(tc_buf) - 2, tc); + normal = FALSE; + } + } +@@ -1049,8 +1066,9 @@ + if (use_terminfo_vars() && (h = getenv("HOME")) != NULL && *h != '\0' + && (strlen(h) + sizeof(PRIVATE_CAP)) < PATH_MAX) { + /* user's .termcap, if any, should override it */ +- (void) strcpy(envhome, h); +- (void) sprintf(pathbuf, PRIVATE_CAP, envhome); ++ _nc_STRCPY(envhome, h, sizeof(envhome)); ++ _nc_SPRINTF(pathbuf, _nc_SLIMIT(sizeof(pathbuf)) ++ PRIVATE_CAP, envhome); + ADD_TC(pathbuf, filecount); + } + } +@@ -1063,7 +1081,7 @@ + for (j = 0; j < filecount; j++) { + bool omit = FALSE; + if (stat(termpaths[j], &test_stat[j]) != 0 +- || (test_stat[j].st_mode & S_IFMT) != S_IFREG) { ++ || !S_ISREG(test_stat[j].st_mode)) { + omit = TRUE; + } else { + for (k = 0; k < j; k++) { +@@ -1075,7 +1093,7 @@ + } + } + if (omit) { +- T(("Path %s is a duplicate", termpaths[j])); ++ TR(TRACE_DATABASE, ("Path %s is a duplicate", termpaths[j])); + for (k = j + 1; k < filecount; k++) { + termpaths[k - 1] = termpaths[k]; + test_stat[k - 1] = test_stat[k]; +@@ -1100,7 +1118,7 @@ + + for (i = 0; i < filecount; i++) { + +- T(("Looking for %s in %s", tn, termpaths[i])); ++ TR(TRACE_DATABASE, ("Looking for %s in %s", tn, termpaths[i])); + if (_nc_access(termpaths[i], R_OK) == 0 + && (fp = fopen(termpaths[i], "r")) != (FILE *) 0) { + _nc_set_source(termpaths[i]); +@@ -1138,8 +1156,7 @@ + * from the list. + */ + *tp = ep->tterm; +- _nc_delink_entry(_nc_head, &(ep->tterm)); +- free(ep); ++ _nc_free_entry(_nc_head, &(ep->tterm)); + + /* + * OK, now try to write the type to user's terminfo directory. +diff -Naur ncurses-5.9.orig/ncurses/tinfo/setbuf.c ncurses-5.9/ncurses/tinfo/setbuf.c +--- ncurses-5.9.orig/ncurses/tinfo/setbuf.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/setbuf.c 2012-08-25 19:58:00.046564556 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: setbuf.c,v 1.16 2010/08/28 21:08:31 tom Exp $") ++MODULE_ID("$Id: setbuf.c,v 1.17 2011/10/22 16:34:50 tom Exp $") + + /* + * If the output file descriptor is connected to a tty (the typical case) it +@@ -100,7 +100,7 @@ + * buffer. So we disable this by default (there may yet be a workaround). + */ + NCURSES_EXPORT(void) +-NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, bool buffered) ++NCURSES_SP_NAME(_nc_set_buffer) (NCURSES_SP_DCLx FILE *ofp, int buffered) + { + int Cols; + int Lines; +@@ -149,7 +149,7 @@ + #ifdef SETVBUF_REVERSED /* pre-svr3? */ + (void) setvbuf(ofp, buf_ptr, buf_len, buf_len ? _IOFBF : _IOLBF); + #else +- (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, buf_len); ++ (void) setvbuf(ofp, buf_ptr, buf_len ? _IOFBF : _IOLBF, (size_t) buf_len); + #endif + #elif HAVE_SETBUFFER + (void) setbuffer(ofp, buf_ptr, (int) buf_len); +@@ -162,7 +162,7 @@ + + #if NCURSES_SP_FUNCS + NCURSES_EXPORT(void) +-_nc_set_buffer(FILE *ofp, bool buffered) ++_nc_set_buffer(FILE *ofp, int buffered) + { + NCURSES_SP_NAME(_nc_set_buffer) (CURRENT_SCREEN, ofp, buffered); + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/strings.c ncurses-5.9/ncurses/tinfo/strings.c +--- ncurses-5.9.orig/ncurses/tinfo/strings.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/strings.c 2012-08-25 19:58:00.919893759 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2000-2003,2007 Free Software Foundation, Inc. * ++ * Copyright (c) 2000-2007,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: strings.c,v 1.6 2007/08/11 17:12:17 tom Exp $") ++MODULE_ID("$Id: strings.c,v 1.8 2012/02/22 22:34:31 tom Exp $") + + /**************************************************************************** + * Useful string functions (especially for mvcur) +@@ -110,7 +110,7 @@ + + if (len < dst->s_size) { + if (dst->s_tail != 0) { +- strcpy(dst->s_tail, src); ++ _nc_STRCPY(dst->s_tail, src, dst->s_size); + dst->s_tail += len; + } + dst->s_size -= len; +@@ -131,7 +131,7 @@ + + if (len < dst->s_size) { + if (dst->s_head != 0) { +- strcpy(dst->s_head, src); ++ _nc_STRCPY(dst->s_head, src, dst->s_size); + dst->s_tail = dst->s_head + len; + } + dst->s_size = dst->s_init - len; +diff -Naur ncurses-5.9.orig/ncurses/tinfo/tinfo_driver.c ncurses-5.9/ncurses/tinfo/tinfo_driver.c +--- ncurses-5.9.orig/ncurses/tinfo/tinfo_driver.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/tinfo_driver.c 2012-08-25 19:58:02.069888321 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -50,7 +50,7 @@ + # endif + #endif + +-MODULE_ID("$Id: tinfo_driver.c,v 1.13 2010/12/20 01:47:09 tom Exp $") ++MODULE_ID("$Id: tinfo_driver.c,v 1.24 2012/07/28 20:12:11 tom Exp $") + + /* + * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, +@@ -93,7 +93,7 @@ + + #define TCBMAGIC NCDRV_MAGIC(NCDRV_TINFO) + #define AssertTCB() assert(TCB!=0 && TCB->magic==TCBMAGIC) +-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp ++#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp + + /* + * This routine needs to do all the work to make curscr look +@@ -106,22 +106,6 @@ + return TINFO_DOUPDATE(TCB->csp); + } + +-#define ret_error(code, fmt, arg) if (errret) {\ +- *errret = code;\ +- return(FALSE); \ +- } else {\ +- fprintf(stderr, fmt, arg);\ +- exit(EXIT_FAILURE);\ +- } +- +-#define ret_error0(code, msg) if (errret) {\ +- *errret = code;\ +- return(FALSE);\ +- } else {\ +- fprintf(stderr, msg);\ +- exit(EXIT_FAILURE);\ +- } +- + static bool + drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) + { +@@ -156,12 +140,12 @@ + if (status == TGETENT_ERR) { + ret_error0(status, "terminals database is inaccessible\n"); + } else if (status == TGETENT_NO) { +- ret_error(status, "'%s': unknown terminal type.\n", tname); ++ ret_error1(status, "unknown terminal type.\n", tname); + } + } + result = TRUE; + #if !USE_REENTRANT +- strncpy(ttytype, termp->type.term_names, NAMESIZE - 1); ++ strncpy(ttytype, termp->type.term_names, (size_t) NAMESIZE - 1); + ttytype[NAMESIZE - 1] = '\0'; + #endif + +@@ -169,17 +153,27 @@ + _nc_tinfo_cmdch(termp, *command_character); + + if (generic_type) { +- ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname); ++ /* ++ * BSD 4.3's termcap contains mis-typed "gn" for wy99. Do a sanity ++ * check before giving up. ++ */ ++ if ((VALID_STRING(cursor_address) ++ || (VALID_STRING(cursor_down) && VALID_STRING(cursor_home))) ++ && VALID_STRING(clear_screen)) { ++ ret_error1(TGETENT_YES, "terminal is not really generic.\n", tname); ++ } else { ++ ret_error1(TGETENT_NO, "I need something more specific.\n", tname); ++ } + } + if (hard_copy) { +- ret_error(TGETENT_YES, "'%s': I can't handle hardcopy terminals.\n", tname); ++ ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname); + } + + return result; + } + + static int +-drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, bool beepFlag) ++drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, int beepFlag) + { + SCREEN *sp; + int res = ERR; +@@ -277,7 +271,7 @@ + + static void + drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, +- bool fore, ++ int fore, + int color, + NCURSES_SP_OUTC outc) + { +@@ -348,14 +342,18 @@ + { + SCREEN *sp; + bool useEnv = TRUE; ++ bool useTioctl = TRUE; + + AssertTCB(); + sp = TCB->csp; /* can be null here */ + + if (sp) { + useEnv = sp->_use_env; +- } else ++ useTioctl = sp->_use_tioctl; ++ } else { + useEnv = _nc_prescreen.use_env; ++ useTioctl = _nc_prescreen.use_tioctl; ++ } + + /* figure out the size of the screen */ + T(("screen size: terminfo lines = %d columns = %d", lines, columns)); +@@ -363,7 +361,7 @@ + *linep = (int) lines; + *colp = (int) columns; + +- if (useEnv) { ++ if (useEnv || useTioctl) { + int value; + + #ifdef __EMX__ +@@ -371,7 +369,9 @@ + int screendata[2]; + _scrsize(screendata); + *colp = screendata[0]; +- *linep = screendata[1]; ++ *linep = ((sp != 0 && sp->_filtered) ++ ? 1 ++ : screendata[1]); + T(("EMX screen size: environment LINES = %d COLUMNS = %d", + *linep, *colp)); + } +@@ -400,19 +400,33 @@ + } + #endif /* HAVE_SIZECHANGE */ + +- /* +- * Finally, look for environment variables. +- * +- * Solaris lets users override either dimension with an environment +- * variable. +- */ +- if ((value = _nc_getenv_num("LINES")) > 0) { +- *linep = value; +- T(("screen size: environment LINES = %d", *linep)); +- } +- if ((value = _nc_getenv_num("COLUMNS")) > 0) { +- *colp = value; +- T(("screen size: environment COLUMNS = %d", *colp)); ++ if (useEnv) { ++ if (useTioctl) { ++ /* ++ * If environment variables are used, update them. ++ */ ++ if ((sp == 0 || !sp->_filtered) && _nc_getenv_num("LINES") > 0) { ++ _nc_setenv_num("LINES", *linep); ++ } ++ if (_nc_getenv_num("COLUMNS") > 0) { ++ _nc_setenv_num("COLUMNS", *colp); ++ } ++ } ++ ++ /* ++ * Finally, look for environment variables. ++ * ++ * Solaris lets users override either dimension with an environment ++ * variable. ++ */ ++ if ((value = _nc_getenv_num("LINES")) > 0) { ++ *linep = value; ++ T(("screen size: environment LINES = %d", *linep)); ++ } ++ if ((value = _nc_getenv_num("COLUMNS")) > 0) { ++ *colp = value; ++ T(("screen size: environment COLUMNS = %d", *colp)); ++ } + } + + /* if we can't get dynamic info about the size, use static */ +@@ -463,7 +477,7 @@ + } + + static int +-drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf) ++drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, int setFlag, TTY * buf) + { + SCREEN *sp = TCB->csp; + TERMINAL *_term = (TERMINAL *) TCB; +@@ -497,7 +511,7 @@ + } + + static int +-drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag) ++drv_mode(TERMINAL_CONTROL_BLOCK * TCB, int progFlag, int defFlag) + { + SCREEN *sp; + TERMINAL *_term = (TERMINAL *) TCB; +@@ -620,15 +634,13 @@ + static void + drv_init(TERMINAL_CONTROL_BLOCK * TCB) + { +- SCREEN *sp; + TERMINAL *trm; + + AssertTCB(); + + trm = (TERMINAL *) TCB; +- sp = TCB->csp; + +- TCB->info.initcolor = initialize_color; ++ TCB->info.initcolor = VALID_STRING(initialize_color); + TCB->info.canchange = can_change; + TCB->info.hascolor = ((VALID_NUMERIC(max_colors) && VALID_NUMERIC(max_pairs) + && (((set_foreground != NULL) +@@ -665,7 +677,7 @@ + #define InPalette(n) ((n) >= 0 && (n) < MAX_PALETTE) + + static void +-drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, short pair, short f, short b) ++drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, int pair, int f, int b) + { + SCREEN *sp; + +@@ -712,7 +724,7 @@ + + static void + drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, +- short color, short r, short g, short b) ++ int color, int r, int g, int b) + { + SCREEN *sp = TCB->csp; + +@@ -726,9 +738,9 @@ + + static void + drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, +- short old_pair, +- short pair, +- bool reverse, ++ int old_pair, ++ int pair, ++ int reverse, + NCURSES_SP_OUTC outc) + { + SCREEN *sp = TCB->csp; +@@ -759,7 +771,7 @@ + if (old_pair >= 0 + && sp != 0 + && NCURSES_SP_NAME(pair_content) (NCURSES_SP_ARGx +- old_pair, ++ (short) old_pair, + &old_fg, + &old_bg) !=ERR) { + if ((isDefaultColor(fg) && !isDefaultColor(old_fg)) +@@ -845,7 +857,9 @@ + } + + static int +-drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB, int delay) ++drv_testmouse(TERMINAL_CONTROL_BLOCK * TCB, ++ int delay ++ EVENTLIST_2nd(_nc_eventlist * evl)) + { + int rc = 0; + SCREEN *sp; +@@ -899,7 +913,7 @@ + } + + static void +-drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, bool OnFlag) ++drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, int OnFlag) + { + SCREEN *sp = TCB->csp; + +@@ -1176,7 +1190,7 @@ + if ((pthread_self) && (pthread_kill) && (pthread_equal)) + _nc_globals.read_thread = pthread_self(); + # endif +- n = read(sp->_ifd, &c2, 1); ++ n = read(sp->_ifd, &c2, (size_t) 1); + #if USE_PTHREADS_EINTR + _nc_globals.read_thread = 0; + #endif +@@ -1225,7 +1239,7 @@ + } + + static int +-drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag) ++drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, int flag) + { + int ret = ERR; + SCREEN *sp; +@@ -1251,7 +1265,7 @@ + } + + static int +-drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, bool flag) ++drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int c, int flag) + { + SCREEN *sp; + int code = ERR; +@@ -1264,7 +1278,8 @@ + if (c >= 0) { + unsigned ch = (unsigned) c; + if (flag) { +- while ((s = _nc_expand_try(sp->_key_ok, ch, &count, 0)) != 0 ++ while ((s = _nc_expand_try(sp->_key_ok, ++ ch, &count, (size_t) 0)) != 0 + && _nc_remove_key(&(sp->_key_ok), ch)) { + code = _nc_add_to_try(&(sp->_keytry), s, ch); + free(s); +@@ -1273,7 +1288,8 @@ + break; + } + } else { +- while ((s = _nc_expand_try(sp->_keytry, ch, &count, 0)) != 0 ++ while ((s = _nc_expand_try(sp->_keytry, ++ ch, &count, (size_t) 0)) != 0 + && _nc_remove_key(&(sp->_keytry), ch)) { + code = _nc_add_to_try(&(sp->_key_ok), s, ch); + free(s); +diff -Naur ncurses-5.9.orig/ncurses/tinfo/trim_sgr0.c ncurses-5.9/ncurses/tinfo/trim_sgr0.c +--- ncurses-5.9.orig/ncurses/tinfo/trim_sgr0.c 2012-08-25 19:57:59.413234218 +0000 ++++ ncurses-5.9/ncurses/tinfo/trim_sgr0.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2005-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2005-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + + #include <tic.h> + +-MODULE_ID("$Id: trim_sgr0.c,v 1.12 2010/12/25 23:03:57 tom Exp $") ++MODULE_ID("$Id: trim_sgr0.c,v 1.14 2012/02/22 22:34:31 tom Exp $") + + #undef CUR + #define CUR tp-> +@@ -108,7 +108,7 @@ + for (n = 0; n < len_s - len_a; ++n) { + s[n] = s[n + len_a]; + } +- strcpy(s + n, attr); ++ _nc_STRCPY(s + n, attr, strlen(s) + 1); + TR(TRACE_DATABASE, ("to:\n\t%s", s)); + } + } +diff -Naur ncurses-5.9.orig/ncurses/tinfo/write_entry.c ncurses-5.9/ncurses/tinfo/write_entry.c +--- ncurses-5.9.orig/ncurses/tinfo/write_entry.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/tinfo/write_entry.c 2012-08-25 19:58:01.729889930 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,21 +39,15 @@ + #include <curses.priv.h> + #include <hashed_db.h> + +-#include <sys/stat.h> +- + #include <tic.h> + +-#ifndef S_ISDIR +-#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR) +-#endif +- + #if 1 + #define TRACE_OUT(p) DEBUG(2, p) + #else + #define TRACE_OUT(p) /*nothing */ + #endif + +-MODULE_ID("$Id: write_entry.c,v 1.78 2010/12/25 23:23:08 tom Exp $") ++MODULE_ID("$Id: write_entry.c,v 1.86 2012/06/16 16:59:05 tom Exp $") + + static int total_written; + +@@ -76,7 +70,7 @@ + DEBUG(1, ("Created %s", filename)); + + if (write_object(tp, buffer, &offset, limit) == ERR +- || fwrite(buffer, sizeof(char), offset, fp) != offset) { ++ || fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) { + _nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename); + } + +@@ -105,7 +99,7 @@ + if (verified[s - dirnames]) + return; + +- sprintf(dir, LEAF_FMT, code); ++ _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code); + if (make_db_root(dir) < 0) { + _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir); + } +@@ -115,36 +109,35 @@ + #endif /* !USE_HASHED_DB */ + + static int +-make_db_path(char *dst, const char *src, unsigned limit) ++make_db_path(char *dst, const char *src, size_t limit) + { + int rc = -1; + const char *top = _nc_tic_dir(0); + + if (src == top || _nc_is_abs_path(src)) { + if (strlen(src) + 1 <= limit) { +- (void) strcpy(dst, src); ++ _nc_STRCPY(dst, src, limit); + rc = 0; + } + } else { + if (strlen(top) + strlen(src) + 2 <= limit) { +- (void) sprintf(dst, "%s/%s", top, src); ++ _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src); + rc = 0; + } + } + #if USE_HASHED_DB + if (rc == 0) { +- if (_nc_is_dir_path(dst)) { +- rc = -1; +- } else { +- static const char suffix[] = DBM_SUFFIX; +- unsigned have = strlen(dst); +- unsigned need = strlen(suffix); +- if (have > need && strcmp(dst + have - need, suffix)) { +- if (have + need <= limit) +- strcat(dst, suffix); +- else +- rc = -1; ++ static const char suffix[] = DBM_SUFFIX; ++ size_t have = strlen(dst); ++ size_t need = strlen(suffix); ++ if (have > need && strcmp(dst + (int) (have - need), suffix)) { ++ if (have + need <= limit) { ++ _nc_STRCAT(dst, suffix, limit); ++ } else { ++ rc = -1; + } ++ } else if (_nc_is_dir_path(dst)) { ++ rc = -1; + } + } + #endif +@@ -164,10 +157,11 @@ + #if USE_HASHED_DB + DB *capdbp; + +- if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) ++ if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) { + rc = -1; +- else if (_nc_db_close(capdbp) < 0) ++ } else if (_nc_db_close(capdbp) < 0) { + rc = -1; ++ } + #else + struct stat statbuf; + +@@ -283,7 +277,7 @@ + assert(strlen(tp->term_names) != 0); + assert(strlen(tp->term_names) < sizeof(name_list)); + +- (void) strcpy(name_list, tp->term_names); ++ _nc_STRCPY(name_list, tp->term_names, sizeof(name_list)); + DEBUG(7, ("Name list = '%s'", name_list)); + + first_name = name_list; +@@ -336,7 +330,9 @@ + key.data = name_list; + key.size = strlen(name_list); + +- strcpy(buffer + 1, tp->term_names); ++ _nc_STRCPY(buffer + 1, ++ tp->term_names, ++ sizeof(buffer) - 1); + data.size = strlen(tp->term_names) + 1; + + _nc_db_put(capdb, &key, &data); +@@ -355,7 +351,6 @@ + + _nc_db_put(capdb, &key, &data); + } +- _nc_db_close(capdb); + } + } + #else /* !USE_HASHED_DB */ +@@ -366,7 +361,8 @@ + if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN)) + _nc_warning("terminal name too long."); + +- sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name); ++ _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename)) ++ LEAF_FMT "/%s", first_name[0], first_name); + + /* + * Has this primary name been written since the first call to +@@ -376,7 +372,22 @@ + if (start_time > 0 && + stat(filename, &statbuf) >= 0 + && statbuf.st_mtime >= start_time) { ++#if HAVE_LINK && !USE_SYMLINKS ++ /* ++ * If the file has more than one link, the reason for the previous ++ * write could be that the current primary name used to be an alias for ++ * the previous entry. In that case, unlink the file so that we will ++ * not modify the previous entry as we write this one. ++ */ ++ if (statbuf.st_nlink > 1) { ++ _nc_warning("name redefined."); ++ unlink(filename); ++ } else { ++ _nc_warning("name multiply defined."); ++ } ++#else + _nc_warning("name multiply defined."); ++#endif + } + + check_writeable(first_name[0]); +@@ -407,7 +418,8 @@ + } + + check_writeable(ptr[0]); +- sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr); ++ _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname)) ++ LEAF_FMT "/%s", ptr[0], ptr); + + if (strcmp(filename, linkname) == 0) { + _nc_warning("self-synonym ignored"); +@@ -422,7 +434,7 @@ + if (first_name[0] == linkname[0]) + strncpy(symlinkname, first_name, sizeof(symlinkname) - 1); + else { +- strcpy(symlinkname, "../"); ++ _nc_STRCPY(symlinkname, "../", sizeof(suymlinkname)); + strncat(symlinkname, filename, sizeof(symlinkname) - 4); + } + symlinkname[sizeof(symlinkname) - 1] = '\0'; +@@ -491,7 +503,7 @@ + return (want / size); + } + +-#define Write(buf, size, count) fake_write(buffer, offset, limit, (char *) buf, count, size) ++#define Write(buf, size, count) fake_write(buffer, offset, (size_t) limit, (char *) buf, (size_t) count, (size_t) size) + + #undef LITTLE_ENDIAN /* BSD/OS defines this as a feature macro */ + #define HI(x) ((x) / 256) +@@ -706,7 +718,7 @@ + return (ERR); + + nextfree = compute_offsets(tp->Strings + STRCOUNT, +- tp->ext_Strings, ++ (size_t) tp->ext_Strings, + offsets); + TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree)); + +@@ -714,7 +726,7 @@ + return (ERR); + + nextfree += compute_offsets(tp->ext_Names, +- extcnt, ++ (size_t) extcnt, + offsets + tp->ext_Strings); + TRACE_OUT(("after extended capnames, nextfree=%d", nextfree)); + strmax = tp->ext_Strings + extcnt; +@@ -742,7 +754,7 @@ + + TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset)); + if (tp->ext_Numbers) { +- convert_shorts(buf, tp->Numbers + NUMCOUNT, tp->ext_Numbers); ++ convert_shorts(buf, tp->Numbers + NUMCOUNT, (size_t) tp->ext_Numbers); + if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers) + return (ERR); + } +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_trace.c ncurses-5.9/ncurses/trace/lib_trace.c +--- ncurses-5.9.orig/ncurses/trace/lib_trace.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_trace.c 2012-08-25 19:58:01.316558550 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -47,7 +47,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: lib_trace.c,v 1.76 2010/12/19 01:21:19 tom Exp $") ++MODULE_ID("$Id: lib_trace.c,v 1.81 2012/04/29 00:20:43 tom Exp $") + + NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */ + +@@ -103,9 +103,9 @@ + } + TracePath[size] = '\0'; + assert(strlen(TracePath) <= size); +- strcat(TracePath, "/trace"); ++ _nc_STRCAT(TracePath, "/trace", sizeof(TracePath)); + if (_nc_is_dir_path(TracePath)) { +- strcat(TracePath, ".log"); ++ _nc_STRCAT(TracePath, ".log", sizeof(TracePath)); + } + } + +@@ -121,7 +121,7 @@ + * end of each line. This is useful in case the program dies. + */ + #if HAVE_SETVBUF /* ANSI */ +- (void) setvbuf(TraceFP, (char *) 0, _IOLBF, 0); ++ (void) setvbuf(TraceFP, (char *) 0, _IOLBF, (size_t) 0); + #elif HAVE_SETBUF /* POSIX */ + (void) setbuffer(TraceFP, (char *) 0); + #endif +@@ -185,9 +185,9 @@ + if ((pthread_self)) + # endif + #ifdef __MINGW32__ +- fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self().p); ++ fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self().p); + #else +- fprintf(TraceFP, "%#lx:", (long) (void *) pthread_self()); ++ fprintf(TraceFP, "%#lx:", (long) (intptr_t) pthread_self()); + #endif + #endif + if (before || after) { +@@ -218,7 +218,7 @@ + + /* Trace 'bool' return-values */ + NCURSES_EXPORT(NCURSES_BOOL) +-_nc_retrace_bool(NCURSES_BOOL code) ++_nc_retrace_bool(int code) + { + T((T_RETURN("%s"), code ? "TRUE" : "FALSE")); + return code; +@@ -226,10 +226,10 @@ + + /* Trace 'char' return-values */ + NCURSES_EXPORT(char) +-_nc_retrace_char(char code) ++_nc_retrace_char(int code) + { + T((T_RETURN("%c"), code)); +- return code; ++ return (char) code; + } + + /* Trace 'int' return-values */ +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_traceatr.c ncurses-5.9/ncurses/trace/lib_traceatr.c +--- ncurses-5.9.orig/ncurses/trace/lib_traceatr.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_traceatr.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -43,10 +43,13 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_traceatr.c,v 1.74 2011/01/22 19:48:01 tom Exp $") ++MODULE_ID("$Id: lib_traceatr.c,v 1.79 2012/02/22 22:40:24 tom Exp $") + + #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name)) + ++#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) ++#define COLOR_BUF_SIZE(num) (sizeof(my_buffer[num])) ++ + #ifdef TRACE + + static const char l_brace[] = StringOf(L_BRACE); +@@ -65,9 +68,12 @@ + my_cached = c; + my_select = !my_select; + if (c == COLOR_DEFAULT) +- strcpy(my_buffer[my_select], "default"); ++ _nc_STRCPY(my_buffer[my_select], "default", ++ COLOR_BUF_SIZE(my_select)); + else +- sprintf(my_buffer[my_select], "color%d", c); ++ _nc_SPRINTF(my_buffer[my_select], ++ _nc_SLIMIT(COLOR_BUF_SIZE(my_select)) ++ "color%d", c); + } + return my_buffer[my_select]; + } +@@ -120,14 +126,14 @@ + ; + size_t n; + char temp[80]; +- char *result = _nc_trace_buf(bufnum, BUFSIZ); ++ char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); + + if (result != 0) { + unsigned save_nc_tracing = _nc_tracing; + + _nc_tracing = 0; + +- strcpy(result, l_brace); ++ _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); + + for (n = 0; n < SIZEOF(names); n++) { + if ((newmode & names[n].val) != 0) { +@@ -139,18 +145,20 @@ + short pairnum = (short) PairNumber(newmode); + #ifdef USE_TERMLIB + /* pair_content lives in libncurses */ +- (void) sprintf(temp, "{%d}", pairnum); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) ++ "{%d}", pairnum); + #else + short fg, bg; + + if (pair_content(pairnum, &fg, &bg) == OK) { +- (void) sprintf(temp, +- "{%d = {%s, %s}}", +- pairnum, +- COLOR_OF(fg), +- COLOR_OF(bg)); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) ++ "{%d = {%s, %s}}", ++ pairnum, ++ COLOR_OF(fg), ++ COLOR_OF(bg)); + } else { +- (void) sprintf(temp, "{%d}", pairnum); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) ++ "{%d}", pairnum); + } + #endif + result = _nc_trace_bufcat(bufnum, temp); +@@ -243,7 +251,7 @@ + #if NCURSES_SP_FUNCS + (void) sp; + #endif +- if ((attr & A_ALTCHARSET) && (acs_chars != 0)) { ++ if (SP_PARM != 0 && (attr & A_ALTCHARSET) && (acs_chars != 0)) { + char *cp; + char *found = 0; + const ALT_NAMES *strp; +@@ -271,10 +279,10 @@ + _tracechtype2(int bufnum, chtype ch) + { + const char *found; +- char *result = _nc_trace_buf(bufnum, BUFSIZ); ++ char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); + + if (result != 0) { +- strcpy(result, l_brace); ++ _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); + if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) { + (void) _nc_trace_bufcat(bufnum, found); + } else +@@ -311,12 +319,12 @@ + NCURSES_EXPORT(char *) + _tracecchar_t2(int bufnum, const cchar_t *ch) + { +- char *result = _nc_trace_buf(bufnum, BUFSIZ); ++ char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); + attr_t attr; + const char *found; + + if (result != 0) { +- strcpy(result, l_brace); ++ _nc_STRCPY(result, l_brace, TRACE_BUF_SIZE(bufnum)); + if (ch != 0) { + attr = AttrOfD(ch); + if ((found = _nc_altcharset_name(attr, (chtype) CharOfD(ch))) != 0) { +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracebits.c ncurses-5.9/ncurses/trace/lib_tracebits.c +--- ncurses-5.9.orig/ncurses/trace/lib_tracebits.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_tracebits.c 2012-08-25 19:58:01.729889930 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,11 +34,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_tracebits.c,v 1.19 2011/01/09 00:23:03 tom Exp $") +- +-#if SVR4_TERMIO && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif ++MODULE_ID("$Id: lib_tracebits.c,v 1.23 2012/06/09 19:55:46 tom Exp $") + + #if HAVE_SYS_TERMIO_H + #include <sys/termio.h> /* needed for ISC */ +@@ -80,22 +76,24 @@ + const char *name; + } BITNAMES; + ++#define TRACE_BUF_SIZE(num) (_nc_globals.tracebuf_ptr[num].size) ++ + static void + lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int val) + { + const BITNAMES *sp; + +- (void) strcat(buf, label); +- (void) strcat(buf, ": {"); ++ _nc_STRCAT(buf, label, TRACE_BUF_SIZE(0)); ++ _nc_STRCAT(buf, ": {", TRACE_BUF_SIZE(0)); + for (sp = table; sp->name; sp++) + if (sp->val != 0 + && (val & sp->val) == sp->val) { +- (void) strcat(buf, sp->name); +- (void) strcat(buf, ", "); ++ _nc_STRCAT(buf, sp->name, TRACE_BUF_SIZE(0)); ++ _nc_STRCAT(buf, ", ", TRACE_BUF_SIZE(0)); + } + if (buf[strlen(buf) - 2] == ',') + buf[strlen(buf) - 2] = '\0'; +- (void) strcat(buf, "} "); ++ _nc_STRCAT(buf, "} ", TRACE_BUF_SIZE(0)); + } + + NCURSES_EXPORT(char *) +@@ -192,7 +190,7 @@ + CS_DATA(CS8), + }; + const char *result = "CSIZE? "; +- int value = (tty->c_cflag & CSIZE); ++ int value = (int) (tty->c_cflag & CSIZE); + unsigned n; + + if (value != 0) { +@@ -203,7 +201,7 @@ + } + } + } +- strcat(buf, result); ++ _nc_STRCAT(buf, result, TRACE_BUF_SIZE(0)); + } + #endif + +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracechr.c ncurses-5.9/ncurses/trace/lib_tracechr.c +--- ncurses-5.9.orig/ncurses/trace/lib_tracechr.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_tracechr.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,10 +39,12 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: lib_tracechr.c,v 1.20 2009/04/18 22:48:29 tom Exp $") ++MODULE_ID("$Id: lib_tracechr.c,v 1.22 2012/02/22 22:40:24 tom Exp $") + + #ifdef TRACE + ++#define MyBufSize sizeof(_nc_globals.tracechr_buf) ++ + NCURSES_EXPORT(char *) + _nc_tracechar(SCREEN *sp, int ch) + { +@@ -55,19 +57,22 @@ + name = safe_keyname(SP_PARM, ch); + if (name == 0 || *name == '\0') + name = "NULL"; +- (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); ++ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) ++ "'%.30s' = %#03o", name, ch); + } else if (!is8bits(ch) || !isprint(UChar(ch))) { + /* + * workaround for glibc bug: + * sprintf changes the result from unctrl() to an empty string if it + * does not correspond to a valid multibyte sequence. + */ +- (void) sprintf(MyBuffer, "%#03o", ch); ++ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) ++ "%#03o", ch); + } else { + name = safe_unctrl(SP_PARM, (chtype) ch); + if (name == 0 || *name == 0) + name = "null"; /* shouldn't happen */ +- (void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch); ++ _nc_SPRINTF(MyBuffer, _nc_SLIMIT(MyBufSize) ++ "'%.30s' = %#03o", name, ch); + } + return (MyBuffer); + } +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracedmp.c ncurses-5.9/ncurses/trace/lib_tracedmp.c +--- ncurses-5.9.orig/ncurses/trace/lib_tracedmp.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_tracedmp.c 2012-08-25 19:58:01.733223247 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + #include <curses.priv.h> + #include <ctype.h> + +-MODULE_ID("$Id: lib_tracedmp.c,v 1.32 2009/04/18 21:01:38 tom Exp $") ++MODULE_ID("$Id: lib_tracedmp.c,v 1.33 2012/06/09 20:29:33 tom Exp $") + + #ifdef TRACE + +@@ -111,7 +111,7 @@ + if (multicolumn) { + ep = my_buffer; + for (j = 0; j < width; ++j) { +- chtype test = WidecExt(win->_line[n].text[j]); ++ int test = WidecExt(win->_line[n].text[j]); + if (test) { + ep[j] = (char) (test + '0'); + } else { +diff -Naur ncurses-5.9.orig/ncurses/trace/lib_tracemse.c ncurses-5.9/ncurses/trace/lib_tracemse.c +--- ncurses-5.9.orig/ncurses/trace/lib_tracemse.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/lib_tracemse.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -38,7 +38,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_tracemse.c,v 1.18 2011/01/22 19:48:08 tom Exp $") ++MODULE_ID("$Id: lib_tracemse.c,v 1.20 2012/02/22 22:40:24 tom Exp $") + + #ifdef TRACE + +@@ -47,7 +47,11 @@ + static char * + _trace_mmask_t(SCREEN *sp, mmask_t code) + { +-#define SHOW(m, s) if ((code & m) == m) strcat(strcat(my_buffer, s), ", ") ++#define SHOW(m, s) \ ++ if ((code & m) == m) { \ ++ _nc_STRCAT(my_buffer, s, sizeof(my_buffer)); \ ++ _nc_STRCAT(my_buffer, ", ", sizeof(my_buffer)); \ ++ } + + SHOW(BUTTON1_RELEASED, "release-1"); + SHOW(BUTTON1_PRESSED, "press-1"); +@@ -110,15 +114,16 @@ + NCURSES_EXPORT(char *) + _nc_tracemouse(SCREEN *sp, MEVENT const *ep) + { +- (void) sprintf(my_buffer, TRACEMSE_FMT, +- ep->id, +- ep->x, +- ep->y, +- ep->z, +- (unsigned long) ep->bstate); ++ _nc_SPRINTF(my_buffer, _nc_SLIMIT(sizeof(my_buffer)) ++ TRACEMSE_FMT, ++ ep->id, ++ ep->x, ++ ep->y, ++ ep->z, ++ (unsigned long) ep->bstate); + + (void) _trace_mmask_t(sp, ep->bstate); +- (void) strcat(my_buffer, "}"); ++ _nc_STRCAT(my_buffer, "}", sizeof(my_buffer)); + return (my_buffer); + } + +diff -Naur ncurses-5.9.orig/ncurses/trace/trace_buf.c ncurses-5.9/ncurses/trace/trace_buf.c +--- ncurses-5.9.orig/ncurses/trace/trace_buf.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/trace_buf.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: trace_buf.c,v 1.17 2011/01/22 19:48:16 tom Exp $") ++MODULE_ID("$Id: trace_buf.c,v 1.20 2012/02/22 22:34:31 tom Exp $") + + #ifdef TRACE + +@@ -103,13 +103,14 @@ + NCURSES_EXPORT(char *) + _nc_trace_bufcat(int bufnum, const char *value) + { +- char *buffer = _nc_trace_alloc(bufnum, 0); ++ char *buffer = _nc_trace_alloc(bufnum, (size_t) 0); + if (buffer != 0) { + size_t have = strlen(buffer); ++ size_t need = strlen(value) + have; + +- buffer = _nc_trace_alloc(bufnum, 1 + have + strlen(value)); ++ buffer = _nc_trace_alloc(bufnum, 1 + need); + if (buffer != 0) +- (void) strcpy(buffer + have, value); ++ _nc_STRCPY(buffer + have, value, need); + + } + return buffer; +diff -Naur ncurses-5.9.orig/ncurses/trace/varargs.c ncurses-5.9/ncurses/trace/varargs.c +--- ncurses-5.9.orig/ncurses/trace/varargs.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/varargs.c 2012-08-25 19:58:00.923227077 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2001-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 2001-2008,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: varargs.c,v 1.8 2008/11/16 00:19:59 juergen Exp $") ++MODULE_ID("$Id: varargs.c,v 1.10 2012/02/22 22:40:24 tom Exp $") + + #ifdef TRACE + +@@ -149,25 +149,30 @@ + param = buffer; + switch (used) { + case atInteger: +- sprintf(buffer, "%d", ival); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%d", ival); + break; + case atFloat: +- sprintf(buffer, "%f", fval); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%f", fval); + break; + case atPoint: +- sprintf(buffer, "%p", pval); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%p", pval); + break; + case atString: + param = _nc_visbuf2(1, sval); + break; + case atUnknown: + default: +- strcpy(buffer, "?"); ++ _nc_STRCPY(buffer, "?", sizeof(buffer)); + break; + } + MyLength += strlen(param) + 2; + MyBuffer = typeRealloc(char, MyLength, MyBuffer); +- sprintf(MyBuffer + strlen(MyBuffer), ", %s", param); ++ _nc_SPRINTF(MyBuffer + strlen(MyBuffer), ++ _nc_SLIMIT(MyLength - strlen(MyBuffer)) ++ ", %s", param); + } + } + used = atUnknown; +diff -Naur ncurses-5.9.orig/ncurses/trace/visbuf.c ncurses-5.9/ncurses/trace/visbuf.c +--- ncurses-5.9.orig/ncurses/trace/visbuf.c 2012-08-25 19:57:59.409900901 +0000 ++++ ncurses-5.9/ncurses/trace/visbuf.c 2012-08-25 19:58:00.926560395 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2001-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + #include <tic.h> + #include <ctype.h> + +-MODULE_ID("$Id: visbuf.c,v 1.37 2010/05/29 18:51:41 tom Exp $") ++MODULE_ID("$Id: visbuf.c,v 1.40 2012/02/22 22:40:24 tom Exp $") + + #define NUM_VISBUFS 4 + +@@ -55,8 +55,16 @@ + static const char r_brace[] = StringOf(R_BRACE); + #endif + ++#if USE_STRING_HACKS && HAVE_SNPRINTF ++#define VisChar(tp, chr, limit) _nc_vischar(tp, chr, limit) ++#define LIMIT_ARG ,size_t limit ++#else ++#define VisChar(tp, chr, limit) _nc_vischar(tp, chr) ++#define LIMIT_ARG /* nothing */ ++#endif ++ + static char * +-_nc_vischar(char *tp, unsigned c) ++_nc_vischar(char *tp, unsigned c LIMIT_ARG) + { + if (c == '"' || c == '\\') { + *tp++ = '\\'; +@@ -84,7 +92,8 @@ + *tp++ = '^'; + *tp++ = (char) ('@' + c); + } else { +- sprintf(tp, "\\%03lo", (unsigned long) ChCharOf(c)); ++ _nc_SPRINTF(tp, _nc_SLIMIT(limit) ++ "\\%03lo", (unsigned long) ChCharOf(c)); + tp += strlen(tp); + } + *tp = 0; +@@ -97,6 +106,7 @@ + const char *vbuf = 0; + char *tp; + int c; ++ int count; + + if (buf == 0) + return ("(null)"); +@@ -106,6 +116,7 @@ + if (len < 0) + len = (int) strlen(buf); + ++ count = len; + #ifdef TRACE + vbuf = tp = _nc_trace_buf(bufnum, NormalLen(len)); + #else +@@ -124,8 +135,8 @@ + #endif + if (tp != 0) { + *tp++ = D_QUOTE; +- while ((--len >= 0) && (c = *buf++) != '\0') { +- tp = _nc_vischar(tp, UChar(c)); ++ while ((--count >= 0) && (c = *buf++) != '\0') { ++ tp = VisChar(tp, UChar(c), NormalLen(len)); + } + *tp++ = D_QUOTE; + *tp = '\0'; +@@ -175,6 +186,7 @@ + const char *vbuf; + char *tp; + wchar_t c; ++ int count; + + if (buf == 0) + return ("(null)"); +@@ -182,6 +194,7 @@ + if (len < 0) + len = (int) wcslen(buf); + ++ count = len; + #ifdef TRACE + vbuf = tp = _nc_trace_buf(bufnum, WideLen(len)); + #else +@@ -193,15 +206,16 @@ + #endif + if (tp != 0) { + *tp++ = D_QUOTE; +- while ((--len >= 0) && (c = *buf++) != '\0') { ++ while ((--count >= 0) && (c = *buf++) != '\0') { + char temp[CCHARW_MAX + 80]; + int j = wctomb(temp, c), k; + if (j <= 0) { +- sprintf(temp, "\\u%08X", (unsigned) c); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) ++ "\\u%08X", (unsigned) c); + j = (int) strlen(temp); + } + for (k = 0; k < j; ++k) { +- tp = _nc_vischar(tp, UChar(temp[k])); ++ tp = VisChar(tp, UChar(temp[k]), WideLen(len)); + } + } + *tp++ = D_QUOTE; +@@ -261,7 +275,7 @@ + NCURSES_EXPORT(const char *) + _nc_viscbuf2(int bufnum, const NCURSES_CH_T * buf, int len) + { +- char *result = _nc_trace_buf(bufnum, BUFSIZ); ++ char *result = _nc_trace_buf(bufnum, (size_t) BUFSIZ); + int first; + const char *found; + +@@ -315,7 +329,7 @@ + break; + for (k = 0; k < PUTC_n; k++) { + char temp[80]; +- _nc_vischar(temp, UChar(PUTC_buf[k])); ++ VisChar(temp, UChar(PUTC_buf[k]), sizeof(temp)); + (void) _nc_trace_bufcat(bufnum, temp); + } + } +@@ -323,7 +337,7 @@ + #else + { + char temp[80]; +- _nc_vischar(temp, UChar(buf[j])); ++ VisChar(temp, UChar(buf[j]), sizeof(temp)); + result = _nc_trace_bufcat(bufnum, temp); + } + #endif /* USE_WIDEC_SUPPORT */ +diff -Naur ncurses-5.9.orig/ncurses/tty/hardscroll.c ncurses-5.9/ncurses/tty/hardscroll.c +--- ncurses-5.9.orig/ncurses/tty/hardscroll.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/hardscroll.c 2012-08-25 19:58:00.926560395 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -147,7 +147,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: hardscroll.c,v 1.47 2010/04/24 23:46:47 tom Exp $") ++MODULE_ID("$Id: hardscroll.c,v 1.49 2012/02/22 22:40:24 tom Exp $") + + #if defined(SCROLLDEBUG) || defined(HASHDEBUG) + +@@ -173,9 +173,9 @@ + # if USE_HASHMAP + # define oldnums(sp) (sp)->_oldnum_list + # define OLDNUM(sp,n) oldnums(sp)[n] +-# else /* !USE_HASHMAP */ ++# else /* !USE_HASHMAP */ + # define OLDNUM(sp,n) NewScreen(sp)->_line[n].oldindex +-# endif /* !USE_HASHMAP */ ++# endif /* !USE_HASHMAP */ + + #define OLDNUM_SIZE(sp) (sp)->_oldnum_size + +@@ -302,7 +302,9 @@ + + *buf = '\0'; + for (n = 0; n < screen_lines(SP_PARM); n++) +- (void) sprintf(buf + strlen(buf), " %02d", OLDNUM(SP_PARM, n)); ++ _nc_SPRINTF(buf + strlen(buf), ++ _nc_SLIMIT(want - strlen(buf)) ++ " %02d", OLDNUM(SP_PARM, n)); + TR(TRACE_UPDATE | TRACE_MOVE, ("virt %s", buf)); + free(buf); + } +diff -Naur ncurses-5.9.orig/ncurses/tty/hashmap.c ncurses-5.9/ncurses/tty/hashmap.c +--- ncurses-5.9.orig/ncurses/tty/hashmap.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/hashmap.c 2012-08-25 19:58:00.049897873 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -73,7 +73,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: hashmap.c,v 1.62 2010/04/24 23:46:07 tom Exp $") ++MODULE_ID("$Id: hashmap.c,v 1.63 2011/10/22 16:34:50 tom Exp $") + + #ifdef HASHDEBUG + +@@ -163,7 +163,7 @@ + * effective. 'blank' indicates whether the line 'to' would become blank. + */ + static NCURSES_INLINE bool +-cost_effective(SCREEN *sp, const int from, const int to, const bool blank) ++cost_effective(SCREEN *sp, const int from, const int to, const int blank) + { + int new_from; + +diff -Naur ncurses-5.9.orig/ncurses/tty/lib_mvcur.c ncurses-5.9/ncurses/tty/lib_mvcur.c +--- ncurses-5.9.orig/ncurses/tty/lib_mvcur.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/lib_mvcur.c 2012-08-25 19:58:00.049897873 +0000 +@@ -159,7 +159,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_mvcur.c,v 1.126 2011/01/22 19:48:21 tom Exp $") ++MODULE_ID("$Id: lib_mvcur.c,v 1.127 2011/10/22 16:09:52 tom Exp $") + + #define WANT_CHAR(sp, y, x) NewScreen(sp)->_line[y].text[x] /* desired state */ + +@@ -549,7 +549,7 @@ + int from_x, + int to_y, + int to_x, +- bool ovw) ++ int ovw) + /* move via local motions (cuu/cuu1/cud/cud1/cub1/cub/cuf1/cuf/vpa/hpa) */ + { + string_desc save; +@@ -770,7 +770,7 @@ + */ + + static NCURSES_INLINE int +-onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, bool ovw) ++onscreen_mvcur(NCURSES_SP_DCLx int yold, int xold, int ynew, int xnew, int ovw) + /* onscreen move from (yold, xold) to (ynew, xnew) */ + { + string_desc result; +diff -Naur ncurses-5.9.orig/ncurses/tty/lib_tstp.c ncurses-5.9/ncurses/tty/lib_tstp.c +--- ncurses-5.9.orig/ncurses/tty/lib_tstp.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/lib_tstp.c 2012-08-25 19:58:00.049897873 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,11 +42,7 @@ + + #include <SigAction.h> + +-#if SVR4_ACTION && !defined(_POSIX_SOURCE) +-#define _POSIX_SOURCE +-#endif +- +-MODULE_ID("$Id: lib_tstp.c,v 1.41 2010/05/15 21:31:12 tom Exp $") ++MODULE_ID("$Id: lib_tstp.c,v 1.45 2011/10/22 15:37:42 tom Exp $") + + #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC) + #define USE_SIGTSTP 1 +@@ -244,16 +240,19 @@ + SCREEN *sp = CURRENT_SCREEN; + + /* +- * Actually, doing any sort of I/O from within an signal handler is +- * "unsafe". But we'll _try_ to clean up the screen and terminal +- * settings on the way out. ++ * Much of this is unsafe from a signal handler. But we'll _try_ to clean ++ * up the screen and terminal settings on the way out. ++ * ++ * There are at least the following problems: ++ * 1) Walking the SCREEN list is unsafe, since all list management ++ * is done without any signal blocking. ++ * 2) On systems which have REENTRANT turned on, set_term() uses ++ * _nc_lock_global() which could deadlock or misbehave in other ways. ++ * 3) endwin() calls all sorts of stuff, many of which use stdio or ++ * other library functions which are clearly unsafe. + */ + if (!_nc_globals.cleanup_nested++ +- && (sig == SIGINT +-#ifdef SIGQUIT +- || sig == SIGQUIT +-#endif +- )) { ++ && (sig == SIGINT || sig == SIGTERM)) { + #if HAVE_SIGACTION || HAVE_SIGVEC + sigaction_t act; + sigemptyset(&act.sa_mask); +@@ -274,11 +273,11 @@ + set_term(scan); + NCURSES_SP_NAME(endwin) (NCURSES_SP_ARG); + if (sp) +- sp->_endwin = FALSE; /* in case we have an atexit! */ ++ sp->_endwin = FALSE; /* in case of reuse */ + } + } + } +- exit(EXIT_FAILURE); ++ _exit(EXIT_FAILURE); + } + + #if USE_SIGWINCH +@@ -364,7 +363,7 @@ + * the caller later changes its mind, but that doesn't seem correct. + */ + NCURSES_EXPORT(void) +-_nc_signal_handler(bool enable) ++_nc_signal_handler(int enable) + { + T((T_CALLED("_nc_signal_handler(%d)"), enable)); + #if USE_SIGTSTP /* Xenix 2.x doesn't have SIGTSTP, for example */ +diff -Naur ncurses-5.9.orig/ncurses/tty/lib_twait.c ncurses-5.9/ncurses/tty/lib_twait.c +--- ncurses-5.9.orig/ncurses/tty/lib_twait.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/lib_twait.c 2012-08-25 19:58:00.833227503 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -53,6 +53,11 @@ + #include <OS.h> + #endif + ++#if USE_KLIBC_KBD ++#define INCL_KBD ++#include <os2.h> ++#endif ++ + #if USE_FUNC_POLL + # if HAVE_SYS_TIME_H + # include <sys/time.h> +@@ -70,10 +75,10 @@ + #endif + #undef CUR + +-MODULE_ID("$Id: lib_twait.c,v 1.61 2010/12/25 23:43:58 tom Exp $") ++MODULE_ID("$Id: lib_twait.c,v 1.64 2012/02/18 20:32:55 tom Exp $") + + static long +-_nc_gettime(TimeType * t0, bool first) ++_nc_gettime(TimeType * t0, int first) + { + long res; + +@@ -184,6 +189,12 @@ + fd_set set; + #endif + ++#if USE_KLIBC_KBD ++ fd_set saved_set; ++ KBDKEYINFO ki; ++ struct timeval tv; ++#endif ++ + long starttime, returntime; + + TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d", +@@ -207,6 +218,7 @@ + starttime = _nc_gettime(&t0, TRUE); + + count = 0; ++ (void) count; + + #ifdef NCURSES_WGETCH_EVENTS + if ((mode & TW_EVENT) && evl) +@@ -247,7 +259,7 @@ + } + #endif + +- result = poll(fds, (unsigned) count, milliseconds); ++ result = poll(fds, (size_t) count, milliseconds); + + #ifdef NCURSES_WGETCH_EVENTS + if ((mode & TW_EVENT) && evl) { +@@ -329,10 +341,12 @@ + */ + FD_ZERO(&set); + ++#if !USE_KLIBC_KBD + if (mode & TW_INPUT) { + FD_SET(sp->_ifd, &set); + count = sp->_ifd + 1; + } ++#endif + if ((mode & TW_MOUSE) + && (fd = sp->_mouse_fd) >= 0) { + FD_SET(fd, &set); +@@ -352,6 +366,31 @@ + } + #endif + ++#if USE_KLIBC_KBD ++ for (saved_set = set;; set = saved_set) { ++ if ((mode & TW_INPUT) ++ && (sp->_extended_key ++ || (KbdPeek(&ki, 0) == 0 ++ && (ki.fbStatus & KBDTRF_FINAL_CHAR_IN)))) { ++ FD_ZERO(&set); ++ FD_SET(sp->_ifd, &set); ++ result = 1; ++ break; ++ } ++ ++ tv.tv_sec = 0; ++ tv.tv_usec = (milliseconds == 0) ? 0 : (10 * 1000); ++ ++ if ((result = select(count, &set, NULL, NULL, &tv)) != 0) ++ break; ++ ++ /* Time out ? */ ++ if (milliseconds >= 0 && _nc_gettime(&t0, FALSE) >= milliseconds) { ++ result = 0; ++ break; ++ } ++ } ++#else + if (milliseconds >= 0) { + struct timeval ntimeout; + ntimeout.tv_sec = milliseconds / 1000; +@@ -360,6 +399,7 @@ + } else { + result = select(count, &set, NULL, NULL, NULL); + } ++#endif + + #ifdef NCURSES_WGETCH_EVENTS + if ((mode & TW_EVENT) && evl) { +diff -Naur ncurses-5.9.orig/ncurses/tty/lib_vidattr.c ncurses-5.9/ncurses/tty/lib_vidattr.c +--- ncurses-5.9.orig/ncurses/tty/lib_vidattr.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/lib_vidattr.c 2012-08-25 19:58:00.053231190 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -69,7 +69,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_vidattr.c,v 1.61 2010/06/05 22:22:04 tom Exp $") ++MODULE_ID("$Id: lib_vidattr.c,v 1.62 2011/05/28 21:22:04 tom Exp $") + + #define doPut(mode) \ + TPUTS_TRACE(#mode); \ +@@ -341,42 +341,44 @@ + chtype attrs = A_NORMAL; + + T((T_CALLED("termattrs(%p)"), (void *) SP_PARM)); ++ ++ if (HasTerminal(SP_PARM)) { + #ifdef USE_TERM_DRIVER +- if (HasTerminal(SP_PARM)) + attrs = CallDriver(SP_PARM, conattr); + #else + +- if (enter_alt_charset_mode) +- attrs |= A_ALTCHARSET; ++ if (enter_alt_charset_mode) ++ attrs |= A_ALTCHARSET; + +- if (enter_blink_mode) +- attrs |= A_BLINK; ++ if (enter_blink_mode) ++ attrs |= A_BLINK; + +- if (enter_bold_mode) +- attrs |= A_BOLD; ++ if (enter_bold_mode) ++ attrs |= A_BOLD; + +- if (enter_dim_mode) +- attrs |= A_DIM; ++ if (enter_dim_mode) ++ attrs |= A_DIM; + +- if (enter_reverse_mode) +- attrs |= A_REVERSE; ++ if (enter_reverse_mode) ++ attrs |= A_REVERSE; + +- if (enter_standout_mode) +- attrs |= A_STANDOUT; ++ if (enter_standout_mode) ++ attrs |= A_STANDOUT; + +- if (enter_protected_mode) +- attrs |= A_PROTECT; ++ if (enter_protected_mode) ++ attrs |= A_PROTECT; + +- if (enter_secure_mode) +- attrs |= A_INVIS; ++ if (enter_secure_mode) ++ attrs |= A_INVIS; + +- if (enter_underline_mode) +- attrs |= A_UNDERLINE; ++ if (enter_underline_mode) ++ attrs |= A_UNDERLINE; + +- if (SP_PARM->_coloron) +- attrs |= A_COLOR; ++ if (SP_PARM->_coloron) ++ attrs |= A_COLOR; + + #endif ++ } + returnChtype(attrs); + } + +diff -Naur ncurses-5.9.orig/ncurses/tty/tty_update.c ncurses-5.9/ncurses/tty/tty_update.c +--- ncurses-5.9.orig/ncurses/tty/tty_update.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/tty/tty_update.c 2012-08-25 19:58:01.469891159 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -82,7 +82,7 @@ + + #include <ctype.h> + +-MODULE_ID("$Id: tty_update.c,v 1.264 2010/12/19 01:21:02 tom Exp $") ++MODULE_ID("$Id: tty_update.c,v 1.268 2012/05/12 21:02:00 tom Exp $") + + /* + * This define controls the line-breakout optimization. Every once in a +@@ -288,13 +288,12 @@ + int j = CharOfD(ch); + chtype temp = UChar(SP_PARM->_acs_map[j]); + +- if (!(SP_PARM->_screen_acs_map[j])) { ++ if (temp != 0) { ++ SetChar(my_ch, temp, AttrOf(attr)); ++ } else { ++ my_ch = CHDEREF(ch); + RemAttr(attr, A_ALTCHARSET); +- if (temp == 0) +- temp = ' '; + } +- if (temp != 0) +- SetChar(my_ch, temp, AttrOf(attr)); + } + ch = CHREF(my_ch); + } +@@ -342,7 +341,7 @@ + struct pollfd fds[1]; + fds[0].fd = SP_PARM->_checkfd; + fds[0].events = POLLIN; +- if (poll(fds, 1, 0) > 0) { ++ if (poll(fds, (size_t) 1, 0) > 0) { + have_pending = TRUE; + } + #elif defined(__BEOS__) +@@ -677,6 +676,9 @@ + + T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM)); + ++ if (SP_PARM == 0) ++ returnCode(ERR); ++ + #if !USE_REENTRANT + /* + * It is "legal" but unlikely that an application could assign a new +@@ -1076,7 +1078,7 @@ + */ + + static void +-ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, bool needclear) ++ClrToEOL(NCURSES_SP_DCLx NCURSES_CH_T blank, int needclear) + { + int j; + +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_box_set.c ncurses-5.9/ncurses/widechar/lib_box_set.c +--- ncurses-5.9.orig/ncurses/widechar/lib_box_set.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_box_set.c 2012-08-25 19:58:00.053231190 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2003,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_box_set.c,v 1.5 2009/10/24 22:36:56 tom Exp $") ++MODULE_ID("$Id: lib_box_set.c,v 1.6 2011/06/25 19:02:07 Vassili.Courzakis Exp $") + + NCURSES_EXPORT(int) + wborder_set(WINDOW *win, +@@ -52,7 +52,7 @@ + NCURSES_SIZE_T endx, endy; + NCURSES_CH_T wls, wrs, wts, wbs, wtl, wtr, wbl, wbr; + +- T((T_CALLED("wborder(%p,%s,%s,%s,%s,%s,%s,%s,%s)"), ++ T((T_CALLED("wborder_set(%p,%s,%s,%s,%s,%s,%s,%s,%s)"), + (void *) win, + _tracech_t2(1, ls), + _tracech_t2(2, rs), +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_cchar.c ncurses-5.9/ncurses/widechar/lib_cchar.c +--- ncurses-5.9.orig/ncurses/widechar/lib_cchar.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_cchar.c 2012-08-25 19:58:01.059893097 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2001-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,7 +35,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_cchar.c,v 1.20 2010/12/25 23:46:26 tom Exp $") ++MODULE_ID("$Id: lib_cchar.c,v 1.26 2012/03/24 18:37:17 tom Exp $") + + /* + * The SuSv2 description leaves some room for interpretation. We'll assume wch +@@ -58,9 +58,9 @@ + (void *) wcval, _nc_viswbuf(wch), + (unsigned long) attrs, color_pair, opts)); + +- len = (unsigned) wcslen(wch); + if (opts != NULL +- || (len > 1 && wcwidth(wch[0]) < 0)) { ++ || wch == NULL ++ || ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) { + code = ERR; + } else { + if (len > CCHARW_MAX) +@@ -80,7 +80,7 @@ + memset(wcval, 0, sizeof(*wcval)); + + if (len != 0) { +- SetAttr(*wcval, attrs | (attr_t) ColorPair(color_pair)); ++ SetAttr(*wcval, attrs); + SetPair(CHDEREF(wcval), color_pair); + memcpy(&wcval->chars, wch, len * sizeof(wchar_t)); + TR(TRACE_CCALLS, ("copy %d wchars, first is %s", len, +@@ -110,8 +110,8 @@ + (void *) color_pair, + opts)); + +- if (opts == NULL) { +- len = ((wp = wmemchr(wcval->chars, L'\0', CCHARW_MAX)) ++ if (opts == NULL && wcval != NULL) { ++ len = ((wp = wmemchr(wcval->chars, L'\0', (size_t) CCHARW_MAX)) + ? (int) (wp - wcval->chars) + : CCHARW_MAX); + +@@ -126,7 +126,7 @@ + } else if (len >= 0) { + *attrs = AttrOf(*wcval) & A_ATTRIBUTES; + *color_pair = (short) GetPair(*wcval); +- wmemcpy(wch, wcval->chars, (unsigned) len); ++ wmemcpy(wch, wcval->chars, (size_t) len); + wch[len] = L'\0'; + code = OK; + } +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_get_wch.c ncurses-5.9/ncurses/widechar/lib_get_wch.c +--- ncurses-5.9.orig/ncurses/widechar/lib_get_wch.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_get_wch.c 2012-08-25 19:58:00.053231190 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -40,7 +40,7 @@ + #include <curses.priv.h> + #include <ctype.h> + +-MODULE_ID("$Id: lib_get_wch.c,v 1.22 2010/08/28 21:00:35 tom Exp $") ++MODULE_ID("$Id: lib_get_wch.c,v 1.23 2011/05/28 23:00:29 tom Exp $") + + NCURSES_EXPORT(int) + wget_wch(WINDOW *win, wint_t *result) +@@ -106,7 +106,10 @@ + } else { + code = ERR; + } +- *result = (wint_t) value; ++ ++ if (result != 0) ++ *result = (wint_t) value; ++ + _nc_unlock_global(curses); + T(("result %#o", value)); + returnCode(code); +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.9/ncurses/widechar/lib_get_wstr.c +--- ncurses-5.9.orig/ncurses/widechar/lib_get_wstr.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_get_wstr.c 2012-08-25 19:58:00.053231190 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_get_wstr.c,v 1.12 2009/10/24 22:38:11 tom Exp $") ++MODULE_ID("$Id: lib_get_wstr.c,v 1.13 2011/10/22 16:31:35 tom Exp $") + + static int + wadd_wint(WINDOW *win, wint_t *src) +@@ -49,7 +49,7 @@ + + wch[0] = (wchar_t) (*src); + wch[1] = 0; +- setcchar(&tmp, wch, A_NORMAL, 0, NULL); ++ setcchar(&tmp, wch, A_NORMAL, (short) 0, NULL); + return wadd_wch(win, &tmp); + } + +@@ -58,7 +58,7 @@ + * or other character, and handles reverse wraparound. + */ + static wint_t * +-WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, bool echoed) ++WipeOut(WINDOW *win, int y, int x, wint_t *first, wint_t *last, int echoed) + { + if (last > first) { + *--last = '\0'; +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_ins_wch.c ncurses-5.9/ncurses/widechar/lib_ins_wch.c +--- ncurses-5.9.orig/ncurses/widechar/lib_ins_wch.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_ins_wch.c 2012-08-25 19:58:00.053231190 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_ins_wch.c,v 1.16 2010/12/19 01:34:04 tom Exp $") ++MODULE_ID("$Id: lib_ins_wch.c,v 1.17 2011/10/22 16:34:50 tom Exp $") + + /* + * Insert the given character, updating the current location to simplify +@@ -132,7 +132,7 @@ + (void) setcchar(&tmp_cchar, + &tmp_wchar, + WA_NORMAL, +- 0, ++ (short) 0, + (void *) 0); + code = _nc_insert_wch(win, &tmp_cchar); + } else { +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_inwstr.c ncurses-5.9/ncurses/widechar/lib_inwstr.c +--- ncurses-5.9.orig/ncurses/widechar/lib_inwstr.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_inwstr.c 2012-08-25 19:58:00.056564508 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2004,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_inwstr.c,v 1.5 2009/10/24 22:37:29 tom Exp $") ++MODULE_ID("$Id: lib_inwstr.c,v 1.6 2011/05/28 22:49:49 tom Exp $") + + NCURSES_EXPORT(int) + winnwstr(WINDOW *win, wchar_t *wstr, int n) +@@ -93,8 +93,13 @@ + winwstr(WINDOW *win, wchar_t *wstr) + { + int result = OK; ++ + T((T_CALLED("winwstr(%p,%p)"), (void *) win, (void *) wstr)); +- if (winnwstr(win, wstr, CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) ++ if (win == 0) { ++ result = ERR; ++ } else if (winnwstr(win, wstr, ++ CCHARW_MAX * (win->_maxx - win->_curx + 1)) == ERR) { + result = ERR; ++ } + returnCode(result); + } +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_slk_wset.c ncurses-5.9/ncurses/widechar/lib_slk_wset.c +--- ncurses-5.9.orig/ncurses/widechar/lib_slk_wset.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_slk_wset.c 2012-08-25 19:58:00.056564508 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003-2004,2005 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-2002,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -40,7 +40,7 @@ + #include <wctype.h> + #endif + +-MODULE_ID("$Id: lib_slk_wset.c,v 1.11 2005/01/16 01:03:53 tom Exp $") ++MODULE_ID("$Id: lib_slk_wset.c,v 1.13 2011/10/22 15:52:20 tom Exp $") + + NCURSES_EXPORT(int) + slk_wset(int i, const wchar_t *astr, int format) +@@ -53,19 +53,21 @@ + + T((T_CALLED("slk_wset(%d, %s, %d)"), i, _nc_viswbuf(astr), format)); + +- init_mb(state); +- str = astr; +- if ((arglen = wcsrtombs(NULL, &str, 0, &state)) != (size_t) -1) { +- if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) { +- str = astr; +- if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) { +- /* glibc documentation claims that the terminating L'\0' +- * is written, but it is not... +- */ +- mystr[arglen] = 0; +- result = slk_set(i, mystr, format); ++ if (astr != 0) { ++ init_mb(state); ++ str = astr; ++ if ((arglen = wcsrtombs(NULL, &str, (size_t) 0, &state)) != (size_t) -1) { ++ if ((mystr = (char *) _nc_doalloc(0, arglen + 1)) != 0) { ++ str = astr; ++ if (wcsrtombs(mystr, &str, arglen, &state) != (size_t) -1) { ++ /* glibc documentation claims that the terminating L'\0' ++ * is written, but it is not... ++ */ ++ mystr[arglen] = 0; ++ result = slk_set(i, mystr, format); ++ } ++ free(mystr); + } +- free(mystr); + } + } + returnCode(result); +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.9/ncurses/widechar/lib_unget_wch.c +--- ncurses-5.9.orig/ncurses/widechar/lib_unget_wch.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_unget_wch.c 2012-08-25 19:58:00.056564508 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_unget_wch.c,v 1.14 2010/07/24 11:35:21 tom Exp $") ++MODULE_ID("$Id: lib_unget_wch.c,v 1.15 2011/10/22 16:34:50 tom Exp $") + + /* + * Wrapper for wcrtomb() which obtains the length needed for the given +@@ -55,7 +55,7 @@ + const wchar_t *tempp = temp; + temp[0] = source; + temp[1] = 0; +- result = (int) wcsrtombs(NULL, &tempp, 0, state); ++ result = (int) wcsrtombs(NULL, &tempp, (size_t) 0, state); + } else { + result = (int) wcrtomb(target, source, state); + } +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.9/ncurses/widechar/lib_vid_attr.c +--- ncurses-5.9.orig/ncurses/widechar/lib_vid_attr.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_vid_attr.c 2012-08-25 19:58:01.733223247 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + #define CUR SP_TERMTYPE + #endif + +-MODULE_ID("$Id: lib_vid_attr.c,v 1.14 2010/12/19 01:44:24 tom Exp $") ++MODULE_ID("$Id: lib_vid_attr.c,v 1.16 2012/06/09 20:29:33 tom Exp $") + + #define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc) + +@@ -120,7 +120,7 @@ + * A_ALTCHARSET (256) down 2 to line up. We use the NCURSES_BITS + * macro so this will work properly for the wide-character layout. + */ +- unsigned value = no_color_video; ++ unsigned value = (unsigned) no_color_video; + attr_t mask = NCURSES_BITS((value & 63) + | ((value & 192) << 1) + | ((value & 256) >> 2), 8); +@@ -296,24 +296,26 @@ + NCURSES_EXPORT(attr_t) + NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0) + { +- attr_t attrs; ++ attr_t attrs = 0; + + T((T_CALLED("term_attrs()"))); +- attrs = SP_PARM ? NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG) : 0; ++ if (SP_PARM) { ++ attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG); + +- /* these are only supported for wide-character mode */ +- if (enter_horizontal_hl_mode) +- attrs |= WA_HORIZONTAL; +- if (enter_left_hl_mode) +- attrs |= WA_LEFT; +- if (enter_low_hl_mode) +- attrs |= WA_LOW; +- if (enter_right_hl_mode) +- attrs |= WA_RIGHT; +- if (enter_top_hl_mode) +- attrs |= WA_TOP; +- if (enter_vertical_hl_mode) +- attrs |= WA_VERTICAL; ++ /* these are only supported for wide-character mode */ ++ if (enter_horizontal_hl_mode) ++ attrs |= WA_HORIZONTAL; ++ if (enter_left_hl_mode) ++ attrs |= WA_LEFT; ++ if (enter_low_hl_mode) ++ attrs |= WA_LOW; ++ if (enter_right_hl_mode) ++ attrs |= WA_RIGHT; ++ if (enter_top_hl_mode) ++ attrs |= WA_TOP; ++ if (enter_vertical_hl_mode) ++ attrs |= WA_VERTICAL; ++ } + + returnAttr(attrs); + } +diff -Naur ncurses-5.9.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.9/ncurses/widechar/lib_wunctrl.c +--- ncurses-5.9.orig/ncurses/widechar/lib_wunctrl.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/ncurses/widechar/lib_wunctrl.c 2012-08-25 19:58:00.056564508 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2001-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,14 +35,17 @@ + + #include <curses.priv.h> + +-MODULE_ID("$Id: lib_wunctrl.c,v 1.14 2010/12/19 01:42:15 tom Exp $") ++MODULE_ID("$Id: lib_wunctrl.c,v 1.15 2011/05/28 22:06:26 tom Exp $") + + NCURSES_EXPORT(wchar_t *) + NCURSES_SP_NAME(wunctrl) (NCURSES_SP_DCLx cchar_t *wc) + { + static wchar_t str[CCHARW_MAX + 1], *wsp; ++ wchar_t *result; + +- if (Charable(*wc)) { ++ if (wc == 0) { ++ result = 0; ++ } else if (Charable(*wc)) { + const char *p = + NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx + (unsigned) _nc_to_char((wint_t)CharOf(*wc))); +@@ -51,9 +54,11 @@ + *wsp++ = (wchar_t) _nc_to_widechar(*p); + } + *wsp = 0; +- return str; +- } else +- return wc->chars; ++ result = str; ++ } else { ++ result = wc->chars; ++ } ++ return result; + } + + #if NCURSES_SP_FUNCS +diff -Naur ncurses-5.9.orig/ncurses/win32con/win_driver.c ncurses-5.9/ncurses/win32con/win_driver.c +--- ncurses-5.9.orig/ncurses/win32con/win_driver.c 2012-08-25 19:57:59.416567535 +0000 ++++ ncurses-5.9/ncurses/win32con/win_driver.c 2012-08-25 19:58:00.836560821 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -28,7 +28,6 @@ + + /**************************************************************************** + * Author: Juergen Pfeifer * +- * * + ****************************************************************************/ + + /* +@@ -39,12 +38,12 @@ + #include <curses.priv.h> + #define CUR my_term.type. + +-MODULE_ID("$Id: win_driver.c,v 1.10 2010/12/25 19:28:21 tom Exp $") ++MODULE_ID("$Id: win_driver.c,v 1.11 2012/02/18 20:28:25 tom Exp $") + + #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE) + + #define AssertTCB() assert(TCB!=0 && TCB->magic==WINMAGIC) +-#define SetSP() assert(TCB->csp!=0); sp = TCB->csp ++#define SetSP() assert(TCB->csp!=0); sp = TCB->csp; (void) sp + + #define GenMap(vKey,key) MAKELONG(key, vKey) + +@@ -308,7 +307,7 @@ + + static int + drv_dobeepflash(TERMINAL_CONTROL_BLOCK * TCB, +- bool beepFlag GCC_UNUSED) ++ int beepFlag GCC_UNUSED) + { + SCREEN *sp; + int res = ERR; +@@ -348,7 +347,7 @@ + + static void + drv_setcolor(TERMINAL_CONTROL_BLOCK * TCB, +- bool fore, ++ int fore, + int color, + int (*outc) (SCREEN *, int) GCC_UNUSED) + { +@@ -412,7 +411,7 @@ + } + + static int +-drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, bool setFlag, TTY * buf) ++drv_sgmode(TERMINAL_CONTROL_BLOCK * TCB, int setFlag, TTY * buf) + { + DWORD dwFlag = 0; + tcflag_t iflag; +@@ -479,7 +478,7 @@ + } + + static int +-drv_mode(TERMINAL_CONTROL_BLOCK * TCB, bool progFlag, bool defFlag) ++drv_mode(TERMINAL_CONTROL_BLOCK * TCB, int progFlag, int defFlag) + { + SCREEN *sp; + TERMINAL *_term = (TERMINAL *) TCB; +@@ -674,9 +673,9 @@ + + static void + drv_initpair(TERMINAL_CONTROL_BLOCK * TCB, +- short pair, +- short f, +- short b) ++ int pair, ++ int f, ++ int b) + { + SCREEN *sp; + +@@ -691,10 +690,10 @@ + + static void + drv_initcolor(TERMINAL_CONTROL_BLOCK * TCB, +- short color GCC_UNUSED, +- short r GCC_UNUSED, +- short g GCC_UNUSED, +- short b GCC_UNUSED) ++ int color GCC_UNUSED, ++ int r GCC_UNUSED, ++ int g GCC_UNUSED, ++ int b GCC_UNUSED) + { + SCREEN *sp; + +@@ -704,9 +703,9 @@ + + static void + drv_do_color(TERMINAL_CONTROL_BLOCK * TCB, +- short old_pair GCC_UNUSED, +- short pair GCC_UNUSED, +- bool reverse GCC_UNUSED, ++ int old_pair GCC_UNUSED, ++ int pair GCC_UNUSED, ++ int reverse GCC_UNUSED, + int (*outc) (SCREEN *, int) GCC_UNUSED + ) + { +@@ -778,7 +777,7 @@ + + static void + drv_hwlabelOnOff(TERMINAL_CONTROL_BLOCK * TCB, +- bool OnFlag GCC_UNUSED) ++ int OnFlag GCC_UNUSED) + { + SCREEN *sp; + +@@ -1080,7 +1079,6 @@ + BOOL b; + DWORD nRead; + WORD vk; +- WORD sc; + + AssertTCB(); + assert(buf); +@@ -1096,7 +1094,6 @@ + continue; + *buf = (int) inp_rec.Event.KeyEvent.uChar.AsciiChar; + vk = inp_rec.Event.KeyEvent.wVirtualKeyCode; +- sc = inp_rec.Event.KeyEvent.wVirtualScanCode; + if (*buf == 0) { + if (sp->_keypad_on) { + *buf = MapKey(TCB, vk); +@@ -1157,7 +1154,7 @@ + } + + static int +-drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, bool flag GCC_UNUSED) ++drv_kpad(TERMINAL_CONTROL_BLOCK * TCB, int flag GCC_UNUSED) + { + SCREEN *sp; + int code = ERR; +@@ -1172,7 +1169,7 @@ + } + + static int +-drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, bool flag) ++drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, int flag) + { + int code = ERR; + SCREEN *sp; +diff -Naur ncurses-5.9.orig/package/debian/changelog ncurses-5.9/package/debian/changelog +--- ncurses-5.9.orig/package/debian/changelog 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/changelog 2012-08-25 19:58:02.389886808 +0000 +@@ -0,0 +1,11 @@ ++ncurses6 (5.9-20120811) unstable; urgency=low ++ ++ * latest weekly patch ++ ++ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 11 Aug 2012 17:52:54 -0400 ++ ++ncurses6 (5.9-20120608) unstable; urgency=low ++ ++ * initial release ++ ++ -- Thomas E. Dickey <dickey@invisible-island.net> Fri, 08 Jun 2012 07:54:29 -0400 +diff -Naur ncurses-5.9.orig/package/debian/compat ncurses-5.9/package/debian/compat +--- ncurses-5.9.orig/package/debian/compat 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/compat 2012-08-25 19:58:01.596557226 +0000 +@@ -0,0 +1 @@ ++5 +diff -Naur ncurses-5.9.orig/package/debian/control ncurses-5.9/package/debian/control +--- ncurses-5.9.orig/package/debian/control 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/control 2012-08-25 19:58:01.596557226 +0000 +@@ -0,0 +1,16 @@ ++Source: ncurses6 ++Section: libdevel ++Priority: optional ++Maintainer: Thomas E. Dickey <dickey@invisible-island.net> ++Homepage: http://invisible-island.net/ncurses/ ++Build-Depends: debhelper (>= 7) ++Standards-Version: 3.8.2 ++ ++Package: ncurses6 ++Architecture: any ++Depends: ${misc:Depends} ++Description: shared libraries for terminal handling ++ The ncurses library routines are a terminal-independent method of ++ updating character screens with reasonable optimization. ++ . ++ This package is used for testing ABI 6. +diff -Naur ncurses-5.9.orig/package/debian/copyright ncurses-5.9/package/debian/copyright +--- ncurses-5.9.orig/package/debian/copyright 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/copyright 2012-08-25 19:58:01.596557226 +0000 +@@ -0,0 +1,112 @@ ++This package is used for testing builds of ncurses. ++ ++Copyright (c) 1998-2012 Free Software Foundation, Inc. ++Copyright © 2001 by Pradeep Padala ++ ++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, distribute with modifications, 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 ABOVE 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(s) of the above copyright ++holders shall not be used in advertising or otherwise to promote the ++sale, use or other dealings in this Software without prior written ++authorization. ++ ++ ++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. ++ ++ ++Copyright (c) 1980, 1991, 1992, 1993 ++ The Regents of the University of California. All rights reserved. ++ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions ++are met: ++1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++2. 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. ++3. Neither the name of the University nor the names of its contributors ++ may be used to endorse or promote products derived from this software ++ without specific prior written permission. ++ ++THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. ++ ++ ++Copyright 1996-2007 by Thomas E. Dickey ++ ++ All Rights Reserved ++ ++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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright ++holders shall not be used in advertising or otherwise to promote the ++sale, use or other dealings in this Software without prior written ++authorization. ++ ++-- vile: txtmode file-encoding=utf-8 +diff -Naur ncurses-5.9.orig/package/debian/rules ncurses-5.9/package/debian/rules +--- ncurses-5.9.orig/package/debian/rules 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/rules 2012-08-25 19:58:01.866555950 +0000 +@@ -0,0 +1,118 @@ ++#!/usr/bin/make -f ++# MAde with the aid of dh_make, by Craig Small ++# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. ++# Some lines taken from debmake, by Cristoph Lameter. ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# These are used for cross-compiling and for saving the configure script ++# from having to guess our platform (since we know it already) ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++ ++CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion ++CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic ++ ++MY_DIR=/usr/local/ncurses6 ++MYDATA=/usr/local/ncurses/share/terminfo ++ ++CFLAGS = $(CC_NORMAL) ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ CFLAGS += -O0 ++else ++ CFLAGS += -O2 ++endif ++ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) ++ INSTALL_PROGRAM += -s ++endif ++ ++ ++configure: configure-stamp ++configure-stamp: ++ dh_testdir ++ ++ RPATH_LIST=../lib:$(MY_DIR)/lib \ ++ CFLAGS="$(CFLAGS)" ./configure \ ++ --host=$(DEB_HOST_GNU_TYPE) \ ++ --build=$(DEB_BUILD_GNU_TYPE) \ ++ --prefix=$(MY_DIR) \ ++ --with-default-terminfo-dir=$(MYDATA) \ ++ --with-terminfo-dirs=$(MYDATA):/usr/share/terminfo \ ++ --disable-echo \ ++ --disable-getcap \ ++ --disable-leaks \ ++ --disable-macros \ ++ --disable-termcap \ ++ --enable-const \ ++ --enable-ext-colors \ ++ --enable-ext-mouse \ ++ --enable-hard-tabs \ ++ --enable-interop \ ++ --enable-rpath \ ++ --enable-sp-funcs \ ++ --enable-warnings \ ++ --enable-widec \ ++ --verbose \ ++ --with-develop \ ++ --with-shared \ ++ --with-termlib \ ++ --with-ticlib \ ++ --with-trace \ ++ --with-xterm-kbs=DEL \ ++ --without-ada \ ++ --without-debug \ ++ --without-normal ++ ++ touch configure-stamp ++ ++build: build-stamp ++build-stamp: configure-stamp ++ dh_testdir ++ ++ $(MAKE) ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ ++ [ ! -f makefile ] || $(MAKE) distclean ++ ++ rm -f configure-stamp build-stamp install-stamp ++ ++ dh_clean ++ ++install: install-stamp ++install-stamp: build-stamp ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ $(MAKE) install.libs install.progs DESTDIR=$(CURDIR)/debian/ncurses6 ++ ++ touch install-stamp ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# No binary-indep target. ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installchangelogs NEWS ++ dh_strip ++ dh_compress ++ dh_fixperms ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install install-stamp +diff -Naur ncurses-5.9.orig/package/debian/source/format ncurses-5.9/package/debian/source/format +--- ncurses-5.9.orig/package/debian/source/format 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/source/format 2012-08-25 19:58:01.599890543 +0000 +@@ -0,0 +1 @@ ++3.0 (native) +diff -Naur ncurses-5.9.orig/package/debian/watch ncurses-5.9/package/debian/watch +--- ncurses-5.9.orig/package/debian/watch 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/debian/watch 2012-08-25 19:58:01.599890543 +0000 +@@ -0,0 +1,4 @@ ++version=3 ++ ++opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \ ++ debian uupdate +diff -Naur ncurses-5.9.orig/package/ncurses.spec ncurses-5.9/package/ncurses.spec +--- ncurses-5.9.orig/package/ncurses.spec 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/package/ncurses.spec 2012-08-25 19:58:02.389886808 +0000 +@@ -0,0 +1,82 @@ ++Summary: shared libraries for terminal handling ++Name: ncurses6 ++Release: 5.9 ++Version: 20120811 ++License: X11 ++Group: Development/Libraries ++Source: ncurses-%{release}-%{version}.tgz ++# URL: http://invisible-island.net/ncurses/ ++ ++%define CC_NORMAL -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion ++%define CC_STRICT %{CC_NORMAL} -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic ++ ++%define _prefix /usr/local/ncurses6 ++%define MYDATA /usr/local/ncurses/share/terminfo ++ ++%description ++The ncurses library routines are a terminal-independent method of ++updating character screens with reasonable optimization. ++ ++This package is used for testing ABI 6. ++ ++%prep ++ ++%setup -q -n ncurses-%{release}-%{version} ++ ++%build ++CFLAGS="%{CC_NORMAL}" \ ++RPATH_LIST=../lib:%{_prefix}/lib \ ++%configure \ ++ --target %{_target_platform} \ ++ --prefix=%{_prefix} \ ++ --includedir='${prefix}/include' \ ++ --with-default-terminfo-dir=%{MYDATA} \ ++ --with-install-prefix=$RPM_BUILD_ROOT \ ++ --with-terminfo-dirs=%{MYDATA}:/usr/share/terminfo \ ++ --disable-echo \ ++ --disable-getcap \ ++ --disable-leaks \ ++ --disable-macros \ ++ --disable-overwrite \ ++ --disable-termcap \ ++ --enable-const \ ++ --enable-ext-colors \ ++ --enable-ext-mouse \ ++ --enable-hard-tabs \ ++ --enable-interop \ ++ --enable-rpath \ ++ --enable-sp-funcs \ ++ --enable-warnings \ ++ --enable-widec \ ++ --verbose \ ++ --with-develop \ ++ --with-shared \ ++ --with-termlib \ ++ --with-ticlib \ ++ --with-trace \ ++ --with-xterm-kbs=DEL \ ++ --without-ada \ ++ --without-debug \ ++ --without-normal ++ ++make ++ ++%install ++rm -rf $RPM_BUILD_ROOT ++ ++make install.libs install.progs ++ ++%clean ++rm -rf $RPM_BUILD_ROOT ++ ++%files ++%defattr(-,root,root,-) ++%{_bindir}/* ++%{_includedir}/* ++%{_libdir}/* ++#%{_datadir}/* ++ ++%changelog ++ ++* Fri Jun 08 2012 Thomas E. Dickey ++- initial version. +diff -Naur ncurses-5.9.orig/panel/Makefile.in ncurses-5.9/panel/Makefile.in +--- ncurses-5.9.orig/panel/Makefile.in 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/panel/Makefile.in 2012-08-25 19:58:02.389886808 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.58 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.60 2012/08/11 21:31:56 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -57,6 +57,7 @@ + bindir = @bindir@ + libdir = @libdir@ + includedir = @includedir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + + LIBTOOL = @LIBTOOL@ +@@ -103,6 +104,7 @@ + SHLIB_DIRS = -L../lib + SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@ + ++RPATH_LIST = @RPATH_LIST@ + MK_SHARED_LIB = @MK_SHARED_LIB@ + + NCURSES_MAJOR = @NCURSES_MAJOR@ +diff -Naur ncurses-5.9.orig/panel/p_above.c ncurses-5.9/panel/p_above.c +--- ncurses-5.9.orig/panel/p_above.c 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/panel/p_above.c 2012-08-25 19:58:00.989893428 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,13 +36,13 @@ + */ + #include "panel.priv.h" + +-MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $") ++MODULE_ID("$Id: p_above.c,v 1.9 2012/03/10 23:43:41 tom Exp $") + + #if NCURSES_SP_FUNCS + NCURSES_EXPORT(PANEL *) + ground_panel(SCREEN * sp) + { +- T((T_CALLED("ground_panel(%p)"), sp)); ++ T((T_CALLED("ground_panel(%p)"), (void *)sp)); + if (sp) + { + struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); +diff -Naur ncurses-5.9.orig/panel/p_below.c ncurses-5.9/panel/p_below.c +--- ncurses-5.9.orig/panel/p_below.c 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/panel/p_below.c 2012-08-25 19:58:00.989893428 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,13 +36,13 @@ + */ + #include "panel.priv.h" + +-MODULE_ID("$Id: p_below.c,v 1.8 2010/01/23 21:22:15 tom Exp $") ++MODULE_ID("$Id: p_below.c,v 1.9 2012/03/10 23:43:41 tom Exp $") + + #if NCURSES_SP_FUNCS + NCURSES_EXPORT(PANEL *) + ceiling_panel(SCREEN * sp) + { +- T((T_CALLED("ceiling_panel(%p)"), sp)); ++ T((T_CALLED("ceiling_panel(%p)"), (void *)sp)); + if (sp) + { + struct panelhook *ph = NCURSES_SP_NAME(_nc_panelhook) (sp); +diff -Naur ncurses-5.9.orig/panel/panel.c ncurses-5.9/panel/panel.c +--- ncurses-5.9.orig/panel/panel.c 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/panel/panel.c 2012-08-25 19:58:00.926560395 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -36,7 +36,7 @@ + /* panel.c -- implementation of panels library, some core routines */ + #include "panel.priv.h" + +-MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $") ++MODULE_ID("$Id: panel.c,v 1.26 2012/02/23 10:02:15 tom Exp $") + + /*+------------------------------------------------------------------------- + _nc_retrace_panel (pan) +@@ -61,9 +61,9 @@ + char temp[32]; + + if (ptr != 0) +- sprintf(temp, "ptr:%p", ptr); ++ _nc_SPRINTF(temp, _nc_SLIMIT(sizeof(temp)) "ptr:%p", ptr); + else +- strcpy(temp, "<null>"); ++ _nc_STRCPY(temp, "<null>", sizeof(temp)); + return _nc_visbuf(temp); + } + #endif +@@ -95,7 +95,7 @@ + + GetPanelHook(pan); + +- sprintf(s80, fmt, num, pan); ++ _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) fmt, num, pan); + _tracef("%s b=%s t=%s", s80, + (_nc_bottom_panel) ? USER_PTR(_nc_bottom_panel->user) : "--", + (_nc_top_panel) ? USER_PTR(_nc_top_panel->user) : "--"); +@@ -143,7 +143,7 @@ + { + char s80[80]; + +- sprintf(s80, "Touchline s=%d c=%d", start, count); ++ _nc_SPRINTF(s80, _nc_SLIMIT(sizeof(s80)) "Touchline s=%d c=%d", start, count); + dPanel(s80, pan); + touchline(pan->win, start, count); + } +diff -Naur ncurses-5.9.orig/panel/panel.priv.h ncurses-5.9/panel/panel.priv.h +--- ncurses-5.9.orig/panel/panel.priv.h 2012-08-25 19:57:59.393234312 +0000 ++++ ncurses-5.9/panel/panel.priv.h 2012-08-25 19:58:00.056564508 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + +-/* $Id: panel.priv.h,v 1.23 2009/04/11 20:33:55 tom Exp $ */ ++/* $Id: panel.priv.h,v 1.24 2011/05/21 18:55:07 tom Exp $ */ + + #ifndef NCURSES_PANEL_PRIV_H + #define NCURSES_PANEL_PRIV_H 1 +@@ -160,7 +160,7 @@ + ---------------------------------------------------------------------------*/ + #define PANEL_UPDATE(pan,panstart)\ + { PANEL* pan2 = ((panstart) ? (panstart) : _nc_bottom_panel);\ +- while(pan2) {\ ++ while(pan2 && pan2->win) {\ + if ((pan2 != pan) && PANELS_OVERLAPPED(pan,pan2)) {\ + int y, ix1, ix2, iy1, iy2;\ + COMPUTE_INTERSECTION(pan, pan2, ix1, ix2, iy1, iy2);\ +diff -Naur ncurses-5.9.orig/progs/Makefile.in ncurses-5.9/progs/Makefile.in +--- ncurses-5.9.orig/progs/Makefile.in 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/Makefile.in 2012-08-25 19:58:02.389886808 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.85 2010/11/27 21:45:27 tom Exp $ ++# $Id: Makefile.in,v 1.89 2012/08/11 21:31:56 tom Exp $ + ############################################################################## +-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -61,6 +61,7 @@ + bindir = @bindir@ + libdir = @libdir@ + includedir = @includedir@ ++datarootdir = @datarootdir@ + datadir = @datadir@ + + LIBTOOL = @LIBTOOL@ +@@ -104,20 +105,21 @@ + LD = @LD@ + LINK = @LINK_PROGS@ $(LIBTOOL_LINK) + LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS@ ++RPATH_LIST = @RPATH_LIST@ + + LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL) + LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) + LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) +-LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) ++LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) + LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ + + LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) + +-LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ +-LDFLAGS_TIC = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC) ++LIBS_TIC = @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ ++LDFLAGS_TIC = @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC) + +-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ +-LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) ++LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ ++LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) + + LINT = @LINT@ + LINT_OPTS = @LINT_OPTS@ +@@ -230,46 +232,46 @@ + $(MODEL)/transform$o + + tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h +- @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@ + + DEPS_TOE = \ + $(MODEL)/toe$o + + toe$x: $(DEPS_TOE) $(DEPS_CURSES) +- @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@ + + DEPS_CLEAR = \ + $(MODEL)/clear$o + + clear$x: $(DEPS_CLEAR) $(DEPS_CURSES) +- @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@ + + DEPS_TABS = \ + $(MODEL)/tabs$o + + tabs$x: $(DEPS_TABS) $(DEPS_TABS) +- @ECHO_LINK@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_TABS) $(LDFLAGS_TINFO) -o $@ + + DEPS_TPUT = \ + $(MODEL)/tput$o \ + $(MODEL)/transform$o + + tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h +- @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@ + + DEPS_INFOCMP = \ + $(MODEL)/infocmp$o \ + $(MODEL)/dump_entry$o + + infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES) +- @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@ + + DEPS_TSET = \ + $(MODEL)/tset$o \ + $(MODEL)/transform$o + + tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h +- @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@ ++ @ECHO_LD@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@ + + termsort.c: $(srcdir)/MKtermsort.sh + sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@ +diff -Naur ncurses-5.9.orig/progs/capconvert ncurses-5.9/progs/capconvert +--- ncurses-5.9.orig/progs/capconvert 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/capconvert 2012-08-25 19:58:00.056564508 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + ############################################################################## +-# Copyright (c) 1998,2006 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2006,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -26,7 +26,7 @@ + # use or other dealings in this Software without prior written # + # authorization. # + ############################################################################## +-# $Id: capconvert,v 1.4 2006/04/22 21:46:17 tom Exp $ ++# $Id: capconvert,v 1.5 2011/11/12 23:28:07 Robert.Millan Exp $ + # + # capconvert -- automated conversion from termcap to terminfo + # +@@ -77,16 +77,18 @@ + # Assumes the terminfo master covers all canned terminal types + exit; + fi +- if test "$TERM" = "xterm" +- then ++ case $TERM in ++ xterm | xterm-*) + echo "You are running xterm, which usually sets TERMCAP itself." + echo "We can ignore this, because terminfo knows about xterm." + echo "So you will just use the system-wide terminfo tree." +- exit; +- else ++ exit ++ ;; ++ *) + echo "We will have to make a local one for you anyway, to capture the effect" + echo "of your TERMCAP variable." +- fi ++ ;; ++ esac + else + echo "No system-wide terminfo tree. We will make you a local one." + fi +@@ -109,7 +111,7 @@ + for x in $PATH . + do + if test $OPT $x/tic +- then ++ then + TIC=$x/tic + break + fi +@@ -141,7 +143,7 @@ + then + echo "It appears you already have a private terminfo directory" + echo "at $HOME/.terminfo; this seems odd, because TERMINFO" +- echo "is not defined. I am not going to second-guess this -- if you" ++ echo "is not defined. I am not going to second-guess this -- if you" + echo "really want me to try auto-configuring for you, remove or" + echo "rename $HOME/terminfo and run me again." + exit; +@@ -214,7 +216,7 @@ + # + echo "You now have a private tree under $HOME/.terminfo;" + echo "the ncurses library will automatically read from it," +-echo "and ncurses tic will automatically compile entries to it." ++echo "and ncurses tic will automatically compile entries to it." + + # We're done unless user has a .termcap file or equivalent named by TERMCAP + if test -z "$TERMCAP" +@@ -235,7 +237,7 @@ + echo "Done." + echo "Note that editing $HOME/.termcap will no longer change the data curses sees." + elif test -f "$TERMCAP" +-then ++then + echo "Your TERMCAP names the file $TERMCAP. I will compile that." + eval $TIC $TERMCAP + echo "Done." +diff -Naur ncurses-5.9.orig/progs/dump_entry.c ncurses-5.9/progs/dump_entry.c +--- ncurses-5.9.orig/progs/dump_entry.c 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/progs/dump_entry.c 2012-08-25 19:58:01.736556564 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -39,7 +39,7 @@ + #include "termsort.c" /* this C file is generated */ + #include <parametrized.h> /* so is this */ + +-MODULE_ID("$Id: dump_entry.c,v 1.89 2010/05/01 22:04:08 tom Exp $") ++MODULE_ID("$Id: dump_entry.c,v 1.100 2012/06/09 21:44:40 tom Exp $") + + #define INDENT 8 + #define DISCARD(string) string = ABSENT_STRING +@@ -57,6 +57,7 @@ + static int outform; /* output format to use */ + static int sortmode; /* sort mode to use */ + static int width = 60; /* max line width for listings */ ++static int height = 65535; /* max number of lines for listings */ + static int column; /* current column, limited by 'width' */ + static int oldcol; /* last value of column before wrap */ + static bool pretty; /* true if we format if-then-else strings */ +@@ -172,11 +173,17 @@ + } + + void +-dump_init(const char *version, int mode, int sort, int twidth, int traceval, ++dump_init(const char *version, ++ int mode, ++ int sort, ++ int twidth, ++ int theight, ++ unsigned traceval, + bool formatted) + /* set up for entry display */ + { + width = twidth; ++ height = theight; + pretty = formatted; + + /* versions */ +@@ -201,7 +208,7 @@ + bool_names = boolnames; + num_names = numnames; + str_names = strnames; +- separator = twidth ? ", " : ","; ++ separator = (twidth > 0 && theight > 1) ? ", " : ","; + trailer = "\n\t"; + break; + +@@ -209,7 +216,7 @@ + bool_names = boolfnames; + num_names = numfnames; + str_names = strfnames; +- separator = twidth ? ", " : ","; ++ separator = (twidth > 0 && theight > 1) ? ", " : ","; + trailer = "\n\t"; + break; + +@@ -393,8 +400,8 @@ + static void + wrap_concat(const char *src) + { +- unsigned need = strlen(src); +- unsigned want = strlen(separator) + need; ++ size_t need = strlen(src); ++ size_t want = strlen(separator) + need; + + if (column > INDENT + && column + (int) want > width) { +@@ -593,14 +600,28 @@ + column = INDENT; /* FIXME: workaround to prevent empty lines */ + } else { + strcpy_DYN(&outbuf, tterm->term_names); ++ ++ /* ++ * Colon is legal in terminfo descriptions, but not in termcap. ++ */ ++ if (!infodump) { ++ char *p = outbuf.text; ++ while (*p) { ++ if (*p == ':') { ++ *p = '='; ++ } ++ ++p; ++ } ++ } + strcpy_DYN(&outbuf, separator); + column = (int) outbuf.used; +- force_wrap(); ++ if (height > 1) ++ force_wrap(); + } + + for_each_boolean(j, tterm) { + i = BoolIndirect(j); +- name = ExtBoolname(tterm, i, bool_names); ++ name = ExtBoolname(tterm, (int) i, bool_names); + assert(strlen(name) < sizeof(buffer) - EXTRA_CAP); + + if (!version_filter(BOOLEAN, i)) +@@ -610,21 +631,21 @@ + + predval = pred(BOOLEAN, i); + if (predval != FAIL) { +- (void) strcpy(buffer, name); ++ _nc_STRCPY(buffer, name, sizeof(buffer)); + if (predval <= 0) +- (void) strcat(buffer, "@"); ++ _nc_STRCAT(buffer, "@", sizeof(buffer)); + else if (i + 1 > num_bools) + num_bools = i + 1; + WRAP_CONCAT; + } + } + +- if (column != INDENT) ++ if (column != INDENT && height > 1) + force_wrap(); + + for_each_number(j, tterm) { + i = NumIndirect(j); +- name = ExtNumname(tterm, i, num_names); ++ name = ExtNumname(tterm, (int) i, num_names); + assert(strlen(name) < sizeof(buffer) - EXTRA_CAP); + + if (!version_filter(NUMBER, i)) +@@ -635,9 +656,11 @@ + predval = pred(NUMBER, i); + if (predval != FAIL) { + if (tterm->Numbers[i] < 0) { +- sprintf(buffer, "%s@", name); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s@", name); + } else { +- sprintf(buffer, "%s#%d", name, tterm->Numbers[i]); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s#%d", name, tterm->Numbers[i]); + if (i + 1 > num_values) + num_values = i + 1; + } +@@ -645,7 +668,7 @@ + } + } + +- if (column != INDENT) ++ if (column != INDENT && height > 1) + force_wrap(); + + len += (int) (num_bools +@@ -670,7 +693,7 @@ + + for_each_string(j, tterm) { + i = StrIndirect(j); +- name = ExtStrname(tterm, i, str_names); ++ name = ExtStrname(tterm, (int) i, str_names); + assert(strlen(name) < sizeof(buffer) - EXTRA_CAP); + + capability = tterm->Strings[i]; +@@ -698,14 +721,14 @@ + if (PRESENT(insert_character) || PRESENT(parm_ich)) { + if (SAME_CAP(i, enter_insert_mode) + && enter_insert_mode == ABSENT_STRING) { +- (void) strcpy(buffer, "im="); ++ _nc_STRCPY(buffer, "im=", sizeof(buffer)); + WRAP_CONCAT; + continue; + } + + if (SAME_CAP(i, exit_insert_mode) + && exit_insert_mode == ABSENT_STRING) { +- (void) strcpy(buffer, "ei="); ++ _nc_STRCPY(buffer, "ei=", sizeof(buffer)); + WRAP_CONCAT; + continue; + } +@@ -739,7 +762,8 @@ + num_strings = i + 1; + + if (!VALID_STRING(capability)) { +- sprintf(buffer, "%s@", name); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s@", name); + WRAP_CONCAT; + } else if (outform == F_TERMCAP || outform == F_TCONVERR) { + int params = ((i < (int) SIZEOF(parametrized)) +@@ -750,13 +774,14 @@ + + if (cv == 0) { + if (outform == F_TCONVERR) { +- sprintf(buffer, "%s=!!! %s WILL NOT CONVERT !!!", +- name, srccap); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s=!!! %s WILL NOT CONVERT !!!", ++ name, srccap); + } else if (suppress_untranslatable) { + continue; + } else { + char *s = srccap, *d = buffer; +- sprintf(d, "..%s=", name); ++ _nc_SPRINTF(d, _nc_SLIMIT(sizeof(buffer)) "..%s=", name); + d += strlen(d); + while ((*d = *s++) != 0) { + if (*d == ':') { +@@ -769,7 +794,8 @@ + } + } + } else { +- sprintf(buffer, "%s=%s", name, cv); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s=%s", name, cv); + } + len += (int) strlen(capability) + 1; + WRAP_CONCAT; +@@ -805,11 +831,13 @@ + */ + if (tversion == V_HPUX) { + if (VALID_STRING(memory_lock)) { +- (void) sprintf(buffer, "meml=%s", memory_lock); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "meml=%s", memory_lock); + WRAP_CONCAT; + } + if (VALID_STRING(memory_unlock)) { +- (void) sprintf(buffer, "memu=%s", memory_unlock); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "memu=%s", memory_unlock); + WRAP_CONCAT; + } + } else if (tversion == V_AIX) { +@@ -832,9 +860,11 @@ + tp[0] = '\0'; + + if (box_ok) { +- (void) strcpy(buffer, "box1="); +- (void) strcat(buffer, _nc_tic_expand(boxchars, +- outform == F_TERMINFO, numbers)); ++ _nc_STRCPY(buffer, "box1=", sizeof(buffer)); ++ _nc_STRCAT(buffer, ++ _nc_tic_expand(boxchars, ++ outform == F_TERMINFO, numbers), ++ sizeof(buffer)); + WRAP_CONCAT; + } + } +@@ -846,7 +876,7 @@ + */ + if (outcount) { + bool trimmed = FALSE; +- j = outbuf.used; ++ j = (PredIdx) outbuf.used; + if (j >= 2 + && outbuf.text[j - 1] == '\t' + && outbuf.text[j - 2] == '\n') { +@@ -926,7 +956,7 @@ + char name[10]; + + for (n = 0; n <= 10; ++n) { +- sprintf(name, "lf%d", n); ++ _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "lf%d", n); + if ((cap = find_string(tterm, name)) != ABSENT_STRING + && kill_string(tterm, cap)) { + target -= (int) (strlen(cap) + 5); +@@ -951,7 +981,7 @@ + char name[10]; + + for (n = 60; n >= 0; --n) { +- sprintf(name, "kf%d", n); ++ _nc_SPRINTF(name, _nc_SLIMIT(sizeof(name)) "kf%d", n); + if ((cap = find_string(tterm, name)) != ABSENT_STRING + && kill_string(tterm, cap)) { + target -= (int) (strlen(cap) + 5); +@@ -1064,7 +1094,7 @@ + */ + unsigned n; + for (n = STRCOUNT; n < NUM_STRINGS(tterm); n++) { +- const char *name = ExtStrname(tterm, n, strnames); ++ const char *name = ExtStrname(tterm, (int) n, strnames); + + if (VALID_STRING(tterm->Strings[n])) { + set_attributes = ABSENT_STRING; +@@ -1144,21 +1174,45 @@ + + if (outform == F_TERMCAP || outform == F_TCONVERR) + trim_trailing(); +- (void) sprintf(buffer, "%s%s", infodump ? "use=" : "tc=", name); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "%s%s", infodump ? "use=" : "tc=", name); + wrap_concat(buffer); + } + + int + show_entry(void) + { +- trim_trailing(); ++ /* ++ * Trim any remaining whitespace. ++ */ ++ if (outbuf.used != 0) { ++ bool infodump = (outform != F_TERMCAP && outform != F_TCONVERR); ++ char delim = (char) (infodump ? ',' : ':'); ++ int j; ++ ++ for (j = (int) outbuf.used - 1; j > 0; --j) { ++ char ch = outbuf.text[j]; ++ if (ch == '\n') { ++ ; ++ } else if (isspace(UChar(ch))) { ++ outbuf.used = (size_t) j; ++ } else if (!infodump && ch == '\\') { ++ outbuf.used = (size_t) j; ++ } else if (ch == delim && (j == 0 || outbuf.text[j - 1] != '\\')) { ++ outbuf.used = (size_t) (j + 1); ++ } else { ++ break; ++ } ++ } ++ outbuf.text[outbuf.used] = '\0'; ++ } + (void) fputs(outbuf.text, stdout); + putchar('\n'); + return (int) outbuf.used; + } + + void +-compare_entry(void (*hook) (PredType t, PredIdx i, const char *name), ++compare_entry(PredHook hook, + TERMTYPE *tp GCC_UNUSED, + bool quiet) + /* compare two entries */ +@@ -1170,7 +1224,7 @@ + fputs(" comparing booleans.\n", stdout); + for_each_boolean(j, tp) { + i = BoolIndirect(j); +- name = ExtBoolname(tp, i, bool_names); ++ name = ExtBoolname(tp, (int) i, bool_names); + + if (isObsolete(outform, name)) + continue; +@@ -1182,7 +1236,7 @@ + fputs(" comparing numbers.\n", stdout); + for_each_number(j, tp) { + i = NumIndirect(j); +- name = ExtNumname(tp, i, num_names); ++ name = ExtNumname(tp, (int) i, num_names); + + if (isObsolete(outform, name)) + continue; +@@ -1194,7 +1248,7 @@ + fputs(" comparing strings.\n", stdout); + for_each_string(j, tp) { + i = StrIndirect(j); +- name = ExtStrname(tp, i, str_names); ++ name = ExtStrname(tp, (int) i, str_names); + + if (isObsolete(outform, name)) + continue; +diff -Naur ncurses-5.9.orig/progs/dump_entry.h ncurses-5.9/progs/dump_entry.h +--- ncurses-5.9.orig/progs/dump_entry.h 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/dump_entry.h 2012-08-25 19:58:00.059897826 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -32,9 +32,8 @@ + * and: Thomas E. Dickey 1996-on * + ****************************************************************************/ + +- + /* +- * $Id: dump_entry.h,v 1.30 2008/07/12 20:23:03 tom Exp $ ++ * $Id: dump_entry.h,v 1.32 2011/08/06 16:33:05 tom Exp $ + * + * Dump control definitions and variables + */ +@@ -64,16 +63,17 @@ + + typedef unsigned PredType; + typedef unsigned PredIdx; +-typedef int (*PredFunc)(PredType, PredIdx); ++typedef int (*PredFunc) (PredType, PredIdx); ++typedef void (*PredHook) (PredType, PredIdx, const char *); + + extern NCURSES_CONST char *nametrans(const char *); + extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int); + extern int show_entry(void); +-extern void compare_entry(void (*)(PredType, PredIdx, const char *), TERMTYPE *, bool); ++extern void compare_entry(PredHook, TERMTYPE *, bool); + extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc); +-extern void dump_init(const char *, int, int, int, int, bool); ++extern void dump_init(const char *, int, int, int, int, unsigned, bool); + extern void dump_uses(const char *, bool); +-extern void repair_acsc(TERMTYPE * tp); ++extern void repair_acsc(TERMTYPE *tp); + + #define FAIL -1 + +diff -Naur ncurses-5.9.orig/progs/infocmp.c ncurses-5.9/progs/infocmp.c +--- ncurses-5.9.orig/progs/infocmp.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/infocmp.c 2012-08-25 19:58:01.603223861 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -42,7 +42,7 @@ + + #include <dump_entry.h> + +-MODULE_ID("$Id: infocmp.c,v 1.105 2010/05/01 22:04:08 tom Exp $") ++MODULE_ID("$Id: infocmp.c,v 1.120 2012/06/08 23:05:25 tom Exp $") + + #define L_CURL "{" + #define R_CURL "}" +@@ -70,8 +70,9 @@ + static const char *s_absent = "NULL"; + static const char *s_cancel = "NULL"; + static const char *tversion; /* terminfo version selected */ +-static int itrace; /* trace flag for debugging */ ++static unsigned itrace; /* trace flag for debugging */ + static int mwidth = 60; ++static int mheight = 65535; + static int numbers = 0; /* format "%'char'" to/from "%{number}" */ + static int outform = F_TERMINFO; /* output format */ + static int sortmode; /* sort_mode */ +@@ -86,16 +87,34 @@ + static bool ignorepads; /* ignore pad prefixes when diffing */ + + #if NO_LEAKS ++ ++typedef struct { ++ ENTRY *head; ++ ENTRY *tail; ++} ENTERED; ++ ++static ENTERED *entered; ++ + #undef ExitProgram + static void ExitProgram(int code) GCC_NORETURN; + /* prototype is to get gcc to accept the noreturn attribute */ + static void + ExitProgram(int code) + { +- while (termcount-- > 0) +- _nc_free_termtype(&entries[termcount].tterm); ++ int n; ++ ++ for (n = 0; n < termcount; ++n) { ++ ENTRY *new_head = _nc_head; ++ ENTRY *new_tail = _nc_tail; ++ _nc_head = entered[n].head; ++ _nc_tail = entered[n].tail; ++ _nc_free_entries(entered[n].head); ++ _nc_head = new_head; ++ _nc_tail = new_tail; ++ } + _nc_leaks_dump_entry(); + free(entries); ++ free(entered); + _nc_free_tic(code); + } + #endif +@@ -106,7 +125,7 @@ + { + char *bp; + +- (void) strcpy(buf, ptr); ++ _nc_STRCPY(buf, ptr, NAMESIZE); + if ((bp = strchr(buf, '|')) != 0) + *bp = '\0'; + +@@ -307,13 +326,13 @@ + { + switch (val) { + case ABSENT_NUMERIC: +- strcpy(buf, s_absent); ++ _nc_STRCPY(buf, s_absent, MAX_STRING); + break; + case CANCELLED_NUMERIC: +- strcpy(buf, s_cancel); ++ _nc_STRCPY(buf, s_cancel, MAX_STRING); + break; + default: +- sprintf(buf, "%d", val); ++ _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) "%d", val); + break; + } + } +@@ -323,31 +342,90 @@ + /* display the value of a string capability */ + { + if (val == ABSENT_STRING) +- strcpy(buf, s_absent); ++ _nc_STRCPY(buf, s_absent, MAX_STRING); + else if (val == CANCELLED_STRING) +- strcpy(buf, s_cancel); ++ _nc_STRCPY(buf, s_cancel, MAX_STRING); + else { +- sprintf(buf, "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val)); ++ _nc_SPRINTF(buf, _nc_SLIMIT(MAX_STRING) ++ "'%.*s'", MAX_STRING - 3, TIC_EXPAND(val)); + } + } + ++/* ++ * Show "comparing..." message for the given terminal names. ++ */ ++static void ++show_comparing(char **names) ++{ ++ if (itrace) { ++ switch (compare) { ++ case C_DIFFERENCE: ++ (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname); ++ break; ++ ++ case C_COMMON: ++ (void) fprintf(stderr, "%s: dumping common capabilities\n", _nc_progname); ++ break; ++ ++ case C_NAND: ++ (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname); ++ break; ++ } ++ } ++ if (*names) { ++ printf("comparing %s", *names++); ++ if (*names) { ++ printf(" to %s", *names++); ++ while (*names) { ++ printf(", %s", *names++); ++ } ++ } ++ printf(".\n"); ++ } ++} ++ ++/* ++ * ncurses stores two types of non-standard capabilities: ++ * a) capabilities listed past the "STOP-HERE" comment in the Caps file. ++ * These are used in the terminfo source file to provide data for termcaps, ++ * e.g., when there is no equivalent capability in terminfo, as well as for ++ * widely-used non-standard capabilities. ++ * b) user-definable capabilities, via "tic -x". ++ * ++ * However, if "-x" is omitted from the tic command, both types of ++ * non-standard capability are not loaded into the terminfo database. This ++ * macro is used for limit-checks against the symbols that tic uses to omit ++ * the two types of non-standard entry. ++ */ ++#define check_user_definable(n,limit) if (!_nc_user_definable && (n) > (limit)) break ++ ++/* ++ * Use these macros to simplify loops on C_COMMON and C_NAND: ++ */ ++#define for_each_entry() while (entries[extra].tterm.term_names) ++#define next_entry (&(entries[extra++].tterm)) ++ + static void + compare_predicate(PredType type, PredIdx idx, const char *name) + /* predicate function to use for entry difference reports */ + { +- register ENTRY *e1 = &entries[0]; +- register ENTRY *e2 = &entries[1]; +- char buf1[MAX_STRING], buf2[MAX_STRING]; ++ ENTRY *e1 = &entries[0]; ++ ENTRY *e2 = &entries[1]; ++ char buf1[MAX_STRING]; ++ char buf2[MAX_STRING]; + int b1, b2; + int n1, n2; + char *s1, *s2; ++ bool found; ++ int extra = 1; + + switch (type) { + case CMP_BOOLEAN: ++ check_user_definable(idx, BOOLWRITE); + b1 = e1->tterm.Booleans[idx]; +- b2 = e2->tterm.Booleans[idx]; + switch (compare) { + case C_DIFFERENCE: ++ b2 = next_entry->Booleans[idx]; + if (!(b1 == ABSENT_BOOLEAN && b2 == ABSENT_BOOLEAN) && b1 != b2) + (void) printf("\t%s: %s%s%s.\n", + name, +@@ -357,45 +435,93 @@ + break; + + case C_COMMON: +- if (b1 == b2 && b1 != ABSENT_BOOLEAN) +- (void) printf("\t%s= %s.\n", name, dump_boolean(b1)); ++ if (b1 != ABSENT_BOOLEAN) { ++ found = TRUE; ++ for_each_entry() { ++ b2 = next_entry->Booleans[idx]; ++ if (b1 != b2) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t%s= %s.\n", name, dump_boolean(b1)); ++ } ++ } + break; + + case C_NAND: +- if (b1 == ABSENT_BOOLEAN && b2 == ABSENT_BOOLEAN) +- (void) printf("\t!%s.\n", name); ++ if (b1 == ABSENT_BOOLEAN) { ++ found = TRUE; ++ for_each_entry() { ++ b2 = next_entry->Booleans[idx]; ++ if (b1 != b2) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t!%s.\n", name); ++ } ++ } + break; + } + break; + + case CMP_NUMBER: ++ check_user_definable(idx, NUMWRITE); + n1 = e1->tterm.Numbers[idx]; +- n2 = e2->tterm.Numbers[idx]; +- dump_numeric(n1, buf1); +- dump_numeric(n2, buf2); + switch (compare) { + case C_DIFFERENCE: +- if (!((n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC)) && n1 != n2) ++ n2 = next_entry->Numbers[idx]; ++ if (!((n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC)) && n1 != n2) { ++ dump_numeric(n1, buf1); ++ dump_numeric(n2, buf2); + (void) printf("\t%s: %s, %s.\n", name, buf1, buf2); ++ } + break; + + case C_COMMON: +- if (n1 != ABSENT_NUMERIC && n2 != ABSENT_NUMERIC && n1 == n2) +- (void) printf("\t%s= %s.\n", name, buf1); ++ if (n1 != ABSENT_NUMERIC) { ++ found = TRUE; ++ for_each_entry() { ++ n2 = next_entry->Numbers[idx]; ++ if (n1 != n2) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ dump_numeric(n1, buf1); ++ (void) printf("\t%s= %s.\n", name, buf1); ++ } ++ } + break; + + case C_NAND: +- if (n1 == ABSENT_NUMERIC && n2 == ABSENT_NUMERIC) +- (void) printf("\t!%s.\n", name); ++ if (n1 == ABSENT_NUMERIC) { ++ found = TRUE; ++ for_each_entry() { ++ n2 = next_entry->Numbers[idx]; ++ if (n1 != n2) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t!%s.\n", name); ++ } ++ } + break; + } + break; + + case CMP_STRING: ++ check_user_definable(idx, STRWRITE); + s1 = e1->tterm.Strings[idx]; +- s2 = e2->tterm.Strings[idx]; + switch (compare) { + case C_DIFFERENCE: ++ s2 = next_entry->Strings[idx]; + if (capcmp(idx, s1, s2)) { + dump_string(s1, buf1); + dump_string(s2, buf2); +@@ -405,13 +531,35 @@ + break; + + case C_COMMON: +- if (s1 && s2 && !capcmp(idx, s1, s2)) +- (void) printf("\t%s= '%s'.\n", name, TIC_EXPAND(s1)); ++ if (s1 != ABSENT_STRING) { ++ found = TRUE; ++ for_each_entry() { ++ s2 = next_entry->Strings[idx]; ++ if (capcmp(idx, s1, s2) != 0) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t%s= '%s'.\n", name, TIC_EXPAND(s1)); ++ } ++ } + break; + + case C_NAND: +- if (!s1 && !s2) +- (void) printf("\t!%s.\n", name); ++ if (s1 == ABSENT_STRING) { ++ found = TRUE; ++ for_each_entry() { ++ s2 = next_entry->Strings[idx]; ++ if (s2 != s1) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t!%s.\n", name); ++ } ++ } + break; + } + break; +@@ -430,16 +578,37 @@ + break; + + case C_COMMON: +- if (e1->nuses && e2->nuses && useeq(e1, e2)) { +- (void) fputs("\tuse: ", stdout); +- print_uses(e1, stdout); +- fputs(".\n", stdout); ++ if (e1->nuses) { ++ found = TRUE; ++ for_each_entry() { ++ e2 = &entries[extra++]; ++ if (e2->nuses != e1->nuses || !useeq(e1, e2)) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) fputs("\tuse: ", stdout); ++ print_uses(e1, stdout); ++ fputs(".\n", stdout); ++ } + } + break; + + case C_NAND: +- if (!e1->nuses && !e2->nuses) +- (void) printf("\t!use.\n"); ++ if (!e1->nuses) { ++ found = TRUE; ++ for_each_entry() { ++ e2 = &entries[extra++]; ++ if (e2->nuses != e1->nuses) { ++ found = FALSE; ++ break; ++ } ++ } ++ if (found) { ++ (void) printf("\t!use.\n"); ++ } ++ } + break; + } + } +@@ -556,7 +725,7 @@ + } + + static bool +-same_param(const char *table, const char *param, unsigned length) ++same_param(const char *table, const char *param, size_t length) + { + bool result = FALSE; + if (strncmp(table, param, length) == 0) { +@@ -581,15 +750,15 @@ + size_t tlen = strlen(ap->from); + + if (same_param(ap->from, ep, tlen)) { +- (void) strcat(dst, ap->to); ++ _nc_STRCAT(dst, ap->to, MAX_TERMINFO_LENGTH); + found = TRUE; + break; + } + } + + if (!found) +- (void) strcat(dst, ep); +- (void) strcat(dst, ";"); ++ _nc_STRCAT(dst, ep, MAX_TERMINFO_LENGTH); ++ _nc_STRCAT(dst, ";", MAX_TERMINFO_LENGTH); + } while + ((ep = strtok((char *) 0, ";"))); + +@@ -682,7 +851,11 @@ + && (next = (size_t) csi + len) + && ((sp[next] == 'h') || (sp[next] == 'l'))) { + +- (void) strcpy(buf2, (sp[next] == 'h') ? "ECMA+" : "ECMA-"); ++ _nc_STRCPY(buf2, ++ ((sp[next] == 'h') ++ ? "ECMA+" ++ : "ECMA-"), ++ sizeof(buf2)); + (void) strncpy(buf3, sp + csi, len); + buf3[len] = '\0'; + len += (size_t) csi + 1; +@@ -699,7 +872,11 @@ + && (next = (size_t) csi + 1 + len) + && ((sp[next] == 'h') || (sp[next] == 'l'))) { + +- (void) strcpy(buf2, (sp[next] == 'h') ? "DEC+" : "DEC-"); ++ _nc_STRCPY(buf2, ++ ((sp[next] == 'h') ++ ? "DEC+" ++ : "DEC-"), ++ sizeof(buf2)); + (void) strncpy(buf3, sp + csi + 1, len); + buf3[len] = '\0'; + len += (size_t) csi + 2; +@@ -715,7 +892,7 @@ + && (next = (size_t) csi + len) + && sp[next] == 'm') { + +- (void) strcpy(buf2, "SGR:"); ++ _nc_STRCPY(buf2, "SGR:", sizeof(buf2)); + (void) strncpy(buf3, sp + csi, len); + buf3[len] = '\0'; + len += (size_t) csi + 1; +@@ -727,8 +904,8 @@ + && (csi = skip_csi(sp)) != 0 + && sp[csi] == 'm') { + len = (size_t) csi + 1; +- (void) strcpy(buf2, "SGR:"); +- strcat(buf2, ecma_highlights[0].to); ++ _nc_STRCPY(buf2, "SGR:", sizeof(buf2)); ++ _nc_STRCAT(buf2, ecma_highlights[0].to, sizeof(buf2)); + expansion = buf2; + } + +@@ -739,7 +916,7 @@ + expansion = "RSR"; + len = 1; + } else { +- (void) sprintf(buf2, "1;%dr", tp_lines); ++ _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "1;%dr", tp_lines); + len = strlen(buf2); + if (strncmp(buf2, sp + csi, len) == 0) + expansion = "RSR"; +@@ -750,12 +927,12 @@ + /* now check for home-down */ + if (!expansion + && (csi = skip_csi(sp)) != 0) { +- (void) sprintf(buf2, "%d;1H", tp_lines); ++ _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%d;1H", tp_lines); + len = strlen(buf2); + if (strncmp(buf2, sp + csi, len) == 0) { + expansion = "LL"; + } else { +- (void) sprintf(buf2, "%dH", tp_lines); ++ _nc_SPRINTF(buf2, _nc_SLIMIT(sizeof(buf2)) "%dH", tp_lines); + len = strlen(buf2); + if (strncmp(buf2, sp + csi, len) == 0) { + expansion = "LL"; +@@ -795,12 +972,16 @@ + int i, n; + + memset(heads, 0, sizeof(heads)); +- dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, itrace, FALSE); ++ dump_init((char *) 0, F_LITERAL, S_TERMINFO, 0, 65535, itrace, FALSE); + + for (n = 0; n < argc && n < MAXCOMPARE; n++) { + if (freopen(argv[n], "r", stdin) == 0) + _nc_err_abort("Can't open %s", argv[n]); + ++#if NO_LEAKS ++ entered[n].head = _nc_head; ++ entered[n].tail = _nc_tail; ++#endif + _nc_head = _nc_tail = 0; + + /* parse entries out of the source file */ +@@ -925,6 +1106,11 @@ + #endif + if (!(entryeq(&qp->tterm, &rp->tterm) && useeq(qp, rp))) { + char name1[NAMESIZE], name2[NAMESIZE]; ++ char *names[3]; ++ ++ names[0] = name1; ++ names[1] = name2; ++ names[2] = 0; + + entries[0] = *qp; + entries[1] = *rp; +@@ -934,29 +1120,17 @@ + + switch (compare) { + case C_DIFFERENCE: +- if (itrace) +- (void) fprintf(stderr, +- "%s: dumping differences\n", +- _nc_progname); +- (void) printf("comparing %s to %s.\n", name1, name2); ++ show_comparing(names); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + + case C_COMMON: +- if (itrace) +- (void) fprintf(stderr, +- "%s: dumping common capabilities\n", +- _nc_progname); +- (void) printf("comparing %s to %s.\n", name1, name2); ++ show_comparing(names); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + + case C_NAND: +- if (itrace) +- (void) fprintf(stderr, +- "%s: dumping differences\n", +- _nc_progname); +- (void) printf("comparing %s to %s.\n", name1, name2); ++ show_comparing(names); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + +@@ -974,7 +1148,9 @@ + "Usage: infocmp [options] [-A directory] [-B directory] [termname...]" + ,"" + ,"Options:" ++ ," -0 print single-row" + ," -1 print single-column" ++ ," -K use termcap-names and BSD syntax" + ," -C use termcap-names" + ," -F compare terminfo-files" + ," -I use terminfo-names" +@@ -1030,19 +1206,23 @@ + any_initializer(const char *fmt, const char *type) + { + static char *initializer; ++ static size_t need; + char *s; + +- if (initializer == 0) +- initializer = (char *) malloc(strlen(entries->tterm.term_names) + +- strlen(type) + strlen(fmt)); ++ if (initializer == 0) { ++ need = (strlen(entries->tterm.term_names) ++ + strlen(type) ++ + strlen(fmt)); ++ initializer = (char *) malloc(need); ++ } + +- (void) strcpy(initializer, entries->tterm.term_names); ++ _nc_STRCPY(initializer, entries->tterm.term_names, need); + for (s = initializer; *s != 0 && *s != '|'; s++) { + if (!isalnum(UChar(*s))) + *s = '_'; + } + *s = 0; +- (void) sprintf(s, fmt, type); ++ _nc_SPRINTF(s, _nc_SLIMIT(need) fmt, type); + return initializer; + } + +@@ -1073,9 +1253,10 @@ + + if (VALID_STRING(term->Strings[n])) { + tp = buf; ++#define TP_LIMIT ((MAX_STRING - 5) - (size_t)(tp - buf)) + *tp++ = '"'; + for (sp = term->Strings[n]; +- *sp != 0 && (tp - buf) < MAX_STRING - 6; ++ *sp != 0 && TP_LIMIT > 2; + sp++) { + if (isascii(UChar(*sp)) + && isprint(UChar(*sp)) +@@ -1083,14 +1264,15 @@ + && *sp != '"') + *tp++ = *sp; + else { +- (void) sprintf(tp, "\\%03o", UChar(*sp)); ++ _nc_SPRINTF(tp, _nc_SLIMIT(TP_LIMIT) "\\%03o", UChar(*sp)); + tp += 4; + } + } + *tp++ = '"'; + *tp = '\0'; + (void) printf("static char %-20s[] = %s;\n", +- string_variable(ExtStrname(term, n, strnames)), buf); ++ string_variable(ExtStrname(term, (int) n, strnames)), ++ buf); + } + } + printf("\n"); +@@ -1116,7 +1298,7 @@ + break; + } + (void) printf("\t/* %3u: %-8s */\t%s,\n", +- n, ExtBoolname(term, n, boolnames), str); ++ n, ExtBoolname(term, (int) n, boolnames), str); + } + (void) printf("%s;\n", R_CURL); + +@@ -1132,12 +1314,12 @@ + str = "CANCELLED_NUMERIC"; + break; + default: +- sprintf(buf, "%d", term->Numbers[n]); ++ _nc_SPRINTF(buf, _nc_SLIMIT(sizeof(buf)) "%d", term->Numbers[n]); + str = buf; + break; + } + (void) printf("\t/* %3u: %-8s */\t%s,\n", n, +- ExtNumname(term, n, numnames), str); ++ ExtNumname(term, (int) n, numnames), str); + } + (void) printf("%s;\n", R_CURL); + +@@ -1150,10 +1332,10 @@ + else if (term->Strings[n] == CANCELLED_STRING) + str = "CANCELLED_STRING"; + else { +- str = string_variable(ExtStrname(term, n, strnames)); ++ str = string_variable(ExtStrname(term, (int) n, strnames)); + } + (void) printf("\t/* %3u: %-8s */\t%s,\n", n, +- ExtStrname(term, n, strnames), str); ++ ExtStrname(term, (int) n, strnames), str); + } + (void) printf("%s;\n", R_CURL); + +@@ -1165,15 +1347,15 @@ + name_initializer("string_ext"), L_CURL); + for (n = BOOLCOUNT; n < NUM_BOOLEANS(term); ++n) { + (void) printf("\t/* %3u: bool */\t\"%s\",\n", +- n, ExtBoolname(term, n, boolnames)); ++ n, ExtBoolname(term, (int) n, boolnames)); + } + for (n = NUMCOUNT; n < NUM_NUMBERS(term); ++n) { + (void) printf("\t/* %3u: num */\t\"%s\",\n", +- n, ExtNumname(term, n, numnames)); ++ n, ExtNumname(term, (int) n, numnames)); + } + for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) { + (void) printf("\t/* %3u: str */\t\"%s\",\n", +- n, ExtStrname(term, n, strnames)); ++ n, ExtStrname(term, (int) n, strnames)); + } + (void) printf("%s;\n", R_CURL); + } +@@ -1247,6 +1429,23 @@ + return terminal; + } + ++/* ++ * Show the databases that infocmp knows about. The location to which it writes is ++ */ ++static void ++show_databases(void) ++{ ++ DBDIRS state; ++ int offset; ++ const char *path2; ++ ++ _nc_first_db(&state, &offset); ++ while ((path2 = _nc_next_db(&state, &offset)) != 0) { ++ printf("%s\n", path2); ++ } ++ _nc_last_db(); ++} ++ + /*************************************************************************** + * + * Main sequence +@@ -1269,7 +1468,7 @@ + /* Also avoid overflowing smaller stacks on systems like AmigaOS */ + path *tfile = 0; + char **tname = 0; +- int maxterms; ++ size_t maxterms; + + char **myargv; + +@@ -1287,6 +1486,7 @@ + #if NCURSES_XNAMES + use_extended_names(FALSE); + #endif ++ _nc_strict_bsd = 0; + + _nc_progname = _nc_rootname(argv[0]); + +@@ -1297,8 +1497,13 @@ + + while ((c = getopt(argc, + argv, +- "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != -1) { ++ "01A:aB:CcDdEeFfGgIiKLlnpqR:rs:TtUuVv:w:x")) != -1) { + switch (c) { ++ case '0': ++ mwidth = 65535; ++ mheight = 1; ++ break; ++ + case '1': + mwidth = 0; + break; +@@ -1317,6 +1522,9 @@ + restdir = optarg; + break; + ++ case 'K': ++ _nc_strict_bsd = 1; ++ /* FALLTHRU */ + case 'C': + outform = F_TERMCAP; + tversion = "BSD"; +@@ -1324,6 +1532,11 @@ + sortmode = S_TERMCAP; + break; + ++ case 'D': ++ show_databases(); ++ ExitProgram(EXIT_SUCCESS); ++ break; ++ + case 'c': + compare = C_COMMON; + break; +@@ -1441,7 +1654,7 @@ + ExitProgram(EXIT_SUCCESS); + + case 'v': +- itrace = optarg_to_number(); ++ itrace = (unsigned) optarg_to_number(); + set_trace_level(itrace); + break; + +@@ -1460,10 +1673,13 @@ + } + } + +- maxterms = (argc + 2 - optind); ++ maxterms = (size_t) (argc + 2 - optind); + tfile = typeMalloc(path, maxterms); + tname = typeCalloc(char *, maxterms); + entries = typeCalloc(ENTRY, maxterms); ++#if NO_LEAKS ++ entered = typeCalloc(ENTERED, maxterms); ++#endif + + if (tfile == 0 + || tname == 0 +@@ -1476,9 +1692,6 @@ + if (sortmode == S_DEFAULT) + sortmode = S_TERMINFO; + +- /* set up for display */ +- dump_init(tversion, outform, sortmode, mwidth, itrace, formatted); +- + /* make sure we have at least one terminal name to work with */ + if (optind >= argc) + argv[argc++] = terminal_env(); +@@ -1487,9 +1700,23 @@ + if (compare != C_DEFAULT && optind >= argc - 1) + argv[argc++] = terminal_env(); + ++ /* exactly one terminal name with no options means display it */ + /* exactly two terminal names with no options means do -d */ +- if (argc - optind == 2 && compare == C_DEFAULT) +- compare = C_DIFFERENCE; ++ if (compare == C_DEFAULT) { ++ switch (argc - optind) { ++ default: ++ fprintf(stderr, "%s: too many names to compare\n", _nc_progname); ++ ExitProgram(EXIT_FAILURE); ++ case 1: ++ break; ++ case 2: ++ compare = C_DIFFERENCE; ++ break; ++ } ++ } ++ ++ /* set up for display */ ++ dump_init(tversion, outform, sortmode, mwidth, mheight, itrace, formatted); + + if (!filecompare) { + /* grab the entries */ +@@ -1507,9 +1734,11 @@ + #else + #define LEAF_FMT "%02x" + #endif +- (void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s", +- directory, +- UChar(*argv[optind]), argv[optind]); ++ _nc_SPRINTF(tfile[termcount], ++ _nc_SLIMIT(sizeof(path)) ++ "%s/" LEAF_FMT "/%s", ++ directory, ++ UChar(*argv[optind]), argv[optind]); + if (itrace) + (void) fprintf(stderr, + "%s: reading entry %s from file %s\n", +@@ -1599,27 +1828,17 @@ + break; + + case C_DIFFERENCE: +- if (itrace) +- (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname); +- (void) printf("comparing %s to %s.\n", tname[0], tname[1]); ++ show_comparing(tname); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + + case C_COMMON: +- if (itrace) +- (void) fprintf(stderr, +- "%s: dumping common capabilities\n", +- _nc_progname); +- (void) printf("comparing %s to %s.\n", tname[0], tname[1]); ++ show_comparing(tname); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + + case C_NAND: +- if (itrace) +- (void) fprintf(stderr, +- "%s: dumping differences\n", +- _nc_progname); +- (void) printf("comparing %s to %s.\n", tname[0], tname[1]); ++ show_comparing(tname); + compare_entry(compare_predicate, &entries->tterm, quiet); + break; + +@@ -1640,15 +1859,16 @@ + break; + } + } +- } else if (compare == C_USEALL) ++ } else if (compare == C_USEALL) { + (void) fprintf(stderr, "Sorry, -u doesn't work with -F\n"); +- else if (compare == C_DEFAULT) ++ } else if (compare == C_DEFAULT) { + (void) fprintf(stderr, "Use `tic -[CI] <file>' for this.\n"); +- else if (argc - optind != 2) ++ } else if (argc - optind != 2) { + (void) fprintf(stderr, + "File comparison needs exactly two file arguments.\n"); +- else ++ } else { + file_comparison(argc - optind, argv + optind); ++ } + + MAIN_LEAKS(); + ExitProgram(EXIT_SUCCESS); +diff -Naur ncurses-5.9.orig/progs/progs.priv.h ncurses-5.9/progs/progs.priv.h +--- ncurses-5.9.orig/progs/progs.priv.h 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/progs.priv.h 2012-08-25 19:58:00.929893713 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -30,7 +30,7 @@ + * Author: Thomas E. Dickey 1997-on * + ****************************************************************************/ + /* +- * $Id: progs.priv.h,v 1.34 2008/08/03 17:43:05 tom Exp $ ++ * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $ + * + * progs.priv.h + * +@@ -42,7 +42,7 @@ + #if USE_RCS_IDS + #define MODULE_ID(id) static const char Ident[] = id; + #else +-#define MODULE_ID(id) /*nothing*/ ++#define MODULE_ID(id) /*nothing */ + #endif + + #include <stdlib.h> +@@ -90,6 +90,14 @@ + # endif + #endif + ++#if HAVE_INTTYPES_H ++# include <inttypes.h> ++#else ++# if HAVE_STDINT_H ++# include <stdint.h> ++# endif ++#endif ++ + #include <assert.h> + #include <errno.h> + +@@ -99,7 +107,7 @@ + + #if HAVE_GETOPT_H + #include <getopt.h> +-#else ++#elif !defined(HAVE_GETOPT_HEADER) + /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its + * variables doesn't hurt. + */ +@@ -109,9 +117,11 @@ + + #include <curses.h> + #include <term_entry.h> ++#include <nc_termios.h> + #include <tic.h> + #include <nc_tparm.h> + ++#include <nc_string.h> + #include <nc_alloc.h> + #if HAVE_NC_FREEALL + #undef ExitProgram +@@ -171,7 +181,7 @@ + # elif defined(MAXPATHLEN) + # define PATH_MAX MAXPATHLEN + # else +-# define PATH_MAX 255 /* the Posix minimum pathsize */ ++# define PATH_MAX 255 /* the Posix minimum pathsize */ + # endif + #endif + +@@ -183,7 +193,7 @@ + # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127) + # define isascii(c) (UChar(c) <= 127) + # else +-# define isascii(c) 1 /* not really ascii anyway */ ++# define isascii(c) 1 /* not really ascii anyway */ + # endif + #endif + +diff -Naur ncurses-5.9.orig/progs/tabs.c ncurses-5.9/progs/tabs.c +--- ncurses-5.9.orig/progs/tabs.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/tabs.c 2012-08-25 19:58:00.929893713 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -37,7 +37,7 @@ + #define USE_LIBTINFO + #include <progs.priv.h> + +-MODULE_ID("$Id: tabs.c,v 1.19 2010/10/23 22:26:01 tom Exp $") ++MODULE_ID("$Id: tabs.c,v 1.23 2012/02/22 23:57:44 tom Exp $") + + static void usage(void) GCC_NORETURN; + +@@ -140,10 +140,11 @@ + for (n = 0; n < max_cols; n += 10) { + int ch = 1 + (n / 10); + char buffer[20]; +- sprintf(buffer, "----+----%c", +- ((ch < 10) +- ? (ch + '0') +- : (ch + 'A' - 10))); ++ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) ++ "----+----%c", ++ ((ch < 10) ++ ? (ch + '0') ++ : (ch + 'A' - 10))); + printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer); + } + putchar('\n'); +@@ -227,7 +228,7 @@ + bool result = FALSE; + + if (source != 0) { +- unsigned len = strlen(source); ++ size_t len = strlen(source); + if (len != 0) + result = (source[len - 1] != ','); + } else { +@@ -251,7 +252,7 @@ + + if (copied != 0 && *copied != '\0') { + const char *comma = ","; +- unsigned need = 1 + strlen(copied); ++ size_t need = 1 + strlen(copied); + + if (*copied == ',') + comma = ""; +@@ -266,11 +267,11 @@ + if (result != 0) { + *result = '\0'; + if (*append != 0) { +- strcpy(result, *append); ++ _nc_STRCPY(result, *append, need); + free(*append); + } +- strcat(result, comma); +- strcat(result, copied); ++ _nc_STRCAT(result, comma, need); ++ _nc_STRCAT(result, copied, need); + } + + *append = result; +@@ -353,7 +354,6 @@ + bool no_op = FALSE; + int n, ch; + NCURSES_CONST char *term_name = 0; +- const char *mar_list = 0; /* ignored */ + char *append = 0; + const char *tab_list = 0; + +@@ -446,7 +446,11 @@ + while ((ch = *++option) != '\0') { + switch (ch) { + case 'm': +- mar_list = option; ++ /* ++ * The "+mXXX" option is unimplemented because only the long-obsolete ++ * att510d implements smgl, which is needed to support ++ * this option. ++ */ + break; + default: + /* special case of relative stops separated by spaces? */ +diff -Naur ncurses-5.9.orig/progs/tic.c ncurses-5.9/progs/tic.c +--- ncurses-5.9.orig/progs/tic.c 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/progs/tic.c 2012-08-25 19:58:01.529890874 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -35,6 +35,7 @@ + /* + * tic.c --- Main program for terminfo compiler + * by Eric S. Raymond ++ * and Thomas E Dickey + * + */ + +@@ -42,9 +43,12 @@ + #include <sys/stat.h> + + #include <dump_entry.h> ++#include <hashed_db.h> + #include <transform.h> + +-MODULE_ID("$Id: tic.c,v 1.147 2011/02/12 18:39:08 tom Exp $") ++MODULE_ID("$Id: tic.c,v 1.177 2012/06/02 17:19:31 tom Exp $") ++ ++#define STDIN_NAME "<stdin>" + + const char *_nc_progname = "tic"; + +@@ -53,6 +57,7 @@ + static bool capdump = FALSE; /* running as infotocap? */ + static bool infodump = FALSE; /* running as captoinfo? */ + static bool showsummary = FALSE; ++static char **namelst = 0; + static const char *to_remove; + + static void (*save_check_termtype) (TERMTYPE *, bool); +@@ -69,11 +74,13 @@ + 1\ + a\ + C\ ++D\ + c\ + f\ + G\ + g\ + I\ ++K\ + L\ + N\ + r\ +@@ -99,7 +106,7 @@ + #endif + + static void +-cleanup(char **namelst GCC_UNUSED) ++cleanup(void) + { + #if NO_LEAKS + free_namelist(namelst); +@@ -119,7 +126,6 @@ + failed(const char *msg) + { + perror(msg); +- cleanup((char **) 0); + ExitProgram(EXIT_FAILURE); + } + +@@ -133,7 +139,9 @@ + #if NCURSES_XNAMES + " -a retain commented-out capabilities (sets -x also)", + #endif ++ " -K translate entries to termcap source form with BSD syntax", + " -C translate entries to termcap source form", ++ " -D print list of tic's database locations (first must be writable)", + " -c check only, validate input without compiling or translating", + " -e<names> translate/compile only entries named by comma-separated list", + " -f format complex strings for readability", +@@ -173,7 +181,7 @@ + + #define L_BRACE '{' + #define R_BRACE '}' +-#define S_QUOTE '\''; ++#define S_QUOTE '\'' + + static void + write_it(ENTRY * ep) +@@ -216,12 +224,12 @@ + } + *d = 0; + if (strlen(result) < strlen(s)) +- strcpy(s, result); ++ _nc_STRCPY(s, result, strlen(s) + 1); + } + } + + _nc_set_type(_nc_first_name(ep->tterm.term_names)); +- _nc_curr_line = ep->startline; ++ _nc_curr_line = (int) ep->startline; + _nc_write_entry(&ep->tterm); + } + +@@ -308,7 +316,7 @@ + if ((up = strchr(namebuf, '#')) != 0 + || (up = strchr(namebuf, '=')) != 0 + || ((up = strchr(namebuf, '@')) != 0 && up[1] == '>')) { +- (void) strcpy(suffix, up); ++ _nc_STRCPY(suffix, up, have); + *up = '\0'; + } + +@@ -339,39 +347,116 @@ + static char * + stripped(char *src) + { ++ char *dst = 0; ++ + while (isspace(UChar(*src))) + src++; ++ + if (*src != '\0') { +- char *dst; + size_t len; + +- if ((dst = strdup(src)) == NULL) ++ if ((dst = strdup(src)) == NULL) { + failed("strdup"); ++ } else { ++ len = strlen(dst); ++ while (--len != 0 && isspace(UChar(dst[len]))) ++ dst[len] = '\0'; ++ } ++ } ++ return dst; ++} ++ ++static FILE * ++open_tempfile(char *filename) ++{ ++ FILE *result = 0; ++ ++ _nc_STRCPY(filename, "/tmp/XXXXXX", PATH_MAX); ++#if HAVE_MKSTEMP ++ { ++ int fd = mkstemp(filename); ++ if (fd >= 0) ++ result = fdopen(fd, "w"); ++ } ++#else ++ if (tmpnam(filename) != 0) ++ result = fopen(filename, "w"); ++#endif ++ return result; ++} + +- assert(dst != 0); ++static FILE * ++copy_input(FILE *source, const char *filename, char *alt_file) ++{ ++ FILE *result = 0; ++ FILE *target = open_tempfile(alt_file); ++ int ch; + +- len = strlen(dst); +- while (--len != 0 && isspace(UChar(dst[len]))) +- dst[len] = '\0'; +- return dst; ++ if (source == 0) { ++ failed("copy_input (source)"); ++ } else if (target == 0) { ++ failed("copy_input (target)"); ++ } else { ++ clearerr(source); ++ for (;;) { ++ ch = fgetc(source); ++ if (feof(source)) { ++ break; ++ } else if (ferror(source)) { ++ failed(filename); ++ } else if (ch == 0) { ++ /* don't loop in case someone wants to convert /dev/zero */ ++ fprintf(stderr, "%s: %s is not a text-file\n", _nc_progname, filename); ++ ExitProgram(EXIT_FAILURE); ++ } ++ fputc(ch, target); ++ } ++ fclose(source); ++ /* ++ * rewind() does not force the target file's data to disk (not does ++ * fflush()...). So open a second stream on the data and then close ++ * the one that we were writing on before starting to read from the ++ * second stream. ++ */ ++ result = fopen(alt_file, "r+"); ++ fclose(target); ++ to_remove = alt_file; + } +- return 0; ++ return result; + } + + static FILE * +-open_input(const char *filename) ++open_input(const char *filename, char *alt_file) + { +- FILE *fp = fopen(filename, "r"); ++ FILE *fp; + struct stat sb; ++ int mode; + +- if (fp == 0) { +- fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename); ++ if (!strcmp(filename, "-")) { ++ fp = copy_input(stdin, STDIN_NAME, alt_file); ++ } else if (stat(filename, &sb) < 0) { ++ fprintf(stderr, "%s: %s %s\n", _nc_progname, filename, strerror(errno)); + ExitProgram(EXIT_FAILURE); +- } +- if (fstat(fileno(fp), &sb) < 0 +- || (sb.st_mode & S_IFMT) != S_IFREG) { ++ } else if ((mode = (sb.st_mode & S_IFMT)) == S_IFDIR ++ || (mode != S_IFREG && mode != S_IFCHR)) { + fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename); + ExitProgram(EXIT_FAILURE); ++ } else { ++ fp = fopen(filename, "r"); ++ ++ if (fp == 0) { ++ fprintf(stderr, "%s: Can't open %s\n", _nc_progname, filename); ++ ExitProgram(EXIT_FAILURE); ++ } ++ if (mode != S_IFREG) { ++ if (alt_file != 0) { ++ FILE *fp2 = copy_input(fp, filename, alt_file); ++ fp = fp2; ++ } else { ++ fprintf(stderr, "%s: %s is not a file\n", _nc_progname, filename); ++ ExitProgram(EXIT_FAILURE); ++ } ++ } + } + return fp; + } +@@ -389,7 +474,7 @@ + if (src == 0) { + /* EMPTY */ ; + } else if (strchr(src, '/') != 0) { /* a filename */ +- FILE *fp = open_input(src); ++ FILE *fp = open_input(src, (char *) 0); + + for (pass = 1; pass <= 2; pass++) { + nn = 0; +@@ -456,26 +541,114 @@ + return (code); + } + +-static FILE * +-open_tempfile(char *name) ++static const char * ++valid_db_path(const char *nominal) + { +- FILE *result = 0; +-#if HAVE_MKSTEMP +- int fd = mkstemp(name); +- if (fd >= 0) +- result = fdopen(fd, "w"); ++ struct stat sb; ++#if USE_HASHED_DB ++ char suffix[] = DBM_SUFFIX; ++ size_t need = strlen(nominal) + sizeof(suffix); ++ char *result = malloc(need); ++ ++ _nc_STRCPY(result, nominal, need); ++ if (strcmp(result + need - sizeof(suffix), suffix)) { ++ _nc_STRCAT(result, suffix, need); ++ } + #else +- if (tmpnam(name) != 0) +- result = fopen(name, "w"); ++ char *result = strdup(nominal); ++#endif ++ ++ DEBUG(1, ("** stat(%s)", result)); ++ if (stat(result, &sb) >= 0) { ++#if USE_HASHED_DB ++ if (!S_ISREG(sb.st_mode) ++ || access(result, R_OK | W_OK) != 0) { ++ DEBUG(1, ("...not a writable file")); ++ free(result); ++ result = 0; ++ } ++#else ++ if (!S_ISDIR(sb.st_mode) ++ || access(result, R_OK | W_OK | X_OK) != 0) { ++ DEBUG(1, ("...not a writable directory")); ++ free(result); ++ result = 0; ++ } + #endif ++ } else { ++ /* check if parent is directory and is writable */ ++ unsigned leaf = _nc_pathlast(result); ++ ++ DEBUG(1, ("...not found")); ++ if (leaf) { ++ char save = result[leaf]; ++ result[leaf] = 0; ++ if (stat(result, &sb) >= 0 ++ && S_ISDIR(sb.st_mode) ++ && access(result, R_OK | W_OK | X_OK) == 0) { ++ result[leaf] = save; ++ } else { ++ DEBUG(1, ("...parent directory %s is not writable", result)); ++ free(result); ++ result = 0; ++ } ++ } else { ++ DEBUG(1, ("... no parent directory")); ++ free(result); ++ result = 0; ++ } ++ } + return result; + } + ++/* ++ * Show the databases to which tic could write. The location to which it ++ * writes is always the first one. If none are writable, print an error ++ * message. ++ */ ++static void ++show_databases(const char *outdir) ++{ ++ bool specific = (outdir != 0) || getenv("TERMINFO") != 0; ++ const char *result; ++ const char *tried = 0; ++ ++ if (outdir == 0) { ++ outdir = _nc_tic_dir(0); ++ } ++ if ((result = valid_db_path(outdir)) != 0) { ++ printf("%s\n", result); ++ } else { ++ tried = outdir; ++ } ++ ++ if ((outdir = _nc_home_terminfo())) { ++ if ((result = valid_db_path(outdir)) != 0) { ++ printf("%s\n", result); ++ } else if (!specific) { ++ tried = outdir; ++ } ++ } ++ ++ /* ++ * If we can write in neither location, give an error message. ++ */ ++ if (tried) { ++ fflush(stdout); ++ fprintf(stderr, "%s: %s (no permission)\n", _nc_progname, tried); ++ ExitProgram(EXIT_FAILURE); ++ } ++} ++ ++#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) ++ + int + main(int argc, char *argv[]) + { + char my_tmpname[PATH_MAX]; +- int v_opt = -1, debug_level; ++ char my_altfile[PATH_MAX]; ++ int v_opt = -1; ++ unsigned debug_level; + int smart_defaults = TRUE; + char *termcap; + ENTRY *qp; +@@ -486,6 +659,7 @@ + int sortmode = S_TERMINFO; /* sort_mode */ + + int width = 60; ++ int height = 65535; + bool formatted = FALSE; /* reformat complex strings? */ + bool literal = FALSE; /* suppress post-processing? */ + int numbers = 0; /* format "%'char'" to/from "%{number}" */ +@@ -493,7 +667,6 @@ + bool limited = TRUE; + char *tversion = (char *) NULL; + const char *source_file = "terminfo"; +- char **namelst = 0; + char *outdir = (char *) NULL; + bool check_only = FALSE; + bool suppress_untranslatable = FALSE; +@@ -501,6 +674,7 @@ + log_fp = stderr; + + _nc_progname = _nc_rootname(argv[0]); ++ atexit(cleanup); + + if ((infodump = same_program(_nc_progname, PROG_CAPTOINFO)) != FALSE) { + outform = F_TERMINFO; +@@ -513,6 +687,7 @@ + #if NCURSES_XNAMES + use_extended_names(FALSE); + #endif ++ _nc_strict_bsd = 0; + + /* + * Processing arguments is a little complicated, since someone made a +@@ -520,7 +695,7 @@ + * be optional. + */ + while ((this_opt = getopt(argc, argv, +- "0123456789CILNR:TUVace:fGgo:rstvwx")) != -1) { ++ "0123456789CDIKLNR:TUVace:fGgo:rstvwx")) != -1) { + if (isdigit(this_opt)) { + switch (last_opt) { + case 'v': +@@ -530,19 +705,40 @@ + width = (width * 10) + (this_opt - '0'); + break; + default: +- if (this_opt != '1') ++ switch (this_opt) { ++ case '0': ++ last_opt = this_opt; ++ width = 65535; ++ height = 1; ++ break; ++ case '1': ++ last_opt = this_opt; ++ width = 0; ++ break; ++ default: + usage(); +- last_opt = this_opt; +- width = 0; ++ } + } + continue; + } + switch (this_opt) { ++ case 'K': ++ _nc_strict_bsd = 1; ++ /* the initial version of -K in 20110730 fell-thru here, but the ++ * same flag is useful when reading sources -TD ++ */ ++ break; + case 'C': + capdump = TRUE; + outform = F_TERMCAP; + sortmode = S_TERMCAP; + break; ++ case 'D': ++ debug_level = VtoTrace(v_opt); ++ set_trace_level(debug_level); ++ show_databases(outdir); ++ ExitProgram(EXIT_SUCCESS); ++ break; + case 'I': + infodump = TRUE; + outform = F_TERMINFO; +@@ -568,7 +764,6 @@ + break; + case 'V': + puts(curses_version()); +- cleanup(namelst); + ExitProgram(EXIT_SUCCESS); + case 'c': + check_only = TRUE; +@@ -618,7 +813,7 @@ + last_opt = this_opt; + } + +- debug_level = (v_opt > 0) ? v_opt : (v_opt == 0); ++ debug_level = VtoTrace(v_opt); + set_trace_level(debug_level); + + if (_nc_tracing) { +@@ -638,8 +833,8 @@ + */ + if (namelst && (!infodump && !capdump)) { + (void) fprintf(stderr, +- "Sorry, -e can't be used without -I or -C\n"); +- cleanup(namelst); ++ "%s: Sorry, -e can't be used without -I or -C\n", ++ _nc_progname); + ExitProgram(EXIT_FAILURE); + } + #endif /* HAVE_BIG_CORE */ +@@ -663,16 +858,16 @@ + if (access(termcap, F_OK) == 0) { + /* file exists */ + source_file = termcap; +- } else if ((tmp_fp = open_tempfile(strcpy(my_tmpname, +- "/tmp/XXXXXX"))) +- != 0) { +- source_file = my_tmpname; +- fprintf(tmp_fp, "%s\n", termcap); +- fclose(tmp_fp); +- tmp_fp = open_input(source_file); +- to_remove = source_file; + } else { +- failed("tmpnam"); ++ if ((tmp_fp = open_tempfile(my_tmpname)) != 0) { ++ source_file = my_tmpname; ++ fprintf(tmp_fp, "%s\n", termcap); ++ fclose(tmp_fp); ++ tmp_fp = open_input(source_file, (char *) 0); ++ to_remove = source_file; ++ } else { ++ failed("tmpnam"); ++ } + } + } + } else { +@@ -682,24 +877,28 @@ + _nc_progname, + _nc_progname, + usage_string); +- cleanup(namelst); + ExitProgram(EXIT_FAILURE); + } + } + +- if (tmp_fp == 0) +- tmp_fp = open_input(source_file); ++ if (tmp_fp == 0) { ++ tmp_fp = open_input(source_file, my_altfile); ++ if (!strcmp(source_file, "-")) { ++ source_file = STDIN_NAME; ++ } ++ } + +- if (infodump) ++ if (infodump) { + dump_init(tversion, + smart_defaults + ? outform + : F_LITERAL, +- sortmode, width, debug_level, formatted); +- else if (capdump) ++ sortmode, width, height, debug_level, formatted); ++ } else if (capdump) { + dump_init(tversion, + outform, +- sortmode, width, debug_level, FALSE); ++ sortmode, width, height, debug_level, FALSE); ++ } + + /* parse entries out of the source file */ + _nc_set_source(source_file); +@@ -716,7 +915,6 @@ + /* do use resolution */ + if (check_only || (!infodump && !capdump) || forceresolve) { + if (!_nc_resolve_uses2(TRUE, literal) && !check_only) { +- cleanup(namelst); + ExitProgram(EXIT_FAILURE); + } + } +@@ -750,7 +948,7 @@ + + for_entry_list(qp) { + if (matches(namelst, qp->tterm.term_names)) { +- int j = qp->cend - qp->cstart; ++ long j = qp->cend - qp->cstart; + int len = 0; + + /* this is in case infotocap() generates warnings */ +@@ -767,7 +965,7 @@ + repair_acsc(&qp->tterm); + dump_entry(&qp->tterm, suppress_untranslatable, + limited, numbers, NULL); +- for (j = 0; j < (int) qp->nuses; j++) ++ for (j = 0; j < (long) qp->nuses; j++) + dump_uses(qp->uses[j].name, !capdump); + len = show_entry(); + if (debug_level != 0 && !limited) +@@ -811,7 +1009,6 @@ + else + fprintf(log_fp, "No entries written\n"); + } +- cleanup(namelst); + ExitProgram(EXIT_SUCCESS); + } + +@@ -915,18 +1112,18 @@ + return result; + } + +-static int ++static long + keypad_index(const char *string) + { + char *test; + const char *list = "PQRSwxymtuvlqrsPpn"; /* app-keypad except "Enter" */ + int ch; +- int result = -1; ++ long result = -1; + + if ((ch = keypad_final(string)) != '\0') { + test = strchr(list, ch); + if (test != 0) +- result = (test - list); ++ result = (long) (test - list); + } + return result; + } +@@ -1015,13 +1212,18 @@ + int count; + char *list[4]; + ++ /* it is rare to have an insert-line feature without a matching delete */ ++ ANDMISSING(parm_insert_line, insert_line); ++ ANDMISSING(parm_delete_line, delete_line); ++ ANDMISSING(parm_insert_line, parm_delete_line); ++ + /* if we have a parameterized form, then the non-parameterized is easy */ + ANDMISSING(parm_down_cursor, cursor_down); + ANDMISSING(parm_up_cursor, cursor_up); + ANDMISSING(parm_left_cursor, cursor_left); + ANDMISSING(parm_right_cursor, cursor_right); + +- /* Given any of a set of cursor movement, the whole set should be present. ++ /* Given any of a set of cursor movement, the whole set should be present. + * Technically this is not true (we could use cursor_address to fill in + * unsupported controls), but it is likely. + */ +@@ -1097,11 +1299,11 @@ + VALID_STRING(key_c1) && + VALID_STRING(key_c3)) { + char final[MAX_KP + 1]; +- int list[MAX_KP]; ++ long list[MAX_KP]; + int increase = 0; + int j, k, kk; +- int last; +- int test; ++ long last; ++ long test; + + final[0] = keypad_final(key_a1); + final[1] = keypad_final(key_a3); +@@ -1149,19 +1351,19 @@ + assert(strlen(show) < (MAX_KP * 4)); + switch (kk) { + case 0: +- strcat(show, " ka1"); ++ _nc_STRCAT(show, " ka1", sizeof(show)); + break; + case 1: +- strcat(show, " ka3"); ++ _nc_STRCAT(show, " ka3", sizeof(show)); + break; + case 2: +- strcat(show, " kb2"); ++ _nc_STRCAT(show, " kb2", sizeof(show)); + break; + case 3: +- strcat(show, " kc1"); ++ _nc_STRCAT(show, " kc1", sizeof(show)); + break; + case 4: +- strcat(show, " kc3"); ++ _nc_STRCAT(show, " kc3", sizeof(show)); + break; + } + } +@@ -1176,18 +1378,24 @@ + VALID_STRING(key_c3)) { + show[0] = '\0'; + if (keypad_index(key_a1) >= 0) +- strcat(show, " ka1"); ++ _nc_STRCAT(show, " ka1", sizeof(show)); + if (keypad_index(key_a3) >= 0) +- strcat(show, " ka3"); ++ _nc_STRCAT(show, " ka3", sizeof(show)); + if (keypad_index(key_b2) >= 0) +- strcat(show, " kb2"); ++ _nc_STRCAT(show, " kb2", sizeof(show)); + if (keypad_index(key_c1) >= 0) +- strcat(show, " kc1"); ++ _nc_STRCAT(show, " kc1", sizeof(show)); + if (keypad_index(key_c3) >= 0) +- strcat(show, " kc3"); ++ _nc_STRCAT(show, " kc3", sizeof(show)); + if (*show != '\0') + _nc_warning("vt100 keypad map incomplete:%s", show); + } ++ ++ /* ++ * These warnings are useful for consistency checks - it is possible that ++ * there are real terminals with mismatches in these ++ */ ++ ANDMISSING(key_ic, key_dc); + } + + static void +@@ -1216,6 +1424,72 @@ + ANDMISSING(parm_up_micro, micro_up); + } + ++static bool ++uses_SGR_39_49(const char *value) ++{ ++ return (strstr(value, "39;49") != 0 ++ || strstr(value, "49;39") != 0); ++} ++ ++/* ++ * Check consistency of termcap extensions related to "screen". ++ */ ++static void ++check_screen(TERMTYPE *tp) ++{ ++ if (_nc_user_definable) { ++ int have_XT = tigetflag("XT"); ++ int have_XM = tigetflag("XM"); ++ int have_bce = back_color_erase; ++ bool have_kmouse = FALSE; ++ bool use_sgr_39_49 = FALSE; ++ char *name = _nc_first_name(tp->term_names); ++ ++ if (!VALID_BOOLEAN(have_bce)) { ++ have_bce = FALSE; ++ } ++ if (!VALID_BOOLEAN(have_XM)) { ++ have_XM = FALSE; ++ } ++ if (!VALID_BOOLEAN(have_XT)) { ++ have_XT = FALSE; ++ } ++ if (VALID_STRING(key_mouse)) { ++ have_kmouse = !strcmp("\033[M", key_mouse); ++ } ++ if (VALID_STRING(orig_colors)) { ++ use_sgr_39_49 = uses_SGR_39_49(orig_colors); ++ } else if (VALID_STRING(orig_pair)) { ++ use_sgr_39_49 = uses_SGR_39_49(orig_pair); ++ } ++ ++ if (have_XM && have_XT) { ++ _nc_warning("Screen's XT capability conflicts with XM"); ++ } else if (have_XT ++ && strstr(name, "screen") != 0 ++ && strchr(name, '.') != 0) { ++ _nc_warning("Screen's \"screen\" entries should not have XT set"); ++ } else if (have_XT) { ++ if (!have_kmouse && have_bce) { ++ if (VALID_STRING(key_mouse)) { ++ _nc_warning("Value of kmous inconsistent with screen's usage"); ++ } else { ++ _nc_warning("Expected kmous capability with XT"); ++ } ++ } ++ if (!have_bce && max_colors > 0) ++ _nc_warning("Expected bce capability with XT"); ++ if (!use_sgr_39_49 && have_bce && max_colors > 0) ++ _nc_warning("Expected orig_colors capability with XT to have 39/49 parameters"); ++ if (VALID_STRING(to_status_line)) ++ _nc_warning("\"tsl\" capability is redundant, given XT"); ++ } else { ++ if (have_kmouse && !have_XM) ++ _nc_warning("Expected XT to be set, given kmous"); ++ } ++ } ++} ++ + /* + * Returns the expected number of parameters for the given capability. + */ +@@ -1527,7 +1801,7 @@ + show_where(unsigned level) + { + if (_nc_tracing >= DEBUG_LEVEL(level)) { +- char my_name[256]; ++ char my_name[MAX_NAME_SIZE]; + _nc_get_type(my_name); + _tracef("\"%s\", line %d, '%s'", + _nc_get_source(), +@@ -1539,6 +1813,55 @@ + #define show_where(level) /* nothing */ + #endif + ++typedef struct { ++ int keycode; ++ const char *name; ++ const char *value; ++} NAME_VALUE; ++ ++static NAME_VALUE * ++get_fkey_list(TERMTYPE *tp) ++{ ++ NAME_VALUE *result = typeMalloc(NAME_VALUE, NUM_STRINGS(tp) + 1); ++ const struct tinfo_fkeys *all_fkeys = _nc_tinfo_fkeys; ++ int used = 0; ++ int j; ++ ++ for (j = 0; all_fkeys[j].code; j++) { ++ char *a = tp->Strings[all_fkeys[j].offset]; ++ if (VALID_STRING(a)) { ++ result[used].keycode = (int) all_fkeys[j].code; ++ result[used].name = strnames[all_fkeys[j].offset]; ++ result[used].value = a; ++ ++used; ++ } ++ } ++#if NCURSES_XNAMES ++ for (j = STRCOUNT; j < NUM_STRINGS(tp); ++j) { ++ const char *name = ExtStrname(tp, j, strnames); ++ if (*name == 'k') { ++ result[used].keycode = -1; ++ result[used].name = name; ++ result[used].value = tp->Strings[j]; ++ ++used; ++ } ++ } ++#endif ++ result[used].keycode = 0; ++ return result; ++} ++ ++static void ++show_fkey_name(NAME_VALUE * data) ++{ ++ if (data->keycode > 0) { ++ fprintf(stderr, " %s", keyname(data->keycode)); ++ fprintf(stderr, " (capability \"%s\")", data->name); ++ } else { ++ fprintf(stderr, " capability \"%s\"", data->name); ++ } ++} ++ + /* other sanity-checks (things that we don't want in the normal + * logic that reads a terminfo entry) + */ +@@ -1547,7 +1870,6 @@ + { + bool conflict = FALSE; + unsigned j, k; +- char fkeys[STRCOUNT]; + + /* + * A terminal entry may contain more than one keycode assigned to +@@ -1555,44 +1877,47 @@ + * return one (the last one assigned). + */ + if (!(_nc_syntax == SYN_TERMCAP && capdump)) { +- memset(fkeys, 0, sizeof(fkeys)); +- for (j = 0; _nc_tinfo_fkeys[j].code; j++) { +- char *a = tp->Strings[_nc_tinfo_fkeys[j].offset]; ++ char *check = calloc((size_t) (NUM_STRINGS(tp) + 1), sizeof(char)); ++ NAME_VALUE *given = get_fkey_list(tp); ++ ++ for (j = 0; given[j].keycode; ++j) { ++ const char *a = given[j].value; + bool first = TRUE; +- if (!VALID_STRING(a)) +- continue; +- for (k = j + 1; _nc_tinfo_fkeys[k].code; k++) { +- char *b = tp->Strings[_nc_tinfo_fkeys[k].offset]; +- if (!VALID_STRING(b) +- || fkeys[k]) ++ ++ for (k = j + 1; given[k].keycode; k++) { ++ const char *b = given[k].value; ++ if (check[k]) + continue; + if (!_nc_capcmp(a, b)) { +- fkeys[j] = 1; +- fkeys[k] = 1; ++ check[j] = 1; ++ check[k] = 1; + if (first) { + if (!conflict) { + _nc_warning("Conflicting key definitions (using the last)"); + conflict = TRUE; + } +- fprintf(stderr, "... %s is the same as %s", +- keyname((int) _nc_tinfo_fkeys[j].code), +- keyname((int) _nc_tinfo_fkeys[k].code)); ++ fprintf(stderr, "..."); ++ show_fkey_name(given + j); ++ fprintf(stderr, " is the same as"); ++ show_fkey_name(given + k); + first = FALSE; + } else { +- fprintf(stderr, ", %s", +- keyname((int) _nc_tinfo_fkeys[k].code)); ++ fprintf(stderr, ", "); ++ show_fkey_name(given + k); + } + } + } + if (!first) + fprintf(stderr, "\n"); + } ++ free(given); ++ free(check); + } + +- for (j = 0; j < NUM_STRINGS(tp); j++) { ++ for_each_string(j, tp) { + char *a = tp->Strings[j]; + if (VALID_STRING(a)) +- check_params(tp, ExtStrname(tp, j, strnames), a); ++ check_params(tp, ExtStrname(tp, (int) j, strnames), a); + } + + check_acs(tp); +@@ -1600,6 +1925,7 @@ + check_cursor(tp); + check_keypad(tp); + check_printer(tp); ++ check_screen(tp); + + /* + * These may be mismatched because the terminal description relies on +diff -Naur ncurses-5.9.orig/progs/toe.c ncurses-5.9/progs/toe.c +--- ncurses-5.9.orig/progs/toe.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/toe.c 2012-08-25 19:58:02.026555193 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -44,12 +44,23 @@ + #include <hashed_db.h> + #endif + +-MODULE_ID("$Id: toe.c,v 1.52 2010/05/01 22:04:08 tom Exp $") ++MODULE_ID("$Id: toe.c,v 1.68 2012/07/21 22:55:59 tom Exp $") + + #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) + ++typedef struct { ++ int db_index; ++ unsigned long checksum; ++ char *term_name; ++ char *description; ++} TERMDATA; ++ + const char *_nc_progname; + ++static TERMDATA *ptr_termdata; /* array of terminal data */ ++static size_t use_termdata; /* actual usage in ptr_termdata[] */ ++static size_t len_termdata; /* allocated size of ptr_termdata[] */ ++ + #if NO_LEAKS + #undef ExitProgram + static void ExitProgram(int code) GCC_NORETURN; +@@ -61,6 +72,8 @@ + } + #endif + ++static void failed(const char *) GCC_NORETURN; ++ + static void + failed(const char *msg) + { +@@ -68,6 +81,148 @@ + ExitProgram(EXIT_FAILURE); + } + ++static char * ++strmalloc(const char *value) ++{ ++ char *result = strdup(value); ++ if (result == 0) { ++ failed("strmalloc"); ++ } ++ return result; ++} ++ ++static TERMDATA * ++new_termdata(void) ++{ ++ size_t want = use_termdata + 1; ++ ++ if (want >= len_termdata) { ++ len_termdata = (2 * want) + 10; ++ ptr_termdata = typeRealloc(TERMDATA, len_termdata, ptr_termdata); ++ } ++ ++ return ptr_termdata + use_termdata++; ++} ++ ++static int ++compare_termdata(const void *a, const void *b) ++{ ++ const TERMDATA *p = (const TERMDATA *) a; ++ const TERMDATA *q = (const TERMDATA *) b; ++ int result = strcmp(p->term_name, q->term_name); ++ ++ if (result == 0) { ++ result = (p->db_index - q->db_index); ++ } ++ return result; ++} ++ ++/* ++ * Sort the array of TERMDATA and print it. If more than one database is being ++ * reported, add a column to show which database has a given entry. ++ */ ++static void ++show_termdata(int eargc, char **eargv) ++{ ++ int j, k; ++ size_t n; ++ ++ if (use_termdata) { ++ if (eargc > 1) { ++ for (j = 0; j < eargc; ++j) { ++ for (k = 0; k <= j; ++k) { ++ printf("--"); ++ } ++ printf("> "); ++ printf("%s\n", eargv[j]); ++ } ++ } ++ if (use_termdata > 1) ++ qsort(ptr_termdata, use_termdata, sizeof(TERMDATA), compare_termdata); ++ for (n = 0; n < use_termdata; ++n) { ++ ++ /* ++ * If there is more than one database, show how they differ. ++ */ ++ if (eargc > 1) { ++ unsigned long check = 0; ++ k = 0; ++ for (;;) { ++ for (; k < ptr_termdata[n].db_index; ++k) { ++ printf("--"); ++ } ++ ++ /* ++ * If this is the first entry, or its checksum differs ++ * from the first entry's checksum, print "*". Otherwise ++ * it looks enough like a duplicate to print "+". ++ */ ++ printf("%c-", ((check == 0 ++ || (check != ptr_termdata[n].checksum)) ++ ? '*' ++ : '+')); ++ check = ptr_termdata[n].checksum; ++ ++ ++k; ++ if ((n + 1) >= use_termdata ++ || strcmp(ptr_termdata[n].term_name, ++ ptr_termdata[n + 1].term_name)) { ++ break; ++ } ++ ++n; ++ } ++ for (; k < eargc; ++k) { ++ printf("--"); ++ } ++ printf(":\t"); ++ } ++ ++ (void) printf("%-10s\t%s\n", ++ ptr_termdata[n].term_name, ++ ptr_termdata[n].description); ++ } ++ } ++} ++ ++static void ++free_termdata(void) ++{ ++ if (ptr_termdata != 0) { ++ while (use_termdata != 0) { ++ --use_termdata; ++ free(ptr_termdata[use_termdata].term_name); ++ free(ptr_termdata[use_termdata].description); ++ } ++ free(ptr_termdata); ++ ptr_termdata = 0; ++ } ++ use_termdata = 0; ++ len_termdata = 0; ++} ++ ++static char ** ++allocArgv(size_t count) ++{ ++ char **result = typeCalloc(char *, count + 1); ++ if (result == 0) ++ failed("realloc eargv"); ++ ++ assert(result != 0); ++ return result; ++} ++ ++static void ++freeArgv(char **argv) ++{ ++ if (argv) { ++ int count = 0; ++ while (argv[count]) { ++ free(argv[count++]); ++ } ++ free(argv); ++ } ++} ++ + #if USE_HASHED_DB + static bool + make_db_name(char *dst, const char *src, unsigned limit) +@@ -81,61 +236,91 @@ + + if (need <= limit) { + if (size >= lens +- && !strcmp(src + size - lens, suffix)) +- (void) strcpy(dst, src); +- else +- (void) sprintf(dst, "%s%s", src, suffix); ++ && !strcmp(src + size - lens, suffix)) { ++ _nc_STRCPY(dst, src, PATH_MAX); ++ } else { ++ _nc_SPRINTF(dst, _nc_SLIMIT(PATH_MAX) "%s%s", src, suffix); ++ } + result = TRUE; + } + return result; + } + #endif + +-static bool +-is_database(const char *path) ++typedef void (DescHook) (int /* db_index */ , ++ int /* db_limit */ , ++ const char * /* term_name */ , ++ TERMTYPE * /* term */ ); ++ ++static const char * ++term_description(TERMTYPE *tp) + { +- bool result = FALSE; +-#if USE_DATABASE +- if (_nc_is_dir_path(path) && access(path, R_OK | X_OK) == 0) { +- result = TRUE; ++ const char *desc; ++ ++ if ((desc = strrchr(tp->term_names, '|')) == 0 || *++desc == '\0') ++ desc = "(No description)"; ++ ++ return desc; ++} ++ ++/* display a description for the type */ ++static void ++deschook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp) ++{ ++ (void) db_index; ++ (void) db_limit; ++ (void) printf("%-10s\t%s\n", term_name, term_description(tp)); ++} ++ ++static unsigned long ++string_sum(const char *value) ++{ ++ unsigned long result = 0; ++ ++ if ((intptr_t) value == (intptr_t) (-1)) { ++ result = ~result; ++ } else if (value) { ++ while (*value) { ++ result += UChar(*value); ++ ++value; ++ } + } +-#endif +-#if USE_TERMCAP +- if (_nc_is_file_path(path) && access(path, R_OK) == 0) { +- result = TRUE; ++ return result; ++} ++ ++static unsigned long ++checksum_of(TERMTYPE *tp) ++{ ++ unsigned long result = string_sum(tp->term_names); ++ unsigned i; ++ ++ for (i = 0; i < NUM_BOOLEANS(tp); i++) { ++ result += (unsigned long) (tp->Booleans[i]); + } +-#endif +-#if USE_HASHED_DB +- if (!result) { +- char filename[PATH_MAX]; +- if (_nc_is_file_path(path) && access(path, R_OK) == 0) { +- result = TRUE; +- } else if (make_db_name(filename, path, sizeof(filename))) { +- if (_nc_is_file_path(filename) && access(filename, R_OK) == 0) { +- result = TRUE; +- } +- } ++ for (i = 0; i < NUM_NUMBERS(tp); i++) { ++ result += (unsigned long) (tp->Numbers[i]); ++ } ++ for (i = 0; i < NUM_STRINGS(tp); i++) { ++ result += string_sum(tp->Strings[i]); + } +-#endif + return result; + } + ++/* collect data, to sort before display */ + static void +-deschook(const char *cn, TERMTYPE *tp) +-/* display a description for the type */ ++sorthook(int db_index, int db_limit, const char *term_name, TERMTYPE *tp) + { +- const char *desc; +- +- if ((desc = strrchr(tp->term_names, '|')) == 0 || *++desc == '\0') +- desc = "(No description)"; ++ TERMDATA *data = new_termdata(); + +- (void) printf("%-10s\t%s\n", cn, desc); ++ data->db_index = db_index; ++ data->checksum = ((db_limit > 1) ? checksum_of(tp) : 0); ++ data->term_name = strmalloc(term_name); ++ data->description = strmalloc(term_description(tp)); + } + + #if USE_TERMCAP + static void +-show_termcap(char *buffer, +- void (*hook) (const char *, TERMTYPE *tp)) ++show_termcap(int db_index, int db_limit, char *buffer, DescHook hook) + { + TERMTYPE data; + char *next = strchr(buffer, ':'); +@@ -149,20 +334,36 @@ + if (last) + ++last; + +- data.term_names = strdup(buffer); ++ memset(&data, 0, sizeof(data)); ++ data.term_names = strmalloc(buffer); + while ((next = strtok(list, "|")) != 0) { + if (next != last) +- hook(next, &data); ++ hook(db_index, db_limit, next, &data); + list = 0; + } + free(data.term_names); + } + #endif + ++#if USE_DATABASE ++static char * ++copy_entryname(DIRENT * src) ++{ ++ size_t len = NAMLEN(src); ++ char *result = malloc(len + 1); ++ if (result == 0) ++ failed("copy entryname"); ++ memcpy(result, src->d_name, len); ++ result[len] = '\0'; ++ ++ return result; ++} ++#endif ++ + static int + typelist(int eargc, char *eargv[], + bool verbosity, +- void (*hook) (const char *, TERMTYPE *tp)) ++ DescHook hook) + /* apply a function to each entry in given terminfo directories */ + { + int i; +@@ -179,28 +380,35 @@ + (void) fprintf(stderr, + "%s: can't open terminfo directory %s\n", + _nc_progname, eargv[i]); +- return (EXIT_FAILURE); +- } else if (verbosity) ++ continue; ++ } ++ ++ if (verbosity) + (void) printf("#\n#%s:\n#\n", eargv[i]); + + while ((subdir = readdir(termdir)) != 0) { +- size_t len = NAMLEN(subdir); +- size_t cwd_len = len + strlen(eargv[i]) + 3; +- char name_1[PATH_MAX]; ++ size_t cwd_len; ++ char *name_1; + DIR *entrydir; + DIRENT *entry; + ++ name_1 = copy_entryname(subdir); ++ if (isDotname(name_1)) { ++ free(name_1); ++ continue; ++ } ++ ++ cwd_len = NAMLEN(subdir) + strlen(eargv[i]) + 3; + cwd_buf = typeRealloc(char, cwd_len, cwd_buf); + if (cwd_buf == 0) + failed("realloc cwd_buf"); + + assert(cwd_buf != 0); + +- strncpy(name_1, subdir->d_name, len)[len] = '\0'; +- if (isDotname(name_1)) +- continue; ++ _nc_SPRINTF(cwd_buf, _nc_SLIMIT(cwd_len) ++ "%s/%s/", eargv[i], name_1); ++ free(name_1); + +- (void) sprintf(cwd_buf, "%s/%.*s/", eargv[i], (int) len, name_1); + if (chdir(cwd_buf) != 0) + continue; + +@@ -210,15 +418,16 @@ + continue; + } + while ((entry = readdir(entrydir)) != 0) { +- char name_2[PATH_MAX]; ++ char *name_2; + TERMTYPE lterm; + char *cn; + int status; + +- len = NAMLEN(entry); +- strncpy(name_2, entry->d_name, len)[len] = '\0'; +- if (isDotname(name_2) || !_nc_is_file_path(name_2)) ++ name_2 = copy_entryname(entry); ++ if (isDotname(name_2) || !_nc_is_file_path(name_2)) { ++ free(name_2); + continue; ++ } + + status = _nc_read_file_entry(name_2, <erm); + if (status <= 0) { +@@ -226,6 +435,7 @@ + (void) fprintf(stderr, + "%s: couldn't open terminfo file %s.\n", + _nc_progname, name_2); ++ free(name_2); + return (EXIT_FAILURE); + } + +@@ -233,21 +443,26 @@ + cn = _nc_first_name(lterm.term_names); + if (!strcmp(cn, name_2)) { + /* apply the selected hook function */ +- (*hook) (cn, <erm); ++ hook(i, eargc, cn, <erm); + } + _nc_free_termtype(<erm); ++ free(name_2); + } + closedir(entrydir); + } + closedir(termdir); + if (cwd_buf != 0) + free(cwd_buf); ++ continue; + } + #if USE_HASHED_DB + else { + DB *capdbp; + char filename[PATH_MAX]; + ++ if (verbosity) ++ (void) printf("#\n#%s:\n#\n", eargv[i]); ++ + if (make_db_name(filename, eargv[i], sizeof(filename))) { + if ((capdbp = _nc_db_open(filename, FALSE)) != 0) { + DBT key, data; +@@ -265,7 +480,7 @@ + /* only visit things once, by primary name */ + cn = _nc_first_name(lterm.term_names); + /* apply the selected hook function */ +- (*hook) (cn, <erm); ++ hook(i, eargc, cn, <erm); + _nc_free_termtype(<erm); + } + } +@@ -273,6 +488,7 @@ + } + + _nc_db_close(capdbp); ++ continue; + } + } + } +@@ -280,37 +496,43 @@ + #endif + #if USE_TERMCAP + #if HAVE_BSD_CGETENT +- char *db_array[2]; +- char *buffer = 0; ++ { ++ CGETENT_CONST char *db_array[2]; ++ char *buffer = 0; + +- if (verbosity) +- (void) printf("#\n#%s:\n#\n", eargv[i]); ++ if (verbosity) ++ (void) printf("#\n#%s:\n#\n", eargv[i]); + +- db_array[0] = eargv[i]; +- db_array[1] = 0; ++ db_array[0] = eargv[i]; ++ db_array[1] = 0; + +- if (cgetfirst(&buffer, db_array)) { +- show_termcap(buffer, hook); +- free(buffer); +- while (cgetnext(&buffer, db_array)) { +- show_termcap(buffer, hook); ++ if (cgetfirst(&buffer, db_array) > 0) { ++ show_termcap(i, eargc, buffer, hook); + free(buffer); ++ while (cgetnext(&buffer, db_array) > 0) { ++ show_termcap(i, eargc, buffer, hook); ++ free(buffer); ++ } ++ cgetclose(); ++ continue; + } + } +- cgetclose(); + #else + /* scan termcap text-file only */ + if (_nc_is_file_path(eargv[i])) { + char buffer[2048]; + FILE *fp; + ++ if (verbosity) ++ (void) printf("#\n#%s:\n#\n", eargv[i]); ++ + if ((fp = fopen(eargv[i], "r")) != 0) { + while (fgets(buffer, sizeof(buffer), fp) != 0) { + if (*buffer == '#') + continue; + if (isspace(*buffer)) + continue; +- show_termcap(buffer, hook); ++ show_termcap(i, eargc, buffer, hook); + } + fclose(fp); + } +@@ -319,13 +541,18 @@ + #endif + } + ++ if (hook == sorthook) { ++ show_termdata(eargc, eargv); ++ free_termdata(); ++ } ++ + return (EXIT_SUCCESS); + } + + static void + usage(void) + { +- (void) fprintf(stderr, "usage: %s [-ahuUV] [-v n] [file...]\n", _nc_progname); ++ (void) fprintf(stderr, "usage: %s [-ahsuUV] [-v n] [file...]\n", _nc_progname); + ExitProgram(EXIT_FAILURE); + } + +@@ -340,23 +567,24 @@ + unsigned i; + int code; + int this_opt, last_opt = '?'; +- int v_opt = 0; ++ unsigned v_opt = 0; ++ DescHook *hook = deschook; + + _nc_progname = _nc_rootname(argv[0]); + +- while ((this_opt = getopt(argc, argv, "0123456789ahu:vU:V")) != -1) { ++ while ((this_opt = getopt(argc, argv, "0123456789ahsu:vU:V")) != -1) { + /* handle optional parameter */ + if (isdigit(this_opt)) { + switch (last_opt) { + case 'v': +- v_opt = (this_opt - '0'); ++ v_opt = (unsigned) (this_opt - '0'); + break; + default: + if (isdigit(last_opt)) + v_opt *= 10; + else + v_opt = 0; +- v_opt += (this_opt - '0'); ++ v_opt += (unsigned) (this_opt - '0'); + last_opt = this_opt; + } + continue; +@@ -368,6 +596,9 @@ + case 'h': + header = TRUE; + break; ++ case 's': ++ hook = sorthook; ++ break; + case 'u': + direct_dependencies = TRUE; + report_file = optarg; +@@ -450,7 +681,7 @@ + * If we get this far, user wants a simple terminal type listing. + */ + if (optind < argc) { +- code = typelist(argc - optind, argv + optind, header, deschook); ++ code = typelist(argc - optind, argv + optind, header, hook); + } else if (all_dirs) { + DBDIRS state; + int offset; +@@ -460,64 +691,37 @@ + + code = EXIT_FAILURE; + for (pass = 0; pass < 2; ++pass) { +- unsigned count = 0; ++ size_t count = 0; + + _nc_first_db(&state, &offset); + while ((path = _nc_next_db(&state, &offset)) != 0) { +- if (!is_database(path)) { +- ; +- } else if (eargv != 0) { +- unsigned n; +- int found = FALSE; +- +- /* eliminate duplicates */ +- for (n = 0; n < count; ++n) { +- if (!strcmp(path, eargv[n])) { +- found = TRUE; +- break; +- } +- } +- if (!found) { +- eargv[count] = strdup(path); +- ++count; +- } +- } else { +- ++count; ++ if (pass) { ++ eargv[count] = strmalloc(path); + } ++ ++count; + } + if (!pass) { +- eargv = typeCalloc(char *, count + 1); +- if (eargv == 0) +- failed("realloc eargv"); +- +- assert(eargv != 0); ++ eargv = allocArgv(count); + } else { +- code = typelist((int) count, eargv, header, deschook); +- while (count-- > 0) +- free(eargv[count]); +- free(eargv); ++ code = typelist((int) count, eargv, header, hook); ++ freeArgv(eargv); + } + } + } else { + DBDIRS state; + int offset; + const char *path; +- char *eargv[3]; +- int count = 0; ++ char **eargv = allocArgv(2); ++ size_t count = 0; + + _nc_first_db(&state, &offset); +- while ((path = _nc_next_db(&state, &offset)) != 0) { +- if (is_database(path)) { +- eargv[count++] = strdup(path); +- break; +- } ++ if ((path = _nc_next_db(&state, &offset)) != 0) { ++ eargv[count++] = strmalloc(path); + } +- eargv[count] = 0; + +- code = typelist(count, eargv, header, deschook); ++ code = typelist((int) count, eargv, header, hook); + +- while (count-- > 0) +- free(eargv[count]); ++ freeArgv(eargv); + } + _nc_last_db(); + +diff -Naur ncurses-5.9.orig/progs/tput.c ncurses-5.9/progs/tput.c +--- ncurses-5.9.orig/progs/tput.c 2012-08-25 19:57:59.423234170 +0000 ++++ ncurses-5.9/progs/tput.c 2012-08-25 19:58:00.836560821 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -47,7 +47,7 @@ + #endif + #include <transform.h> + +-MODULE_ID("$Id: tput.c,v 1.46 2010/01/09 16:53:24 tom Exp $") ++MODULE_ID("$Id: tput.c,v 1.48 2012/02/18 21:51:17 tom Exp $") + + #define PUTS(s) fputs(s, stdout) + #define PUTCHAR(c) putchar(c) +@@ -94,9 +94,6 @@ + * Lookup the type of call we should make to tparm(). This ignores the actual + * terminfo capability (bad, because it is not extensible), but makes this + * code portable to platforms where sizeof(int) != sizeof(char *). +- * +- * FIXME: If we want extensibility, analyze the capability string as we do +- * in tparm() to decide how to parse the varargs list. + */ + static TParams + tparm_type(const char *name) +@@ -338,7 +335,7 @@ + case Numbers: + default: + (void) _nc_tparm_analyze(s, p_is_s, &popcount); +-#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n]) ++#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) + s = TPARM_9(s, + myParam(1), + myParam(2), +diff -Naur ncurses-5.9.orig/progs/transform.c ncurses-5.9/progs/transform.c +--- ncurses-5.9.orig/progs/transform.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/transform.c 2012-08-25 19:58:00.063231144 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,21 +34,21 @@ + + #include <transform.h> + +-MODULE_ID("$Id: transform.c,v 1.2 2010/09/04 21:16:17 tom Exp $") ++MODULE_ID("$Id: transform.c,v 1.3 2011/05/14 22:41:17 tom Exp $") + + #ifdef SUFFIX_IGNORED + static void +-trim_suffix(const char *a, unsigned *len) ++trim_suffix(const char *a, size_t *len) + { + const char ignore[] = SUFFIX_IGNORED; + + if (sizeof(ignore) != 0) { + bool trim = FALSE; +- unsigned need = (sizeof(ignore) - 1); ++ size_t need = (sizeof(ignore) - 1); + + if (*len > need) { +- unsigned first = *len - need; +- unsigned n; ++ size_t first = *len - need; ++ size_t n; + trim = TRUE; + for (n = first; n < *len; ++n) { + if (tolower(UChar(a[n])) != tolower(UChar(ignore[n - first]))) { +@@ -69,8 +69,8 @@ + bool + same_program(const char *a, const char *b) + { +- unsigned len_a = strlen(a); +- unsigned len_b = strlen(b); ++ size_t len_a = strlen(a); ++ size_t len_b = strlen(b); + + trim_suffix(a, &len_a); + trim_suffix(b, &len_b); +diff -Naur ncurses-5.9.orig/progs/tset.c ncurses-5.9/progs/tset.c +--- ncurses-5.9.orig/progs/tset.c 2012-08-25 19:57:59.419900852 +0000 ++++ ncurses-5.9/progs/tset.c 2012-08-25 19:58:00.929893713 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -119,7 +119,7 @@ + #include <dump_entry.h> + #include <transform.h> + +-MODULE_ID("$Id: tset.c,v 1.82 2010/05/01 21:42:46 tom Exp $") ++MODULE_ID("$Id: tset.c,v 1.89 2012/02/22 22:50:47 tom Exp $") + + /* + * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, +@@ -148,6 +148,10 @@ + #undef CTRL + #define CTRL(x) ((x) & 0x1f) + ++static void failed(const char *) GCC_NORETURN; ++static void exit_error(void) GCC_NORETURN; ++static void err(const char *,...) GCC_NORETURN; ++ + const char *_nc_progname = "tset"; + + static TTY mode, oldmode, original; +@@ -160,7 +164,10 @@ + static int terasechar = -1; /* new erase character */ + static int intrchar = -1; /* new interrupt character */ + static int tkillchar = -1; /* new kill character */ ++ ++#if HAVE_SIZECHANGE + static int tlines, tcolumns; /* window size */ ++#endif + + #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c)) + +@@ -203,13 +210,13 @@ + failed(const char *msg) + { + char temp[BUFSIZ]; +- unsigned len = strlen(_nc_progname) + 2; ++ size_t len = strlen(_nc_progname) + 2; + + if ((int) len < (int) sizeof(temp) - 12) { +- strcpy(temp, _nc_progname); +- strcat(temp, ": "); ++ _nc_STRCPY(temp, _nc_progname, sizeof(temp)); ++ _nc_STRCAT(temp, ": ", sizeof(temp)); + } else { +- strcpy(temp, "tset: "); ++ _nc_STRCPY(temp, "tset: ", sizeof(temp)); + } + perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2)); + exit_error(); +@@ -1043,11 +1050,18 @@ + { + if (set_tab && clear_all_tabs) { + int c; ++ int lim = ++#if HAVE_SIZECHANGE ++ tcolumns ++#else ++ columns ++#endif ++ ; + + (void) putc('\r', stderr); /* Force to left margin. */ + tputs(clear_all_tabs, 0, outc); + +- for (c = 8; c < tcolumns; c += 8) { ++ for (c = 8; c < lim; c += 8) { + /* Get to the right column. In BSD tset, this + * used to try a bunch of half-clever things + * with cup and hpa, for an average saving of +@@ -1273,10 +1287,10 @@ + (void) get_termcap_entry(*argv); + + if (!noset) { ++#if HAVE_SIZECHANGE + tcolumns = columns; + tlines = lines; + +-#if HAVE_SIZECHANGE + if (opt_w) { + STRUCT_WINSIZE win; + /* Set window size if not set already */ +diff -Naur ncurses-5.9.orig/test/Makefile.in ncurses-5.9/test/Makefile.in +--- ncurses-5.9.orig/test/Makefile.in 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/Makefile.in 2012-08-25 19:58:00.063231144 +0000 +@@ -1,6 +1,6 @@ +-# $Id: Makefile.in,v 1.108 2010/11/28 16:39:40 tom Exp $ ++# $Id: Makefile.in,v 1.109 2011/09/24 15:13:44 nix Exp $ + ############################################################################## +-# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. # ++# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # + # # + # Permission is hereby granted, free of charge, to any person obtaining a # + # copy of this software and associated documentation files (the "Software"), # +@@ -102,7 +102,7 @@ + LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) + LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@ + +-TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ ++TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ + + # use these for linking with all of the libraries + LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB) +@@ -117,8 +117,8 @@ + LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES) + + # use these for linking with the tinfo library if we have it, or curses library if not +-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB) +-LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) ++LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB) ++LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO) + + LINT = @LINT@ + LINT_OPTS = @LINT_OPTS@ +diff -Naur ncurses-5.9.orig/test/README ncurses-5.9/test/README +--- ncurses-5.9.orig/test/README 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/README 2012-08-25 19:58:00.399896218 +0000 +@@ -1,5 +1,5 @@ + ------------------------------------------------------------------------------- +--- Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -- ++-- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- + -- -- + -- Permission is hereby granted, free of charge, to any person obtaining a -- + -- copy of this software and associated documentation files (the -- +@@ -25,7 +25,7 @@ + -- sale, use or other dealings in this Software without prior written -- + -- authorization. -- + ------------------------------------------------------------------------------- +--- $Id: README,v 1.44 2011/02/26 00:09:25 tom Exp $ ++-- $Id: README,v 1.46 2012/01/21 23:55:22 tom Exp $ + ------------------------------------------------------------------------------- + + The programs in this directory are designed to test your newest toy :-) +@@ -234,7 +234,7 @@ + addnwstr test: ncurses test_addwstr + addstr test: blue bs cardfile gdc hanoi lrtest ncurses savescreen test_addstr + addwstr test: ncurses test_addwstr +-assume_default_colors test: ncurses ++assume_default_colors test: background ncurses + assume_default_colors_sp - + attr_get test: ncurses + attr_off test: ncurses +@@ -670,7 +670,7 @@ + ungetmouse - + ungetmouse_sp - + untouchwin lib: form +-use_default_colors test: filter firework gdc hanoi knight ncurses rain tclock worm xmas ++use_default_colors test: background filter firework gdc hanoi knight ncurses rain tclock worm xmas + use_default_colors_sp - + use_env progs: tput + use_env_sp - +diff -Naur ncurses-5.9.orig/test/aclocal.m4 ncurses-5.9/test/aclocal.m4 +--- ncurses-5.9.orig/test/aclocal.m4 2012-08-25 19:57:59.406567583 +0000 ++++ ncurses-5.9/test/aclocal.m4 2012-08-25 19:58:02.206554341 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 2003-2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 2003-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + dnl authorization. * + dnl*************************************************************************** + dnl +-dnl $Id: aclocal.m4,v 1.50 2011/03/24 08:28:07 tom Exp $ ++dnl $Id: aclocal.m4,v 1.78 2012/08/04 18:14:48 tom Exp $ + dnl + dnl Author: Thomas E. Dickey + dnl +@@ -40,6 +40,31 @@ + dnl + dnl --------------------------------------------------------------------------- + dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_CHECK version: 2 updated: 2011/05/08 11:22:03 ++dnl ------------------ ++dnl Conditionally generate script according to whether we're using a given autoconf. ++dnl ++dnl $1 = version to compare against ++dnl $2 = code to use if AC_ACVERSION is at least as high as $1. ++dnl $3 = code to use if AC_ACVERSION is older than $1. ++define(CF_ACVERSION_CHECK, ++[ ++ifdef([m4_version_compare], ++[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], ++[CF_ACVERSION_COMPARE( ++AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), ++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_ACVERSION_COMPARE version: 2 updated: 2011/04/14 20:56:50 ++dnl -------------------- ++dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, ++dnl MAJOR2, MINOR2, TERNARY2, ++dnl PRINTABLE2, not FOUND, FOUND) ++define(CF_ACVERSION_COMPARE, ++[ifelse(builtin([eval], [$2 < $5]), 1, ++[ifelse([$8], , ,[$8])], ++[ifelse([$9], , ,[$9])])])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 + dnl ------------- + dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS +@@ -272,12 +297,33 @@ + } + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 ++dnl CF_ANSI_CC_CHECK version: 11 updated: 2011/07/01 19:47:45 + dnl ---------------- +-dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' +-dnl in the sharutils 4.2 distribution. ++dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and ++dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. + AC_DEFUN([CF_ANSI_CC_CHECK], + [ ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++AC_MSG_CHECKING(\$CC variable) ++case "$CC" in #(vi ++*[[\ \ ]]-[[IUD]]*) ++ AC_MSG_RESULT(broken) ++ AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` ++ CC=`echo "$CC" | sed -e 's/[[ ]].*//'` ++ CF_ADD_CFLAGS($cf_flags) ++ ;; ++*) ++ AC_MSG_RESULT(ok) ++ ;; ++esac ++ + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ + cf_cv_ansi_cc=no + cf_save_CFLAGS="$CFLAGS" +@@ -434,6 +480,39 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 ++dnl ----------------- ++dnl Check if the given compiler is really clang. clang's C driver defines ++dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does ++dnl not ignore some gcc options. ++dnl ++dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to ++dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from ++dnl the wrappers for gcc and g++ warnings. ++dnl ++dnl $1 = GCC (default) or GXX ++dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS ++dnl $3 = CFLAGS (default) or CXXFLAGS ++AC_DEFUN([CF_CLANG_COMPILER],[ ++ifelse([$2],,CLANG_COMPILER,[$2])=no ++ ++if test "$ifelse([$1],,[$1],GCC)" = yes ; then ++ AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) ++ cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ++ ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" ++ AC_TRY_COMPILE([],[ ++#ifdef __clang__ ++#else ++make an error ++#endif ++],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ++],[]) ++ ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" ++ AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_CURSES_ACS_MAP version: 6 updated: 2010/10/23 15:54:49 + dnl ----------------- + dnl Check for likely values of acs_map[]: +@@ -533,7 +612,7 @@ + CF_CURSES_LIBS + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11 ++dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08 + dnl ------------------ + dnl Look for the curses headers. + AC_DEFUN([CF_CURSES_CPPFLAGS],[ +@@ -542,13 +621,19 @@ + cf_cv_curses_incdir=no + case $host_os in #(vi + hpux10.*) #(vi +- test -d /usr/include/curses_colr && \ +- cf_cv_curses_incdir="-I/usr/include/curses_colr" ++ if test "x$cf_cv_screen" = "xcurses_colr" ++ then ++ test -d /usr/include/curses_colr && \ ++ cf_cv_curses_incdir="-I/usr/include/curses_colr" ++ fi + ;; + sunos3*|sunos4*) +- test -d /usr/5lib && \ +- test -d /usr/5include && \ +- cf_cv_curses_incdir="-I/usr/5include" ++ if test "x$cf_cv_screen" = "xcurses_5lib" ++ then ++ test -d /usr/5lib && \ ++ test -d /usr/5include && \ ++ cf_cv_curses_incdir="-I/usr/5include" ++ fi + ;; + esac + ]) +@@ -558,7 +643,7 @@ + CF_TERM_HEADER + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32 ++dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29 + dnl --------------- + dnl Curses-functions are a little complicated, since a lot of them are macros. + AC_DEFUN([CF_CURSES_FUNCS], +@@ -566,6 +651,7 @@ + AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl + AC_REQUIRE([CF_XOPEN_CURSES]) + AC_REQUIRE([CF_CURSES_TERM_H]) ++AC_REQUIRE([CF_CURSES_UNCTRL_H]) + for cf_func in $1 + do + CF_UPPER(cf_tr_func,$cf_func) +@@ -578,7 +664,8 @@ + [ + #ifndef ${cf_func} + long foo = (long)(&${cf_func}); +-${cf_cv_main_return:-return}(foo == 0); ++if (foo + 1234 > 5678) ++ ${cf_cv_main_return:-return}(foo); + #endif + ], + [cf_result=yes], +@@ -595,7 +682,7 @@ + done + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 ++dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 + dnl ---------------- + dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common + dnl variations of ncurses' installs. +@@ -605,10 +692,10 @@ + AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ + cf_cv_ncurses_header=none + for cf_header in ifelse($1,,,[ \ +- $1/curses.h \ +- $1/ncurses.h]) \ +- curses.h \ +- ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h]) ++ $1/ncurses.h \ ++ $1/curses.h]) \ ++ ncurses.h \ ++ curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) + do + AC_TRY_COMPILE([#include <${cf_header}>], + [initscr(); tgoto("?", 0,0)], +@@ -624,7 +711,7 @@ + AC_CHECK_HEADERS($cf_cv_ncurses_header) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_LIBS version: 33 updated: 2011/03/06 12:37:18 ++dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48 + dnl -------------- + dnl Look for the curses libraries. Older curses implementations may require + dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. +@@ -644,16 +731,23 @@ + AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) + ;; + hpux10.*) #(vi +- AC_CHECK_LIB(cur_colr,initscr,[ +- CF_ADD_LIBS(-lcur_colr) +- ac_cv_func_initscr=yes +- ],[ +- AC_CHECK_LIB(Hcurses,initscr,[ +- # HP's header uses __HP_CURSES, but user claims _HP_CURSES. +- CF_ADD_LIBS(-lHcurses) +- CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" +- ac_cv_func_initscr=yes +- ])]) ++ # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr ++ # next (1998), and xcurses "newer" (2000). There is no header file for ++ # Hcurses; the subdirectory curses_colr has the headers (curses.h and ++ # term.h) for cur_colr ++ if test "x$cf_cv_screen" = "xcurses_colr" ++ then ++ AC_CHECK_LIB(cur_colr,initscr,[ ++ CF_ADD_LIBS(-lcur_colr) ++ ac_cv_func_initscr=yes ++ ],[ ++ AC_CHECK_LIB(Hcurses,initscr,[ ++ # HP's header uses __HP_CURSES, but user claims _HP_CURSES. ++ CF_ADD_LIBS(-lHcurses) ++ CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" ++ ac_cv_func_initscr=yes ++ ])]) ++ fi + ;; + linux*) + case `arch 2>/dev/null` in +@@ -671,9 +765,12 @@ + esac + ;; + sunos3*|sunos4*) +- if test -d /usr/5lib ; then +- CF_ADD_LIBDIR(/usr/5lib) +- CF_ADD_LIBS(-lcurses -ltermcap) ++ if test "x$cf_cv_screen" = "xcurses_5lib" ++ then ++ if test -d /usr/5lib ; then ++ CF_ADD_LIBDIR(/usr/5lib) ++ CF_ADD_LIBS(-lcurses -ltermcap) ++ fi + fi + ac_cv_func_initscr=yes + ;; +@@ -694,7 +791,7 @@ + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ +- for cf_term_lib in $cf_check_list termcap termlib unknown ++ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) + done +@@ -738,7 +835,7 @@ + + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49 ++dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55 + dnl ---------------- + dnl SVr4 curses should have term.h as well (where it puts the definitions of + dnl the low-level interface). This may not be true in old/broken implementations, +@@ -752,9 +849,17 @@ + + # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look + # for <term.h> if we do not find the variant. +-for cf_header in \ +- `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \ +- term.h ++ ++cf_header_list="term.h ncurses/term.h ncursesw/term.h" ++ ++case ${cf_cv_ncurses_header:-curses.h} in #(vi ++*/*) ++ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h ++ cf_header_list="$cf_header_item $cf_header_list" ++ ;; ++esac ++ ++for cf_header in $cf_header_list + do + AC_TRY_COMPILE([ + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -800,6 +905,61 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55 ++dnl ------------------ ++dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages ++dnl may put it in a subdirectory (along with ncurses' other headers, of ++dnl course). Packages which put the headers in inconsistent locations are ++dnl broken). ++AC_DEFUN([CF_CURSES_UNCTRL_H], ++[ ++AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl ++ ++AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[ ++ ++# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look ++# for <unctrl.h> if we do not find the variant. ++ ++cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h" ++ ++case ${cf_cv_ncurses_header:-curses.h} in #(vi ++*/*) ++ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h ++ cf_header_list="$cf_header_item $cf_header_list" ++ ;; ++esac ++ ++for cf_header in $cf_header_list ++do ++ AC_TRY_COMPILE([ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <${cf_header}>], ++ [WINDOW *x], ++ [cf_cv_unctrl_header=$cf_header ++ break], ++ [cf_cv_unctrl_header=no]) ++done ++ ++case $cf_cv_unctrl_header in #(vi ++no) ++ AC_MSG_WARN(unctrl.h header not found) ++ ;; ++esac ++]) ++ ++case $cf_cv_unctrl_header in #(vi ++unctrl.h) #(vi ++ AC_DEFINE(HAVE_UNCTRL_H) ++ ;; ++ncurses/unctrl.h) #(vi ++ AC_DEFINE(HAVE_NCURSES_UNCTRL_H) ++ ;; ++ncursesw/unctrl.h) ++ AC_DEFINE(HAVE_NCURSESW_UNCTRL_H) ++ ;; ++esac ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59 + dnl ------------------ + dnl Check for likely values of wacs_map[]. +@@ -922,6 +1082,25 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33 ++dnl --------------------- ++dnl The rpath-hack makes it simpler to build programs, particularly with the ++dnl *BSD ports which may have essential libraries in unusual places. But it ++dnl can interfere with building an executable for the base system. Use this ++dnl option in that case. ++AC_DEFUN([CF_DISABLE_RPATH_HACK], ++[ ++AC_MSG_CHECKING(if rpath-hack should be disabled) ++CF_ARG_DISABLE(rpath-hack, ++ [ --disable-rpath-hack don't add rpath options for additional libraries], ++ [cf_disable_rpath_hack=yes], ++ [cf_disable_rpath_hack=no]) ++AC_MSG_RESULT($cf_disable_rpath_hack) ++if test "$cf_disable_rpath_hack" = no ; then ++ CF_RPATH_HACK ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_ENABLE_WARNINGS version: 4 updated: 2009/07/26 17:53:03 + dnl ------------------ + dnl Configure-option to enable gcc warnings +@@ -1268,7 +1447,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 ++dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39 + dnl --------------- + dnl Check if the compiler supports useful warning options. There's a few that + dnl we don't use, simply because they're too noisy: +@@ -1291,6 +1470,7 @@ + [ + AC_REQUIRE([CF_GCC_VERSION]) + CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) ++CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) + + cat > conftest.$ac_ext <<EOF + #line __oline__ "${as_me:-configure}" +@@ -1366,6 +1546,13 @@ + continue;; + esac + ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [[12]].*) ++ CF_VERBOSE(feature is broken in gcc $GCC_VERSION) ++ continue;; ++ esac ++ ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -1377,6 +1564,29 @@ + AC_SUBST(EXTRA_CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_GETOPT_HEADER version: 4 updated: 2009/08/31 20:07:52 ++dnl ---------------- ++dnl Check for getopt's variables which are commonly defined in stdlib.h, ++dnl unistd.h or (nonstandard) in getopt.h ++AC_DEFUN([CF_GETOPT_HEADER], ++[ ++AC_HAVE_HEADERS(unistd.h getopt.h) ++AC_CACHE_CHECK(for header declaring getopt variables,cf_cv_getopt_header,[ ++cf_cv_getopt_header=none ++for cf_header in stdio.h stdlib.h unistd.h getopt.h ++do ++AC_TRY_COMPILE([ ++#include <$cf_header>], ++[int x = optind; char *y = optarg], ++[cf_cv_getopt_header=$cf_header ++ break]) ++done ++]) ++if test $cf_cv_getopt_header != none ; then ++ AC_DEFINE(HAVE_GETOPT_HEADER) ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07 + dnl ------------- + dnl Check if we must define _GNU_SOURCE to get a reasonable value for +@@ -1498,6 +1708,60 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41 ++dnl --------------- ++dnl For the given system and compiler, find the compiler flags to pass to the ++dnl loader to use the "rpath" feature. ++AC_DEFUN([CF_LD_RPATH_OPT], ++[ ++AC_REQUIRE([CF_CHECK_CACHE]) ++ ++LD_RPATH_OPT= ++AC_MSG_CHECKING(for an rpath option) ++case $cf_cv_system_name in #(vi ++irix*) #(vi ++ if test "$GCC" = yes; then ++ LD_RPATH_OPT="-Wl,-rpath," ++ else ++ LD_RPATH_OPT="-rpath " ++ fi ++ ;; ++linux*|gnu*|k*bsd*-gnu) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++openbsd[[2-9]].*|mirbsd*) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++dragonfly*|freebsd*) #(vi ++ LD_RPATH_OPT="-rpath " ++ ;; ++netbsd*) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++osf*|mls+*) #(vi ++ LD_RPATH_OPT="-rpath " ++ ;; ++solaris2*) #(vi ++ LD_RPATH_OPT="-R" ++ ;; ++*) ++ ;; ++esac ++AC_MSG_RESULT($LD_RPATH_OPT) ++ ++case "x$LD_RPATH_OPT" in #(vi ++x-R*) ++ AC_MSG_CHECKING(if we need a space after rpath option) ++ cf_save_LIBS="$LIBS" ++ CF_ADD_LIBS(${LD_RPATH_OPT}$libdir) ++ AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes) ++ LIBS="$cf_save_LIBS" ++ AC_MSG_RESULT($cf_rpath_space) ++ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ++ ;; ++esac ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50 + dnl --------------- + dnl Construct a search-list of directories for a nonstandard library-file +@@ -1690,7 +1954,7 @@ + ,[$1=no]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 ++dnl CF_NCURSES_CONFIG version: 9 updated: 2011/11/26 15:42:05 + dnl ----------------- + dnl Tie together the configure-script macros for ncurses. + dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. +@@ -1702,7 +1966,10 @@ + cf_ncuconfig_root=ifelse($1,,ncurses,$1) + + echo "Looking for ${cf_ncuconfig_root}-config" +-AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) ++ ++CF_ACVERSION_CHECK(2.52, ++ [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], ++ [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + + if test "$NCURSES_CONFIG" != none ; then + +@@ -2096,7 +2363,7 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 ++dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 + dnl -------------- + dnl Check the argument to see that it looks like a pathname. Rewrite it if it + dnl begins with one of the prefix/exec_prefix variables, and then again if the +@@ -2116,7 +2383,7 @@ + ;; + .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX + ;; +-.\[$]{*prefix}*) #(vi ++.\[$]{*prefix}*|.\[$]{*dir}*) #(vi + eval $1="[$]$1" + case ".[$]$1" in #(vi + .NONE/*) +@@ -2133,13 +2400,15 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PDCURSES_X11 version: 11 updated: 2011/01/15 18:45:38 ++dnl CF_PDCURSES_X11 version: 12 updated: 2011/11/26 15:42:05 + dnl --------------- + dnl Configure for PDCurses' X11 library + AC_DEFUN([CF_PDCURSES_X11],[ + AC_REQUIRE([CF_X_ATHENA]) + +-AC_PATH_PROGS(XCURSES_CONFIG,xcurses-config,none) ++CF_ACVERSION_CHECK(2.52, ++ [AC_CHECK_TOOLS(XCURSES_CONFIG, xcurses-config, none)], ++ [AC_PATH_PROGS(XCURSES_CONFIG, xcurses-config, none)]) + + if test "$XCURSES_CONFIG" != none ; then + +@@ -2176,7 +2445,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24 ++dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 + dnl ------------- + dnl Check for the package-config program, unless disabled by command-line. + AC_DEFUN([CF_PKG_CONFIG], +@@ -2193,7 +2462,9 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) ++ CF_ACVERSION_CHECK(2.52, ++ [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], ++ [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; + *) + PKG_CONFIG=$withval +@@ -2373,6 +2644,121 @@ + -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33 ++dnl ------------- ++AC_DEFUN([CF_RPATH_HACK], ++[ ++AC_REQUIRE([CF_LD_RPATH_OPT]) ++AC_MSG_CHECKING(for updated LDFLAGS) ++if test -n "$LD_RPATH_OPT" ; then ++ AC_MSG_RESULT(maybe) ++ ++ AC_CHECK_PROGS(cf_ldd_prog,ldd,no) ++ cf_rpath_list="/usr/lib /lib" ++ if test "$cf_ldd_prog" != no ++ then ++ cf_rpath_oops= ++ ++AC_TRY_LINK([#include <stdio.h>], ++ [printf("Hello");], ++ [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` ++ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`]) ++ ++ # If we passed the link-test, but get a "not found" on a given library, ++ # this could be due to inept reconfiguration of gcc to make it only ++ # partly honor /usr/local/lib (or whatever). Sometimes this behavior ++ # is intentional, e.g., installing gcc in /usr/bin and suppressing the ++ # /usr/local libraries. ++ if test -n "$cf_rpath_oops" ++ then ++ for cf_rpath_src in $cf_rpath_oops ++ do ++ for cf_rpath_dir in \ ++ /usr/local \ ++ /usr/pkg \ ++ /opt/sfw ++ do ++ if test -f $cf_rpath_dir/lib/$cf_rpath_src ++ then ++ CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src) ++ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" ++ break ++ fi ++ done ++ done ++ fi ++ fi ++ ++ CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS) ++ ++ CF_RPATH_HACK_2(LDFLAGS) ++ CF_RPATH_HACK_2(LIBS) ++ ++ CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS) ++fi ++AC_SUBST(EXTRA_LDFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_RPATH_HACK_2 version: 6 updated: 2010/04/17 16:31:24 ++dnl --------------- ++dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to ++dnl EXTRA_LDFLAGS for each -L option found. ++dnl ++dnl $cf_rpath_list contains a list of directories to ignore. ++dnl ++dnl $1 = variable name to update. The LDFLAGS variable should be the only one, ++dnl but LIBS often has misplaced -L options. ++AC_DEFUN([CF_RPATH_HACK_2], ++[ ++CF_VERBOSE(...checking $1 [$]$1) ++ ++cf_rpath_dst= ++for cf_rpath_src in [$]$1 ++do ++ case $cf_rpath_src in #(vi ++ -L*) #(vi ++ ++ # check if this refers to a directory which we will ignore ++ cf_rpath_skip=no ++ if test -n "$cf_rpath_list" ++ then ++ for cf_rpath_item in $cf_rpath_list ++ do ++ if test "x$cf_rpath_src" = "x-L$cf_rpath_item" ++ then ++ cf_rpath_skip=yes ++ break ++ fi ++ done ++ fi ++ ++ if test "$cf_rpath_skip" = no ++ then ++ # transform the option ++ if test "$LD_RPATH_OPT" = "-R " ; then ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"` ++ else ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"` ++ fi ++ ++ # if we have not already added this, add it now ++ cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"` ++ if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS" ++ then ++ CF_VERBOSE(...Filter $cf_rpath_src ->$cf_rpath_tmp) ++ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" ++ fi ++ fi ++ ;; ++ esac ++ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src" ++done ++$1=$cf_rpath_dst ++ ++CF_VERBOSE(...checked $1 [$]$1) ++AC_SUBST(EXTRA_LDFLAGS) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12 + dnl --------------- + dnl signal handler, but there are some gcc depedencies in that recommendation. +@@ -2495,6 +2881,59 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23 ++dnl --------------- ++dnl Define a top_builddir symbol, for applications that need an absolute path. ++AC_DEFUN([CF_TOP_BUILDDIR], ++[ ++top_builddir=`pwd` ++AC_SUBST(top_builddir) ++])dnl ++dnl --------------------------------------------------------------------------- ++dnl CF_TPUTS_PROTO version: 2 updated: 2011/04/23 19:25:50 ++dnl -------------- ++dnl Check for type of function-pointer passed to tputs. Some old ++dnl implementations used functions that had different prototypes, making it ++dnl hard to compile portable programs using tputs. ++AC_DEFUN([CF_TPUTS_PROTO],[ ++CF_CURSES_FUNCS(tputs) ++if test x$cf_cv_func_tputs = xyes ++then ++ cf_done=no ++ for cf_arg in int char ++ do ++ for cf_ret in int void ++ do ++ if test $cf_ret = void ++ then ++ cf_return="/* nothing */" ++ else ++ cf_return="return value" ++ fi ++ AC_TRY_COMPILE([ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <$cf_cv_term_header> ++ ++static $cf_ret outc($cf_arg value) { $cf_return; } ++],[ ++ tputs("hello", 0, outc); ++ ${cf_cv_main_return:-return}(0); ++],[ ++ CF_VERBOSE([prototype $cf_ret func($cf_arg value)]) ++ cat >>confdefs.h <<EOF ++#define TPUTS_ARG $cf_arg ++#define TPUTS_PROTO(func,value) $cf_ret func(TPUTS_ARG value) ++#define TPUTS_RETURN(value) $cf_return ++EOF ++ cf_done=yes ++ break ++]) ++ done ++ test $cf_done = yes && break ++ done ++fi ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30 + dnl ----------------- + dnl This is a simple wrapper to use for pkg-config, for libraries which may be +@@ -2520,6 +2959,45 @@ + fi + ]) + dnl --------------------------------------------------------------------------- ++dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 ++dnl ------------------- ++dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we ++dnl can define it successfully. ++AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ ++AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++],[ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_cv_xopen_source=no], ++ [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) ++ CPPFLAGS="$cf_save" ++ ]) ++]) ++ ++if test "$cf_cv_xopen_source" != no ; then ++ CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) ++ CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ CF_ADD_CFLAGS($cf_temp_xopen_source) ++fi ++]) ++dnl --------------------------------------------------------------------------- + dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59 + dnl -------- + dnl Make an uppercase version of a variable +@@ -2667,6 +3145,60 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- ++dnl CF_WITH_NCURSES_ETC version: 2 updated: 2012/01/13 10:49:00 ++dnl ------------------- ++dnl Use this macro for programs which use any variant of "curses", e.g., ++dnl "ncurses", and "PDCurses". Programs that can use curses and some unrelated ++dnl library (such as slang) should use a "--with-screen=XXX" option. ++dnl ++dnl This does not use AC_DEFUN, because that would tell autoconf to run each ++dnl of the macros inside this one - before this macro. ++define([CF_WITH_NCURSES_ETC],[ ++CF_WITH_CURSES_DIR ++ ++cf_cv_screen=curses ++ ++AC_MSG_CHECKING(for specified curses library type) ++AC_ARG_WITH(ncursesw, ++ [ --with-ncursesw use wide ncurses-libraries], ++ [cf_cv_screen=ncursesw],[ ++ ++AC_ARG_WITH(ncurses, ++ [ --with-ncurses use ncurses-libraries], ++ [cf_cv_screen=ncurses],[ ++ ++AC_ARG_WITH(pdcurses, ++ [ --with-pdcurses compile/link with pdcurses X11 library], ++ [cf_cv_screen=pdcurses],[ ++ ++AC_ARG_WITH(curses-colr, ++ [ --with-curses-colr compile/link with HPUX 10.x color-curses], ++ [cf_cv_screen=curses_colr],[ ++ ++AC_ARG_WITH(curses-5lib, ++ [ --with-curses-5lib compile/link with SunOS 5lib curses], ++ [cf_cv_screen=curses_5lib])])])])]) ++ ++AC_MSG_RESULT($cf_cv_screen) ++ ++case $cf_cv_screen in #(vi ++curses|curses_*) #(vi ++ CF_CURSES_CONFIG ++ ;; ++ncurses) #(vi ++ CF_NCURSES_CONFIG ++ ;; ++ncursesw) #(vi ++ CF_UTF8_LIB ++ CF_NCURSES_CONFIG(ncursesw) ++ ;; ++pdcurses) ++ CF_PDCURSES_X11 ++ ;; ++esac ++ ++])dnl ++dnl --------------------------------------------------------------------------- + dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 + dnl ---------------- + AC_DEFUN([CF_WITH_VALGRIND],[ +@@ -2714,7 +3246,7 @@ + test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 ++dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 + dnl --------------- + dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, + dnl or adapt to the vendor's definitions to get equivalent functionality, +@@ -2730,7 +3262,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[[456]]*) #(vi ++aix[[4-7]]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -2741,6 +3273,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -2758,15 +3291,23 @@ + ;; + irix[[56]].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + CF_GNU_SOURCE + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[[4-9]]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 + ;; + openbsd*) #(vi + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +@@ -2780,36 +3321,11 @@ + sco*) #(vi + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +-solaris2.1[[0-9]]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[[1-9]]) #(vi ++solaris2.*) #(vi + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifndef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- AC_TRY_COMPILE([#include <sys/types.h>],[ +-#ifdef _XOPEN_SOURCE +-make an error +-#endif], +- [cf_cv_xopen_source=no], +- [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) +- CPPFLAGS="$cf_save" +- ]) +-]) +- if test "$cf_cv_xopen_source" != no ; then +- CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) +- CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +- CF_ADD_CFLAGS($cf_temp_xopen_source) +- fi ++ CF_TRY_XOPEN_SOURCE + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + ;; + esac +@@ -2817,6 +3333,35 @@ + if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) + fi ++ ++dnl In anything but the default case, we may have system-specific setting ++dnl which is still not guaranteed to provide all of the entrypoints that ++dnl _XOPEN_SOURCE would yield. ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set=yes], ++ [cf_XOPEN_SOURCE_set=no]) ++ AC_MSG_RESULT($cf_XOPEN_SOURCE_set) ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ AC_TRY_COMPILE([#include <stdlib.h>],[ ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif], ++ [cf_XOPEN_SOURCE_set_ok=yes], ++ [cf_XOPEN_SOURCE_set_ok=no]) ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) ++ fi ++ else ++ CF_TRY_XOPEN_SOURCE ++ fi ++fi + ]) + dnl --------------------------------------------------------------------------- + dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02 +@@ -2957,7 +3502,7 @@ + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33 ++dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02 + dnl ---------------- + dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of + dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. +@@ -2973,19 +3518,24 @@ + /usr/local + do + for cf_lib in \ +- "-l$cf_x_athena_root -lXmu" \ +- "-l$cf_x_athena_root -lXpm -lXmu" \ +- "-l${cf_x_athena_root}_s -lXmu_s" ++ ${cf_x_athena_root} \ ++ ${cf_x_athena_root}7 \ ++ ${cf_x_athena_root}6 ++ do ++ for cf_libs in \ ++ "-l$cf_lib -lXmu" \ ++ "-l$cf_lib -lXpm -lXmu" \ ++ "-l${cf_lib}_s -lXmu_s" + do + if test -z "$cf_x_athena_lib" ; then + cf_save="$LIBS" + cf_test=XawSimpleMenuAddGlobalActions + if test $cf_path != default ; then +- CF_ADD_LIBS(-L$cf_path/lib $cf_lib) +- AC_MSG_CHECKING(for $cf_lib in $cf_path) ++ CF_ADD_LIBS(-L$cf_path/lib $cf_libs) ++ AC_MSG_CHECKING(for $cf_libs in $cf_path) + else +- CF_ADD_LIBS($cf_lib) +- AC_MSG_CHECKING(for $cf_test in $cf_lib) ++ CF_ADD_LIBS($cf_libs) ++ AC_MSG_CHECKING(for $cf_test in $cf_libs) + fi + AC_TRY_LINK([ + #include <X11/Intrinsic.h> +@@ -2996,12 +3546,14 @@ + [cf_result=no]) + AC_MSG_RESULT($cf_result) + if test "$cf_result" = yes ; then +- cf_x_athena_lib="$cf_lib" ++ cf_x_athena_lib="$cf_libs" + break + fi + LIBS="$cf_save" + fi +- done ++ done # cf_libs ++ test -n "$cf_x_athena_lib" && break ++ done # cf_lib + done + + if test -z "$cf_x_athena_lib" ; then +diff -Naur ncurses-5.9.orig/test/background.c ncurses-5.9/test/background.c +--- ncurses-5.9.orig/test/background.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/background.c 2012-08-25 19:58:01.743223199 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003,2006 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,15 +26,172 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: background.c,v 1.3 2006/06/03 16:43:08 tom Exp $ ++ * $Id: background.c,v 1.13 2012/06/09 20:30:33 tom Exp $ + */ + +-#include <test.priv.h> ++#define NEED_COLOR_CODE 1 ++#define NEED_COLOR_NAME 1 ++#include <color_name.h> ++ ++static int default_bg = COLOR_BLACK; ++static int default_fg = COLOR_WHITE; ++ ++static void ++test_background(void) ++{ ++ short f, b; ++ int row; ++ int chr; ++ ++ if (pair_content(0, &f, &b) == ERR) { ++ printw("pair 0 contains no data\n"); ++ } else { ++ printw("pair 0 contains (%d,%d)\n", f, b); ++ } ++ getch(); ++ ++ printw("Initializing pair 1 to red/%s\n", color_name(default_bg)); ++ init_pair(1, COLOR_RED, (short) default_bg); ++ bkgdset((chtype) (' ' | COLOR_PAIR(1))); ++ printw("RED/BLACK\n"); ++ getch(); ++ ++ printw("Initializing pair 2 to %s/blue\n", color_name(default_fg)); ++ init_pair(2, (short) default_fg, COLOR_BLUE); ++ bkgdset((chtype) (' ' | COLOR_PAIR(2))); ++ printw("This line should be %s/blue\n", color_name(default_fg)); ++ getch(); ++ ++ printw("Initializing pair 3 to %s/cyan (ACS_HLINE)\n", color_name(default_fg)); ++ init_pair(3, (short) default_fg, COLOR_CYAN); ++ printw("...and drawing a box which should be followed by lines\n"); ++ bkgdset(ACS_HLINE | COLOR_PAIR(3)); ++ /* ++ * Characters from vt100 line-drawing should be mapped to line-drawing, ++ * since A_ALTCHARSET is set in the background, and the character part ++ * of the background is replaced by the nonblank characters written. ++ * ++ * Characters not in the line-drawing range are usually sent as-is. ++ * ++ * With SVr4 curses it is possible to rely on this to mix uppercase text ++ * with the (lowercase) line-drawing characters. ncurses uses some of ++ * the uppercase characters for encoding thick- and double-lines. ++ */ ++ row = 7; ++ mvprintw(row++, 10, "l"); ++ for (chr = 0; chr < 32; ++chr) ++ addch(' '); ++ printw("x\n"); ++ chr = 32; ++ while (chr < 128) { ++ if ((chr % 32) == 0) ++ mvprintw(row++, 10, "x"); ++ addch((chtype) ((chr == 127) ? ' ' : chr)); ++ if ((++chr % 32) == 0) ++ printw("x\n"); ++ } ++ mvprintw(row++, 10, "m"); ++ for (chr = 0; chr < 32; ++chr) ++ addch(' '); ++ printw("j\n"); ++ getch(); ++ ++ bkgdset((chtype) (' ' | COLOR_PAIR(0))); ++ printw("Default Colors\n"); ++ getch(); ++ ++ printw("Resetting colors to pair 1\n"); ++ bkgdset((chtype) (' ' | COLOR_PAIR(1))); ++ printw("This line should be red/%s\n", color_name(default_bg)); ++ getch(); ++ ++ printw("Setting screen to pair 0\n"); ++ bkgd((chtype) (' ' | COLOR_PAIR(0))); ++ getch(); ++ ++ printw("Setting screen to pair 1\n"); ++ bkgd((chtype) (' ' | COLOR_PAIR(1))); ++ getch(); ++ ++ printw("Setting screen to pair 2\n"); ++ bkgd((chtype) (' ' | COLOR_PAIR(2))); ++ getch(); ++ ++ printw("Setting screen to pair 3\n"); ++ bkgd((chtype) (' ' | COLOR_PAIR(3))); ++ getch(); ++ ++ printw("Setting screen to pair 0\n"); ++ bkgd((chtype) (' ' | COLOR_PAIR(0))); ++ getch(); ++} ++ ++static void ++usage(void) ++{ ++ static const char *msg[] = ++ { ++ "Usage: background [options]" ++ ,"" ++ ,"Options:" ++#if HAVE_ASSUME_DEFAULT_COLORS ++ ," -a invoke assume_default_colors, repeat to use in init_pair" ++#endif ++ ," -b XXX specify background color" ++#if HAVE_USE_DEFAULT_COLORS ++ ," -d invoke use_default_colors, repeat to use in init_pair" ++#endif ++ ," -f XXX specify foreground color" ++ }; ++ size_t n; ++ ++ for (n = 0; n < SIZEOF(msg); n++) ++ fprintf(stderr, "%s\n", msg[n]); ++ ++ ExitProgram(EXIT_FAILURE); ++} + + int + main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) + { +- short f, b; ++#if HAVE_ASSUME_DEFAULT_COLORS ++ int a_option = 0; ++#endif ++#if HAVE_USE_DEFAULT_COLORS ++ int d_option = 0; ++#endif ++ int n; ++ ++ setlocale(LC_ALL, ""); ++ ++ while ((n = getopt(argc, argv, "ab:df:")) != -1) { ++ switch (n) { ++#if HAVE_ASSUME_DEFAULT_COLORS ++ case 'a': ++ ++a_option; ++ break; ++#endif ++ case 'b': ++ default_bg = color_code(optarg); ++ break; ++#if HAVE_USE_DEFAULT_COLORS ++ case 'd': ++ ++d_option; ++ break; ++#endif ++ case 'f': ++ default_fg = color_code(optarg); ++ break; ++ default: ++ usage(); ++ } ++ } ++#if HAVE_USE_DEFAULT_COLORS && HAVE_ASSUME_DEFAULT_COLORS ++ if (a_option && d_option) { ++ fprintf(stderr, "Use either -a or -d option, but not both\n"); ++ ExitProgram(EXIT_FAILURE); ++ } ++#endif + + initscr(); + cbreak(); +@@ -43,47 +200,30 @@ + if (has_colors()) { + start_color(); + +- pair_content(0, &f, &b); +- printw("pair 0 contains (%d,%d)\n", f, b); +- getch(); ++#if HAVE_USE_DEFAULT_COLORS ++ if (d_option) { ++ printw("Using default colors...\n"); ++ use_default_colors(); ++ if (d_option > 1) { ++ default_fg = -1; ++ default_bg = -1; ++ } ++ } ++#endif ++#if HAVE_ASSUME_DEFAULT_COLORS ++ if (a_option) { ++ printw("Using assumed colors %s/%s...\n", ++ color_name(default_fg), ++ color_name(default_bg)); ++ assume_default_colors(default_fg, default_bg); ++ if (a_option > 1) { ++ default_fg = -1; ++ default_bg = -1; ++ } ++ } ++#endif + +- printw("Initializing pair 1 to red/black\n"); +- init_pair(1, COLOR_RED, COLOR_BLACK); +- bkgdset(' ' | COLOR_PAIR(1)); +- printw("RED/BLACK\n"); +- getch(); +- +- printw("Initializing pair 2 to white/blue\n"); +- init_pair(2, COLOR_WHITE, COLOR_BLUE); +- bkgdset(' ' | COLOR_PAIR(2)); +- printw("WHITE/BLUE\n"); +- getch(); +- +- printw("Resetting colors to pair 0\n"); +- bkgdset(' ' | COLOR_PAIR(0)); +- printw("Default Colors\n"); +- getch(); +- +- printw("Resetting colors to pair 1\n"); +- bkgdset(' ' | COLOR_PAIR(1)); +- printw("RED/BLACK\n"); +- getch(); +- +- printw("Setting screen to pair 0\n"); +- bkgd(' ' | COLOR_PAIR(0)); +- getch(); +- +- printw("Setting screen to pair 1\n"); +- bkgd(' ' | COLOR_PAIR(1)); +- getch(); +- +- printw("Setting screen to pair 2\n"); +- bkgd(' ' | COLOR_PAIR(2)); +- getch(); +- +- printw("Setting screen to pair 0\n"); +- bkgd(' ' | COLOR_PAIR(0)); +- getch(); ++ test_background(); + + } else { + printw("This demo requires a color terminal"); +diff -Naur ncurses-5.9.orig/test/bs.c ncurses-5.9/test/bs.c +--- ncurses-5.9.orig/test/bs.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/bs.c 2012-08-25 19:58:01.743223199 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -34,7 +34,7 @@ + * v2.0 featuring strict ANSI/POSIX conformance, November 1993. + * v2.1 with ncurses mouse support, September 1995 + * +- * $Id: bs.c,v 1.52 2010/11/13 20:07:52 tom Exp $ ++ * $Id: bs.c,v 1.53 2012/06/09 20:30:32 tom Exp $ + */ + + #include <test.priv.h> +@@ -368,7 +368,7 @@ + MvAddCh(PYBASE + i, PXBASE - 3, (chtype) (i + 'A')); + #ifdef A_COLOR + if (has_colors()) +- attron(COLOR_PAIR(COLOR_BLUE)); ++ attron((attr_t) COLOR_PAIR(COLOR_BLUE)); + #endif /* A_COLOR */ + (void) addch(' '); + for (j = 0; j < BWIDTH; j++) +@@ -386,7 +386,7 @@ + MvAddCh(CYBASE + i, CXBASE - 3, (chtype) (i + 'A')); + #ifdef A_COLOR + if (has_colors()) +- attron(COLOR_PAIR(COLOR_BLUE)); ++ attron((attr_t) COLOR_PAIR(COLOR_BLUE)); + #endif /* A_COLOR */ + (void) addch(' '); + for (j = 0; j < BWIDTH; j++) +@@ -769,7 +769,7 @@ + cgoto(y1, x1); + #ifdef A_COLOR + if (has_colors()) +- attron(COLOR_PAIR(COLOR_GREEN)); ++ attron((attr_t) COLOR_PAIR(COLOR_GREEN)); + #endif /* A_COLOR */ + (void) addch(MARK_MISS); + #ifdef A_COLOR +@@ -795,7 +795,7 @@ + pgoto(y1, x1); + #ifdef A_COLOR + if (has_colors()) +- attron(COLOR_PAIR(COLOR_RED)); ++ attron((attr_t) COLOR_PAIR(COLOR_RED)); + #endif /* A_COLOR */ + (void) addch(SHOWHIT); + #ifdef A_COLOR +@@ -834,9 +834,9 @@ + #ifdef A_COLOR + if (has_colors()) { + if (hit) +- attron(COLOR_PAIR(COLOR_RED)); ++ attron((attr_t) COLOR_PAIR(COLOR_RED)); + else +- attron(COLOR_PAIR(COLOR_GREEN)); ++ attron((attr_t) COLOR_PAIR(COLOR_GREEN)); + } + #endif /* A_COLOR */ + (void) addch((chtype) hits[PLAYER][curx][cury]); +@@ -965,9 +965,9 @@ + #ifdef A_COLOR + if (has_colors()) { + if (hit) +- attron(COLOR_PAIR(COLOR_RED)); ++ attron((attr_t) COLOR_PAIR(COLOR_RED)); + else +- attron(COLOR_PAIR(COLOR_GREEN)); ++ attron((attr_t) COLOR_PAIR(COLOR_GREEN)); + } + #endif /* A_COLOR */ + (void) addch((chtype) (hit ? SHOWHIT : SHOWSPLASH)); +diff -Naur ncurses-5.9.orig/test/cardfile.c ncurses-5.9/test/cardfile.c +--- ncurses-5.9.orig/test/cardfile.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/cardfile.c 2012-08-25 19:58:01.746556517 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1999-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1999-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: cardfile.c,v 1.38 2010/11/14 00:58:45 tom Exp $ ++ * $Id: cardfile.c,v 1.39 2012/06/09 20:30:32 tom Exp $ + * + * File format: text beginning in column 1 is a title; other text is content. + */ +@@ -414,7 +414,7 @@ + if ((win = newwin(panel_high, panel_wide, y, x)) == 0) + break; + +- wbkgd(win, COLOR_PAIR(pair_2)); ++ wbkgd(win, (chtype) COLOR_PAIR(pair_2)); + keypad(win, TRUE); + p->panel = new_panel(win); + box(win, 0, 0); +@@ -588,7 +588,7 @@ + start_color(); + init_pair(pair_1, COLOR_WHITE, COLOR_BLUE); + init_pair(pair_2, COLOR_WHITE, COLOR_CYAN); +- bkgd(COLOR_PAIR(pair_1)); ++ bkgd((chtype) COLOR_PAIR(pair_1)); + } else { + try_color = FALSE; + } +diff -Naur ncurses-5.9.orig/test/clip_printw.c ncurses-5.9/test/clip_printw.c +--- ncurses-5.9.orig/test/clip_printw.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/clip_printw.c 2012-08-25 19:58:01.746556517 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: clip_printw.c,v 1.7 2010/11/13 20:48:48 tom Exp $ ++ * $Id: clip_printw.c,v 1.8 2012/06/09 20:30:32 tom Exp $ + * + * demonstrate how to use printw without wrapping. + */ +@@ -329,7 +329,7 @@ + do { + switch (st.ch) { + case '.': /* change from current position */ +- (void) wattrset(win, st.attr | (chtype) COLOR_PAIR(st.pair)); ++ (void) wattrset(win, (int) (st.attr | (chtype) COLOR_PAIR(st.pair))); + if (st.count > 0) { + need = (unsigned) st.count + 1; + sprintf(fmt, "%%c%%%ds%%c", st.count); +diff -Naur ncurses-5.9.orig/test/color_name.h ncurses-5.9/test/color_name.h +--- ncurses-5.9.orig/test/color_name.h 1970-01-01 00:00:00.000000000 +0000 ++++ ncurses-5.9/test/color_name.h 2012-08-25 19:58:00.066564462 +0000 +@@ -0,0 +1,103 @@ ++/**************************************************************************** ++ * Copyright (c) 2011 Free Software Foundation, Inc. * ++ * * ++ * 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, distribute with modifications, 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 ABOVE 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(s) of the above copyright * ++ * holders shall not be used in advertising or otherwise to promote the * ++ * sale, use or other dealings in this Software without prior written * ++ * authorization. * ++ ****************************************************************************/ ++/* ++ * $Id: color_name.h,v 1.3 2011/05/14 17:41:17 tom Exp $ ++ */ ++ ++#ifndef __COLORNAME_H ++#define __COLORNAME_H 1 ++ ++#ifndef __TEST_PRIV_H ++#include <test.priv.h> ++#endif ++ ++static NCURSES_CONST char *the_color_names[] = ++{ ++ "black", ++ "red", ++ "green", ++ "yellow", ++ "blue", ++ "magenta", ++ "cyan", ++ "white", ++ "BLACK", ++ "RED", ++ "GREEN", ++ "YELLOW", ++ "BLUE", ++ "MAGENTA", ++ "CYAN", ++ "WHITE" ++}; ++ ++#ifdef NEED_COLOR_CODE ++static int ++color_code(const char *color) ++{ ++ int result = 0; ++ char *endp = 0; ++ size_t n; ++ ++ if ((result = (int) strtol(color, &endp, 0)) >= 0 ++ && (endp == 0 || *endp == 0)) { ++ ; ++ } else if (!strcmp(color, "default")) { ++ result = -1; ++ } else { ++ for (n = 0; n < SIZEOF(the_color_names); ++n) { ++ if (!strcmp(the_color_names[n], color)) { ++ result = (int) n; ++ break; ++ } ++ } ++ } ++ return result; ++} ++#endif /* NEED_COLOR_NAME */ ++ ++#ifdef NEED_COLOR_NAME ++static const char * ++color_name(int color) ++{ ++ static char temp[20]; ++ const char *result = 0; ++ ++ if (color > (int) SIZEOF(the_color_names)) { ++ sprintf(temp, "%d", color); ++ result = temp; ++ } else if (color < 0) { ++ result = "default"; ++ } else { ++ result = the_color_names[color]; ++ } ++ return result; ++} ++#endif /* NEED_COLOR_NAME */ ++ ++#endif /* __COLORNAME_H */ +diff -Naur ncurses-5.9.orig/test/configure ncurses-5.9/test/configure +--- ncurses-5.9.orig/test/configure 2012-08-25 19:57:59.406567583 +0000 ++++ ncurses-5.9/test/configure 2012-08-25 19:58:02.406553397 +0000 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by Autoconf 2.52.20101002. ++# Generated by Autoconf 2.52.20120811. + # + # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 + # Free Software Foundation, Inc. +@@ -105,42 +105,6 @@ + : ${ac_max_here_lines=38} + + ac_unique_file="ncurses.c" +-# Factoring default headers for most tests. +-ac_includes_default="\ +-#include <stdio.h> +-#if HAVE_SYS_TYPES_H +-# include <sys/types.h> +-#endif +-#if HAVE_SYS_STAT_H +-# include <sys/stat.h> +-#endif +-#if STDC_HEADERS +-# include <stdlib.h> +-# include <stddef.h> +-#else +-# if HAVE_STDLIB_H +-# include <stdlib.h> +-# endif +-#endif +-#if HAVE_STRING_H +-# if !STDC_HEADERS && HAVE_MEMORY_H +-# include <memory.h> +-# endif +-# include <string.h> +-#endif +-#if HAVE_STRINGS_H +-# include <strings.h> +-#endif +-#if HAVE_INTTYPES_H +-# include <inttypes.h> +-#else +-# if HAVE_STDINT_H +-# include <stdint.h> +-# endif +-#endif +-#if HAVE_UNISTD_H +-# include <unistd.h> +-#endif" + + # Initialize some variables set by options. + ac_init_help= +@@ -170,15 +134,16 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datarootdir}/info' ++mandir='${datarootdir}/man' + + # Identity of this package. + PACKAGE_NAME= +@@ -229,6 +194,13 @@ + | --da=*) + 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. +@@ -504,7 +476,7 @@ + done + + # Be sure to have absolute paths. +-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir + do + eval ac_val=$`echo $ac_var` +@@ -641,15 +613,16 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data [PREFIX/share] ++ --datarootdir=DIR read-only architecture-independent data [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --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] +- --infodir=DIR info documentation [PREFIX/info] +- --mandir=DIR man documentation [PREFIX/man] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --mandir=DIR man documentation [DATAROOTDIR/man] + EOF + + cat <<\EOF +@@ -687,17 +660,20 @@ + --with-dbmalloc test: use Conor Cahill's dbmalloc library + --with-valgrind test: use valgrind + --disable-leaks test: free permanent memory, analyze leaks ++ --disable-widec disable checks for wide-character functions + --with-curses-dir=DIR directory in which (n)curses is installed +- --with-5lib use SunOS sysv-libraries +- --with-ncursesw use wide ncurses-libraries (installed) +- --with-ncurses use ncurses-libraries (installed) ++ --with-ncursesw use wide ncurses-libraries ++ --with-ncurses use ncurses-libraries + --with-pdcurses compile/link with pdcurses X11 library ++ --with-curses-colr compile/link with HPUX 10.x color-curses ++ --with-curses-5lib compile/link with SunOS 5lib curses + --with-Xaw3d link with Xaw 3d library + --with-neXtaw link with neXT Athena library + --with-XawPlus link with Athena-Plus library + --with-pkg-config{=path} enable/disable use of pkg-config + --with-x use the X Window System + --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables ++ --disable-rpath-hack don't add rpath options for additional libraries + + Some influential environment variables: + CC C compiler command +@@ -767,7 +743,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.52.20101002. Invocation command line was ++generated by GNU Autoconf 2.52.20120811. Invocation command line was + + $ $0 $@ + +@@ -891,7 +867,7 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- { echo "$as_me:894: loading site script $ac_site_file" >&5 ++ { echo "$as_me:870: loading site script $ac_site_file" >&5 + echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" +@@ -902,7 +878,7 @@ + # 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:905: loading cache $cache_file" >&5 ++ { echo "$as_me:881: loading cache $cache_file" >&5 + echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; +@@ -910,7 +886,7 @@ + esac + fi + else +- { echo "$as_me:913: creating cache $cache_file" >&5 ++ { echo "$as_me:889: creating cache $cache_file" >&5 + echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file + fi +@@ -926,21 +902,21 @@ + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) +- { echo "$as_me:929: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++ { echo "$as_me:905: 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:933: error: \`$ac_var' was not set in the previous run" >&5 ++ { echo "$as_me:909: 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:939: error: \`$ac_var' has changed since the previous run:" >&5 ++ { echo "$as_me:915: 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:941: former value: $ac_old_val" >&5 ++ { echo "$as_me:917: former value: $ac_old_val" >&5 + echo "$as_me: former value: $ac_old_val" >&2;} +- { echo "$as_me:943: current value: $ac_new_val" >&5 ++ { echo "$as_me:919: current value: $ac_new_val" >&5 + echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; +@@ -959,9 +935,9 @@ + fi + done + if $ac_cache_corrupted; then +- { echo "$as_me:962: error: changes in the environment can compromise the build" >&5 ++ { echo "$as_me:938: 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:964: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++ { { echo "$as_me:940: 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 +@@ -982,10 +958,10 @@ + echo "#! $SHELL" >conftest.sh + echo "exit 0" >>conftest.sh + chmod +x conftest.sh +-if { (echo "$as_me:985: PATH=\".;.\"; conftest.sh") >&5 ++if { (echo "$as_me:961: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? +- echo "$as_me:988: \$? = $ac_status" >&5 ++ echo "$as_me:964: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' + else +@@ -1017,7 +993,7 @@ + fi + done + if test -z "$ac_aux_dir"; then +- { { echo "$as_me:1020: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++ { { echo "$as_me:996: 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 +@@ -1027,11 +1003,11 @@ + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || +- { { echo "$as_me:1030: error: cannot run $ac_config_sub" >&5 ++ { { echo "$as_me:1006: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +-echo "$as_me:1034: checking build system type" >&5 ++echo "$as_me:1010: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1040,16 +1016,16 @@ + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && +- { { echo "$as_me:1043: error: cannot guess build type; you must specify one" >&5 ++ { { echo "$as_me:1019: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || +- { { echo "$as_me:1047: error: $ac_config_sub $ac_cv_build_alias failed." >&5 ++ { { echo "$as_me:1023: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1052: result: $ac_cv_build" >&5 ++echo "$as_me:1028: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1057,7 +1033,7 @@ + build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then +- echo "$as_me:1060: checking host system type" >&5 ++ echo "$as_me:1036: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1066,12 +1042,12 @@ + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || +- { { echo "$as_me:1069: error: $ac_config_sub $ac_cv_host_alias failed" >&5 ++ { { echo "$as_me:1045: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:1074: result: $ac_cv_host" >&5 ++echo "$as_me:1050: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +@@ -1096,13 +1072,13 @@ + fi + + test -z "$system_name" && system_name="$cf_cv_system_name" +-test -n "$cf_cv_system_name" && echo "$as_me:1099: result: Configuring for $cf_cv_system_name" >&5 ++test -n "$cf_cv_system_name" && echo "$as_me:1075: result: Configuring for $cf_cv_system_name" >&5 + echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + + if test ".$system_name" != ".$cf_cv_system_name" ; then +- echo "$as_me:1103: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 ++ echo "$as_me:1079: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 +- { { echo "$as_me:1105: error: \"Please remove config.cache and try again.\"" >&5 ++ { { echo "$as_me:1081: error: \"Please remove config.cache and try again.\"" >&5 + echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -1120,7 +1096,7 @@ + program_transform_name=`echo $program_transform_name | sed -f conftest.sed` + rm conftest.sed + +-echo "$as_me:1123: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "$as_me:1099: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` + if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +@@ -1140,11 +1116,11 @@ + rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$as_me:1143: result: yes" >&5 ++ echo "$as_me:1119: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$as_me:1147: result: no" >&5 ++ echo "$as_me:1123: result: no" >&5 + echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi +@@ -1158,7 +1134,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +-echo "$as_me:1161: checking for $ac_word" >&5 ++echo "$as_me:1137: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1173,7 +1149,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="${ac_tool_prefix}gcc" +-echo "$as_me:1176: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1152: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1181,10 +1157,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1184: result: $CC" >&5 ++ echo "$as_me:1160: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1187: result: no" >&5 ++ echo "$as_me:1163: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1193,7 +1169,7 @@ + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo "$as_me:1196: checking for $ac_word" >&5 ++echo "$as_me:1172: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1208,7 +1184,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="gcc" +-echo "$as_me:1211: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1187: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1216,10 +1192,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1219: result: $ac_ct_CC" >&5 ++ echo "$as_me:1195: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1222: result: no" >&5 ++ echo "$as_me:1198: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1232,7 +1208,7 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + set dummy ${ac_tool_prefix}cc; ac_word=$2 +-echo "$as_me:1235: checking for $ac_word" >&5 ++echo "$as_me:1211: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1247,7 +1223,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="${ac_tool_prefix}cc" +-echo "$as_me:1250: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1226: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1255,10 +1231,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1258: result: $CC" >&5 ++ echo "$as_me:1234: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1261: result: no" >&5 ++ echo "$as_me:1237: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1267,7 +1243,7 @@ + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:1270: checking for $ac_word" >&5 ++echo "$as_me:1246: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1282,7 +1258,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="cc" +-echo "$as_me:1285: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1261: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1290,10 +1266,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1293: result: $ac_ct_CC" >&5 ++ echo "$as_me:1269: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1296: result: no" >&5 ++ echo "$as_me:1272: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1306,7 +1282,7 @@ + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo "$as_me:1309: checking for $ac_word" >&5 ++echo "$as_me:1285: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1326,7 +1302,7 @@ + continue + fi + ac_cv_prog_CC="cc" +-echo "$as_me:1329: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1305: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1348,10 +1324,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1351: result: $CC" >&5 ++ echo "$as_me:1327: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1354: result: no" >&5 ++ echo "$as_me:1330: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1362,7 +1338,7 @@ + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +-echo "$as_me:1365: checking for $ac_word" >&5 ++echo "$as_me:1341: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1377,7 +1353,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +-echo "$as_me:1380: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1356: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1385,10 +1361,10 @@ + fi + CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$as_me:1388: result: $CC" >&5 ++ echo "$as_me:1364: result: $CC" >&5 + echo "${ECHO_T}$CC" >&6 + else +- echo "$as_me:1391: result: no" >&5 ++ echo "$as_me:1367: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1401,7 +1377,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 "$as_me:1404: checking for $ac_word" >&5 ++echo "$as_me:1380: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -1416,7 +1392,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ac_ct_CC="$ac_prog" +-echo "$as_me:1419: found $ac_dir/$ac_word" >&5 ++echo "$as_me:1395: found $ac_dir/$ac_word" >&5 + break + done + +@@ -1424,10 +1400,10 @@ + fi + ac_ct_CC=$ac_cv_prog_ac_ct_CC + if test -n "$ac_ct_CC"; then +- echo "$as_me:1427: result: $ac_ct_CC" >&5 ++ echo "$as_me:1403: result: $ac_ct_CC" >&5 + echo "${ECHO_T}$ac_ct_CC" >&6 + else +- echo "$as_me:1430: result: no" >&5 ++ echo "$as_me:1406: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -1439,32 +1415,32 @@ + + fi + +-test -z "$CC" && { { echo "$as_me:1442: error: no acceptable cc found in \$PATH" >&5 ++test -z "$CC" && { { echo "$as_me:1418: error: no acceptable cc found in \$PATH" >&5 + echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + + # Provide some information about the compiler. +-echo "$as_me:1447:" \ ++echo "$as_me:1423:" \ + "checking for C compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` +-{ (eval echo "$as_me:1450: \"$ac_compiler --version </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1426: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1453: \$? = $ac_status" >&5 ++ echo "$as_me:1429: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1455: \"$ac_compiler -v </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1431: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1458: \$? = $ac_status" >&5 ++ echo "$as_me:1434: \$? = $ac_status" >&5 + (exit $ac_status); } +-{ (eval echo "$as_me:1460: \"$ac_compiler -V </dev/null >&5\"") >&5 ++{ (eval echo "$as_me:1436: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? +- echo "$as_me:1463: \$? = $ac_status" >&5 ++ echo "$as_me:1439: \$? = $ac_status" >&5 + (exit $ac_status); } + + cat >conftest.$ac_ext <<_ACEOF +-#line 1467 "configure" ++#line 1443 "configure" + #include "confdefs.h" + + int +@@ -1480,13 +1456,13 @@ + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-echo "$as_me:1483: checking for C compiler default output" >&5 ++echo "$as_me:1459: checking for C compiler default output" >&5 + echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 + ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +-if { (eval echo "$as_me:1486: \"$ac_link_default\"") >&5 ++if { (eval echo "$as_me:1462: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? +- echo "$as_me:1489: \$? = $ac_status" >&5 ++ echo "$as_me:1465: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is + # not robust to junk in `.', hence go to wildcards (a.*) only as a last +@@ -1509,34 +1485,34 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1512: error: C compiler cannot create executables" >&5 ++{ { echo "$as_me:1488: error: C compiler cannot create executables" >&5 + echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } + fi + + ac_exeext=$ac_cv_exeext +-echo "$as_me:1518: result: $ac_file" >&5 ++echo "$as_me:1494: result: $ac_file" >&5 + echo "${ECHO_T}$ac_file" >&6 + + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1523: checking whether the C compiler works" >&5 ++echo "$as_me:1499: checking whether the C compiler works" >&5 + echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. + if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' +- { (eval echo "$as_me:1529: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1505: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1532: \$? = $ac_status" >&5 ++ echo "$as_me:1508: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else +- { { echo "$as_me:1539: error: cannot run C compiled programs. ++ { { echo "$as_me:1515: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&5 + echo "$as_me: error: cannot run C compiled programs. + If you meant to cross compile, use \`--host'." >&2;} +@@ -1544,24 +1520,24 @@ + fi + fi + fi +-echo "$as_me:1547: result: yes" >&5 ++echo "$as_me:1523: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + + rm -f a.out a.exe conftest$ac_cv_exeext + ac_clean_files=$ac_clean_files_save + # Check the compiler produces executables we can run. If not, either + # the compiler is broken, or we cross compile. +-echo "$as_me:1554: checking whether we are cross compiling" >&5 ++echo "$as_me:1530: checking whether we are cross compiling" >&5 + echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +-echo "$as_me:1556: result: $cross_compiling" >&5 ++echo "$as_me:1532: result: $cross_compiling" >&5 + echo "${ECHO_T}$cross_compiling" >&6 + +-echo "$as_me:1559: checking for executable suffix" >&5 ++echo "$as_me:1535: checking for executable suffix" >&5 + echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +-if { (eval echo "$as_me:1561: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:1537: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:1564: \$? = $ac_status" >&5 ++ echo "$as_me:1540: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) + # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +@@ -1577,25 +1553,25 @@ + esac + done + else +- { { echo "$as_me:1580: error: cannot compute EXEEXT: cannot compile and link" >&5 ++ { { echo "$as_me:1556: error: cannot compute EXEEXT: cannot compile and link" >&5 + echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest$ac_cv_exeext +-echo "$as_me:1586: result: $ac_cv_exeext" >&5 ++echo "$as_me:1562: result: $ac_cv_exeext" >&5 + echo "${ECHO_T}$ac_cv_exeext" >&6 + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT +-echo "$as_me:1592: checking for object suffix" >&5 ++echo "$as_me:1568: checking for object suffix" >&5 + echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 + if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1598 "configure" ++#line 1574 "configure" + #include "confdefs.h" + + int +@@ -1607,10 +1583,10 @@ + } + _ACEOF + rm -f conftest.o conftest.obj +-if { (eval echo "$as_me:1610: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1586: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1613: \$? = $ac_status" >&5 ++ echo "$as_me:1589: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in +@@ -1622,24 +1598,24 @@ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-{ { echo "$as_me:1625: error: cannot compute OBJEXT: cannot compile" >&5 ++{ { echo "$as_me:1601: error: cannot compute OBJEXT: cannot compile" >&5 + echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } + fi + + rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi +-echo "$as_me:1632: result: $ac_cv_objext" >&5 ++echo "$as_me:1608: result: $ac_cv_objext" >&5 + echo "${ECHO_T}$ac_cv_objext" >&6 + OBJEXT=$ac_cv_objext + ac_objext=$OBJEXT +-echo "$as_me:1636: checking whether we are using the GNU C compiler" >&5 ++echo "$as_me:1612: checking whether we are using the GNU C compiler" >&5 + echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 + if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1642 "configure" ++#line 1618 "configure" + #include "confdefs.h" + + int +@@ -1654,16 +1630,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1657: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1633: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1660: \$? = $ac_status" >&5 ++ echo "$as_me:1636: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1663: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1639: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1666: \$? = $ac_status" >&5 ++ echo "$as_me:1642: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes + else +@@ -1675,19 +1651,19 @@ + ac_cv_c_compiler_gnu=$ac_compiler_gnu + + fi +-echo "$as_me:1678: result: $ac_cv_c_compiler_gnu" >&5 ++echo "$as_me:1654: result: $ac_cv_c_compiler_gnu" >&5 + echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 + GCC=`test $ac_compiler_gnu = yes && echo yes` + ac_test_CFLAGS=${CFLAGS+set} + ac_save_CFLAGS=$CFLAGS + CFLAGS="-g" +-echo "$as_me:1684: checking whether $CC accepts -g" >&5 ++echo "$as_me:1660: checking whether $CC accepts -g" >&5 + echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 + if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 1690 "configure" ++#line 1666 "configure" + #include "confdefs.h" + + int +@@ -1699,16 +1675,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1702: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1678: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1705: \$? = $ac_status" >&5 ++ echo "$as_me:1681: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1708: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1684: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1711: \$? = $ac_status" >&5 ++ echo "$as_me:1687: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +@@ -1718,7 +1694,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:1721: result: $ac_cv_prog_cc_g" >&5 ++echo "$as_me:1697: result: $ac_cv_prog_cc_g" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +@@ -1745,16 +1721,16 @@ + #endif + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1748: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1724: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1751: \$? = $ac_status" >&5 ++ echo "$as_me:1727: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1754: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1730: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1757: \$? = $ac_status" >&5 ++ echo "$as_me:1733: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ +@@ -1766,7 +1742,7 @@ + 'void exit (int);' + do + cat >conftest.$ac_ext <<_ACEOF +-#line 1769 "configure" ++#line 1745 "configure" + #include "confdefs.h" + #include <stdlib.h> + $ac_declaration +@@ -1779,16 +1755,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1782: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1785: \$? = $ac_status" >&5 ++ echo "$as_me:1761: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1788: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1764: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1791: \$? = $ac_status" >&5 ++ echo "$as_me:1767: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -1798,7 +1774,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +-#line 1801 "configure" ++#line 1777 "configure" + #include "confdefs.h" + $ac_declaration + int +@@ -1810,16 +1786,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:1813: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:1789: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:1816: \$? = $ac_status" >&5 ++ echo "$as_me:1792: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:1819: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:1795: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:1822: \$? = $ac_status" >&5 ++ echo "$as_me:1798: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break + else +@@ -1853,7 +1829,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_main_return=return +-echo "$as_me:1856: checking how to run the C preprocessor" >&5 ++echo "$as_me:1832: checking how to run the C preprocessor" >&5 + echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then +@@ -1874,18 +1850,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1877 "configure" ++#line 1853 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:1882: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1858: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1888: \$? = $ac_status" >&5 ++ echo "$as_me:1864: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1908,17 +1884,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 1911 "configure" ++#line 1887 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:1915: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1891: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1921: \$? = $ac_status" >&5 ++ echo "$as_me:1897: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1955,7 +1931,7 @@ + else + ac_cv_prog_CPP=$CPP + fi +-echo "$as_me:1958: result: $CPP" >&5 ++echo "$as_me:1934: result: $CPP" >&5 + echo "${ECHO_T}$CPP" >&6 + ac_preproc_ok=false + for ac_c_preproc_warn_flag in '' yes +@@ -1965,18 +1941,18 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +-#line 1968 "configure" ++#line 1944 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax error + _ACEOF +-if { (eval echo "$as_me:1973: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1949: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:1979: \$? = $ac_status" >&5 ++ echo "$as_me:1955: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -1999,17 +1975,17 @@ + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +-#line 2002 "configure" ++#line 1978 "configure" + #include "confdefs.h" + #include <ac_nonexistent.h> + _ACEOF +-if { (eval echo "$as_me:2006: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:1982: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:2012: \$? = $ac_status" >&5 ++ echo "$as_me:1988: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -2037,7 +2013,7 @@ + if $ac_preproc_ok; then + : + else +- { { echo "$as_me:2040: error: C preprocessor \"$CPP\" fails sanity check" >&5 ++ { { echo "$as_me:2016: error: C preprocessor \"$CPP\" fails sanity check" >&5 + echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -2053,7 +2029,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 "$as_me:2056: checking for $ac_word" >&5 ++echo "$as_me:2032: 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 +@@ -2068,7 +2044,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_AWK="$ac_prog" +-echo "$as_me:2071: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2047: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2076,10 +2052,10 @@ + fi + AWK=$ac_cv_prog_AWK + if test -n "$AWK"; then +- echo "$as_me:2079: result: $AWK" >&5 ++ echo "$as_me:2055: result: $AWK" >&5 + echo "${ECHO_T}$AWK" >&6 + else +- echo "$as_me:2082: result: no" >&5 ++ echo "$as_me:2058: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2098,7 +2074,7 @@ + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. +-echo "$as_me:2101: checking for a BSD compatible install" >&5 ++echo "$as_me:2077: 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 +@@ -2147,7 +2123,7 @@ + INSTALL=$ac_install_sh + fi + fi +-echo "$as_me:2150: result: $INSTALL" >&5 ++echo "$as_me:2126: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. +@@ -2172,7 +2148,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 "$as_me:2175: checking for $ac_word" >&5 ++echo "$as_me:2151: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_LINT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2187,7 +2163,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_LINT="$ac_prog" +-echo "$as_me:2190: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2166: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2195,17 +2171,17 @@ + fi + LINT=$ac_cv_prog_LINT + if test -n "$LINT"; then +- echo "$as_me:2198: result: $LINT" >&5 ++ echo "$as_me:2174: result: $LINT" >&5 + echo "${ECHO_T}$LINT" >&6 + else +- echo "$as_me:2201: result: no" >&5 ++ echo "$as_me:2177: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + test -n "$LINT" && break + done + +-echo "$as_me:2208: checking if filesystem supports mixed-case filenames" >&5 ++echo "$as_me:2184: checking if filesystem supports mixed-case filenames" >&5 + echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 + if test "${cf_cv_mixedcase+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2232,7 +2208,7 @@ + fi + + fi +-echo "$as_me:2235: result: $cf_cv_mixedcase" >&5 ++echo "$as_me:2211: result: $cf_cv_mixedcase" >&5 + echo "${ECHO_T}$cf_cv_mixedcase" >&6 + test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF + #define MIXEDCASE_FILENAMES 1 +@@ -2242,7 +2218,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 "$as_me:2245: checking for $ac_word" >&5 ++echo "$as_me:2221: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_CTAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2257,7 +2233,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_CTAGS="$ac_prog" +-echo "$as_me:2260: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2236: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2265,10 +2241,10 @@ + fi + CTAGS=$ac_cv_prog_CTAGS + if test -n "$CTAGS"; then +- echo "$as_me:2268: result: $CTAGS" >&5 ++ echo "$as_me:2244: result: $CTAGS" >&5 + echo "${ECHO_T}$CTAGS" >&6 + else +- echo "$as_me:2271: result: no" >&5 ++ echo "$as_me:2247: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2279,7 +2255,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 "$as_me:2282: checking for $ac_word" >&5 ++echo "$as_me:2258: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ETAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2294,7 +2270,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_ETAGS="$ac_prog" +-echo "$as_me:2297: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2273: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2302,10 +2278,10 @@ + fi + ETAGS=$ac_cv_prog_ETAGS + if test -n "$ETAGS"; then +- echo "$as_me:2305: result: $ETAGS" >&5 ++ echo "$as_me:2281: result: $ETAGS" >&5 + echo "${ECHO_T}$ETAGS" >&6 + else +- echo "$as_me:2308: result: no" >&5 ++ echo "$as_me:2284: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2314,7 +2290,7 @@ + + # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. + set dummy ${CTAGS:-ctags}; ac_word=$2 +-echo "$as_me:2317: checking for $ac_word" >&5 ++echo "$as_me:2293: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2329,7 +2305,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_LOWER_TAGS="yes" +-echo "$as_me:2332: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2308: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2338,17 +2314,17 @@ + fi + MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS + if test -n "$MAKE_LOWER_TAGS"; then +- echo "$as_me:2341: result: $MAKE_LOWER_TAGS" >&5 ++ echo "$as_me:2317: result: $MAKE_LOWER_TAGS" >&5 + echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 + else +- echo "$as_me:2344: result: no" >&5 ++ echo "$as_me:2320: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + if test "$cf_cv_mixedcase" = yes ; then + # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. + set dummy ${ETAGS:-etags}; ac_word=$2 +-echo "$as_me:2351: checking for $ac_word" >&5 ++echo "$as_me:2327: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2363,7 +2339,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_MAKE_UPPER_TAGS="yes" +-echo "$as_me:2366: found $ac_dir/$ac_word" >&5 ++echo "$as_me:2342: found $ac_dir/$ac_word" >&5 + break + done + +@@ -2372,10 +2348,10 @@ + fi + MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS + if test -n "$MAKE_UPPER_TAGS"; then +- echo "$as_me:2375: result: $MAKE_UPPER_TAGS" >&5 ++ echo "$as_me:2351: result: $MAKE_UPPER_TAGS" >&5 + echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 + else +- echo "$as_me:2378: result: no" >&5 ++ echo "$as_me:2354: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -2395,14 +2371,14 @@ + MAKE_LOWER_TAGS="#" + fi + +-echo "$as_me:2398: checking if -lm needed for math functions" >&5 ++echo "$as_me:2374: checking if -lm needed for math functions" >&5 + echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 + if test "${cf_cv_need_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 2405 "configure" ++#line 2381 "configure" + #include "confdefs.h" + + #include <stdio.h> +@@ -2417,16 +2393,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:2420: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:2396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:2423: \$? = $ac_status" >&5 ++ echo "$as_me:2399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:2426: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2429: \$? = $ac_status" >&5 ++ echo "$as_me:2405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_libm=no + else +@@ -2436,13 +2412,15 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:2439: result: $cf_cv_need_libm" >&5 ++echo "$as_me:2415: result: $cf_cv_need_libm" >&5 + echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes + then + MATH_LIB=-lm + fi + ++top_builddir=`pwd` ++ + CC_G_OPT="-g" + CC_SHARED_OPTS=unknown + CPPFLAGS="$CPPFLAGS" +@@ -2464,14 +2442,118 @@ + TEST_ARGS="" + TEST_DEPS="" + TEST_LIBS="" +-TINFO_ARGS='$(LIBS_CURSES)' ++TINFO_LDFLAGS='' ++TINFO_LIBS='$(LIBS_CURSES)' + cf_cv_abi_version="" + cf_cv_rel_version="" + + cf_cv_screen=curses + cf_cv_libtype= + +-echo "$as_me:2474: checking for ${CC:-cc} option to accept ANSI C" >&5 ++# This should have been defined by AC_PROG_CC ++: ${CC:=cc} ++ ++# Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content ++# into CC. This will not help with broken scripts that wrap the compiler with ++# options, but eliminates a more common category of user confusion. ++echo "$as_me:2459: checking \$CC variable" >&5 ++echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 ++case "$CC" in #(vi ++*[\ \ ]-[IUD]*) ++ echo "$as_me:2463: result: broken" >&5 ++echo "${ECHO_T}broken" >&6 ++ { echo "$as_me:2465: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 ++echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} ++ # humor him... ++ cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` ++ CC=`echo "$CC" | sed -e 's/[ ].*//'` ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_flags ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++ ;; ++*) ++ echo "$as_me:2551: result: ok" >&5 ++echo "${ECHO_T}ok" >&6 ++ ;; ++esac ++ ++echo "$as_me:2556: checking for ${CC:-cc} option to accept ANSI C" >&5 + echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 + if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -2575,7 +2657,7 @@ + fi + + cat >conftest.$ac_ext <<_ACEOF +-#line 2578 "configure" ++#line 2660 "configure" + #include "confdefs.h" + + #ifndef CC_HAS_PROTOS +@@ -2596,16 +2678,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2599: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2681: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2602: \$? = $ac_status" >&5 ++ echo "$as_me:2684: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2605: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2687: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2608: \$? = $ac_status" >&5 ++ echo "$as_me:2690: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ansi_cc="$cf_arg"; break + else +@@ -2618,7 +2700,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:2621: result: $cf_cv_ansi_cc" >&5 ++echo "$as_me:2703: result: $cf_cv_ansi_cc" >&5 + echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + + if test "$cf_cv_ansi_cc" != "no"; then +@@ -2711,7 +2793,7 @@ + fi + + if test "$cf_cv_ansi_cc" = "no"; then +- { { echo "$as_me:2714: error: Your compiler does not appear to recognize prototypes. ++ { { echo "$as_me:2796: error: Your compiler does not appear to recognize prototypes. + You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler +@@ -2742,10 +2824,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:2745: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:2827: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <<EOF +-#line 2748 "${as_me:-configure}" ++#line 2830 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -2794,12 +2876,12 @@ + ;; + esac + +- if { (eval echo "$as_me:2797: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:2879: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2800: \$? = $ac_status" >&5 ++ echo "$as_me:2882: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:2802: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:2884: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in #(vi +@@ -2839,7 +2921,7 @@ + cf_xopen_source= + + case $host_os in #(vi +-aix[456]*) #(vi ++aix[4-7]*) #(vi + cf_xopen_source="-D_ALL_SOURCE" + ;; + cygwin) #(vi +@@ -2850,6 +2932,7 @@ + ;; + darwin*) #(vi + cf_xopen_source="-D_DARWIN_C_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + freebsd*|dragonfly*) #(vi + # 5.x headers associate +@@ -2867,17 +2950,18 @@ + ;; + irix[56].*) #(vi + cf_xopen_source="-D_SGI_SOURCE" ++ cf_XOPEN_SOURCE= + ;; + linux*|gnu*|mint*|k*bsd*-gnu) #(vi + +-echo "$as_me:2873: checking if we must define _GNU_SOURCE" >&5 ++echo "$as_me:2957: checking if we must define _GNU_SOURCE" >&5 + echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 + if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 2880 "configure" ++#line 2964 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -2892,16 +2976,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:2979: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2898: \$? = $ac_status" >&5 ++ echo "$as_me:2982: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2901: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:2985: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2904: \$? = $ac_status" >&5 ++ echo "$as_me:2988: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -2910,7 +2994,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 2913 "configure" ++#line 2997 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -2925,16 +3009,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:2928: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3012: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:2931: \$? = $ac_status" >&5 ++ echo "$as_me:3015: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:2934: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:2937: \$? = $ac_status" >&5 ++ echo "$as_me:3021: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -2949,51 +3033,45 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:2952: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:3036: result: $cf_cv_gnu_source" >&5 + echo "${ECHO_T}$cf_cv_gnu_source" >&6 + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + + ;; + mirbsd*) #(vi +- # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h> +- ;; +-netbsd*) #(vi +- # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw +- ;; +-openbsd*) #(vi +- # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw +- ;; +-osf[45]*) #(vi +- cf_xopen_source="-D_OSF_SOURCE" +- ;; +-nto-qnx*) #(vi +- cf_xopen_source="-D_QNX_SOURCE" +- ;; +-sco*) #(vi +- # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer +- ;; +-solaris2.1[0-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- ;; +-solaris2.[1-9]) #(vi +- cf_xopen_source="-D__EXTENSIONS__" +- ;; +-*) +- echo "$as_me:2982: checking if we should define _XOPEN_SOURCE" >&5 +-echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +-if test "${cf_cv_xopen_source+set}" = set; then ++ # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types ++ cf_XOPEN_SOURCE= ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ++cf_save_CFLAGS="$CFLAGS" ++cf_save_CPPFLAGS="$CPPFLAGS" ++ ++cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++echo "$as_me:3058: checking if we should define _POSIX_C_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ++echo "${as_me:-configure}:3064: testing if the symbol is already defined go no further ..." 1>&5 ++ + cat >conftest.$ac_ext <<_ACEOF +-#line 2989 "configure" ++#line 3067 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifndef _XOPEN_SOURCE ++#ifndef _POSIX_C_SOURCE + make an error + #endif + ; +@@ -3001,32 +3079,44 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3004: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3082: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3007: \$? = $ac_status" >&5 ++ echo "$as_me:3085: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3010: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3088: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3013: \$? = $ac_status" >&5 ++ echo "$as_me:3091: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ cf_cv_posix_c_source=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +- cat >conftest.$ac_ext <<_ACEOF +-#line 3022 "configure" ++cf_want_posix_source=no ++ case .$cf_POSIX_C_SOURCE in #(vi ++ .[12]??*) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ ;; ++ .2) #(vi ++ cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ++ cf_want_posix_source=yes ++ ;; ++ .*) ++ cf_want_posix_source=yes ++ ;; ++ esac ++ if test "$cf_want_posix_source" = yes ; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3112 "configure" + #include "confdefs.h" + #include <sys/types.h> + int + main () + { + +-#ifdef _XOPEN_SOURCE ++#ifdef _POSIX_SOURCE + make an error + #endif + ; +@@ -3034,50 +3124,87 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3037: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3127: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3040: \$? = $ac_status" >&5 ++ echo "$as_me:3130: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3043: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3133: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3046: \$? = $ac_status" >&5 ++ echo "$as_me:3136: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- cf_cv_xopen_source=no ++ : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-cf_cv_xopen_source=$cf_XOPEN_SOURCE ++cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$cf_save" ++ fi ++ ++echo "${as_me:-configure}:3147: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++ ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" ++ ++echo "${as_me:-configure}:3152: testing if the second compile does not leave our definition intact error ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3155 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++int ++main () ++{ + ++#ifndef _POSIX_C_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3170: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3173: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3176: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3179: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_posix_c_source=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ CPPFLAGS="$cf_save_CPPFLAGS" + + fi +-echo "$as_me:3061: result: $cf_cv_xopen_source" >&5 +-echo "${ECHO_T}$cf_cv_xopen_source" >&6 +- if test "$cf_cv_xopen_source" != no ; then +- +-CFLAGS=`echo "$CFLAGS" | \ +- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++rm -f conftest.$ac_objext conftest.$ac_ext + +-CPPFLAGS=`echo "$CPPFLAGS" | \ +- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++fi ++echo "$as_me:3195: result: $cf_cv_posix_c_source" >&5 ++echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + +- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++if test "$cf_cv_posix_c_source" != no ; then ++ CFLAGS="$cf_trim_CFLAGS" ++ CPPFLAGS="$cf_trim_CPPFLAGS" + + cf_fix_cppflags=no + cf_new_cflags= + cf_new_cppflags= + cf_new_extra_cppflags= + +-for cf_add_cflags in $cf_temp_xopen_source ++for cf_add_cflags in $cf_cv_posix_c_source + do + case $cf_fix_cppflags in + no) +@@ -3150,33 +3277,241 @@ + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + +- fi +- +-cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE +- +-cf_save_CFLAGS="$CFLAGS" +-cf_save_CPPFLAGS="$CPPFLAGS" +- +-cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ +- sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++fi + +-cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ +- sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ +- -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ;; ++netbsd*) #(vi ++ cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ++ ;; ++openbsd[4-9]*) #(vi ++ # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw ++ cf_xopen_source="-D_BSD_SOURCE" ++ cf_XOPEN_SOURCE=600 ++ ;; ++openbsd*) #(vi ++ # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ++ ;; ++osf[45]*) #(vi ++ cf_xopen_source="-D_OSF_SOURCE" ++ ;; ++nto-qnx*) #(vi ++ cf_xopen_source="-D_QNX_SOURCE" ++ ;; ++sco*) #(vi ++ # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ++ ;; ++solaris2.*) #(vi ++ cf_xopen_source="-D__EXTENSIONS__" ++ ;; ++*) + +-echo "$as_me:3168: checking if we should define _POSIX_C_SOURCE" >&5 +-echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 +-if test "${cf_cv_posix_c_source+set}" = set; then ++echo "$as_me:3308: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +-echo "${as_me:-configure}:3174: testing if the symbol is already defined go no further ..." 1>&5 +- + cat >conftest.$ac_ext <<_ACEOF +-#line 3177 "configure" ++#line 3315 "configure" + #include "confdefs.h" +-#include <sys/types.h> ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3334: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3337: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3340: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3343: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3352 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3371: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3374: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3377: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3380: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:3395: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 ++ ++if test "$cf_cv_xopen_source" != no ; then ++ ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_temp_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE ++ ++cf_save_CFLAGS="$CFLAGS" ++cf_save_CPPFLAGS="$CPPFLAGS" ++ ++cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++echo "$as_me:3503: checking if we should define _POSIX_C_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_posix_c_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++echo "${as_me:-configure}:3509: testing if the symbol is already defined go no further ..." 1>&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3512 "configure" ++#include "confdefs.h" ++#include <sys/types.h> + int + main () + { +@@ -3189,16 +3524,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3192: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3527: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3195: \$? = $ac_status" >&5 ++ echo "$as_me:3530: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3198: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3201: \$? = $ac_status" >&5 ++ echo "$as_me:3536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -3219,7 +3554,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 3222 "configure" ++#line 3557 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -3234,16 +3569,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3572: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3240: \$? = $ac_status" >&5 ++ echo "$as_me:3575: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3243: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3578: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3246: \$? = $ac_status" >&5 ++ echo "$as_me:3581: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3254,15 +3589,15 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me:-configure}:3257: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me:-configure}:3592: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + +-echo "${as_me:-configure}:3262: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me:-configure}:3597: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 3265 "configure" ++#line 3600 "configure" + #include "confdefs.h" + #include <sys/types.h> + int +@@ -3277,16 +3612,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3280: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:3615: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3283: \$? = $ac_status" >&5 ++ echo "$as_me:3618: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3286: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3621: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3289: \$? = $ac_status" >&5 ++ echo "$as_me:3624: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -3302,7 +3637,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:3305: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:3640: result: $cf_cv_posix_c_source" >&5 + echo "${ECHO_T}$cf_cv_posix_c_source" >&6 + + if test "$cf_cv_posix_c_source" != no ; then +@@ -3474,104 +3809,371 @@ + + fi + +-echo "$as_me:3477: checking for $CC option to accept ANSI C" >&5 +-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +-if test "${ac_cv_prog_cc_stdc+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_cv_prog_cc_stdc=no +-ac_save_CC=$CC +-cat >conftest.$ac_ext <<_ACEOF +-#line 3485 "configure" ++if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then ++ echo "$as_me:3813: checking if _XOPEN_SOURCE really is set" >&5 ++echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3816 "configure" + #include "confdefs.h" +-#include <stdarg.h> +-#include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; ++#include <stdlib.h> + int + main () + { +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif + ; + return 0; + } + _ACEOF +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5 ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3831: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3537: \$? = $ac_status" >&5 ++ echo "$as_me:3834: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3540: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:3837: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3543: \$? = $ac_status" >&5 ++ echo "$as_me:3840: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_prog_cc_stdc=$ac_arg +-break ++ cf_XOPEN_SOURCE_set=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set=no + fi +-rm -f conftest.$ac_objext +-done +-rm -f conftest.$ac_ext conftest.$ac_objext +-CC=$ac_save_CC +- +-fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ echo "$as_me:3849: result: $cf_XOPEN_SOURCE_set" >&5 ++echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 ++ if test $cf_XOPEN_SOURCE_set = yes ++ then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3854 "configure" ++#include "confdefs.h" ++#include <stdlib.h> ++int ++main () ++{ + +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$as_me:3560: result: none needed" >&5 +-echo "${ECHO_T}none needed" >&6 ;; ++#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3869: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3872: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3875: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3878: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_XOPEN_SOURCE_set_ok=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_XOPEN_SOURCE_set_ok=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ if test $cf_XOPEN_SOURCE_set_ok = no ++ then ++ { echo "$as_me:3889: WARNING: _XOPEN_SOURCE is lower than requested" >&5 ++echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} ++ fi ++ else ++ ++echo "$as_me:3894: checking if we should define _XOPEN_SOURCE" >&5 ++echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 ++if test "${cf_cv_xopen_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3901 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifndef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3920: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3923: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3926: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3929: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_save="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 3938 "configure" ++#include "confdefs.h" ++ ++#include <stdlib.h> ++#include <string.h> ++#include <sys/types.h> ++ ++int ++main () ++{ ++ ++#ifdef _XOPEN_SOURCE ++make an error ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:3960: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:3963: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:3966: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_xopen_source=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_xopen_source=$cf_XOPEN_SOURCE ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save" ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:3981: result: $cf_cv_xopen_source" >&5 ++echo "${ECHO_T}$cf_cv_xopen_source" >&6 ++ ++if test "$cf_cv_xopen_source" != no ; then ++ ++CFLAGS=`echo "$CFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` ++ ++ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" ++ ++cf_fix_cppflags=no ++cf_new_cflags= ++cf_new_cppflags= ++cf_new_extra_cppflags= ++ ++for cf_add_cflags in $cf_temp_xopen_source ++do ++case $cf_fix_cppflags in ++no) ++ case $cf_add_cflags in #(vi ++ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi ++ case $cf_add_cflags in ++ -D*) ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=yes ++ ++ if test $cf_fix_cppflags = yes ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ elif test "${cf_tst_cflags}" = "\"'" ; then ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ continue ++ fi ++ ;; ++ esac ++ case "$CPPFLAGS" in ++ *$cf_add_cflags) #(vi ++ ;; ++ *) #(vi ++ case $cf_add_cflags in #(vi ++ -D*) ++ cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` ++ ++CPPFLAGS=`echo "$CPPFLAGS" | \ ++ sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ ++ -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` ++ ++ ;; ++ esac ++ cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++ *) ++ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ++ ;; ++ esac ++ ;; ++yes) ++ cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" ++ ++ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` ++ ++ test "${cf_add_cflags}" != "${cf_tst_cflags}" \ ++ && test -z "${cf_tst_cflags}" \ ++ && cf_fix_cppflags=no ++ ;; ++esac ++done ++ ++if test -n "$cf_new_cflags" ; then ++ ++ CFLAGS="$CFLAGS $cf_new_cflags" ++fi ++ ++if test -n "$cf_new_cppflags" ; then ++ ++ CPPFLAGS="$CPPFLAGS $cf_new_cppflags" ++fi ++ ++if test -n "$cf_new_extra_cppflags" ; then ++ ++ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" ++fi ++ ++fi ++ ++ fi ++fi ++ ++echo "$as_me:4079: checking for $CC option to accept ANSI C" >&5 ++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 ++if test "${ac_cv_prog_cc_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_stdc=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++#line 4087 "configure" ++#include "confdefs.h" ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++# Don't try gcc -ansi; that turns off useful extensions and ++# breaks some systems' header files. ++# AIX -qlanglvl=ansi ++# Ultrix and OSF/1 -std1 ++# HP-UX 10.20 and later -Ae ++# HP-UX older versions -Aa -D_HPUX_SOURCE ++# SVR4 -Xc -D__EXTENSIONS__ ++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:4136: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:4139: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:4142: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:4145: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_stdc=$ac_arg ++break ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext ++done ++rm -f conftest.$ac_ext conftest.$ac_objext ++CC=$ac_save_CC ++ ++fi ++ ++case "x$ac_cv_prog_cc_stdc" in ++ x|xno) ++ echo "$as_me:4162: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6 ;; + *) +- echo "$as_me:3563: result: $ac_cv_prog_cc_stdc" >&5 ++ echo "$as_me:4165: result: $ac_cv_prog_cc_stdc" >&5 + echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; + esac + +-echo "$as_me:3568: checking for an ANSI C-conforming const" >&5 ++echo "$as_me:4170: checking for an ANSI C-conforming const" >&5 + echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 + if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 3574 "configure" ++#line 4176 "configure" + #include "confdefs.h" + + int +@@ -3629,16 +4231,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3632: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4234: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3635: \$? = $ac_status" >&5 ++ echo "$as_me:4237: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3638: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4240: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3641: \$? = $ac_status" >&5 ++ echo "$as_me:4243: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +@@ -3648,7 +4250,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:3651: result: $ac_cv_c_const" >&5 ++echo "$as_me:4253: result: $ac_cv_c_const" >&5 + echo "${ECHO_T}$ac_cv_c_const" >&6 + if test $ac_cv_c_const = no; then + +@@ -3658,7 +4260,7 @@ + + fi + +-echo "$as_me:3661: checking for signal global datatype" >&5 ++echo "$as_me:4263: checking for signal global datatype" >&5 + echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 + if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -3670,7 +4272,7 @@ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 3673 "configure" ++#line 4275 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -3693,16 +4295,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4298: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3699: \$? = $ac_status" >&5 ++ echo "$as_me:4301: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3702: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4304: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3705: \$? = $ac_status" >&5 ++ echo "$as_me:4307: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type + else +@@ -3716,13 +4318,13 @@ + + fi + +-echo "$as_me:3719: result: $cf_cv_sig_atomic_t" >&5 ++echo "$as_me:4321: result: $cf_cv_sig_atomic_t" >&5 + echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 + test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF + #define SIG_ATOMIC_T $cf_cv_sig_atomic_t + EOF + +-echo "$as_me:3725: checking if you want to see long compiling messages" >&5 ++echo "$as_me:4327: checking if you want to see long compiling messages" >&5 + echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + + # Check whether --enable-echo or --disable-echo was given. +@@ -3756,22 +4358,22 @@ + ECHO_CC='' + + fi; +-echo "$as_me:3759: result: $enableval" >&5 ++echo "$as_me:4361: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + GCC_VERSION=none + if test "$GCC" = yes ; then +- echo "$as_me:3764: checking version of $CC" >&5 ++ echo "$as_me:4366: checking version of $CC" >&5 + echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown +- echo "$as_me:3768: result: $GCC_VERSION" >&5 ++ echo "$as_me:4370: result: $GCC_VERSION" >&5 + echo "${ECHO_T}$GCC_VERSION" >&6 + fi + + if ( test "$GCC" = yes || test "$GXX" = yes ) + then +-echo "$as_me:3774: checking if you want to turn on gcc warnings" >&5 ++echo "$as_me:4376: checking if you want to turn on gcc warnings" >&5 + echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + + # Check whether --enable-warnings or --disable-warnings was given. +@@ -3788,7 +4390,7 @@ + with_warnings=no + + fi; +-echo "$as_me:3791: result: $with_warnings" >&5 ++echo "$as_me:4393: result: $with_warnings" >&5 + echo "${ECHO_T}$with_warnings" >&6 + if test "$with_warnings" = "yes" + then +@@ -3811,10 +4413,10 @@ + EOF + if test "$GCC" = yes + then +- { echo "$as_me:3814: checking for $CC __attribute__ directives..." >&5 ++ { echo "$as_me:4416: checking for $CC __attribute__ directives..." >&5 + echo "$as_me: checking for $CC __attribute__ directives..." >&6;} + cat > conftest.$ac_ext <<EOF +-#line 3817 "${as_me:-configure}" ++#line 4419 "${as_me:-configure}" + #include "confdefs.h" + #include "conftest.h" + #include "conftest.i" +@@ -3863,12 +4465,12 @@ + ;; + esac + +- if { (eval echo "$as_me:3866: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:4468: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3869: \$? = $ac_status" >&5 ++ echo "$as_me:4471: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:3871: result: ... $cf_attribute" >&5 ++ test -n "$verbose" && echo "$as_me:4473: result: ... $cf_attribute" >&5 + echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case $cf_attribute in #(vi +@@ -3908,19 +4510,70 @@ + if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) +- echo "$as_me:3911: checking if this is really Intel C compiler" >&5 ++ echo "$as_me:4513: checking if this is really Intel C compiler" >&5 + echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +-#line 3916 "configure" ++#line 4518 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++#ifdef __INTEL_COMPILER ++#else ++make an error ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:4535: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:4538: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:4541: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:4544: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ INTEL_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:4555: result: $INTEL_COMPILER" >&5 ++echo "${ECHO_T}$INTEL_COMPILER" >&6 ++ ;; ++ esac ++fi ++ ++CLANG_COMPILER=no ++ ++if test "$GCC" = yes ; then ++ echo "$as_me:4564: checking if this is really Clang C compiler" >&5 ++echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 ++ cf_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Qunused-arguments" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 4569 "configure" + #include "confdefs.h" + + int + main () + { + +-#ifdef __INTEL_COMPILER ++#ifdef __clang__ + #else + make an error + #endif +@@ -3930,34 +4583,32 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:3933: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:4586: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3936: \$? = $ac_status" >&5 ++ echo "$as_me:4589: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:3939: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4592: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:3942: \$? = $ac_status" >&5 ++ echo "$as_me:4595: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- INTEL_COMPILER=yes +-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" ++ CLANG_COMPILER=yes ++cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$cf_save_CFLAGS" +- echo "$as_me:3953: result: $INTEL_COMPILER" >&5 +-echo "${ECHO_T}$INTEL_COMPILER" >&6 +- ;; +- esac ++ CFLAGS="$cf_save_CFLAGS" ++ echo "$as_me:4606: result: $CLANG_COMPILER" >&5 ++echo "${ECHO_T}$CLANG_COMPILER" >&6 + fi + + cat > conftest.$ac_ext <<EOF +-#line 3960 "${as_me:-configure}" ++#line 4611 "${as_me:-configure}" + int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } + EOF + +@@ -3974,7 +4625,7 @@ + # remark #981: operands are evaluated in unspecified order + # warning #279: controlling expression is constant + +- { echo "$as_me:3977: checking for $CC warning options..." >&5 ++ { echo "$as_me:4628: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" +@@ -3990,12 +4641,12 @@ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:4644: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:3996: \$? = $ac_status" >&5 ++ echo "$as_me:4647: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:3998: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:4649: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi +@@ -4004,7 +4655,7 @@ + + elif test "$GCC" = yes + then +- { echo "$as_me:4007: checking for $CC warning options..." >&5 ++ { echo "$as_me:4658: checking for $CC warning options..." >&5 + echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS= +@@ -4024,12 +4675,12 @@ + Wundef $cf_warn_CONST + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" +- if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5 ++ if { (eval echo "$as_me:4678: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4030: \$? = $ac_status" >&5 ++ echo "$as_me:4681: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- test -n "$verbose" && echo "$as_me:4032: result: ... -$cf_opt" >&5 ++ test -n "$verbose" && echo "$as_me:4683: result: ... -$cf_opt" >&5 + echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in #(vi + Wcast-qual) #(vi +@@ -4040,7 +4691,17 @@ + [34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +-echo "${as_me:-configure}:4043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++echo "${as_me:-configure}:4694: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 ++ ++ continue;; ++ esac ++ ;; ++ Wpointer-arith) #(vi ++ case $GCC_VERSION in ++ [12].*) ++ test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 ++ ++echo "${as_me:-configure}:4704: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac +@@ -4056,7 +4717,7 @@ + fi + fi + +-echo "$as_me:4059: checking if you want to use dmalloc for testing" >&5 ++echo "$as_me:4720: checking if you want to use dmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dmalloc or --without-dmalloc was given. +@@ -4072,7 +4733,7 @@ + else + with_dmalloc= + fi; +-echo "$as_me:4075: result: ${with_dmalloc:-no}" >&5 ++echo "$as_me:4736: result: ${with_dmalloc:-no}" >&5 + echo "${ECHO_T}${with_dmalloc:-no}" >&6 + + case .$with_cflags in #(vi +@@ -4166,23 +4827,23 @@ + esac + + if test "$with_dmalloc" = yes ; then +- echo "$as_me:4169: checking for dmalloc.h" >&5 ++ echo "$as_me:4830: checking for dmalloc.h" >&5 + echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4175 "configure" ++#line 4836 "configure" + #include "confdefs.h" + #include <dmalloc.h> + _ACEOF +-if { (eval echo "$as_me:4179: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:4840: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4185: \$? = $ac_status" >&5 ++ echo "$as_me:4846: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4201,11 +4862,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4204: result: $ac_cv_header_dmalloc_h" >&5 ++echo "$as_me:4865: result: $ac_cv_header_dmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 + if test $ac_cv_header_dmalloc_h = yes; then + +-echo "$as_me:4208: checking for dmalloc_debug in -ldmalloc" >&5 ++echo "$as_me:4869: checking for dmalloc_debug in -ldmalloc" >&5 + echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4213,7 +4874,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 4216 "configure" ++#line 4877 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -4232,16 +4893,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4235: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:4896: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4238: \$? = $ac_status" >&5 ++ echo "$as_me:4899: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4241: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:4902: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4244: \$? = $ac_status" >&5 ++ echo "$as_me:4905: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes + else +@@ -4252,7 +4913,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:4255: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 ++echo "$as_me:4916: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 + echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 + if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then + cat >>confdefs.h <<EOF +@@ -4267,7 +4928,7 @@ + + fi + +-echo "$as_me:4270: checking if you want to use dbmalloc for testing" >&5 ++echo "$as_me:4931: checking if you want to use dbmalloc for testing" >&5 + echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + + # Check whether --with-dbmalloc or --without-dbmalloc was given. +@@ -4283,7 +4944,7 @@ + else + with_dbmalloc= + fi; +-echo "$as_me:4286: result: ${with_dbmalloc:-no}" >&5 ++echo "$as_me:4947: result: ${with_dbmalloc:-no}" >&5 + echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + + case .$with_cflags in #(vi +@@ -4377,23 +5038,23 @@ + esac + + if test "$with_dbmalloc" = yes ; then +- echo "$as_me:4380: checking for dbmalloc.h" >&5 ++ echo "$as_me:5041: checking for dbmalloc.h" >&5 + echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 + if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4386 "configure" ++#line 5047 "configure" + #include "confdefs.h" + #include <dbmalloc.h> + _ACEOF +-if { (eval echo "$as_me:4390: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:5051: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4396: \$? = $ac_status" >&5 ++ echo "$as_me:5057: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4412,11 +5073,11 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4415: result: $ac_cv_header_dbmalloc_h" >&5 ++echo "$as_me:5076: result: $ac_cv_header_dbmalloc_h" >&5 + echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 + if test $ac_cv_header_dbmalloc_h = yes; then + +-echo "$as_me:4419: checking for debug_malloc in -ldbmalloc" >&5 ++echo "$as_me:5080: checking for debug_malloc in -ldbmalloc" >&5 + echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 + if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4424,7 +5085,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldbmalloc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 4427 "configure" ++#line 5088 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -4443,16 +5104,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:4446: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:4449: \$? = $ac_status" >&5 ++ echo "$as_me:5110: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:4452: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4455: \$? = $ac_status" >&5 ++ echo "$as_me:5116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes + else +@@ -4463,7 +5124,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:4466: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 ++echo "$as_me:5127: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 + echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 + if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then + cat >>confdefs.h <<EOF +@@ -4478,7 +5139,7 @@ + + fi + +-echo "$as_me:4481: checking if you want to use valgrind for testing" >&5 ++echo "$as_me:5142: checking if you want to use valgrind for testing" >&5 + echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + + # Check whether --with-valgrind or --without-valgrind was given. +@@ -4494,7 +5155,7 @@ + else + with_valgrind= + fi; +-echo "$as_me:4497: result: ${with_valgrind:-no}" >&5 ++echo "$as_me:5158: result: ${with_valgrind:-no}" >&5 + echo "${ECHO_T}${with_valgrind:-no}" >&6 + + case .$with_cflags in #(vi +@@ -4587,7 +5248,7 @@ + ;; + esac + +-echo "$as_me:4590: checking if you want to perform memory-leak testing" >&5 ++echo "$as_me:5251: checking if you want to perform memory-leak testing" >&5 + echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + + # Check whether --enable-leaks or --disable-leaks was given. +@@ -4597,7 +5258,7 @@ + else + : ${with_no_leaks:=no} + fi; +-echo "$as_me:4600: result: $with_no_leaks" >&5 ++echo "$as_me:5261: result: $with_no_leaks" >&5 + echo "${ECHO_T}$with_no_leaks" >&6 + + if test "$with_no_leaks" = yes ; then +@@ -4611,7 +5272,27 @@ + + fi + +-echo "$as_me:4614: checking for specific curses-directory" >&5 ++echo "$as_me:5275: checking if you want to check for wide-character functions" >&5 ++echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 ++ ++# Check whether --enable-widec or --disable-widec was given. ++if test "${enable_widec+set}" = set; then ++ enableval="$enable_widec" ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ cf_enable_widec=no ++ else ++ cf_enable_widec=yes ++ fi ++else ++ enableval=yes ++ cf_enable_widec=yes ++ ++fi; ++echo "$as_me:5292: result: $cf_enable_widec" >&5 ++echo "${ECHO_T}$cf_enable_widec" >&6 ++ ++echo "$as_me:5295: checking for specific curses-directory" >&5 + echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 + + # Check whether --with-curses-dir or --without-curses-dir was given. +@@ -4621,7 +5302,7 @@ + else + cf_cv_curses_dir=no + fi; +-echo "$as_me:4624: result: $cf_cv_curses_dir" >&5 ++echo "$as_me:5305: result: $cf_cv_curses_dir" >&5 + echo "${ECHO_T}$cf_cv_curses_dir" >&6 + + if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +@@ -4640,7 +5321,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) +@@ -4652,7 +5333,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:4655: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:5336: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -4685,7 +5366,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 4688 "configure" ++#line 5369 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -4697,16 +5378,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5381: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4703: \$? = $ac_status" >&5 ++ echo "$as_me:5384: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4706: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5387: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4709: \$? = $ac_status" >&5 ++ echo "$as_me:5390: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -4723,7 +5404,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:4726: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:5407: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -4757,7 +5438,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:4760: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:5441: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -4768,12 +5449,10 @@ + fi + fi + +-# Check whether --with-5lib or --without-5lib was given. +-if test "${with_5lib+set}" = set; then +- withval="$with_5lib" +- LIBS="-L/usr/5lib $LIBS" +- CPPFLAGS="$CPPFLAGS -I/usr/5include" +-fi; ++cf_cv_screen=curses ++ ++echo "$as_me:5454: checking for specified curses library type" >&5 ++echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 + + # Check whether --with-ncursesw or --without-ncursesw was given. + if test "${with_ncursesw+set}" = set; then +@@ -4791,14 +5470,31 @@ + if test "${with_pdcurses+set}" = set; then + withval="$with_pdcurses" + cf_cv_screen=pdcurses ++else ++ ++# Check whether --with-curses-colr or --without-curses-colr was given. ++if test "${with_curses_colr+set}" = set; then ++ withval="$with_curses_colr" ++ cf_cv_screen=curses_colr ++else ++ ++# Check whether --with-curses-5lib or --without-curses-5lib was given. ++if test "${with_curses_5lib+set}" = set; then ++ withval="$with_curses_5lib" ++ cf_cv_screen=curses_5lib ++fi; ++fi; + fi; + fi; + fi; + +-case $cf_cv_screen in +-curses) ++echo "$as_me:5491: result: $cf_cv_screen" >&5 ++echo "${ECHO_T}$cf_cv_screen" >&6 ++ ++case $cf_cv_screen in #(vi ++curses|curses_*) #(vi + +-echo "$as_me:4801: checking for extra include directories" >&5 ++echo "$as_me:5497: checking for extra include directories" >&5 + echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 + if test "${cf_cv_curses_incdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4807,22 +5503,28 @@ + cf_cv_curses_incdir=no + case $host_os in #(vi + hpux10.*) #(vi +- test -d /usr/include/curses_colr && \ +- cf_cv_curses_incdir="-I/usr/include/curses_colr" ++ if test "x$cf_cv_screen" = "xcurses_colr" ++ then ++ test -d /usr/include/curses_colr && \ ++ cf_cv_curses_incdir="-I/usr/include/curses_colr" ++ fi + ;; + sunos3*|sunos4*) +- test -d /usr/5lib && \ +- test -d /usr/5include && \ +- cf_cv_curses_incdir="-I/usr/5include" ++ if test "x$cf_cv_screen" = "xcurses_5lib" ++ then ++ test -d /usr/5lib && \ ++ test -d /usr/5include && \ ++ cf_cv_curses_incdir="-I/usr/5include" ++ fi + ;; + esac + + fi +-echo "$as_me:4821: result: $cf_cv_curses_incdir" >&5 ++echo "$as_me:5523: result: $cf_cv_curses_incdir" >&5 + echo "${ECHO_T}$cf_cv_curses_incdir" >&6 + test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" + +-echo "$as_me:4825: checking if we have identified curses headers" >&5 ++echo "$as_me:5527: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4830,11 +5532,11 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- curses.h \ +- ncurses.h ncurses/curses.h ncurses/ncurses.h ++ ncurses.h \ ++ curses.h ncurses/ncurses.h ncurses/curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4837 "configure" ++#line 5539 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -4846,16 +5548,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5551: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4852: \$? = $ac_status" >&5 ++ echo "$as_me:5554: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4855: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5557: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4858: \$? = $ac_status" >&5 ++ echo "$as_me:5560: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -4866,11 +5568,11 @@ + done + + fi +-echo "$as_me:4869: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:5571: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:4873: error: No curses header-files found" >&5 ++ { { echo "$as_me:5575: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -4880,23 +5582,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:4883: checking for $ac_header" >&5 ++echo "$as_me:5585: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 4889 "configure" ++#line 5591 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:4893: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:5595: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:4899: \$? = $ac_status" >&5 ++ echo "$as_me:5601: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -4915,7 +5617,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:4918: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:5620: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -4925,7 +5627,7 @@ + fi + done + +-echo "$as_me:4928: checking for terminfo header" >&5 ++echo "$as_me:5630: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -4943,7 +5645,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 4946 "configure" ++#line 5648 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -4958,16 +5660,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:4961: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:5663: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:4964: \$? = $ac_status" >&5 ++ echo "$as_me:5666: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:4967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5669: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:4970: \$? = $ac_status" >&5 ++ echo "$as_me:5672: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -4983,7 +5685,7 @@ + done + + fi +-echo "$as_me:4986: result: $cf_cv_term_header" >&5 ++echo "$as_me:5688: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -5012,7 +5714,7 @@ + ;; + esac + +-echo "$as_me:5015: checking for ncurses version" >&5 ++echo "$as_me:5717: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5038,10 +5740,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:5041: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:5743: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:5044: \$? = $ac_status" >&5 ++ echo "$as_me:5746: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -5051,7 +5753,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5054 "configure" ++#line 5756 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -5076,15 +5778,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:5079: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5781: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5082: \$? = $ac_status" >&5 ++ echo "$as_me:5784: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:5084: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5786: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5087: \$? = $ac_status" >&5 ++ echo "$as_me:5789: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -5098,16 +5800,16 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:5101: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:5803: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 + EOF + +-echo "$as_me:5107: checking if we have identified curses libraries" >&5 ++echo "$as_me:5809: checking if we have identified curses libraries" >&5 + echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 5110 "configure" ++#line 5812 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5119,16 +5821,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5122: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5125: \$? = $ac_status" >&5 ++ echo "$as_me:5827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5131: \$? = $ac_status" >&5 ++ echo "$as_me:5833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -5137,13 +5839,13 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:5140: result: $cf_result" >&5 ++echo "$as_me:5842: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = no ; then + case $host_os in #(vi + freebsd*) #(vi +- echo "$as_me:5146: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:5848: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5151,7 +5853,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5154 "configure" ++#line 5856 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5170,16 +5872,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5173: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5875: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5176: \$? = $ac_status" >&5 ++ echo "$as_me:5878: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5179: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5881: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5182: \$? = $ac_status" >&5 ++ echo "$as_me:5884: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -5190,7 +5892,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5193: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:5895: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + LIBS="-lmytinfo $LIBS" +@@ -5198,7 +5900,13 @@ + + ;; + hpux10.*) #(vi +- echo "$as_me:5201: checking for initscr in -lcur_colr" >&5 ++ # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr ++ # next (1998), and xcurses "newer" (2000). There is no header file for ++ # Hcurses; the subdirectory curses_colr has the headers (curses.h and ++ # term.h) for cur_colr ++ if test "x$cf_cv_screen" = "xcurses_colr" ++ then ++ echo "$as_me:5909: checking for initscr in -lcur_colr" >&5 + echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 + if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5206,7 +5914,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcur_colr $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5209 "configure" ++#line 5917 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5225,16 +5933,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5228: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5936: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5231: \$? = $ac_status" >&5 ++ echo "$as_me:5939: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5234: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5942: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5237: \$? = $ac_status" >&5 ++ echo "$as_me:5945: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cur_colr_initscr=yes + else +@@ -5245,16 +5953,16 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5248: result: $ac_cv_lib_cur_colr_initscr" >&5 ++echo "$as_me:5956: result: $ac_cv_lib_cur_colr_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 + if test $ac_cv_lib_cur_colr_initscr = yes; then + +- LIBS="-lcur_colr $LIBS" +- ac_cv_func_initscr=yes ++ LIBS="-lcur_colr $LIBS" ++ ac_cv_func_initscr=yes + + else + +- echo "$as_me:5257: checking for initscr in -lHcurses" >&5 ++ echo "$as_me:5965: checking for initscr in -lHcurses" >&5 + echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 + if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5262,7 +5970,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lHcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5265 "configure" ++#line 5973 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5281,16 +5989,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5284: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:5992: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5287: \$? = $ac_status" >&5 ++ echo "$as_me:5995: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5290: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:5998: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5293: \$? = $ac_status" >&5 ++ echo "$as_me:6001: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Hcurses_initscr=yes + else +@@ -5301,19 +6009,20 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5304: result: $ac_cv_lib_Hcurses_initscr" >&5 ++echo "$as_me:6012: result: $ac_cv_lib_Hcurses_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 + if test $ac_cv_lib_Hcurses_initscr = yes; then + +- # HP's header uses __HP_CURSES, but user claims _HP_CURSES. +- LIBS="-lHcurses $LIBS" +- CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" +- ac_cv_func_initscr=yes ++ # HP's header uses __HP_CURSES, but user claims _HP_CURSES. ++ LIBS="-lHcurses $LIBS" ++ CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" ++ ac_cv_func_initscr=yes + + fi + + fi + ++ fi + ;; + linux*) + case `arch 2>/dev/null` in +@@ -5340,7 +6049,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:5343: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6052: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -5369,7 +6078,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:5372: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6081: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -5400,7 +6109,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:5403: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6112: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -5412,7 +6121,9 @@ + esac + ;; + sunos3*|sunos4*) +- if test -d /usr/5lib ; then ++ if test "x$cf_cv_screen" = "xcurses_5lib" ++ then ++ if test -d /usr/5lib ; then + + if test -n "/usr/5lib" ; then + for cf_add_libdir in /usr/5lib +@@ -5433,7 +6144,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:5436: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:6147: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -5441,7 +6152,8 @@ + done + fi + +- LIBS="-lcurses -ltermcap $LIBS" ++ LIBS="-lcurses -ltermcap $LIBS" ++ fi + fi + ac_cv_func_initscr=yes + ;; +@@ -5461,13 +6173,13 @@ + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. +- echo "$as_me:5464: checking for tgoto" >&5 ++ echo "$as_me:6176: checking for tgoto" >&5 + echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 + if test "${ac_cv_func_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5470 "configure" ++#line 6182 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char tgoto (); below. */ +@@ -5490,7 +6202,7 @@ + #if defined (__stub_tgoto) || defined (__stub___tgoto) + choke me + #else +-f = tgoto; ++f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -5498,16 +6210,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5501: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6213: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5504: \$? = $ac_status" >&5 ++ echo "$as_me:6216: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6219: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5510: \$? = $ac_status" >&5 ++ echo "$as_me:6222: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_tgoto=yes + else +@@ -5517,16 +6229,16 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:5520: result: $ac_cv_func_tgoto" >&5 ++echo "$as_me:6232: result: $ac_cv_func_tgoto" >&5 + echo "${ECHO_T}$ac_cv_func_tgoto" >&6 + if test $ac_cv_func_tgoto = yes; then + cf_term_lib=predefined + else + +- for cf_term_lib in $cf_check_list termcap termlib unknown ++ for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +-echo "$as_me:5529: checking for tgoto in -l$cf_term_lib" >&5 ++echo "$as_me:6241: checking for tgoto in -l$cf_term_lib" >&5 + echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5534,7 +6246,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_term_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5537 "configure" ++#line 6249 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5553,16 +6265,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5556: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6268: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5559: \$? = $ac_status" >&5 ++ echo "$as_me:6271: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5562: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6274: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5565: \$? = $ac_status" >&5 ++ echo "$as_me:6277: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -5573,7 +6285,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5576: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:6288: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + break +@@ -5588,7 +6300,7 @@ + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` +-echo "$as_me:5591: checking for initscr in -l$cf_curs_lib" >&5 ++echo "$as_me:6303: checking for initscr in -l$cf_curs_lib" >&5 + echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5596,7 +6308,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_curs_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5599 "configure" ++#line 6311 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -5615,16 +6327,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5618: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6330: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5621: \$? = $ac_status" >&5 ++ echo "$as_me:6333: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5624: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5627: \$? = $ac_status" >&5 ++ echo "$as_me:6339: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -5635,23 +6347,23 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:5638: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:6350: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + break + fi + + done +- test $cf_curs_lib = unknown && { { echo "$as_me:5645: error: no curses library found" >&5 ++ test $cf_curs_lib = unknown && { { echo "$as_me:6357: error: no curses library found" >&5 + echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } + + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then +- echo "$as_me:5651: checking if we can link with $cf_curs_lib library" >&5 ++ echo "$as_me:6363: checking if we can link with $cf_curs_lib library" >&5 + echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 5654 "configure" ++#line 6366 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5663,16 +6375,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5666: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6378: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5669: \$? = $ac_status" >&5 ++ echo "$as_me:6381: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5672: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5675: \$? = $ac_status" >&5 ++ echo "$as_me:6387: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -5681,18 +6393,18 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:5684: result: $cf_result" >&5 ++ echo "$as_me:6396: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 +- test $cf_result = no && { { echo "$as_me:5686: error: Cannot link curses library" >&5 ++ test $cf_result = no && { { echo "$as_me:6398: error: Cannot link curses library" >&5 + echo "$as_me: error: Cannot link curses library" >&2;} + { (exit 1); exit 1; }; } + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then +- echo "$as_me:5692: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 ++ echo "$as_me:6404: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 5695 "configure" ++#line 6407 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5704,16 +6416,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5707: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6419: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5710: \$? = $ac_status" >&5 ++ echo "$as_me:6422: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5713: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6425: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5716: \$? = $ac_status" >&5 ++ echo "$as_me:6428: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no + else +@@ -5722,7 +6434,7 @@ + + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 5725 "configure" ++#line 6437 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -5734,16 +6446,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:5737: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6449: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:5740: \$? = $ac_status" >&5 ++ echo "$as_me:6452: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:5743: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5746: \$? = $ac_status" >&5 ++ echo "$as_me:6458: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -5755,167 +6467,99 @@ + + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:5758: result: $cf_result" >&5 ++ echo "$as_me:6470: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + fi + fi + fi + +-echo "$as_me:5764: checking for NetBSD form.h" >&5 +-echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 +-if test "${cf_cv_netbsd_form_h+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +-cat >conftest.$ac_ext <<_ACEOF +-#line 5771 "configure" +-#include "confdefs.h" +- +-#include <${cf_cv_ncurses_header:-curses.h}> +-#include <form.h> +- +-int +-main () +-{ +- +- FORM *form; +- int y = current_field(form)->cursor_ypos; +- int x = current_field(form)->cursor_xpos; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:5793: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5796: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:5799: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cf_cv_netbsd_form_h=yes +- +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-cf_cv_netbsd_form_h=no +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext ++ ;; ++ncurses) #(vi + +-fi +-echo "$as_me:5811: result: $cf_cv_netbsd_form_h" >&5 +-echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 ++cf_ncuconfig_root=ncurses + +-test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF +-#define HAVE_NETBSD_FORM_H 1 +-EOF ++echo "Looking for ${cf_ncuconfig_root}-config" + +-echo "$as_me:5818: checking for NetBSD menu.h" >&5 +-echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 +-if test "${cf_cv_netbsd_menu_h+set}" = set; then ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:6488: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:6503: found $ac_dir/$ac_word" >&5 ++break ++done + +-cat >conftest.$ac_ext <<_ACEOF +-#line 5825 "configure" +-#include "confdefs.h" +- +-#include <${cf_cv_ncurses_header:-curses.h}> +-#include <menu.h> +- +-int +-main () +-{ +- +- MENU *menu; +- int y = menu->max_item_width; +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:5846: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5849: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:5852: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cf_cv_netbsd_menu_h=yes +- ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:6511: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-cf_cv_netbsd_menu_h=no ++ echo "$as_me:6514: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi +-rm -f conftest.$ac_objext conftest.$ac_ext + ++ test -n "$NCURSES_CONFIG" && break ++ done + fi +-echo "$as_me:5864: result: $cf_cv_netbsd_menu_h" >&5 +-echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 +- +-test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF +-#define HAVE_NETBSD_MENU_H 1 +-EOF +- +- ;; +-ncurses) +- +-cf_ncuconfig_root=ncurses +- +-echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:5881: checking for $ac_word" >&5 ++echo "$as_me:6527: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. ++else + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:5898: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:6542: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:5909: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:6550: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:5912: result: no" >&5 ++ echo "$as_me:6553: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -5924,7 +6568,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:5927: checking if we have identified curses headers" >&5 ++echo "$as_me:6571: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -5932,13 +6576,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncurses/curses.h \ +- ncurses/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncurses/ncurses.h \ ++ ncurses/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 5941 "configure" ++#line 6585 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -5950,16 +6594,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:5953: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:5956: \$? = $ac_status" >&5 ++ echo "$as_me:6600: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:5959: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6603: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:5962: \$? = $ac_status" >&5 ++ echo "$as_me:6606: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -5970,11 +6614,11 @@ + done + + fi +-echo "$as_me:5973: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:6617: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:5977: error: No curses header-files found" >&5 ++ { { echo "$as_me:6621: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -5984,23 +6628,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:5987: checking for $ac_header" >&5 ++echo "$as_me:6631: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 5993 "configure" ++#line 6637 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:5997: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:6641: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:6003: \$? = $ac_status" >&5 ++ echo "$as_me:6647: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -6019,7 +6663,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:6022: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:6666: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -6072,7 +6716,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6075 "configure" ++#line 6719 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6084,16 +6728,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6087: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6731: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6090: \$? = $ac_status" >&5 ++ echo "$as_me:6734: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6093: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6096: \$? = $ac_status" >&5 ++ echo "$as_me:6740: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6110,7 +6754,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6113: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:6757: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6127,7 +6771,7 @@ + + } + +-echo "$as_me:6130: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:6774: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6139,7 +6783,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6142 "configure" ++#line 6786 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6163,16 +6807,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6166: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6169: \$? = $ac_status" >&5 ++ echo "$as_me:6813: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6172: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6816: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6175: \$? = $ac_status" >&5 ++ echo "$as_me:6819: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -6187,14 +6831,14 @@ + done + + fi +-echo "$as_me:6190: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:6834: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:6197: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:6841: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6334,7 +6978,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6337 "configure" ++#line 6981 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6346,16 +6990,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6993: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6352: \$? = $ac_status" >&5 ++ echo "$as_me:6996: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6355: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6999: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6358: \$? = $ac_status" >&5 ++ echo "$as_me:7002: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6372,7 +7016,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6375: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7019: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6393,7 +7037,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 6396 "configure" ++#line 7040 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -6417,16 +7061,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6420: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7064: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6423: \$? = $ac_status" >&5 ++ echo "$as_me:7067: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6426: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7070: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6429: \$? = $ac_status" >&5 ++ echo "$as_me:7073: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -6447,12 +7091,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6450: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:7094: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:6455: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:7099: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -6485,7 +7129,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 6488 "configure" ++#line 7132 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -6497,16 +7141,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6500: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7144: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6503: \$? = $ac_status" >&5 ++ echo "$as_me:7147: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6506: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7150: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6509: \$? = $ac_status" >&5 ++ echo "$as_me:7153: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -6523,7 +7167,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:6526: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:7170: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -6566,7 +7210,7 @@ + ;; + esac + +-echo "$as_me:6569: checking for terminfo header" >&5 ++echo "$as_me:7213: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6584,7 +7228,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 6587 "configure" ++#line 7231 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6599,16 +7243,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6602: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7246: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6605: \$? = $ac_status" >&5 ++ echo "$as_me:7249: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6608: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7252: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6611: \$? = $ac_status" >&5 ++ echo "$as_me:7255: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -6624,7 +7268,7 @@ + done + + fi +-echo "$as_me:6627: result: $cf_cv_term_header" >&5 ++echo "$as_me:7271: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -6658,7 +7302,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:6661: checking for ncurses version" >&5 ++echo "$as_me:7305: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6684,10 +7328,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:6687: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:7331: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:6690: \$? = $ac_status" >&5 ++ echo "$as_me:7334: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -6697,7 +7341,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6700 "configure" ++#line 7344 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -6722,15 +7366,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:6725: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7369: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6728: \$? = $ac_status" >&5 ++ echo "$as_me:7372: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:6730: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7374: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6733: \$? = $ac_status" >&5 ++ echo "$as_me:7377: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -6744,7 +7388,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:6747: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:7391: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -6756,7 +7400,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:6759: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:7403: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6764,7 +7408,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6767 "configure" ++#line 7411 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6783,16 +7427,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6786: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7430: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6789: \$? = $ac_status" >&5 ++ echo "$as_me:7433: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6792: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6795: \$? = $ac_status" >&5 ++ echo "$as_me:7439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -6803,10 +7447,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6806: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:7450: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:6809: checking for initscr in -lgpm" >&5 ++ echo "$as_me:7453: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6814,7 +7458,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6817 "configure" ++#line 7461 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6833,16 +7477,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6836: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7480: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6839: \$? = $ac_status" >&5 ++ echo "$as_me:7483: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6842: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7486: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6845: \$? = $ac_status" >&5 ++ echo "$as_me:7489: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -6853,7 +7497,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6856: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:7500: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -6868,7 +7512,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:6871: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:7515: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -6876,7 +7520,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 6879 "configure" ++#line 7523 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -6895,16 +7539,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6898: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7542: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6901: \$? = $ac_status" >&5 ++ echo "$as_me:7545: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6904: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7548: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6907: \$? = $ac_status" >&5 ++ echo "$as_me:7551: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -6915,7 +7559,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:6918: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:7562: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -6934,13 +7578,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:6937: checking for initscr" >&5 ++ echo "$as_me:7581: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 6943 "configure" ++#line 7587 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -6963,7 +7607,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -6971,16 +7615,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6974: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7618: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6977: \$? = $ac_status" >&5 ++ echo "$as_me:7621: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6980: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7624: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6983: \$? = $ac_status" >&5 ++ echo "$as_me:7627: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -6990,18 +7634,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:6993: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:7637: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:7000: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:7644: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7004 "configure" ++#line 7648 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7013,25 +7657,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7016: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7660: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7019: \$? = $ac_status" >&5 ++ echo "$as_me:7663: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7022: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7666: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7025: \$? = $ac_status" >&5 ++ echo "$as_me:7669: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7027: result: yes" >&5 ++ echo "$as_me:7671: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7034: result: no" >&5 ++echo "$as_me:7678: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -7121,11 +7765,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:7124: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:7768: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7128 "configure" ++#line 7772 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7137,25 +7781,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7140: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7784: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7143: \$? = $ac_status" >&5 ++ echo "$as_me:7787: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7790: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7149: \$? = $ac_status" >&5 ++ echo "$as_me:7793: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7151: result: yes" >&5 ++ echo "$as_me:7795: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7158: result: no" >&5 ++echo "$as_me:7802: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -7170,7 +7814,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:7173: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:7817: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7178,7 +7822,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:7181: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:7825: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -7188,7 +7832,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 7191 "configure" ++#line 7835 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -7200,23 +7844,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7203: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7847: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7206: \$? = $ac_status" >&5 ++ echo "$as_me:7850: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7209: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7212: \$? = $ac_status" >&5 ++ echo "$as_me:7856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:7214: result: yes" >&5 ++ echo "$as_me:7858: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:7219: result: no" >&5 ++echo "$as_me:7863: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -7232,10 +7876,9 @@ + fi + + ;; +-ncursesw) +- cf_cv_libtype=w ++ncursesw) #(vi + +-echo "$as_me:7238: checking for multibyte character support" >&5 ++echo "$as_me:7881: checking for multibyte character support" >&5 + echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 + if test "${cf_cv_utf8_lib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7243,7 +7886,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 7246 "configure" ++#line 7889 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -7256,16 +7899,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7902: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7262: \$? = $ac_status" >&5 ++ echo "$as_me:7905: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7265: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7908: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7268: \$? = $ac_status" >&5 ++ echo "$as_me:7911: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -7277,12 +7920,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me:-configure}:7280: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:7923: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7285 "configure" ++#line 7928 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -7295,16 +7938,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7298: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7941: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7301: \$? = $ac_status" >&5 ++ echo "$as_me:7944: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7304: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7947: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7307: \$? = $ac_status" >&5 ++ echo "$as_me:7950: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -7318,7 +7961,7 @@ + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7321 "configure" ++#line 7964 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -7331,16 +7974,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7334: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7977: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7337: \$? = $ac_status" >&5 ++ echo "$as_me:7980: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7340: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7343: \$? = $ac_status" >&5 ++ echo "$as_me:7986: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes +@@ -7357,9 +8000,9 @@ + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me:-configure}:7360: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me:-configure}:8003: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me:-configure}:7362: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:8005: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7472,11 +8115,11 @@ + if test -d $cf_cv_header_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7475: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8118: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 7479 "configure" ++#line 8122 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -7489,21 +8132,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7492: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8135: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7495: \$? = $ac_status" >&5 ++ echo "$as_me:8138: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7498: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8141: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7501: \$? = $ac_status" >&5 ++ echo "$as_me:8144: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7506: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8149: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7521,7 +8164,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me:-configure}:7524: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me:-configure}:8167: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -7618,13 +8261,13 @@ + if test -d $cf_cv_library_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7621: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8264: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +-#line 7627 "configure" ++#line 8270 "configure" + #include "confdefs.h" + + #include <libutf8.h> +@@ -7637,21 +8280,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7640: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:8283: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7643: \$? = $ac_status" >&5 ++ echo "$as_me:8286: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7646: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7649: \$? = $ac_status" >&5 ++ echo "$as_me:8292: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +-echo "${as_me:-configure}:7654: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me:-configure}:8297: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -7693,7 +8336,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7696: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:8339: result: $cf_cv_utf8_lib" >&5 + echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + + # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +@@ -7727,7 +8370,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 7730 "configure" ++#line 8373 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -7739,16 +8382,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7742: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8385: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7745: \$? = $ac_status" >&5 ++ echo "$as_me:8388: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7748: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8391: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7751: \$? = $ac_status" >&5 ++ echo "$as_me:8394: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7765,7 +8408,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:7768: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8411: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7799,7 +8442,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me:-configure}:7802: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me:-configure}:8445: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7813,48 +8456,87 @@ + cf_ncuconfig_root=ncursesw + + echo "Looking for ${cf_ncuconfig_root}-config" +-for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:8465: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$NCURSES_CONFIG"; then ++ ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:8480: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG ++if test -n "$NCURSES_CONFIG"; then ++ echo "$as_me:8488: result: $NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++else ++ echo "$as_me:8491: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$NCURSES_CONFIG" && break ++ done ++fi ++if test -z "$NCURSES_CONFIG"; then ++ ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG ++ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + 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:7820: checking for $ac_word" >&5 ++echo "$as_me:8504: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $NCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_NCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. ++else + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:7837: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" ++echo "$as_me:8519: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +- +-if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:7848: result: $NCURSES_CONFIG" >&5 +-echo "${ECHO_T}$NCURSES_CONFIG" >&6 ++fi ++ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG ++if test -n "$ac_ct_NCURSES_CONFIG"; then ++ echo "$as_me:8527: result: $ac_ct_NCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 + else +- echo "$as_me:7851: result: no" >&5 ++ echo "$as_me:8530: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$NCURSES_CONFIG" && break ++ test -n "$ac_ct_NCURSES_CONFIG" && break + done +-test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" ++test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" ++ ++ NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG ++fi + + if test "$NCURSES_CONFIG" != none ; then + +@@ -7863,7 +8545,7 @@ + + # even with config script, some packages use no-override for curses.h + +-echo "$as_me:7866: checking if we have identified curses headers" >&5 ++echo "$as_me:8548: checking if we have identified curses headers" >&5 + echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 + if test "${cf_cv_ncurses_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7871,13 +8553,13 @@ + + cf_cv_ncurses_header=none + for cf_header in \ +- ncursesw/curses.h \ +- ncursesw/ncurses.h \ +- curses.h \ +- ncurses.h ++ ncursesw/ncurses.h \ ++ ncursesw/curses.h \ ++ ncurses.h \ ++ curses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 7880 "configure" ++#line 8562 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -7889,16 +8571,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7892: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8574: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7895: \$? = $ac_status" >&5 ++ echo "$as_me:8577: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7898: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8580: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7901: \$? = $ac_status" >&5 ++ echo "$as_me:8583: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -7909,11 +8591,11 @@ + done + + fi +-echo "$as_me:7912: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:8594: result: $cf_cv_ncurses_header" >&5 + echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + + if test "$cf_cv_ncurses_header" = none ; then +- { { echo "$as_me:7916: error: No curses header-files found" >&5 ++ { { echo "$as_me:8598: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -7923,23 +8605,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:7926: checking for $ac_header" >&5 ++echo "$as_me:8608: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 7932 "configure" ++#line 8614 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:7936: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8618: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:7942: \$? = $ac_status" >&5 ++ echo "$as_me:8624: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -7958,7 +8640,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:7961: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8643: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -8011,7 +8693,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 8014 "configure" ++#line 8696 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8023,16 +8705,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8026: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8708: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8029: \$? = $ac_status" >&5 ++ echo "$as_me:8711: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8032: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8035: \$? = $ac_status" >&5 ++ echo "$as_me:8717: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8049,7 +8731,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8052: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:8734: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8066,7 +8748,7 @@ + + } + +-echo "$as_me:8069: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:8751: checking for $cf_ncuhdr_root header in include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8078,7 +8760,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 8081 "configure" ++#line 8763 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -8110,16 +8792,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8113: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8795: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8116: \$? = $ac_status" >&5 ++ echo "$as_me:8798: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8119: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8122: \$? = $ac_status" >&5 ++ echo "$as_me:8804: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -8134,14 +8816,14 @@ + done + + fi +-echo "$as_me:8137: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:8819: result: $cf_cv_ncurses_h" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + + if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h + else + +-echo "$as_me:8144: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:8826: checking for $cf_ncuhdr_root include-path" >&5 + echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 + if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8281,7 +8963,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 8284 "configure" ++#line 8966 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8293,16 +8975,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8296: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8978: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8299: \$? = $ac_status" >&5 ++ echo "$as_me:8981: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8302: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8305: \$? = $ac_status" >&5 ++ echo "$as_me:8987: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8319,7 +9001,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8322: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9004: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8340,7 +9022,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 8343 "configure" ++#line 9025 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -8364,16 +9046,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8367: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9049: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8370: \$? = $ac_status" >&5 ++ echo "$as_me:9052: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9055: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8376: \$? = $ac_status" >&5 ++ echo "$as_me:9058: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -8394,12 +9076,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8397: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9079: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:8402: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:9084: result: $cf_cv_ncurses_h2" >&5 + echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` +@@ -8432,7 +9114,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 8435 "configure" ++#line 9117 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -8444,16 +9126,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8447: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8450: \$? = $ac_status" >&5 ++ echo "$as_me:9132: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8453: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8456: \$? = $ac_status" >&5 ++ echo "$as_me:9138: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8470,7 +9152,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me:-configure}:8473: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me:-configure}:9155: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -8513,7 +9195,7 @@ + ;; + esac + +-echo "$as_me:8516: checking for terminfo header" >&5 ++echo "$as_me:9198: checking for terminfo header" >&5 + echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8531,7 +9213,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 8534 "configure" ++#line 9216 "configure" + #include "confdefs.h" + #include <stdio.h> + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8546,16 +9228,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8549: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9231: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8552: \$? = $ac_status" >&5 ++ echo "$as_me:9234: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8555: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9237: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8558: \$? = $ac_status" >&5 ++ echo "$as_me:9240: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -8571,7 +9253,7 @@ + done + + fi +-echo "$as_me:8574: result: $cf_cv_term_header" >&5 ++echo "$as_me:9256: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -8605,7 +9287,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:8608: checking for ncurses version" >&5 ++echo "$as_me:9290: checking for ncurses version" >&5 + echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 + if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8631,10 +9313,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:8634: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:9316: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:8637: \$? = $ac_status" >&5 ++ echo "$as_me:9319: \$? = $ac_status" >&5 + (exit $ac_status); } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` +@@ -8644,7 +9326,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8647 "configure" ++#line 9329 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -8669,15 +9351,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:8672: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9354: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8675: \$? = $ac_status" >&5 ++ echo "$as_me:9357: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:8677: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9359: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8680: \$? = $ac_status" >&5 ++ echo "$as_me:9362: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -8691,7 +9373,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:8694: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:9376: result: $cf_cv_ncurses_version" >&5 + echo "${ECHO_T}$cf_cv_ncurses_version" >&6 + test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF + #define NCURSES 1 +@@ -8703,7 +9385,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:8706: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:9388: checking for Gpm_Open in -lgpm" >&5 + echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8711,7 +9393,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8714 "configure" ++#line 9396 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8730,16 +9412,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8733: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9415: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8736: \$? = $ac_status" >&5 ++ echo "$as_me:9418: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8739: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9421: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8742: \$? = $ac_status" >&5 ++ echo "$as_me:9424: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -8750,10 +9432,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8753: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:9435: result: $ac_cv_lib_gpm_Gpm_Open" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 + if test $ac_cv_lib_gpm_Gpm_Open = yes; then +- echo "$as_me:8756: checking for initscr in -lgpm" >&5 ++ echo "$as_me:9438: checking for initscr in -lgpm" >&5 + echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 + if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8761,7 +9443,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8764 "configure" ++#line 9446 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8780,16 +9462,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8783: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9465: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8786: \$? = $ac_status" >&5 ++ echo "$as_me:9468: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8789: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9471: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8792: \$? = $ac_status" >&5 ++ echo "$as_me:9474: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -8800,7 +9482,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8803: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:9485: result: $ac_cv_lib_gpm_initscr" >&5 + echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 + if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +@@ -8815,7 +9497,7 @@ + # This is only necessary if you are linking against an obsolete + # version of ncurses (but it should do no harm, since it's static). + if test "$cf_nculib_root" = ncurses ; then +- echo "$as_me:8818: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:9500: checking for tgoto in -lmytinfo" >&5 + echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 + if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -8823,7 +9505,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8826 "configure" ++#line 9508 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -8842,16 +9524,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8845: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9527: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8848: \$? = $ac_status" >&5 ++ echo "$as_me:9530: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8851: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8854: \$? = $ac_status" >&5 ++ echo "$as_me:9536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -8862,7 +9544,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:8865: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:9547: result: $ac_cv_lib_mytinfo_tgoto" >&5 + echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 + if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +@@ -8881,13 +9563,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:8884: checking for initscr" >&5 ++ echo "$as_me:9566: checking for initscr" >&5 + echo $ECHO_N "checking for initscr... $ECHO_C" >&6 + if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 8890 "configure" ++#line 9572 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -8910,7 +9592,7 @@ + #if defined (__stub_initscr) || defined (__stub___initscr) + choke me + #else +-f = initscr; ++f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -8918,16 +9600,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8921: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9603: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8924: \$? = $ac_status" >&5 ++ echo "$as_me:9606: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8927: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9609: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8930: \$? = $ac_status" >&5 ++ echo "$as_me:9612: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -8937,18 +9619,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:8940: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:9622: result: $ac_cv_func_initscr" >&5 + echo "${ECHO_T}$ac_cv_func_initscr" >&6 + if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + else + + cf_save_LIBS="$LIBS" +- echo "$as_me:8947: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:9629: checking for initscr in -l$cf_nculib_root" >&5 + echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 8951 "configure" ++#line 9633 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -8960,25 +9642,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:8963: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9645: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:8966: \$? = $ac_status" >&5 ++ echo "$as_me:9648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:8969: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8972: \$? = $ac_status" >&5 ++ echo "$as_me:9654: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:8974: result: yes" >&5 ++ echo "$as_me:9656: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:8981: result: no" >&5 ++echo "$as_me:9663: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -9068,11 +9750,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:9071: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:9753: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9075 "configure" ++#line 9757 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9084,25 +9766,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9087: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9769: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9090: \$? = $ac_status" >&5 ++ echo "$as_me:9772: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9093: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9775: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9096: \$? = $ac_status" >&5 ++ echo "$as_me:9778: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9098: result: yes" >&5 ++ echo "$as_me:9780: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:9105: result: no" >&5 ++echo "$as_me:9787: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -9117,7 +9799,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:9120: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:9802: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -9125,7 +9807,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:9128: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:9810: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do +@@ -9135,7 +9817,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 9138 "configure" ++#line 9820 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> + int +@@ -9147,23 +9829,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9150: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9832: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9153: \$? = $ac_status" >&5 ++ echo "$as_me:9835: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9156: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9838: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9159: \$? = $ac_status" >&5 ++ echo "$as_me:9841: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:9161: result: yes" >&5 ++ echo "$as_me:9843: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:9166: result: no" >&5 ++echo "$as_me:9848: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -9179,9 +9861,9 @@ + fi + + ;; +-pdcurses) #(vi ++pdcurses) + +-echo "$as_me:9184: checking if you want to use pkg-config" >&5 ++echo "$as_me:9866: checking if you want to use pkg-config" >&5 + echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 + + # Check whether --with-pkg-config or --without-pkg-config was given. +@@ -9191,7 +9873,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:9194: result: $cf_pkg_config" >&5 ++echo "$as_me:9876: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in #(vi +@@ -9199,10 +9881,11 @@ + PKG_CONFIG=none + ;; + yes) #(vi +- if test -n "$ac_tool_prefix"; then ++ ++if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. + set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-echo "$as_me:9205: checking for $ac_word" >&5 ++echo "$as_me:9888: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9219,7 +9902,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:9222: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:9905: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9230,10 +9913,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:9233: result: $PKG_CONFIG" >&5 ++ echo "$as_me:9916: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:9236: result: no" >&5 ++ echo "$as_me:9919: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9242,7 +9925,7 @@ + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:9245: checking for $ac_word" >&5 ++echo "$as_me:9928: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9259,7 +9942,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:9262: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:9945: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -9271,10 +9954,10 @@ + ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + + if test -n "$ac_pt_PKG_CONFIG"; then +- echo "$as_me:9274: result: $ac_pt_PKG_CONFIG" >&5 ++ echo "$as_me:9957: result: $ac_pt_PKG_CONFIG" >&5 + echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + else +- echo "$as_me:9277: result: no" >&5 ++ echo "$as_me:9960: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -9305,7 +9988,7 @@ + ;; + .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +-.\${*prefix}*) #(vi ++.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) +@@ -9317,7 +10000,7 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:9320: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:10003: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -9325,7 +10008,7 @@ + + fi + +-echo "$as_me:9328: checking for X" >&5 ++echo "$as_me:10011: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + + # Check whether --with-x or --without-x was given. +@@ -9422,17 +10105,17 @@ + # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +-#line 9425 "configure" ++#line 10108 "configure" + #include "confdefs.h" + #include <X11/Intrinsic.h> + _ACEOF +-if { (eval echo "$as_me:9429: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10112: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:9435: \$? = $ac_status" >&5 ++ echo "$as_me:10118: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -9465,7 +10148,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9468 "configure" ++#line 10151 "configure" + #include "confdefs.h" + #include <X11/Intrinsic.h> + int +@@ -9477,16 +10160,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9480: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10163: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9483: \$? = $ac_status" >&5 ++ echo "$as_me:10166: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9486: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10169: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9489: \$? = $ac_status" >&5 ++ echo "$as_me:10172: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -9524,7 +10207,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:9527: result: $have_x" >&5 ++ echo "$as_me:10210: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -9534,7 +10217,7 @@ + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$as_me:9537: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:10220: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -9558,11 +10241,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:9561: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:10244: checking whether -R must be followed by a space" >&5 + echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +-#line 9565 "configure" ++#line 10248 "configure" + #include "confdefs.h" + + int +@@ -9574,16 +10257,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9577: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10260: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9580: \$? = $ac_status" >&5 ++ echo "$as_me:10263: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9583: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10266: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9586: \$? = $ac_status" >&5 ++ echo "$as_me:10269: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes + else +@@ -9593,13 +10276,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then +- echo "$as_me:9596: result: no" >&5 ++ echo "$as_me:10279: result: no" >&5 + echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF +-#line 9602 "configure" ++#line 10285 "configure" + #include "confdefs.h" + + int +@@ -9611,16 +10294,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9614: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10297: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9617: \$? = $ac_status" >&5 ++ echo "$as_me:10300: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9620: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10303: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9623: \$? = $ac_status" >&5 ++ echo "$as_me:10306: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes + else +@@ -9630,11 +10313,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then +- echo "$as_me:9633: result: yes" >&5 ++ echo "$as_me:10316: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:9637: result: neither works" >&5 ++ echo "$as_me:10320: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -9654,7 +10337,7 @@ + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF +-#line 9657 "configure" ++#line 10340 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9673,22 +10356,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9676: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10359: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9679: \$? = $ac_status" >&5 ++ echo "$as_me:10362: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9682: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10365: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9685: \$? = $ac_status" >&5 ++ echo "$as_me:10368: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:9691: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:10374: checking for dnet_ntoa in -ldnet" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9696,7 +10379,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9699 "configure" ++#line 10382 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9715,16 +10398,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9718: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10401: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9721: \$? = $ac_status" >&5 ++ echo "$as_me:10404: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9724: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10407: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9727: \$? = $ac_status" >&5 ++ echo "$as_me:10410: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -9735,14 +10418,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9738: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:10421: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 + if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" + fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then +- echo "$as_me:9745: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:10428: checking for dnet_ntoa in -ldnet_stub" >&5 + echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9750,7 +10433,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9753 "configure" ++#line 10436 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9769,16 +10452,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9772: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10455: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9775: \$? = $ac_status" >&5 ++ echo "$as_me:10458: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9778: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10461: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9781: \$? = $ac_status" >&5 ++ echo "$as_me:10464: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -9789,7 +10472,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9792: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:10475: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 + echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 + if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +@@ -9808,13 +10491,13 @@ + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. +- echo "$as_me:9811: checking for gethostbyname" >&5 ++ echo "$as_me:10494: checking for gethostbyname" >&5 + echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9817 "configure" ++#line 10500 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. */ +@@ -9837,7 +10520,7 @@ + #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) + choke me + #else +-f = gethostbyname; ++f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -9845,16 +10528,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9848: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10531: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9851: \$? = $ac_status" >&5 ++ echo "$as_me:10534: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10537: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9857: \$? = $ac_status" >&5 ++ echo "$as_me:10540: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -9864,11 +10547,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:9867: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:10550: result: $ac_cv_func_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 + + if test $ac_cv_func_gethostbyname = no; then +- echo "$as_me:9871: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:10554: checking for gethostbyname in -lnsl" >&5 + echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9876,7 +10559,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9879 "configure" ++#line 10562 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9895,16 +10578,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9898: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10581: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9901: \$? = $ac_status" >&5 ++ echo "$as_me:10584: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9904: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10587: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9907: \$? = $ac_status" >&5 ++ echo "$as_me:10590: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -9915,14 +10598,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9918: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:10601: result: $ac_cv_lib_nsl_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 + if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" + fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then +- echo "$as_me:9925: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:10608: checking for gethostbyname in -lbsd" >&5 + echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -9930,7 +10613,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 9933 "configure" ++#line 10616 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -9949,16 +10632,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9952: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10635: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9955: \$? = $ac_status" >&5 ++ echo "$as_me:10638: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9958: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10641: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9961: \$? = $ac_status" >&5 ++ echo "$as_me:10644: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -9969,7 +10652,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:9972: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:10655: result: $ac_cv_lib_bsd_gethostbyname" >&5 + echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 + if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +@@ -9985,13 +10668,13 @@ + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. +- echo "$as_me:9988: checking for connect" >&5 ++ echo "$as_me:10671: checking for connect" >&5 + echo $ECHO_N "checking for connect... $ECHO_C" >&6 + if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 9994 "configure" ++#line 10677 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. */ +@@ -10014,7 +10697,7 @@ + #if defined (__stub_connect) || defined (__stub___connect) + choke me + #else +-f = connect; ++f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -10022,16 +10705,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10025: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10708: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10028: \$? = $ac_status" >&5 ++ echo "$as_me:10711: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10031: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10034: \$? = $ac_status" >&5 ++ echo "$as_me:10717: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes + else +@@ -10041,11 +10724,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10044: result: $ac_cv_func_connect" >&5 ++echo "$as_me:10727: result: $ac_cv_func_connect" >&5 + echo "${ECHO_T}$ac_cv_func_connect" >&6 + + if test $ac_cv_func_connect = no; then +- echo "$as_me:10048: checking for connect in -lsocket" >&5 ++ echo "$as_me:10731: checking for connect in -lsocket" >&5 + echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10053,7 +10736,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10056 "configure" ++#line 10739 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10072,16 +10755,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10075: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10758: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10078: \$? = $ac_status" >&5 ++ echo "$as_me:10761: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10081: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10764: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10084: \$? = $ac_status" >&5 ++ echo "$as_me:10767: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -10092,7 +10775,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10095: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:10778: result: $ac_cv_lib_socket_connect" >&5 + echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 + if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +@@ -10101,13 +10784,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:10104: checking for remove" >&5 ++ echo "$as_me:10787: checking for remove" >&5 + echo $ECHO_N "checking for remove... $ECHO_C" >&6 + if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10110 "configure" ++#line 10793 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. */ +@@ -10130,7 +10813,7 @@ + #if defined (__stub_remove) || defined (__stub___remove) + choke me + #else +-f = remove; ++f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -10138,16 +10821,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10141: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10824: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10144: \$? = $ac_status" >&5 ++ echo "$as_me:10827: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10147: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10830: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10150: \$? = $ac_status" >&5 ++ echo "$as_me:10833: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes + else +@@ -10157,11 +10840,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10160: result: $ac_cv_func_remove" >&5 ++echo "$as_me:10843: result: $ac_cv_func_remove" >&5 + echo "${ECHO_T}$ac_cv_func_remove" >&6 + + if test $ac_cv_func_remove = no; then +- echo "$as_me:10164: checking for remove in -lposix" >&5 ++ echo "$as_me:10847: checking for remove in -lposix" >&5 + echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10169,7 +10852,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10172 "configure" ++#line 10855 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10188,16 +10871,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10191: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10874: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10194: \$? = $ac_status" >&5 ++ echo "$as_me:10877: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10197: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10200: \$? = $ac_status" >&5 ++ echo "$as_me:10883: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -10208,7 +10891,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10211: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:10894: result: $ac_cv_lib_posix_remove" >&5 + echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 + if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +@@ -10217,13 +10900,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:10220: checking for shmat" >&5 ++ echo "$as_me:10903: checking for shmat" >&5 + echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 10226 "configure" ++#line 10909 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat (); below. */ +@@ -10246,7 +10929,7 @@ + #if defined (__stub_shmat) || defined (__stub___shmat) + choke me + #else +-f = shmat; ++f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -10254,16 +10937,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10257: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10940: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10260: \$? = $ac_status" >&5 ++ echo "$as_me:10943: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10263: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10946: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10266: \$? = $ac_status" >&5 ++ echo "$as_me:10949: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes + else +@@ -10273,11 +10956,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10276: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:10959: result: $ac_cv_func_shmat" >&5 + echo "${ECHO_T}$ac_cv_func_shmat" >&6 + + if test $ac_cv_func_shmat = no; then +- echo "$as_me:10280: checking for shmat in -lipc" >&5 ++ echo "$as_me:10963: checking for shmat in -lipc" >&5 + echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10285,7 +10968,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10288 "configure" ++#line 10971 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10304,16 +10987,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10307: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10990: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10310: \$? = $ac_status" >&5 ++ echo "$as_me:10993: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10313: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10316: \$? = $ac_status" >&5 ++ echo "$as_me:10999: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -10324,7 +11007,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10327: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:11010: result: $ac_cv_lib_ipc_shmat" >&5 + echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 + if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +@@ -10342,7 +11025,7 @@ + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry +- echo "$as_me:10345: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:11028: checking for IceConnectionNumber in -lICE" >&5 + echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10350,7 +11033,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10353 "configure" ++#line 11036 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10369,16 +11052,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10372: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11055: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10375: \$? = $ac_status" >&5 ++ echo "$as_me:11058: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11061: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10381: \$? = $ac_status" >&5 ++ echo "$as_me:11064: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -10389,7 +11072,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10392: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:11075: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 + echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 + if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +@@ -10401,7 +11084,7 @@ + + cf_x_athena=${cf_x_athena:-Xaw} + +-echo "$as_me:10404: checking if you want to link with Xaw 3d library" >&5 ++echo "$as_me:11087: checking if you want to link with Xaw 3d library" >&5 + echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 + withval= + +@@ -10412,14 +11095,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3d +- echo "$as_me:10415: result: yes" >&5 ++ echo "$as_me:11098: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:10418: result: no" >&5 ++ echo "$as_me:11101: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:10422: checking if you want to link with neXT Athena library" >&5 ++echo "$as_me:11105: checking if you want to link with neXT Athena library" >&5 + echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 + withval= + +@@ -10430,14 +11113,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=neXtaw +- echo "$as_me:10433: result: yes" >&5 ++ echo "$as_me:11116: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:10436: result: no" >&5 ++ echo "$as_me:11119: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:10440: checking if you want to link with Athena-Plus library" >&5 ++echo "$as_me:11123: checking if you want to link with Athena-Plus library" >&5 + echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 + withval= + +@@ -10448,10 +11131,10 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=XawPlus +- echo "$as_me:10451: result: yes" >&5 ++ echo "$as_me:11134: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:10454: result: no" >&5 ++ echo "$as_me:11137: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -10471,17 +11154,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then + test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 + +-echo "${as_me:-configure}:10474: testing found package $cf_athena_pkg ..." 1>&5 ++echo "${as_me:-configure}:11157: testing found package $cf_athena_pkg ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" + test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:10480: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11163: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:10484: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11167: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -10571,14 +11254,14 @@ + #define $cf_x_athena_LIBS 1 + EOF + +-echo "$as_me:10574: checking for usable $cf_x_athena/Xmu package" >&5 ++echo "$as_me:11257: checking for usable $cf_x_athena/Xmu package" >&5 + echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 + if test "${cf_cv_xaw_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 10581 "configure" ++#line 11264 "configure" + #include "confdefs.h" + + #include <X11/Xmu/CharSet.h> +@@ -10594,16 +11277,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10597: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10600: \$? = $ac_status" >&5 ++ echo "$as_me:11283: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10603: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10606: \$? = $ac_status" >&5 ++ echo "$as_me:11289: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xaw_compat=yes + else +@@ -10613,7 +11296,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10616: result: $cf_cv_xaw_compat" >&5 ++echo "$as_me:11299: result: $cf_cv_xaw_compat" >&5 + echo "${ECHO_T}$cf_cv_xaw_compat" >&6 + + if test "$cf_cv_xaw_compat" = no +@@ -10625,22 +11308,22 @@ + *) + test -n "$verbose" && echo " work around broken package" 1>&6 + +-echo "${as_me:-configure}:10628: testing work around broken package ..." 1>&5 ++echo "${as_me:-configure}:11311: testing work around broken package ..." 1>&5 + + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then + test -n "$verbose" && echo " found package xmu" 1>&6 + +-echo "${as_me:-configure}:10633: testing found package xmu ..." 1>&5 ++echo "${as_me:-configure}:11316: testing found package xmu ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" + test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:10639: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11322: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:10643: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11326: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -10726,12 +11409,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:10729: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:11412: testing ...before $LIBS ..." 1>&5 + + LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/ / /g'` + test -n "$verbose" && echo " ...after $LIBS" 1>&6 + +-echo "${as_me:-configure}:10734: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:11417: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -10752,17 +11435,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then + test -n "$verbose" && echo " found package Xext" 1>&6 + +-echo "${as_me:-configure}:10755: testing found package Xext ..." 1>&5 ++echo "${as_me:-configure}:11438: testing found package Xext ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" + test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:10761: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11444: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:10765: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11448: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -10846,7 +11529,7 @@ + : + else + +- echo "$as_me:10849: checking for XextCreateExtension in -lXext" >&5 ++ echo "$as_me:11532: checking for XextCreateExtension in -lXext" >&5 + echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 + if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -10854,7 +11537,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10857 "configure" ++#line 11540 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -10873,16 +11556,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10876: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11559: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10879: \$? = $ac_status" >&5 ++ echo "$as_me:11562: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10882: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11565: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10885: \$? = $ac_status" >&5 ++ echo "$as_me:11568: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes + else +@@ -10893,7 +11576,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:10896: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 ++echo "$as_me:11579: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 + echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 + if test $ac_cv_lib_Xext_XextCreateExtension = yes; then + LIBS="-lXext $LIBS" +@@ -10906,17 +11589,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then + test -n "$verbose" && echo " found package xt" 1>&6 + +-echo "${as_me:-configure}:10909: testing found package xt ..." 1>&5 ++echo "${as_me:-configure}:11592: testing found package xt ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" + test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:10915: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11598: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:10919: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11602: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -11003,14 +11686,14 @@ + ;; + *) + # we have an "xt" package, but it may omit Xt's dependency on X11 +-echo "$as_me:11006: checking for usable X dependency" >&5 ++echo "$as_me:11689: checking for usable X dependency" >&5 + echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 + if test "${cf_cv_xt_x11_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 11013 "configure" ++#line 11696 "configure" + #include "confdefs.h" + + #include <X11/Xlib.h> +@@ -11029,16 +11712,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11032: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11715: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11035: \$? = $ac_status" >&5 ++ echo "$as_me:11718: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11038: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11721: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11041: \$? = $ac_status" >&5 ++ echo "$as_me:11724: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_x11_compat=yes + else +@@ -11048,30 +11731,30 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11051: result: $cf_cv_xt_x11_compat" >&5 ++echo "$as_me:11734: result: $cf_cv_xt_x11_compat" >&5 + echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 + if test "$cf_cv_xt_x11_compat" = no + then + test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 + +-echo "${as_me:-configure}:11057: testing work around broken X11 dependency ..." 1>&5 ++echo "${as_me:-configure}:11740: testing work around broken X11 dependency ..." 1>&5 + + # 2010/11/19 - good enough until a working Xt on Xcb is delivered. + + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then + test -n "$verbose" && echo " found package x11" 1>&6 + +-echo "${as_me:-configure}:11064: testing found package x11 ..." 1>&5 ++echo "${as_me:-configure}:11747: testing found package x11 ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" + test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:11070: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11753: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:11074: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11757: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -11157,12 +11840,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:11160: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:11843: testing ...before $LIBS ..." 1>&5 + + LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/ / /g'` + test -n "$verbose" && echo " ...after $LIBS" 1>&6 + +-echo "${as_me:-configure}:11165: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:11848: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -11170,14 +11853,14 @@ + ;; + esac + +-echo "$as_me:11173: checking for usable X Toolkit package" >&5 ++echo "$as_me:11856: checking for usable X Toolkit package" >&5 + echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 + if test "${cf_cv_xt_ice_compat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 11180 "configure" ++#line 11863 "configure" + #include "confdefs.h" + + #include <X11/Shell.h> +@@ -11192,16 +11875,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11195: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11198: \$? = $ac_status" >&5 ++ echo "$as_me:11881: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11201: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11204: \$? = $ac_status" >&5 ++ echo "$as_me:11887: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xt_ice_compat=yes + else +@@ -11211,7 +11894,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11214: result: $cf_cv_xt_ice_compat" >&5 ++echo "$as_me:11897: result: $cf_cv_xt_ice_compat" >&5 + echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 + + if test "$cf_cv_xt_ice_compat" = no +@@ -11225,22 +11908,22 @@ + *) + test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 + +-echo "${as_me:-configure}:11228: testing work around broken ICE dependency ..." 1>&5 ++echo "${as_me:-configure}:11911: testing work around broken ICE dependency ..." 1>&5 + + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then + test -n "$verbose" && echo " found package ice" 1>&6 + +-echo "${as_me:-configure}:11233: testing found package ice ..." 1>&5 ++echo "${as_me:-configure}:11916: testing found package ice ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" + test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:11239: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:11922: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:11243: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:11926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -11325,17 +12008,17 @@ + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then + test -n "$verbose" && echo " found package sm" 1>&6 + +-echo "${as_me:-configure}:11328: testing found package sm ..." 1>&5 ++echo "${as_me:-configure}:12011: testing found package sm ..." 1>&5 + + cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" + test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 + +-echo "${as_me:-configure}:11334: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 ++echo "${as_me:-configure}:12017: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + + test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 + +-echo "${as_me:-configure}:11338: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 ++echo "${as_me:-configure}:12021: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 + + cf_fix_cppflags=no + cf_new_cflags= +@@ -11425,12 +12108,12 @@ + + test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +-echo "${as_me:-configure}:11428: testing ...before $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12111: testing ...before $LIBS ..." 1>&5 + + LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'` + test -n "$verbose" && echo " ...after $LIBS" 1>&6 + +-echo "${as_me:-configure}:11433: testing ...after $LIBS ..." 1>&5 ++echo "${as_me:-configure}:12116: testing ...after $LIBS ..." 1>&5 + + fi + +@@ -11448,7 +12131,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:11451: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12134: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -11519,7 +12202,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:11522: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:12205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" + fi +@@ -11527,7 +12210,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:11530: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12213: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + fi +@@ -11535,14 +12218,14 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:11538: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12221: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 11545 "configure" ++#line 12228 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -11554,16 +12237,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11557: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12240: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11560: \$? = $ac_status" >&5 ++ echo "$as_me:12243: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11563: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12246: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11566: \$? = $ac_status" >&5 ++ echo "$as_me:12249: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -11571,12 +12254,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:11574: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12257: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:11579: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12262: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -11584,13 +12267,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +- echo "$as_me:11587: checking for XOpenDisplay" >&5 ++ echo "$as_me:12270: checking for XOpenDisplay" >&5 + echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 + if test "${ac_cv_func_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 11593 "configure" ++#line 12276 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XOpenDisplay (); below. */ +@@ -11613,7 +12296,7 @@ + #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) + choke me + #else +-f = XOpenDisplay; ++f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -11621,16 +12304,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11624: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12307: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11627: \$? = $ac_status" >&5 ++ echo "$as_me:12310: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11630: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12313: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11633: \$? = $ac_status" >&5 ++ echo "$as_me:12316: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes + else +@@ -11640,13 +12323,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11643: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "$as_me:12326: result: $ac_cv_func_XOpenDisplay" >&5 + echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 + if test $ac_cv_func_XOpenDisplay = yes; then + : + else + +- echo "$as_me:11649: checking for XOpenDisplay in -lX11" >&5 ++ echo "$as_me:12332: checking for XOpenDisplay in -lX11" >&5 + echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 + if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11654,7 +12337,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11657 "configure" ++#line 12340 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11673,16 +12356,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11676: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12359: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11679: \$? = $ac_status" >&5 ++ echo "$as_me:12362: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11682: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12365: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11685: \$? = $ac_status" >&5 ++ echo "$as_me:12368: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -11693,7 +12376,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11696: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:12379: result: $ac_cv_lib_X11_XOpenDisplay" >&5 + echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 + if test $ac_cv_lib_X11_XOpenDisplay = yes; then + LIBS="-lX11 $LIBS" +@@ -11701,13 +12384,13 @@ + + fi + +- echo "$as_me:11704: checking for XtAppInitialize" >&5 ++ echo "$as_me:12387: checking for XtAppInitialize" >&5 + echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 + if test "${ac_cv_func_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 11710 "configure" ++#line 12393 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XtAppInitialize (); below. */ +@@ -11730,7 +12413,7 @@ + #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) + choke me + #else +-f = XtAppInitialize; ++f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -11738,16 +12421,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11741: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12424: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11744: \$? = $ac_status" >&5 ++ echo "$as_me:12427: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11747: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12430: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11750: \$? = $ac_status" >&5 ++ echo "$as_me:12433: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes + else +@@ -11757,13 +12440,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11760: result: $ac_cv_func_XtAppInitialize" >&5 ++echo "$as_me:12443: result: $ac_cv_func_XtAppInitialize" >&5 + echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 + if test $ac_cv_func_XtAppInitialize = yes; then + : + else + +- echo "$as_me:11766: checking for XtAppInitialize in -lXt" >&5 ++ echo "$as_me:12449: checking for XtAppInitialize in -lXt" >&5 + echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 + if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -11771,7 +12454,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11774 "configure" ++#line 12457 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11790,16 +12473,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11793: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12476: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11796: \$? = $ac_status" >&5 ++ echo "$as_me:12479: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11799: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12482: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11802: \$? = $ac_status" >&5 ++ echo "$as_me:12485: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes + else +@@ -11810,7 +12493,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11813: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 ++echo "$as_me:12496: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 + echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 + if test $ac_cv_lib_Xt_XtAppInitialize = yes; then + cat >>confdefs.h <<\EOF +@@ -11826,7 +12509,7 @@ + fi + + if test $cf_have_X_LIBS = no ; then +- { echo "$as_me:11829: WARNING: Unable to successfully link X Toolkit library (-lXt) with ++ { echo "$as_me:12512: WARNING: Unable to successfully link X Toolkit library (-lXt) with + test program. You will have to check and add the proper libraries by hand + to makefile." >&5 + echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with +@@ -11848,14 +12531,14 @@ + cf_test=X11/$cf_x_athena_root/SimpleMenu.h + if test $cf_path != default ; then + CPPFLAGS="$cf_save -I$cf_path/include" +- echo "$as_me:11851: checking for $cf_test in $cf_path" >&5 ++ echo "$as_me:12534: checking for $cf_test in $cf_path" >&5 + echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 + else +- echo "$as_me:11854: checking for $cf_test" >&5 ++ echo "$as_me:12537: checking for $cf_test" >&5 + echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 11858 "configure" ++#line 12541 "configure" + #include "confdefs.h" + + #include <X11/Intrinsic.h> +@@ -11869,16 +12552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:11872: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:11875: \$? = $ac_status" >&5 ++ echo "$as_me:12558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:11878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11881: \$? = $ac_status" >&5 ++ echo "$as_me:12564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -11887,7 +12570,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:11890: result: $cf_result" >&5 ++ echo "$as_me:12573: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_inc=$cf_path +@@ -11899,7 +12582,7 @@ + done + + if test -z "$cf_x_athena_inc" ; then +- { echo "$as_me:11902: WARNING: Unable to successfully find Athena header files with test program" >&5 ++ { echo "$as_me:12585: WARNING: Unable to successfully find Athena header files with test program" >&5 + echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + elif test "$cf_x_athena_inc" != default ; then + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" +@@ -11915,24 +12598,29 @@ + /usr/local + do + for cf_lib in \ +- "-l$cf_x_athena_root -lXmu" \ +- "-l$cf_x_athena_root -lXpm -lXmu" \ +- "-l${cf_x_athena_root}_s -lXmu_s" ++ ${cf_x_athena_root} \ ++ ${cf_x_athena_root}7 \ ++ ${cf_x_athena_root}6 ++ do ++ for cf_libs in \ ++ "-l$cf_lib -lXmu" \ ++ "-l$cf_lib -lXpm -lXmu" \ ++ "-l${cf_lib}_s -lXmu_s" + do + if test -z "$cf_x_athena_lib" ; then + cf_save="$LIBS" + cf_test=XawSimpleMenuAddGlobalActions + if test $cf_path != default ; then +- LIBS="-L$cf_path/lib $cf_lib $LIBS" +- echo "$as_me:11927: checking for $cf_lib in $cf_path" >&5 +-echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 ++ LIBS="-L$cf_path/lib $cf_libs $LIBS" ++ echo "$as_me:12615: checking for $cf_libs in $cf_path" >&5 ++echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 + else +- LIBS="$cf_lib $LIBS" +- echo "$as_me:11931: checking for $cf_test in $cf_lib" >&5 +-echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 ++ LIBS="$cf_libs $LIBS" ++ echo "$as_me:12619: checking for $cf_test in $cf_libs" >&5 ++echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 11935 "configure" ++#line 12623 "configure" + #include "confdefs.h" + + #include <X11/Intrinsic.h> +@@ -11948,16 +12636,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11951: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12639: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11954: \$? = $ac_status" >&5 ++ echo "$as_me:12642: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11957: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11960: \$? = $ac_status" >&5 ++ echo "$as_me:12648: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -11966,19 +12654,21 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:11969: result: $cf_result" >&5 ++ echo "$as_me:12657: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then +- cf_x_athena_lib="$cf_lib" ++ cf_x_athena_lib="$cf_libs" + break + fi + LIBS="$cf_save" + fi +- done ++ done # cf_libs ++ test -n "$cf_x_athena_lib" && break ++ done # cf_lib + done + + if test -z "$cf_x_athena_lib" ; then +- { { echo "$as_me:11981: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 ++ { { echo "$as_me:12671: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -11991,48 +12681,86 @@ + + fi + +-for ac_prog in xcurses-config ++if test -n "$ac_tool_prefix"; then ++ for ac_prog in xcurses-config ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:12689: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$XCURSES_CONFIG"; then ++ ac_cv_prog_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" ++echo "$as_me:12704: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG ++if test -n "$XCURSES_CONFIG"; then ++ echo "$as_me:12712: result: $XCURSES_CONFIG" >&5 ++echo "${ECHO_T}$XCURSES_CONFIG" >&6 ++else ++ echo "$as_me:12715: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$XCURSES_CONFIG" && break ++ done ++fi ++if test -z "$XCURSES_CONFIG"; then ++ ac_ct_XCURSES_CONFIG=$XCURSES_CONFIG ++ for ac_prog in xcurses-config + 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:11998: checking for $ac_word" >&5 ++echo "$as_me:12728: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then ++if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case $XCURSES_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XCURSES_CONFIG="$XCURSES_CONFIG" # Let the user override the test with a path. +- ;; +- *) ++ if test -n "$ac_ct_XCURSES_CONFIG"; then ++ ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_ct_XCURSES_CONFIG" # Let the user override the test. ++else + ac_save_IFS=$IFS; IFS=$ac_path_separator + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. +- if $as_executable_p "$ac_dir/$ac_word"; then +- ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:12015: found $ac_dir/$ac_word" >&5 +- break +-fi ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" ++echo "$as_me:12743: found $ac_dir/$ac_word" >&5 ++break + done + +- ;; +-esac + fi +-XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG +- +-if test -n "$XCURSES_CONFIG"; then +- echo "$as_me:12026: result: $XCURSES_CONFIG" >&5 +-echo "${ECHO_T}$XCURSES_CONFIG" >&6 ++fi ++ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG ++if test -n "$ac_ct_XCURSES_CONFIG"; then ++ echo "$as_me:12751: result: $ac_ct_XCURSES_CONFIG" >&5 ++echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 + else +- echo "$as_me:12029: result: no" >&5 ++ echo "$as_me:12754: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +- test -n "$XCURSES_CONFIG" && break ++ test -n "$ac_ct_XCURSES_CONFIG" && break + done +-test -n "$XCURSES_CONFIG" || XCURSES_CONFIG="none" ++test -n "$ac_ct_XCURSES_CONFIG" || ac_ct_XCURSES_CONFIG="none" ++ ++ XCURSES_CONFIG=$ac_ct_XCURSES_CONFIG ++fi + + if test "$XCURSES_CONFIG" != none ; then + +@@ -12047,7 +12775,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me:-configure}:12050: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12778: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -12118,7 +12846,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me:-configure}:12121: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me:-configure}:12849: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" + fi +@@ -12126,7 +12854,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me:-configure}:12129: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12857: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + fi +@@ -12134,14 +12862,14 @@ + if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + +-echo "${as_me:-configure}:12137: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me:-configure}:12865: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 12144 "configure" ++#line 12872 "configure" + #include "confdefs.h" + #include <stdio.h> + int +@@ -12153,16 +12881,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12156: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12884: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12159: \$? = $ac_status" >&5 ++ echo "$as_me:12887: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12162: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12890: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12165: \$? = $ac_status" >&5 ++ echo "$as_me:12893: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12170,12 +12898,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me:-configure}:12173: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12901: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + +-echo "${as_me:-configure}:12178: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me:-configure}:12906: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -12183,7 +12911,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:12186: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:12914: checking for XOpenDisplay in -lX11" >&5 + echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 + if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12191,7 +12919,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12194 "configure" ++#line 12922 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12210,16 +12938,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12213: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12941: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12216: \$? = $ac_status" >&5 ++ echo "$as_me:12944: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12947: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12222: \$? = $ac_status" >&5 ++ echo "$as_me:12950: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -12230,13 +12958,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12233: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:12961: result: $ac_cv_lib_X11_XOpenDisplay" >&5 + echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 + if test $ac_cv_lib_X11_XOpenDisplay = yes; then + LIBS="-lX11 $LIBS" + fi + +-echo "$as_me:12239: checking for XCurses library" >&5 ++echo "$as_me:12967: checking for XCurses library" >&5 + echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 + if test "${cf_cv_lib_XCurses+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12244,7 +12972,7 @@ + + LIBS="-lXCurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12247 "configure" ++#line 12975 "configure" + #include "confdefs.h" + + #include <xcurses.h> +@@ -12259,16 +12987,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12262: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12990: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12265: \$? = $ac_status" >&5 ++ echo "$as_me:12993: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12268: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12996: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12271: \$? = $ac_status" >&5 ++ echo "$as_me:12999: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_lib_XCurses=yes + else +@@ -12279,7 +13007,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:12282: result: $cf_cv_lib_XCurses" >&5 ++echo "$as_me:13010: result: $cf_cv_lib_XCurses" >&5 + echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 + + fi +@@ -12293,23 +13021,23 @@ + #define XCURSES 1 + EOF + +- echo "$as_me:12296: checking for xcurses.h" >&5 ++ echo "$as_me:13024: checking for xcurses.h" >&5 + echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 + if test "${ac_cv_header_xcurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12302 "configure" ++#line 13030 "configure" + #include "confdefs.h" + #include <xcurses.h> + _ACEOF +-if { (eval echo "$as_me:12306: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13034: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12312: \$? = $ac_status" >&5 ++ echo "$as_me:13040: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12328,7 +13056,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:12331: result: $ac_cv_header_xcurses_h" >&5 ++echo "$as_me:13059: result: $ac_cv_header_xcurses_h" >&5 + echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 + if test $ac_cv_header_xcurses_h = yes; then + cat >>confdefs.h <<\EOF +@@ -12338,7 +13066,7 @@ + fi + + else +- { { echo "$as_me:12341: error: Cannot link with XCurses" >&5 ++ { { echo "$as_me:13069: error: Cannot link with XCurses" >&5 + echo "$as_me: error: Cannot link with XCurses" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -12346,6 +13074,122 @@ + ;; + esac + ++case $cf_cv_screen in ++curses|curses_*) ++ ++echo "$as_me:13080: checking for NetBSD form.h" >&5 ++echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 ++if test "${cf_cv_netbsd_form_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line 13087 "configure" ++#include "confdefs.h" ++ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <form.h> ++ ++int ++main () ++{ ++ ++ FORM *form; ++ int y = current_field(form)->cursor_ypos; ++ int x = current_field(form)->cursor_xpos; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:13109: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:13112: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:13115: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_netbsd_form_h=yes ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_netbsd_form_h=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:13127: result: $cf_cv_netbsd_form_h" >&5 ++echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 ++ ++test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF ++#define HAVE_NETBSD_FORM_H 1 ++EOF ++ ++echo "$as_me:13134: checking for NetBSD menu.h" >&5 ++echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 ++if test "${cf_cv_netbsd_menu_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line 13141 "configure" ++#include "confdefs.h" ++ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <menu.h> ++ ++int ++main () ++{ ++ ++ MENU *menu; ++ int y = menu->max_item_width; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:13159: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:13162: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:13165: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:13168: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_netbsd_menu_h=yes ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_netbsd_menu_h=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:13180: result: $cf_cv_netbsd_menu_h" >&5 ++echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 ++ ++test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF ++#define HAVE_NETBSD_MENU_H 1 ++EOF ++ ++ ;; ++ncursesw) ++ cf_cv_libtype=w ++ ;; ++esac ++ + case $cf_cv_screen in #(vi + pdcurses) #(vi + ;; +@@ -12353,7 +13197,7 @@ + # look for curses-related libraries + + as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh` +-echo "$as_me:12356: checking for new_panel in -lpanel$cf_cv_libtype" >&5 ++echo "$as_me:13200: checking for new_panel in -lpanel$cf_cv_libtype" >&5 + echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12361,7 +13205,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lpanel$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12364 "configure" ++#line 13208 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12380,16 +13224,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12383: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13227: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12386: \$? = $ac_status" >&5 ++ echo "$as_me:13230: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12389: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13233: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12392: \$? = $ac_status" >&5 ++ echo "$as_me:13236: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -12400,7 +13244,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12403: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:13247: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12412,7 +13256,7 @@ + fi + + as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh` +-echo "$as_me:12415: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 ++echo "$as_me:13259: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 + echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12420,7 +13264,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmenu$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12423 "configure" ++#line 13267 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12439,16 +13283,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12442: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13286: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12445: \$? = $ac_status" >&5 ++ echo "$as_me:13289: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12448: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13292: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12451: \$? = $ac_status" >&5 ++ echo "$as_me:13295: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -12459,7 +13303,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12462: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:13306: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12471,7 +13315,7 @@ + fi + + as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh` +-echo "$as_me:12474: checking for form_driver in -lform$cf_cv_libtype" >&5 ++echo "$as_me:13318: checking for form_driver in -lform$cf_cv_libtype" >&5 + echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -12479,7 +13323,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lform$cf_cv_libtype $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12482 "configure" ++#line 13326 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12498,16 +13342,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12501: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13345: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12504: \$? = $ac_status" >&5 ++ echo "$as_me:13348: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12507: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12510: \$? = $ac_status" >&5 ++ echo "$as_me:13354: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -12518,7 +13362,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12521: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:13365: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12541,23 +13385,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:12544: checking for $ac_header" >&5 ++echo "$as_me:13388: checking for $ac_header" >&5 + echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12550 "configure" ++#line 13394 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:12554: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13398: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12560: \$? = $ac_status" >&5 ++ echo "$as_me:13404: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12576,7 +13420,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:12579: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:13423: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12589,13 +13433,13 @@ + ;; + esac + +-echo "$as_me:12592: checking return type of signal handlers" >&5 ++echo "$as_me:13436: checking return type of signal handlers" >&5 + echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 + if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12598 "configure" ++#line 13442 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <signal.h> +@@ -12617,16 +13461,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12620: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12623: \$? = $ac_status" >&5 ++ echo "$as_me:13467: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12626: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12629: \$? = $ac_status" >&5 ++ echo "$as_me:13473: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_signal=void + else +@@ -12636,20 +13480,20 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:12639: result: $ac_cv_type_signal" >&5 ++echo "$as_me:13483: result: $ac_cv_type_signal" >&5 + echo "${ECHO_T}$ac_cv_type_signal" >&6 + + cat >>confdefs.h <<EOF + #define RETSIGTYPE $ac_cv_type_signal + EOF + +-echo "$as_me:12646: checking for ANSI C header files" >&5 ++echo "$as_me:13490: checking for ANSI C header files" >&5 + echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12652 "configure" ++#line 13496 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -12657,13 +13501,13 @@ + #include <float.h> + + _ACEOF +-if { (eval echo "$as_me:12660: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:13504: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 +- echo "$as_me:12666: \$? = $ac_status" >&5 ++ echo "$as_me:13510: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -12685,7 +13529,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 <<_ACEOF +-#line 12688 "configure" ++#line 13532 "configure" + #include "confdefs.h" + #include <string.h> + +@@ -12703,7 +13547,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 <<_ACEOF +-#line 12706 "configure" ++#line 13550 "configure" + #include "confdefs.h" + #include <stdlib.h> + +@@ -12724,7 +13568,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12727 "configure" ++#line 13571 "configure" + #include "confdefs.h" + #include <ctype.h> + #if ((' ' & 0x0FF) == 0x020) +@@ -12750,15 +13594,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:12753: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13597: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12756: \$? = $ac_status" >&5 ++ echo "$as_me:13600: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:12758: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13602: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12761: \$? = $ac_status" >&5 ++ echo "$as_me:13605: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12771,146 +13615,319 @@ + fi + fi + fi +-echo "$as_me:12774: result: $ac_cv_header_stdc" >&5 +-echo "${ECHO_T}$ac_cv_header_stdc" >&6 +-if test $ac_cv_header_stdc = yes; then +- +-cat >>confdefs.h <<\EOF +-#define STDC_HEADERS 1 ++echo "$as_me:13618: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++if test $ac_cv_header_stdc = yes; then ++ ++cat >>confdefs.h <<\EOF ++#define STDC_HEADERS 1 ++EOF ++ ++fi ++ ++echo "$as_me:13628: checking whether time.h and sys/time.h may both be included" >&5 ++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 ++if test "${ac_cv_header_time+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 13634 "configure" ++#include "confdefs.h" ++#include <sys/types.h> ++#include <sys/time.h> ++#include <time.h> ++ ++int ++main () ++{ ++if ((struct tm *) 0) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:13650: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:13653: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:13656: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:13659: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_time=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++ac_cv_header_time=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:13669: result: $ac_cv_header_time" >&5 ++echo "${ECHO_T}$ac_cv_header_time" >&6 ++if test $ac_cv_header_time = yes; then ++ ++cat >>confdefs.h <<\EOF ++#define TIME_WITH_SYS_TIME 1 ++EOF ++ ++fi ++ ++for ac_header in \ ++getopt.h \ ++locale.h \ ++math.h \ ++stdarg.h \ ++sys/ioctl.h \ ++sys/select.h \ ++sys/time.h \ ++termios.h \ ++unistd.h \ ++ ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:13692: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 13698 "configure" ++#include "confdefs.h" ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:13702: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ egrep -v '^ *\+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:13708: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ eval "$as_ac_Header=no" ++fi ++rm -f conftest.err conftest.$ac_ext ++fi ++echo "$as_me:13727: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<EOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++EOF ++ ++fi ++done ++ ++for ac_header in unistd.h getopt.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:13740: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line 13746 "configure" ++#include "confdefs.h" ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:13750: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ egrep -v '^ *\+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:13756: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ eval "$as_ac_Header=no" ++fi ++rm -f conftest.err conftest.$ac_ext ++fi ++echo "$as_me:13775: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<EOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + EOF + + fi ++done + +-echo "$as_me:12784: checking whether time.h and sys/time.h may both be included" >&5 +-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +-if test "${ac_cv_header_time+set}" = set; then ++echo "$as_me:13785: checking for header declaring getopt variables" >&5 ++echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 ++if test "${cf_cv_getopt_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-#line 12790 "configure" ++ ++cf_cv_getopt_header=none ++for cf_header in stdio.h stdlib.h unistd.h getopt.h ++do ++cat >conftest.$ac_ext <<_ACEOF ++#line 13795 "configure" + #include "confdefs.h" +-#include <sys/types.h> +-#include <sys/time.h> +-#include <time.h> + ++#include <$cf_header> + int + main () + { +-if ((struct tm *) 0) +-return 0; ++int x = optind; char *y = optarg + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12806: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13808: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12809: \$? = $ac_status" >&5 ++ echo "$as_me:13811: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12812: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13814: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12815: \$? = $ac_status" >&5 ++ echo "$as_me:13817: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_header_time=yes ++ cf_cv_getopt_header=$cf_header ++ break + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-ac_cv_header_time=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:12825: result: $ac_cv_header_time" >&5 +-echo "${ECHO_T}$ac_cv_header_time" >&6 +-if test $ac_cv_header_time = yes; then ++done + +-cat >>confdefs.h <<\EOF +-#define TIME_WITH_SYS_TIME 1 ++fi ++echo "$as_me:13829: result: $cf_cv_getopt_header" >&5 ++echo "${ECHO_T}$cf_cv_getopt_header" >&6 ++if test $cf_cv_getopt_header != none ; then ++ cat >>confdefs.h <<\EOF ++#define HAVE_GETOPT_HEADER 1 + EOF + + fi + +-for ac_header in \ +-getopt.h \ +-locale.h \ +-math.h \ +-stdarg.h \ +-sys/ioctl.h \ +-sys/select.h \ +-sys/time.h \ +-termios.h \ +-unistd.h \ ++for ac_func in \ ++gettimeofday \ ++strdup \ + + do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:12848: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:13844: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12854 "configure" ++#line 13850 "configure" + #include "confdefs.h" +-#include <$ac_header> ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* 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 (*f) (); ++ ++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 ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; ++#endif ++ ++ ; ++ return 0; ++} + _ACEOF +-if { (eval echo "$as_me:12858: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:13881: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 + ac_status=$? +- egrep -v '^ *\+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:12864: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- eval "$as_ac_Header=yes" ++ echo "$as_me:13884: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:13887: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:13890: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else + echo "$as_me: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- eval "$as_ac_Header=no" ++cat conftest.$ac_ext >&5 ++eval "$as_ac_var=no" + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12883: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then ++echo "$as_me:13900: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + EOF + + fi + done + ++if test "$cf_enable_widec" = yes; then ++ + for ac_func in \ +-gettimeofday \ + mblen \ + mbrlen \ + mbrtowc \ + mbsrtowcs \ + mbstowcs \ + mbtowc \ +-strdup \ + wcsrtombs \ + wcstombs \ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:12907: checking for $ac_func" >&5 ++echo "$as_me:13924: checking for $ac_func" >&5 + echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 + if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 12913 "configure" ++#line 13930 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -12933,7 +13950,7 @@ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-f = $ac_func; ++f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; + #endif + + ; +@@ -12941,16 +13958,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12944: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13961: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12947: \$? = $ac_status" >&5 ++ echo "$as_me:13964: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12950: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13967: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12953: \$? = $ac_status" >&5 ++ echo "$as_me:13970: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -12960,7 +13977,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:12963: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:13980: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<EOF +@@ -12970,14 +13987,16 @@ + fi + done + +-echo "$as_me:12973: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++fi ++ ++echo "$as_me:13992: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 12980 "configure" ++#line 13999 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -12999,23 +14018,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13002: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14021: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13005: \$? = $ac_status" >&5 ++ echo "$as_me:14024: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13008: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14027: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13011: \$? = $ac_status" >&5 ++ echo "$as_me:14030: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 13018 "configure" ++#line 14037 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -13037,16 +14056,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13040: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14059: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13043: \$? = $ac_status" >&5 ++ echo "$as_me:14062: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13046: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14065: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13049: \$? = $ac_status" >&5 ++ echo "$as_me:14068: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=yes + else +@@ -13058,11 +14077,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:13061: result: $cf_cv_need_xopen_extension" >&5 ++echo "$as_me:14080: result: $cf_cv_need_xopen_extension" >&5 + echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 + test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + +-echo "$as_me:13065: checking for term.h" >&5 ++echo "$as_me:14084: checking for term.h" >&5 + echo $ECHO_N "checking for term.h... $ECHO_C" >&6 + if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13070,12 +14089,20 @@ + + # If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look + # for <term.h> if we do not find the variant. +-for cf_header in \ +- `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \ +- term.h ++ ++cf_header_list="term.h ncurses/term.h ncursesw/term.h" ++ ++case ${cf_cv_ncurses_header:-curses.h} in #(vi ++*/*) ++ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h ++ cf_header_list="$cf_header_item $cf_header_list" ++ ;; ++esac ++ ++for cf_header in $cf_header_list + do + cat >conftest.$ac_ext <<_ACEOF +-#line 13078 "configure" ++#line 14105 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -13089,16 +14116,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13092: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14119: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13095: \$? = $ac_status" >&5 ++ echo "$as_me:14122: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13098: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13101: \$? = $ac_status" >&5 ++ echo "$as_me:14128: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -13117,7 +14144,7 @@ + for cf_header in ncurses/term.h ncursesw/term.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 13120 "configure" ++#line 14147 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -13135,16 +14162,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13138: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14165: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13141: \$? = $ac_status" >&5 ++ echo "$as_me:14168: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13144: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14171: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13147: \$? = $ac_status" >&5 ++ echo "$as_me:14174: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -13159,7 +14186,7 @@ + esac + + fi +-echo "$as_me:13162: result: $cf_cv_term_header" >&5 ++echo "$as_me:14189: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + case $cf_cv_term_header in #(vi +@@ -13183,7 +14210,96 @@ + ;; + esac + ++echo "$as_me:14213: checking for unctrl.h" >&5 ++echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 ++if test "${cf_cv_unctrl_header+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++# If we found <ncurses/curses.h>, look for <ncurses/unctrl.h>, but always look ++# for <unctrl.h> if we do not find the variant. ++ ++cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h" ++ ++case ${cf_cv_ncurses_header:-curses.h} in #(vi ++*/*) ++ cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h ++ cf_header_list="$cf_header_item $cf_header_list" ++ ;; ++esac ++ ++for cf_header in $cf_header_list ++do ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14234 "configure" ++#include "confdefs.h" ++ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <${cf_header}> ++int ++main () ++{ ++WINDOW *x ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:14248: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:14251: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:14254: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14257: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_cv_unctrl_header=$cf_header ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_cv_unctrl_header=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++done ++ ++case $cf_cv_unctrl_header in #(vi ++no) ++ { echo "$as_me:14271: WARNING: unctrl.h header not found" >&5 ++echo "$as_me: WARNING: unctrl.h header not found" >&2;} ++ ;; ++esac ++ ++fi ++echo "$as_me:14277: result: $cf_cv_unctrl_header" >&5 ++echo "${ECHO_T}$cf_cv_unctrl_header" >&6 ++ ++case $cf_cv_unctrl_header in #(vi ++unctrl.h) #(vi ++ cat >>confdefs.h <<\EOF ++#define HAVE_UNCTRL_H 1 ++EOF ++ ++ ;; ++ncurses/unctrl.h) #(vi ++ cat >>confdefs.h <<\EOF ++#define HAVE_NCURSES_UNCTRL_H 1 ++EOF ++ ++ ;; ++ncursesw/unctrl.h) ++ cat >>confdefs.h <<\EOF ++#define HAVE_NCURSESW_UNCTRL_H 1 ++EOF ++ ++ ;; ++esac ++ + for cf_func in \ ++assume_default_colors \ + chgat \ + color_set \ + filter \ +@@ -13210,8 +14326,10 @@ + tigetstr \ + typeahead \ + use_default_colors \ +-vw_printw \ ++use_screen \ ++use_window \ + vsscanf \ ++vw_printw \ + wchgat \ + winsstr \ + wresize \ +@@ -13221,10 +14339,94 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:13224: checking for ${cf_func}" >&5 ++ echo "$as_me:14342: checking for ${cf_func}" >&5 ++echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 ++ ++echo "${as_me:-configure}:14345: testing ${cf_func} ..." 1>&5 ++ ++ if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ eval cf_result='$ac_cv_func_'$cf_func ++ if test ".$cf_result" != ".no"; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14354 "configure" ++#include "confdefs.h" ++ ++#ifdef HAVE_XCURSES ++#include <xcurses.h> ++char * XCursesProgramName = "test"; ++#else ++#include <${cf_cv_ncurses_header:-curses.h}> ++#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) ++#include <ncursesw/term.h> ++#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) ++#include <ncurses/term.h> ++#elif defined(HAVE_TERM_H) ++#include <term.h> ++#endif ++#endif ++ ++int ++main () ++{ ++ ++#ifndef ${cf_func} ++long foo = (long)(&${cf_func}); ++if (foo + 1234 > 5678) ++ ${cf_cv_main_return:-return}(foo); ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:14386: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:14389: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:14392: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14395: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_result=yes ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_result=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ fi ++ eval 'cf_cv_func_'$cf_func'=$cf_result' ++ ++fi ++ ++ # use the computed/retrieved cache-value: ++ eval 'cf_result=$cf_cv_func_'$cf_func ++ echo "$as_me:14411: result: $cf_result" >&5 ++echo "${ECHO_T}$cf_result" >&6 ++ if test $cf_result != no; then ++ cat >>confdefs.h <<EOF ++#define HAVE_${cf_tr_func} 1 ++EOF ++ ++ fi ++done ++ ++for cf_func in tputs ++do ++ ++cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ++ ++ echo "$as_me:14426: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me:-configure}:13227: testing ${cf_func} ..." 1>&5 ++echo "${as_me:-configure}:14429: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13233,7 +14435,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 13236 "configure" ++#line 14438 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -13256,7 +14458,8 @@ + + #ifndef ${cf_func} + long foo = (long)(&${cf_func}); +-${cf_cv_main_return:-return}(foo == 0); ++if (foo + 1234 > 5678) ++ ${cf_cv_main_return:-return}(foo); + #endif + + ; +@@ -13264,16 +14467,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13267: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14470: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13270: \$? = $ac_status" >&5 ++ echo "$as_me:14473: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13273: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14476: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13276: \$? = $ac_status" >&5 ++ echo "$as_me:14479: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -13289,7 +14492,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:13292: result: $cf_result" >&5 ++ echo "$as_me:14495: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <<EOF +@@ -13299,14 +14502,82 @@ + fi + done + +-echo "$as_me:13302: checking for ncurses extended functions" >&5 ++if test x$cf_cv_func_tputs = xyes ++then ++ cf_done=no ++ for cf_arg in int char ++ do ++ for cf_ret in int void ++ do ++ if test $cf_ret = void ++ then ++ cf_return="/* nothing */" ++ else ++ cf_return="return value" ++ fi ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14519 "configure" ++#include "confdefs.h" ++ ++#include <${cf_cv_ncurses_header:-curses.h}> ++#include <$cf_cv_term_header> ++ ++static $cf_ret outc($cf_arg value) { $cf_return; } ++ ++int ++main () ++{ ++ ++ tputs("hello", 0, outc); ++ ${cf_cv_main_return:-return}(0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:14539: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:14542: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:14545: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:14548: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ++ test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 ++ ++echo "${as_me:-configure}:14553: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 ++ ++ cat >>confdefs.h <<EOF ++#define TPUTS_ARG $cf_arg ++#define TPUTS_PROTO(func,value) $cf_ret func(TPUTS_ARG value) ++#define TPUTS_RETURN(value) $cf_return ++EOF ++ cf_done=yes ++ break ++ ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ done ++ test $cf_done = yes && break ++ done ++fi ++ ++echo "$as_me:14573: checking for ncurses extended functions" >&5 + echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 + if test "${cf_cv_ncurses_ext_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 13309 "configure" ++#line 14580 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -13321,16 +14592,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13327: \$? = $ac_status" >&5 ++ echo "$as_me:14598: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13330: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14601: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13333: \$? = $ac_status" >&5 ++ echo "$as_me:14604: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=defined + else +@@ -13338,7 +14609,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 13341 "configure" ++#line 14612 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -13363,16 +14634,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13366: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14637: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13369: \$? = $ac_status" >&5 ++ echo "$as_me:14640: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13372: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13375: \$? = $ac_status" >&5 ++ echo "$as_me:14646: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_ext_funcs=yes + else +@@ -13386,515 +14657,168 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:13389: result: $cf_cv_ncurses_ext_funcs" >&5 ++echo "$as_me:14660: result: $cf_cv_ncurses_ext_funcs" >&5 + echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 + test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF + #define NCURSES_EXT_FUNCS 1 + EOF + +-echo "$as_me:13395: checking for wide-character functions" >&5 +-echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 +-if test "${cf_cv_widechar_funcs+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else ++if test "$cf_enable_widec" = yes ++then ++ # workaround for systems with ncurses before 20111029, due to change of ++ # feature test macro from _XPG5 to _XOPEN_SOURCE ++ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno ++ then ++ cf_define_xpg5=no ++ echo "$as_me:14673: checking if _XPG5 should be defined to enable wide-characters" >&5 ++echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 + +-cat >conftest.$ac_ext <<_ACEOF +-#line 13402 "configure" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14677 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> + int + main () + { +- +- static wchar_t src_wchar[2]; +- static cchar_t dst_cchar; +- setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13419: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:13422: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13425: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:13428: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cf_cv_widechar_funcs=yes +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-cf_cv_widechar_funcs=no +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- +-fi +-echo "$as_me:13439: result: $cf_cv_widechar_funcs" >&5 +-echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 +-if test "$cf_cv_widechar_funcs" != no ; then +- cat >>confdefs.h <<\EOF +-#define USE_WIDEC_SUPPORT 1 +-EOF +- +-else +- cat >>confdefs.h <<\EOF +-#define USE_WIDEC_SUPPORT 0 +-EOF +- +-fi +- +-# On IRIX 5.3, sys/types and inttypes.h are conflicting. +- +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:13459: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 13465 "configure" +-#include "confdefs.h" +-$ac_includes_default +-#include <$ac_header> +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13471: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>&5 +- ac_status=$? +- echo "$as_me:13474: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13477: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:13480: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_Header=yes" +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-eval "$as_ac_Header=no" +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:13490: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<EOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-EOF +- +-fi +-done +- +-echo "$as_me:13500: checking for pid_t" >&5 +-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +-if test "${ac_cv_type_pid_t+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 13506 "configure" +-#include "confdefs.h" +-$ac_includes_default +-int +-main () +-{ +-if ((pid_t *) 0) +- return 0; +-if (sizeof (pid_t)) +- return 0; ++int x = _XPG5 + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13521: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14690: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13524: \$? = $ac_status" >&5 ++ echo "$as_me:14693: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13527: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14696: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13530: \$? = $ac_status" >&5 ++ echo "$as_me:14699: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_type_pid_t=yes +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-ac_cv_type_pid_t=no +-fi +-rm -f conftest.$ac_objext conftest.$ac_ext +-fi +-echo "$as_me:13540: result: $ac_cv_type_pid_t" >&5 +-echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +-if test $ac_cv_type_pid_t = yes; then + : + else +- +-cat >>confdefs.h <<EOF +-#define pid_t int +-EOF +- +-fi +- +-for ac_header in unistd.h vfork.h +-do +-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:13555: checking for $ac_header" >&5 +-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_Header+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 13561 "configure" +-#include "confdefs.h" +-#include <$ac_header> +-_ACEOF +-if { (eval echo "$as_me:13565: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +- ac_status=$? +- egrep -v '^ *\+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:13571: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- eval "$as_ac_Header=yes" +-else + echo "$as_me: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- eval "$as_ac_Header=no" +-fi +-rm -f conftest.err conftest.$ac_ext +-fi +-echo "$as_me:13590: result: `eval echo '${'$as_ac_Header'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +-if test `eval echo '${'$as_ac_Header'}'` = yes; then +- cat >>confdefs.h <<EOF +-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-EOF +- +-fi +-done +- +-for ac_func in fork vfork +-do +-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:13603: checking for $ac_func" >&5 +-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_var+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 13609 "configure" ++cat conftest.$ac_ext >&5 ++cf_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XPG5" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14708 "configure" + #include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-/* 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 (*f) (); + ++#include <${cf_cv_ncurses_header:-curses.h}> + 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 +-f = $ac_func; +-#endif +- ++int x = _XPG5 + ; + return 0; + } + _ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13640: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:13643: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13646: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:13649: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- eval "$as_ac_var=yes" +-else +- echo "$as_me: failed program was:" >&5 +-cat conftest.$ac_ext >&5 +-eval "$as_ac_var=no" +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi +-echo "$as_me:13659: result: `eval echo '${'$as_ac_var'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +-if test `eval echo '${'$as_ac_var'}'` = yes; then +- cat >>confdefs.h <<EOF +-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-EOF +- +-fi +-done +- +-ac_cv_func_fork_works=$ac_cv_func_fork +-if test "x$ac_cv_func_fork" = xyes; then +- echo "$as_me:13671: checking for working fork" >&5 +-echo $ECHO_N "checking for working fork... $ECHO_C" >&6 +-if test "${ac_cv_func_fork_works+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test "$cross_compiling" = yes; then +- ac_cv_func_fork_works=cross +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* By Rüdiger Kuhlmann. */ +- #include <sys/types.h> +- #if HAVE_UNISTD_H +- # include <unistd.h> +- #endif +- /* Some systems only have a dummy stub for fork() */ +- int main () +- { +- if (fork() < 0) +- $ac_main_return (1); +- $ac_main_return (0); +- } +-_ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:13694: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:14721: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13697: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:13699: \"$ac_try\"") >&5 ++ echo "$as_me:14724: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:14727: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13702: \$? = $ac_status" >&5 ++ echo "$as_me:14730: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_func_fork_works=yes ++ cf_define_xpg5=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-ac_cv_func_fork_works=no +-fi +-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ CPPFLAGS="$cf_save_cppflags" + fi +-echo "$as_me:13714: result: $ac_cv_func_fork_works" >&5 +-echo "${ECHO_T}$ac_cv_func_fork_works" >&6 ++rm -f conftest.$ac_objext conftest.$ac_ext ++ echo "$as_me:14741: result: $cf_define_xpg5" >&5 ++echo "${ECHO_T}$cf_define_xpg5" >&6 + +-fi +-if test "x$ac_cv_func_fork_works" = xcross; then +- case $host in +- *-*-amigaos* | *-*-msdosdjgpp*) +- # Override, as these systems have only a dummy fork() stub +- ac_cv_func_fork_works=no +- ;; +- *) +- ac_cv_func_fork_works=yes +- ;; +- esac +- { echo "$as_me:13728: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 +-echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} +-fi +-ac_cv_func_vfork_works=$ac_cv_func_vfork +-if test "x$ac_cv_func_vfork" = xyes; then +- echo "$as_me:13733: checking for working vfork" >&5 +-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 +-if test "${ac_cv_func_vfork_works+set}" = set; then ++ if test "$cf_define_xpg5" = yes ++ then ++ CPPFLAGS="$CPPFLAGS -D_XPG5" ++ fi ++ fi ++ ++ echo "$as_me:14750: checking for wide-character functions" >&5 ++echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 ++if test "${cf_cv_widechar_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test "$cross_compiling" = yes; then +- ac_cv_func_vfork_works=cross +-else +- cat >conftest.$ac_ext <<_ACEOF +-#line 13742 "configure" ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line 14757 "configure" + #include "confdefs.h" +-/* Thanks to Paul Eggert for this test. */ +-#include <stdio.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-#if HAVE_UNISTD_H +-# include <unistd.h> +-#endif +-#if HAVE_VFORK_H +-# include <vfork.h> +-#endif +-/* On some sparc systems, changes by the child to local and incoming +- argument registers are propagated back to the parent. The compiler +- is told about this with #include <vfork.h>, but some compilers +- (e.g. gcc -O) don't grok <vfork.h>. Test for this by using a +- static variable whose address is put into a register that is +- clobbered by the vfork. */ +-static +-#ifdef __cplusplus +-sparc_address_test (int arg) +-# else +-sparc_address_test (arg) int arg; +-#endif +-{ +- static pid_t child; +- if (!child) { +- child = vfork (); +- if (child < 0) { +- perror ("vfork"); +- _exit(2); +- } +- if (!child) { +- arg = getpid(); +- write(-1, "", 0); +- _exit (arg); +- } +- } +-} + ++#include <${cf_cv_ncurses_header:-curses.h}> + int + main () + { +- pid_t parent = getpid (); +- pid_t child; +- +- sparc_address_test (); + +- child = vfork (); ++ static wchar_t src_wchar[2]; ++ static cchar_t dst_cchar; ++ setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); + +- if (child == 0) { +- /* Here is another test for sparc vfork register problems. This +- test uses lots of local variables, at least as many local +- variables as main has allocated so far including compiler +- temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris +- 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should +- reuse the register of parent for one of the local variables, +- since it will think that parent can't possibly be used any more +- in this routine. Assigning to the local variable will thus +- munge parent in the parent process. */ +- pid_t +- p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), +- p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); +- /* Convince the compiler that p..p7 are live; otherwise, it might +- use the same hardware register for all 8 local variables. */ +- if (p != p1 || p != p2 || p != p3 || p != p4 +- || p != p5 || p != p6 || p != p7) +- _exit(1); +- +- /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent +- from child file descriptors. If the child closes a descriptor +- before it execs or exits, this munges the parent's descriptor +- as well. Test for this by closing stdout in the child. */ +- _exit(close(fileno(stdout)) != 0); +- } else { +- int status; +- struct stat st; +- +- while (wait(&status) != child) +- ; +- $ac_main_return( +- /* Was there some problem with vforking? */ +- child < 0 +- +- /* Did the child fail? (This shouldn't happen.) */ +- || status +- +- /* Did the vfork/compiler bug occur? */ +- || parent != getpid() +- +- /* Did the file descriptor bug occur? */ +- || fstat(fileno(stdout), &st) != 0 +- ); +- } ++ ; ++ return 0; + } + _ACEOF +-rm -f conftest$ac_exeext +-if { (eval echo "$as_me:13839: \"$ac_link\"") >&5 ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:14774: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13842: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:13844: \"$ac_try\"") >&5 ++ echo "$as_me:14777: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:14780: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13847: \$? = $ac_status" >&5 ++ echo "$as_me:14783: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_func_vfork_works=yes ++ cf_cv_widechar_funcs=yes + else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-ac_cv_func_vfork_works=no +-fi +-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi ++cf_cv_widechar_funcs=no + fi +-echo "$as_me:13859: result: $ac_cv_func_vfork_works" >&5 +-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +-fi; +-if test "x$ac_cv_func_fork_works" = xcross; then +- ac_cv_func_vfork_works=ac_cv_func_vfork +- { echo "$as_me:13865: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 +-echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} + fi +- +-if test "x$ac_cv_func_vfork_works" = xyes; then +- +-cat >>confdefs.h <<\EOF +-#define HAVE_WORKING_VFORK 1 ++echo "$as_me:14794: result: $cf_cv_widechar_funcs" >&5 ++echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 ++ if test "$cf_cv_widechar_funcs" != no ; then ++ cat >>confdefs.h <<\EOF ++#define USE_WIDEC_SUPPORT 1 + EOF + +-else +- +-cat >>confdefs.h <<\EOF +-#define vfork fork ++ else ++ cat >>confdefs.h <<\EOF ++#define USE_WIDEC_SUPPORT 0 + EOF + +-fi +-if test "x$ac_cv_func_fork_works" = xyes; then +- +-cat >>confdefs.h <<\EOF +-#define HAVE_WORKING_FORK 1 ++ fi ++else ++ cat >>confdefs.h <<\EOF ++#define USE_WIDEC_SUPPORT 0 + EOF + + fi + +-echo "$as_me:13890: checking if sys/time.h works with sys/select.h" >&5 ++echo "$as_me:14814: checking if sys/time.h works with sys/select.h" >&5 + echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 + if test "${cf_cv_sys_time_select+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 13897 "configure" ++#line 14821 "configure" + #include "confdefs.h" + + #include <sys/types.h> +@@ -13914,16 +14838,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14841: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13920: \$? = $ac_status" >&5 ++ echo "$as_me:14844: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13923: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14847: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13926: \$? = $ac_status" >&5 ++ echo "$as_me:14850: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_time_select=yes + else +@@ -13935,13 +14859,13 @@ + + fi + +-echo "$as_me:13938: result: $cf_cv_sys_time_select" >&5 ++echo "$as_me:14862: result: $cf_cv_sys_time_select" >&5 + echo "${ECHO_T}$cf_cv_sys_time_select" >&6 + test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF + #define HAVE_SYS_TIME_SELECT 1 + EOF + +-echo "$as_me:13944: checking for function curses_version" >&5 ++echo "$as_me:14868: checking for function curses_version" >&5 + echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 + if test "${cf_cv_func_curses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -13951,7 +14875,7 @@ + cf_cv_func_curses_version=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 13954 "configure" ++#line 14878 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -13964,15 +14888,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:13967: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14891: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13970: \$? = $ac_status" >&5 ++ echo "$as_me:14894: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:13972: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13975: \$? = $ac_status" >&5 ++ echo "$as_me:14899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_curses_version=yes + +@@ -13987,13 +14911,13 @@ + fi + rm -f core + fi +-echo "$as_me:13990: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:14914: result: $cf_cv_func_curses_version" >&5 + echo "${ECHO_T}$cf_cv_func_curses_version" >&6 + test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF + #define HAVE_CURSES_VERSION 1 + EOF + +-echo "$as_me:13996: checking for ncurses wrap-prefix" >&5 ++echo "$as_me:14920: checking for ncurses wrap-prefix" >&5 + echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 + + # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. +@@ -14003,10 +14927,10 @@ + else + NCURSES_WRAP_PREFIX=_nc_ + fi; +-echo "$as_me:14006: result: $NCURSES_WRAP_PREFIX" >&5 ++echo "$as_me:14930: result: $NCURSES_WRAP_PREFIX" >&5 + echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 + +-echo "$as_me:14009: checking for alternate character set array" >&5 ++echo "$as_me:14933: checking for alternate character set array" >&5 + echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 + if test "${cf_cv_curses_acs_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14016,7 +14940,7 @@ + for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map + do + cat >conftest.$ac_ext <<_ACEOF +-#line 14019 "configure" ++#line 14943 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header:-curses.h}> +@@ -14032,16 +14956,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14035: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14959: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14038: \$? = $ac_status" >&5 ++ echo "$as_me:14962: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14041: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14044: \$? = $ac_status" >&5 ++ echo "$as_me:14968: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_acs_map=$name; break + else +@@ -14052,14 +14976,16 @@ + done + + fi +-echo "$as_me:14055: result: $cf_cv_curses_acs_map" >&5 ++echo "$as_me:14979: result: $cf_cv_curses_acs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 + + test "$cf_cv_curses_acs_map" != unknown && cat >>confdefs.h <<EOF + #define CURSES_ACS_ARRAY $cf_cv_curses_acs_map + EOF + +-echo "$as_me:14062: checking for wide alternate character set array" >&5 ++if test "$cf_enable_widec" = yes; then ++ ++echo "$as_me:14988: checking for wide alternate character set array" >&5 + echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 + if test "${cf_cv_curses_wacs_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14069,7 +14995,7 @@ + for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char + do + cat >conftest.$ac_ext <<_ACEOF +-#line 14072 "configure" ++#line 14998 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14085,16 +15011,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14088: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15014: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14091: \$? = $ac_status" >&5 ++ echo "$as_me:15017: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14094: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15020: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14097: \$? = $ac_status" >&5 ++ echo "$as_me:15023: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_map=$name + break +@@ -14105,14 +15031,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + fi +-echo "$as_me:14108: result: $cf_cv_curses_wacs_map" >&5 ++echo "$as_me:15034: result: $cf_cv_curses_wacs_map" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 + + test "$cf_cv_curses_wacs_map" != unknown && cat >>confdefs.h <<EOF + #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map + EOF + +-echo "$as_me:14115: checking for wide alternate character constants" >&5 ++echo "$as_me:15041: checking for wide alternate character constants" >&5 + echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 + if test "${cf_cv_curses_wacs_symbols+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -14122,7 +15048,7 @@ + if test "$cf_cv_curses_wacs_map" != unknown + then + cat >conftest.$ac_ext <<_ACEOF +-#line 14125 "configure" ++#line 15051 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14139,16 +15065,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14142: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14145: \$? = $ac_status" >&5 ++ echo "$as_me:15071: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14148: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15074: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14151: \$? = $ac_status" >&5 ++ echo "$as_me:15077: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -14158,7 +15084,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14161 "configure" ++#line 15087 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14174,16 +15100,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14177: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14180: \$? = $ac_status" >&5 ++ echo "$as_me:15106: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14183: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14186: \$? = $ac_status" >&5 ++ echo "$as_me:15112: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curses_wacs_symbols=yes + else +@@ -14194,17 +15120,19 @@ + fi + + fi +-echo "$as_me:14197: result: $cf_cv_curses_wacs_symbols" >&5 ++echo "$as_me:15123: result: $cf_cv_curses_wacs_symbols" >&5 + echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 + + test "$cf_cv_curses_wacs_symbols" != no && cat >>confdefs.h <<\EOF + #define CURSES_WACS_SYMBOLS 1 + EOF + +-echo "$as_me:14204: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++fi ++ ++echo "$as_me:15132: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14207 "configure" ++#line 15135 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14222,16 +15150,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14225: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15153: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14228: \$? = $ac_status" >&5 ++ echo "$as_me:15156: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14231: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15159: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14234: \$? = $ac_status" >&5 ++ echo "$as_me:15162: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14240,7 +15168,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14243: result: $cf_result" >&5 ++echo "$as_me:15171: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -14257,15 +15185,17 @@ + + fi + ++if test "$cf_enable_widec" = yes; then ++ + # This is needed on Tru64 5.0 to declare mbstate_t +-echo "$as_me:14261: checking if we must include wchar.h to declare mbstate_t" >&5 ++echo "$as_me:15191: checking if we must include wchar.h to declare mbstate_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 + if test "${cf_cv_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14268 "configure" ++#line 15198 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14283,23 +15213,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14286: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15216: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14289: \$? = $ac_status" >&5 ++ echo "$as_me:15219: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14292: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15222: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14295: \$? = $ac_status" >&5 ++ echo "$as_me:15225: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 14302 "configure" ++#line 15232 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14318,16 +15248,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14321: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14324: \$? = $ac_status" >&5 ++ echo "$as_me:15254: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14327: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14330: \$? = $ac_status" >&5 ++ echo "$as_me:15260: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_mbstate_t=yes + else +@@ -14339,7 +15269,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:14342: result: $cf_cv_mbstate_t" >&5 ++echo "$as_me:15272: result: $cf_cv_mbstate_t" >&5 + echo "${ECHO_T}$cf_cv_mbstate_t" >&6 + + if test "$cf_cv_mbstate_t" = yes ; then +@@ -14361,14 +15291,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wchar_t +-echo "$as_me:14364: checking if we must include wchar.h to declare wchar_t" >&5 ++echo "$as_me:15294: checking if we must include wchar.h to declare wchar_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 + if test "${cf_cv_wchar_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14371 "configure" ++#line 15301 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14386,23 +15316,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14389: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15319: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14392: \$? = $ac_status" >&5 ++ echo "$as_me:15322: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14395: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15325: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14398: \$? = $ac_status" >&5 ++ echo "$as_me:15328: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 14405 "configure" ++#line 15335 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14421,16 +15351,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14424: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14427: \$? = $ac_status" >&5 ++ echo "$as_me:15357: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14430: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15360: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14433: \$? = $ac_status" >&5 ++ echo "$as_me:15363: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wchar_t=yes + else +@@ -14442,7 +15372,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:14445: result: $cf_cv_wchar_t" >&5 ++echo "$as_me:15375: result: $cf_cv_wchar_t" >&5 + echo "${ECHO_T}$cf_cv_wchar_t" >&6 + + if test "$cf_cv_wchar_t" = yes ; then +@@ -14464,14 +15394,14 @@ + fi + + # This is needed on Tru64 5.0 to declare wint_t +-echo "$as_me:14467: checking if we must include wchar.h to declare wint_t" >&5 ++echo "$as_me:15397: checking if we must include wchar.h to declare wint_t" >&5 + echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 + if test "${cf_cv_wint_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 14474 "configure" ++#line 15404 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14489,23 +15419,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14492: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15422: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14495: \$? = $ac_status" >&5 ++ echo "$as_me:15425: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14498: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15428: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14501: \$? = $ac_status" >&5 ++ echo "$as_me:15431: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 14508 "configure" ++#line 15438 "configure" + #include "confdefs.h" + + #include <stdlib.h> +@@ -14524,16 +15454,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14527: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15457: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14530: \$? = $ac_status" >&5 ++ echo "$as_me:15460: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14533: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15463: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14536: \$? = $ac_status" >&5 ++ echo "$as_me:15466: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_wint_t=yes + else +@@ -14545,7 +15475,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:14548: result: $cf_cv_wint_t" >&5 ++echo "$as_me:15478: result: $cf_cv_wint_t" >&5 + echo "${ECHO_T}$cf_cv_wint_t" >&6 + + if test "$cf_cv_wint_t" = yes ; then +@@ -14566,12 +15496,12 @@ + NCURSES_OK_WINT_T=1 + fi + +-if test "$NCURSES_OK_MBSTATE_T" = 0 ; then ++ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then + +-echo "$as_me:14571: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15501: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14574 "configure" ++#line 15504 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14589,16 +15519,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14592: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15522: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14595: \$? = $ac_status" >&5 ++ echo "$as_me:15525: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14598: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15528: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14601: \$? = $ac_status" >&5 ++ echo "$as_me:15531: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14607,7 +15537,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14610: result: $cf_result" >&5 ++echo "$as_me:15540: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -14624,14 +15554,14 @@ + + fi + +-fi ++ fi + +-if test "$NCURSES_OK_WCHAR_T" = 0 ; then ++ if test "$NCURSES_OK_WCHAR_T" = 0 ; then + +-echo "$as_me:14631: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15561: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14634 "configure" ++#line 15564 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14649,16 +15579,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14652: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15582: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14655: \$? = $ac_status" >&5 ++ echo "$as_me:15585: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14658: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15588: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14661: \$? = $ac_status" >&5 ++ echo "$as_me:15591: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14667,7 +15597,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14670: result: $cf_result" >&5 ++echo "$as_me:15600: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -14684,14 +15614,14 @@ + + fi + +-fi ++ fi + +-if test "$NCURSES_OK_WINT_T" = 0 ; then ++ if test "$NCURSES_OK_WINT_T" = 0 ; then + +-echo "$as_me:14691: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15621: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14694 "configure" ++#line 15624 "configure" + #include "confdefs.h" + + #ifndef _XOPEN_SOURCE_EXTENDED +@@ -14709,16 +15639,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15642: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14715: \$? = $ac_status" >&5 ++ echo "$as_me:15645: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14718: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14721: \$? = $ac_status" >&5 ++ echo "$as_me:15651: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14727,7 +15657,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14730: result: $cf_result" >&5 ++echo "$as_me:15660: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -14744,13 +15674,14 @@ + + fi + ++ fi + fi + +-echo "$as_me:14749: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15680: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >conftest.$ac_ext <<_ACEOF +-#line 14753 "configure" ++#line 15684 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -14778,16 +15709,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14781: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14784: \$? = $ac_status" >&5 ++ echo "$as_me:15715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14787: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14790: \$? = $ac_status" >&5 ++ echo "$as_me:15721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14796,7 +15727,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14799: result: $cf_result" >&5 ++echo "$as_me:15730: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -14808,14 +15739,14 @@ + EOF + + else +- echo "$as_me:14811: checking for data boolnames in library" >&5 ++ echo "$as_me:15742: checking for data boolnames in library" >&5 + echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >conftest.$ac_ext <<_ACEOF +-#line 14818 "configure" ++#line 15749 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -14847,16 +15778,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14850: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15781: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14853: \$? = $ac_status" >&5 ++ echo "$as_me:15784: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14856: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15787: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14859: \$? = $ac_status" >&5 ++ echo "$as_me:15790: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14868,7 +15799,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 14871 "configure" ++#line 15802 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -14893,15 +15824,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:14896: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15827: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14899: \$? = $ac_status" >&5 ++ echo "$as_me:15830: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:14901: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15832: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14904: \$? = $ac_status" >&5 ++ echo "$as_me:15835: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14912,7 +15843,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:14915: result: $cf_result" >&5 ++ echo "$as_me:15846: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -14925,11 +15856,11 @@ + fi + fi + +-echo "$as_me:14928: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 ++echo "$as_me:15859: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 + echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 + + cat >conftest.$ac_ext <<_ACEOF +-#line 14932 "configure" ++#line 15863 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -14957,16 +15888,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14960: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15891: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14963: \$? = $ac_status" >&5 ++ echo "$as_me:15894: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14966: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15897: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14969: \$? = $ac_status" >&5 ++ echo "$as_me:15900: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -14975,7 +15906,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:14978: result: $cf_result" >&5 ++echo "$as_me:15909: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test $cf_result = yes ; then +@@ -14987,14 +15918,14 @@ + EOF + + else +- echo "$as_me:14990: checking for data boolfnames in library" >&5 ++ echo "$as_me:15921: checking for data boolfnames in library" >&5 + echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6 + # BSD linkers insist on making weak linkage, but resolve at runtime. + if test "$cross_compiling" = yes; then + + # cross-compiling + cat >conftest.$ac_ext <<_ACEOF +-#line 14997 "configure" ++#line 15928 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15026,16 +15957,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15029: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15960: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15032: \$? = $ac_status" >&5 ++ echo "$as_me:15963: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15035: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15966: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15038: \$? = $ac_status" >&5 ++ echo "$as_me:15969: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15047,7 +15978,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 15050 "configure" ++#line 15981 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -15072,15 +16003,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:15075: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16006: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15078: \$? = $ac_status" >&5 ++ echo "$as_me:16009: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:15080: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15083: \$? = $ac_status" >&5 ++ echo "$as_me:16014: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -15091,7 +16022,7 @@ + fi + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- echo "$as_me:15094: result: $cf_result" >&5 ++ echo "$as_me:16025: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result = yes ; then + +@@ -15104,6 +16035,335 @@ + fi + fi + ++LD_RPATH_OPT= ++echo "$as_me:16039: checking for an rpath option" >&5 ++echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 ++case $cf_cv_system_name in #(vi ++irix*) #(vi ++ if test "$GCC" = yes; then ++ LD_RPATH_OPT="-Wl,-rpath," ++ else ++ LD_RPATH_OPT="-rpath " ++ fi ++ ;; ++linux*|gnu*|k*bsd*-gnu) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++openbsd[2-9].*|mirbsd*) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++dragonfly*|freebsd*) #(vi ++ LD_RPATH_OPT="-rpath " ++ ;; ++netbsd*) #(vi ++ LD_RPATH_OPT="-Wl,-rpath," ++ ;; ++osf*|mls+*) #(vi ++ LD_RPATH_OPT="-rpath " ++ ;; ++solaris2*) #(vi ++ LD_RPATH_OPT="-R" ++ ;; ++*) ++ ;; ++esac ++echo "$as_me:16070: result: $LD_RPATH_OPT" >&5 ++echo "${ECHO_T}$LD_RPATH_OPT" >&6 ++ ++case "x$LD_RPATH_OPT" in #(vi ++x-R*) ++ echo "$as_me:16075: checking if we need a space after rpath option" >&5 ++echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 ++ cf_save_LIBS="$LIBS" ++ LIBS="${LD_RPATH_OPT}$libdir $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line 16080 "configure" ++#include "confdefs.h" ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:16092: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16095: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:16098: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16101: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_rpath_space=no ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++cf_rpath_space=yes ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ LIBS="$cf_save_LIBS" ++ echo "$as_me:16111: result: $cf_rpath_space" >&5 ++echo "${ECHO_T}$cf_rpath_space" >&6 ++ test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ++ ;; ++esac ++ ++echo "$as_me:16117: checking if rpath-hack should be disabled" >&5 ++echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 ++ ++# Check whether --enable-rpath-hack or --disable-rpath-hack was given. ++if test "${enable_rpath_hack+set}" = set; then ++ enableval="$enable_rpath_hack" ++ test "$enableval" != no && enableval=yes ++ if test "$enableval" != "yes" ; then ++ cf_disable_rpath_hack=yes ++ else ++ cf_disable_rpath_hack=no ++ fi ++else ++ enableval=yes ++ cf_disable_rpath_hack=no ++ ++fi; ++echo "$as_me:16134: result: $cf_disable_rpath_hack" >&5 ++echo "${ECHO_T}$cf_disable_rpath_hack" >&6 ++if test "$cf_disable_rpath_hack" = no ; then ++ ++echo "$as_me:16138: checking for updated LDFLAGS" >&5 ++echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 ++if test -n "$LD_RPATH_OPT" ; then ++ echo "$as_me:16141: result: maybe" >&5 ++echo "${ECHO_T}maybe" >&6 ++ ++ for ac_prog in ldd ++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:16148: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$cf_ldd_prog"; then ++ ac_cv_prog_cf_ldd_prog="$cf_ldd_prog" # Let the user override the test. ++else ++ ac_save_IFS=$IFS; IFS=$ac_path_separator ++ac_dummy="$PATH" ++for ac_dir in $ac_dummy; do ++ IFS=$ac_save_IFS ++ test -z "$ac_dir" && ac_dir=. ++ $as_executable_p "$ac_dir/$ac_word" || continue ++ac_cv_prog_cf_ldd_prog="$ac_prog" ++echo "$as_me:16163: found $ac_dir/$ac_word" >&5 ++break ++done ++ ++fi ++fi ++cf_ldd_prog=$ac_cv_prog_cf_ldd_prog ++if test -n "$cf_ldd_prog"; then ++ echo "$as_me:16171: result: $cf_ldd_prog" >&5 ++echo "${ECHO_T}$cf_ldd_prog" >&6 ++else ++ echo "$as_me:16174: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ test -n "$cf_ldd_prog" && break ++done ++test -n "$cf_ldd_prog" || cf_ldd_prog="no" ++ ++ cf_rpath_list="/usr/lib /lib" ++ if test "$cf_ldd_prog" != no ++ then ++ cf_rpath_oops= ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line 16188 "configure" ++#include "confdefs.h" ++#include <stdio.h> ++int ++main () ++{ ++printf("Hello"); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:16200: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:16203: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:16206: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:16209: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` ++ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` ++else ++ echo "$as_me: failed program was:" >&5 ++cat conftest.$ac_ext >&5 ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ ++ # If we passed the link-test, but get a "not found" on a given library, ++ # this could be due to inept reconfiguration of gcc to make it only ++ # partly honor /usr/local/lib (or whatever). Sometimes this behavior ++ # is intentional, e.g., installing gcc in /usr/bin and suppressing the ++ # /usr/local libraries. ++ if test -n "$cf_rpath_oops" ++ then ++ for cf_rpath_src in $cf_rpath_oops ++ do ++ for cf_rpath_dir in \ ++ /usr/local \ ++ /usr/pkg \ ++ /opt/sfw ++ do ++ if test -f $cf_rpath_dir/lib/$cf_rpath_src ++ then ++ test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 ++ ++echo "${as_me:-configure}:16237: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 ++ ++ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" ++ break ++ fi ++ done ++ done ++ fi ++ fi ++ ++ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 ++ ++echo "${as_me:-configure}:16249: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++ ++test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 ++ ++echo "${as_me:-configure}:16253: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++ ++cf_rpath_dst= ++for cf_rpath_src in $LDFLAGS ++do ++ case $cf_rpath_src in #(vi ++ -L*) #(vi ++ ++ # check if this refers to a directory which we will ignore ++ cf_rpath_skip=no ++ if test -n "$cf_rpath_list" ++ then ++ for cf_rpath_item in $cf_rpath_list ++ do ++ if test "x$cf_rpath_src" = "x-L$cf_rpath_item" ++ then ++ cf_rpath_skip=yes ++ break ++ fi ++ done ++ fi ++ ++ if test "$cf_rpath_skip" = no ++ then ++ # transform the option ++ if test "$LD_RPATH_OPT" = "-R " ; then ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"` ++ else ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"` ++ fi ++ ++ # if we have not already added this, add it now ++ cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"` ++ if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS" ++ then ++ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 ++ ++echo "${as_me:-configure}:16290: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++ ++ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" ++ fi ++ fi ++ ;; ++ esac ++ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src" ++done ++LDFLAGS=$cf_rpath_dst ++ ++test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 ++ ++echo "${as_me:-configure}:16303: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++ ++test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 ++ ++echo "${as_me:-configure}:16307: testing ...checking LIBS $LIBS ..." 1>&5 ++ ++cf_rpath_dst= ++for cf_rpath_src in $LIBS ++do ++ case $cf_rpath_src in #(vi ++ -L*) #(vi ++ ++ # check if this refers to a directory which we will ignore ++ cf_rpath_skip=no ++ if test -n "$cf_rpath_list" ++ then ++ for cf_rpath_item in $cf_rpath_list ++ do ++ if test "x$cf_rpath_src" = "x-L$cf_rpath_item" ++ then ++ cf_rpath_skip=yes ++ break ++ fi ++ done ++ fi ++ ++ if test "$cf_rpath_skip" = no ++ then ++ # transform the option ++ if test "$LD_RPATH_OPT" = "-R " ; then ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%-R %"` ++ else ++ cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e "s%-L%$LD_RPATH_OPT%"` ++ fi ++ ++ # if we have not already added this, add it now ++ cf_rpath_tst=`echo "$EXTRA_LDFLAGS" | sed -e "s%$cf_rpath_tmp %%"` ++ if test "x$cf_rpath_tst" = "x$EXTRA_LDFLAGS" ++ then ++ test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 ++ ++echo "${as_me:-configure}:16344: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++ ++ EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" ++ fi ++ fi ++ ;; ++ esac ++ cf_rpath_dst="$cf_rpath_dst $cf_rpath_src" ++done ++LIBS=$cf_rpath_dst ++ ++test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 ++ ++echo "${as_me:-configure}:16357: testing ...checked LIBS $LIBS ..." 1>&5 ++ ++ test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 ++ ++echo "${as_me:-configure}:16361: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++ ++fi ++ ++fi ++ + TEST_ARGS="$LIBS" + LIBS= + +@@ -15188,7 +16448,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:15191: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:16451: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -15320,7 +16580,7 @@ + cat >>$CONFIG_STATUS <<EOF + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.52.20101002, ++configured by $0, generated by GNU Autoconf 2.52.20120811, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" + + Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +@@ -15364,7 +16624,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:15367: error: ambiguous option: $1 ++ { { echo "$as_me:16627: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: ambiguous option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -15383,7 +16643,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:15386: error: unrecognized option: $1 ++ -*) { { echo "$as_me:16646: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&5 + echo "$as_me: error: unrecognized option: $1 + Try \`$0 --help' for more information." >&2;} +@@ -15402,7 +16662,7 @@ + ## Running config.status. ## + ## ----------------------- ## + +-This file was extended by $as_me 2.52.20101002, executed with ++This file was extended by $as_me 2.52.20120811, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS +@@ -15419,7 +16679,9 @@ + # + + AWK="$AWK" ++ECHO_CC="$ECHO_CC" + ECHO_LD="$ECHO_LD" ++SHOW_CC="$SHOW_LD" + + EOF + +@@ -15431,7 +16693,7 @@ + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; +- *) { { echo "$as_me:15434: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:16696: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -15490,6 +16752,7 @@ + s,@bindir@,$bindir,;t t + s,@sbindir@,$sbindir,;t t + s,@libexecdir@,$libexecdir,;t t ++s,@datarootdir@,$datarootdir,;t t + s,@datadir@,$datadir,;t t + s,@sysconfdir@,$sysconfdir,;t t + s,@sharedstatedir@,$sharedstatedir,;t t +@@ -15541,6 +16804,7 @@ + s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t + s,@MAKE_UPPER_TAGS@,$MAKE_UPPER_TAGS,;t t + s,@MATH_LIB@,$MATH_LIB,;t t ++s,@top_builddir@,$top_builddir,;t t + s,@CC_G_OPT@,$CC_G_OPT,;t t + s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t + s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t +@@ -15561,7 +16825,8 @@ + s,@TEST_ARGS@,$TEST_ARGS,;t t + s,@TEST_DEPS@,$TEST_DEPS,;t t + s,@TEST_LIBS@,$TEST_LIBS,;t t +-s,@TINFO_ARGS@,$TINFO_ARGS,;t t ++s,@TINFO_LDFLAGS@,$TINFO_LDFLAGS,;t t ++s,@TINFO_LIBS@,$TINFO_LIBS,;t t + s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t + s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t + s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t +@@ -15572,6 +16837,7 @@ + s,@ECHO_CC@,$ECHO_CC,;t t + s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t + s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t ++s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t + s,@X_CFLAGS@,$X_CFLAGS,;t t +@@ -15579,7 +16845,10 @@ + s,@X_LIBS@,$X_LIBS,;t t + s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t + s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t ++s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t + s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t ++s,@cf_ldd_prog@,$cf_ldd_prog,;t t ++s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t + CEOF + + EOF +@@ -15694,7 +16963,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:15697: creating $ac_file" >&5 ++ { echo "$as_me:16966: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -15712,7 +16981,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:15715: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:16984: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -15725,7 +16994,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:15728: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:16997: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -15791,7 +17060,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:15794: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:17063: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -15802,7 +17071,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:15805: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:17074: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -15815,7 +17084,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:15818: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:17087: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -15873,7 +17142,7 @@ + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then +- { echo "$as_me:15876: $ac_file is unchanged" >&5 ++ { echo "$as_me:17145: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +@@ -15949,7 +17218,8 @@ + \$(MODEL)/$N.o : \$(srcdir)/$N.c \\ + \$(srcdir)/test.priv.h \\ + ncurses_cfg.h +- @echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c ++ $SHOW_CC ++ $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c + TEST_EOF + done + +diff -Naur ncurses-5.9.orig/test/configure.in ncurses-5.9/test/configure.in +--- ncurses-5.9.orig/test/configure.in 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/configure.in 2012-08-25 19:58:01.046559827 +0000 +@@ -1,5 +1,5 @@ + dnl*************************************************************************** +-dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + dnl * + dnl Permission is hereby granted, free of charge, to any person obtaining a * + dnl copy of this software and associated documentation files (the * +@@ -28,7 +28,7 @@ + dnl + dnl Author: Thomas E. Dickey 1996, etc. + dnl +-dnl $Id: configure.in,v 1.90 2011/03/22 09:15:08 tom Exp $ ++dnl $Id: configure.in,v 1.104 2012/03/17 17:29:03 tom Exp $ + dnl This is a simple configuration-script for the ncurses test programs that + dnl allows the test-directory to be separately configured against a reference + dnl system (i.e., sysvr4 curses) +@@ -60,6 +60,7 @@ + AC_SUBST(MATH_LIB) + + dnl Things that we don't need (or must override) if we're not building ncurses ++CF_TOP_BUILDDIR + CC_G_OPT="-g" AC_SUBST(CC_G_OPT) + CC_SHARED_OPTS=unknown AC_SUBST(CC_SHARED_OPTS) + CPPFLAGS="$CPPFLAGS" AC_SUBST(CPPFLAGS) +@@ -81,7 +82,8 @@ + TEST_ARGS="" AC_SUBST(TEST_ARGS) + TEST_DEPS="" AC_SUBST(TEST_DEPS) + TEST_LIBS="" AC_SUBST(TEST_LIBS) +-TINFO_ARGS='$(LIBS_CURSES)' AC_SUBST(TINFO_ARGS) ++TINFO_LDFLAGS='' AC_SUBST(TINFO_LDFLAGS) ++TINFO_LIBS='$(LIBS_CURSES)' AC_SUBST(TINFO_LIBS) + cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version) + cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version) + +@@ -101,45 +103,27 @@ + CF_ENABLE_WARNINGS + + CF_DISABLE_LEAKS +-CF_WITH_CURSES_DIR + +-dnl SunOS 4.x +-AC_ARG_WITH(5lib, +- [ --with-5lib use SunOS sysv-libraries], +- [LIBS="-L/usr/5lib $LIBS" +- CPPFLAGS="$CPPFLAGS -I/usr/5include"]) ++dnl --------------------------------------------------------------------------- ++AC_MSG_CHECKING(if you want to check for wide-character functions) ++CF_ARG_DISABLE(widec, ++ [ --disable-widec disable checks for wide-character functions], ++ cf_enable_widec=no, ++ cf_enable_widec=yes, ++ yes) ++AC_MSG_RESULT($cf_enable_widec) ++ + + dnl --------------------------------------------------------------------------- +-dnl NcursesW, installed in conventional location +-AC_ARG_WITH(ncursesw, +- [ --with-ncursesw use wide ncurses-libraries (installed)], +- [cf_cv_screen=ncursesw],[ +- +-dnl Ncurses, installed in conventional location +-AC_ARG_WITH(ncurses, +- [ --with-ncurses use ncurses-libraries (installed)], +- [cf_cv_screen=ncurses],[ +- +-AC_ARG_WITH(pdcurses, +- [ --with-pdcurses compile/link with pdcurses X11 library], +- [cf_cv_screen=pdcurses])])]) ++CF_WITH_NCURSES_ETC + + case $cf_cv_screen in +-curses) +- CF_CURSES_CONFIG ++curses|curses_*) + CF_NETBSD_FORM_H + CF_NETBSD_MENU_H + ;; +-ncurses) +- CF_NCURSES_CONFIG +- ;; + ncursesw) + cf_cv_libtype=w +- CF_UTF8_LIB +- CF_NCURSES_CONFIG(ncursesw) +- ;; +-pdcurses) #(vi +- CF_PDCURSES_X11 + ;; + esac + +@@ -185,20 +169,28 @@ + unistd.h \ + ) + ++CF_GETOPT_HEADER ++ + AC_CHECK_FUNCS( \ + gettimeofday \ ++strdup \ ++) ++ ++if test "$cf_enable_widec" = yes; then ++AC_CHECK_FUNCS( \ + mblen \ + mbrlen \ + mbrtowc \ + mbsrtowcs \ + mbstowcs \ + mbtowc \ +-strdup \ + wcsrtombs \ + wcstombs \ + ) ++fi + + CF_CURSES_FUNCS( \ ++assume_default_colors \ + chgat \ + color_set \ + filter \ +@@ -225,61 +217,100 @@ + tigetstr \ + typeahead \ + use_default_colors \ +-vw_printw \ ++use_screen \ ++use_window \ + vsscanf \ ++vw_printw \ + wchgat \ + winsstr \ + wresize \ + wsyncdown \ + ) + ++CF_TPUTS_PROTO + CF_NCURSES_EXT_FUNCS + +-AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[ +-AC_TRY_LINK([ ++if test "$cf_enable_widec" = yes ++then ++ # workaround for systems with ncurses before 20111029, due to change of ++ # feature test macro from _XPG5 to _XOPEN_SOURCE ++ if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno ++ then ++ cf_define_xpg5=no ++ AC_MSG_CHECKING(if _XPG5 should be defined to enable wide-characters) ++ ++ AC_TRY_COMPILE([ ++#include <${cf_cv_ncurses_header:-curses.h}>], ++ [int x = _XPG5],, ++ [cf_save_cppflags="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS -D_XPG5" ++ AC_TRY_COMPILE([ ++#include <${cf_cv_ncurses_header:-curses.h}>], ++ [int x = _XPG5], ++ [cf_define_xpg5=yes]) ++ CPPFLAGS="$cf_save_cppflags"]) ++ AC_MSG_RESULT($cf_define_xpg5) ++ ++ if test "$cf_define_xpg5" = yes ++ then ++ CPPFLAGS="$CPPFLAGS -D_XPG5" ++ fi ++ fi ++ ++ AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[ ++ AC_TRY_LINK([ + #include <${cf_cv_ncurses_header:-curses.h}>], +-[ +- static wchar_t src_wchar[2]; +- static cchar_t dst_cchar; +- setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); +- ], +- [cf_cv_widechar_funcs=yes], +- [cf_cv_widechar_funcs=no]) +-]) +-if test "$cf_cv_widechar_funcs" != no ; then +- AC_DEFINE(USE_WIDEC_SUPPORT,1) ++ [ ++ static wchar_t src_wchar[2]; ++ static cchar_t dst_cchar; ++ setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0); ++ ], ++ [cf_cv_widechar_funcs=yes], ++ [cf_cv_widechar_funcs=no]) ++ ]) ++ if test "$cf_cv_widechar_funcs" != no ; then ++ AC_DEFINE(USE_WIDEC_SUPPORT,1) ++ else ++ AC_DEFINE(USE_WIDEC_SUPPORT,0) ++ fi + else + AC_DEFINE(USE_WIDEC_SUPPORT,0) + fi + +-AC_FUNC_VFORK + CF_SYS_TIME_SELECT + CF_FUNC_CURSES_VERSION + CF_CURSES_ACS_MAP +-CF_CURSES_WACS_MAP +-CF_CURSES_WACS_SYMBOLS + +-CF_CURSES_CHECK_TYPE(attr_t,long) +- +-CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T) +-CF_WCHAR_TYPE(wchar_t, NCURSES_WCHAR_T, NCURSES_OK_WCHAR_T) +-CF_WCHAR_TYPE(wint_t, NCURSES_WINT_T, NCURSES_OK_WINT_T) +- +-if test "$NCURSES_OK_MBSTATE_T" = 0 ; then +- CF_CURSES_CHECK_TYPE(mbstate_t,long) ++if test "$cf_enable_widec" = yes; then ++ CF_CURSES_WACS_MAP ++ CF_CURSES_WACS_SYMBOLS + fi + +-if test "$NCURSES_OK_WCHAR_T" = 0 ; then +- CF_CURSES_CHECK_TYPE(wchar_t,long) +-fi ++CF_CURSES_CHECK_TYPE(attr_t,long) + +-if test "$NCURSES_OK_WINT_T" = 0 ; then +- CF_CURSES_CHECK_TYPE(wint_t,long) ++if test "$cf_enable_widec" = yes; then ++ CF_WCHAR_TYPE(mbstate_t, NCURSES_MBSTATE_T, NCURSES_OK_MBSTATE_T) ++ CF_WCHAR_TYPE(wchar_t, NCURSES_WCHAR_T, NCURSES_OK_WCHAR_T) ++ CF_WCHAR_TYPE(wint_t, NCURSES_WINT_T, NCURSES_OK_WINT_T) ++ ++ if test "$NCURSES_OK_MBSTATE_T" = 0 ; then ++ CF_CURSES_CHECK_TYPE(mbstate_t,long) ++ fi ++ ++ if test "$NCURSES_OK_WCHAR_T" = 0 ; then ++ CF_CURSES_CHECK_TYPE(wchar_t,long) ++ fi ++ ++ if test "$NCURSES_OK_WINT_T" = 0 ; then ++ CF_CURSES_CHECK_TYPE(wint_t,long) ++ fi + fi + + CF_CURSES_CHECK_DATA(boolnames) + CF_CURSES_CHECK_DATA(boolfnames) + ++CF_DISABLE_RPATH_HACK ++ + TEST_ARGS="$LIBS" + LIBS= + +@@ -302,7 +333,8 @@ + \$(MODEL)/$N.o : \$(srcdir)/$N.c \\ + \$(srcdir)/test.priv.h \\ + ncurses_cfg.h +- @echo compiling $N; \$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c ++ $SHOW_CC ++ $ECHO_CC\$(CC) -c \$(CFLAGS_DEFAULT) \$(srcdir)/$N.c + TEST_EOF + done + +@@ -317,5 +349,7 @@ + fi + ],[ + AWK="$AWK" ++ECHO_CC="$ECHO_CC" + ECHO_LD="$ECHO_LD" ++SHOW_CC="$SHOW_LD" + ],cat) +diff -Naur ncurses-5.9.orig/test/demo_forms.c ncurses-5.9/test/demo_forms.c +--- ncurses-5.9.orig/test/demo_forms.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/demo_forms.c 2012-08-25 19:58:01.779889693 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2003-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 2003-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_forms.c,v 1.38 2011/01/15 18:15:11 tom Exp $ ++ * $Id: demo_forms.c,v 1.39 2012/06/09 20:30:32 tom Exp $ + * + * Demonstrate a variety of functions from the form library. + * Thomas Dickey - 2003/4/26 +@@ -108,7 +108,7 @@ + set_field_just(f, j_value); + if (d_option) { + if (has_colors()) { +- set_field_fore(f, COLOR_PAIR(2)); ++ set_field_fore(f, (chtype) COLOR_PAIR(2)); + set_field_back(f, A_UNDERLINE | COLOR_PAIR(3)); + } else { + set_field_fore(f, A_BOLD); +@@ -257,7 +257,7 @@ + int currow, curcol; + + if (has_colors()) { +- wbkgd(win, COLOR_PAIR(1)); ++ wbkgd(win, (chtype) COLOR_PAIR(1)); + } + werase(win); + form_getyx(form, currow, curcol); +@@ -309,15 +309,15 @@ + } + + waddch(win, ' '); +- (void) wattrset(win, field_fore(field)); ++ (void) wattrset(win, (int) field_fore(field)); + waddstr(win, "fore"); +- wattroff(win, field_fore(field)); ++ wattroff(win, (int) field_fore(field)); + + waddch(win, '/'); + +- (void) wattrset(win, field_back(field)); ++ (void) wattrset(win, (int) field_back(field)); + waddstr(win, "back"); +- wattroff(win, field_back(field)); ++ wattroff(win, (int) field_back(field)); + + wprintw(win, ", pad '%c'", + field_pad(field)); +@@ -531,7 +531,7 @@ + init_pair(1, COLOR_WHITE, COLOR_BLUE); + init_pair(2, COLOR_GREEN, COLOR_BLACK); + init_pair(3, COLOR_CYAN, COLOR_BLACK); +- bkgd(COLOR_PAIR(1)); ++ bkgd((chtype) COLOR_PAIR(1)); + refresh(); + } + +@@ -540,6 +540,7 @@ + endwin(); + ExitProgram(EXIT_SUCCESS); + } ++ + #else + int + main(void) +diff -Naur ncurses-5.9.orig/test/demo_menus.c ncurses-5.9/test/demo_menus.c +--- ncurses-5.9.orig/test/demo_menus.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/demo_menus.c 2012-08-25 19:58:01.783223010 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2005-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 2005-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: demo_menus.c,v 1.32 2011/01/15 20:02:47 tom Exp $ ++ * $Id: demo_menus.c,v 1.34 2012/06/09 20:30:33 tom Exp $ + * + * Demonstrate a variety of functions from the menu library. + * Thomas Dickey - 2005/4/9 +@@ -225,8 +225,8 @@ + result = new_menu(items); + + if (has_colors()) { +- set_menu_fore(result, COLOR_PAIR(1)); +- set_menu_back(result, COLOR_PAIR(2)); ++ set_menu_fore(result, (chtype) COLOR_PAIR(1)); ++ set_menu_back(result, (chtype) COLOR_PAIR(2)); + } + + set_menu_format(result, maxrow, maxcol); +@@ -831,7 +831,7 @@ + { + static const char *const tbl[] = + { +- "Usage: demo_menus [options]" ++ "Usage: demo_menus [options] [menu-file]" + ,"" + ,"Options:" + #if HAVE_RIPOFFLINE +diff -Naur ncurses-5.9.orig/test/demo_termcap.c ncurses-5.9/test/demo_termcap.c +--- ncurses-5.9.orig/test/demo_termcap.c 2012-08-25 19:57:59.406567583 +0000 ++++ ncurses-5.9/test/demo_termcap.c 2012-08-25 19:58:01.896555808 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2005-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 2005-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: demo_termcap.c,v 1.14 2011/01/15 21:41:27 tom Exp $ ++ * $Id: demo_termcap.c,v 1.22 2012/07/07 23:37:27 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -50,11 +50,112 @@ + #if USE_CODE_LISTS + static bool b_opt = FALSE; + static bool n_opt = FALSE; ++static bool q_opt = FALSE; + static bool s_opt = FALSE; + #endif + ++static char *d_opt; ++static char *e_opt; ++static char **db_list; ++static int db_item; ++ ++static long total_values; ++ + #define isCapName(c) (isgraph(c) && strchr("^#=:\\", c) == 0) + ++#if NO_LEAKS && USE_CODE_LISTS ++ ++#define MYSCR struct _myscr ++MYSCR { ++ MYSCR *next; ++ TERMINAL *term; ++}; ++ ++static MYSCR *my_screens; ++ ++static void ++save_screen(void) ++{ ++ MYSCR *obj = malloc(sizeof(MYSCR)); ++ obj->next = my_screens; ++ obj->term = cur_term; ++ my_screens = obj; ++} ++#else ++#define save_screen() /* nothing */ ++#endif ++ ++static char * ++make_dbitem(char *p, char *q) ++{ ++ char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q)); ++ sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q); ++ return result; ++} ++ ++static void ++make_dblist(void) ++{ ++ if (d_opt && e_opt) { ++ int pass; ++ ++ for (pass = 0; pass < 2; ++pass) { ++ char *p, *q; ++ size_t count = 0; ++ ++ for (p = q = d_opt; *p != '\0'; ++p) { ++ if (*p == ':') { ++ if (p != q + 1) { ++ if (pass) { ++ db_list[count] = make_dbitem(p, q); ++ } ++ count++; ++ } ++ q = p + 1; ++ } ++ } ++ if (p != q + 1) { ++ if (pass) { ++ db_list[count] = make_dbitem(p, q); ++ } ++ count++; ++ } ++ if (!pass) { ++ db_list = typeCalloc(char *, count + 1); ++ } ++ } ++ } ++} ++ ++static char * ++next_dbitem(void) ++{ ++ char *result = 0; ++ ++ if (db_list) { ++ if ((result = db_list[db_item]) == 0) { ++ db_item = 0; ++ result = db_list[0]; ++ } else { ++ db_item++; ++ } ++ } ++ printf("** %s\n", result); ++ return result; ++} ++ ++static void ++free_dblist(void) ++{ ++ if (db_list) { ++ int n; ++ for (n = 0; db_list[n]; ++n) ++ free(db_list[n]); ++ free(db_list); ++ db_list = 0; ++ } ++} ++ + static void + dumpit(NCURSES_CONST char *cap) + { +@@ -70,66 +171,77 @@ + int num; + + if ((str = tgetstr(cap, &ap)) != 0) { +- /* +- * Note that the strings returned are mostly terminfo format, since +- * ncurses does not convert except for a handful of special cases. +- */ +- printf(FNAME(str), cap); +- while (*str != 0) { +- int ch = UChar(*str++); +- switch (ch) { +- case '\177': +- fputs("^?", stdout); +- break; +- case '\033': +- fputs("\\E", stdout); +- break; +- case '\b': +- fputs("\\b", stdout); +- break; +- case '\f': +- fputs("\\f", stdout); +- break; +- case '\n': +- fputs("\\n", stdout); +- break; +- case '\r': +- fputs("\\r", stdout); +- break; +- case ' ': +- fputs("\\s", stdout); +- break; +- case '\t': +- fputs("\\t", stdout); +- break; +- case '^': +- fputs("\\^", stdout); +- break; +- case ':': +- fputs("\\072", stdout); +- break; +- case '\\': +- fputs("\\\\", stdout); +- break; +- default: +- if (isgraph(ch)) +- fputc(ch, stdout); +- else if (ch < 32) +- printf("^%c", ch + '@'); +- else +- printf("\\%03o", ch); +- break; ++ total_values++; ++ if (!q_opt) { ++ /* ++ * Note that the strings returned are mostly terminfo format, since ++ * ncurses does not convert except for a handful of special cases. ++ */ ++ printf(FNAME(str), cap); ++ while (*str != 0) { ++ int ch = UChar(*str++); ++ switch (ch) { ++ case '\177': ++ fputs("^?", stdout); ++ break; ++ case '\033': ++ fputs("\\E", stdout); ++ break; ++ case '\b': ++ fputs("\\b", stdout); ++ break; ++ case '\f': ++ fputs("\\f", stdout); ++ break; ++ case '\n': ++ fputs("\\n", stdout); ++ break; ++ case '\r': ++ fputs("\\r", stdout); ++ break; ++ case ' ': ++ fputs("\\s", stdout); ++ break; ++ case '\t': ++ fputs("\\t", stdout); ++ break; ++ case '^': ++ fputs("\\^", stdout); ++ break; ++ case ':': ++ fputs("\\072", stdout); ++ break; ++ case '\\': ++ fputs("\\\\", stdout); ++ break; ++ default: ++ if (isgraph(ch)) ++ fputc(ch, stdout); ++ else if (ch < 32) ++ printf("^%c", ch + '@'); ++ else ++ printf("\\%03o", ch); ++ break; ++ } + } ++ printf("\n"); + } +- printf("\n"); + } else if ((num = tgetnum(cap)) >= 0) { +- printf(FNAME(num), cap); +- printf(" %d\n", num); ++ total_values++; ++ if (!q_opt) { ++ printf(FNAME(num), cap); ++ printf(" %d\n", num); ++ } + } else if (tgetflag(cap) > 0) { +- printf(FNAME(flg), cap); +- printf("%s\n", "true"); ++ ++total_values; ++ if (!q_opt) { ++ printf(FNAME(flg), cap); ++ printf("%s\n", "true"); ++ } + } +- fflush(stdout); ++ ++ if (!q_opt) ++ fflush(stdout); + } + + static void +@@ -137,6 +249,9 @@ + { + char buffer[1024]; + ++ if (db_list) { ++ putenv(next_dbitem()); ++ } + printf("Terminal type %s\n", name); + if (tgetent(buffer, name) >= 0) { + char cap[3]; +@@ -159,17 +274,21 @@ + + #if USE_CODE_LISTS + static void +-demo_terminfo(NCURSES_CONST char *name) ++demo_termcap(NCURSES_CONST char *name) + { + unsigned n; + NCURSES_CONST char *cap; + ++ if (db_list) { ++ putenv(next_dbitem()); ++ } + printf("Terminal type \"%s\"\n", name); + #if HAVE_SETUPTERM + setupterm(name, 1, (int *) 0); + #else + setterm(name); + #endif ++ save_screen(); + + if (b_opt) { + for (n = 0;; ++n) { +@@ -204,7 +323,7 @@ + { + static const char *msg[] = + { +- "Usage: demo_terminfo [options] [terminal]", ++ "Usage: demo_termcap [options] [terminal]", + "", + "If no options are given, print all (boolean, numeric, string)", + "capabilities for the given terminal, using short names.", +@@ -212,7 +331,10 @@ + "Options:", + " -a try all names, print capabilities found", + " -b print boolean-capabilities", ++ " -d LIST colon-separated list of databases to use", ++ " -e NAME environment variable to set with -d option", + " -n print numeric-capabilities", ++ " -q quiet (prints only counts)", + " -r COUNT repeat for given count", + " -s print string-capabilities", + }; +@@ -235,7 +357,7 @@ + int repeat; + int r_opt = 1; + +- while ((n = getopt(argc, argv, "abnr:s")) != -1) { ++ while ((n = getopt(argc, argv, "abd:e:nqr:s")) != -1) { + switch (n) { + case 'a': + a_opt = TRUE; +@@ -243,9 +365,18 @@ + case 'b': + b_opt = TRUE; + break; ++ case 'd': ++ d_opt = optarg; ++ break; ++ case 'e': ++ e_opt = optarg; ++ break; + case 'n': + n_opt = TRUE; + break; ++ case 'q': ++ q_opt = TRUE; ++ break; + case 'r': + if ((r_opt = atoi(optarg)) <= 0) + usage(); +@@ -268,6 +399,8 @@ + a_opt = TRUE; + #endif + ++ make_dblist(); ++ + if (a_opt) { + if (optind < argc) { + for (n = optind; n < argc; ++n) { +@@ -285,17 +418,35 @@ + for (repeat = 0; repeat < r_opt; ++repeat) { + if (optind < argc) { + for (n = optind; n < argc; ++n) { +- demo_terminfo(argv[n]); ++ demo_termcap(argv[n]); + } + } else if ((name = getenv("TERM")) != 0) { +- demo_terminfo(name); ++ demo_termcap(name); + } else { + static char dumb[] = "dumb"; +- demo_terminfo(dumb); ++ demo_termcap(dumb); + } + } +- } ++#if NO_LEAKS ++ /* ++ * ncurses' tgetent() interface caches some entries and its no-leaks ++ * code discards those. The calls to setupterm() on the other hand ++ * are not cached, and each call allocates a chunk of memory, even ++ * if the same terminal type is requested repeatedly. ++ */ ++ while (my_screens != 0) { ++ MYSCR *next = my_screens->next; ++ del_curterm(my_screens->term); ++ free(my_screens); ++ my_screens = next; ++ } + #endif ++ } ++#endif /* USE_CODE_LISTS */ ++ ++ printf("%ld values\n", total_values); ++ ++ free_dblist(); + + ExitProgram(EXIT_SUCCESS); + } +@@ -306,6 +457,6 @@ + char *argv[]GCC_UNUSED) + { + printf("This program requires termcap\n"); +- exit(EXIT_FAILURE); ++ ExitProgram(EXIT_FAILURE); + } + #endif +diff -Naur ncurses-5.9.orig/test/demo_terminfo.c ncurses-5.9/test/demo_terminfo.c +--- ncurses-5.9.orig/test/demo_terminfo.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/demo_terminfo.c 2012-08-25 19:58:01.896555808 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey + * +- * $Id: demo_terminfo.c,v 1.9 2010/11/28 00:15:27 tom Exp $ ++ * $Id: demo_terminfo.c,v 1.13 2012/07/07 23:37:13 tom Exp $ + * + * A simple demo of the terminfo interface. + */ +@@ -52,12 +52,90 @@ + static bool b_opt = FALSE; + static bool f_opt = FALSE; + static bool n_opt = FALSE; ++static bool q_opt = FALSE; + static bool s_opt = FALSE; + static bool x_opt = FALSE; + ++static char *d_opt; ++static char *e_opt; ++static char **db_list; ++static int db_item; ++ ++static long total_values; ++ + #define FCOLS 8 + #define FNAME(type) "%s %-*s = ", #type, FCOLS + ++static char * ++make_dbitem(char *p, char *q) ++{ ++ char *result = malloc(strlen(e_opt) + 2 + (size_t) (p - q)); ++ sprintf(result, "%s=%.*s", e_opt, (int) (p - q), q); ++ return result; ++} ++ ++static void ++make_dblist(void) ++{ ++ if (d_opt && e_opt) { ++ int pass; ++ ++ for (pass = 0; pass < 2; ++pass) { ++ char *p, *q; ++ size_t count = 0; ++ ++ for (p = q = d_opt; *p != '\0'; ++p) { ++ if (*p == ':') { ++ if (p != q + 1) { ++ if (pass) { ++ db_list[count] = make_dbitem(p, q); ++ } ++ count++; ++ } ++ q = p + 1; ++ } ++ } ++ if (p != q + 1) { ++ if (pass) { ++ db_list[count] = make_dbitem(p, q); ++ } ++ count++; ++ } ++ if (!pass) { ++ db_list = typeCalloc(char *, count + 1); ++ } ++ } ++ } ++} ++ ++static char * ++next_dbitem(void) ++{ ++ char *result = 0; ++ ++ if (db_list) { ++ if ((result = db_list[db_item]) == 0) { ++ db_item = 0; ++ result = db_list[0]; ++ } else { ++ db_item++; ++ } ++ } ++ printf("** %s\n", result); ++ return result; ++} ++ ++static void ++free_dblist(void) ++{ ++ if (db_list) { ++ int n; ++ for (n = 0; db_list[n]; ++n) ++ free(db_list[n]); ++ free(db_list); ++ db_list = 0; ++ } ++} + static void + dumpit(NCURSES_CONST char *cap) + { +@@ -72,66 +150,77 @@ + int num; + + if ((str = tigetstr(cap)) != 0 && (str != (char *) -1)) { +- /* +- * Note that the strings returned are mostly terminfo format, since +- * ncurses does not convert except for a handful of special cases. +- */ +- printf(FNAME(str), cap); +- while (*str != 0) { +- int ch = UChar(*str++); +- switch (ch) { +- case '\177': +- fputs("^?", stdout); +- break; +- case '\033': +- fputs("\\E", stdout); +- break; +- case '\b': +- fputs("\\b", stdout); +- break; +- case '\f': +- fputs("\\f", stdout); +- break; +- case '\n': +- fputs("\\n", stdout); +- break; +- case '\r': +- fputs("\\r", stdout); +- break; +- case ' ': +- fputs("\\s", stdout); +- break; +- case '\t': +- fputs("\\t", stdout); +- break; +- case '^': +- fputs("\\^", stdout); +- break; +- case ':': +- fputs("\\072", stdout); +- break; +- case '\\': +- fputs("\\\\", stdout); +- break; +- default: +- if (isgraph(ch)) +- fputc(ch, stdout); +- else if (ch < 32) +- printf("^%c", ch + '@'); +- else +- printf("\\%03o", ch); +- break; ++ total_values++; ++ if (!q_opt) { ++ /* ++ * Note that the strings returned are mostly terminfo format, since ++ * ncurses does not convert except for a handful of special cases. ++ */ ++ printf(FNAME(str), cap); ++ while (*str != 0) { ++ int ch = UChar(*str++); ++ switch (ch) { ++ case '\177': ++ fputs("^?", stdout); ++ break; ++ case '\033': ++ fputs("\\E", stdout); ++ break; ++ case '\b': ++ fputs("\\b", stdout); ++ break; ++ case '\f': ++ fputs("\\f", stdout); ++ break; ++ case '\n': ++ fputs("\\n", stdout); ++ break; ++ case '\r': ++ fputs("\\r", stdout); ++ break; ++ case ' ': ++ fputs("\\s", stdout); ++ break; ++ case '\t': ++ fputs("\\t", stdout); ++ break; ++ case '^': ++ fputs("\\^", stdout); ++ break; ++ case ':': ++ fputs("\\072", stdout); ++ break; ++ case '\\': ++ fputs("\\\\", stdout); ++ break; ++ default: ++ if (isgraph(ch)) ++ fputc(ch, stdout); ++ else if (ch < 32) ++ printf("^%c", ch + '@'); ++ else ++ printf("\\%03o", ch); ++ break; ++ } + } ++ printf("\n"); + } +- printf("\n"); + } else if ((num = tigetnum(cap)) >= 0) { +- printf(FNAME(num), cap); +- printf(" %d\n", num); ++ total_values++; ++ if (!q_opt) { ++ printf(FNAME(num), cap); ++ printf(" %d\n", num); ++ } + } else if ((num = tigetflag(cap)) >= 0) { +- printf(FNAME(flg), cap); +- printf("%s\n", num ? "true" : "false"); ++ total_values++; ++ if (!q_opt) { ++ printf(FNAME(flg), cap); ++ printf("%s\n", num ? "true" : "false"); ++ } + } +- fflush(stdout); ++ ++ if (!q_opt) ++ fflush(stdout); + } + + static void +@@ -140,6 +229,9 @@ + unsigned n; + NCURSES_CONST char *cap; + ++ if (db_list) { ++ putenv(next_dbitem()); ++ } + printf("Terminal type \"%s\"\n", name); + setupterm(name, 1, (int *) 0); + +@@ -224,8 +316,11 @@ + "", + "Options:", + " -b print boolean-capabilities", ++ " -d LIST colon-separated list of databases to use", ++ " -e NAME environment variable to set with -d option", + " -f print full names", + " -n print numeric-capabilities", ++ " -q quiet (prints only counts)", + " -r COUNT repeat for given count", + " -s print string-capabilities", + #ifdef NCURSES_VERSION +@@ -247,17 +342,26 @@ + char *name; + int r_opt = 1; + +- while ((n = getopt(argc, argv, "bfnr:sx")) != -1) { ++ while ((n = getopt(argc, argv, "bd:e:fnqr:sx")) != -1) { + switch (n) { + case 'b': + b_opt = TRUE; + break; ++ case 'd': ++ d_opt = optarg; ++ break; ++ case 'e': ++ e_opt = optarg; ++ break; + case 'f': + f_opt = TRUE; + break; + case 'n': + n_opt = TRUE; + break; ++ case 'q': ++ q_opt = TRUE; ++ break; + case 'r': + if ((r_opt = atoi(optarg)) <= 0) + usage(); +@@ -283,6 +387,8 @@ + s_opt = TRUE; + } + ++ make_dblist(); ++ + for (repeat = 0; repeat < r_opt; ++repeat) { + if (optind < argc) { + for (n = optind; n < argc; ++n) { +@@ -296,6 +402,10 @@ + } + } + ++ printf("%ld values\n", total_values); ++ ++ free_dblist(); ++ + ExitProgram(EXIT_SUCCESS); + } + +diff -Naur ncurses-5.9.orig/test/ditto.c ncurses-5.9/test/ditto.c +--- ncurses-5.9.orig/test/ditto.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/ditto.c 2012-08-25 19:58:00.086564367 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey (1998-on) + * +- * $Id: ditto.c,v 1.40 2010/11/14 01:06:47 tom Exp $ ++ * $Id: ditto.c,v 1.41 2011/05/21 18:55:07 tom Exp $ + * + * The program illustrates how to set up multiple screens from a single + * program. +@@ -98,6 +98,9 @@ + DITTO *ditto; /* data for all screens */ + } DDATA; + ++static void failed(const char *) GCC_NORETURN; ++static void usage(void) GCC_NORETURN; ++ + static void + failed(const char *s) + { +diff -Naur ncurses-5.9.orig/test/dots.c ncurses-5.9/test/dots.c +--- ncurses-5.9.orig/test/dots.c 2012-08-25 19:57:59.406567583 +0000 ++++ ncurses-5.9/test/dots.c 2012-08-25 19:58:00.086564367 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey <dickey@clark.net> 1999 + * +- * $Id: dots.c,v 1.22 2010/11/14 01:00:02 tom Exp $ ++ * $Id: dots.c,v 1.23 2011/04/23 19:15:04 tom Exp $ + * + * A simple demo of the terminfo interface. + */ +@@ -46,8 +46,8 @@ + static long total_chars = 0; + static time_t started; + +-static int +-outc(TPUTS_ARG c) ++static ++TPUTS_PROTO(outc, c) + { + int rc = c; + +@@ -58,7 +58,7 @@ + } else { + rc = putc(c, stdout); + } +- return rc; ++ TPUTS_RETURN(rc); + } + + static bool +diff -Naur ncurses-5.9.orig/test/dots_mvcur.c ncurses-5.9/test/dots_mvcur.c +--- ncurses-5.9.orig/test/dots_mvcur.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/dots_mvcur.c 2012-08-25 19:58:00.086564367 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey - 2007 + * +- * $Id: dots_mvcur.c,v 1.6 2010/11/14 01:00:44 tom Exp $ ++ * $Id: dots_mvcur.c,v 1.7 2011/04/23 19:17:20 tom Exp $ + * + * A simple demo of the terminfo interface, and mvcur. + */ +@@ -46,8 +46,8 @@ + static long total_chars = 0; + static time_t started; + +-static int +-outc(TPUTS_ARG c) ++static ++TPUTS_PROTO(outc, c) + { + int rc = c; + +@@ -59,7 +59,7 @@ + if (putc(c, stdout) == EOF) + rc = EOF; + } +- return rc; ++ TPUTS_RETURN(rc); + } + + static bool +diff -Naur ncurses-5.9.orig/test/echochar.c ncurses-5.9/test/echochar.c +--- ncurses-5.9.orig/test/echochar.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/echochar.c 2012-08-25 19:58:01.783223010 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: echochar.c,v 1.8 2010/11/14 01:00:44 tom Exp $ ++ * $Id: echochar.c,v 1.9 2012/06/09 20:30:32 tom Exp $ + * + * Demonstrate the echochar function (compare to dots.c). + * Thomas Dickey - 2006/11/4 +@@ -74,7 +74,7 @@ + (short) fg, + (short) bg); + } +- attron(COLOR_PAIR(pair)); ++ attron((attr_t) COLOR_PAIR(pair)); + } + + int +diff -Naur ncurses-5.9.orig/test/filter.c ncurses-5.9/test/filter.c +--- ncurses-5.9.orig/test/filter.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/filter.c 2012-08-25 19:58:01.783223010 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey <dickey@clark.net> 1998 + * +- * $Id: filter.c,v 1.13 2010/11/13 20:55:54 tom Exp $ ++ * $Id: filter.c,v 1.15 2012/06/09 20:30:32 tom Exp $ + */ + #include <test.priv.h> + +@@ -133,7 +133,7 @@ + background = -1; + #endif + init_pair(1, COLOR_CYAN, (short) background); +- underline = COLOR_PAIR(1); ++ underline = (attr_t) COLOR_PAIR(1); + } else { + underline = A_UNDERLINE; + } +@@ -143,7 +143,7 @@ + reset_shell_mode(); + printf("\n"); + fflush(stdout); +- system(buffer); ++ IGNORE_RC(system(buffer)); + reset_prog_mode(); + touchwin(stdscr); + erase(); +diff -Naur ncurses-5.9.orig/test/gdc.c ncurses-5.9/test/gdc.c +--- ncurses-5.9.orig/test/gdc.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/gdc.c 2012-08-25 19:58:01.786556327 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -33,7 +33,7 @@ + * modified 10-18-89 for curses (jrl) + * 10-18-89 added signal handling + * +- * $Id: gdc.c,v 1.34 2010/11/13 21:01:23 tom Exp $ ++ * $Id: gdc.c,v 1.35 2012/06/09 20:30:32 tom Exp $ + */ + + #include <test.priv.h> +@@ -78,7 +78,7 @@ + int n; + + if (hascolor) +- (void) attrset(COLOR_PAIR(PAIR_FRAMES)); ++ (void) attrset((attr_t) COLOR_PAIR(PAIR_FRAMES)); + + MvAddCh(YBASE - 1, XBASE - 1, ACS_ULCORNER); + hline(ACS_HLINE, XLENGTH); +@@ -102,7 +102,7 @@ + vline(ACS_VLINE, YDEPTH); + + if (hascolor) +- (void) attrset(COLOR_PAIR(PAIR_OTHERS)); ++ (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS)); + } + + static void +@@ -110,13 +110,13 @@ + { + if (on) { + if (hascolor) { +- attron(COLOR_PAIR(PAIR_DIGITS)); ++ attron((attr_t) COLOR_PAIR(PAIR_DIGITS)); + } else { + attron(A_STANDOUT); + } + } else { + if (hascolor) { +- attron(COLOR_PAIR(PAIR_OTHERS)); ++ attron((attr_t) COLOR_PAIR(PAIR_OTHERS)); + } else { + attroff(A_STANDOUT); + } +@@ -220,7 +220,7 @@ + init_pair(PAIR_DIGITS, COLOR_BLACK, COLOR_RED); + init_pair(PAIR_OTHERS, COLOR_RED, bg); + init_pair(PAIR_FRAMES, COLOR_WHITE, bg); +- (void) attrset(COLOR_PAIR(PAIR_OTHERS)); ++ (void) attrset((attr_t) COLOR_PAIR(PAIR_OTHERS)); + } + + restart: +diff -Naur ncurses-5.9.orig/test/hanoi.c ncurses-5.9/test/hanoi.c +--- ncurses-5.9.orig/test/hanoi.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/hanoi.c 2012-08-25 19:58:01.786556327 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -41,7 +41,7 @@ + * + * Date: 05.Nov.90 + * +- * $Id: hanoi.c,v 1.31 2010/11/14 01:01:07 tom Exp $ ++ * $Id: hanoi.c,v 1.32 2012/06/09 20:30:32 tom Exp $ + */ + + #include <test.priv.h> +@@ -57,7 +57,7 @@ + #define MIDPEG 39 + #define RIGHTPEG 59 + +-#define LENTOIND(x) (((x)-1)/2) ++#define LENTOIND(x) (((int)(x)-1)/2) + #define OTHER(a,b) (3-((a)+(b))) + + struct Peg { +@@ -255,7 +255,7 @@ + memset(TileBuf, ' ', len); + TileBuf[len] = '\0'; + if (has_colors()) +- (void) attrset(COLOR_PAIR(LENTOIND(len))); ++ (void) attrset((attr_t) COLOR_PAIR(LENTOIND(len))); + else + (void) attrset(A_REVERSE); + MvAddStr(BASELINE - (SlotNo + 1), +diff -Naur ncurses-5.9.orig/test/ins_wide.c ncurses-5.9/test/ins_wide.c +--- ncurses-5.9.orig/test/ins_wide.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/ins_wide.c 2012-08-25 19:58:01.786556327 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: ins_wide.c,v 1.15 2010/12/12 00:20:14 tom Exp $ ++ * $Id: ins_wide.c,v 1.17 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the wins_wstr() and wins_wch functions. + * Thomas Dickey - 2002/11/23 +@@ -228,8 +228,9 @@ + WINDOW *work = 0; + WINDOW *show = 0; + int margin = (2 * MY_TABSIZE) - 1; +- Options option = ((m_opt ? oMove : oDefault) +- | ((w_opt || (level > 0)) ? oWindow : oDefault)); ++ Options option = (Options) ((int) (m_opt ? oMove : oDefault) ++ | (int) ((w_opt || (level > 0)) ++ ? oWindow : oDefault)); + + if (first) { + static char cmd[80]; +@@ -281,7 +282,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgdset(work, COLOR_PAIR(1) | ' '); ++ wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); + } + + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { +diff -Naur ncurses-5.9.orig/test/insdelln.c ncurses-5.9/test/insdelln.c +--- ncurses-5.9.orig/test/insdelln.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/insdelln.c 2012-08-25 19:58:01.789889645 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2008-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: insdelln.c,v 1.5 2010/11/13 23:39:38 tom Exp $ ++ * $Id: insdelln.c,v 1.6 2012/06/09 20:29:33 tom Exp $ + * + * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln + */ +@@ -300,7 +300,7 @@ + init_status(win, &st); + + do { +- (void) wattrset(win, st.attr | (attr_t) COLOR_PAIR(st.pair)); ++ (void) wattrset(win, (int) (st.attr | (attr_t) COLOR_PAIR(st.pair))); + switch (st.ch) { + case 'i': + for (n = 0; n < st.count; ++n) +diff -Naur ncurses-5.9.orig/test/inserts.c ncurses-5.9/test/inserts.c +--- ncurses-5.9.orig/test/inserts.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/inserts.c 2012-08-25 19:58:01.789889645 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2002-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2002-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: inserts.c,v 1.23 2010/12/12 00:19:55 tom Exp $ ++ * $Id: inserts.c,v 1.24 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the winsstr() and winsch functions. + * Thomas Dickey - 2002/10/19 +@@ -207,7 +207,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgdset(work, COLOR_PAIR(1) | ' '); ++ wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); + } + + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { +diff -Naur ncurses-5.9.orig/test/movewindow.c ncurses-5.9/test/movewindow.c +--- ncurses-5.9.orig/test/movewindow.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/movewindow.c 2012-08-25 19:58:01.793222963 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2008,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,18 +26,22 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: movewindow.c,v 1.24 2010/11/13 23:34:55 tom Exp $ ++ * $Id: movewindow.c,v 1.35 2012/06/09 20:30:32 tom Exp $ + * + * Demonstrate move functions for windows and derived windows from the curses + * library. + * +- * Thomas Dickey - 2006/2/11 ++ * Author: Thomas E. Dickey + */ + /* + derwin + mvderwin + subwin + mvwin ++ ++TODO: ++ add command to reset subwindow's origin to coincide with parent. ++ add command to delete subwindow (check if it has subwindows though) + */ + + #include <test.priv.h> +@@ -122,7 +126,12 @@ + * Arrow keys move cursor, return location at current on non-arrow key. + */ + static PAIR * +-selectcell(WINDOW *parent, int uli, int ulj, int lri, int lrj) ++selectcell(WINDOW *parent, ++ WINDOW *child, ++ int uli, int ulj, ++ int lri, int lrj, ++ bool relative, ++ bool * more) + { + static PAIR res; /* result cell */ + int si = lri - uli + 1; /* depth of the select area */ +@@ -131,25 +140,46 @@ + + res.y = uli; + res.x = ulj; ++ ++ if (child != 0) { ++ if (relative) { ++ getparyx(child, i, j); ++ } else { ++ getbegyx(child, i, j); ++ i -= uli + getbegy(parent); ++ j -= ulj + getbegx(parent); ++ } ++ } ++ ++ if (more) ++ *more = FALSE; ++ + for (;;) { +- tail_line("Upper left [%2d,%2d] Lower right [%2d,%2d] -> %d,%d", ++ bool moved = FALSE; ++ ++ tail_line("Upper left [%2d,%2d] Lower right [%2d,%2d] -> %d,%d -> %d,%d", + uli, ulj, + lri, lrj, ++ i, j, + uli + i, ulj + j); + wmove(parent, uli + i, ulj + j); + + switch (wgetch(parent)) { + case KEY_UP: + i += si - 1; ++ moved = TRUE; + break; + case KEY_DOWN: + i++; ++ moved = TRUE; + break; + case KEY_LEFT: + j += sj - 1; ++ moved = TRUE; + break; + case KEY_RIGHT: + j++; ++ moved = TRUE; + break; + case QUIT: + case ESCAPE: +@@ -161,8 +191,14 @@ + + getmouse(&event); + if (event.y > uli && event.x > ulj) { +- i = event.y - uli; +- j = event.x - ulj; ++ if (parent != stdscr) { ++ i = event.y - getbegy(parent) - uli; ++ j = event.x - getbegx(parent) - ulj; ++ } else { ++ i = event.y - uli; ++ j = event.x - ulj; ++ } ++ moved = TRUE; + } else { + beep(); + break; +@@ -177,6 +213,16 @@ + } + i %= si; + j %= sj; ++ ++ /* ++ * If the caller can handle continuous movement, return the result. ++ */ ++ if (moved && more) { ++ *more = TRUE; ++ res.y = uli + i; ++ res.x = ulj + j; ++ return (&res); ++ } + } + } + +@@ -194,12 +240,20 @@ + bool result = FALSE; + + head_line("Use arrows to move cursor, anything else to mark corner 1"); +- if ((tmp = selectcell(parent, min_line, min_col, max_line, max_col)) != 0) { ++ if ((tmp = selectcell(parent, 0, ++ min_line, min_col, ++ max_line, max_col, ++ FALSE, ++ (bool *) 0)) != 0) { + *ul = *tmp; + MvWAddCh(parent, ul->y, ul->x, '*'); + + head_line("Use arrows to move cursor, anything else to mark corner 2"); +- if ((tmp = selectcell(parent, ul->y, ul->x, max_line, max_col)) != 0) { ++ if ((tmp = selectcell(parent, 0, ++ ul->y, ul->x, ++ max_line, max_col, ++ FALSE, ++ (bool *) 0)) != 0) { + *lr = *tmp; + MvWAddCh(parent, lr->y, lr->x, '*'); + wmove(parent, lr->y, lr->x); +@@ -341,10 +395,7 @@ + + for (n = 0; n < num_windows; ++n) { + if (all_windows[n].parent == parent) { +- int y0, x0; +- +- getbegyx(all_windows[n].child, y0, x0); +- mvwin(all_windows[n].child, y0 + dy, x0 + dx); ++ mvwin(all_windows[n].child, dy, dx); + recur_move_window(all_windows[n].child, dy, dx); + } + } +@@ -366,20 +417,24 @@ + int min_line = top ? LINE_MIN : 0; + int max_line = top ? LINE_MAX : getmaxy(parent); + PAIR *tmp; ++ bool more; + + head_line("Select new position for %swindow", top ? "" : "sub"); + +- if ((tmp = selectcell(parent, +- min_line, min_col, +- max_line, max_col)) != 0) { ++ while ((tmp = selectcell(parent, ++ win, ++ min_line, min_col, ++ max_line, max_col, ++ FALSE, ++ &more)) != 0) { + int y0, x0; + getbegyx(parent, y0, x0); + /* +- * Note: Moving a subwindow has the effect of moving a viewport +- * around the screen. The parent window retains the contents of +- * the subwindow in the original location, but the viewport will +- * show the contents (again) at the new location. So it will look +- * odd when testing. ++ * Moving a subwindow has the effect of moving a viewport around ++ * the screen. The parent window retains the contents of the ++ * subwindow in the original location, but the viewport will show ++ * the contents (again) at the new location. So it will look odd ++ * when testing. + */ + if (mvwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) { + if (recur) { +@@ -388,17 +443,34 @@ + refresh_all(win); + doupdate(); + result = TRUE; ++ } else { ++ result = FALSE; + } ++ if (!more) ++ break; + } + } ++ head_line("done"); + return result; + } + ++static void ++show_derwin(WINDOW *win) ++{ ++ int pary, parx, maxy, maxx; ++ ++ getmaxyx(win, maxy, maxx); ++ getparyx(win, pary, parx); ++ ++ head_line("Select new position for derived window at %d,%d (%d,%d)", ++ pary, parx, maxy, maxx); ++} ++ + /* + * test mvderwin(). + */ + static bool +-move_subwin(WINDOW *win) ++move_derwin(WINDOW *win) + { + WINDOW *parent = parent_of(win); + bool result = FALSE; +@@ -411,22 +483,31 @@ + int min_line = top ? LINE_MIN : 0; + int max_line = top ? LINE_MAX : getmaxy(parent); + PAIR *tmp; ++ bool more; + +- head_line("Select new position for subwindow"); +- +- if ((tmp = selectcell(parent, +- min_line, min_col, +- max_line, max_col)) != 0) { +- int y0, x0; +- getbegyx(parent, y0, x0); +- if (mvderwin(win, y0 + tmp->y, x0 + tmp->x) != ERR) { ++ show_derwin(win); ++ while ((tmp = selectcell(parent, ++ win, ++ min_line, min_col, ++ max_line, max_col, ++ TRUE, ++ &more)) != 0) { ++ if (mvderwin(win, tmp->y, tmp->x) != ERR) { + refresh_all(win); + doupdate(); ++ repaint_one(win); ++ doupdate(); + result = TRUE; ++ show_derwin(win); ++ } else { ++ flash(); + } ++ if (!more) ++ break; + } + } + } ++ head_line("done"); + return result; + } + +@@ -449,6 +530,28 @@ + wrefresh(win); + } + ++static void ++fill_with_pattern(WINDOW *win) ++{ ++ int y, x; ++ int y0, x0; ++ int y1, x1; ++ int ch = 'a'; ++ ++ getyx(win, y0, x0); ++ getmaxyx(win, y1, x1); ++ for (y = 0; y < y1; ++y) { ++ for (x = 0; x < x1; ++x) { ++ MvWAddCh(win, y, x, (chtype) ch); ++ if (++ch > 'z') ++ ch = 'a'; ++ } ++ } ++ wsyncdown(win); ++ wmove(win, y0, x0); ++ wrefresh(win); ++} ++ + #define lines_of(ul,lr) (lr.y - ul.y + 1) + #define cols_of(ul,lr) (lr.x - ul.x + 1) + #define pair_of(ul) ul.y, ul.x +@@ -523,12 +626,13 @@ + { 'b', "Draw a box inside the current window" }, + { 'c', "Create a new window" }, + { 'd', "Create a new derived window" }, ++ { 'D', "Move derived window (moves viewport)" }, + { 'f', "Fill the current window with the next character" }, ++ { 'F', "Fill the current window with a pattern" }, + { 'm', "Move the current window" }, + { 'M', "Move the current window (and its children)" }, + { 'q', "Quit" }, + { 's', "Create a new subwindow" }, +- { 't', "Move the current subwindow (moves content)" }, + { CTRL('L'), "Repaint all windows, doing current one last" }, + { CTRL('N'), "Cursor to next window" }, + { CTRL('P'), "Cursor to previous window" }, +@@ -571,6 +675,10 @@ + #endif /* NCURSES_MOUSE_VERSION */ + + while (!done && (ch = wgetch(current_win)) != ERR) { ++ int y, x; ++ ++ getyx(current_win, y, x); ++ + switch (ch) { + case '?': + show_help(current_win); +@@ -584,9 +692,18 @@ + case 'd': + current_win = create_my_derwin(current_win); + break; ++ case 'D': ++ if (!move_derwin(current_win)) { ++ tail_line("error"); ++ continue; ++ } ++ break; + case 'f': + fill_window(current_win, (chtype) wgetch(current_win)); + break; ++ case 'F': ++ fill_with_pattern(current_win); ++ break; + case 'm': + case 'M': + if (!move_window(current_win, (ch == 'M'))) { +@@ -600,12 +717,6 @@ + case 's': + current_win = create_my_subwin(current_win); + break; +- case 't': +- if (!move_subwin(current_win)) { +- tail_line("error"); +- continue; +- } +- break; + case CTRL('L'): + refresh_all(current_win); + break; +@@ -621,6 +732,7 @@ + /* want to allow deleting a window also */ + #endif + default: ++ wmove(current_win, y, x); + tail_line("unrecognized key (use '?' for help)"); + beep(); + continue; +diff -Naur ncurses-5.9.orig/test/ncurses.c ncurses-5.9/test/ncurses.c +--- ncurses-5.9.orig/test/ncurses.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/ncurses.c 2012-08-25 19:58:02.029888511 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -40,7 +40,7 @@ + Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993 + Thomas E. Dickey (beginning revision 1.27 in 1996). + +-$Id: ncurses.c,v 1.365 2011/01/22 19:48:33 tom Exp $ ++$Id: ncurses.c,v 1.373 2012/07/21 17:40:21 tom Exp $ + + ***************************************************************************/ + +@@ -490,7 +490,7 @@ + #ifdef __MINGW32__ + system("cmd.exe"); + #else +- system("sh"); ++ IGNORE_RC(system("sh")); + #endif + if (message) + addstr("returned from shellout.\n"); +@@ -777,12 +777,21 @@ + } + doupdate(); + } +-#endif /* resize_boxes */ ++#endif /* resize_boxes */ + #else + #define forget_boxes() /* nothing */ + #define remember_boxes(level,text,frame) /* nothing */ + #endif + ++/* ++ * Return-code is OK/ERR or a keyname. ++ */ ++static const char * ++ok_keyname(int code) ++{ ++ return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code))); ++} ++ + static void + wgetch_test(unsigned level, WINDOW *win, int delay) + { +@@ -824,9 +833,11 @@ + } else if (c == 'g') { + waddstr(win, "getstr test: "); + echo(); +- wgetnstr(win, buf, sizeof(buf) - 1); ++ c = wgetnstr(win, buf, sizeof(buf) - 1); + noecho(); +- wprintw(win, "I saw %d characters:\n\t`%s'.", (int) strlen(buf), buf); ++ wprintw(win, "I saw %d characters:\n\t`%s' (%s).", ++ (int) strlen(buf), buf, ++ ok_keyname(c)); + wclrtoeol(win); + wgetch_wrap(win, first_y); + } else if (c == 'k') { +@@ -1394,7 +1405,7 @@ + if (!(termattrs() & test)) { + printw(" (N/A)"); + } else { +- if (ncv > 0 && (getbkgd(stdscr) & A_COLOR)) { ++ if (ncv > 0 && stdscr && (getbkgd(stdscr) & A_COLOR)) { + static const chtype table[] = + { + A_STANDOUT, +@@ -1675,8 +1686,8 @@ + add_wch(&ch); + } + } else { +- attr_t old_attr; +- short old_pair; ++ attr_t old_attr = 0; ++ short old_pair = 0; + + (void) attr_get(&old_attr, &old_pair, 0); + (void) attr_set(attr, pair, 0); +@@ -2972,7 +2983,7 @@ + #endif + default: + if (cycle_attr(c, &at_code, &attr)) { +- slk_attr_set(attr, (fg || bg), NULL); ++ slk_attr_set(attr, (short) (fg || bg), NULL); + slk_touch(); + slk_noutrefresh(); + break; +@@ -3360,6 +3371,7 @@ + * The repeat-count may make text wrap - avoid that. + */ + getyx(stdscr, y, x); ++ (void) y; + if (x >= col + (COLS / 2) - 2) + break; + } while (--count > 0); +@@ -4269,8 +4281,10 @@ + + neww->next = current ? current->next : 0; + neww->last = current; +- neww->last->next = neww; +- neww->next->last = neww; ++ if (neww->last != 0) ++ neww->last->next = neww; ++ if (neww->next != 0) ++ neww->next->last = neww; + + neww->wind = getwin(fp); + +@@ -5226,7 +5240,7 @@ + #ifdef A_COLOR + if (use_colors) { + init_pair(2, COLOR_CYAN, COLOR_BLUE); +- wbkgd(subWin, COLOR_PAIR(2) | ' '); ++ wbkgd(subWin, (chtype) (COLOR_PAIR(2) | ' ')); + } + #endif + (void) wattrset(subWin, A_BOLD); +@@ -6056,11 +6070,11 @@ + break; + case 2: + init_pair(cpair, COLOR_BLUE, COLOR_WHITE); +- (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_NORMAL); ++ (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_NORMAL)); + break; + case 3: + init_pair(cpair, COLOR_WHITE, COLOR_BLUE); +- (void) wattrset(win, (attr_t) COLOR_PAIR(cpair) | A_BOLD); ++ (void) wattrset(win, (int) (COLOR_PAIR(cpair) | A_BOLD)); + break; + } + } +@@ -6483,6 +6497,7 @@ + ," -a f,b set default-colors (assumed white-on-black)" + ," -d use default-colors if terminal supports them" + #endif ++ ," -E call use_env(FALSE) to ignore $LINES and $COLUMNS" + #if USE_SOFTKEYS + ," -e fmt specify format for soft-keys test (e)" + #endif +@@ -6495,6 +6510,9 @@ + #if USE_LIBPANEL + ," -s msec specify nominal time for panel-demo (default: 1, to hold)" + #endif ++#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) ++ ," -T call use_tioctl(TRUE) to allow SIGWINCH to override environment" ++#endif + #ifdef TRACE + ," -t mask specify default trace-level (may toggle with ^T)" + #endif +@@ -6681,7 +6699,7 @@ + + setlocale(LC_ALL, ""); + +- while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) { ++ while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:")) != -1) { + switch (c) { + #ifdef NCURSES_VERSION + case 'a': +@@ -6692,6 +6710,9 @@ + default_colors = TRUE; + break; + #endif ++ case 'E': ++ use_env(FALSE); ++ break; + case 'e': + my_e_param = atoi(optarg); + #ifdef NCURSES_VERSION +@@ -6721,6 +6742,11 @@ + nap_msec = (int) atol(optarg); + break; + #endif ++#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20120714) ++ case 'T': ++ use_tioctl(TRUE); ++ break; ++#endif + #ifdef TRACE + case 't': + save_trace = (unsigned) strtol(optarg, 0, 0); +@@ -6772,7 +6798,7 @@ + use_default_colors(); + min_colors = -1; + } +-#if NCURSES_VERSION_PATCH >= 20000708 ++#if HAVE_ASSUME_DEFAULT_COLORS + if (assumed_colors) + assume_default_colors(default_fg, default_bg); + #endif +diff -Naur ncurses-5.9.orig/test/newdemo.c ncurses-5.9/test/newdemo.c +--- ncurses-5.9.orig/test/newdemo.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/newdemo.c 2012-08-25 19:58:01.799889599 +0000 +@@ -2,7 +2,7 @@ + * newdemo.c - A demo program using PDCurses. The program illustrate + * the use of colours for text output. + * +- * $Id: newdemo.c,v 1.35 2010/12/12 00:19:15 tom Exp $ ++ * $Id: newdemo.c,v 1.36 2012/06/09 19:17:29 tom Exp $ + */ + + #include <test.priv.h> +@@ -84,7 +84,7 @@ + if (pair > COLOR_PAIRS) + pair = COLOR_PAIRS; + init_pair((short) pair, (short) foreground, (short) background); +- (void) wattrset(win, (attr_t) COLOR_PAIR(pair)); ++ (void) wattrset(win, (int) COLOR_PAIR(pair)); + } + } + +@@ -96,7 +96,7 @@ + pair = COLOR_PAIRS; + attrs |= (chtype) COLOR_PAIR(pair); + } +- (void) wattrset(win, attrs); ++ (void) wattrset(win, (int) attrs); + return attrs; + } + +diff -Naur ncurses-5.9.orig/test/railroad.c ncurses-5.9/test/railroad.c +--- ncurses-5.9.orig/test/railroad.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/railroad.c 2012-08-25 19:58:00.089897685 +0000 +@@ -29,7 +29,7 @@ + /* + * Author: Thomas E. Dickey - 2000 + * +- * $Id: railroad.c,v 1.19 2009/10/24 21:37:56 tom Exp $ ++ * $Id: railroad.c,v 1.20 2011/04/23 19:15:04 tom Exp $ + * + * A simple demo of the termcap interface. + */ +@@ -55,8 +55,8 @@ + + static bool interrupted = FALSE; + +-static int +-outc(TPUTS_ARG c) ++static ++TPUTS_PROTO(outc, c) + { + int rc = OK; + +@@ -68,7 +68,7 @@ + if (putc(c, stdout) == EOF) + rc = ERR; + } +- return rc; ++ TPUTS_RETURN(rc); + } + + static void +diff -Naur ncurses-5.9.orig/test/rain.c ncurses-5.9/test/rain.c +--- ncurses-5.9.orig/test/rain.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/rain.c 2012-08-25 19:58:00.506562380 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: rain.c,v 1.38 2010/11/13 20:11:46 tom Exp $ ++ * $Id: rain.c,v 1.40 2012/01/21 23:54:47 tom Exp $ + */ + #include <test.priv.h> + +@@ -222,7 +222,7 @@ + * Find myself in the list of threads so we can count the number of loops. + */ + for (mystats = 0; mystats < MAX_THREADS; ++mystats) { +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(__WINPTHREADS_VERSION) + if (drop_threads[mystats].myself.p == pthread_self().p) + #else + if (drop_threads[mystats].myself == pthread_self()) +@@ -256,7 +256,7 @@ + /* + * The description of pthread_create() is misleading, since it implies that + * threads will exit cleanly after their function returns. +- * ++ * + * Since they do not (and the number of threads is limited by system + * resources), make a limited number of threads, and signal any that are + * waiting when we want a thread past that limit. +diff -Naur ncurses-5.9.orig/test/redraw.c ncurses-5.9/test/redraw.c +--- ncurses-5.9.orig/test/redraw.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/redraw.c 2012-08-25 19:58:00.089897685 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2006-2007,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2006-2010,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: redraw.c,v 1.5 2010/05/01 22:04:08 tom Exp $ ++ * $Id: redraw.c,v 1.7 2011/05/21 18:38:35 tom Exp $ + * + * Demonstrate the redrawwin() and wredrawln() functions. + * Thomas Dickey - 2006/11/4 +@@ -71,7 +71,7 @@ + keypad(win, TRUE); + getmaxyx(win, max_y, max_x); + getbegyx(win, beg_y, beg_x); +- while (!done) { ++ while (!done && win != 0) { + ch = wgetch(win); + getyx(win, y, x); + switch (ch) { +@@ -113,7 +113,7 @@ + * using mvcur(). It is ifdef'd for NCURSES, since X/Open does + * not define the case where the old location is unknown. + */ +- system("date"); ++ IGNORE_RC(system("date")); + mvcur(-1, -1, y, x); + break; + #endif +diff -Naur ncurses-5.9.orig/test/tclock.c ncurses-5.9/test/tclock.c +--- ncurses-5.9.orig/test/tclock.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/tclock.c 2012-08-25 19:58:01.799889599 +0000 +@@ -1,4 +1,4 @@ +-/* $Id: tclock.c,v 1.30 2011/03/22 09:16:00 tom Exp $ */ ++/* $Id: tclock.c,v 1.31 2012/06/09 19:17:02 tom Exp $ */ + + #include <test.priv.h> + +@@ -216,12 +216,12 @@ + attroff(A_REVERSE); + + if (has_colors()) +- (void) attrset(COLOR_PAIR(1)); ++ (void) attrset((attr_t) COLOR_PAIR(1)); + + dline(1, cx, cy, cx + sdx, cy - sdy, 'O'); + + if (has_colors()) +- (void) attrset(COLOR_PAIR(0)); ++ (void) attrset((attr_t) COLOR_PAIR(0)); + + text = ctime(&tim); + MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text); +diff -Naur ncurses-5.9.orig/test/test.priv.h ncurses-5.9/test/test.priv.h +--- ncurses-5.9.orig/test/test.priv.h 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/test.priv.h 2012-08-25 19:58:00.089897685 +0000 +@@ -29,7 +29,7 @@ + /**************************************************************************** + * Author: Thomas E. Dickey 1996-on * + ****************************************************************************/ +-/* $Id: test.priv.h,v 1.103 2011/03/22 09:15:45 tom Exp $ */ ++/* $Id: test.priv.h,v 1.114 2011/10/29 19:59:55 tom Exp $ */ + + #ifndef __TEST_PRIV_H + #define __TEST_PRIV_H 1 +@@ -58,6 +58,10 @@ + /* + * Fallback definitions to accommodate broken compilers. + */ ++#ifndef HAVE_ASSUME_DEFAULT_COLORS ++#define HAVE_ASSUME_DEFAULT_COLORS 0 ++#endif ++ + #ifndef HAVE_CURSES_VERSION + #define HAVE_CURSES_VERSION 0 + #endif +@@ -202,6 +206,14 @@ + #define HAVE_USE_DEFAULT_COLORS 0 + #endif + ++#ifndef HAVE_USE_SCREEN ++#define HAVE_USE_SCREEN 0 ++#endif ++ ++#ifndef HAVE_USE_WINDOW ++#define HAVE_USE_WINDOW 0 ++#endif ++ + #ifndef HAVE_WRESIZE + #define HAVE_WRESIZE 0 + #endif +@@ -222,6 +234,13 @@ + #define NO_LEAKS 0 + #endif + ++/* ++ * Workaround for HPUX ++ */ ++#if defined(__hpux) && !defined(NCURSES_VERSION) ++#define _ACS_COMPAT_CODE /* needed for acs_map vs __acs_map */ ++#endif ++ + #include <stdlib.h> + #include <stdarg.h> + #include <string.h> +@@ -269,21 +288,18 @@ + + /* + * Not all curses.h implementations include unctrl.h, +- * Solaris 10 xpg4 for example. + */ +-#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES) +-#if defined(HAVE_NCURSESW_NCURSES_H) ++#if defined(HAVE_NCURSESW_UNCTRL_H) + #include <ncursesw/unctrl.h> +-#elif defined(HAVE_NCURSES_NCURSES_H) ++#elif defined(HAVE_NCURSES_UNCTRL_H) + #include <ncurses/unctrl.h> +-#else ++#elif defined(HAVE_UNCTRL_H) + #include <unctrl.h> + #endif +-#endif + + #if HAVE_GETOPT_H + #include <getopt.h> +-#else ++#elif !defined(HAVE_GETOPT_HEADER) + /* 'getopt()' may be prototyped in <stdlib.h>, but declaring its variables + * doesn't hurt. + */ +@@ -323,17 +339,20 @@ + #endif + + #if !USE_SOFTKEYS +-#define slk_init() /* nothing */ +-#define slk_restore() /* nothing */ +-#define slk_clear() /* nothing */ ++#define slk_init() /* nothing */ ++#define slk_restore() /* nothing */ ++#define slk_clear() /* nothing */ + #endif + + #ifndef HAVE_WSYNCDOWN +-#define wsyncdown(win) /* nothing */ ++#define wsyncdown(win) /* nothing */ + #endif + + #ifndef USE_WIDEC_SUPPORT +-#if (defined(_XOPEN_SOURCE_EXTENDED) || defined(_XPG5)) && defined(WACS_ULCORNER) ++#if (defined(_XOPEN_SOURCE_EXTENDED) \ ++ || (defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE - 0 >= 500)) \ ++ || (defined(NCURSES_WIDECHAR) && (NCURSES_WIDECHAR - 0 < 1))) \ ++ && defined(WACS_ULCORNER) + #define USE_WIDEC_SUPPORT 1 + #else + #define USE_WIDEC_SUPPORT 0 +@@ -653,25 +672,32 @@ + * The same would be needed for HPUX 10.20 + */ + #ifndef TPUTS_ARG ++#define TPUTS_ARG int ++#endif ++ + #if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH) ++#undef TPUTS_ARG + #define TPUTS_ARG char + extern char *tgoto(char *, int, int); /* available, but not prototyped */ +-#else +-#define TPUTS_ARG int + #endif ++ ++#ifndef TPUTS_PROTO ++#define TPUTS_PROTO(func,value) int func(TPUTS_ARG value) ++#endif ++ ++#ifndef TPUTS_RETURN ++#define TPUTS_RETURN(value) return value + #endif + + /* + * Workarounds for Solaris's X/Open curses + */ +-#if defined(sun) && defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH) + #if !defined(KEY_MIN) && defined(__KEY_MIN) + #define KEY_MIN __KEY_MIN + #endif + #if !defined(KEY_MAX) && defined(__KEY_MIN) + #define KEY_MAX __KEY_MAX + #endif +-#endif + + /* + * Workaround to build with Sun's default SVr4 curses. +@@ -702,23 +728,10 @@ + #define CONST_MENUS /* nothing */ + #endif + +-#ifndef HAVE_USE_WINDOW +-#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS +-#define HAVE_USE_WINDOW 0 +-#else +-#define HAVE_USE_WINDOW 1 +-#endif +-#endif +- + /* + * Simplify setting up demo of threading with these macros. + */ + +-#if !HAVE_USE_WINDOW +-typedef int (*NCURSES_WINDOW_CB) (WINDOW *, void *); +-typedef int (*NCURSES_SCREEN_CB) (SCREEN *, void *); +-#endif +- + #if HAVE_USE_WINDOW + #define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w) + #define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data) +diff -Naur ncurses-5.9.orig/test/test_add_wchstr.c ncurses-5.9/test/test_add_wchstr.c +--- ncurses-5.9.orig/test/test_add_wchstr.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/test_add_wchstr.c 2012-08-25 19:58:01.803222916 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010,2011 Free Software Foundation, Inc. * ++ * Copyright (c) 2010,2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_add_wchstr.c,v 1.15 2011/01/15 18:15:11 tom Exp $ ++ * $Id: test_add_wchstr.c,v 1.16 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the waddwchstr() and wadd_wch functions. + * Thomas Dickey - 2009/9/12 +@@ -357,7 +357,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgdset(work, COLOR_PAIR(1) | ' '); ++ wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); + } + + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { +diff -Naur ncurses-5.9.orig/test/test_addchstr.c ncurses-5.9/test/test_addchstr.c +--- ncurses-5.9.orig/test/test_addchstr.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/test_addchstr.c 2012-08-25 19:58:01.803222916 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_addchstr.c,v 1.13 2010/12/12 01:28:24 tom Exp $ ++ * $Id: test_addchstr.c,v 1.14 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the waddchstr() and waddch functions. + * Thomas Dickey - 2009/9/12 +@@ -277,7 +277,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- show_attr = COLOR_PAIR(1); ++ show_attr = (attr_t) COLOR_PAIR(1); + wbkgdset(work, show_attr | ' '); + } else { + show_attr = A_STANDOUT; +diff -Naur ncurses-5.9.orig/test/test_addstr.c ncurses-5.9/test/test_addstr.c +--- ncurses-5.9.orig/test/test_addstr.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/test_addstr.c 2012-08-25 19:58:01.803222916 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_addstr.c,v 1.6 2010/12/12 00:17:37 tom Exp $ ++ * $Id: test_addstr.c,v 1.7 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the waddstr() and waddch functions. + * Thomas Dickey - 2009/9/12 +@@ -201,7 +201,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgdset(work, COLOR_PAIR(1) | ' '); ++ wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); + } + + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { +diff -Naur ncurses-5.9.orig/test/test_addwstr.c ncurses-5.9/test/test_addwstr.c +--- ncurses-5.9.orig/test/test_addwstr.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/test_addwstr.c 2012-08-25 19:58:01.803222916 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_addwstr.c,v 1.6 2010/12/12 00:18:00 tom Exp $ ++ * $Id: test_addwstr.c,v 1.8 2012/06/09 20:29:33 tom Exp $ + * + * Demonstrate the waddwstr() and wadd_wch functions. + * Thomas Dickey - 2009/9/12 +@@ -233,8 +233,9 @@ + WINDOW *work = 0; + WINDOW *show = 0; + int margin = (2 * MY_TABSIZE) - 1; +- Options option = ((m_opt ? oMove : oDefault) +- | ((w_opt || (level > 0)) ? oWindow : oDefault)); ++ Options option = (Options) ((int) (m_opt ? oMove : oDefault) ++ | (int) ((w_opt || (level > 0)) ++ ? oWindow : oDefault)); + + if (first) { + static char cmd[80]; +@@ -286,7 +287,7 @@ + if (has_colors()) { + start_color(); + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgdset(work, COLOR_PAIR(1) | ' '); ++ wbkgdset(work, (chtype) (COLOR_PAIR(1) | ' ')); + } + + while ((ch = read_linedata(work)) != ERR && !isQUIT(ch)) { +diff -Naur ncurses-5.9.orig/test/test_getstr.c ncurses-5.9/test/test_getstr.c +--- ncurses-5.9.orig/test/test_getstr.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/test_getstr.c 2012-08-25 19:58:01.903222442 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 2007-2008,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 2007-2009,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -26,7 +26,7 @@ + * authorization. * + ****************************************************************************/ + /* +- * $Id: test_getstr.c,v 1.9 2009/08/29 19:02:25 tom Exp $ ++ * $Id: test_getstr.c,v 1.10 2012/07/07 18:22:49 tom Exp $ + * + * Author: Thomas E Dickey + * +@@ -58,6 +58,15 @@ + eMaxFlavor + } Flavors; + ++/* ++ * Return-code is OK/ERR or a keyname. ++ */ ++static const char * ++ok_keyname(int code) ++{ ++ return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code))); ++} ++ + static bool + Quit(int ch) + { +@@ -310,7 +319,7 @@ + } + noecho(); + (void) wattrset(txtwin, A_NORMAL); +- wprintw(strwin, "%d:%s", rc, buffer); ++ wprintw(strwin, "%s:%s", ok_keyname(rc), buffer); + wnoutrefresh(strwin); + break; + default: +diff -Naur ncurses-5.9.orig/test/testaddch.c ncurses-5.9/test/testaddch.c +--- ncurses-5.9.orig/test/testaddch.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/testaddch.c 2012-08-25 19:58:00.093231002 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2009,2011 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -29,7 +29,7 @@ + * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>, + * to demonstrate an inconsistency between ncurses and SVr4 curses. + * +- * $Id: testaddch.c,v 1.7 2009/08/29 19:02:25 tom Exp $ ++ * $Id: testaddch.c,v 1.8 2011/04/23 20:13:12 tom Exp $ + */ + #include <test.priv.h> + +@@ -63,7 +63,7 @@ + for (i = 0; i < 8; i++) { + back = (i & 1) ? A_BOLD | 'B' : ' '; + set = (i & 2) ? A_REVERSE : 0; +- attr = (i & 4) ? COLOR_PAIR(4) : 0; ++ attr = (chtype) ((i & 4) ? COLOR_PAIR(4) : 0); + + bkgdset(back); + (void) attrset(set); +@@ -74,7 +74,7 @@ + for (i = 0; i < 8; i++) { + back = (i & 1) ? A_BOLD | 'B' | COLOR_PAIR(1) : ' '; + set = (i & 2) ? A_REVERSE | COLOR_PAIR(2) : 0; +- attr = (i & 4) ? COLOR_PAIR(4) : 0; ++ attr = (chtype) ((i & 4) ? COLOR_PAIR(4) : 0); + + bkgdset(back); + (void) attrset(set); +diff -Naur ncurses-5.9.orig/test/testcurs.c ncurses-5.9/test/testcurs.c +--- ncurses-5.9.orig/test/testcurs.c 2012-08-25 19:57:59.399900947 +0000 ++++ ncurses-5.9/test/testcurs.c 2012-08-25 19:58:01.803222916 +0000 +@@ -6,7 +6,7 @@ + * wrs(5/28/93) -- modified to be consistent (perform identically) with either + * PDCurses or under Unix System V, R4 + * +- * $Id: testcurs.c,v 1.43 2010/11/13 21:02:28 tom Exp $ ++ * $Id: testcurs.c,v 1.44 2012/06/09 19:10:45 tom Exp $ + */ + + #include <test.priv.h> +@@ -85,7 +85,7 @@ + #ifdef A_COLOR + if (has_colors()) { + init_pair(1, COLOR_WHITE, COLOR_BLUE); +- wbkgd(win, COLOR_PAIR(1)); ++ wbkgd(win, (chtype) COLOR_PAIR(1)); + } else + wbkgd(win, A_REVERSE); + #else +@@ -491,7 +491,7 @@ + #ifdef A_COLOR + if (has_colors()) { + init_pair(3, COLOR_BLUE, COLOR_WHITE); +- wbkgd(win1, COLOR_PAIR(3)); ++ wbkgd(win1, (chtype) COLOR_PAIR(3)); + } else + wbkgd(win1, A_NORMAL); + #else +diff -Naur ncurses-5.9.orig/test/view.c ncurses-5.9/test/view.c +--- ncurses-5.9.orig/test/view.c 2012-08-25 19:57:59.403234265 +0000 ++++ ncurses-5.9/test/view.c 2012-08-25 19:58:01.806556233 +0000 +@@ -1,5 +1,5 @@ + /**************************************************************************** +- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * ++ * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a * + * copy of this software and associated documentation files (the * +@@ -50,7 +50,7 @@ + * scroll operation worked, and the refresh() code only had to do a + * partial repaint. + * +- * $Id: view.c,v 1.81 2010/11/14 01:06:02 tom Exp $ ++ * $Id: view.c,v 1.85 2012/06/09 20:29:33 tom Exp $ + */ + + #include <test.priv.h> +@@ -110,9 +110,9 @@ + #if CAN_RESIZE + static RETSIGTYPE adjust(int sig); + static int interrupted; ++static bool waiting = FALSE; + #endif + +-static bool waiting = FALSE; + static int shift = 0; + static bool try_color = FALSE; + +@@ -121,6 +121,8 @@ + static NCURSES_CH_T **lptr; + static int num_lines; + ++static void usage(void) GCC_NORETURN; ++ + static void + usage(void) + { +@@ -180,7 +182,7 @@ + { + unsigned len = (unsigned) strlen(src); + NCURSES_CH_T *dst = typeMalloc(NCURSES_CH_T, len + 1); +- unsigned j, k; ++ size_t j, k; + #if USE_WIDEC_SUPPORT + wchar_t wstr[CCHARW_MAX + 1]; + wchar_t wch; +@@ -354,7 +356,7 @@ + if (has_colors()) { + start_color(); + init_pair(my_pair, COLOR_WHITE, COLOR_BLUE); +- bkgd(COLOR_PAIR(my_pair)); ++ bkgd((chtype) COLOR_PAIR(my_pair)); + } else { + try_color = FALSE; + } +@@ -373,10 +375,12 @@ + adjust(0); + my_label = "interrupt"; + } +-#endif + waiting = TRUE; + c = getch(); + waiting = FALSE; ++#else ++ c = getch(); ++#endif + if ((c < 127) && isdigit(c)) { + if (!got_number) { + MvPrintw(0, 0, "Count: "); diff --git a/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch new file mode 100644 index 0000000..1c1d1b8 --- /dev/null +++ b/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch @@ -0,0 +1,130 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2013-06-01 +Initial Package Version: 0.12.1 +Upstream Status: Not sent +Origin: https://raw.github.com/niXman/mingw-builds/master/patches/ppl/ppl-resolve-conflicts-with-gmp-5.1.0.patch +Description: Fix compilation errors similar to that: + + error: redefinition of 'class > std::numeric_limits<__gmp_expr<__mpz_struct [1], __mpz_struct [1]> >' + +GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits. + +diff -Naur ppl-0.12.1.orig/src/mp_std_bits.cc ppl-0.12.1.patched/src/mp_std_bits.cc +--- ppl-0.12.1.orig/src/mp_std_bits.cc 2012-04-16 08:12:30.000000000 -0400 ++++ ppl-0.12.1.patched/src/mp_std_bits.cc 2013-05-31 09:57:56.453911121 -0400 +@@ -25,6 +25,9 @@ + #include "ppl-config.h" + #include "mp_std_bits.defs.hh" + ++#if __GNU_MP_VERSION < 5 \ ++ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + const bool std::numeric_limits<mpz_class>::is_specialized; + const int std::numeric_limits<mpz_class>::digits; + const int std::numeric_limits<mpz_class>::digits10; +@@ -70,3 +73,6 @@ + const bool std::numeric_limits<mpq_class>::traps; + const bool std::numeric_limits<mpq_class>::tininess_before; + const std::float_round_style std::numeric_limits<mpq_class>::round_style; ++ ++#endif // __GNU_MP_VERSION < 5 ++ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) +diff -Naur ppl-0.12.1.orig/src/mp_std_bits.cc.orig ppl-0.12.1.patched/src/mp_std_bits.cc.orig +--- ppl-0.12.1.orig/src/mp_std_bits.cc.orig 1969-12-31 19:00:00.000000000 -0500 ++++ ppl-0.12.1.patched/src/mp_std_bits.cc.orig 2012-04-16 08:12:30.000000000 -0400 +@@ -0,0 +1,72 @@ ++/* Definitions of specializations of std::numeric_limits objects for ++ multi-precision types. ++ Copyright (C) 2001-2010 Roberto Bagnara <bagnara@cs.unipr.it> ++ Copyright (C) 2010-2012 BUGSENG srl (http://bugseng.com) ++ ++This file is part of the Parma Polyhedra Library (PPL). ++ ++The PPL 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 3 of the License, or (at your ++option) any later version. ++ ++The PPL 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 02111-1307, USA. ++ ++For the most up-to-date information see the Parma Polyhedra Library ++site: http://bugseng.com/products/ppl/ . */ ++ ++#include "ppl-config.h" ++#include "mp_std_bits.defs.hh" ++ ++const bool std::numeric_limits<mpz_class>::is_specialized; ++const int std::numeric_limits<mpz_class>::digits; ++const int std::numeric_limits<mpz_class>::digits10; ++const bool std::numeric_limits<mpz_class>::is_signed; ++const bool std::numeric_limits<mpz_class>::is_integer; ++const bool std::numeric_limits<mpz_class>::is_exact; ++const int std::numeric_limits<mpz_class>::radix; ++const int std::numeric_limits<mpz_class>::min_exponent; ++const int std::numeric_limits<mpz_class>::min_exponent10; ++const int std::numeric_limits<mpz_class>::max_exponent; ++const int std::numeric_limits<mpz_class>::max_exponent10; ++const bool std::numeric_limits<mpz_class>::has_infinity; ++const bool std::numeric_limits<mpz_class>::has_quiet_NaN; ++const bool std::numeric_limits<mpz_class>::has_signaling_NaN; ++const std::float_denorm_style std::numeric_limits<mpz_class>::has_denorm; ++const bool std::numeric_limits<mpz_class>::has_denorm_loss; ++const bool std::numeric_limits<mpz_class>::is_iec559; ++const bool std::numeric_limits<mpz_class>::is_bounded; ++const bool std::numeric_limits<mpz_class>::is_modulo; ++const bool std::numeric_limits<mpz_class>::traps; ++const bool std::numeric_limits<mpz_class>::tininess_before; ++const std::float_round_style std::numeric_limits<mpz_class>::round_style; ++ ++const bool std::numeric_limits<mpq_class>::is_specialized; ++const int std::numeric_limits<mpq_class>::digits; ++const int std::numeric_limits<mpq_class>::digits10; ++const bool std::numeric_limits<mpq_class>::is_signed; ++const bool std::numeric_limits<mpq_class>::is_integer; ++const bool std::numeric_limits<mpq_class>::is_exact; ++const int std::numeric_limits<mpq_class>::radix; ++const int std::numeric_limits<mpq_class>::min_exponent; ++const int std::numeric_limits<mpq_class>::min_exponent10; ++const int std::numeric_limits<mpq_class>::max_exponent; ++const int std::numeric_limits<mpq_class>::max_exponent10; ++const bool std::numeric_limits<mpq_class>::has_infinity; ++const bool std::numeric_limits<mpq_class>::has_quiet_NaN; ++const bool std::numeric_limits<mpq_class>::has_signaling_NaN; ++const std::float_denorm_style std::numeric_limits<mpq_class>::has_denorm; ++const bool std::numeric_limits<mpq_class>::has_denorm_loss; ++const bool std::numeric_limits<mpq_class>::is_iec559; ++const bool std::numeric_limits<mpq_class>::is_bounded; ++const bool std::numeric_limits<mpq_class>::is_modulo; ++const bool std::numeric_limits<mpq_class>::traps; ++const bool std::numeric_limits<mpq_class>::tininess_before; ++const std::float_round_style std::numeric_limits<mpq_class>::round_style; +diff -Naur ppl-0.12.1.orig/src/mp_std_bits.defs.hh ppl-0.12.1.patched/src/mp_std_bits.defs.hh +--- ppl-0.12.1.orig/src/mp_std_bits.defs.hh 2012-04-16 08:12:30.000000000 -0400 ++++ ppl-0.12.1.patched/src/mp_std_bits.defs.hh 2013-05-31 09:57:56.453911121 -0400 +@@ -38,6 +38,9 @@ + #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) + void swap(mpq_class& x, mpq_class& y); + ++#if __GNU_MP_VERSION < 5 \ ++ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + namespace std { + + #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +@@ -164,6 +167,9 @@ + + } // namespace std + ++#endif // __GNU_MP_VERSION < 5 ++ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ++ + #include "mp_std_bits.inlines.hh" + + #endif // !defined(PPL_mp_std_bits_defs_hh) diff --git a/stage0/patches/x86/gcc-4.6.3-specs-1.patch b/stage0/patches/x86/gcc-4.6.3-specs-1.patch new file mode 100644 index 0000000..fe69ef8 --- /dev/null +++ b/stage0/patches/x86/gcc-4.6.3-specs-1.patch @@ -0,0 +1,456 @@ +Submitted By: Joe Ciccone <jciccone@gmail.com> +Date: 04-16-2011 +Initial Package Version: 3.4.6 +Origin: Idea originally developed by Ryan Oliver and Greg Schafer for + the Pure LFS project. +Upstream Status: Not Applied - CLFS Specific +Description: The specs patch changes the location of the dynamic linker as + well as the link spec to /tools/lib{,32,64}. + + Rediffed Against 4.5.2 By Joe Ciccone <jciccone@gmail.com> + Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com> + +diff -Naur gcc-4.6.0.orig/gcc/config/alpha/gnu.h gcc-4.6.0/gcc/config/alpha/gnu.h +--- gcc-4.6.0.orig/gcc/config/alpha/gnu.h 2010-10-06 03:49:52.000000000 -0400 ++++ gcc-4.6.0/gcc/config/alpha/gnu.h 2011-04-16 15:31:47.519213210 -0400 +@@ -34,7 +34,7 @@ + } while (0) + + #undef ELF_DYNAMIC_LINKER +-#define ELF_DYNAMIC_LINKER "/lib/ld.so" ++#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so" + + #undef STARTFILE_SPEC + #define STARTFILE_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h gcc-4.6.0/gcc/config/alpha/linux-elf.h +--- gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/alpha/linux-elf.h 2011-04-16 15:33:20.991213246 -0400 +@@ -27,8 +27,8 @@ + #define EXTRA_SPECS \ + { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif DEFAULT_LIBC == LIBC_GLIBC +diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h gcc-4.6.0/gcc/config/arm/linux-eabi.h +--- gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h 2011-01-12 09:29:14.000000000 -0500 ++++ gcc-4.6.0/gcc/config/arm/linux-eabi.h 2011-04-16 15:31:47.911213210 -0400 +@@ -62,7 +62,7 @@ + /* Use ld-linux.so.3 so that it will be possible to run "classic" + GNU/Linux binaries on an EABI system. */ + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3" + + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ +diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h +--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h 2011-01-14 13:42:32.000000000 -0500 ++++ gcc-4.6.0/gcc/config/arm/linux-elf.h 2011-04-16 15:31:48.087213212 -0400 +@@ -62,7 +62,7 @@ + + #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #define LINUX_TARGET_LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +diff -Naur gcc-4.6.0.orig/gcc/config/bfin/linux.h gcc-4.6.0/gcc/config/bfin/linux.h +--- gcc-4.6.0.orig/gcc/config/bfin/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/bfin/linux.h 2011-04-16 15:33:51.791213258 -0400 +@@ -45,7 +45,7 @@ + %{shared:-G -Bdynamic} \ + %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld-uClibc.so.0} \ ++ -dynamic-linker /tools/lib/ld-uClibc.so.0} \ + %{static}} -init __init -fini __fini" + + #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" +diff -Naur gcc-4.6.0.orig/gcc/config/cris/linux.h gcc-4.6.0/gcc/config/cris/linux.h +--- gcc-4.6.0.orig/gcc/config/cris/linux.h 2011-01-14 13:51:46.000000000 -0500 ++++ gcc-4.6.0/gcc/config/cris/linux.h 2011-04-16 15:31:48.239213212 -0400 +@@ -103,7 +103,7 @@ + #undef CRIS_DEFAULT_CPU_VERSION + #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef CRIS_LINK_SUBTARGET_SPEC + #define CRIS_LINK_SUBTARGET_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/freebsd-spec.h gcc-4.6.0/gcc/config/freebsd-spec.h +--- gcc-4.6.0.orig/gcc/config/freebsd-spec.h 2011-02-13 19:40:15.000000000 -0500 ++++ gcc-4.6.0/gcc/config/freebsd-spec.h 2011-04-16 15:31:48.239213212 -0400 +@@ -131,7 +131,7 @@ + #if FBSD_MAJOR < 6 + #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" + #else +-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1" ++#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1" + #endif + + #if defined(HAVE_LD_EH_FRAME_HDR) +diff -Naur gcc-4.6.0.orig/gcc/config/frv/linux.h gcc-4.6.0/gcc/config/frv/linux.h +--- gcc-4.6.0.orig/gcc/config/frv/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/frv/linux.h 2011-04-16 15:31:48.239213212 -0400 +@@ -35,7 +35,7 @@ + #define ENDFILE_SPEC \ + "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/i386/gnu.h gcc-4.6.0/gcc/config/i386/gnu.h +--- gcc-4.6.0.orig/gcc/config/i386/gnu.h 2011-02-08 14:14:04.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/gnu.h 2011-04-16 15:31:48.239213212 -0400 +@@ -21,7 +21,7 @@ + */ + + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so" + + #undef TARGET_VERSION + #define TARGET_VERSION fprintf (stderr, " (i386 GNU)"); +diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux.h gcc-4.6.0/gcc/config/i386/linux.h +--- gcc-4.6.0.orig/gcc/config/i386/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/linux.h 2011-04-16 15:31:48.239213212 -0400 +@@ -92,7 +92,7 @@ + + /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ + #define LINK_EMULATION "elf_i386" +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef ASM_SPEC + #define ASM_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h +--- gcc-4.6.0.orig/gcc/config/i386/linux64.h 2011-03-02 17:35:36.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:31:48.239213212 -0400 +@@ -62,8 +62,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -Naur gcc-4.6.0.orig/gcc/config/ia64/linux.h gcc-4.6.0/gcc/config/ia64/linux.h +--- gcc-4.6.0.orig/gcc/config/ia64/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/ia64/linux.h 2011-04-16 15:31:48.239213212 -0400 +@@ -61,7 +61,7 @@ + /* Define this for shared library support because it isn't in the main + linux.h file. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.6.0/gcc/config/kfreebsd-gnu.h +--- gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h 2007-08-02 06:49:31.000000000 -0400 ++++ gcc-4.6.0/gcc/config/kfreebsd-gnu.h 2011-04-16 15:31:48.239213212 -0400 +@@ -33,5 +33,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h gcc-4.6.0/gcc/config/knetbsd-gnu.h +--- gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h 2007-08-02 06:49:31.000000000 -0400 ++++ gcc-4.6.0/gcc/config/knetbsd-gnu.h 2011-04-16 15:31:48.239213212 -0400 +@@ -34,5 +34,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.6.0/gcc/config/kopensolaris-gnu.h +--- gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h 2009-01-29 13:48:41.000000000 -0500 ++++ gcc-4.6.0/gcc/config/kopensolaris-gnu.h 2011-04-16 15:31:48.239213212 -0400 +@@ -33,5 +33,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h +--- gcc-4.6.0.orig/gcc/config/linux.h 2011-01-12 09:29:14.000000000 -0500 ++++ gcc-4.6.0/gcc/config/linux.h 2011-04-16 15:34:53.103213282 -0400 +@@ -74,9 +74,9 @@ + GLIBC_DYNAMIC_LINKER must be defined for each target using them, or + GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets + supporting both 32-bit and 64-bit compilation. */ +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" +diff -Naur gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.6.0/gcc/config/lm32/uclinux-elf.h +--- gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h 2011-01-14 13:42:32.000000000 -0500 ++++ gcc-4.6.0/gcc/config/lm32/uclinux-elf.h 2011-04-16 15:38:23.975213362 -0400 +@@ -72,7 +72,7 @@ + %{shared:-shared} \ + %{symbolic:-Bsymbolic} \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld-linux.so.2" ++ -dynamic-linker /tools/lib/ld-linux.so.2" + + #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS() + +diff -Naur gcc-4.6.0.orig/gcc/config/m32r/linux.h gcc-4.6.0/gcc/config/m32r/linux.h +--- gcc-4.6.0.orig/gcc/config/m32r/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/m32r/linux.h 2011-04-16 15:31:48.395213212 -0400 +@@ -47,7 +47,7 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef LINK_SPEC + #if TARGET_LITTLE_ENDIAN +diff -Naur gcc-4.6.0.orig/gcc/config/m68k/linux.h gcc-4.6.0/gcc/config/m68k/linux.h +--- gcc-4.6.0.orig/gcc/config/m68k/linux.h 2011-01-26 15:30:12.000000000 -0500 ++++ gcc-4.6.0/gcc/config/m68k/linux.h 2011-04-16 15:31:48.395213212 -0400 +@@ -75,7 +75,7 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "-m m68kelf %{shared} \ +diff -Naur gcc-4.6.0.orig/gcc/config/microblaze/linux.h gcc-4.6.0/gcc/config/microblaze/linux.h +--- gcc-4.6.0.orig/gcc/config/microblaze/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/microblaze/linux.h 2011-04-16 15:40:09.295213402 -0400 +@@ -20,7 +20,7 @@ + <http://www.gnu.org/licenses/>. */ + + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#define DYNAMIC_LINKER "/tools/lib/ld.so.1" + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } +diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux.h gcc-4.6.0/gcc/config/mips/linux.h +--- gcc-4.6.0.orig/gcc/config/mips/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mips/linux.h 2011-04-16 15:31:48.395213212 -0400 +@@ -61,7 +61,7 @@ + #undef MIPS_DEFAULT_GVALUE + #define MIPS_DEFAULT_GVALUE 0 + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + /* Borrowed from sparc/linux.h */ + #undef LINK_SPEC +diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h +--- gcc-4.6.0.orig/gcc/config/mips/linux64.h 2011-01-19 15:39:09.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:35:35.847213298 -0400 +@@ -35,10 +35,10 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +diff -Naur gcc-4.6.0.orig/gcc/config/mn10300/linux.h gcc-4.6.0/gcc/config/mn10300/linux.h +--- gcc-4.6.0.orig/gcc/config/mn10300/linux.h 2010-12-31 09:34:26.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mn10300/linux.h 2011-04-16 15:31:48.395213212 -0400 +@@ -32,7 +32,7 @@ + #undef ASM_SPEC + #define ASM_SPEC "" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ +diff -Naur gcc-4.6.0.orig/gcc/config/pa/pa-linux.h gcc-4.6.0/gcc/config/pa/pa-linux.h +--- gcc-4.6.0.orig/gcc/config/pa/pa-linux.h 2011-01-26 15:27:04.000000000 -0500 ++++ gcc-4.6.0/gcc/config/pa/pa-linux.h 2011-04-16 15:31:48.395213212 -0400 +@@ -39,7 +39,7 @@ + /* Define this for shared library support because it isn't in the main + linux.h file. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h +--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h 2011-03-07 02:50:23.000000000 -0500 ++++ gcc-4.6.0/gcc/config/rs6000/linux64.h 2011-04-16 15:36:11.471213312 -0400 +@@ -372,10 +372,10 @@ + #undef LINK_OS_DEFAULT_SPEC + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1" ++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif DEFAULT_LIBC == LIBC_GLIBC +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h +--- gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h 2011-03-07 02:50:23.000000000 -0500 ++++ gcc-4.6.0/gcc/config/rs6000/sysv4.h 2011-04-16 15:37:33.279213342 -0400 +@@ -818,8 +818,8 @@ + + #define LINK_START_LINUX_SPEC "" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +@@ -863,7 +863,7 @@ + + #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld.so.1}}" ++ -dynamic-linker /tools/lib/ld.so.1}}" + + #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ + %{!undef: \ +diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h +--- gcc-4.6.0.orig/gcc/config/s390/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/s390/linux.h 2011-04-16 15:31:48.399213212 -0400 +@@ -72,8 +72,8 @@ + #define MULTILIB_DEFAULTS { "m31" } + #endif + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" + + #undef LINK_SPEC + #define LINK_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/sh/linux.h gcc-4.6.0/gcc/config/sh/linux.h +--- gcc-4.6.0.orig/gcc/config/sh/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sh/linux.h 2011-04-16 15:31:48.399213212 -0400 +@@ -47,7 +47,7 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux.h 2011-01-26 15:30:12.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux.h 2011-04-16 15:31:48.399213212 -0400 +@@ -71,10 +71,10 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h 2011-02-17 08:57:21.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux64.h 2011-04-16 15:31:48.399213212 -0400 +@@ -101,8 +101,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +diff -Naur gcc-4.6.0.orig/gcc/config/vax/linux.h gcc-4.6.0/gcc/config/vax/linux.h +--- gcc-4.6.0.orig/gcc/config/vax/linux.h 2010-12-09 20:03:33.000000000 -0500 ++++ gcc-4.6.0/gcc/config/vax/linux.h 2011-04-16 15:38:05.583213354 -0400 +@@ -44,7 +44,7 @@ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld.so.1} \ ++ -dynamic-linker /tools/lib/ld.so.1} \ + %{static:-static}}" + + #undef WCHAR_TYPE +diff -Naur gcc-4.6.0.orig/gcc/config/xtensa/linux.h gcc-4.6.0/gcc/config/xtensa/linux.h +--- gcc-4.6.0.orig/gcc/config/xtensa/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/xtensa/linux.h 2011-04-16 15:31:48.399213212 -0400 +@@ -48,7 +48,7 @@ + %{mlongcalls:--longcalls} \ + %{mno-longcalls:--no-longcalls}" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC \ diff --git a/stage0/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch b/stage0/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch new file mode 100644 index 0000000..825de22 --- /dev/null +++ b/stage0/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch @@ -0,0 +1,515 @@ +Submitted By: Joe Ciccone <jciccone@gmail.com> +Date: 04-16-2011 +Initial Package Version: 3.4.6 +Origin: Idea originally developed by Ryan Oliver and Greg Schafer for + the Pure LFS project. +Upstream Status: Not Applied - CLFS Specific +Description: The specs patch changes the location of the dynamic linker as + well as the link spec to /tools/lib{,32,64}. This patch in + addition makes changes to the paths for pure64, eg 64bit libs + in /usr/lib, 32bit in /usr/lib32. + + Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se> + Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com> + +diff -Naur gcc-4.6.0.orig/gcc/config/alpha/gnu.h gcc-4.6.0/gcc/config/alpha/gnu.h +--- gcc-4.6.0.orig/gcc/config/alpha/gnu.h 2010-10-06 03:49:52.000000000 -0400 ++++ gcc-4.6.0/gcc/config/alpha/gnu.h 2011-04-16 15:42:48.119213462 -0400 +@@ -34,7 +34,7 @@ + } while (0) + + #undef ELF_DYNAMIC_LINKER +-#define ELF_DYNAMIC_LINKER "/lib/ld.so" ++#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so" + + #undef STARTFILE_SPEC + #define STARTFILE_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h gcc-4.6.0/gcc/config/alpha/linux-elf.h +--- gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/alpha/linux-elf.h 2011-04-16 15:45:39.055213526 -0400 +@@ -27,8 +27,8 @@ + #define EXTRA_SPECS \ + { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif DEFAULT_LIBC == LIBC_GLIBC +diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h gcc-4.6.0/gcc/config/arm/linux-eabi.h +--- gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h 2011-01-12 09:29:14.000000000 -0500 ++++ gcc-4.6.0/gcc/config/arm/linux-eabi.h 2011-04-16 15:42:48.119213462 -0400 +@@ -62,7 +62,7 @@ + /* Use ld-linux.so.3 so that it will be possible to run "classic" + GNU/Linux binaries on an EABI system. */ + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3" + + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ +diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h +--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h 2011-01-14 13:42:32.000000000 -0500 ++++ gcc-4.6.0/gcc/config/arm/linux-elf.h 2011-04-16 15:42:48.119213462 -0400 +@@ -62,7 +62,7 @@ + + #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #define LINUX_TARGET_LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +diff -Naur gcc-4.6.0.orig/gcc/config/bfin/linux.h gcc-4.6.0/gcc/config/bfin/linux.h +--- gcc-4.6.0.orig/gcc/config/bfin/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/bfin/linux.h 2011-04-16 15:43:19.823213474 -0400 +@@ -45,7 +45,7 @@ + %{shared:-G -Bdynamic} \ + %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld-uClibc.so.0} \ ++ -dynamic-linker /tools/lib/ld-uClibc.so.0} \ + %{static}} -init __init -fini __fini" + + #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" +diff -Naur gcc-4.6.0.orig/gcc/config/cris/linux.h gcc-4.6.0/gcc/config/cris/linux.h +--- gcc-4.6.0.orig/gcc/config/cris/linux.h 2011-01-14 13:51:46.000000000 -0500 ++++ gcc-4.6.0/gcc/config/cris/linux.h 2011-04-16 15:42:48.119213462 -0400 +@@ -103,7 +103,7 @@ + #undef CRIS_DEFAULT_CPU_VERSION + #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef CRIS_LINK_SUBTARGET_SPEC + #define CRIS_LINK_SUBTARGET_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/freebsd-spec.h gcc-4.6.0/gcc/config/freebsd-spec.h +--- gcc-4.6.0.orig/gcc/config/freebsd-spec.h 2011-02-13 19:40:15.000000000 -0500 ++++ gcc-4.6.0/gcc/config/freebsd-spec.h 2011-04-16 15:42:48.119213462 -0400 +@@ -131,7 +131,7 @@ + #if FBSD_MAJOR < 6 + #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" + #else +-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1" ++#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1" + #endif + + #if defined(HAVE_LD_EH_FRAME_HDR) +diff -Naur gcc-4.6.0.orig/gcc/config/frv/linux.h gcc-4.6.0/gcc/config/frv/linux.h +--- gcc-4.6.0.orig/gcc/config/frv/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/frv/linux.h 2011-04-16 15:42:48.119213462 -0400 +@@ -35,7 +35,7 @@ + #define ENDFILE_SPEC \ + "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/i386/gnu.h gcc-4.6.0/gcc/config/i386/gnu.h +--- gcc-4.6.0.orig/gcc/config/i386/gnu.h 2011-02-08 14:14:04.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/gnu.h 2011-04-16 15:42:48.119213462 -0400 +@@ -21,7 +21,7 @@ + */ + + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so" + + #undef TARGET_VERSION + #define TARGET_VERSION fprintf (stderr, " (i386 GNU)"); +diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux.h gcc-4.6.0/gcc/config/i386/linux.h +--- gcc-4.6.0.orig/gcc/config/i386/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/linux.h 2011-04-16 15:42:48.123213462 -0400 +@@ -92,7 +92,7 @@ + + /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */ + #define LINK_EMULATION "elf_i386" +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef ASM_SPEC + #define ASM_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h +--- gcc-4.6.0.orig/gcc/config/i386/linux64.h 2011-03-02 17:35:36.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:42:48.123213462 -0400 +@@ -62,8 +62,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64 +--- gcc-4.6.0.orig/gcc/config/i386/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:42:48.123213462 -0400 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Naur gcc-4.6.0.orig/gcc/config/ia64/linux.h gcc-4.6.0/gcc/config/ia64/linux.h +--- gcc-4.6.0.orig/gcc/config/ia64/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/ia64/linux.h 2011-04-16 15:42:48.123213462 -0400 +@@ -61,7 +61,7 @@ + /* Define this for shared library support because it isn't in the main + linux.h file. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.6.0/gcc/config/kfreebsd-gnu.h +--- gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h 2007-08-02 06:49:31.000000000 -0400 ++++ gcc-4.6.0/gcc/config/kfreebsd-gnu.h 2011-04-16 15:42:48.123213462 -0400 +@@ -33,5 +33,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h gcc-4.6.0/gcc/config/knetbsd-gnu.h +--- gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h 2007-08-02 06:49:31.000000000 -0400 ++++ gcc-4.6.0/gcc/config/knetbsd-gnu.h 2011-04-16 15:42:48.123213462 -0400 +@@ -34,5 +34,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.6.0/gcc/config/kopensolaris-gnu.h +--- gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h 2009-01-29 13:48:41.000000000 -0500 ++++ gcc-4.6.0/gcc/config/kopensolaris-gnu.h 2011-04-16 15:42:48.123213462 -0400 +@@ -33,5 +33,5 @@ + + #ifdef GLIBC_DYNAMIC_LINKER + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + #endif +diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h +--- gcc-4.6.0.orig/gcc/config/linux.h 2011-01-12 09:29:14.000000000 -0500 ++++ gcc-4.6.0/gcc/config/linux.h 2011-04-16 15:43:45.695213484 -0400 +@@ -74,9 +74,9 @@ + GLIBC_DYNAMIC_LINKER must be defined for each target using them, or + GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets + supporting both 32-bit and 64-bit compilation. */ +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" +diff -Naur gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.6.0/gcc/config/lm32/uclinux-elf.h +--- gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h 2011-01-14 13:42:32.000000000 -0500 ++++ gcc-4.6.0/gcc/config/lm32/uclinux-elf.h 2011-04-16 15:46:22.543213544 -0400 +@@ -72,7 +72,7 @@ + %{shared:-shared} \ + %{symbolic:-Bsymbolic} \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld-linux.so.2" ++ -dynamic-linker /tools/lib/ld-linux.so.2" + + #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS() + +diff -Naur gcc-4.6.0.orig/gcc/config/m32r/linux.h gcc-4.6.0/gcc/config/m32r/linux.h +--- gcc-4.6.0.orig/gcc/config/m32r/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/m32r/linux.h 2011-04-16 15:42:48.135213462 -0400 +@@ -47,7 +47,7 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef LINK_SPEC + #if TARGET_LITTLE_ENDIAN +diff -Naur gcc-4.6.0.orig/gcc/config/m68k/linux.h gcc-4.6.0/gcc/config/m68k/linux.h +--- gcc-4.6.0.orig/gcc/config/m68k/linux.h 2011-01-26 15:30:12.000000000 -0500 ++++ gcc-4.6.0/gcc/config/m68k/linux.h 2011-04-16 15:42:48.135213462 -0400 +@@ -75,7 +75,7 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "-m m68kelf %{shared} \ +diff -Naur gcc-4.6.0.orig/gcc/config/microblaze/linux.h gcc-4.6.0/gcc/config/microblaze/linux.h +--- gcc-4.6.0.orig/gcc/config/microblaze/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/microblaze/linux.h 2011-04-16 15:46:40.719213550 -0400 +@@ -20,7 +20,7 @@ + <http://www.gnu.org/licenses/>. */ + + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#define DYNAMIC_LINKER "/tools/lib/ld.so.1" + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } +diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux.h gcc-4.6.0/gcc/config/mips/linux.h +--- gcc-4.6.0.orig/gcc/config/mips/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mips/linux.h 2011-04-16 15:42:48.135213462 -0400 +@@ -61,7 +61,7 @@ + #undef MIPS_DEFAULT_GVALUE + #define MIPS_DEFAULT_GVALUE 0 + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + /* Borrowed from sparc/linux.h */ + #undef LINK_SPEC +diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h +--- gcc-4.6.0.orig/gcc/config/mips/linux64.h 2011-01-19 15:39:09.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:44:23.007213498 -0400 +@@ -35,10 +35,10 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64 +--- gcc-4.6.0.orig/gcc/config/mips/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:42:48.135213462 -0400 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +diff -Naur gcc-4.6.0.orig/gcc/config/mn10300/linux.h gcc-4.6.0/gcc/config/mn10300/linux.h +--- gcc-4.6.0.orig/gcc/config/mn10300/linux.h 2010-12-31 09:34:26.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mn10300/linux.h 2011-04-16 15:42:48.135213462 -0400 +@@ -32,7 +32,7 @@ + #undef ASM_SPEC + #define ASM_SPEC "" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ +diff -Naur gcc-4.6.0.orig/gcc/config/pa/pa-linux.h gcc-4.6.0/gcc/config/pa/pa-linux.h +--- gcc-4.6.0.orig/gcc/config/pa/pa-linux.h 2011-01-26 15:27:04.000000000 -0500 ++++ gcc-4.6.0/gcc/config/pa/pa-linux.h 2011-04-16 15:42:48.135213462 -0400 +@@ -39,7 +39,7 @@ + /* Define this for shared library support because it isn't in the main + linux.h file. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC "\ +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h +--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h 2011-03-07 02:50:23.000000000 -0500 ++++ gcc-4.6.0/gcc/config/rs6000/linux64.h 2011-04-16 15:44:57.343213510 -0400 +@@ -372,10 +372,10 @@ + #undef LINK_OS_DEFAULT_SPEC + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1" ++#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif DEFAULT_LIBC == LIBC_GLIBC +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h +--- gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h 2011-03-07 02:50:23.000000000 -0500 ++++ gcc-4.6.0/gcc/config/rs6000/sysv4.h 2011-04-16 15:45:23.727213520 -0400 +@@ -818,8 +818,8 @@ + + #define LINK_START_LINUX_SPEC "" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +@@ -863,7 +863,7 @@ + + #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld.so.1}}" ++ -dynamic-linker /tools/lib/ld.so.1}}" + + #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ + %{!undef: \ +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64 +--- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/rs6000/t-linux64 2011-04-16 15:42:48.195213462 -0400 +@@ -36,7 +36,7 @@ + MULTILIB_EXTRA_OPTS = fPIC mstrict-align + MULTILIB_EXCEPTIONS = m64/msoft-float + MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof ++MULTILIB_OSDIRNAMES = ../lib ../lib32 nof + MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) + + softfp_wrap_start := '\#ifndef __powerpc64__' +diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h +--- gcc-4.6.0.orig/gcc/config/s390/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/s390/linux.h 2011-04-16 15:42:48.195213462 -0400 +@@ -72,8 +72,8 @@ + #define MULTILIB_DEFAULTS { "m31" } + #endif + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" + + #undef LINK_SPEC + #define LINK_SPEC \ +diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64 +--- gcc-4.6.0.orig/gcc/config/s390/t-linux64 2010-10-04 12:51:59.000000000 -0400 ++++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:42:48.195213462 -0400 +@@ -7,4 +7,4 @@ + + MULTILIB_OPTIONS = m64/m31 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 +diff -Naur gcc-4.6.0.orig/gcc/config/sh/linux.h gcc-4.6.0/gcc/config/sh/linux.h +--- gcc-4.6.0.orig/gcc/config/sh/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sh/linux.h 2011-04-16 15:42:48.195213462 -0400 +@@ -47,7 +47,7 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef SUBTARGET_LINK_EMUL_SUFFIX + #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux.h 2011-01-26 15:30:12.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux.h 2011-04-16 15:42:48.195213462 -0400 +@@ -71,10 +71,10 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h 2011-02-17 08:57:21.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux64.h 2011-04-16 15:42:48.195213462 -0400 +@@ -101,8 +101,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64 +--- gcc-4.6.0.orig/gcc/config/sparc/t-linux64 2011-01-03 15:52:22.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/t-linux64 2011-04-16 15:42:48.195213462 -0400 +@@ -26,7 +26,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Naur gcc-4.6.0.orig/gcc/config/vax/linux.h gcc-4.6.0/gcc/config/vax/linux.h +--- gcc-4.6.0.orig/gcc/config/vax/linux.h 2010-12-09 20:03:33.000000000 -0500 ++++ gcc-4.6.0/gcc/config/vax/linux.h 2011-04-16 15:45:53.007213532 -0400 +@@ -44,7 +44,7 @@ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +- -dynamic-linker /lib/ld.so.1} \ ++ -dynamic-linker /tools/lib/ld.so.1} \ + %{static:-static}}" + + #undef WCHAR_TYPE +diff -Naur gcc-4.6.0.orig/gcc/config/xtensa/linux.h gcc-4.6.0/gcc/config/xtensa/linux.h +--- gcc-4.6.0.orig/gcc/config/xtensa/linux.h 2011-01-14 13:45:06.000000000 -0500 ++++ gcc-4.6.0/gcc/config/xtensa/linux.h 2011-04-16 15:42:48.195213462 -0400 +@@ -48,7 +48,7 @@ + %{mlongcalls:--longcalls} \ + %{mno-longcalls:--no-longcalls}" + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1" + + #undef LINK_SPEC + #define LINK_SPEC \ diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc index 24ee1ef..d0d37e4 100644 --- a/stage0/pkg/gcc +++ b/stage0/pkg/gcc @@ -1,24 +1,5 @@ #!/bin/bash -hvpatch() -{ - # Manually applying patches if specified - if [ -n "${GCC_PATCHES}" ]; then - for p in ${GCC_PATCHES}; do - apply_patch ${PACKAGE}-${p}.patch ${PACKAGE} - done - fi - - case "${HVL_TARGET}" in - "x86") - apply_patch ${PACKAGE}-specs-1.patch ${PACKAGE} - ;; - "x86_64") - apply_patch ${PACKAGE}-pure64_specs-1.patch ${PACKAGE} - ;; - esac -} - hvconfig_pre() { export AR=ar diff --git a/stage1/packages-update b/stage1/packages-update index 1401ed5..8fefe3a 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -24,11 +24,7 @@ lpkg 0 ${KERNEL} # New packages for stage 1: fpkg ${ZLIB} "http://www.zlib.net" - -unset USE_CLFS_PATCHES fpkg -m gnu ${BASH} -USE_CLFS_PATCHES=1 - fpkg -m gnu ${BISON} fpkg -e "tar.gz" ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})" fpkg -m gnu -e "tar.xz" ${COREUTILS} diff --git a/stage1/patches/common/bash-4.2-fixes-9.patch b/stage1/patches/common/bash-4.2-fixes-9.patch new file mode 100644 index 0000000..fd4bea6 --- /dev/null +++ b/stage1/patches/common/bash-4.2-fixes-9.patch @@ -0,0 +1,1757 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2012-09-16 +Initial Package Version: 4.2 +Upstream Status: Already in upstream patch repo +Origin: Upstream +Description: This patch contains upstream patch numbers 001 thru 037. + +diff -Naur bash-4.2.orig/assoc.c bash-4.2/assoc.c +--- bash-4.2.orig/assoc.c 2009-08-06 00:19:40.000000000 +0000 ++++ bash-4.2/assoc.c 2012-09-15 19:12:29.543156618 +0000 +@@ -77,6 +77,11 @@ + b = hash_search (key, hash, HASH_CREATE); + if (b == 0) + return -1; ++ /* If we are overwriting an existing element's value, we're not going to ++ use the key. Nothing in the array assignment code path frees the key ++ string, so we can free it here to avoid a memory leak. */ ++ if (b->key != key) ++ free (key); + FREE (b->data); + b->data = value ? savestring (value) : (char *)0; + return (0); +diff -Naur bash-4.2.orig/bashline.c bash-4.2/bashline.c +--- bash-4.2.orig/bashline.c 2011-01-16 20:32:47.000000000 +0000 ++++ bash-4.2/bashline.c 2012-09-15 19:12:29.883157597 +0000 +@@ -121,6 +121,9 @@ + static int filename_completion_ignore __P((char **)); + static int bash_push_line __P((void)); + ++static rl_icppfunc_t *save_directory_hook __P((void)); ++static void reset_directory_hook __P((rl_icppfunc_t *)); ++ + static void cleanup_expansion_error __P((void)); + static void maybe_make_readline_line __P((char *)); + static void set_up_new_line __P((char *)); +@@ -243,10 +246,17 @@ + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + ++/* Expand directory names during word/filename completion. */ ++int dircomplete_expand = 0; ++int dircomplete_expand_relpath = 0; ++ + static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:"; + static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:"; + /* )) */ + ++static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++static char *custom_filename_quote_characters = 0; ++ + static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; + + static int dot_in_path = 0; +@@ -501,7 +511,7 @@ + + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +- rl_directory_rewrite_hook = bash_directory_completion_hook; ++ set_directory_hook (); + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; + +@@ -529,7 +539,7 @@ + enable_hostname_completion (perform_hostname_completion); + + /* characters that need to be quoted when appearing in filenames. */ +- rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++ rl_filename_quote_characters = default_filename_quote_characters; + + rl_filename_quoting_function = bash_quote_filename; + rl_filename_dequoting_function = bash_dequote_filename; +@@ -564,8 +574,10 @@ + tilde_initialize (); + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; +- rl_directory_rewrite_hook = bash_directory_completion_hook; + rl_ignore_some_completions_function = filename_completion_ignore; ++ rl_filename_quote_characters = default_filename_quote_characters; ++ ++ set_directory_hook (); + } + + /* Contains the line to push into readline. */ +@@ -1279,6 +1291,9 @@ + matches = (char **)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + ++ rl_filename_quote_characters = default_filename_quote_characters; ++ set_directory_hook (); ++ + /* Determine if this could be a command word. It is if it appears at + the start of the line (ignoring preceding whitespace), or if it + appears after a character that separates commands. It cannot be a +@@ -1591,6 +1606,12 @@ + } + else + { ++ if (dircomplete_expand && dot_or_dotdot (filename_hint)) ++ { ++ dircomplete_expand = 0; ++ set_directory_hook (); ++ dircomplete_expand = 1; ++ } + mapping_over = 4; + goto inner; + } +@@ -1791,6 +1812,9 @@ + + inner: + val = rl_filename_completion_function (filename_hint, istate); ++ if (mapping_over == 4 && dircomplete_expand) ++ set_directory_hook (); ++ + istate = 1; + + if (val == 0) +@@ -2693,6 +2717,52 @@ + return conv; + } + ++/* Functions to save and restore the appropriate directory hook */ ++/* This is not static so the shopt code can call it */ ++void ++set_directory_hook () ++{ ++ if (dircomplete_expand) ++ { ++ rl_directory_completion_hook = bash_directory_completion_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; ++ } ++ else ++ { ++ rl_directory_rewrite_hook = bash_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)0; ++ } ++} ++ ++static rl_icppfunc_t * ++save_directory_hook () ++{ ++ rl_icppfunc_t *ret; ++ ++ if (dircomplete_expand) ++ { ++ ret = rl_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; ++ } ++ else ++ { ++ ret = rl_directory_rewrite_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; ++ } ++ ++ return ret; ++} ++ ++static void ++restore_directory_hook (hookf) ++ rl_icppfunc_t *hookf; ++{ ++ if (dircomplete_expand) ++ rl_directory_completion_hook = hookf; ++ else ++ rl_directory_rewrite_hook = hookf; ++} ++ + /* Handle symbolic link references and other directory name + expansions while hacking completion. This should return 1 if it modifies + the DIRNAME argument, 0 otherwise. It should make sure not to modify +@@ -2702,20 +2772,31 @@ + char **dirname; + { + char *local_dirname, *new_dirname, *t; +- int return_value, should_expand_dirname; ++ int return_value, should_expand_dirname, nextch, closer; + WORD_LIST *wl; + struct stat sb; + +- return_value = should_expand_dirname = 0; ++ return_value = should_expand_dirname = nextch = closer = 0; + local_dirname = *dirname; + +- if (mbschr (local_dirname, '$')) +- should_expand_dirname = 1; ++ if (t = mbschr (local_dirname, '$')) ++ { ++ should_expand_dirname = '$'; ++ nextch = t[1]; ++ /* Deliberately does not handle the deprecated $[...] arithmetic ++ expansion syntax */ ++ if (nextch == '(') ++ closer = ')'; ++ else if (nextch == '{') ++ closer = '}'; ++ else ++ nextch = 0; ++ } + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +- should_expand_dirname = 1; ++ should_expand_dirname = '`'; + } + + #if defined (HAVE_LSTAT) +@@ -2739,6 +2820,23 @@ + free (new_dirname); + dispose_words (wl); + local_dirname = *dirname; ++ /* XXX - change rl_filename_quote_characters here based on ++ should_expand_dirname/nextch/closer. This is the only place ++ custom_filename_quote_characters is modified. */ ++ if (rl_filename_quote_characters && *rl_filename_quote_characters) ++ { ++ int i, j, c; ++ i = strlen (default_filename_quote_characters); ++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); ++ for (i = j = 0; c = default_filename_quote_characters[i]; i++) ++ { ++ if (c == should_expand_dirname || c == nextch || c == closer) ++ continue; ++ custom_filename_quote_characters[j++] = c; ++ } ++ custom_filename_quote_characters[j] = '\0'; ++ rl_filename_quote_characters = custom_filename_quote_characters; ++ } + } + else + { +@@ -2758,11 +2856,31 @@ + local_dirname = *dirname = new_dirname; + } + ++ /* no_symbolic_links == 0 -> use (default) logical view of the file system. ++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the ++ current directory (./). ++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames ++ in the current directory (e.g., lib/sh). ++ XXX - should we do spelling correction on these? */ ++ ++ /* This is test as it was in bash-4.2: skip relative pathnames in current ++ directory. Change test to ++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) ++ if we want to skip paths beginning with ./ also. */ + if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) + { + char *temp1, *temp2; + int len1, len2; + ++ /* If we have a relative path ++ (local_dirname[0] != '/' && local_dirname[0] != '.') ++ that is canonical after appending it to the current directory, then ++ temp1 = temp2+'/' ++ That is, ++ strcmp (temp1, temp2) == 0 ++ after adding a slash to temp2 below. It should be safe to not ++ change those. ++ */ + t = get_working_directory ("symlink-hook"); + temp1 = make_absolute (local_dirname, t); + free (t); +@@ -2797,7 +2915,15 @@ + temp2[len2 + 1] = '\0'; + } + } +- return_value |= STREQ (local_dirname, temp2) == 0; ++ ++ /* dircomplete_expand_relpath == 0 means we want to leave relative ++ pathnames that are unchanged by canonicalization alone. ++ *local_dirname != '/' && *local_dirname != '.' == relative pathname ++ (consistent with general.c:absolute_pathname()) ++ temp1 == temp2 (after appending a slash to temp2) means the pathname ++ is not changed by canonicalization as described above. */ ++ if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) ++ return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; + free (temp1); +@@ -3002,12 +3128,13 @@ + + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; +- orig_dir_func = rl_directory_rewrite_hook; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; ++ ++ orig_dir_func = save_directory_hook (); ++ + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; +- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; + +@@ -3015,10 +3142,11 @@ + + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; +- rl_directory_rewrite_hook = orig_dir_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + ++ restore_directory_hook (orig_dir_func); ++ + return r; + } + +diff -Naur bash-4.2.orig/bashline.h bash-4.2/bashline.h +--- bash-4.2.orig/bashline.h 2009-01-04 19:32:22.000000000 +0000 ++++ bash-4.2/bashline.h 2012-09-15 19:12:29.920157704 +0000 +@@ -33,10 +33,15 @@ + extern void bashline_reinitialize __P((void)); + extern int bash_re_edit __P((char *)); + ++extern void bashline_set_event_hook __P((void)); ++extern void bashline_reset_event_hook __P((void)); ++ + extern int bind_keyseq_to_unix_command __P((char *)); + + extern char **bash_default_completion __P((const char *, int, int, int, int)); + ++void set_directory_hook __P((void)); ++ + /* Used by programmable completion code. */ + extern char *command_word_completion_function __P((const char *, int)); + extern char *bash_groupname_completion_function __P((const char *, int)); +diff -Naur bash-4.2.orig/builtins/declare.def bash-4.2/builtins/declare.def +--- bash-4.2.orig/builtins/declare.def 2010-05-30 22:25:21.000000000 +0000 ++++ bash-4.2/builtins/declare.def 2012-09-15 19:12:29.685157027 +0000 +@@ -513,6 +513,11 @@ + *subscript_start = '['; /* ] */ + var = assign_array_element (name, value, 0); /* XXX - not aflags */ + *subscript_start = '\0'; ++ if (var == 0) /* some kind of assignment error */ ++ { ++ assign_error++; ++ NEXT_VARIABLE (); ++ } + } + else if (simple_array_assign) + { +diff -Naur bash-4.2.orig/builtins/fc.def bash-4.2/builtins/fc.def +--- bash-4.2.orig/builtins/fc.def 2010-05-30 22:25:38.000000000 +0000 ++++ bash-4.2/builtins/fc.def 2012-09-15 19:12:29.530156581 +0000 +@@ -304,7 +304,7 @@ + last_hist = i - rh - hist_last_line_added; + + /* XXX */ +- if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) ++ if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; + if (last_hist < 0) +@@ -475,7 +475,7 @@ + HIST_ENTRY **hlist; + { + int sign, n, clen, rh; +- register int i, j; ++ register int i, j, last_hist; + register char *s; + + sign = 1; +@@ -495,7 +495,15 @@ + has been enabled (interactive or not) should use it in the last_hist + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +- i -= rh + hist_last_line_added; ++ last_hist = i - rh - hist_last_line_added; ++ ++ if (i == last_hist && hlist[last_hist] == 0) ++ while (last_hist >= 0 && hlist[last_hist] == 0) ++ last_hist--; ++ if (last_hist < 0) ++ return (-1); ++ ++ i = last_hist; + + /* No specification defaults to most recent command. */ + if (command == NULL) +diff -Naur bash-4.2.orig/builtins/mapfile.def bash-4.2/builtins/mapfile.def +--- bash-4.2.orig/builtins/mapfile.def 2010-05-30 02:09:47.000000000 +0000 ++++ bash-4.2/builtins/mapfile.def 2012-09-15 19:12:30.014157974 +0000 +@@ -195,13 +195,9 @@ + /* Reset the buffer for bash own stream */ + interrupt_immediately++; + for (array_index = origin, line_count = 1; +- zgetline (fd, &line, &line_length, unbuffered_read) != -1; +- array_index++, line_count++) ++ zgetline (fd, &line, &line_length, unbuffered_read) != -1; ++ array_index++) + { +- /* Have we exceeded # of lines to store? */ +- if (line_count_goal != 0 && line_count > line_count_goal) +- break; +- + /* Remove trailing newlines? */ + if (flags & MAPF_CHOP) + do_chop (line); +@@ -217,6 +213,11 @@ + } + + bind_array_element (entry, array_index, line, 0); ++ ++ /* Have we exceeded # of lines to store? */ ++ line_count++; ++ if (line_count_goal != 0 && line_count > line_count_goal) ++ break; + } + + xfree (line); +diff -Naur bash-4.2.orig/builtins/printf.def bash-4.2/builtins/printf.def +--- bash-4.2.orig/builtins/printf.def 2010-11-23 15:02:55.000000000 +0000 ++++ bash-4.2/builtins/printf.def 2012-09-15 19:12:29.733157165 +0000 +@@ -255,6 +255,8 @@ + #endif + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) + vbuf[0] = 0; +@@ -465,6 +467,9 @@ + secs = shell_start_time; /* roughly $SECONDS */ + else + secs = arg; ++#if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++#endif + tm = localtime (&secs); + n = strftime (timebuf, sizeof (timebuf), timefmt, tm); + free (timefmt); +diff -Naur bash-4.2.orig/builtins/read.def bash-4.2/builtins/read.def +--- bash-4.2.orig/builtins/read.def 2011-01-04 16:43:36.000000000 +0000 ++++ bash-4.2/builtins/read.def 2012-09-15 19:12:29.705157085 +0000 +@@ -642,6 +642,12 @@ + xfree (input_string); + return EXECUTION_FAILURE; /* readonly or noassign */ + } ++ if (assoc_p (var)) ++ { ++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* existing associative array */ ++ } + array_flush (array_cell (var)); + + alist = list_string (input_string, ifs_chars, 0); +@@ -731,7 +737,7 @@ + xfree (t1); + } + else +- var = bind_read_variable (varname, t); ++ var = bind_read_variable (varname, t ? t : ""); + } + else + { +@@ -792,7 +798,7 @@ + xfree (t); + } + else +- var = bind_read_variable (list->word->word, input_string); ++ var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) + { +diff -Naur bash-4.2.orig/builtins/shopt.def bash-4.2/builtins/shopt.def +--- bash-4.2.orig/builtins/shopt.def 2010-07-03 02:42:44.000000000 +0000 ++++ bash-4.2/builtins/shopt.def 2012-09-15 19:12:29.921157707 +0000 +@@ -61,6 +61,10 @@ + #include "common.h" + #include "bashgetopt.h" + ++#if defined (READLINE) ++# include "../bashline.h" ++#endif ++ + #if defined (HISTORY) + # include "../bashhist.h" + #endif +@@ -94,7 +98,7 @@ + extern int hist_verify, history_reediting, perform_hostname_completion; + extern int no_empty_command_completion; + extern int force_fignore; +-extern int dircomplete_spelling; ++extern int dircomplete_spelling, dircomplete_expand; + + extern int enable_hostname_completion __P((int)); + #endif +@@ -121,6 +125,10 @@ + static int set_restricted_shell __P((char *, int)); + #endif + ++#if defined (READLINE) ++static int shopt_set_complete_direxpand __P((char *, int)); ++#endif ++ + static int shopt_login_shell; + static int shopt_compat31; + static int shopt_compat32; +@@ -150,6 +158,7 @@ + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, + #if defined (READLINE) ++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif + { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL }, +@@ -535,6 +544,17 @@ + return 0; + } + ++#if defined (READLINE) ++static int ++shopt_set_complete_direxpand (option_name, mode) ++ char *option_name; ++ int mode; ++{ ++ set_directory_hook (); ++ return 0; ++} ++#endif ++ + #if defined (RESTRICTED_SHELL) + /* Don't allow the value of restricted_shell to be modified. */ + +diff -Naur bash-4.2.orig/command.h bash-4.2/command.h +--- bash-4.2.orig/command.h 2010-08-02 23:36:51.000000000 +0000 ++++ bash-4.2/command.h 2012-09-15 19:12:29.744157197 +0000 +@@ -97,6 +97,7 @@ + #define W_HASCTLESC 0x200000 /* word contains literal CTLESC characters */ + #define W_ASSIGNASSOC 0x400000 /* word looks like associative array assignment */ + #define W_ARRAYIND 0x800000 /* word is an array index being expanded */ ++#define W_ASSNGLOBAL 0x1000000 /* word is a global assignment to declare (declare/typeset -g) */ + + /* Possible values for subshell_environment */ + #define SUBSHELL_ASYNC 0x01 /* subshell caused by `command &' */ +diff -Naur bash-4.2.orig/doc/bash.1 bash-4.2/doc/bash.1 +--- bash-4.2.orig/doc/bash.1 2011-01-16 20:31:39.000000000 +0000 ++++ bash-4.2/doc/bash.1 2012-09-15 19:12:29.922157710 +0000 +@@ -8948,6 +8948,16 @@ + quoted. This is the behavior of posix mode through version 4.1. + The default bash behavior remains as in previous versions. + .TP 8 ++.B direxpand ++If set, ++.B bash ++replaces directory names with the results of word expansion when performing ++filename completion. This changes the contents of the readline editing ++buffer. ++If not set, ++.B bash ++attempts to preserve what the user typed. ++.TP 8 + .B dirspell + If set, + .B bash +diff -Naur bash-4.2.orig/doc/bashref.texi bash-4.2/doc/bashref.texi +--- bash-4.2.orig/doc/bashref.texi 2011-01-16 20:31:57.000000000 +0000 ++++ bash-4.2/doc/bashref.texi 2012-09-15 19:12:29.929157729 +0000 +@@ -4535,6 +4535,13 @@ + quoted. This is the behavior of @sc{posix} mode through version 4.1. + The default Bash behavior remains as in previous versions. + ++@item direxpand ++If set, Bash ++replaces directory names with the results of word expansion when performing ++filename completion. This changes the contents of the readline editing ++buffer. ++If not set, Bash attempts to preserve what the user typed. ++ + @item dirspell + If set, Bash + attempts spelling correction on directory names during word completion +diff -Naur bash-4.2.orig/error.c bash-4.2/error.c +--- bash-4.2.orig/error.c 2009-08-22 02:31:31.000000000 +0000 ++++ bash-4.2/error.c 2012-09-15 19:12:29.723157137 +0000 +@@ -200,7 +200,11 @@ + + va_end (args); + if (exit_immediately_on_error) +- exit_shell (1); ++ { ++ if (last_command_exit_value == 0) ++ last_command_exit_value = 1; ++ exit_shell (last_command_exit_value); ++ } + } + + void +diff -Naur bash-4.2.orig/execute_cmd.c bash-4.2/execute_cmd.c +--- bash-4.2.orig/execute_cmd.c 2011-02-09 22:32:25.000000000 +0000 ++++ bash-4.2/execute_cmd.c 2012-09-15 19:12:29.756157232 +0000 +@@ -2196,6 +2196,7 @@ + if (ignore_return && cmd) + cmd->flags |= CMD_IGNORE_RETURN; + ++#if defined (JOB_CONTROL) + lastpipe_flag = 0; + begin_unwind_frame ("lastpipe-exec"); + lstdin = -1; +@@ -2204,7 +2205,7 @@ + current shell environment. */ + if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + { +- lstdin = move_to_high_fd (0, 0, 255); ++ lstdin = move_to_high_fd (0, 1, -1); + if (lstdin > 0) + { + do_piping (prev, pipe_out); +@@ -2215,15 +2216,19 @@ + lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */ + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +- cmd->flags |= CMD_LASTPIPE; ++ if (cmd) ++ cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); ++#endif + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + ++#if defined (JOB_CONTROL) + if (lstdin > 0) + restore_stdin (lstdin); ++#endif + + if (prev >= 0) + close (prev); +@@ -2246,7 +2251,9 @@ + unfreeze_jobs_list (); + } + ++#if defined (JOB_CONTROL) + discard_unwind_frame ("lastpipe-exec"); ++#endif + + return (exec_result); + } +@@ -3575,13 +3582,13 @@ + { + WORD_LIST *w; + struct builtin *b; +- int assoc; ++ int assoc, global; + + if (words == 0) + return; + + b = 0; +- assoc = 0; ++ assoc = global = 0; + + for (w = words; w; w = w->next) + if (w->word->flags & W_ASSIGNMENT) +@@ -3598,12 +3605,17 @@ + #if defined (ARRAY_VARS) + if (assoc) + w->word->flags |= W_ASSIGNASSOC; ++ if (global) ++ w->word->flags |= W_ASSNGLOBAL; + #endif + } + #if defined (ARRAY_VARS) + /* Note that we saw an associative array option to a builtin that takes + assignment statements. This is a bit of a kludge. */ +- else if (w->word->word[0] == '-' && strchr (w->word->word, 'A')) ++ else if (w->word->word[0] == '-' && (strchr (w->word->word+1, 'A') || strchr (w->word->word+1, 'g'))) ++#else ++ else if (w->word->word[0] == '-' && strchr (w->word->word+1, 'g')) ++#endif + { + if (b == 0) + { +@@ -3613,10 +3625,11 @@ + else if (b && (b->flags & ASSIGNMENT_BUILTIN)) + words->word->flags |= W_ASSNBLTIN; + } +- if (words->word->flags & W_ASSNBLTIN) ++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'A')) + assoc = 1; ++ if ((words->word->flags & W_ASSNBLTIN) && strchr (w->word->word+1, 'g')) ++ global = 1; + } +-#endif + } + + /* Return 1 if the file found by searching $PATH for PATHNAME, defaulting +diff -Naur bash-4.2.orig/expr.c bash-4.2/expr.c +--- bash-4.2.orig/expr.c 2010-12-21 16:12:13.000000000 +0000 ++++ bash-4.2/expr.c 2012-09-15 19:12:29.650156926 +0000 +@@ -476,19 +476,23 @@ + + if (special) + { ++ if ((op == DIV || op == MOD) && value == 0) ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ value = 1; ++ } ++ + switch (op) + { + case MUL: + lvalue *= value; + break; + case DIV: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue /= value; + break; + case MOD: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue %= value; + break; + case PLUS: +@@ -804,7 +808,12 @@ + val2 = exppower (); + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +- evalerror (_("division by 0")); ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ val2 = 1; ++ } + + if (op == MUL) + val1 *= val2; +diff -Naur bash-4.2.orig/lib/glob/glob.c bash-4.2/lib/glob/glob.c +--- bash-4.2.orig/lib/glob/glob.c 2009-11-14 23:39:30.000000000 +0000 ++++ bash-4.2/lib/glob/glob.c 2012-09-15 19:12:29.987157897 +0000 +@@ -200,8 +200,11 @@ + wchar_t *pat_wc, *dn_wc; + size_t pat_n, dn_n; + ++ pat_wc = dn_wc = (wchar_t *)NULL; ++ + pat_n = xdupmbstowcs (&pat_wc, NULL, pat); +- dn_n = xdupmbstowcs (&dn_wc, NULL, dname); ++ if (pat_n != (size_t)-1) ++ dn_n = xdupmbstowcs (&dn_wc, NULL, dname); + + ret = 0; + if (pat_n != (size_t)-1 && dn_n !=(size_t)-1) +@@ -221,6 +224,8 @@ + (pat_wc[0] != L'\\' || pat_wc[1] != L'.')) + ret = 1; + } ++ else ++ ret = skipname (pat, dname, flags); + + FREE (pat_wc); + FREE (dn_wc); +@@ -266,8 +271,11 @@ + /* Convert the strings into wide characters. */ + n = xdupmbstowcs (&wpathname, NULL, pathname); + if (n == (size_t) -1) +- /* Something wrong. */ +- return; ++ { ++ /* Something wrong. Fall back to single-byte */ ++ udequote_pathname (pathname); ++ return; ++ } + orig_wpathname = wpathname; + + for (i = j = 0; wpathname && wpathname[i]; ) +diff -Naur bash-4.2.orig/lib/glob/gmisc.c bash-4.2/lib/glob/gmisc.c +--- bash-4.2.orig/lib/glob/gmisc.c 2011-02-05 21:11:17.000000000 +0000 ++++ bash-4.2/lib/glob/gmisc.c 2012-09-15 19:12:29.481156440 +0000 +@@ -77,8 +77,8 @@ + wchar_t *wpat; + size_t wmax; + { +- wchar_t wc, *wbrack; +- int matlen, t, in_cclass, in_collsym, in_equiv; ++ wchar_t wc; ++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) + return (0); +@@ -118,58 +118,80 @@ + break; + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +- wbrack = wpat; ++ bracklen = 1; + wc = *wpat++; + do + { + if (wc == 0) + { +- matlen += wpat - wbrack - 1; /* incremented below */ +- break; ++ wpat--; /* back up to NUL */ ++ matlen += bracklen; ++ goto bad_bracket; + } + else if (wc == L'\\') + { +- wc = *wpat++; +- if (*wpat == 0) +- break; ++ /* *wpat == backslash-escaped character */ ++ bracklen++; ++ /* If the backslash or backslash-escape ends the string, ++ bail. The ++wpat skips over the backslash escape */ ++ if (*wpat == 0 || *++wpat == 0) ++ { ++ matlen += bracklen; ++ goto bad_bracket; ++ } + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; ++ bracklen++; + in_cclass = 1; + } + else if (in_cclass && wc == L':' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_cclass = 0; + } + else if (wc == L'[' && *wpat == L'.') /* collating symbol */ + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +- wpat++; ++ { ++ wpat++; ++ bracklen++; ++ } + in_collsym = 1; + } + else if (in_collsym && wc == L'.' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_collsym = 0; + } + else if (wc == L'[' && *wpat == L'=') /* equivalence class */ + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +- wpat++; ++ { ++ wpat++; ++ bracklen++; ++ } + in_equiv = 1; + } + else if (in_equiv && wc == L'=' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((wc = *wpat++) != L']'); + matlen++; /* bracket expression can only match one char */ ++bad_bracket: + break; + } + } +@@ -213,8 +235,8 @@ + char *pat; + size_t max; + { +- char c, *brack; +- int matlen, t, in_cclass, in_collsym, in_equiv; ++ char c; ++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) + return (0); +@@ -254,58 +276,80 @@ + break; + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +- brack = pat; ++ bracklen = 1; + c = *pat++; + do + { + if (c == 0) + { +- matlen += pat - brack - 1; /* incremented below */ +- break; ++ pat--; /* back up to NUL */ ++ matlen += bracklen; ++ goto bad_bracket; + } + else if (c == '\\') + { +- c = *pat++; +- if (*pat == 0) +- break; ++ /* *pat == backslash-escaped character */ ++ bracklen++; ++ /* If the backslash or backslash-escape ends the string, ++ bail. The ++pat skips over the backslash escape */ ++ if (*pat == 0 || *++pat == 0) ++ { ++ matlen += bracklen; ++ goto bad_bracket; ++ } + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; ++ bracklen++; + in_cclass = 1; + } + else if (in_cclass && c == ':' && *pat == ']') + { + pat++; ++ bracklen++; + in_cclass = 0; + } + else if (c == '[' && *pat == '.') /* collating symbol */ + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +- pat++; ++ { ++ pat++; ++ bracklen++; ++ } + in_collsym = 1; + } + else if (in_collsym && c == '.' && *pat == ']') + { + pat++; ++ bracklen++; + in_collsym = 0; + } + else if (c == '[' && *pat == '=') /* equivalence class */ + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +- pat++; ++ { ++ pat++; ++ bracklen++; ++ } + in_equiv = 1; + } + else if (in_equiv && c == '=' && *pat == ']') + { + pat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((c = *pat++) != ']'); + matlen++; /* bracket expression can only match one char */ ++bad_bracket: + break; + } + } +diff -Naur bash-4.2.orig/lib/glob/xmbsrtowcs.c bash-4.2/lib/glob/xmbsrtowcs.c +--- bash-4.2.orig/lib/glob/xmbsrtowcs.c 2010-05-30 22:36:27.000000000 +0000 ++++ bash-4.2/lib/glob/xmbsrtowcs.c 2012-09-15 19:12:29.986157894 +0000 +@@ -35,6 +35,8 @@ + + #if HANDLE_MULTIBYTE + ++#define WSBUF_INC 32 ++ + #ifndef FREE + # define FREE(x) do { if (x) free (x); } while (0) + #endif +@@ -148,7 +150,7 @@ + size_t wsbuf_size; /* Size of WSBUF */ + size_t wcnum; /* Number of wide characters in WSBUF */ + mbstate_t state; /* Conversion State */ +- size_t wcslength; /* Number of wide characters produced by the conversion. */ ++ size_t n, wcslength; /* Number of wide characters produced by the conversion. */ + const char *end_or_backslash; + size_t nms; /* Number of multibyte characters to convert at one time. */ + mbstate_t tmp_state; +@@ -171,7 +173,18 @@ + /* Compute the number of produced wide-characters. */ + tmp_p = p; + tmp_state = state; +- wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state); ++ ++ if (nms == 0 && *p == '\\') /* special initial case */ ++ nms = wcslength = 1; ++ else ++ wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state); ++ ++ if (wcslength == 0) ++ { ++ tmp_p = p; /* will need below */ ++ tmp_state = state; ++ wcslength = 1; /* take a single byte */ ++ } + + /* Conversion failed. */ + if (wcslength == (size_t)-1) +@@ -186,7 +199,8 @@ + { + wchar_t *wstmp; + +- wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */ ++ while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */ ++ wsbuf_size += WSBUF_INC; + + wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t)); + if (wstmp == NULL) +@@ -199,10 +213,18 @@ + } + + /* Perform the conversion. This is assumed to return 'wcslength'. +- * It may set 'p' to NULL. */ +- mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); ++ It may set 'p' to NULL. */ ++ n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state); + +- wcnum += wcslength; ++ /* Compensate for taking single byte on wcs conversion failure above. */ ++ if (wcslength == 1 && (n == 0 || n == (size_t)-1)) ++ { ++ state = tmp_state; ++ p = tmp_p; ++ wsbuf[wcnum++] = *p++; ++ } ++ else ++ wcnum += wcslength; + + if (mbsinit (&state) && (p != NULL) && (*p == '\\')) + { +@@ -230,8 +252,6 @@ + If conversion is failed, the return value is (size_t)-1 and the values + of DESTP and INDICESP are NULL. */ + +-#define WSBUF_INC 32 +- + size_t + xdupmbstowcs (destp, indicesp, src) + wchar_t **destp; /* Store the pointer to the wide character string */ +diff -Naur bash-4.2.orig/lib/readline/callback.c bash-4.2/lib/readline/callback.c +--- bash-4.2.orig/lib/readline/callback.c 2010-06-06 16:18:58.000000000 +0000 ++++ bash-4.2/lib/readline/callback.c 2012-09-15 19:12:29.478156431 +0000 +@@ -148,6 +148,9 @@ + eof = _rl_vi_domove_callback (_rl_vimvcxt); + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } + #endif +diff -Naur bash-4.2.orig/lib/readline/input.c bash-4.2/lib/readline/input.c +--- bash-4.2.orig/lib/readline/input.c 2010-05-30 22:33:01.000000000 +0000 ++++ bash-4.2/lib/readline/input.c 2012-09-15 19:12:29.999157931 +0000 +@@ -409,7 +409,7 @@ + int + rl_read_key () + { +- int c; ++ int c, r; + + rl_key_sequence_length++; + +@@ -429,14 +429,18 @@ + { + while (rl_event_hook) + { +- if (rl_gather_tyi () < 0) /* XXX - EIO */ ++ if (rl_get_char (&c) != 0) ++ break; ++ ++ if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } ++ else if (r == 1) /* read something */ ++ continue; ++ + RL_CHECK_SIGNALS (); +- if (rl_get_char (&c) != 0) +- break; + if (rl_done) /* XXX - experimental */ + return ('\n'); + (*rl_event_hook) (); +diff -Naur bash-4.2.orig/lib/readline/vi_mode.c bash-4.2/lib/readline/vi_mode.c +--- bash-4.2.orig/lib/readline/vi_mode.c 2010-11-21 00:51:39.000000000 +0000 ++++ bash-4.2/lib/readline/vi_mode.c 2012-09-15 19:12:30.019157989 +0000 +@@ -1114,7 +1114,7 @@ + rl_beg_of_line (1, c); + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +- return (0); ++ return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) + /* XXX - these need to handle rl_universal_argument bindings */ +@@ -1234,11 +1234,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } +- else if (vi_redoing) ++ else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `dd' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { +@@ -1316,11 +1324,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } +- else if (vi_redoing) ++ else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `cc' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { +@@ -1377,6 +1393,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ r = rl_domove_motion_callback (_rl_vimvcxt); ++ } ++ else if (vi_redoing) /* handle redoing `yy' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { +diff -Naur bash-4.2.orig/lib/sh/eaccess.c bash-4.2/lib/sh/eaccess.c +--- bash-4.2.orig/lib/sh/eaccess.c 2011-01-09 01:50:10.000000000 +0000 ++++ bash-4.2/lib/sh/eaccess.c 2012-09-15 19:12:30.006157951 +0000 +@@ -82,6 +82,8 @@ + const char *path; + struct stat *finfo; + { ++ static char *pbuf = 0; ++ + if (*path == '\0') + { + errno = ENOENT; +@@ -106,7 +108,7 @@ + trailing slash. Make sure /dev/fd/xx really uses DEV_FD_PREFIX/xx. + On most systems, with the notable exception of linux, this is + effectively a no-op. */ +- char pbuf[32]; ++ pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8)); + strcpy (pbuf, DEV_FD_PREFIX); + strcat (pbuf, path + 8); + return (stat (pbuf, finfo)); +diff -Naur bash-4.2.orig/lib/sh/zread.c bash-4.2/lib/sh/zread.c +--- bash-4.2.orig/lib/sh/zread.c 2009-03-02 13:54:45.000000000 +0000 ++++ bash-4.2/lib/sh/zread.c 2012-09-15 19:12:29.707157091 +0000 +@@ -160,14 +160,13 @@ + zsyncfd (fd) + int fd; + { +- off_t off; +- int r; ++ off_t off, r; + + off = lused - lind; + r = 0; + if (off > 0) + r = lseek (fd, -off, SEEK_CUR); + +- if (r >= 0) ++ if (r != -1) + lused = lind = 0; + } +diff -Naur bash-4.2.orig/parse.y bash-4.2/parse.y +--- bash-4.2.orig/parse.y 2011-01-02 20:48:11.000000000 +0000 ++++ bash-4.2/parse.y 2012-09-15 19:12:30.009157959 +0000 +@@ -2499,7 +2499,7 @@ + We do this only if it is time to do so. Notice that only here + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +- if (prompt_is_ps1 && time_to_check_mail ()) ++ if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) + { + check_mail (); + reset_mail_timer (); +@@ -3842,6 +3842,7 @@ + int flags; + { + sh_parser_state_t ps; ++ sh_input_line_state_t ls; + int orig_ind, nc, sflags; + char *ret, *s, *ep, *ostring; + +@@ -3849,10 +3850,12 @@ + orig_ind = *indp; + ostring = string; + ++/*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ + sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; + if (flags & SX_NOLONGJMP) + sflags |= SEVAL_NOLONGJMP; + save_parser_state (&ps); ++ save_input_line_state (&ls); + + /*(*/ + parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ +@@ -3861,6 +3864,8 @@ + + restore_parser_state (&ps); + reset_parser (); ++ /* reset_parser clears shell_input_line and associated variables */ ++ restore_input_line_state (&ls); + if (interactive) + token_to_read = 0; + +@@ -4895,6 +4900,9 @@ + return (current_command_line_count == 2 ? "\n" : ""); + } + ++ if (parser_state & PST_COMPASSIGN) ++ return (" "); ++ + /* First, handle some special cases. */ + /*(*/ + /* If we just read `()', assume it's a function definition, and don't +@@ -5135,6 +5143,9 @@ + case 'A': + /* Make the current time/date into a string. */ + (void) time (&the_time); ++#if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++#endif + tm = localtime (&the_time); + + if (c == 'd') +@@ -5905,6 +5916,12 @@ + ps->expand_aliases = expand_aliases; + ps->echo_input_at_read = echo_input_at_read; + ++ ps->token = token; ++ ps->token_buffer_size = token_buffer_size; ++ /* Force reallocation on next call to read_token_word */ ++ token = 0; ++ token_buffer_size = 0; ++ + return (ps); + } + +@@ -5946,6 +5963,42 @@ + + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ ++ FREE (token); ++ token = ps->token; ++ token_buffer_size = ps->token_buffer_size; ++} ++ ++sh_input_line_state_t * ++save_input_line_state (ls) ++ sh_input_line_state_t *ls; ++{ ++ if (ls == 0) ++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); ++ if (ls == 0) ++ return ((sh_input_line_state_t *)NULL); ++ ++ ls->input_line = shell_input_line; ++ ls->input_line_size = shell_input_line_size; ++ ls->input_line_len = shell_input_line_len; ++ ls->input_line_index = shell_input_line_index; ++ ++ /* force reallocation */ ++ shell_input_line = 0; ++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; ++} ++ ++void ++restore_input_line_state (ls) ++ sh_input_line_state_t *ls; ++{ ++ FREE (shell_input_line); ++ shell_input_line = ls->input_line; ++ shell_input_line_size = ls->input_line_size; ++ shell_input_line_len = ls->input_line_len; ++ shell_input_line_index = ls->input_line_index; ++ ++ set_line_mbstate (); + } + + /************************************************ +diff -Naur bash-4.2.orig/patchlevel.h bash-4.2/patchlevel.h +--- bash-4.2.orig/patchlevel.h 2010-06-13 00:14:48.000000000 +0000 ++++ bash-4.2/patchlevel.h 2012-09-15 19:12:30.020157992 +0000 +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 0 ++#define PATCHLEVEL 37 + + #endif /* _PATCHLEVEL_H_ */ +diff -Naur bash-4.2.orig/pathexp.c bash-4.2/pathexp.c +--- bash-4.2.orig/pathexp.c 2010-08-14 03:21:57.000000000 +0000 ++++ bash-4.2/pathexp.c 2012-09-15 19:12:29.557156658 +0000 +@@ -196,7 +196,7 @@ + { + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +- if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) ++ if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; + i++; +diff -Naur bash-4.2.orig/print_cmd.c bash-4.2/print_cmd.c +--- bash-4.2.orig/print_cmd.c 2010-05-30 22:34:08.000000000 +0000 ++++ bash-4.2/print_cmd.c 2012-09-15 19:12:29.533156590 +0000 +@@ -315,6 +315,7 @@ + cprintf ("( "); + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; + +@@ -592,6 +593,7 @@ + newline ("do\n"); + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; + newline ("done"); +@@ -653,6 +655,7 @@ + } + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) + { +diff -Naur bash-4.2.orig/shell.h bash-4.2/shell.h +--- bash-4.2.orig/shell.h 2011-01-07 03:16:55.000000000 +0000 ++++ bash-4.2/shell.h 2012-09-15 19:12:29.548156633 +0000 +@@ -136,6 +136,9 @@ + int parser_state; + int *token_state; + ++ char *token; ++ int token_buffer_size; ++ + /* input line state -- line number saved elsewhere */ + int input_line_terminator; + int eof_encountered; +@@ -166,6 +169,16 @@ + + } sh_parser_state_t; + ++typedef struct _sh_input_line_state_t { ++ char *input_line; ++ int input_line_index; ++ int input_line_size; ++ int input_line_len; ++} sh_input_line_state_t; ++ + /* Let's try declaring these here. */ + extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); + extern void restore_parser_state __P((sh_parser_state_t *)); ++ ++extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); ++extern void restore_input_line_state __P((sh_input_line_state_t *)); +diff -Naur bash-4.2.orig/sig.c bash-4.2/sig.c +--- bash-4.2.orig/sig.c 2010-11-23 13:21:22.000000000 +0000 ++++ bash-4.2/sig.c 2012-09-15 19:12:29.527156572 +0000 +@@ -46,6 +46,7 @@ + + #if defined (READLINE) + # include "bashline.h" ++# include <readline/readline.h> + #endif + + #if defined (HISTORY) +@@ -62,6 +63,7 @@ + #if defined (HISTORY) + extern int history_lines_this_session; + #endif ++extern int no_line_editing; + + extern void initialize_siglist (); + +@@ -505,7 +507,10 @@ + { + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +- history_lines_this_session = 0; ++# if defined (READLINE) ++ if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) ++# endif ++ history_lines_this_session = 0; + #endif + terminate_immediately = 0; + termsig_handler (sig); +diff -Naur bash-4.2.orig/subst.c bash-4.2/subst.c +--- bash-4.2.orig/subst.c 2011-01-02 21:12:51.000000000 +0000 ++++ bash-4.2/subst.c 2012-09-15 19:12:30.017157983 +0000 +@@ -366,6 +366,11 @@ + f &= ~W_ASSNBLTIN; + fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); + } ++ if (f & W_ASSNGLOBAL) ++ { ++ f &= ~W_ASSNGLOBAL; ++ fprintf (stderr, "W_ASSNGLOBAL%s", f ? "|" : ""); ++ } + if (f & W_COMPASSIGN) + { + f &= ~W_COMPASSIGN; +@@ -1379,10 +1384,12 @@ + slen = strlen (string + *sindex) + *sindex; + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +- parse_matched_pair() */ +- dolbrace_state = 0; +- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +- dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; ++ parse_matched_pair(). The different initial value is to handle the ++ case where this function is called to parse the word in ++ ${param op word} (SX_WORD). */ ++ dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; ++ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) ++ dolbrace_state = DOLBRACE_QUOTE; + + i = *sindex; + while (c = string[i]) +@@ -2801,7 +2808,7 @@ + } + else if (assign_list) + { +- if (word->flags & W_ASSIGNARG) ++ if ((word->flags & W_ASSIGNARG) && (word->flags & W_ASSNGLOBAL) == 0) + aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) + aflags |= ASS_MKASSOC; +@@ -3371,7 +3378,7 @@ + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +- td.flags = 0; ++ td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); +@@ -3704,7 +3711,10 @@ + break; + } + else if (string[i] == CTLNUL) +- i++; ++ { ++ i++; ++ continue; ++ } + + prev_i = i; + ADVANCE_CHAR (string, slen, i); +@@ -4156,7 +4166,7 @@ + simple = (wpat[0] != L'\\' && wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'['); + #if defined (EXTENDED_GLOB) + if (extended_glob) +- simple |= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ ++ simple &= (wpat[1] != L'(' || (wpat[0] != L'*' && wpat[0] != L'?' && wpat[0] != L'+' && wpat[0] != L'!' && wpat[0] != L'@')); /*)*/ + #endif + + /* If the pattern doesn't match anywhere in the string, go ahead and +@@ -4607,6 +4617,7 @@ + if (ifs_firstc == 0) + #endif + word->flags |= W_NOSPLIT; ++ word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + +@@ -5798,6 +5809,16 @@ + is the only expansion that creates more than one word. */ + if (qdollaratp && ((hasdol && quoted) || l->next)) + *qdollaratp = 1; ++ /* If we have a quoted null result (QUOTED_NULL(temp)) and the word is ++ a quoted null (l->next == 0 && QUOTED_NULL(l->word->word)), the ++ flags indicate it (l->word->flags & W_HASQUOTEDNULL), and the ++ expansion is quoted (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ++ (which is more paranoia than anything else), we need to return the ++ quoted null string and set the flags to indicate it. */ ++ if (l->next == 0 && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && QUOTED_NULL(temp) && QUOTED_NULL(l->word->word) && (l->word->flags & W_HASQUOTEDNULL)) ++ { ++ w->flags |= W_HASQUOTEDNULL; ++ } + dispose_words (l); + } + else if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && hasdol) +@@ -7176,7 +7197,7 @@ + { + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +- value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); ++ value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); + if (string[sindex] == RBRACE) + sindex++; + else +@@ -7268,6 +7289,7 @@ + default: + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); + FREE (temp); +@@ -7900,7 +7922,7 @@ + + /* State flags */ + int had_quoted_null; +- int has_dollar_at; ++ int has_dollar_at, temp_has_dollar_at; + int tflag; + int pflags; /* flags passed to param_expand */ + +@@ -8105,13 +8127,14 @@ + if (expanded_something) + *expanded_something = 1; + +- has_dollar_at = 0; ++ temp_has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; + tword = param_expand (string, &sindex, quoted, expanded_something, +- &has_dollar_at, "ed_dollar_at, ++ &temp_has_dollar_at, "ed_dollar_at, + &had_quoted_null, pflags); ++ has_dollar_at += temp_has_dollar_at; + + if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) + { +@@ -8129,6 +8152,14 @@ + temp = tword->word; + dispose_word_desc (tword); + ++ /* Kill quoted nulls; we will add them back at the end of ++ expand_word_internal if nothing else in the string */ ++ if (had_quoted_null && temp && QUOTED_NULL (temp)) ++ { ++ FREE (temp); ++ temp = (char *)NULL; ++ } ++ + goto add_string; + break; + +@@ -8244,9 +8275,10 @@ + + temp = (char *)NULL; + +- has_dollar_at = 0; ++ temp_has_dollar_at = 0; /* XXX */ + /* Need to get W_HASQUOTEDNULL flag through this function. */ +- list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL); ++ list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL); ++ has_dollar_at += temp_has_dollar_at; + + if (list == &expand_word_error || list == &expand_word_fatal) + { +@@ -8533,7 +8565,7 @@ + tword->flags |= W_NOEXPAND; /* XXX */ + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tword->flags |= W_QUOTED; +- if (had_quoted_null) ++ if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; + list = make_word_list (tword, (WORD_LIST *)NULL); + } +@@ -8564,7 +8596,7 @@ + tword->flags |= W_NOGLOB; + if (word->flags & W_NOEXPAND) + tword->flags |= W_NOEXPAND; +- if (had_quoted_null) ++ if (had_quoted_null && QUOTED_NULL (istring)) + tword->flags |= W_HASQUOTEDNULL; /* XXX */ + list = make_word_list (tword, (WORD_LIST *)NULL); + } +diff -Naur bash-4.2.orig/subst.h bash-4.2/subst.h +--- bash-4.2.orig/subst.h 2010-12-03 01:21:29.000000000 +0000 ++++ bash-4.2/subst.h 2012-09-15 19:12:29.465156394 +0000 +@@ -56,6 +56,7 @@ + #define SX_NOLONGJMP 0x0040 /* don't longjmp on fatal error */ + #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ + #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ ++#define SX_WORD 0x0200 /* extracting word in ${param op word} */ + + /* Remove backslashes which are quoting backquotes from STRING. Modifies + STRING, and returns a pointer to it. */ +diff -Naur bash-4.2.orig/support/shobj-conf bash-4.2/support/shobj-conf +--- bash-4.2.orig/support/shobj-conf 2009-10-28 13:20:21.000000000 +0000 ++++ bash-4.2/support/shobj-conf 2012-09-15 19:12:29.688157036 +0000 +@@ -157,7 +157,7 @@ + ;; + + # Darwin/MacOS X +-darwin[89]*|darwin10*) ++darwin[89]*|darwin1[012]*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported + +@@ -186,7 +186,7 @@ + SHLIB_LIBSUFF='dylib' + + case "${host_os}" in +- darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' ++ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + *) SHOBJ_LDFLAGS='-dynamic' +diff -Naur bash-4.2.orig/tests/shopt.right bash-4.2/tests/shopt.right +--- bash-4.2.orig/tests/shopt.right 2010-07-03 03:36:30.000000000 +0000 ++++ bash-4.2/tests/shopt.right 2012-09-15 19:12:29.931157735 +0000 +@@ -12,6 +12,7 @@ + shopt -u compat32 + shopt -u compat40 + shopt -u compat41 ++shopt -u direxpand + shopt -u dirspell + shopt -u dotglob + shopt -u execfail +@@ -68,6 +69,7 @@ + shopt -u compat32 + shopt -u compat40 + shopt -u compat41 ++shopt -u direxpand + shopt -u dirspell + shopt -u dotglob + shopt -u execfail +@@ -101,6 +103,7 @@ + compat32 off + compat40 off + compat41 off ++direxpand off + dirspell off + dotglob off + execfail off +diff -Naur bash-4.2.orig/variables.c bash-4.2/variables.c +--- bash-4.2.orig/variables.c 2011-01-25 01:07:48.000000000 +0000 ++++ bash-4.2/variables.c 2012-09-15 19:12:29.506156513 +0000 +@@ -3653,6 +3653,22 @@ + return n; + } + ++int ++chkexport (name) ++ char *name; ++{ ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++ if (v && exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_env (); ++ return 1; ++ } ++ return 0; ++} ++ + void + maybe_make_export_env () + { +@@ -4214,7 +4230,7 @@ + { "TEXTDOMAIN", sv_locale }, + { "TEXTDOMAINDIR", sv_locale }, + +-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) ++#if defined (HAVE_TZSET) + { "TZ", sv_tz }, + #endif + +@@ -4558,12 +4574,13 @@ + } + #endif /* HISTORY */ + +-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) ++#if defined (HAVE_TZSET) + void + sv_tz (name) + char *name; + { +- tzset (); ++ if (chkexport (name)) ++ tzset (); + } + #endif + +diff -Naur bash-4.2.orig/variables.h bash-4.2/variables.h +--- bash-4.2.orig/variables.h 2010-12-03 01:22:01.000000000 +0000 ++++ bash-4.2/variables.h 2012-09-15 19:12:29.489156464 +0000 +@@ -313,6 +313,7 @@ + + extern void sort_variables __P((SHELL_VAR **)); + ++extern int chkexport __P((char *)); + extern void maybe_make_export_env __P((void)); + extern void update_export_env_inplace __P((char *, int, char *)); + extern void put_command_name_into_env __P((char *)); diff --git a/stage1/patches/common/bzip2-1.0.6-install_docs-1.patch b/stage1/patches/common/bzip2-1.0.6-install_docs-1.patch new file mode 100644 index 0000000..c3b0230 --- /dev/null +++ b/stage1/patches/common/bzip2-1.0.6-install_docs-1.patch @@ -0,0 +1,42 @@ +Submitted By: Matthew Burgess <matthew@linuxfromscratch.org> +Date: 2007-01-31 +Initial Package Version: 1.0.4 +Upstream Status: Not submitted +Origin: Randy McMurchy & Steve Crosby +Description: Installs pre-formatted documentation + +diff -Naur bzip2-1.0.4.orig/Makefile bzip2-1.0.4/Makefile +--- bzip2-1.0.4.orig/Makefile 2007-01-03 03:49:21.000000000 +0000 ++++ bzip2-1.0.4/Makefile 2007-01-26 20:00:01.000000000 +0000 +@@ -25,7 +25,7 @@ + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +- ++DOCDIR=share/doc/$(DISTNAME) + + OBJS= blocksort.o \ + huffman.o \ +@@ -74,6 +74,7 @@ + if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi + if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi + if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi ++ if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi + if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi + cp -f bzip2 $(PREFIX)/bin/bzip2 + cp -f bzip2 $(PREFIX)/bin/bunzip2 +@@ -107,6 +108,14 @@ + echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 + echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 + echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 ++ cp -f manual.html $(PREFIX)/$(DOCDIR) ++ cp -f manual.pdf $(PREFIX)/$(DOCDIR) ++ cp -f manual.ps $(PREFIX)/$(DOCDIR) ++ cp -f bzip2.txt $(PREFIX)/$(DOCDIR) ++ chmod a+r $(PREFIX)/$(DOCDIR)/manual.html ++ chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf ++ chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps ++ chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt + + clean: + rm -f *.o libbz2.a bzip2 bzip2recover \ diff --git a/stage1/patches/common/gcc-4.6.3-branch_update-2.patch b/stage1/patches/common/gcc-4.6.3-branch_update-2.patch new file mode 100644 index 0000000..283a93e --- /dev/null +++ b/stage1/patches/common/gcc-4.6.3-branch_update-2.patch @@ -0,0 +1,14541 @@ +Submitted By: Jim Gifford (jim at cross-lfs dot org) +Date: 11-05-2012 +Initial Package Version: 4.6.3 +Origin: Upstream +Upstream Status: Applied +Description: This is a branch update for gcc-4.6.3, and should be + rechecked periodically. + +This patch was made from Revision # 193147. + +diff -Naur gcc-4.6.3.orig/boehm-gc/configure gcc-4.6.3/boehm-gc/configure +--- gcc-4.6.3.orig/boehm-gc/configure 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/boehm-gc/configure 2012-03-02 12:21:41.598223000 -0600 +@@ -15246,6 +15246,17 @@ + fi + done + ++for ac_func in pthread_get_stackaddr_np ++do : ++ ac_fn_c_check_func "$LINENO" "pthread_get_stackaddr_np" "ac_cv_func_pthread_get_stackaddr_np" ++if test "x$ac_cv_func_pthread_get_stackaddr_np" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PTHREAD_GET_STACKADDR_NP 1 ++_ACEOF ++ ++fi ++done ++ + LIBS="$oldLIBS" + + # Configuration of machine-dependent code +diff -Naur gcc-4.6.3.orig/boehm-gc/configure.ac gcc-4.6.3/boehm-gc/configure.ac +--- gcc-4.6.3.orig/boehm-gc/configure.ac 2011-02-02 07:53:56.000000000 -0600 ++++ gcc-4.6.3/boehm-gc/configure.ac 2012-03-02 12:21:41.598223000 -0600 +@@ -392,6 +392,7 @@ + oldLIBS="$LIBS" + LIBS="$LIBS $THREADLIBS" + AC_CHECK_FUNCS([pthread_getattr_np]) ++AC_CHECK_FUNCS([pthread_get_stackaddr_np]) + LIBS="$oldLIBS" + + # Configuration of machine-dependent code +diff -Naur gcc-4.6.3.orig/boehm-gc/include/gc_config.h.in gcc-4.6.3/boehm-gc/include/gc_config.h.in +--- gcc-4.6.3.orig/boehm-gc/include/gc_config.h.in 2009-08-22 08:22:20.000000000 -0500 ++++ gcc-4.6.3/boehm-gc/include/gc_config.h.in 2012-03-02 12:21:41.598223000 -0600 +@@ -87,6 +87,9 @@ + /* Define to 1 if you have the `pthread_getattr_np' function. */ + #undef HAVE_PTHREAD_GETATTR_NP + ++/* Define to 1 if you have the `pthread_get_stackaddr_np_np' function. */ ++#undef HAVE_PTHREAD_GET_STACKADDR_NP ++ + /* Define to 1 if you have the <stdint.h> header file. */ + #undef HAVE_STDINT_H + +diff -Naur gcc-4.6.3.orig/boehm-gc/include/private/gcconfig.h gcc-4.6.3/boehm-gc/include/private/gcconfig.h +--- gcc-4.6.3.orig/boehm-gc/include/private/gcconfig.h 2010-03-21 14:34:19.000000000 -0500 ++++ gcc-4.6.3/boehm-gc/include/private/gcconfig.h 2012-03-02 12:21:41.598223000 -0600 +@@ -1331,7 +1331,11 @@ + These aren't used when dyld support is enabled (it is by default) */ + # define DATASTART ((ptr_t) get_etext()) + # define DATAEND ((ptr_t) get_end()) +-# define STACKBOTTOM ((ptr_t) 0xc0000000) ++# ifdef HAVE_PTHREAD_GET_STACKADDR_NP ++# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) ++# else ++# define STACKBOTTOM ((ptr_t) 0xc0000000) ++# endif + # define USE_MMAP + # define USE_MMAP_ANON + # define USE_ASM_PUSH_REGS +@@ -2011,7 +2015,11 @@ + These aren't used when dyld support is enabled (it is by default) */ + # define DATASTART ((ptr_t) get_etext()) + # define DATAEND ((ptr_t) get_end()) +-# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) ++# ifdef HAVE_PTHREAD_GET_STACKADDR_NP ++# define STACKBOTTOM (ptr_t)pthread_get_stackaddr_np(pthread_self()) ++# else ++# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000) ++# endif + # define USE_MMAP + # define USE_MMAP_ANON + # ifdef GC_DARWIN_THREADS +diff -Naur gcc-4.6.3.orig/gcc/ada/gcc-interface/decl.c gcc-4.6.3/gcc/ada/gcc-interface/decl.c +--- gcc-4.6.3.orig/gcc/ada/gcc-interface/decl.c 2012-01-21 09:01:48.000000000 -0600 ++++ gcc-4.6.3/gcc/ada/gcc-interface/decl.c 2012-05-26 05:44:06.390872000 -0500 +@@ -120,8 +120,8 @@ + /* The value of the qualifier. */ + tree qual; + +- /* The record associated with this variant. */ +- tree record; ++ /* The type of the variant after transformation. */ ++ tree new_type; + } variant_desc; + + DEF_VEC_O(variant_desc); +@@ -3157,11 +3157,16 @@ + { + tree old_variant = v->type; + tree new_variant = make_node (RECORD_TYPE); ++ tree suffix ++ = concat_name (DECL_NAME (gnu_variant_part), ++ IDENTIFIER_POINTER ++ (DECL_NAME (v->field))); + TYPE_NAME (new_variant) +- = DECL_NAME (TYPE_NAME (old_variant)); ++ = concat_name (TYPE_NAME (gnu_type), ++ IDENTIFIER_POINTER (suffix)); + copy_and_substitute_in_size (new_variant, old_variant, + gnu_subst_list); +- v->record = new_variant; ++ v->new_type = new_variant; + } + } + else +@@ -3265,7 +3270,7 @@ + if (selected_variant) + gnu_cont_type = gnu_type; + else +- gnu_cont_type = v->record; ++ gnu_cont_type = v->new_type; + } + else + /* The front-end may pass us "ghost" components if +@@ -7704,7 +7709,7 @@ + v->type = variant_type; + v->field = gnu_field; + v->qual = qual; +- v->record = NULL_TREE; ++ v->new_type = NULL_TREE; + + /* Recurse on the variant subpart of the variant, if any. */ + variant_subpart = get_variant_part (variant_type); +@@ -8457,7 +8462,9 @@ + + /* First create the type of the variant part from that of the old one. */ + new_union_type = make_node (QUAL_UNION_TYPE); +- TYPE_NAME (new_union_type) = DECL_NAME (TYPE_NAME (old_union_type)); ++ TYPE_NAME (new_union_type) ++ = concat_name (TYPE_NAME (record_type), ++ IDENTIFIER_POINTER (DECL_NAME (old_variant_part))); + + /* If the position of the variant part is constant, subtract it from the + size of the type of the parent to get the new size. This manual CSE +@@ -8491,7 +8498,7 @@ + continue; + + /* Retrieve the list of fields already added to the new variant. */ +- new_variant = v->record; ++ new_variant = v->new_type; + field_list = TYPE_FIELDS (new_variant); + + /* If the old variant had a variant subpart, we need to create a new +diff -Naur gcc-4.6.3.orig/gcc/cgraph.c gcc-4.6.3/gcc/cgraph.c +--- gcc-4.6.3.orig/gcc/cgraph.c 2011-06-06 12:16:35.000000000 -0500 ++++ gcc-4.6.3/gcc/cgraph.c 2012-03-25 04:39:32.217767000 -0500 +@@ -1700,19 +1700,27 @@ + free_nodes = node; + } + +-/* Remove the node from cgraph. */ ++/* Remove the node from cgraph and all inline clones inlined into it. ++ Skip however removal of FORBIDDEN_NODE and return true if it needs to be ++ removed. This allows to call the function from outer loop walking clone ++ tree. */ + +-void +-cgraph_remove_node_and_inline_clones (struct cgraph_node *node) ++bool ++cgraph_remove_node_and_inline_clones (struct cgraph_node *node, struct cgraph_node *forbidden_node) + { + struct cgraph_edge *e, *next; ++ bool found = false; ++ ++ if (node == forbidden_node) ++ return true; + for (e = node->callees; e; e = next) + { + next = e->next_callee; + if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ found |= cgraph_remove_node_and_inline_clones (e->callee, forbidden_node); + } + cgraph_remove_node (node); ++ return found; + } + + /* Notify finalize_compilation_unit that given node is reachable. */ +diff -Naur gcc-4.6.3.orig/gcc/cgraph.h gcc-4.6.3/gcc/cgraph.h +--- gcc-4.6.3.orig/gcc/cgraph.h 2011-03-04 12:49:23.000000000 -0600 ++++ gcc-4.6.3/gcc/cgraph.h 2012-03-25 04:39:32.217767000 -0500 +@@ -547,7 +547,7 @@ + void cgraph_insert_node_to_hashtable (struct cgraph_node *node); + void cgraph_remove_edge (struct cgraph_edge *); + void cgraph_remove_node (struct cgraph_node *); +-void cgraph_remove_node_and_inline_clones (struct cgraph_node *); ++bool cgraph_remove_node_and_inline_clones (struct cgraph_node *, struct cgraph_node *); + void cgraph_release_function_body (struct cgraph_node *); + void cgraph_node_remove_callees (struct cgraph_node *node); + struct cgraph_edge *cgraph_create_edge (struct cgraph_node *, +diff -Naur gcc-4.6.3.orig/gcc/cgraphunit.c gcc-4.6.3/gcc/cgraphunit.c +--- gcc-4.6.3.orig/gcc/cgraphunit.c 2011-03-11 07:27:26.000000000 -0600 ++++ gcc-4.6.3/gcc/cgraphunit.c 2012-03-25 04:39:32.217767000 -0500 +@@ -2157,8 +2157,19 @@ + first_clone->ipa_transforms_to_apply); + first_clone->ipa_transforms_to_apply = NULL; + ++ /* When doing recursive inlining, the clone may become unnecessary. ++ This is possible i.e. in the case when the recursive function is proved to be ++ non-throwing and the recursion happens only in the EH landing pad. ++ We can not remove the clone until we are done with saving the body. ++ Remove it now. */ ++ if (!first_clone->callers) ++ { ++ cgraph_remove_node_and_inline_clones (first_clone, NULL); ++ first_clone = NULL; ++ } + #ifdef ENABLE_CHECKING +- verify_cgraph_node (first_clone); ++ else ++ verify_cgraph_node (first_clone); + #endif + return first_clone; + } +diff -Naur gcc-4.6.3.orig/gcc/combine.c gcc-4.6.3/gcc/combine.c +--- gcc-4.6.3.orig/gcc/combine.c 2012-02-09 11:29:38.000000000 -0600 ++++ gcc-4.6.3/gcc/combine.c 2012-03-15 05:04:12.913641000 -0500 +@@ -1788,6 +1788,10 @@ + if (set == 0) + return 0; + ++ /* The simplification in expand_field_assignment may call back to ++ get_last_value, so set safe guard here. */ ++ subst_low_luid = DF_INSN_LUID (insn); ++ + set = expand_field_assignment (set); + src = SET_SRC (set), dest = SET_DEST (set); + +diff -Naur gcc-4.6.3.orig/gcc/config/alpha/alpha.c gcc-4.6.3/gcc/config/alpha/alpha.c +--- gcc-4.6.3.orig/gcc/config/alpha/alpha.c 2011-08-06 13:41:14.000000000 -0500 ++++ gcc-4.6.3/gcc/config/alpha/alpha.c 2012-08-09 16:49:40.880473000 -0500 +@@ -2469,7 +2469,7 @@ + { + case EQ: case LE: case LT: case LEU: case LTU: + case UNORDERED: +- /* We have these compares: */ ++ /* We have these compares. */ + cmp_code = code, branch_code = NE; + break; + +@@ -2706,13 +2706,15 @@ + switch (code) + { + case EQ: case LE: case LT: case LEU: case LTU: ++ case UNORDERED: + /* We have these compares. */ + cmp_code = code, code = NE; + break; + + case NE: +- /* This must be reversed. */ +- cmp_code = EQ, code = EQ; ++ case ORDERED: ++ /* These must be reversed. */ ++ cmp_code = reverse_condition (code), code = EQ; + break; + + case GE: case GT: case GEU: case GTU: +@@ -2732,6 +2734,14 @@ + gcc_unreachable (); + } + ++ if (cmp_mode == DImode) ++ { ++ if (!reg_or_0_operand (op0, DImode)) ++ op0 = force_reg (DImode, op0); ++ if (!reg_or_8bit_operand (op1, DImode)) ++ op1 = force_reg (DImode, op1); ++ } ++ + tem = gen_reg_rtx (cmp_mode); + emit_insn (gen_rtx_SET (VOIDmode, tem, + gen_rtx_fmt_ee (cmp_code, cmp_mode, +@@ -2743,6 +2753,14 @@ + local_fast_math = 1; + } + ++ if (cmp_mode == DImode) ++ { ++ if (!reg_or_0_operand (op0, DImode)) ++ op0 = force_reg (DImode, op0); ++ if (!reg_or_8bit_operand (op1, DImode)) ++ op1 = force_reg (DImode, op1); ++ } ++ + /* We may be able to use a conditional move directly. + This avoids emitting spurious compares. */ + if (signed_comparison_operator (cmp, VOIDmode) +@@ -2761,11 +2779,13 @@ + switch (code) + { + case EQ: case LE: case LT: case LEU: case LTU: ++ case UNORDERED: + /* We have these compares: */ + break; + + case NE: +- /* This must be reversed. */ ++ case ORDERED: ++ /* These must be reversed. */ + code = reverse_condition (code); + cmov_code = EQ; + break; +@@ -9628,18 +9648,19 @@ + } + } + +-/* Insert an unop between a noreturn function call and GP load. */ ++/* Insert an unop between sibcall or noreturn function call and GP load. */ + + static void +-alpha_pad_noreturn (void) ++alpha_pad_function_end (void) + { + rtx insn, next; + + for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) + { +- if (!CALL_P (insn) +- || !find_reg_note (insn, REG_NORETURN, NULL_RTX)) +- continue; ++ if (! (CALL_P (insn) ++ && (SIBLING_CALL_P (insn) ++ || find_reg_note (insn, REG_NORETURN, NULL_RTX)))) ++ continue; + + next = next_active_insn (insn); + +@@ -9660,8 +9681,28 @@ + static void + alpha_reorg (void) + { +- /* Workaround for a linker error that triggers when an +- exception handler immediatelly follows a noreturn function. ++ /* Workaround for a linker error that triggers when an exception ++ handler immediatelly follows a sibcall or a noreturn function. ++ ++In the sibcall case: ++ ++ The instruction stream from an object file: ++ ++ 1d8: 00 00 fb 6b jmp (t12) ++ 1dc: 00 00 ba 27 ldah gp,0(ra) ++ 1e0: 00 00 bd 23 lda gp,0(gp) ++ 1e4: 00 00 7d a7 ldq t12,0(gp) ++ 1e8: 00 40 5b 6b jsr ra,(t12),1ec <__funcZ+0x1ec> ++ ++ was converted in the final link pass to: ++ ++ 12003aa88: 67 fa ff c3 br 120039428 <...> ++ 12003aa8c: 00 00 fe 2f unop ++ 12003aa90: 00 00 fe 2f unop ++ 12003aa94: 48 83 7d a7 ldq t12,-31928(gp) ++ 12003aa98: 00 40 5b 6b jsr ra,(t12),12003aa9c <__func+0x1ec> ++ ++And in the noreturn case: + + The instruction stream from an object file: + +@@ -9681,11 +9722,11 @@ + + GP load instructions were wrongly cleared by the linker relaxation + pass. This workaround prevents removal of GP loads by inserting +- an unop instruction between a noreturn function call and ++ an unop instruction between a sibcall or noreturn function call and + exception handler prologue. */ + + if (current_function_has_exception_handlers ()) +- alpha_pad_noreturn (); ++ alpha_pad_function_end (); + + if (alpha_tp != ALPHA_TP_PROG || flag_exceptions) + alpha_handle_trap_shadows (); +diff -Naur gcc-4.6.3.orig/gcc/config/alpha/linux-unwind.h gcc-4.6.3/gcc/config/alpha/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/alpha/linux-unwind.h 2011-12-21 06:22:48.000000000 -0600 ++++ gcc-4.6.3/gcc/config/alpha/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Alpha Linux. +- Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2011, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -49,7 +49,7 @@ + else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */ + { + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; +diff -Naur gcc-4.6.3.orig/gcc/config/arm/arm.c gcc-4.6.3/gcc/config/arm/arm.c +--- gcc-4.6.3.orig/gcc/config/arm/arm.c 2012-02-14 00:57:17.000000000 -0600 ++++ gcc-4.6.3/gcc/config/arm/arm.c 2012-09-05 05:54:08.480413000 -0500 +@@ -243,6 +243,7 @@ + static bool fa726te_sched_adjust_cost (rtx, rtx, rtx, int *); + static enum machine_mode arm_preferred_simd_mode (enum machine_mode); + static bool arm_class_likely_spilled_p (reg_class_t); ++static HOST_WIDE_INT arm_vector_alignment (const_tree type); + static bool arm_vector_alignment_reachable (const_tree type, bool is_packed); + static bool arm_builtin_support_vector_misalignment (enum machine_mode mode, + const_tree type, +@@ -579,6 +580,9 @@ + #undef TARGET_CLASS_LIKELY_SPILLED_P + #define TARGET_CLASS_LIKELY_SPILLED_P arm_class_likely_spilled_p + ++#undef TARGET_VECTOR_ALIGNMENT ++#define TARGET_VECTOR_ALIGNMENT arm_vector_alignment ++ + #undef TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE + #define TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE \ + arm_vector_alignment_reachable +@@ -2005,7 +2009,8 @@ + global_options_set.x_param_values); + + /* ARM EABI defaults to strict volatile bitfields. */ +- if (TARGET_AAPCS_BASED && flag_strict_volatile_bitfields < 0) ++ if (TARGET_AAPCS_BASED && flag_strict_volatile_bitfields < 0 ++ && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + /* Enable sw prefetching at -O3 for CPUS that have prefetch, and we have deemed +@@ -4692,6 +4697,18 @@ + return gen_rtx_REG (mode, pcum->nregs); + } + ++/* The AAPCS sets the maximum alignment of a vector to 64 bits. */ ++static HOST_WIDE_INT ++arm_vector_alignment (const_tree type) ++{ ++ HOST_WIDE_INT align = tree_low_cst (TYPE_SIZE (type), 0); ++ ++ if (TARGET_AAPCS_BASED) ++ align = MIN (align, 64); ++ ++ return align; ++} ++ + static unsigned int + arm_function_arg_boundary (enum machine_mode mode, const_tree type) + { +@@ -20427,7 +20444,7 @@ + unsigned long l_mask = live_regs_mask & (for_prologue ? 0x40ff : 0xff); + /* Then count how many other high registers will need to be pushed. */ + unsigned long high_regs_pushed = bit_count (live_regs_mask & 0x0f00); +- int n_free, reg_base; ++ int n_free, reg_base, size; + + if (!for_prologue && frame_pointer_needed) + amount = offsets->locals_base - offsets->saved_regs; +@@ -20466,7 +20483,8 @@ + n_free = 0; + if (!for_prologue) + { +- reg_base = arm_size_return_regs () / UNITS_PER_WORD; ++ size = arm_size_return_regs (); ++ reg_base = ARM_NUM_INTS (size); + live_regs_mask >>= reg_base; + } + +@@ -20520,8 +20538,7 @@ + if (extra_pop > 0) + { + unsigned long extra_mask = (1 << extra_pop) - 1; +- live_regs_mask |= extra_mask << ((size + UNITS_PER_WORD - 1) +- / UNITS_PER_WORD); ++ live_regs_mask |= extra_mask << ARM_NUM_INTS (size); + } + + /* The prolog may have pushed some high registers to use as +@@ -23422,8 +23439,11 @@ + } + } + +- arm_process_output_memory_barrier (emit, NULL); ++ /* Note: label is before barrier so that in cmp failure case we still get ++ a barrier to stop subsequent loads floating upwards past the ldrex ++ PR target/48126. */ + arm_output_asm_insn (emit, 1, operands, "%sLSYB%%=:", LOCAL_LABEL_PREFIX); ++ arm_process_output_memory_barrier (emit, NULL); + } + + static rtx +diff -Naur gcc-4.6.3.orig/gcc/config/arm/arm.h gcc-4.6.3/gcc/config/arm/arm.h +--- gcc-4.6.3.orig/gcc/config/arm/arm.h 2011-07-14 16:26:01.000000000 -0500 ++++ gcc-4.6.3/gcc/config/arm/arm.h 2012-06-19 07:30:17.615240000 -0500 +@@ -294,7 +294,8 @@ + #define TARGET_HAVE_DMB (arm_arch7) + + /* Nonzero if this chip implements a memory barrier via CP15. */ +-#define TARGET_HAVE_DMB_MCR (arm_arch6k && ! TARGET_HAVE_DMB) ++#define TARGET_HAVE_DMB_MCR (arm_arch6 && ! TARGET_HAVE_DMB \ ++ && ! TARGET_THUMB1) + + /* Nonzero if this chip implements a memory barrier instruction. */ + #define TARGET_HAVE_MEMORY_BARRIER (TARGET_HAVE_DMB || TARGET_HAVE_DMB_MCR) +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr.c gcc-4.6.3/gcc/config/avr/avr.c +--- gcc-4.6.3.orig/gcc/config/avr/avr.c 2012-01-12 11:23:32.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr.c 2012-09-04 04:21:20.968406000 -0500 +@@ -94,6 +94,7 @@ + static unsigned int avr_case_values_threshold (void); + static bool avr_frame_pointer_required_p (void); + static bool avr_can_eliminate (const int, const int); ++static bool avr_allocate_stack_slots_for_args (void); + static bool avr_class_likely_spilled_p (reg_class_t c); + static rtx avr_function_arg (CUMULATIVE_ARGS *, enum machine_mode, + const_tree, bool); +@@ -218,6 +219,9 @@ + #undef TARGET_CAN_ELIMINATE + #define TARGET_CAN_ELIMINATE avr_can_eliminate + ++#undef TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS ++#define TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS avr_allocate_stack_slots_for_args ++ + #undef TARGET_CLASS_LIKELY_SPILLED_P + #define TARGET_CLASS_LIKELY_SPILLED_P avr_class_likely_spilled_p + +@@ -446,6 +450,16 @@ + return count; + } + ++ ++/* Implement `TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS' */ ++ ++static bool ++avr_allocate_stack_slots_for_args (void) ++{ ++ return !cfun->machine->is_naked; ++} ++ ++ + /* Return true if register FROM can be eliminated via register TO. */ + + bool +@@ -1879,12 +1893,9 @@ + } + else if (test_hard_reg_class (STACK_REG, src)) + { +- *l = 2; +- return AVR_HAVE_8BIT_SP +- ? (AS2 (in,%A0,__SP_L__) CR_TAB +- AS1 (clr,%B0)) +- : (AS2 (in,%A0,__SP_L__) CR_TAB +- AS2 (in,%B0,__SP_H__)); ++ *l = 2; ++ return (AS2 (in,%A0,__SP_L__) CR_TAB ++ AS2 (in,%B0,__SP_H__)); + } + + if (AVR_HAVE_MOVW) +@@ -5177,10 +5188,9 @@ + + default_file_start (); + +- fputs ("__SREG__ = 0x3f\n", asm_out_file); +- if (!AVR_HAVE_8BIT_SP) +- fputs ("__SP_H__ = 0x3e\n", asm_out_file); +- fputs ("__SP_L__ = 0x3d\n", asm_out_file); ++ fputs ("__SREG__ = 0x3f\n" ++ "__SP_H__ = 0x3e\n" ++ "__SP_L__ = 0x3d\n", asm_out_file); + + fputs ("__tmp_reg__ = 0\n" + "__zero_reg__ = 1\n", asm_out_file); +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr-devices.c gcc-4.6.3/gcc/config/avr/avr-devices.c +--- gcc-4.6.3.orig/gcc/config/avr/avr-devices.c 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr-devices.c 2012-09-10 05:51:13.070478000 -0500 +@@ -211,7 +211,7 @@ + { "atmega128rfa1", ARCH_AVR51, "__AVR_ATmega128RFA1__", 0, 0x0200, "m128rfa1" }, + { "at90can128", ARCH_AVR51, "__AVR_AT90CAN128__", 0, 0x0100, "can128" }, + { "at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__", 0, 0x0100, "usb1286" }, +- { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1286" }, ++ { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1287" }, + /* 3-Byte PC. */ + { "avr6", ARCH_AVR6, NULL, 0, 0x0200, "m2561" }, + { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__", 0, 0x0200, "m2560" }, +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr.md gcc-4.6.3/gcc/config/avr/avr.md +--- gcc-4.6.3.orig/gcc/config/avr/avr.md 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr.md 2012-03-28 05:06:51.859458000 -0500 +@@ -299,7 +299,7 @@ + [(set (match_operand:HI 0 "stack_register_operand" "=q") + (unspec_volatile:HI [(match_operand:HI 1 "register_operand" "r")] + UNSPECV_WRITE_SP_IRQ_OFF))] +- "!AVR_HAVE_8BIT_SP" ++ "" + "out __SP_H__, %B1 + out __SP_L__, %A1" + [(set_attr "length" "2") +@@ -309,7 +309,7 @@ + [(set (match_operand:HI 0 "stack_register_operand" "=q") + (unspec_volatile:HI [(match_operand:HI 1 "register_operand" "r")] + UNSPECV_WRITE_SP_IRQ_ON))] +- "!AVR_HAVE_8BIT_SP" ++ "" + "cli + out __SP_H__, %B1 + sei +diff -Naur gcc-4.6.3.orig/gcc/config/avr/avr-stdint.h gcc-4.6.3/gcc/config/avr/avr-stdint.h +--- gcc-4.6.3.orig/gcc/config/avr/avr-stdint.h 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/avr-stdint.h 2012-06-04 04:53:04.873173000 -0500 +@@ -0,0 +1,66 @@ ++/* Definitions for <stdint.h> types on systems using newlib. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ ++This file is part of GCC. ++ ++GCC 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 3, or (at your option) ++any later version. ++ ++GCC 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 GCC; see the file COPYING3. If not see ++<http://www.gnu.org/licenses/>. */ ++ ++/* ++ The intention of this file is to supply definitions that work with ++ avr-gcc's -mint8 that sets int to an 8-bit type. ++ ++ This file is intended to yield the same results as newlib-stdint.h, ++ but there are some differences to newlib-stdint.h: ++ ++ - AVR is an 8-bit architecture that cannot access 16-bit values ++ atomically, this SIG_ATOMIC_TYPE is "char". ++ ++ - For the same reason, [u]int_fast8_t is defined as 8-bit type. ++ ++*/ ++ ++#define SIG_ATOMIC_TYPE "char" ++ ++#define INT8_TYPE "signed char" ++#define INT16_TYPE (INT_TYPE_SIZE == 16 ? "short int" : "long int") ++#define INT32_TYPE (INT_TYPE_SIZE == 16 ? "long int" : "long long int") ++#define INT64_TYPE (INT_TYPE_SIZE == 16 ? "long long int" : 0) ++#define UINT8_TYPE "unsigned char" ++#define UINT16_TYPE (INT_TYPE_SIZE == 16 ? "short unsigned int" : "long unsigned int") ++#define UINT32_TYPE (INT_TYPE_SIZE == 16 ? "long unsigned int" : "long long unsigned int") ++#define UINT64_TYPE (INT_TYPE_SIZE == 16 ? "long long unsigned int" : 0) ++ ++#define INT_LEAST8_TYPE INT8_TYPE ++#define INT_LEAST16_TYPE INT16_TYPE ++#define INT_LEAST32_TYPE INT32_TYPE ++#define INT_LEAST64_TYPE INT64_TYPE ++#define UINT_LEAST8_TYPE UINT8_TYPE ++#define UINT_LEAST16_TYPE UINT16_TYPE ++#define UINT_LEAST32_TYPE UINT32_TYPE ++#define UINT_LEAST64_TYPE UINT64_TYPE ++ ++#define INT_FAST8_TYPE INT8_TYPE ++#define INT_FAST16_TYPE (INT_TYPE_SIZE == 16 ? "int" : INT16_TYPE) ++#define INT_FAST32_TYPE INT32_TYPE ++#define INT_FAST64_TYPE INT64_TYPE ++#define UINT_FAST8_TYPE UINT8_TYPE ++#define UINT_FAST16_TYPE (INT_TYPE_SIZE == 16 ? "unsigned int" : UINT16_TYPE) ++#define UINT_FAST32_TYPE UINT32_TYPE ++#define UINT_FAST64_TYPE UINT64_TYPE ++ ++#define INTPTR_TYPE PTRDIFF_TYPE ++#ifndef UINTPTR_TYPE ++#define UINTPTR_TYPE SIZE_TYPE ++#endif +diff -Naur gcc-4.6.3.orig/gcc/config/avr/libgcc.S gcc-4.6.3/gcc/config/avr/libgcc.S +--- gcc-4.6.3.orig/gcc/config/avr/libgcc.S 2011-12-02 13:14:15.000000000 -0600 ++++ gcc-4.6.3/gcc/config/avr/libgcc.S 2012-03-28 05:06:51.859458000 -0500 +@@ -582,15 +582,6 @@ + push r17 + push r28 + push r29 +-#if defined (__AVR_HAVE_8BIT_SP__) +-;; FIXME: __AVR_HAVE_8BIT_SP__ is set on device level, not on core level +-;; so this lines are dead code. To make it work, devices without +-;; SP_H must get their own multilib(s), see PR51345. +- in r28,__SP_L__ +- sub r28,r26 +- clr r29 +- out __SP_L__,r28 +-#else + in r28,__SP_L__ + in r29,__SP_H__ + sub r28,r26 +@@ -600,7 +591,6 @@ + out __SP_H__,r29 + out __SREG__,__tmp_reg__ + out __SP_L__,r28 +-#endif + #if defined (__AVR_HAVE_EIJMP_EICALL__) + eijmp + #else +@@ -635,15 +625,6 @@ + ldd r16,Y+4 + ldd r17,Y+3 + ldd r26,Y+2 +-#if defined (__AVR_HAVE_8BIT_SP__) +-;; FIXME: __AVR_HAVE_8BIT_SP__ is set on device level, not on core level +-;; so this lines are dead code. To make it work, devices without +-;; SP_H must get their own multilib(s). +- ldd r29,Y+1 +- add r28,r30 +- out __SP_L__,r28 +- mov r28, r26 +-#else + ldd r27,Y+1 + add r28,r30 + adc r29,__zero_reg__ +@@ -654,7 +635,6 @@ + out __SP_L__,r28 + mov_l r28, r26 + mov_h r29, r27 +-#endif + ret + .endfunc + #endif /* defined (L_epilogue) */ +diff -Naur gcc-4.6.3.orig/gcc/config/bfin/linux-unwind.h gcc-4.6.3/gcc/config/bfin/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/bfin/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/bfin/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Blackfin. +- Copyright (C) 2007, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -48,10 +48,10 @@ + { + struct rt_sigframe { + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; + char retcode[8]; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + +diff -Naur gcc-4.6.3.orig/gcc/config/h8300/h8300.c gcc-4.6.3/gcc/config/h8300/h8300.c +--- gcc-4.6.3.orig/gcc/config/h8300/h8300.c 2010-12-01 07:46:36.000000000 -0600 ++++ gcc-4.6.3/gcc/config/h8300/h8300.c 2012-03-28 21:15:29.973365000 -0500 +@@ -416,7 +416,7 @@ + } + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + } + +diff -Naur gcc-4.6.3.orig/gcc/config/host-linux.c gcc-4.6.3/gcc/config/host-linux.c +--- gcc-4.6.3.orig/gcc/config/host-linux.c 2010-11-29 08:09:41.000000000 -0600 ++++ gcc-4.6.3/gcc/config/host-linux.c 2012-03-22 21:19:46.206744000 -0500 +@@ -84,6 +84,8 @@ + # define TRY_EMPTY_VM_SPACE 0x60000000 + #elif defined(__mc68000__) + # define TRY_EMPTY_VM_SPACE 0x40000000 ++#elif defined(__ARM_EABI__) ++# define TRY_EMPTY_VM_SPACE 0x60000000 + #else + # define TRY_EMPTY_VM_SPACE 0 + #endif +diff -Naur gcc-4.6.3.orig/gcc/config/i386/driver-i386.c gcc-4.6.3/gcc/config/i386/driver-i386.c +--- gcc-4.6.3.orig/gcc/config/i386/driver-i386.c 2012-01-19 14:15:29.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/driver-i386.c 2012-10-03 12:51:22.129805000 -0500 +@@ -1,5 +1,5 @@ + /* Subroutines for the gcc driver. +- Copyright (C) 2006, 2007, 2008, 2010 Free Software Foundation, Inc. ++ Copyright (C) 2006-2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -397,6 +397,8 @@ + unsigned int has_pclmul = 0, has_abm = 0, has_lwp = 0; + unsigned int has_fma = 0, has_fma4 = 0, has_xop = 0; + unsigned int has_bmi = 0, has_tbm = 0; ++ unsigned int has_rdrnd = 0, has_f16c = 0, has_fsgsbase = 0; ++ unsigned int has_osxsave = 0; + + bool arch; + +@@ -438,12 +440,15 @@ + has_sse4_1 = ecx & bit_SSE4_1; + has_sse4_2 = ecx & bit_SSE4_2; + has_avx = ecx & bit_AVX; ++ has_osxsave = ecx & bit_OSXSAVE; + has_cmpxchg16b = ecx & bit_CMPXCHG16B; + has_movbe = ecx & bit_MOVBE; + has_popcnt = ecx & bit_POPCNT; + has_aes = ecx & bit_AES; + has_pclmul = ecx & bit_PCLMUL; + has_fma = ecx & bit_FMA; ++ has_f16c = ecx & bit_F16C; ++ has_rdrnd = ecx & bit_RDRND; + + has_cmpxchg8b = edx & bit_CMPXCHG8B; + has_cmov = edx & bit_CMOV; +@@ -451,6 +456,33 @@ + has_sse = edx & bit_SSE; + has_sse2 = edx & bit_SSE2; + ++ if (max_level >= 7) ++ { ++ __cpuid_count (7, 0, eax, ebx, ecx, edx); ++ ++ has_fsgsbase = ebx & bit_FSGSBASE; ++ } ++ ++ /* Get XCR_XFEATURE_ENABLED_MASK register with xgetbv. */ ++#define XCR_XFEATURE_ENABLED_MASK 0x0 ++#define XSTATE_FP 0x1 ++#define XSTATE_SSE 0x2 ++#define XSTATE_YMM 0x4 ++ if (has_osxsave) ++ asm (".byte 0x0f; .byte 0x01; .byte 0xd0" ++ : "=a" (eax), "=d" (edx) ++ : "c" (XCR_XFEATURE_ENABLED_MASK)); ++ ++ /* Check if SSE and YMM states are supported. */ ++ if (!has_osxsave ++ || (eax & (XSTATE_SSE | XSTATE_YMM)) != (XSTATE_SSE | XSTATE_YMM)) ++ { ++ has_avx = 0; ++ has_fma = 0; ++ has_fma4 = 0; ++ has_xop = 0; ++ } ++ + /* Check cpuid level of extended features. */ + __cpuid (0x80000000, ext_level, ebx, ecx, edx); + +@@ -711,10 +743,13 @@ + const char *avx = has_avx ? " -mavx" : " -mno-avx"; + const char *sse4_2 = has_sse4_2 ? " -msse4.2" : " -mno-sse4.2"; + const char *sse4_1 = has_sse4_1 ? " -msse4.1" : " -mno-sse4.1"; ++ const char *rdrnd = has_rdrnd ? " -mrdrnd" : " -mno-rdrnd"; ++ const char *f16c = has_f16c ? " -mf16c" : " -mno-f16c"; ++ const char *fsgsbase = has_fsgsbase ? " -mfsgsbase" : " -mno-fsgsbase"; + + options = concat (options, cx16, sahf, movbe, ase, pclmul, + popcnt, abm, lwp, fma, fma4, xop, bmi, tbm, +- avx, sse4_2, sse4_1, NULL); ++ avx, sse4_2, sse4_1, rdrnd, f16c, fsgsbase, NULL); + } + + done: +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.c gcc-4.6.3/gcc/config/i386/i386.c +--- gcc-4.6.3.orig/gcc/config/i386/i386.c 2012-02-22 13:17:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386.c 2012-05-22 04:20:15.992160000 -0500 +@@ -46,6 +46,7 @@ + #include "target.h" + #include "target-def.h" + #include "langhooks.h" ++#include "reload.h" + #include "cgraph.h" + #include "gimple.h" + #include "dwarf2.h" +@@ -2094,7 +2095,7 @@ + /* Feature tests against the various architecture variations, used to create + ix86_arch_features based on the processor mask. */ + static unsigned int initial_ix86_arch_features[X86_ARCH_LAST] = { +- /* X86_ARCH_CMOVE: Conditional move was added for pentiumpro. */ ++ /* X86_ARCH_CMOV: Conditional move was added for pentiumpro. */ + ~(m_386 | m_486 | m_PENT | m_K6), + + /* X86_ARCH_CMPXCHG: Compare and exchange was added for 80486. */ +@@ -3811,7 +3812,7 @@ + -mtune (rather than -march) points us to a processor that has them. + However, the VIA C3 gives a SIGILL, so we only do that for i686 and + higher processors. */ +- if (TARGET_CMOVE ++ if (TARGET_CMOV + && (processor_alias_table[i].flags & (PTA_PREFETCH_SSE | PTA_SSE))) + x86_prefetch_sse = true; + break; +@@ -4181,12 +4182,6 @@ + target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; + } + +- /* For sane SSE instruction set generation we need fcomi instruction. +- It is safe to enable all CMOVE instructions. Also, RDRAND intrinsic +- expands to a sequence that includes conditional move. */ +- if (TARGET_SSE || TARGET_RDRND) +- TARGET_CMOVE = 1; +- + /* Figure out what ASM_GENERATE_INTERNAL_LABEL builds as a prefix. */ + { + char *p; +@@ -12168,6 +12163,64 @@ + return false; + } + ++/* Our implementation of LEGITIMIZE_RELOAD_ADDRESS. Returns a value to ++ replace the input X, or the original X if no replacement is called for. ++ The output parameter *WIN is 1 if the calling macro should goto WIN, ++ 0 if it should not. */ ++ ++bool ++ix86_legitimize_reload_address (rtx x, ++ enum machine_mode mode ATTRIBUTE_UNUSED, ++ int opnum, int type, ++ int ind_levels ATTRIBUTE_UNUSED) ++{ ++ /* Reload can generate: ++ ++ (plus:DI (plus:DI (unspec:DI [(const_int 0 [0])] UNSPEC_TP) ++ (reg:DI 97)) ++ (reg:DI 2 cx)) ++ ++ This RTX is rejected from ix86_legitimate_address_p due to ++ non-strictness of base register 97. Following this rejection, ++ reload pushes all three components into separate registers, ++ creating invalid memory address RTX. ++ ++ Following code reloads only the invalid part of the ++ memory address RTX. */ ++ ++ if (GET_CODE (x) == PLUS ++ && REG_P (XEXP (x, 1)) ++ && GET_CODE (XEXP (x, 0)) == PLUS ++ && REG_P (XEXP (XEXP (x, 0), 1))) ++ { ++ rtx base, index; ++ bool something_reloaded = false; ++ ++ base = XEXP (XEXP (x, 0), 1); ++ if (!REG_OK_FOR_BASE_STRICT_P (base)) ++ { ++ push_reload (base, NULL_RTX, &XEXP (XEXP (x, 0), 1), NULL, ++ BASE_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0, ++ opnum, (enum reload_type)type); ++ something_reloaded = true; ++ } ++ ++ index = XEXP (x, 1); ++ if (!REG_OK_FOR_INDEX_STRICT_P (index)) ++ { ++ push_reload (index, NULL_RTX, &XEXP (x, 1), NULL, ++ INDEX_REG_CLASS, GET_MODE (x), VOIDmode, 0, 0, ++ opnum, (enum reload_type)type); ++ something_reloaded = true; ++ } ++ ++ gcc_assert (something_reloaded); ++ return true; ++ } ++ ++ return false; ++} ++ + /* Recognizes RTL expressions that are valid memory addresses for an + instruction. The MODE argument is the machine mode for the MEM + expression that wants to use this address. +@@ -27177,8 +27230,8 @@ + arg_adjust = 0; + if (optimize + || target == 0 +- || GET_MODE (target) != tmode +- || !insn_p->operand[0].predicate (target, tmode)) ++ || !register_operand (target, tmode) ++ || GET_MODE (target) != tmode) + target = gen_reg_rtx (tmode); + } + +@@ -31377,9 +31430,9 @@ + tmp = gen_reg_rtx (GET_MODE_INNER (mode)); + ix86_expand_vector_extract (true, tmp, target, 1 - elt); + if (elt == 0) +- tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); +- else + tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); ++ else ++ tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); + emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + return; + } +@@ -31393,9 +31446,9 @@ + tmp = gen_reg_rtx (GET_MODE_INNER (mode)); + ix86_expand_vector_extract (false, tmp, target, 1 - elt); + if (elt == 0) +- tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); +- else + tmp = gen_rtx_VEC_CONCAT (mode, val, tmp); ++ else ++ tmp = gen_rtx_VEC_CONCAT (mode, tmp, val); + emit_insn (gen_rtx_SET (VOIDmode, target, tmp)); + return; + +@@ -32823,7 +32876,8 @@ + return ix86_cost->cond_not_taken_branch_cost; + + case vec_perm: +- return 1; ++ case vec_promote_demote: ++ return ix86_cost->vec_stmt_cost; + + default: + gcc_unreachable (); +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.h gcc-4.6.3/gcc/config/i386/i386.h +--- gcc-4.6.3.orig/gcc/config/i386/i386.h 2011-06-29 15:15:32.000000000 -0500 ++++ gcc-4.6.3/gcc/config/i386/i386.h 2012-05-04 12:48:56.810029000 -0500 +@@ -424,7 +424,7 @@ + + /* Feature tests against the various architecture variations. */ + enum ix86_arch_indices { +- X86_ARCH_CMOVE, /* || TARGET_SSE */ ++ X86_ARCH_CMOV, + X86_ARCH_CMPXCHG, + X86_ARCH_CMPXCHG8B, + X86_ARCH_XADD, +@@ -435,12 +435,17 @@ + + extern unsigned char ix86_arch_features[X86_ARCH_LAST]; + +-#define TARGET_CMOVE ix86_arch_features[X86_ARCH_CMOVE] ++#define TARGET_CMOV ix86_arch_features[X86_ARCH_CMOV] + #define TARGET_CMPXCHG ix86_arch_features[X86_ARCH_CMPXCHG] + #define TARGET_CMPXCHG8B ix86_arch_features[X86_ARCH_CMPXCHG8B] + #define TARGET_XADD ix86_arch_features[X86_ARCH_XADD] + #define TARGET_BSWAP ix86_arch_features[X86_ARCH_BSWAP] + ++/* For sane SSE instruction set generation we need fcomi instruction. ++ It is safe to enable all CMOVE instructions. Also, RDRAND intrinsic ++ expands to a sequence that includes conditional move. */ ++#define TARGET_CMOVE (TARGET_CMOV || TARGET_SSE || TARGET_RDRND) ++ + #define TARGET_FISTTP (TARGET_SSE3 && TARGET_80387) + + extern int x86_prefetch_sse; +@@ -1668,6 +1673,17 @@ + + #define LEGITIMATE_CONSTANT_P(X) legitimate_constant_p (X) + ++/* Try a machine-dependent way of reloading an illegitimate address ++ operand. If we find one, push the reload and jump to WIN. This ++ macro is used in only one place: `find_reloads_address' in reload.c. */ ++ ++#define LEGITIMIZE_RELOAD_ADDRESS(X, MODE, OPNUM, TYPE, INDL, WIN) \ ++do { \ ++ if (ix86_legitimize_reload_address ((X), (MODE), (OPNUM), \ ++ (int)(TYPE), (INDL))) \ ++ goto WIN; \ ++} while (0) ++ + /* If defined, a C expression to determine the base term of address X. + This macro is used in only one place: `find_base_term' in alias.c. + +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386.md gcc-4.6.3/gcc/config/i386/i386.md +--- gcc-4.6.3.orig/gcc/config/i386/i386.md 2012-01-12 04:33:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386.md 2012-05-21 07:59:53.696085000 -0500 +@@ -233,9 +233,6 @@ + + ;; For BMI support + UNSPEC_BEXTR +- +- ;; For RDRAND support +- UNSPEC_RDRAND + ]) + + (define_c_enum "unspecv" [ +@@ -270,6 +267,9 @@ + UNSPECV_WRFSBASE + UNSPECV_WRGSBASE + UNSPECV_SPLIT_STACK_RETURN ++ ++ ;; For RDRAND support ++ UNSPECV_RDRAND + ]) + + ;; Constants to represent pcomtrue/pcomfalse variants +@@ -16349,7 +16349,8 @@ + (define_insn "*x86_mov<mode>cc_0_m1_neg" + [(set (match_operand:SWI48 0 "register_operand" "=r") + (neg:SWI48 (match_operator 1 "ix86_carry_flag_operator" +- [(reg FLAGS_REG) (const_int 0)])))] ++ [(reg FLAGS_REG) (const_int 0)]))) ++ (clobber (reg:CC FLAGS_REG))] + "" + "sbb{<imodesuffix>}\t%0, %0" + [(set_attr "type" "alu") +@@ -18357,9 +18358,9 @@ + + (define_insn "rdrand<mode>_1" + [(set (match_operand:SWI248 0 "register_operand" "=r") +- (unspec:SWI248 [(const_int 0)] UNSPEC_RDRAND)) ++ (unspec_volatile:SWI248 [(const_int 0)] UNSPECV_RDRAND)) + (set (reg:CCC FLAGS_REG) +- (unspec:CCC [(const_int 0)] UNSPEC_RDRAND))] ++ (unspec_volatile:CCC [(const_int 0)] UNSPECV_RDRAND))] + "TARGET_RDRND" + "rdrand\t%0" + [(set_attr "type" "other") +diff -Naur gcc-4.6.3.orig/gcc/config/i386/i386-protos.h gcc-4.6.3/gcc/config/i386/i386-protos.h +--- gcc-4.6.3.orig/gcc/config/i386/i386-protos.h 2011-01-13 14:01:57.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/i386-protos.h 2012-03-29 14:19:26.420040000 -0500 +@@ -59,7 +59,8 @@ + extern bool constant_address_p (rtx); + extern bool legitimate_pic_operand_p (rtx); + extern bool legitimate_pic_address_disp_p (rtx); +- ++extern bool ix86_legitimize_reload_address (rtx, enum machine_mode, ++ int, int, int); + extern void print_reg (rtx, int, FILE*); + extern void ix86_print_operand (FILE *, rtx, int); + +diff -Naur gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h gcc-4.6.3/gcc/config/i386/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/config/i386/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for AMD x86-64 and x86. +- Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2009, 2010, 2012 Free Software Foundation, ++ Inc. + + This file is part of GCC. + +@@ -133,9 +134,9 @@ + { + struct rt_sigframe { + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +diff -Naur gcc-4.6.3.orig/gcc/config/i386/sse.md gcc-4.6.3/gcc/config/i386/sse.md +--- gcc-4.6.3.orig/gcc/config/i386/sse.md 2011-10-27 16:55:22.000000000 -0500 ++++ gcc-4.6.3/gcc/config/i386/sse.md 2012-06-17 09:09:00.121097000 -0500 +@@ -392,18 +392,7 @@ + DONE; + }) + +-(define_expand "avx_movu<ssemodesuffix><avxmodesuffix>" +- [(set (match_operand:AVXMODEF2P 0 "nonimmediate_operand" "") +- (unspec:AVXMODEF2P +- [(match_operand:AVXMODEF2P 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "AVX_VEC_FLOAT_MODE_P (<MODE>mode)" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*avx_movu<ssemodesuffix><avxmodesuffix>" ++(define_insn "avx_movu<ssemodesuffix><avxmodesuffix>" + [(set (match_operand:AVXMODEF2P 0 "nonimmediate_operand" "=x,m") + (unspec:AVXMODEF2P + [(match_operand:AVXMODEF2P 1 "nonimmediate_operand" "xm,x")] +@@ -429,18 +418,7 @@ + (set_attr "prefix" "maybe_vex") + (set_attr "mode" "TI")]) + +-(define_expand "<sse>_movu<ssemodesuffix>" +- [(set (match_operand:SSEMODEF2P 0 "nonimmediate_operand" "") +- (unspec:SSEMODEF2P +- [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "SSE_VEC_FLOAT_MODE_P (<MODE>mode)" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*<sse>_movu<ssemodesuffix>" ++(define_insn "<sse>_movu<ssemodesuffix>" + [(set (match_operand:SSEMODEF2P 0 "nonimmediate_operand" "=x,m") + (unspec:SSEMODEF2P + [(match_operand:SSEMODEF2P 1 "nonimmediate_operand" "xm,x")] +@@ -452,18 +430,7 @@ + (set_attr "movu" "1") + (set_attr "mode" "<MODE>")]) + +-(define_expand "avx_movdqu<avxmodesuffix>" +- [(set (match_operand:AVXMODEQI 0 "nonimmediate_operand" "") +- (unspec:AVXMODEQI +- [(match_operand:AVXMODEQI 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "TARGET_AVX" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (<MODE>mode, operands[1]); +-}) +- +-(define_insn "*avx_movdqu<avxmodesuffix>" ++(define_insn "avx_movdqu<avxmodesuffix>" + [(set (match_operand:AVXMODEQI 0 "nonimmediate_operand" "=x,m") + (unspec:AVXMODEQI + [(match_operand:AVXMODEQI 1 "nonimmediate_operand" "xm,x")] +@@ -475,17 +442,7 @@ + (set_attr "prefix" "vex") + (set_attr "mode" "<avxvecmode>")]) + +-(define_expand "sse2_movdqu" +- [(set (match_operand:V16QI 0 "nonimmediate_operand" "") +- (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "")] +- UNSPEC_MOVU))] +- "TARGET_SSE2" +-{ +- if (MEM_P (operands[0]) && MEM_P (operands[1])) +- operands[1] = force_reg (V16QImode, operands[1]); +-}) +- +-(define_insn "*sse2_movdqu" ++(define_insn "sse2_movdqu" + [(set (match_operand:V16QI 0 "nonimmediate_operand" "=x,m") + (unspec:V16QI [(match_operand:V16QI 1 "nonimmediate_operand" "xm,x")] + UNSPEC_MOVU))] +@@ -1324,14 +1281,14 @@ + (parallel [(const_int 0)])) + (vec_select:DF (match_dup 1) (parallel [(const_int 1)]))) + (plusminus:DF +- (vec_select:DF (match_dup 1) (parallel [(const_int 2)])) +- (vec_select:DF (match_dup 1) (parallel [(const_int 3)])))) +- (vec_concat:V2DF +- (plusminus:DF + (vec_select:DF + (match_operand:V4DF 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) +- (vec_select:DF (match_dup 2) (parallel [(const_int 1)]))) ++ (vec_select:DF (match_dup 2) (parallel [(const_int 1)])))) ++ (vec_concat:V2DF ++ (plusminus:DF ++ (vec_select:DF (match_dup 1) (parallel [(const_int 2)])) ++ (vec_select:DF (match_dup 1) (parallel [(const_int 3)]))) + (plusminus:DF + (vec_select:DF (match_dup 2) (parallel [(const_int 2)])) + (vec_select:DF (match_dup 2) (parallel [(const_int 3)]))))))] +@@ -5058,7 +5015,7 @@ + (vec_select:DF (match_dup 0) (parallel [(const_int 1)]))))] + "TARGET_SSE2 && reload_completed" + [(set (match_dup 0) (match_dup 1))] +- "operands[0] = adjust_address (operands[0], DFmode, 8);") ++ "operands[0] = adjust_address (operands[0], DFmode, 0);") + + ;; Not sure these two are ever used, but it doesn't hurt to have + ;; them. -aoliva +@@ -12095,7 +12052,7 @@ + (unspec:V8SF [(match_operand:V8HI 1 "register_operand" "x")] + UNSPEC_VCVTPH2PS) + (parallel [(const_int 0) (const_int 1) +- (const_int 1) (const_int 2)])))] ++ (const_int 2) (const_int 3)])))] + "TARGET_F16C" + "vcvtph2ps\t{%1, %0|%0, %1}" + [(set_attr "type" "ssecvt") +diff -Naur gcc-4.6.3.orig/gcc/config/ia64/linux-unwind.h gcc-4.6.3/gcc/config/ia64/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/ia64/linux-unwind.h 2009-08-14 15:49:40.000000000 -0500 ++++ gcc-4.6.3/gcc/config/ia64/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for IA64 Linux. +- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -47,7 +47,7 @@ + struct sigframe { + char scratch[16]; + unsigned long sig_number; +- struct siginfo *info; ++ siginfo_t *info; + struct sigcontext *sc; + } *frame_ = (struct sigframe *)context->psp; + struct sigcontext *sc = frame_->sc; +@@ -137,7 +137,7 @@ + struct sigframe { + char scratch[16]; + unsigned long sig_number; +- struct siginfo *info; ++ siginfo_t *info; + struct sigcontext *sc; + } *frame = (struct sigframe *)context->psp; + struct sigcontext *sc = frame->sc; +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/m32c.c gcc-4.6.3/gcc/config/m32c/m32c.c +--- gcc-4.6.3.orig/gcc/config/m32c/m32c.c 2011-02-10 13:41:26.000000000 -0600 ++++ gcc-4.6.3/gcc/config/m32c/m32c.c 2012-03-28 21:15:29.973365000 -0500 +@@ -447,7 +447,7 @@ + flag_ivopts = 0; + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + /* r8c/m16c have no 16-bit indirect call, so thunks are involved. +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/muldiv.md gcc-4.6.3/gcc/config/m32c/muldiv.md +--- gcc-4.6.3.orig/gcc/config/m32c/muldiv.md 2007-08-02 05:49:31.000000000 -0500 ++++ gcc-4.6.3/gcc/config/m32c/muldiv.md 2012-10-17 20:50:24.536874000 -0500 +@@ -108,7 +108,7 @@ + (define_insn "umulhisi3_c" + [(set (match_operand:SI 0 "ra_operand" "=Rsi") + (mult:SI (zero_extend:SI (match_operand:HI 1 "mra_operand" "%0")) +- (match_operand 2 "immediate_operand" "i")))] ++ (match_operand 2 "m32c_const_u16_operand" "i")))] + "" + "mulu.w\t%u2,%1" + [(set_attr "flags" "o")] +diff -Naur gcc-4.6.3.orig/gcc/config/m32c/predicates.md gcc-4.6.3/gcc/config/m32c/predicates.md +--- gcc-4.6.3.orig/gcc/config/m32c/predicates.md 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/config/m32c/predicates.md 2012-10-18 00:56:54.834308000 -0500 +@@ -293,3 +293,7 @@ + (define_predicate "m32c_1mask16_operand" + (and (match_operand 0 "const_int_operand") + (match_test "m32c_const_ok_for_constraint_p(INTVAL(op), 'I', \"Imw\")"))) ++ ++(define_predicate "m32c_const_u16_operand" ++ (and (match_operand 0 "const_int_operand") ++ (match_test "INTVAL (op) >= 0 && INTVAL (op) <= 65535"))) +diff -Naur gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h gcc-4.6.3/gcc/config/mips/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/mips/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for MIPS Linux. +- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software ++ Foundation, Inc. + + This file is part of GCC. + +@@ -75,7 +76,7 @@ + struct rt_sigframe { + u_int32_t ass[4]; /* Argument save space for o32. */ + u_int32_t trampoline[2]; +- struct siginfo info; ++ siginfo_t info; + _sig_ucontext_t uc; + } *rt_ = context->cfa; + sc = &rt_->uc.uc_mcontext; +diff -Naur gcc-4.6.3.orig/gcc/config/mips/mips.c gcc-4.6.3/gcc/config/mips/mips.c +--- gcc-4.6.3.orig/gcc/config/mips/mips.c 2011-05-29 12:48:14.000000000 -0500 ++++ gcc-4.6.3/gcc/config/mips/mips.c 2012-09-02 05:37:49.951074000 -0500 +@@ -15083,7 +15083,10 @@ + } + + if (optimize > 0 && flag_delayed_branch) +- dbr_schedule (get_insns ()); ++ { ++ cleanup_barriers (); ++ dbr_schedule (get_insns ()); ++ } + mips_reorg_process_insns (); + if (!TARGET_MIPS16 + && TARGET_EXPLICIT_RELOCS +diff -Naur gcc-4.6.3.orig/gcc/config/mn10300/mn10300.c gcc-4.6.3/gcc/config/mn10300/mn10300.c +--- gcc-4.6.3.orig/gcc/config/mn10300/mn10300.c 2011-02-15 11:09:39.000000000 -0600 ++++ gcc-4.6.3/gcc/config/mn10300/mn10300.c 2012-07-06 05:09:28.333336000 -0500 +@@ -2505,12 +2505,15 @@ + may access it using GOTOFF instead of GOT. */ + + static void +-mn10300_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED) ++mn10300_encode_section_info (tree decl, rtx rtl, int first) + { + rtx symbol; + ++ default_encode_section_info (decl, rtl, first); ++ + if (! MEM_P (rtl)) + return; ++ + symbol = XEXP (rtl, 0); + if (GET_CODE (symbol) != SYMBOL_REF) + return; +diff -Naur gcc-4.6.3.orig/gcc/config/pa/linux-unwind.h gcc-4.6.3/gcc/config/pa/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/pa/linux-unwind.h 2009-12-05 11:45:59.000000000 -0600 ++++ gcc-4.6.3/gcc/config/pa/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for PA Linux. +- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -63,7 +63,7 @@ + int i; + struct sigcontext *sc; + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *frame; + +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.c gcc-4.6.3/gcc/config/pa/pa.c +--- gcc-4.6.3.orig/gcc/config/pa/pa.c 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.c 2012-06-16 20:33:06.931030000 -0500 +@@ -185,6 +185,7 @@ + static void pa_conditional_register_usage (void); + static enum machine_mode pa_c_mode_for_suffix (char); + static section *pa_function_section (tree, enum node_frequency, bool, bool); ++static unsigned int pa_section_type_flags (tree, const char *, int); + + /* The following extra sections are only used for SOM. */ + static GTY(()) section *som_readonly_data_section; +@@ -400,6 +401,9 @@ + #undef TARGET_ASM_FUNCTION_SECTION + #define TARGET_ASM_FUNCTION_SECTION pa_function_section + ++#undef TARGET_SECTION_TYPE_FLAGS ++#define TARGET_SECTION_TYPE_FLAGS pa_section_type_flags ++ + struct gcc_target targetm = TARGET_INITIALIZER; + + /* Parse the -mfixed-range= option string. */ +@@ -4442,6 +4446,24 @@ + } + } + ++bool ++pa_can_use_return_insn (void) ++{ ++ if (!reload_completed) ++ return false; ++ ++ if (frame_pointer_needed) ++ return false; ++ ++ if (df_regs_ever_live_p (2)) ++ return false; ++ ++ if (crtl->profile) ++ return false; ++ ++ return compute_frame_size (get_frame_size (), 0) == 0; ++} ++ + rtx + hppa_pic_save_rtx (void) + { +@@ -4586,7 +4608,7 @@ + rtx saved_rp; + rtx ins; + +- /* Instruction stream at the normal return address for the export stub: ++ /* The instruction stream at the return address of a PA1.X export stub is: + + 0x4bc23fd1 | stub+8: ldw -18(sr0,sp),rp + 0x004010a1 | stub+12: ldsid (sr0,rp),r1 +@@ -4594,10 +4616,16 @@ + 0xe0400002 | stub+20: be,n 0(sr0,rp) + + 0xe0400002 must be specified as -532676606 so that it won't be +- rejected as an invalid immediate operand on 64-bit hosts. */ ++ rejected as an invalid immediate operand on 64-bit hosts. + +- HOST_WIDE_INT insns[4] = {0x4bc23fd1, 0x004010a1, 0x00011820, -532676606}; +- int i; ++ The instruction stream at the return address of a PA2.0 export stub is: ++ ++ 0x4bc23fd1 | stub+8: ldw -18(sr0,sp),rp ++ 0xe840d002 | stub+12: bve,n (rp) ++ */ ++ ++ HOST_WIDE_INT insns[4]; ++ int i, len; + + if (count != 0) + return NULL_RTX; +@@ -4620,11 +4648,26 @@ + ins = copy_to_reg (gen_rtx_AND (Pmode, rp, MASK_RETURN_ADDR)); + label = gen_label_rtx (); + ++ if (TARGET_PA_20) ++ { ++ insns[0] = 0x4bc23fd1; ++ insns[1] = -398405630; ++ len = 2; ++ } ++ else ++ { ++ insns[0] = 0x4bc23fd1; ++ insns[1] = 0x004010a1; ++ insns[2] = 0x00011820; ++ insns[3] = -532676606; ++ len = 4; ++ } ++ + /* Check the instruction stream at the normal return address for the + export stub. If it is an export stub, than our return address is + really in -24[frameaddr]. */ + +- for (i = 0; i < 3; i++) ++ for (i = 0; i < len; i++) + { + rtx op0 = gen_rtx_MEM (SImode, plus_constant (ins, i * 4)); + rtx op1 = GEN_INT (insns[i]); +@@ -7501,7 +7544,7 @@ + return 24; + else + { +- if (!TARGET_LONG_CALLS && distance < 240000) ++ if (!TARGET_LONG_CALLS && distance < MAX_PCREL17F_OFFSET) + return 8; + + if (TARGET_LONG_ABS_CALL && !flag_pic) +@@ -7714,7 +7757,7 @@ + /* pc-relative branch. */ + if (!TARGET_LONG_CALLS + && ((TARGET_PA_20 && !sibcall && distance < 7600000) +- || distance < 240000)) ++ || distance < MAX_PCREL17F_OFFSET)) + length += 8; + + /* 64-bit plabel sequence. */ +@@ -8073,7 +8116,7 @@ + if (TARGET_FAST_INDIRECT_CALLS + || (!TARGET_PORTABLE_RUNTIME + && ((TARGET_PA_20 && !TARGET_SOM && distance < 7600000) +- || distance < 240000))) ++ || distance < MAX_PCREL17F_OFFSET))) + return 8; + + if (flag_pic) +@@ -10392,4 +10435,23 @@ + return default_function_section (decl, freq, startup, exit); + } + ++/* Implement TARGET_SECTION_TYPE_FLAGS. */ ++ ++static unsigned int ++pa_section_type_flags (tree decl, const char *name, int reloc) ++{ ++ unsigned int flags; ++ ++ flags = default_section_type_flags (decl, name, reloc); ++ ++ /* Function labels are placed in the constant pool. This can ++ cause a section conflict if decls are put in ".data.rel.ro" ++ or ".data.rel.ro.local" using the __attribute__ construct. */ ++ if (strcmp (name, ".data.rel.ro") == 0 ++ || strcmp (name, ".data.rel.ro.local") == 0) ++ flags |= SECTION_WRITE | SECTION_RELRO; ++ ++ return flags; ++} ++ + #include "gt-pa.h" +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.h gcc-4.6.3/gcc/config/pa/pa.h +--- gcc-4.6.3.orig/gcc/config/pa/pa.h 2011-10-29 15:19:38.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.h 2012-06-16 20:33:06.931030000 -0500 +@@ -1563,3 +1563,12 @@ + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true + #endif ++ ++/* The maximum offset in bytes for a PA 1.X pc-relative call to the ++ head of the preceding stub table. The selected offsets have been ++ chosen so that approximately one call stub is allocated for every ++ 86.7 instructions. A long branch stub is two instructions when ++ not generating PIC code. For HP-UX and ELF targets, PIC stubs are ++ seven and four instructions, respectively. */ ++#define MAX_PCREL17F_OFFSET \ ++ (flag_pic ? (TARGET_HPUX ? 198164 : 221312) : 240000) +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa.md gcc-4.6.3/gcc/config/pa/pa.md +--- gcc-4.6.3.orig/gcc/config/pa/pa.md 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa.md 2012-10-10 11:24:22.028351000 -0500 +@@ -2879,15 +2879,17 @@ + [(set_attr "type" "store") + (set_attr "length" "4")]) + +-(define_insn "" +- [(set (match_operand:HI 0 "register_operand" "=r") +- (plus:HI (match_operand:HI 1 "register_operand" "r") +- (match_operand 2 "const_int_operand" "J")))] ++(define_insn "addhi3" ++ [(set (match_operand:HI 0 "register_operand" "=r,r") ++ (plus:HI (match_operand:HI 1 "register_operand" "%r,r") ++ (match_operand:HI 2 "arith_operand" "r,J")))] + "" +- "ldo %2(%1),%0" +- [(set_attr "type" "binary") ++ "@ ++ {addl|add,l} %1,%2,%0 ++ ldo %2(%1),%0" ++ [(set_attr "type" "binary,binary") + (set_attr "pa_combine_type" "addmove") +- (set_attr "length" "4")]) ++ (set_attr "length" "4,4")]) + + (define_expand "movqi" + [(set (match_operand:QI 0 "general_operand" "") +@@ -6348,7 +6350,7 @@ + "" + "* + { +- int x = INTVAL (operands[1]); ++ unsigned HOST_WIDE_INT x = UINTVAL (operands[1]); + operands[2] = GEN_INT (4 + exact_log2 ((x >> 4) + 1)); + operands[1] = GEN_INT ((x & 0xf) - 0x10); + return \"{zvdepi %1,%2,%0|depwi,z %1,%%sar,%2,%0}\"; +@@ -6366,7 +6368,7 @@ + "exact_log2 (INTVAL (operands[1]) + 1) > 0" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 (x + 1)); + return \"{vdepi -1,%2,%0|depwi -1,%%sar,%2,%0}\"; + }" +@@ -6383,7 +6385,7 @@ + "INTVAL (operands[1]) == -2" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 ((~x) + 1)); + return \"{vdepi 0,%2,%0|depwi 0,%%sar,%2,%0}\"; + }" +@@ -6447,7 +6449,7 @@ + "TARGET_64BIT" + "* + { +- int x = INTVAL (operands[1]); ++ unsigned HOST_WIDE_INT x = UINTVAL (operands[1]); + operands[2] = GEN_INT (4 + exact_log2 ((x >> 4) + 1)); + operands[1] = GEN_INT ((x & 0x1f) - 0x20); + return \"depdi,z %1,%%sar,%2,%0\"; +@@ -6465,7 +6467,7 @@ + "TARGET_64BIT && exact_log2 (INTVAL (operands[1]) + 1) > 0" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 (x + 1)); + return \"depdi -1,%%sar,%2,%0\"; + }" +@@ -6482,7 +6484,7 @@ + "TARGET_64BIT && INTVAL (operands[1]) == -2" + "* + { +- int x = INTVAL (operands[1]); ++ HOST_WIDE_INT x = INTVAL (operands[1]); + operands[2] = GEN_INT (exact_log2 ((~x) + 1)); + return \"depdi 0,%%sar,%2,%0\"; + }" +@@ -6671,6 +6673,20 @@ + + ;; Unconditional and other jump instructions. + ++;; Trivial return used when no epilogue is needed. ++(define_insn "return" ++ [(return) ++ (use (reg:SI 2))] ++ "pa_can_use_return_insn ()" ++ "* ++{ ++ if (TARGET_PA_20) ++ return \"bve%* (%%r2)\"; ++ return \"bv%* %%r0(%%r2)\"; ++}" ++ [(set_attr "type" "branch") ++ (set_attr "length" "4")]) ++ + ;; This is used for most returns. + (define_insn "return_internal" + [(return) +@@ -6719,11 +6735,8 @@ + rtx x; + + /* Try to use the trivial return first. Else use the full epilogue. */ +- if (reload_completed +- && !frame_pointer_needed +- && !df_regs_ever_live_p (2) +- && (compute_frame_size (get_frame_size (), 0) ? 0 : 1)) +- x = gen_return_internal (); ++ if (pa_can_use_return_insn ()) ++ x = gen_return (); + else + { + hppa_expand_epilogue (); +diff -Naur gcc-4.6.3.orig/gcc/config/pa/pa-protos.h gcc-4.6.3/gcc/config/pa/pa-protos.h +--- gcc-4.6.3.orig/gcc/config/pa/pa-protos.h 2011-10-29 16:40:55.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/pa-protos.h 2012-03-12 12:08:20.095334000 -0500 +@@ -136,6 +136,7 @@ + extern int cint_ok_for_move (HOST_WIDE_INT); + extern void hppa_expand_prologue (void); + extern void hppa_expand_epilogue (void); ++extern bool pa_can_use_return_insn (void); + extern int ior_mask_p (unsigned HOST_WIDE_INT); + extern void compute_zdepdi_operands (unsigned HOST_WIDE_INT, + unsigned *); +diff -Naur gcc-4.6.3.orig/gcc/config/pa/predicates.md gcc-4.6.3/gcc/config/pa/predicates.md +--- gcc-4.6.3.orig/gcc/config/pa/predicates.md 2011-04-20 18:36:20.000000000 -0500 ++++ gcc-4.6.3/gcc/config/pa/predicates.md 2012-03-04 10:23:26.705142000 -0600 +@@ -421,9 +421,9 @@ + (ior (match_operand 0 "register_operand") + (match_operand 0 "cint_ior_operand"))) + +-;; True iff OP is a CONST_INT of the forms 0...0xxxx or +-;; 0...01...1xxxx. Such values can be the left hand side x in (x << +-;; r), using the zvdepi instruction. ++;; True iff OP is a CONST_INT of the forms 0...0xxxx, 0...01...1xxxx, ++;; or 1...1xxxx. Such values can be the left hand side x in (x << r), ++;; using the zvdepi instruction. + + (define_predicate "lhs_lshift_cint_operand" + (match_code "const_int") +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/altivec.md gcc-4.6.3/gcc/config/rs6000/altivec.md +--- gcc-4.6.3.orig/gcc/config/rs6000/altivec.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/altivec.md 2012-06-04 12:42:25.267281000 -0500 +@@ -2394,8 +2394,8 @@ + + (define_insn "altivec_stvlx" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVLX)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvlx %1,%y0" +@@ -2403,8 +2403,8 @@ + + (define_insn "altivec_stvlxl" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVLXL)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvlxl %1,%y0" +@@ -2412,8 +2412,8 @@ + + (define_insn "altivec_stvrx" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVRX)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvrx %1,%y0" +@@ -2421,8 +2421,8 @@ + + (define_insn "altivec_stvrxl" + [(parallel +- [(set (match_operand:V4SI 0 "memory_operand" "=Z") +- (match_operand:V4SI 1 "register_operand" "v")) ++ [(set (match_operand:V16QI 0 "memory_operand" "=Z") ++ (match_operand:V16QI 1 "register_operand" "v")) + (unspec [(const_int 0)] UNSPEC_STVRXL)])] + "TARGET_ALTIVEC && rs6000_cpu == PROCESSOR_CELL" + "stvrxl %1,%y0" +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.c gcc-4.6.3/gcc/config/rs6000/rs6000.c +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.c 2012-02-15 15:17:42.000000000 -0600 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.c 2012-05-24 08:52:56.478084000 -0500 +@@ -3695,12 +3695,23 @@ + case vec_to_scalar: + case scalar_to_vec: + case cond_branch_not_taken: +- case vec_perm: + return 1; + + case cond_branch_taken: + return 3; + ++ case vec_perm: ++ if (TARGET_VSX) ++ return 4; ++ else ++ return 1; ++ ++ case vec_promote_demote: ++ if (TARGET_VSX) ++ return 5; ++ else ++ return 1; ++ + case unaligned_load: + if (TARGET_VSX && TARGET_ALLOW_MOVMISALIGN) + { +@@ -15811,7 +15822,6 @@ + print_operand (FILE *file, rtx x, int code) + { + int i; +- HOST_WIDE_INT val; + unsigned HOST_WIDE_INT uval; + + switch (code) +@@ -16252,34 +16262,17 @@ + + case 'W': + /* MB value for a PowerPC64 rldic operand. */ +- val = (GET_CODE (x) == CONST_INT +- ? INTVAL (x) : CONST_DOUBLE_HIGH (x)); +- +- if (val < 0) +- i = -1; +- else +- for (i = 0; i < HOST_BITS_PER_WIDE_INT; i++) +- if ((val <<= 1) < 0) +- break; ++ i = clz_hwi (GET_CODE (x) == CONST_INT ++ ? INTVAL (x) : CONST_DOUBLE_HIGH (x)); + + #if HOST_BITS_PER_WIDE_INT == 32 +- if (GET_CODE (x) == CONST_INT && i >= 0) ++ if (GET_CODE (x) == CONST_INT && i > 0) + i += 32; /* zero-extend high-part was all 0's */ + else if (GET_CODE (x) == CONST_DOUBLE && i == 32) +- { +- val = CONST_DOUBLE_LOW (x); +- +- gcc_assert (val); +- if (val < 0) +- --i; +- else +- for ( ; i < 64; i++) +- if ((val <<= 1) < 0) +- break; +- } ++ i = clz_hwi (CONST_DOUBLE_LOW (x)) + 32; + #endif + +- fprintf (file, "%d", i + 1); ++ fprintf (file, "%d", i); + return; + + case 'x': +@@ -17229,6 +17222,10 @@ + case EQ: + case GT: + case GTU: ++ case ORDERED: ++ case UNORDERED: ++ case UNEQ: ++ case LTGT: + mask = gen_reg_rtx (mode); + emit_insn (gen_rtx_SET (VOIDmode, + mask, +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.h gcc-4.6.3/gcc/config/rs6000/rs6000.h +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.h 2011-07-27 13:17:15.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.h 2012-04-13 16:55:15.746111000 -0500 +@@ -469,10 +469,11 @@ + /* ISA 2.01 allowed FCFID to be done in 32-bit, previously it was 64-bit only. + Enable 32-bit fcfid's on any of the switches for newer ISA machines or + XILINX. */ +-#define TARGET_FCFID (TARGET_POWERPC64 \ +- || TARGET_POPCNTB /* ISA 2.02 */ \ +- || TARGET_CMPB /* ISA 2.05 */ \ +- || TARGET_POPCNTD /* ISA 2.06 */ \ ++#define TARGET_FCFID (TARGET_POWERPC64 \ ++ || TARGET_PPC_GPOPT /* 970/power4 */ \ ++ || TARGET_POPCNTB /* ISA 2.02 */ \ ++ || TARGET_CMPB /* ISA 2.05 */ \ ++ || TARGET_POPCNTD /* ISA 2.06 */ \ + || TARGET_XILINX_FPU) + + #define TARGET_FCTIDZ TARGET_FCFID +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/rs6000.md gcc-4.6.3/gcc/config/rs6000/rs6000.md +--- gcc-4.6.3.orig/gcc/config/rs6000/rs6000.md 2012-01-18 13:14:48.000000000 -0600 ++++ gcc-4.6.3/gcc/config/rs6000/rs6000.md 2012-05-03 19:31:50.505528000 -0500 +@@ -2524,7 +2524,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2574,7 +2585,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (Pmode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2655,7 +2677,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +@@ -2700,7 +2733,18 @@ + if (GET_CODE (addr1) == PLUS) + { + emit_insn (gen_add3_insn (op2, XEXP (addr1, 0), GEN_INT (4))); +- addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, XEXP (addr1, 1), op2)); ++ addr2 = op2; ++ } ++ else ++ addr2 = gen_rtx_PLUS (SImode, op2, XEXP (addr1, 1)); ++ } ++ else if (TARGET_AVOID_XFORM) ++ { ++ emit_insn (gen_add3_insn (op2, addr1, GEN_INT (4))); ++ addr2 = op2; + } + else + { +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/vector.md gcc-4.6.3/gcc/config/rs6000/vector.md +--- gcc-4.6.3.orig/gcc/config/rs6000/vector.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/vector.md 2012-03-06 13:46:28.829628000 -0600 +@@ -448,6 +448,94 @@ + "VECTOR_UNIT_ALTIVEC_P (<MODE>mode)" + "") + ++(define_insn_and_split "*vector_uneq<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (uneq:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (gt:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (gt:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (not:VEC_F (ior:VEC_F (match_dup 3) ++ (match_dup 4))))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_ltgt<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (ltgt:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (gt:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (gt:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (ior:VEC_F (match_dup 3) ++ (match_dup 4)))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_ordered<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (ordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (ge:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (ge:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (ior:VEC_F (match_dup 3) ++ (match_dup 4)))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ ++(define_insn_and_split "*vector_unordered<mode>" ++ [(set (match_operand:VEC_F 0 "vfloat_operand" "") ++ (unordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "") ++ (match_operand:VEC_F 2 "vfloat_operand" "")))] ++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)" ++ "#" ++ "" ++ [(set (match_dup 3) ++ (ge:VEC_F (match_dup 1) ++ (match_dup 2))) ++ (set (match_dup 4) ++ (ge:VEC_F (match_dup 2) ++ (match_dup 1))) ++ (set (match_dup 0) ++ (not:VEC_F (ior:VEC_F (match_dup 3) ++ (match_dup 4))))] ++ " ++{ ++ operands[3] = gen_reg_rtx (<MODE>mode); ++ operands[4] = gen_reg_rtx (<MODE>mode); ++}") ++ + ;; Note the arguments for __builtin_altivec_vsel are op2, op1, mask + ;; which is in the reverse order that we want + (define_expand "vector_select_<mode>" +diff -Naur gcc-4.6.3.orig/gcc/config/rs6000/vsx.md gcc-4.6.3/gcc/config/rs6000/vsx.md +--- gcc-4.6.3.orig/gcc/config/rs6000/vsx.md 2011-07-08 15:10:18.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rs6000/vsx.md 2012-03-02 16:12:52.237313000 -0600 +@@ -1006,9 +1006,9 @@ + "VECTOR_MEM_VSX_P (<MODE>mode)" + { + if (INTVAL (operands[3]) == 0) +- return \"xxpermdi %x0,%x1,%x2,1\"; ++ return \"xxpermdi %x0,%x2,%x1,1\"; + else if (INTVAL (operands[3]) == 1) +- return \"xxpermdi %x0,%x2,%x1,0\"; ++ return \"xxpermdi %x0,%x1,%x2,0\"; + else + gcc_unreachable (); + } +diff -Naur gcc-4.6.3.orig/gcc/config/rx/rx.c gcc-4.6.3/gcc/config/rx/rx.c +--- gcc-4.6.3.orig/gcc/config/rx/rx.c 2011-05-17 03:59:10.000000000 -0500 ++++ gcc-4.6.3/gcc/config/rx/rx.c 2012-03-28 21:15:29.973365000 -0500 +@@ -2348,7 +2348,7 @@ + rx_option_override (void) + { + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + + rx_override_options_after_change (); +diff -Naur gcc-4.6.3.orig/gcc/config/sh/linux-unwind.h gcc-4.6.3/gcc/config/sh/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/sh/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,6 @@ + /* DWARF2 EH unwinding support for SH Linux. +- Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, ++ Inc. + + This file is part of GCC. + +@@ -80,9 +81,9 @@ + && (*(unsigned long *) (pc+11) == 0x6ff0fff0)) + { + struct rt_sigframe { +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +@@ -179,7 +180,7 @@ + && (*(unsigned short *) (pc+14) == 0x00ad)))) + { + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. +diff -Naur gcc-4.6.3.orig/gcc/config/sh/sh.c gcc-4.6.3/gcc/config/sh/sh.c +--- gcc-4.6.3.orig/gcc/config/sh/sh.c 2011-06-07 23:07:25.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/sh.c 2012-07-22 18:49:56.312817000 -0500 +@@ -763,11 +763,6 @@ + SUBTARGET_OVERRIDE_OPTIONS; + if (optimize > 1 && !optimize_size) + target_flags |= MASK_SAVE_ALL_TARGET_REGS; +- if (flag_finite_math_only == 2) +- flag_finite_math_only +- = !flag_signaling_nans && TARGET_SH2E && ! TARGET_IEEE; +- if (TARGET_SH2E && !flag_finite_math_only) +- target_flags |= MASK_IEEE; + sh_cpu = PROCESSOR_SH1; + assembler_dialect = 0; + if (TARGET_SH2) +@@ -911,8 +906,6 @@ + if (! VALID_REGISTER_P (ADDREGNAMES_REGNO (regno))) + sh_additional_register_names[regno][0] = '\0'; + +- flag_omit_frame_pointer = (PREFERRED_DEBUGGING_TYPE == DWARF2_DEBUG); +- + if ((flag_pic && ! TARGET_PREFERGOT) + || (TARGET_SHMEDIA && !TARGET_PT_FIXED)) + flag_no_function_cse = 1; +@@ -944,22 +937,17 @@ + flag_schedule_insns = 0; + } + +- if ((target_flags_explicit & MASK_ACCUMULATE_OUTGOING_ARGS) == 0) +- target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; +- + /* Unwind info is not correct around the CFG unless either a frame + pointer is present or M_A_O_A is set. Fixing this requires rewriting + unwind info generation to be aware of the CFG and propagating states + around edges. */ + if ((flag_unwind_tables || flag_asynchronous_unwind_tables + || flag_exceptions || flag_non_call_exceptions) +- && flag_omit_frame_pointer +- && !(target_flags & MASK_ACCUMULATE_OUTGOING_ARGS)) ++ && flag_omit_frame_pointer && !TARGET_ACCUMULATE_OUTGOING_ARGS) + { +- if (target_flags_explicit & MASK_ACCUMULATE_OUTGOING_ARGS) + warning (0, "unwind tables currently require either a frame pointer " + "or -maccumulate-outgoing-args for correctness"); +- target_flags |= MASK_ACCUMULATE_OUTGOING_ARGS; ++ TARGET_ACCUMULATE_OUTGOING_ARGS = 1; + } + + /* Unwinding with -freorder-blocks-and-partition does not work on this +@@ -1014,11 +1002,16 @@ + align_functions = min_align; + } + ++ /* If the -mieee option was not explicitly set by the user, turn it on ++ unless -ffinite-math-only was specified. See also PR 33135. */ ++ if (! global_options_set.x_TARGET_IEEE) ++ TARGET_IEEE = ! flag_finite_math_only; ++ + if (sh_fixed_range_str) + sh_fix_range (sh_fixed_range_str); + + /* This target defaults to strict volatile bitfields. */ +- if (flag_strict_volatile_bitfields < 0) ++ if (flag_strict_volatile_bitfields < 0 && abi_version_at_least(2)) + flag_strict_volatile_bitfields = 1; + } + +diff -Naur gcc-4.6.3.orig/gcc/config/sh/sh.opt gcc-4.6.3/gcc/config/sh/sh.opt +--- gcc-4.6.3.orig/gcc/config/sh/sh.opt 2010-10-22 07:14:45.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sh/sh.opt 2012-07-22 18:49:56.312817000 -0500 +@@ -202,7 +202,7 @@ + Generate FPU-less SHcompact code + + maccumulate-outgoing-args +-Target Report Mask(ACCUMULATE_OUTGOING_ARGS) ++Target Report Var(TARGET_ACCUMULATE_OUTGOING_ARGS) Init(1) + Reserve space for outgoing arguments in the function prologue + + madjust-unroll +@@ -270,8 +270,8 @@ + Follow Renesas (formerly Hitachi) / SuperH calling conventions + + mieee +-Target Report Mask(IEEE) +-Increase the IEEE compliance for floating-point code ++Target Var(TARGET_IEEE) ++Increase the IEEE compliance for floating-point comparisons + + mindexed-addressing + Target Report Mask(ALLOW_INDEXED_ADDRESS) Condition(SUPPORT_ANY_SH5_32MEDIA) +diff -Naur gcc-4.6.3.orig/gcc/config/sol2.h gcc-4.6.3/gcc/config/sol2.h +--- gcc-4.6.3.orig/gcc/config/sol2.h 2011-07-15 04:39:41.000000000 -0500 ++++ gcc-4.6.3/gcc/config/sol2.h 2012-08-16 08:21:11.398440000 -0500 +@@ -1,6 +1,6 @@ + /* Operating system specific defines to be used when targeting GCC for any + Solaris 2 system. +- Copyright 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011 ++ Copyright 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This file is part of GCC. +@@ -163,12 +163,12 @@ + %{YP,*} \ + %{R*} \ + %{compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib} \ +- %{!p:%{!pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib:%R/usr/lib}}} \ ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib:%R/lib} \ ++ %{!p:%{!pg:-Y P,%R/usr/ucblib:%R/usr/ccs/lib:%R/usr/lib:%R/lib}}} \ + -R %R/usr/ucblib} \ + %{!compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib} \ +- %{!p:%{!pg:-Y P,%R/usr/ccs/lib:%R/usr/lib}}}}" ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ccs/lib/libp:%R/usr/lib/libp:%R/usr/ccs/lib:%R/usr/lib:%R/lib} \ ++ %{!p:%{!pg:-Y P,%R/usr/ccs/lib:%R/usr/lib:%R/lib}}}}" + + #undef LINK_ARCH32_SPEC + #define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE +diff -Naur gcc-4.6.3.orig/gcc/config/sparc/sol2-bi.h gcc-4.6.3/gcc/config/sparc/sol2-bi.h +--- gcc-4.6.3.orig/gcc/config/sparc/sol2-bi.h 2011-02-17 07:57:21.000000000 -0600 ++++ gcc-4.6.3/gcc/config/sparc/sol2-bi.h 2012-08-16 08:21:11.398440000 -0500 +@@ -1,6 +1,6 @@ + /* Definitions of target machine for GCC, for bi-arch SPARC + running Solaris 2 using the system assembler and linker. +- Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011 ++ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This file is part of GCC. +@@ -191,12 +191,12 @@ + %{YP,*} \ + %{R*} \ + %{compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9} \ +- %{!p:%{!pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/sparcv9}}} \ ++ %{!YP,*:%{p|pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9} \ ++ %{!p:%{!pg:-Y P,%R/usr/ucblib/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9}}} \ + -R %R/usr/ucblib/sparcv9} \ + %{!compat-bsd: \ +- %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9} \ +- %{!p:%{!pg:-Y P,%R/usr/lib/sparcv9}}}}" ++ %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/sparcv9:%R/usr/lib/sparcv9:%R/lib/sparcv9} \ ++ %{!p:%{!pg:-Y P,%R/usr/lib/sparcv9:%R/lib/sparcv9}}}}" + + #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE + +diff -Naur gcc-4.6.3.orig/gcc/config/sparc/sparc.c gcc-4.6.3/gcc/config/sparc/sparc.c +--- gcc-4.6.3.orig/gcc/config/sparc/sparc.c 2011-12-16 17:38:34.000000000 -0600 ++++ gcc-4.6.3/gcc/config/sparc/sparc.c 2012-09-02 05:37:49.951074000 -0500 +@@ -3658,13 +3658,17 @@ + { + x = delegitimize_mem_from_attrs (x); + +- if (GET_CODE (x) == LO_SUM +- && GET_CODE (XEXP (x, 1)) == UNSPEC +- && XINT (XEXP (x, 1), 1) == UNSPEC_TLSLE) +- { +- x = XVECEXP (XEXP (x, 1), 0, 0); +- gcc_assert (GET_CODE (x) == SYMBOL_REF); +- } ++ if (GET_CODE (x) == LO_SUM && GET_CODE (XEXP (x, 1)) == UNSPEC) ++ switch (XINT (XEXP (x, 1), 1)) ++ { ++ case UNSPEC_MOVE_PIC: ++ case UNSPEC_TLSLE: ++ x = XVECEXP (XEXP (x, 1), 0, 0); ++ gcc_assert (GET_CODE (x) == SYMBOL_REF); ++ break; ++ default: ++ break; ++ } + + return x; + } +@@ -9452,7 +9456,10 @@ + /* We need to have the (essentially) final form of the insn stream in order + to properly detect the various hazards. Run delay slot scheduling. */ + if (optimize > 0 && flag_delayed_branch) +- dbr_schedule (get_insns ()); ++ { ++ cleanup_barriers (); ++ dbr_schedule (get_insns ()); ++ } + + /* Now look for specific patterns in the insn stream. */ + for (insn = get_insns (); insn; insn = next) +@@ -9634,6 +9641,7 @@ + void_list_node)); + DECL_RESULT (decl) = build_decl (BUILTINS_LOCATION, RESULT_DECL, + NULL_TREE, void_type_node); ++ TREE_PUBLIC (decl) = 1; + TREE_STATIC (decl) = 1; + make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); + DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; +diff -Naur gcc-4.6.3.orig/gcc/config/spu/spu.c gcc-4.6.3/gcc/config/spu/spu.c +--- gcc-4.6.3.orig/gcc/config/spu/spu.c 2011-07-15 07:33:27.000000000 -0500 ++++ gcc-4.6.3/gcc/config/spu/spu.c 2012-03-02 08:51:58.551861000 -0600 +@@ -6794,6 +6794,7 @@ + case scalar_to_vec: + case cond_branch_not_taken: + case vec_perm: ++ case vec_promote_demote: + return 1; + + case scalar_store: +diff -Naur gcc-4.6.3.orig/gcc/config/xtensa/linux-unwind.h gcc-4.6.3/gcc/config/xtensa/linux-unwind.h +--- gcc-4.6.3.orig/gcc/config/xtensa/linux-unwind.h 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/gcc/config/xtensa/linux-unwind.h 2012-04-20 03:08:13.688436000 -0500 +@@ -1,5 +1,5 @@ + /* DWARF2 EH unwinding support for Xtensa. +- Copyright (C) 2008, 2009 Free Software Foundation, Inc. ++ Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -62,7 +62,7 @@ + struct sigcontext *sc; + + struct rt_sigframe { +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_; + +diff -Naur gcc-4.6.3.orig/gcc/config.gcc gcc-4.6.3/gcc/config.gcc +--- gcc-4.6.3.orig/gcc/config.gcc 2011-07-22 11:44:50.000000000 -0500 ++++ gcc-4.6.3/gcc/config.gcc 2012-06-04 04:53:04.873173000 -0500 +@@ -817,7 +817,7 @@ + arm*-*-linux*) # ARM GNU/Linux with ELF + tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" + case $target in +- arm*b-*) ++ arm*b-*-linux*) + tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" + ;; + esac +@@ -925,7 +925,7 @@ + extra_objs="avr-devices.o" + ;; + avr-*-*) +- tm_file="avr/avr.h dbxelf.h newlib-stdint.h" ++ tm_file="avr/avr.h dbxelf.h avr/avr-stdint.h" + use_gcc_stdint=wrap + extra_gcc_objs="driver-avr.o avr-devices.o" + extra_objs="avr-devices.o" +diff -Naur gcc-4.6.3.orig/gcc/configure gcc-4.6.3/gcc/configure +--- gcc-4.6.3.orig/gcc/configure 2011-11-20 15:24:07.000000000 -0600 ++++ gcc-4.6.3/gcc/configure 2012-10-18 18:38:21.174413000 -0500 +@@ -4842,7 +4842,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5 + $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; } + +-if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then ++if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then + have_gnat=yes + else + have_gnat=no +@@ -25529,7 +25529,9 @@ + $as_echo_n "(cached) " >&6 + else + gcc_cv_ld_no_dot_syms=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_no_dot_syms=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_no_dot_syms=yes + fi +@@ -25573,7 +25575,9 @@ + $as_echo_n "(cached) " >&6 + else + gcc_cv_ld_large_toc=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_large_toc=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_large_toc=yes + fi +diff -Naur gcc-4.6.3.orig/gcc/configure.ac gcc-4.6.3/gcc/configure.ac +--- gcc-4.6.3.orig/gcc/configure.ac 2011-11-18 05:45:44.000000000 -0600 ++++ gcc-4.6.3/gcc/configure.ac 2012-10-18 18:38:21.174413000 -0500 +@@ -4169,7 +4169,9 @@ + AC_CACHE_CHECK(linker support for omitting dot symbols, + gcc_cv_ld_no_dot_syms, + [gcc_cv_ld_no_dot_syms=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_no_dot_syms=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 16 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_no_dot_syms=yes + fi +@@ -4206,7 +4208,9 @@ + AC_CACHE_CHECK(linker large toc support, + gcc_cv_ld_large_toc, + [gcc_cv_ld_large_toc=no +- if test $in_tree_ld = yes ; then ++ if test x"$ld_is_gold" = xyes; then ++ gcc_cv_ld_large_toc=yes ++ elif test $in_tree_ld = yes ; then + if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 21 -o "$gcc_cv_gld_major_version" -gt 2; then + gcc_cv_ld_large_toc=yes + fi +diff -Naur gcc-4.6.3.orig/gcc/convert.c gcc-4.6.3/gcc/convert.c +--- gcc-4.6.3.orig/gcc/convert.c 2011-10-12 06:57:36.000000000 -0500 ++++ gcc-4.6.3/gcc/convert.c 2012-05-22 04:17:42.260176000 -0500 +@@ -44,11 +44,6 @@ + if (TREE_TYPE (expr) == type) + return expr; + +- /* Propagate overflow to the NULL pointer. */ +- if (integer_zerop (expr)) +- return force_fit_type_double (type, double_int_zero, 0, +- TREE_OVERFLOW (expr)); +- + switch (TREE_CODE (TREE_TYPE (expr))) + { + case POINTER_TYPE: +diff -Naur gcc-4.6.3.orig/gcc/cp/decl.c gcc-4.6.3/gcc/cp/decl.c +--- gcc-4.6.3.orig/gcc/cp/decl.c 2012-02-14 17:34:34.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/decl.c 2012-04-04 15:48:59.830836000 -0500 +@@ -3636,7 +3636,7 @@ + TYPE_SIZE_UNIT (nullptr_type_node) = size_int (GET_MODE_SIZE (ptr_mode)); + TYPE_UNSIGNED (nullptr_type_node) = 1; + TYPE_PRECISION (nullptr_type_node) = GET_MODE_BITSIZE (ptr_mode); +- SET_TYPE_MODE (nullptr_type_node, Pmode); ++ SET_TYPE_MODE (nullptr_type_node, ptr_mode); + record_builtin_type (RID_MAX, "decltype(nullptr)", nullptr_type_node); + nullptr_node = build_int_cst (nullptr_type_node, 0); + } +diff -Naur gcc-4.6.3.orig/gcc/cp/pt.c gcc-4.6.3/gcc/cp/pt.c +--- gcc-4.6.3.orig/gcc/cp/pt.c 2012-02-14 17:36:19.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/pt.c 2012-09-13 10:13:08.240418000 -0500 +@@ -10028,6 +10028,16 @@ + break; + } + ++ if (TREE_CODE (t) == VAR_DECL && DECL_ANON_UNION_VAR_P (t)) ++ { ++ /* Just use name lookup to find a member alias for an anonymous ++ union, but then add it to the hash table. */ ++ r = lookup_name (DECL_NAME (t)); ++ gcc_assert (DECL_ANON_UNION_VAR_P (r)); ++ register_local_specialization (r, t); ++ break; ++ } ++ + /* Create a new node for the specialization we need. */ + r = copy_decl (t); + if (type == NULL_TREE) +@@ -17785,6 +17795,7 @@ + } + else + { ++ tree tmp; + decl = tsubst_copy (TREE_PURPOSE (t), argvec, + tf_warning_or_error, NULL_TREE); + +@@ -17793,10 +17804,17 @@ + in_base_initializer = 1; + + init = TREE_VALUE (t); ++ tmp = init; + if (init != void_type_node) + init = tsubst_expr (init, argvec, + tf_warning_or_error, NULL_TREE, + /*integral_constant_expression_p=*/false); ++ if (init == NULL_TREE && tmp != NULL_TREE) ++ /* If we had an initializer but it instantiated to nothing, ++ value-initialize the object. This will only occur when ++ the initializer was a pack expansion where the parameter ++ packs used in that expansion were of length zero. */ ++ init = void_type_node; + in_base_initializer = 0; + } + +diff -Naur gcc-4.6.3.orig/gcc/cp/semantics.c gcc-4.6.3/gcc/cp/semantics.c +--- gcc-4.6.3.orig/gcc/cp/semantics.c 2012-02-09 11:17:36.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/semantics.c 2012-04-03 17:50:13.736130000 -0500 +@@ -6763,7 +6763,6 @@ + + STRIP_NOPS (sub); + subtype = TREE_TYPE (sub); +- gcc_assert (POINTER_TYPE_P (subtype)); + + if (TREE_CODE (sub) == ADDR_EXPR) + { +diff -Naur gcc-4.6.3.orig/gcc/cp/typeck.c gcc-4.6.3/gcc/cp/typeck.c +--- gcc-4.6.3.orig/gcc/cp/typeck.c 2012-01-16 15:34:26.000000000 -0600 ++++ gcc-4.6.3/gcc/cp/typeck.c 2012-06-25 15:37:14.416810000 -0500 +@@ -1822,7 +1822,7 @@ + if (error_operand_p (exp)) + return error_mark_node; + +- if (NULLPTR_TYPE_P (type)) ++ if (NULLPTR_TYPE_P (type) && !TREE_SIDE_EFFECTS (exp)) + return nullptr_node; + + /* build_c_cast puts on a NOP_EXPR to make the result not an lvalue. +diff -Naur gcc-4.6.3.orig/gcc/cselib.c gcc-4.6.3/gcc/cselib.c +--- gcc-4.6.3.orig/gcc/cselib.c 2012-02-14 17:33:23.000000000 -0600 ++++ gcc-4.6.3/gcc/cselib.c 2012-09-14 18:00:45.851369000 -0500 +@@ -1237,8 +1237,18 @@ + unsigned int regno = UINT_MAX; + struct elt_loc_list *p_in = p; + +- for (; p; p = p -> next) ++ for (; p; p = p->next) + { ++ /* Return these right away to avoid returning stack pointer based ++ expressions for frame pointer and vice versa, which is something ++ that would confuse DSE. See the comment in cselib_expand_value_rtx_1 ++ for more details. */ ++ if (REG_P (p->loc) ++ && (REGNO (p->loc) == STACK_POINTER_REGNUM ++ || REGNO (p->loc) == FRAME_POINTER_REGNUM ++ || REGNO (p->loc) == HARD_FRAME_POINTER_REGNUM ++ || REGNO (p->loc) == cfa_base_preserved_regno)) ++ return p->loc; + /* Avoid infinite recursion trying to expand a reg into a + the same reg. */ + if ((REG_P (p->loc)) +diff -Naur gcc-4.6.3.orig/gcc/c-typeck.c gcc-4.6.3/gcc/c-typeck.c +--- gcc-4.6.3.orig/gcc/c-typeck.c 2011-11-04 16:49:49.000000000 -0500 ++++ gcc-4.6.3/gcc/c-typeck.c 2012-09-14 19:29:28.455504000 -0500 +@@ -3527,7 +3527,13 @@ + "wrong type argument to unary exclamation mark"); + return error_mark_node; + } +- arg = c_objc_common_truthvalue_conversion (location, arg); ++ if (int_operands) ++ { ++ arg = c_objc_common_truthvalue_conversion (location, xarg); ++ arg = remove_c_maybe_const_expr (arg); ++ } ++ else ++ arg = c_objc_common_truthvalue_conversion (location, arg); + ret = invert_truthvalue_loc (location, arg); + /* If the TRUTH_NOT_EXPR has been folded, reset the location. */ + if (EXPR_P (ret) && EXPR_HAS_LOCATION (ret)) +@@ -4315,6 +4321,11 @@ + ret = fold_build3_loc (colon_loc, COND_EXPR, result_type, ifexp, op1, op2); + else + { ++ if (int_operands) ++ { ++ op1 = remove_c_maybe_const_expr (op1); ++ op2 = remove_c_maybe_const_expr (op2); ++ } + ret = build3 (COND_EXPR, result_type, ifexp, op1, op2); + if (int_operands) + ret = note_integer_operands (ret); +@@ -4750,8 +4761,11 @@ + ret = build_c_cast (loc, type, expr); + if (type_expr) + { ++ bool inner_expr_const = true; ++ ret = c_fully_fold (ret, require_constant_value, &inner_expr_const); + ret = build2 (C_MAYBE_CONST_EXPR, TREE_TYPE (ret), type_expr, ret); +- C_MAYBE_CONST_EXPR_NON_CONST (ret) = !type_expr_const; ++ C_MAYBE_CONST_EXPR_NON_CONST (ret) = !(type_expr_const ++ && inner_expr_const); + SET_EXPR_LOCATION (ret, loc); + } + +@@ -9628,8 +9642,20 @@ + but that does not mean the operands should be + converted to ints! */ + result_type = integer_type_node; +- op0 = c_common_truthvalue_conversion (location, op0); +- op1 = c_common_truthvalue_conversion (location, op1); ++ if (op0_int_operands) ++ { ++ op0 = c_objc_common_truthvalue_conversion (location, orig_op0); ++ op0 = remove_c_maybe_const_expr (op0); ++ } ++ else ++ op0 = c_objc_common_truthvalue_conversion (location, op0); ++ if (op1_int_operands) ++ { ++ op1 = c_objc_common_truthvalue_conversion (location, orig_op1); ++ op1 = remove_c_maybe_const_expr (op1); ++ } ++ else ++ op1 = c_objc_common_truthvalue_conversion (location, op1); + converted = 1; + boolean_op = true; + } +@@ -10287,12 +10313,17 @@ + + int_const = (TREE_CODE (expr) == INTEGER_CST && !TREE_OVERFLOW (expr)); + int_operands = EXPR_INT_CONST_OPERANDS (expr); +- if (int_operands) +- expr = remove_c_maybe_const_expr (expr); +- +- /* ??? Should we also give an error for vectors rather than leaving +- those to give errors later? */ +- expr = c_common_truthvalue_conversion (location, expr); ++ if (int_operands && TREE_CODE (expr) != INTEGER_CST) ++ { ++ expr = remove_c_maybe_const_expr (expr); ++ expr = build2 (NE_EXPR, integer_type_node, expr, ++ convert (TREE_TYPE (expr), integer_zero_node)); ++ expr = note_integer_operands (expr); ++ } ++ else ++ /* ??? Should we also give an error for vectors rather than leaving ++ those to give errors later? */ ++ expr = c_common_truthvalue_conversion (location, expr); + + if (TREE_CODE (expr) == INTEGER_CST && int_operands && !int_const) + { +diff -Naur gcc-4.6.3.orig/gcc/DATESTAMP gcc-4.6.3/gcc/DATESTAMP +--- gcc-4.6.3.orig/gcc/DATESTAMP 2012-02-29 18:17:53.000000000 -0600 ++++ gcc-4.6.3/gcc/DATESTAMP 2012-11-04 18:17:00.669518000 -0600 +@@ -1 +1 @@ +-20120301 ++20121105 +diff -Naur gcc-4.6.3.orig/gcc/df-problems.c gcc-4.6.3/gcc/df-problems.c +--- gcc-4.6.3.orig/gcc/df-problems.c 2011-07-07 14:10:01.000000000 -0500 ++++ gcc-4.6.3/gcc/df-problems.c 2012-07-16 04:36:04.162835000 -0500 +@@ -3956,6 +3956,19 @@ + df_simulate_initialize_backwards (merge_bb, test_use); + for (insn = across_to; ; insn = next) + { ++ if (CALL_P (insn)) ++ { ++ if (RTL_CONST_OR_PURE_CALL_P (insn)) ++ /* Pure functions can read from memory. Const functions can ++ read from arguments that the ABI has forced onto the stack. ++ Neither sort of read can be volatile. */ ++ memrefs_in_across |= MEMREF_NORMAL; ++ else ++ { ++ memrefs_in_across |= MEMREF_VOLATILE; ++ mem_sets_in_across |= MEMREF_VOLATILE; ++ } ++ } + if (NONDEBUG_INSN_P (insn)) + { + df_simulate_find_defs (insn, test_set); +diff -Naur gcc-4.6.3.orig/gcc/doc/install.texi gcc-4.6.3/gcc/doc/install.texi +--- gcc-4.6.3.orig/gcc/doc/install.texi 2011-03-21 07:13:26.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/install.texi 2012-04-06 03:28:56.865123000 -0500 +@@ -1208,7 +1208,7 @@ + + @item --with-llsc + On MIPS targets, make @option{-mllsc} the default when no +-@option{-mno-lsc} option is passed. This is the default for ++@option{-mno-llsc} option is passed. This is the default for + Linux-based targets, as the kernel will emulate them if the ISA does + not provide them. + +diff -Naur gcc-4.6.3.orig/gcc/doc/invoke.texi gcc-4.6.3/gcc/doc/invoke.texi +--- gcc-4.6.3.orig/gcc/doc/invoke.texi 2012-01-03 10:43:38.000000000 -0600 ++++ gcc-4.6.3/gcc/doc/invoke.texi 2012-10-02 16:24:45.917815000 -0500 +@@ -598,7 +598,8 @@ + -mno-wide-multiply -mrtd -malign-double @gol + -mpreferred-stack-boundary=@var{num} + -mincoming-stack-boundary=@var{num} @gol +--mcld -mcx16 -msahf -mmovbe -mcrc32 -mrecip -mvzeroupper @gol ++-mcld -mcx16 -msahf -mmovbe -mcrc32 -mrecip @gol ++-mvzeroupper -mprefer-avx128 @gol + -mmmx -msse -msse2 -msse3 -mssse3 -msse4.1 -msse4.2 -msse4 -mavx @gol + -maes -mpclmul -mfsgsbase -mrdrnd -mf16c -mfused-madd @gol + -msse4a -m3dnow -mpopcnt -mabm -mbmi -mtbm -mfma4 -mxop -mlwp @gol +@@ -853,8 +854,8 @@ + -m5-compact -m5-compact-nofpu @gol + -mb -ml -mdalign -mrelax @gol + -mbigtable -mfmovd -mhitachi -mrenesas -mno-renesas -mnomacsave @gol +--mieee -mbitops -misize -minline-ic_invalidate -mpadstruct -mspace @gol +--mprefergot -musermode -multcost=@var{number} -mdiv=@var{strategy} @gol ++-mieee -mno-ieee -mbitops -misize -minline-ic_invalidate -mpadstruct @gol ++-mspace -mprefergot -musermode -multcost=@var{number} -mdiv=@var{strategy} @gol + -mdivsi3_libfunc=@var{name} -mfixed-range=@var{register-range} @gol + -madjust-unroll -mindexed-addressing -mgettrcost=@var{number} -mpt-fixed @gol + -maccumulate-outgoing-args -minvalid-symbols} +@@ -5282,7 +5283,9 @@ + @opindex fdump-rtl-dfinish + These dumps are defined but always produce empty files. + +-@item -fdump-rtl-all ++@item -da ++@itemx -fdump-rtl-all ++@opindex da + @opindex fdump-rtl-all + Produce all the dumps listed above. + +@@ -5299,11 +5302,6 @@ + @opindex dH + Produce a core dump whenever an error occurs. + +-@item -dm +-@opindex dm +-Print statistics on memory usage, at the end of the run, to +-standard error. +- + @item -dp + @opindex dp + Annotate the assembler output with a comment indicating which +@@ -12708,6 +12706,11 @@ + AVX to SSE transition penalty as well as remove unnecessary zeroupper + intrinsics. + ++@item -mprefer-avx128 ++@opindex mprefer-avx128 ++This option instructs GCC to use 128-bit AVX instructions instead of ++256-bit AVX instructions in the auto-vectorizer. ++ + @item -mcx16 + @opindex mcx16 + This option will enable GCC to use CMPXCHG16B instruction in generated code. +@@ -16938,13 +16941,15 @@ + @option{-mhitachi} is given. + + @item -mieee ++@item -mno-ieee + @opindex mieee +-Increase IEEE-compliance of floating-point code. +-At the moment, this is equivalent to @option{-fno-finite-math-only}. +-When generating 16 bit SH opcodes, getting IEEE-conforming results for +-comparisons of NANs / infinities incurs extra overhead in every +-floating point comparison, therefore the default is set to +-@option{-ffinite-math-only}. ++@opindex mnoieee ++Control the IEEE compliance of floating-point comparisons, which affects the ++handling of cases where the result of a comparison is unordered. By default ++@option{-mieee} is implicitly enabled. If @option{-ffinite-math-only} is ++enabled @option{-mno-ieee} is implicitly set, which results in faster ++floating-point greater-equal and less-equal comparisons. The implcit settings ++can be overridden by specifying either @option{-mieee} or @option{-mno-ieee}. + + @item -minline-ic_invalidate + @opindex minline-ic_invalidate +diff -Naur gcc-4.6.3.orig/gcc/doc/tm.texi gcc-4.6.3/gcc/doc/tm.texi +--- gcc-4.6.3.orig/gcc/doc/tm.texi 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/tm.texi 2012-08-10 08:26:44.694722000 -0500 +@@ -1118,6 +1118,14 @@ + If the value of this macro has a type, it should be an unsigned type. + @end defmac + ++@deftypefn {Target Hook} HOST_WIDE_INT TARGET_VECTOR_ALIGNMENT (const_tree @var{type}) ++This hook can be used to define the alignment for a vector of type ++@var{type}, in order to comply with a platform ABI. The default is to ++require natural alignment for vector types. The alignment returned by ++this hook must be a power-of-two multiple of the default alignment of ++the vector element type. ++@end deftypefn ++ + @defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align}) + If defined, a C expression to compute the alignment for stack slot. + @var{type} is the data type, @var{mode} is the widest mode available, +diff -Naur gcc-4.6.3.orig/gcc/doc/tm.texi.in gcc-4.6.3/gcc/doc/tm.texi.in +--- gcc-4.6.3.orig/gcc/doc/tm.texi.in 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/doc/tm.texi.in 2012-08-10 08:26:44.694722000 -0500 +@@ -1108,6 +1108,8 @@ + If the value of this macro has a type, it should be an unsigned type. + @end defmac + ++@hook TARGET_VECTOR_ALIGNMENT ++ + @defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align}) + If defined, a C expression to compute the alignment for stack slot. + @var{type} is the data type, @var{mode} is the widest mode available, +diff -Naur gcc-4.6.3.orig/gcc/expr.c gcc-4.6.3/gcc/expr.c +--- gcc-4.6.3.orig/gcc/expr.c 2012-02-09 11:28:22.000000000 -0600 ++++ gcc-4.6.3/gcc/expr.c 2012-06-28 07:01:16.874415000 -0500 +@@ -5971,6 +5971,8 @@ + || bitpos % GET_MODE_ALIGNMENT (mode)) + && SLOW_UNALIGNED_ACCESS (mode, MEM_ALIGN (target))) + || (bitpos % BITS_PER_UNIT != 0))) ++ || (bitsize >= 0 && mode != BLKmode ++ && GET_MODE_BITSIZE (mode) > bitsize) + /* If the RHS and field are a constant size and the size of the + RHS isn't the same size as the bitfield, we must use bitfield + operations. */ +@@ -9182,6 +9184,7 @@ + orig_op0 = op0 + = expand_expr (tem, + (TREE_CODE (TREE_TYPE (tem)) == UNION_TYPE ++ && COMPLETE_TYPE_P (TREE_TYPE (tem)) + && (TREE_CODE (TYPE_SIZE (TREE_TYPE (tem))) + != INTEGER_CST) + && modifier != EXPAND_STACK_PARM +diff -Naur gcc-4.6.3.orig/gcc/fold-const.c gcc-4.6.3/gcc/fold-const.c +--- gcc-4.6.3.orig/gcc/fold-const.c 2012-02-27 05:19:03.000000000 -0600 ++++ gcc-4.6.3/gcc/fold-const.c 2012-10-19 12:03:07.571221000 -0500 +@@ -6771,12 +6771,14 @@ + && TREE_TYPE (TREE_OPERAND (arg1, 0)) == inner_type)) + return NULL_TREE; + +- if ((TYPE_UNSIGNED (inner_type) != TYPE_UNSIGNED (outer_type) +- || POINTER_TYPE_P (inner_type) != POINTER_TYPE_P (outer_type)) ++ if (TYPE_UNSIGNED (inner_type) != TYPE_UNSIGNED (outer_type) + && code != NE_EXPR + && code != EQ_EXPR) + return NULL_TREE; + ++ if (POINTER_TYPE_P (inner_type) != POINTER_TYPE_P (outer_type)) ++ return NULL_TREE; ++ + if (TREE_CODE (arg1) == INTEGER_CST) + arg1 = force_fit_type_double (inner_type, tree_to_double_int (arg1), + 0, TREE_OVERFLOW (arg1)); +diff -Naur gcc-4.6.3.orig/gcc/fortran/array.c gcc-4.6.3/gcc/fortran/array.c +--- gcc-4.6.3.orig/gcc/fortran/array.c 2011-08-22 15:03:00.000000000 -0500 ++++ gcc-4.6.3/gcc/fortran/array.c 2012-09-13 13:19:22.374742000 -0500 +@@ -91,9 +91,7 @@ + else if (!star) + m = gfc_match_expr (&ar->start[i]); + +- if (m == MATCH_NO && gfc_match_char ('*') == MATCH_YES) +- return MATCH_NO; +- else if (m == MATCH_NO) ++ if (m == MATCH_NO) + gfc_error ("Expected array subscript at %C"); + if (m != MATCH_YES) + return MATCH_ERROR; +@@ -224,7 +222,7 @@ + + for (ar->codimen = 0; ar->codimen + ar->dimen < GFC_MAX_DIMENSIONS; ar->codimen++) + { +- m = match_subscript (ar, init, ar->codimen == (corank - 1)); ++ m = match_subscript (ar, init, true); + if (m == MATCH_ERROR) + return MATCH_ERROR; + +@@ -249,6 +247,13 @@ + gfc_error ("Invalid form of coarray reference at %C"); + return MATCH_ERROR; + } ++ else if (ar->dimen_type[ar->codimen + ar->dimen] == DIMEN_STAR) ++ { ++ gfc_error ("Unexpected '*' for codimension %d of %d at %C", ++ ar->codimen + 1, corank); ++ return MATCH_ERROR; ++ } ++ + if (ar->codimen >= corank) + { + gfc_error ("Invalid codimension %d at %C, only %d codimensions exist", +diff -Naur gcc-4.6.3.orig/gcc/fortran/decl.c gcc-4.6.3/gcc/fortran/decl.c +--- gcc-4.6.3.orig/gcc/fortran/decl.c 2011-06-02 14:53:02.000000000 -0500 ++++ gcc-4.6.3/gcc/fortran/decl.c 2012-06-14 08:11:27.149798000 -0500 +@@ -3623,8 +3623,9 @@ + } + } + +- /* Module variables implicitly have the SAVE attribute. */ +- if (gfc_current_state () == COMP_MODULE && !current_attr.save) ++ /* Since Fortran 2008 module variables implicitly have the SAVE attribute. */ ++ if (gfc_current_state () == COMP_MODULE && !current_attr.save ++ && (gfc_option.allow_std & GFC_STD_F2008) != 0) + current_attr.save = SAVE_IMPLICIT; + + colon_seen = 1; +diff -Naur gcc-4.6.3.orig/gcc/fortran/expr.c gcc-4.6.3/gcc/fortran/expr.c +--- gcc-4.6.3.orig/gcc/fortran/expr.c 2012-01-19 16:21:43.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/expr.c 2012-05-02 07:53:20.873985000 -0500 +@@ -4474,7 +4474,11 @@ + if (ptr_component && ref->type == REF_COMPONENT) + check_intentin = false; + if (ref->type == REF_COMPONENT && ref->u.c.component->attr.pointer) +- ptr_component = true; ++ { ++ ptr_component = true; ++ if (!pointer) ++ check_intentin = false; ++ } + } + if (check_intentin && sym->attr.intent == INTENT_IN) + { +diff -Naur gcc-4.6.3.orig/gcc/fortran/resolve.c gcc-4.6.3/gcc/fortran/resolve.c +--- gcc-4.6.3.orig/gcc/fortran/resolve.c 2012-01-25 02:11:56.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/resolve.c 2012-09-13 13:15:52.599419000 -0500 +@@ -1452,7 +1452,7 @@ + + if (sym->intmod_sym_id) + isym = gfc_intrinsic_function_by_id ((gfc_isym_id) sym->intmod_sym_id); +- else ++ else if (!sym->attr.subroutine) + isym = gfc_find_function (sym->name); + + if (isym) +@@ -9700,7 +9700,8 @@ + || sym->attr.data + || sym->module + || sym->attr.cray_pointee +- || sym->attr.cray_pointer) ++ || sym->attr.cray_pointer ++ || sym->assoc) + return NULL; + + /* Now we'll try to build an initializer expression. */ +@@ -12908,10 +12909,9 @@ + } + + proc = sym->ns->proc_name; +- if (sym->attr.dummy && gfc_pure (proc) +- && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN) +- || +- proc->attr.function)) ++ if (sym->attr.dummy ++ && ((proc->attr.subroutine && sym->attr.intent == INTENT_IN) ++ || proc->attr.function)) + return 1; + + /* TODO: Sort out what can be storage associated, if anything, and include +diff -Naur gcc-4.6.3.orig/gcc/fortran/simplify.c gcc-4.6.3/gcc/fortran/simplify.c +--- gcc-4.6.3.orig/gcc/fortran/simplify.c 2012-02-03 14:37:36.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/simplify.c 2012-09-12 16:54:50.523207000 -0500 +@@ -3296,6 +3296,9 @@ + gcc_assert (array->expr_type == EXPR_VARIABLE); + gcc_assert (as); + ++ if (gfc_resolve_array_spec (as, 0) == FAILURE) ++ return NULL; ++ + /* The last dimension of an assumed-size array is special. */ + if ((!coarray && d == as->rank && as->type == AS_ASSUMED_SIZE && !upper) + || (coarray && d == as->rank + as->corank)) +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans-array.c gcc-4.6.3/gcc/fortran/trans-array.c +--- gcc-4.6.3.orig/gcc/fortran/trans-array.c 2011-12-08 14:54:57.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans-array.c 2012-07-14 10:24:12.262320000 -0500 +@@ -2056,6 +2056,11 @@ + gfc_se se; + int n; + ++ /* Don't evaluate the arguments for realloc_lhs_loop_for_fcn_call; otherwise, ++ arguments could get evaluated multiple times. */ ++ if (ss->is_alloc_lhs) ++ return; ++ + /* TODO: This can generate bad code if there are ordering dependencies, + e.g., a callee allocated function and an unknown size constructor. */ + gcc_assert (ss != NULL); +@@ -7548,7 +7553,7 @@ + scalar = 1; + for (; arg; arg = arg->next) + { +- if (!arg->expr) ++ if (!arg->expr || arg->expr->expr_type == EXPR_NULL) + continue; + + newss = gfc_walk_subexpr (head, arg->expr); +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans.c gcc-4.6.3/gcc/fortran/trans.c +--- gcc-4.6.3.orig/gcc/fortran/trans.c 2011-02-23 16:38:27.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans.c 2012-06-01 15:06:39.161162000 -0500 +@@ -1005,15 +1005,12 @@ + if (!res && size != 0) + _gfortran_os_error ("Allocation would exceed memory limit"); + +- if (size == 0) +- return NULL; +- + return res; + } */ + tree + gfc_call_realloc (stmtblock_t * block, tree mem, tree size) + { +- tree msg, res, nonzero, zero, null_result, tmp; ++ tree msg, res, nonzero, null_result, tmp; + tree type = TREE_TYPE (mem); + + size = gfc_evaluate_now (size, block); +@@ -1044,15 +1041,6 @@ + build_empty_stmt (input_location)); + gfc_add_expr_to_block (block, tmp); + +- /* if (size == 0) then the result is NULL. */ +- tmp = fold_build2_loc (input_location, MODIFY_EXPR, type, res, +- build_int_cst (type, 0)); +- zero = fold_build1_loc (input_location, TRUTH_NOT_EXPR, boolean_type_node, +- nonzero); +- tmp = fold_build3_loc (input_location, COND_EXPR, void_type_node, zero, tmp, +- build_empty_stmt (input_location)); +- gfc_add_expr_to_block (block, tmp); +- + return res; + } + +diff -Naur gcc-4.6.3.orig/gcc/fortran/trans-types.c gcc-4.6.3/gcc/fortran/trans-types.c +--- gcc-4.6.3.orig/gcc/fortran/trans-types.c 2011-11-25 11:18:05.000000000 -0600 ++++ gcc-4.6.3/gcc/fortran/trans-types.c 2012-03-10 03:20:22.792570000 -0600 +@@ -2519,7 +2519,11 @@ + || sym->attr.flavor == FL_PROGRAM); + + if (sym->backend_decl) +- return TREE_TYPE (sym->backend_decl); ++ { ++ if (sym->attr.proc_pointer) ++ return TREE_TYPE (TREE_TYPE (sym->backend_decl)); ++ return TREE_TYPE (sym->backend_decl); ++ } + + alternate_return = 0; + typelist = NULL_TREE; +diff -Naur gcc-4.6.3.orig/gcc/gcov-iov.c gcc-4.6.3/gcc/gcov-iov.c +--- gcc-4.6.3.orig/gcc/gcov-iov.c 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/gcov-iov.c 2012-06-22 07:32:34.527642000 -0500 +@@ -19,8 +19,8 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + +-#include <stdio.h> +-#include <stdlib.h> ++#include "bconfig.h" ++#include "system.h" + + /* Command line arguments are the base GCC version and the development + phase (the latter may be an empty string). */ +@@ -48,8 +48,14 @@ + if (*ptr == '.') + minor = strtoul (ptr + 1, 0, 10); + ++ /* For releases the development phase is an empty string, for ++ prerelease versions on a release branch it is "prerelease". ++ Consider both equal as patch-level releases do not change ++ the GCOV version either. ++ On the trunk the development phase is "experimental". */ + phase = argv[2][0]; +- if (phase == '\0') ++ if (phase == '\0' ++ || strcmp (argv[2], "prerelease") == 0) + phase = '*'; + + v[0] = (major < 10 ? '0' : 'A' - 10) + major; +diff -Naur gcc-4.6.3.orig/gcc/gimple.c gcc-4.6.3/gcc/gimple.c +--- gcc-4.6.3.orig/gcc/gimple.c 2011-08-03 13:56:02.000000000 -0500 ++++ gcc-4.6.3/gcc/gimple.c 2012-05-22 04:23:01.937094000 -0500 +@@ -2275,8 +2275,6 @@ + bool + gimple_has_side_effects (const_gimple s) + { +- unsigned i; +- + if (is_gimple_debug (s)) + return false; + +@@ -2292,45 +2290,15 @@ + + if (is_gimple_call (s)) + { +- unsigned nargs = gimple_call_num_args (s); ++ int flags = gimple_call_flags (s); + +- if (!(gimple_call_flags (s) & (ECF_CONST | ECF_PURE))) +- return true; +- else if (gimple_call_flags (s) & ECF_LOOPING_CONST_OR_PURE) +- /* An infinite loop is considered a side effect. */ ++ /* An infinite loop is considered a side effect. */ ++ if (!(flags & (ECF_CONST | ECF_PURE)) ++ || (flags & ECF_LOOPING_CONST_OR_PURE)) + return true; + +- if (gimple_call_lhs (s) +- && TREE_SIDE_EFFECTS (gimple_call_lhs (s))) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- +- if (TREE_SIDE_EFFECTS (gimple_call_fn (s))) +- return true; +- +- for (i = 0; i < nargs; i++) +- if (TREE_SIDE_EFFECTS (gimple_call_arg (s, i))) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- + return false; + } +- else +- { +- for (i = 0; i < gimple_num_ops (s); i++) +- { +- tree op = gimple_op (s, i); +- if (op && TREE_SIDE_EFFECTS (op)) +- { +- gcc_checking_assert (gimple_has_volatile_ops (s)); +- return true; +- } +- } +- } + + return false; + } +diff -Naur gcc-4.6.3.orig/gcc/gthr-posix.h gcc-4.6.3/gcc/gthr-posix.h +--- gcc-4.6.3.orig/gcc/gthr-posix.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/gthr-posix.h 2012-06-05 16:42:30.036539000 -0500 +@@ -239,16 +239,15 @@ + static inline int + __gthread_active_p (void) + { +- static void *const __gthread_active_ptr +- = __extension__ (void *) &__gthrw_( + /* Android's C library does not provide pthread_cancel, check for + `pthread_create' instead. */ + #ifndef __BIONIC__ +- pthread_cancel ++ static void *const __gthread_active_ptr ++ = __extension__ (void *) &__gthrw_(pthread_cancel); + #else +- pthread_create ++ static void *const __gthread_active_ptr ++ = __extension__ (void *) &__gthrw_(pthread_create); + #endif +- ); + return __gthread_active_ptr != 0; + } + +diff -Naur gcc-4.6.3.orig/gcc/ipa-prop.c gcc-4.6.3/gcc/ipa-prop.c +--- gcc-4.6.3.orig/gcc/ipa-prop.c 2011-12-13 16:03:05.000000000 -0600 ++++ gcc-4.6.3/gcc/ipa-prop.c 2012-07-02 10:53:21.612759000 -0500 +@@ -704,12 +704,11 @@ + || is_global_var (base)) + return; + +- if (detect_type_change (op, base, call, jfunc, offset)) +- return; +- + binfo = TYPE_BINFO (TREE_TYPE (base)); +- if (!binfo) ++ if (!binfo ++ || detect_type_change (op, base, call, jfunc, offset)) + return; ++ + binfo = get_binfo_at_offset (binfo, offset, TREE_TYPE (op)); + if (binfo) + { +diff -Naur gcc-4.6.3.orig/gcc/ira-int.h gcc-4.6.3/gcc/ira-int.h +--- gcc-4.6.3.orig/gcc/ira-int.h 2011-01-03 14:52:22.000000000 -0600 ++++ gcc-4.6.3/gcc/ira-int.h 2012-09-21 05:09:04.504622000 -0500 +@@ -1123,8 +1123,13 @@ + ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a, + ira_object_t *o) + { +- *o = ALLOCNO_OBJECT (a, i->n); +- return i->n++ < ALLOCNO_NUM_OBJECTS (a); ++ int n = i->n++; ++ if (n < ALLOCNO_NUM_OBJECTS (a)) ++ { ++ *o = ALLOCNO_OBJECT (a, n); ++ return true; ++ } ++ return false; + } + + /* Loop over all objects associated with allocno A. In each +diff -Naur gcc-4.6.3.orig/gcc/lto/lto.c gcc-4.6.3/gcc/lto/lto.c +--- gcc-4.6.3.orig/gcc/lto/lto.c 2011-12-13 16:03:05.000000000 -0600 ++++ gcc-4.6.3/gcc/lto/lto.c 2012-04-23 07:44:46.674224000 -0500 +@@ -893,7 +893,8 @@ + + for (node = cgraph_nodes; node; node = node->next) + { +- if (!partition_cgraph_node_p (node)) ++ if (!partition_cgraph_node_p (node) ++ || node->aux) + continue; + + file_data = node->local.lto_file_data; +@@ -923,13 +924,13 @@ + npartitions++; + } + +- if (!node->aux) +- add_cgraph_node_to_partition (partition, node); ++ add_cgraph_node_to_partition (partition, node); + } + + for (vnode = varpool_nodes; vnode; vnode = vnode->next) + { +- if (!partition_varpool_node_p (vnode)) ++ if (!partition_varpool_node_p (vnode) ++ || vnode->aux) + continue; + file_data = vnode->lto_file_data; + slot = pointer_map_contains (pmap, file_data); +@@ -943,8 +944,7 @@ + npartitions++; + } + +- if (!vnode->aux) +- add_varpool_node_to_partition (partition, vnode); ++ add_varpool_node_to_partition (partition, vnode); + } + for (node = cgraph_nodes; node; node = node->next) + node->aux = NULL; +@@ -1050,8 +1050,9 @@ + + for (i = 0; i < n_nodes; i++) + { +- if (!order[i]->aux) +- add_cgraph_node_to_partition (partition, order[i]); ++ if (order[i]->aux) ++ continue; ++ add_cgraph_node_to_partition (partition, order[i]); + total_size -= order[i]->global.size; + + /* Once we added a new node to the partition, we also want to add +@@ -1231,6 +1232,8 @@ + } + i = best_i; + /* When we are finished, avoid creating empty partition. */ ++ while (i < n_nodes - 1 && order[i + 1]->aux) ++ i++; + if (i == n_nodes - 1) + break; + partition = new_partition (""); +diff -Naur gcc-4.6.3.orig/gcc/predict.c gcc-4.6.3/gcc/predict.c +--- gcc-4.6.3.orig/gcc/predict.c 2011-01-22 15:47:40.000000000 -0600 ++++ gcc-4.6.3/gcc/predict.c 2012-03-25 05:59:19.696090000 -0500 +@@ -1790,7 +1790,8 @@ + static void + predict_paths_for_bb (basic_block cur, basic_block bb, + enum br_predictor pred, +- enum prediction taken) ++ enum prediction taken, ++ bitmap visited) + { + edge e; + edge_iterator ei; +@@ -1811,7 +1812,7 @@ + continue; + gcc_assert (bb == cur || dominated_by_p (CDI_POST_DOMINATORS, cur, bb)); + +- /* See if there is how many edge from e->src that is not abnormal ++ /* See if there is an edge from e->src that is not abnormal + and does not lead to BB. */ + FOR_EACH_EDGE (e2, ei2, e->src->succs) + if (e2 != e +@@ -1824,16 +1825,20 @@ + + /* If there is non-abnormal path leaving e->src, predict edge + using predictor. Otherwise we need to look for paths +- leading to e->src. */ ++ leading to e->src. ++ ++ The second may lead to infinite loop in the case we are predicitng ++ regions that are only reachable by abnormal edges. We simply ++ prevent visiting given BB twice. */ + if (found) + predict_edge_def (e, pred, taken); +- else +- predict_paths_for_bb (e->src, e->src, pred, taken); ++ else if (bitmap_set_bit (visited, e->src->index)) ++ predict_paths_for_bb (e->src, e->src, pred, taken, visited); + } + for (son = first_dom_son (CDI_POST_DOMINATORS, cur); + son; + son = next_dom_son (CDI_POST_DOMINATORS, son)) +- predict_paths_for_bb (son, bb, pred, taken); ++ predict_paths_for_bb (son, bb, pred, taken, visited); + } + + /* Sets branch probabilities according to PREDiction and +@@ -1843,7 +1848,9 @@ + predict_paths_leading_to (basic_block bb, enum br_predictor pred, + enum prediction taken) + { +- predict_paths_for_bb (bb, bb, pred, taken); ++ bitmap visited = BITMAP_ALLOC (NULL); ++ predict_paths_for_bb (bb, bb, pred, taken, visited); ++ BITMAP_FREE (visited); + } + + /* Like predict_paths_leading_to but take edge instead of basic block. */ +@@ -1866,7 +1873,11 @@ + break; + } + if (!has_nonloop_edge) +- predict_paths_for_bb (bb, bb, pred, taken); ++ { ++ bitmap visited = BITMAP_ALLOC (NULL); ++ predict_paths_for_bb (bb, bb, pred, taken, visited); ++ BITMAP_FREE (visited); ++ } + else + predict_edge_def (e, pred, taken); + } +diff -Naur gcc-4.6.3.orig/gcc/sel-sched.c gcc-4.6.3/gcc/sel-sched.c +--- gcc-4.6.3.orig/gcc/sel-sched.c 2011-06-28 07:19:18.000000000 -0500 ++++ gcc-4.6.3/gcc/sel-sched.c 2012-10-22 14:34:35.215631000 -0500 +@@ -3578,29 +3578,41 @@ + return NULL; + } + +-/* Lookup EXPR in VINSN_VEC and return TRUE if found. */ ++/* Lookup EXPR in VINSN_VEC and return TRUE if found. Also check patterns from ++ EXPR's history of changes. */ + static bool + vinsn_vec_has_expr_p (vinsn_vec_t vinsn_vec, expr_t expr) + { +- vinsn_t vinsn; ++ vinsn_t vinsn, expr_vinsn; + int n; ++ unsigned i; + +- FOR_EACH_VEC_ELT (vinsn_t, vinsn_vec, n, vinsn) +- if (VINSN_SEPARABLE_P (vinsn)) +- { +- if (vinsn_equal_p (vinsn, EXPR_VINSN (expr))) +- return true; +- } +- else +- { +- /* For non-separable instructions, the blocking insn can have +- another pattern due to substitution, and we can't choose +- different register as in the above case. Check all registers +- being written instead. */ +- if (bitmap_intersect_p (VINSN_REG_SETS (vinsn), +- VINSN_REG_SETS (EXPR_VINSN (expr)))) +- return true; +- } ++ /* Start with checking expr itself and then proceed with all the old forms ++ of expr taken from its history vector. */ ++ for (i = 0, expr_vinsn = EXPR_VINSN (expr); ++ expr_vinsn; ++ expr_vinsn = (i < VEC_length (expr_history_def, ++ EXPR_HISTORY_OF_CHANGES (expr)) ++ ? VEC_index (expr_history_def, ++ EXPR_HISTORY_OF_CHANGES (expr), ++ i++)->old_expr_vinsn ++ : NULL)) ++ FOR_EACH_VEC_ELT (vinsn_t, vinsn_vec, n, vinsn) ++ if (VINSN_SEPARABLE_P (vinsn)) ++ { ++ if (vinsn_equal_p (vinsn, expr_vinsn)) ++ return true; ++ } ++ else ++ { ++ /* For non-separable instructions, the blocking insn can have ++ another pattern due to substitution, and we can't choose ++ different register as in the above case. Check all registers ++ being written instead. */ ++ if (bitmap_intersect_p (VINSN_REG_SETS (vinsn), ++ VINSN_REG_SETS (expr_vinsn))) ++ return true; ++ } + + return false; + } +@@ -5700,8 +5712,8 @@ + || EXPR_TARGET_AVAILABLE (new_expr) + != EXPR_TARGET_AVAILABLE (cur_expr)) + /* Unfortunately, the below code could be also fired up on +- separable insns. +- FIXME: add an example of how this could happen. */ ++ separable insns, e.g. when moving insns through the new ++ speculation check as in PR 53701. */ + vinsn_vec_add (&vec_bookkeeping_blocked_vinsns, cur_expr); + } + +diff -Naur gcc-4.6.3.orig/gcc/sel-sched-ir.h gcc-4.6.3/gcc/sel-sched-ir.h +--- gcc-4.6.3.orig/gcc/sel-sched-ir.h 2011-04-07 07:07:24.000000000 -0500 ++++ gcc-4.6.3/gcc/sel-sched-ir.h 2012-10-30 03:25:16.725474000 -0500 +@@ -1119,7 +1119,8 @@ + /* If bb is empty, and we're skipping to loop exits, then + consider bb as a possible gate to the inner loop now. */ + while (sel_bb_empty_or_nop_p (bb) +- && in_current_region_p (bb)) ++ && in_current_region_p (bb) ++ && EDGE_COUNT (bb->succs) > 0) + { + bb = single_succ (bb); + +diff -Naur gcc-4.6.3.orig/gcc/stor-layout.c gcc-4.6.3/gcc/stor-layout.c +--- gcc-4.6.3.orig/gcc/stor-layout.c 2012-02-20 16:09:48.000000000 -0600 ++++ gcc-4.6.3/gcc/stor-layout.c 2012-08-10 08:26:44.694722000 -0500 +@@ -660,12 +660,13 @@ + /* See if we can use an ordinary integer mode for a bit-field. + Conditions are: a fixed size that is correct for another mode, + occupying a complete byte or bytes on proper boundary, +- and not volatile or not -fstrict-volatile-bitfields. */ ++ and not -fstrict-volatile-bitfields. If the latter is set, ++ we unfortunately can't check TREE_THIS_VOLATILE, as a cast ++ may make a volatile object later. */ + if (TYPE_SIZE (type) != 0 + && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST + && GET_MODE_CLASS (TYPE_MODE (type)) == MODE_INT +- && !(TREE_THIS_VOLATILE (decl) +- && flag_strict_volatile_bitfields > 0)) ++ && flag_strict_volatile_bitfields <= 0) + { + enum machine_mode xmode + = mode_for_size_tree (DECL_SIZE (decl), MODE_INT, 1); +@@ -1926,9 +1927,17 @@ + TYPE_SIZE (type) = int_const_binop (MULT_EXPR, TYPE_SIZE (innertype), + bitsize_int (nunits), 0); + +- /* Always naturally align vectors. This prevents ABI changes +- depending on whether or not native vector modes are supported. */ +- TYPE_ALIGN (type) = tree_low_cst (TYPE_SIZE (type), 0); ++ /* For vector types, we do not default to the mode's alignment. ++ Instead, query a target hook, defaulting to natural alignment. ++ This prevents ABI changes depending on whether or not native ++ vector modes are supported. */ ++ TYPE_ALIGN (type) = targetm.vector_alignment (type); ++ ++ /* However, if the underlying mode requires a bigger alignment than ++ what the target hook provides, we cannot use the mode. For now, ++ simply reject that case. */ ++ gcc_assert (TYPE_ALIGN (type) ++ >= GET_MODE_ALIGNMENT (TYPE_MODE (type))); + break; + } + +diff -Naur gcc-4.6.3.orig/gcc/target.def gcc-4.6.3/gcc/target.def +--- gcc-4.6.3.orig/gcc/target.def 2011-06-04 05:15:48.000000000 -0500 ++++ gcc-4.6.3/gcc/target.def 2012-08-10 08:26:44.694722000 -0500 +@@ -1611,6 +1611,16 @@ + bool, (enum machine_mode mode), + hook_bool_mode_false) + ++DEFHOOK ++(vector_alignment, ++ "This hook can be used to define the alignment for a vector of type\n\ ++@var{type}, in order to comply with a platform ABI. The default is to\n\ ++require natural alignment for vector types. The alignment returned by\n\ ++this hook must be a power-of-two multiple of the default alignment of\n\ ++the vector element type.", ++ HOST_WIDE_INT, (const_tree type), ++ default_vector_alignment) ++ + /* Compute cost of moving data from a register of class FROM to one of + TO, using MODE. */ + DEFHOOK +diff -Naur gcc-4.6.3.orig/gcc/target.h gcc-4.6.3/gcc/target.h +--- gcc-4.6.3.orig/gcc/target.h 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/target.h 2012-03-02 08:51:58.551861000 -0600 +@@ -128,7 +128,8 @@ + scalar_to_vec, + cond_branch_not_taken, + cond_branch_taken, +- vec_perm ++ vec_perm, ++ vec_promote_demote + }; + + /* Sets of optimization levels at which an option may be enabled by +diff -Naur gcc-4.6.3.orig/gcc/targhooks.c gcc-4.6.3/gcc/targhooks.c +--- gcc-4.6.3.orig/gcc/targhooks.c 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/targhooks.c 2012-08-10 08:26:44.694722000 -0500 +@@ -529,6 +529,7 @@ + case scalar_to_vec: + case cond_branch_not_taken: + case vec_perm: ++ case vec_promote_demote: + return 1; + + case unaligned_load: +@@ -978,6 +979,13 @@ + return id; + } + ++/* Default to natural alignment for vector types. */ ++HOST_WIDE_INT ++default_vector_alignment (const_tree type) ++{ ++ return tree_low_cst (TYPE_SIZE (type), 0); ++} ++ + bool + default_builtin_vector_alignment_reachable (const_tree type, bool is_packed) + { +diff -Naur gcc-4.6.3.orig/gcc/targhooks.h gcc-4.6.3/gcc/targhooks.h +--- gcc-4.6.3.orig/gcc/targhooks.h 2011-01-14 09:02:20.000000000 -0600 ++++ gcc-4.6.3/gcc/targhooks.h 2012-08-10 08:26:44.694722000 -0500 +@@ -85,6 +85,8 @@ + + extern tree default_builtin_reciprocal (unsigned int, bool, bool); + ++extern HOST_WIDE_INT default_vector_alignment (const_tree); ++ + extern bool default_builtin_vector_alignment_reachable (const_tree, bool); + extern bool + default_builtin_support_vector_misalignment (enum machine_mode mode, +diff -Naur gcc-4.6.3.orig/gcc/testsuite/c-c++-common/abi-bf.c gcc-4.6.3/gcc/testsuite/c-c++-common/abi-bf.c +--- gcc-4.6.3.orig/gcc/testsuite/c-c++-common/abi-bf.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/c-c++-common/abi-bf.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,3 @@ ++/* { dg-warning "incompatible" } */ ++/* { dg-do compile } */ ++/* { dg-options "-fstrict-volatile-bitfields -fabi-version=1" } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/c-c++-common/pr33763.c gcc-4.6.3/gcc/testsuite/c-c++-common/pr33763.c +--- gcc-4.6.3.orig/gcc/testsuite/c-c++-common/pr33763.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/c-c++-common/pr33763.c 2012-10-05 07:01:59.135703000 -0500 +@@ -0,0 +1,60 @@ ++/* PR tree-optimization/33763 */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++ ++typedef struct ++{ ++ void *a; ++ void *b; ++} T; ++extern void *foo (const char *, const char *); ++extern void *bar (void *, const char *, T); ++extern int baz (const char *, int); ++ ++extern inline __attribute__ ((always_inline, gnu_inline)) int ++baz (const char *x, int y) ++{ ++ return 2; ++} ++ ++int ++baz (const char *x, int y) ++{ ++ return 1; ++} ++ ++int xa, xb; ++ ++static void * ++inl (const char *x, const char *y) ++{ ++ T t = { &xa, &xb }; ++ int *f = (int *) __builtin_malloc (sizeof (int)); ++ const char *z; ++ int o = 0; ++ void *r = 0; ++ ++ for (z = y; *z; z++) ++ { ++ if (*z == 'r') ++ o |= 1; ++ if (*z == 'w') ++ o |= 2; ++ } ++ if (o == 1) ++ *f = baz (x, 0); ++ if (o == 2) ++ *f = baz (x, 1); ++ if (o == 3) ++ *f = baz (x, 2); ++ ++ if (o && *f > 0) ++ r = bar (f, "w", t); ++ return r; ++} ++ ++void * ++foo (const char *x, const char *y) ++{ ++ return inl (x, y); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/limits-externdecl.c 2012-03-24 08:47:46.199387000 -0500 +@@ -0,0 +1,56 @@ ++/* Inspired by the test case for PR middle-end/52640. */ ++ ++typedef struct ++{ ++ char *value; ++} REFERENCE; ++ ++/* Add a few "extern int Xxxxxx ();" declarations. */ ++#undef DEF ++#undef LIM1 ++#undef LIM2 ++#undef LIM3 ++#undef LIM4 ++#undef LIM5 ++#undef LIM6 ++#define DEF(x) extern int x () ++#define LIM1(x) DEF(x##0); DEF(x##1); DEF(x##2); DEF(x##3); DEF(x##4); \ ++ DEF(x##5); DEF(x##6); DEF(x##7); DEF(x##8); DEF(x##9); ++#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ ++ LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) ++#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ ++ LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) ++#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ ++ LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) ++#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ ++ LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) ++#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ ++ LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) ++LIM5 (X); ++ ++/* Add references to them, or GCC will simply ignore the extern decls. */ ++#undef DEF ++#undef LIM1 ++#undef LIM2 ++#undef LIM3 ++#undef LIM4 ++#undef LIM5 ++#undef LIM6 ++#define DEF(x) (char *) x ++#define LIM1(x) DEF(x##0), DEF(x##1), DEF(x##2), DEF(x##3), DEF(x##4), \ ++ DEF(x##5), DEF(x##6), DEF(x##7), DEF(x##8), DEF(x##9), ++#define LIM2(x) LIM1(x##0) LIM1(x##1) LIM1(x##2) LIM1(x##3) LIM1(x##4) \ ++ LIM1(x##5) LIM1(x##6) LIM1(x##7) LIM1(x##8) LIM1(x##9) ++#define LIM3(x) LIM2(x##0) LIM2(x##1) LIM2(x##2) LIM2(x##3) LIM2(x##4) \ ++ LIM2(x##5) LIM2(x##6) LIM2(x##7) LIM2(x##8) LIM2(x##9) ++#define LIM4(x) LIM3(x##0) LIM3(x##1) LIM3(x##2) LIM3(x##3) LIM3(x##4) \ ++ LIM3(x##5) LIM3(x##6) LIM3(x##7) LIM3(x##8) LIM3(x##9) ++#define LIM5(x) LIM4(x##0) LIM4(x##1) LIM4(x##2) LIM4(x##3) LIM4(x##4) \ ++ LIM4(x##5) LIM4(x##6) LIM4(x##7) LIM4(x##8) LIM4(x##9) ++#define LIM6(x) LIM5(x##0) LIM5(x##1) LIM5(x##2) LIM5(x##3) LIM5(x##4) \ ++ LIM5(x##5) LIM5(x##6) LIM5(x##7) LIM5(x##8) LIM5(x##9) ++REFERENCE references[] = { ++ LIM5 (X) ++ 0 ++}; ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-1.c 2012-05-21 15:12:05.729358000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ int i = (0 ? 1 : 0U / 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr53418-2.c 2012-05-21 15:12:05.729358000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ int i = (1 ? 0U / 0 : 1); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-1.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 0 / 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-2.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 || 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-3.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 1 && 0 / 0 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-4.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 / 0 && 1 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-5.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ !(0 / 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54103-6.c 2012-09-14 19:28:05.208434000 -0500 +@@ -0,0 +1,5 @@ ++void ++f (void) ++{ ++ 0 || 65536*65536 ? : 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/compile/pr54552-1.c 2012-09-14 19:29:28.455504000 -0500 +@@ -0,0 +1,8 @@ ++void ++f (void) ++{ ++ unsigned n = 10; ++ ++ typedef double T[n]; ++ (double (*)[n])((unsigned char (*)[sizeof (T)]){ 0 }); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/20120427-1.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/20120427-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/20120427-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/20120427-1.c 2012-04-30 04:56:27.764158000 -0500 +@@ -0,0 +1,36 @@ ++typedef struct sreal ++{ ++ unsigned sig; /* Significant. */ ++ int exp; /* Exponent. */ ++} sreal; ++ ++sreal_compare (sreal *a, sreal *b) ++{ ++ if (a->exp > b->exp) ++ return 1; ++ if (a->exp < b->exp) ++ return -1; ++ if (a->sig > b->sig) ++ return 1; ++ return -(a->sig < b->sig); ++} ++ ++sreal a[] = { ++ { 0, 0 }, ++ { 1, 0 }, ++ { 0, 1 }, ++ { 1, 1 } ++}; ++ ++int main() ++{ ++ int i, j; ++ for (i = 0; i <= 3; i++) { ++ for (j = 0; j < 3; j++) { ++ if (i < j && sreal_compare(&a[i], &a[j]) != -1) abort(); ++ if (i == j && sreal_compare(&a[i], &a[j]) != 0) abort(); ++ if (i > j && sreal_compare(&a[i], &a[j]) != 1) abort(); ++ } ++ } ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/pr53084.c gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/pr53084.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.c-torture/execute/pr53084.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.c-torture/execute/pr53084.c 2012-04-24 01:14:37.854759000 -0500 +@@ -0,0 +1,18 @@ ++/* PR middle-end/53084 */ ++ ++extern void abort (void); ++ ++__attribute__((noinline, noclone)) void ++bar (const char *p) ++{ ++ if (p[0] != 'o' || p[1] != 'o' || p[2]) ++ abort (); ++} ++ ++int ++main () ++{ ++ static const char *const foo[] = {"foo" + 1}; ++ bar (foo[0]); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/20020201-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/20020201-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/20020201-1.c 2005-03-31 12:14:11.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/20020201-1.c 2012-08-06 02:11:07.208019000 -0500 +@@ -7,11 +7,7 @@ + /* { dg-options "-fprofile-arcs" } */ + /* { dg-do run { target native } } */ + +-extern void abort (void); +-extern void exit (int); +- +-int rand (void); +-void srand (unsigned int seed); ++#include <stdlib.h> + + int globvar; + +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/align-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/align-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/align-2.c 2004-10-19 14:21:41.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/align-2.c 2012-08-10 08:26:44.694722000 -0500 +@@ -1,5 +1,5 @@ + /* PR 17962 */ +-/* { dg-do compile } */ ++/* { dg-do compile { target vect_natural_alignment } } */ + /* { dg-options "" } */ + + typedef float v4 __attribute__((vector_size(sizeof(float)*4))); +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/c90-const-expr-8.c gcc-4.6.3/gcc/testsuite/gcc.dg/c90-const-expr-8.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/c90-const-expr-8.c 2009-06-12 17:06:47.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/c90-const-expr-8.c 2012-09-14 19:28:05.208434000 -0500 +@@ -22,6 +22,6 @@ + E5 = 0 * -INT_MIN, /* { dg-warning "12:integer overflow in expression" } */ + /* { dg-error "3:overflow in constant expression" "constant" { target *-*-* } 22 } */ + E6 = 0 * !-INT_MIN, /* { dg-warning "13:integer overflow in expression" } */ +- /* { dg-error "3:not an integer constant" "constant" { target *-*-* } 24 } */ ++ /* { dg-error "8:not an integer constant" "constant" { target *-*-* } 24 } */ + E7 = INT_MIN % -1 /* Not an overflow. */ + }; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr48374.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr48374.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr48374.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr48374.c 2012-10-30 03:25:16.725474000 -0500 +@@ -0,0 +1,17 @@ ++/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */ ++/* { dg-options "-O -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param max-sched-extend-regions-iters=2" } */ ++ ++void foo (int y) ++{ ++ switch (y) ++ { ++ case 3: ++ case 5: ++ case 7: ++ case 11: ++ break; ++ default: ++ __builtin_unreachable (); ++ } ++} ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr49948.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr49948.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr49948.c 2011-08-03 13:56:02.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr49948.c 2012-10-11 10:22:41.183494000 -0500 +@@ -1,5 +1,6 @@ + /* PR tree-optimization/49948 */ + /* { dg-do compile } */ ++/* { dg-require-effective-target pthread } */ + /* { dg-options "-O3 -ftree-parallelize-loops=2" } */ + + extern int a, *b; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr52862.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr52862.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr52862.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr52862.c 2012-05-22 04:17:42.260176000 -0500 +@@ -0,0 +1,9 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O" } */ ++ ++void ASMAtomicWritePtrVoid(const void *pv); ++void rtThreadDestroy(void) ++{ ++ void * const pvTypeChecked = ((void *)0); ++ ASMAtomicWritePtrVoid((void *)(pvTypeChecked)); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr53701.c gcc-4.6.3/gcc/testsuite/gcc.dg/pr53701.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/pr53701.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/pr53701.c 2012-10-22 14:34:35.215631000 -0500 +@@ -0,0 +1,59 @@ ++/* { dg-do compile { target powerpc*-*-* ia64-*-* i?86-*-* x86_64-*-* } } */ ++/* { dg-options "-O3 -fselective-scheduling2 -fsel-sched-pipelining" } */ ++typedef unsigned short int uint16_t; ++typedef unsigned long int uintptr_t; ++typedef struct GFX_VTABLE ++{ ++ int color_depth; ++ unsigned char *line[]; ++} ++BITMAP; ++extern int _drawing_mode; ++extern BITMAP *_drawing_pattern; ++extern int _drawing_y_anchor; ++extern unsigned int _drawing_x_mask; ++extern unsigned int _drawing_y_mask; ++extern uintptr_t bmp_write_line (BITMAP *, int); ++ void ++_linear_hline15 (BITMAP * dst, int dx1, int dy, int dx2, int color) ++{ ++ int w; ++ if (_drawing_mode == 0) ++ { ++ int x, curw; ++ unsigned short *sline = ++ (unsigned short *) (_drawing_pattern-> ++ line[((dy) - ++ _drawing_y_anchor) & _drawing_y_mask]); ++ unsigned short *s; ++ unsigned short *d = ++ ((unsigned short *) (bmp_write_line (dst, dy)) + (dx1)); ++ s = ((unsigned short *) (sline) + (x)); ++ if (_drawing_mode == 2) ++ { ++ } ++ else if (_drawing_mode == 3) ++ { ++ do ++ { ++ w -= curw; ++ do ++ { ++ unsigned long c = (*(s)); ++ if (!((unsigned long) (c) == 0x7C1F)) ++ { ++ (*((uint16_t *) ((uintptr_t) (d))) = ((color))); ++ } ++ ((s)++); ++ } ++ while (--curw > 0); ++ s = sline; ++ curw = ++ (((w) < ++ ((int) _drawing_x_mask + ++ 1)) ? (w) : ((int) _drawing_x_mask + 1)); ++ } ++ while (curw > 0); ++ } ++ } ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/stack-usage-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/stack-usage-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/stack-usage-1.c 2011-01-05 07:25:36.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/stack-usage-1.c 2012-06-20 02:54:17.441164000 -0500 +@@ -41,6 +41,8 @@ + # define SIZE 160 /* 256 - 96 bytes for register save area */ + #elif defined (__SPU__) + # define SIZE 224 ++#elif defined (__sh__) ++# define SIZE 252 + #else + # define SIZE 256 + #endif +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071-2.c 2012-05-22 04:23:01.937094000 -0500 +@@ -0,0 +1,38 @@ ++/* { dg-do compile } */ ++/* { dg-options "-fno-delete-null-pointer-checks" } */ ++ ++extern struct module __this_module; ++static inline void ++trace_module_get (struct module *mod, unsigned long ip) { } ++struct module; ++static inline __attribute__((no_instrument_function)) ++int try_module_get(struct module *module) ++{ ++ int ret = 1; ++ if (module) ++ { ++ if (module_is_live(module)) ++ { ++ __label__ __here; ++ asm(""); ++ __here: ++ trace_module_get(module, (unsigned long)&&__here); ++ } ++ else ++ ret = 0; ++ } ++ return ret; ++} ++struct net_device; ++struct net_device_ops { ++ int (*ndo_open)(struct net_device *dev); ++}; ++int t3e3_open(struct net_device *dev) ++{ ++ int ret = hdlc_open(dev); ++ if (ret) ++ return ret; ++ try_module_get((&__this_module)); ++ return 0; ++} ++const struct net_device_ops t3e3_ops = { .ndo_open = t3e3_open }; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr51071.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr51071.c 2012-05-22 04:23:01.937094000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do compile } */ ++ ++void foo (void); ++void bar (void *); ++extern int t; ++ ++static void kmalloc_large (int size, int flags) ++{ ++ (void) size; ++ (void) flags; ++ foo (); ++ bar (({__here:&&__here;})); ++} ++ ++static void kmalloc (int size, int flags) ++{ ++ if (size) ++ { ++ if ((unsigned long) size > 0x1000) ++ kmalloc_large (size, flags); ++ ++ if (flags) ++ bar (({__here:&&__here;})); ++ } ++} ++ ++void compress_file_range (int i, int j, int k) ++{ ++ int nr_pages = ({j < k;}); ++ ++ if (i || t) ++ kmalloc (0x1000UL * nr_pages, 0x40UL); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52407.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52407.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52407.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52407.c 2012-05-22 04:20:15.992160000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do run } */ ++ ++extern void abort (void); ++ ++typedef long long T; ++typedef T vl_t __attribute__((vector_size(2 * sizeof (T)))); ++ ++vl_t ul[4], vl[4] = { { 1, 2 }, { 3, 4 }, { 5, 6 }, { 7, 8 } }; ++ ++static void ++mul_vl_l(vl_t *u, vl_t *v, T x, int m) ++{ ++ vl_t w; ++ T *p = (T *)&w; ++ p[0] = p[1] = x; ++ while (m--) ++ *u++ = *v++ * w; ++} ++ ++int ++main(int argc, char *argv[]) ++{ ++ int i; ++ T *pl; ++ ++ pl = (T *) &ul; ++ mul_vl_l(ul, vl, 2, 4); ++ for (i = 0; i < 8; i++) ++ if (pl[i] != 2 * (i + 1)) ++ abort (); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52693.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52693.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr52693.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr52693.c 2012-03-28 13:03:28.014541000 -0500 +@@ -0,0 +1,33 @@ ++/* { dg-do run } */ ++ ++struct pair ++{ ++ int x; ++ int y; ++}; ++ ++struct array ++{ ++ struct pair elems[ 2 ]; ++ unsigned index; ++}; ++ ++extern void abort (); ++ ++void __attribute__ ((noinline,noclone)) ++test_results (int x1, int y1, int x2, int y2) ++{ ++ if (x1 != x2 || y1 != y2) ++ abort (); ++} ++ ++int ++main (void) ++{ ++ struct array arr = {{{1,2}, {3,4}}, 1}; ++ struct pair last = arr.elems[arr.index]; ++ ++ test_results ( last.x, last.y, arr.elems[1].x, arr.elems[1].y); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53790.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53790.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53790.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53790.c 2012-06-28 07:01:16.874415000 -0500 +@@ -0,0 +1,17 @@ ++/* { dg-do compile } */ ++ ++typedef struct s { ++ int value; ++} s_t; ++ ++static inline int ++read(s_t const *var) ++{ ++ return var->value; ++} ++ ++int main() ++{ ++ extern union u extern_var; ++ return read((s_t *)&extern_var); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53908.c gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53908.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/torture/pr53908.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/torture/pr53908.c 2012-07-16 04:36:04.162835000 -0500 +@@ -0,0 +1,288 @@ ++/* { dg-do run } */ ++/* SEGV at comment below. */ ++typedef unsigned int size_t; ++typedef enum har { ++ he_fatal = (-199), ++ he_not_initialized, ++ he_bad_input, ++ he_memory_too_small, ++ he_bad_action, ++ he_duplicate, ++ he_bad_nonce, ++ he_stale_nonce, ++ he_bad_credentials, ++ he_bad_user, ++ he_no_such_user, ++ he_bad_passwd, ++ he_unknown_auth_scheme, ++ he_not_found, ++ he_failed_digest_file_check, ++ he_failed_digest_file_save, ++ he_process_not_privileged, ++ he_other, ++ he_end_of_range, ++ ha_no_error = 0, ++ ha_no_value = 1 ++} har; ++typedef enum realm_type ++{ ++ axis_realm = 0, ++ ws_realm ++} realm_type; ++ ++__attribute__((__noclone__, __noinline__)) ++har has_www_auth(char *, size_t, realm_type, har); ++ ++__attribute__((__noclone__, __noinline__)) ++har has_auth_user(const char *, const char *, realm_type, char *, size_t); ++ ++__attribute__((__noclone__, __noinline__)) ++char *ha_get_string_value(void); ++ ++typedef struct ++{ ++ unsigned int track_id; ++ char* user; ++ char* realm; ++ char* authent; ++ int internal_realm; ++} request; ++enum user_response { ++ file_not_found_user_response = -3, ++ access_denied_user_response = -2, ++ no_user_response = -1, ++ ok_user_response = 0 ++}; ++struct realm_group { ++ char *name; ++ int id; ++ struct realm_group *next; ++}; ++struct realm { ++ char *name; ++ char *space; ++ struct realm_group *groups; ++ struct realm *next; ++}; ++struct user_info { ++ char *name; ++ int no_groups; ++ int groups[128]; ++ struct user_info *next; ++}; ++static struct user_info *find_user(const char *user_name); ++static int is_member_of_groups(const struct user_info *user_item, ++ const struct realm_group *groups); ++int authent_author(request *req); ++struct realm *realms = ((void *)0); ++struct user_info *users = ((void *)0); ++static struct user_info* ++find_user(const char *user_name) ++{ ++ struct user_info *user_item; ++ user_item = users; ++ while (user_item != ((void *)0)) { ++ /* SEGV due to NULL access here on user_name. See also comment below. */ ++ if ((__builtin_strcmp(user_item->name, user_name) == 0)) ++ break; ++ user_item = user_item->next; ++ } ++ return user_item; ++} ++static int ++is_member_of_groups(const struct user_info *user_item, ++ const struct realm_group *groups) ++{ ++ const struct realm_group *group_item; ++ int i; ++ group_item = groups; ++ while (group_item != ((void *)0)) { ++ for (i = 0; i < user_item->no_groups; i++) ++ if (user_item->groups[i] == group_item->id) ++ return 0; ++ group_item = group_item->next; ++ } ++ return -1; ++} ++char *foo (void) __attribute__((__noclone__, __noinline__)); ++char* g_strdup (const char *str) __attribute__((__malloc__, __noclone__, __noinline__)); ++int g_strcmp0 (const char *str1, const char *str2); ++static int ++is_basic(char **user) ++{ ++ char *passwd_ptr; ++ char *authent = foo(); ++ passwd_ptr = __builtin_strchr(authent, ':'); ++ if (passwd_ptr != ((void *)0)) { ++ *user = g_strdup(authent); ++ return 0; ++ } ++ return -1; ++} ++static int ++is_digest(char **user) ++{ ++ int ret_val = -1; ++ char *authent; ++ authent = ha_get_string_value(); ++ if (authent) { ++ *user = g_strdup(authent); ++ ret_val = 0; ++ } ++ return ret_val; ++} ++__attribute__((__noclone__, __noinline__)) ++void g_free (void * mem); ++static enum user_response ++get_user_info_from_header(const realm_type type, ++ char **user_name, ++ struct user_info **user_item) ++{ ++ int ret_val = no_user_response; ++ if ((type == ws_realm)) { ++ if (is_basic(user_name) == 0) ++ ret_val = access_denied_user_response; ++ if (is_digest(user_name) == 0) ++ ret_val = ok_user_response; ++ } else { ++ if (is_basic(user_name) < 0 && ++ /* Load of *user_name here, but not after the is_digest call. */ ++ is_digest(user_name) < 0) ++ ; ++ else if ((*user_item = find_user(*user_name)) != ((void *)0)) ++ ret_val = ok_user_response; ++ else ++ ret_val = access_denied_user_response; ++ if (ret_val != ok_user_response) ++ g_free(*user_name); ++ } ++ return ret_val; ++} ++static enum user_response ++authenticate_user(request *req, ++ char **user_name, ++ struct user_info **user_item) ++{ ++ char *authent = ((void *)0); ++ har resp = ha_no_value; ++ enum user_response user_resp; ++ int ret_val = no_user_response; ++ if (req->authent && __builtin_strlen(req->authent)) { ++ authent = req->authent; ++ user_resp = get_user_info_from_header(req->internal_realm, ++ user_name, ++ user_item); ++ if (user_resp == ok_user_response) { ++ resp = has_auth_user(authent, 0, req->internal_realm, "", 1); ++ if (resp == ha_no_error) ++ ret_val = ok_user_response; ++ else if (resp != he_stale_nonce) ++ ret_val = access_denied_user_response; ++ } else if (user_resp == access_denied_user_response) ++ ret_val = access_denied_user_response; ++ } ++ if (resp != he_memory_too_small && resp != ha_no_error) ++ resp = has_www_auth("", 1, req->internal_realm, resp); ++ return ret_val; ++} ++ ++int __attribute__ ((__noinline__, __noclone__)) ++authent_author(request *req) ++{ ++ struct realm *realm; ++ char *user_name = ((void *)0); ++ struct user_info *user_item = ((void *)0); ++ int res = 0; ++ asm (""); ++ realm = realms; ++ if (__builtin_strcmp("Wsd", realm->name) == 0) { ++ req->internal_realm = ws_realm; ++ is_digest(&user_name); ++ } ++ if (authenticate_user(req, &user_name, &user_item) < 0) { ++ if (user_name != ((void *)0)) ++ req->user = user_name; ++ res = -2; ++ goto authent_author_return; ++ } ++ if (is_member_of_groups(user_item, realm->groups) < 0) ++ res = -1; ++authent_author_return: ++ return res; ++} ++ ++int good0, good1, good2; ++ ++__attribute__ ((__noinline__, __noclone__)) ++char *foo(void) ++{ ++ asm (""); ++ good0++; ++ return ""; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++char *ha_get_string_value(void) ++{ ++ asm (""); ++ good1++; ++ return "f"; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++har has_auth_user(const char *a, const char *b, realm_type c, char *d, size_t e) ++{ ++ asm (""); ++ if (*a != 'z' || a[1] != 0 || b != 0 || c != axis_realm || *d != 0 ++ || e != 1) ++ __builtin_abort (); ++ return ha_no_error; ++} ++ ++__attribute__ ((__noinline__, __noclone__)) ++har has_www_auth(char *a, size_t b, realm_type c, har d) ++{ ++ (void)(*a+b+c+d); ++ asm (""); ++ __builtin_abort (); ++} ++ ++ ++char *strdupped_user = "me"; ++__attribute__((__malloc__, __noclone__, __noinline__)) ++char* g_strdup (const char *str) ++{ ++ asm (""); ++ if (*str != 'f') ++ __builtin_abort (); ++ good2++; ++ return strdupped_user; ++} ++ ++__attribute__((__noclone__, __noinline__)) ++void g_free (void * mem) ++{ ++ (void)mem; ++ asm (""); ++ __builtin_abort (); ++} ++ ++struct user_info me = { .name = "me", .no_groups = 1, .groups = {42}, .next = 0}; ++struct user_info you = { .name = "you", .next = &me}; ++struct realm_group xgroups = { .name = "*", .id = 42, .next = 0}; ++ ++int main(void) ++{ ++ char *orig_user = "?"; ++ struct realm r = { .name = "x", .space = "space?", .groups = &xgroups, .next = 0}; ++ request req = { .user = orig_user, .realm = "!", .authent = "z", ++ .internal_realm = axis_realm}; ++ realms = &r; ++ users = &you; ++ if (authent_author (&req) != 0 || good0 != 1 || good1 != 1 || good2 != 1 ++ || req.user != orig_user ++ || req.internal_realm != axis_realm) ++ __builtin_abort (); ++ __builtin_exit (0); ++} ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/slp-25.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/slp-25.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/slp-25.c 2010-10-04 09:59:30.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/slp-25.c 2012-08-10 08:26:44.694722000 -0500 +@@ -57,5 +57,5 @@ + + /* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { vect_no_align } } } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 2 "vect" { xfail { vect_no_align || { ! vect_natural_alignment } } } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-1.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-1.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-1.c 2012-08-10 08:26:44.694722000 -0500 +@@ -49,6 +49,6 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target vect_element_align } } } */ ++/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ + /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-2.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-2.c 2012-08-10 08:26:44.694722000 -0500 +@@ -50,6 +50,6 @@ + } + + /* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ +-/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target vect_element_align } } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target vect_element_align } } } */ ++/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { target { { vect_element_align } && { vect_aligned_arrays } } } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-3.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-3.c 2010-11-22 07:59:45.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-3.c 2012-08-10 08:26:44.694722000 -0500 +@@ -4,9 +4,7 @@ + #include "tree-vect.h" + + #define N 128 +-#define RES 21888 +- +-/* unaligned store. */ ++#define RES 21640 + + int ib[N+10]; + int ia[N+10]; +@@ -18,11 +16,11 @@ + int i, suma = 0, sumb = 0, sumc = 0; + + /* ib and ic have same misalignment, we peel to align them. */ +- for (i = 1; i <= N; i++) ++ for (i = 0; i <= N; i++) + { + suma += ia[i]; +- sumb += ib[i+6]; +- sumc += ic[i+2]; ++ sumb += ib[i+5]; ++ sumc += ic[i+1]; + } + + /* check results: */ +@@ -49,7 +47,7 @@ + return main1 (); + } + +-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail vect_no_align } } } */ +-/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-4.c gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/vect/vect-peel-4.c 2011-01-10 06:41:40.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/vect/vect-peel-4.c 2012-08-10 08:26:44.694722000 -0500 +@@ -16,13 +16,13 @@ + /* Don't peel keeping one load and the store aligned. */ + for (i = 0; i <= N; i++) + { +- ia[i] = ib[i] + ib[i+6]; ++ ia[i] = ib[i] + ib[i+5]; + } + + /* check results: */ + for (i = 1; i <= N; i++) + { +- if (ia[i] != ib[i] + ib[i+6]) ++ if (ia[i] != ib[i] + ib[i+5]) + abort (); + } + +@@ -44,7 +44,7 @@ + return main1 (); + } + +-/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" } } */ ++/* { dg-final { scan-tree-dump-times "vectorized 1 loops" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 1 "vect" { xfail vect_no_align } } } */ + /* { dg-final { scan-tree-dump-times "Alignment of access forced using peeling" 0 "vect" } } */ + /* { dg-final { cleanup-tree-dump "vect" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.dg/volatile-bitfields-2.c gcc-4.6.3/gcc/testsuite/gcc.dg/volatile-bitfields-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.dg/volatile-bitfields-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.dg/volatile-bitfields-2.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,15 @@ ++/* { dg-do run } */ ++/* { dg-options "-fstrict-volatile-bitfields" } */ ++ ++extern void abort(void); ++struct thing { ++ volatile unsigned short a: 8; ++ volatile unsigned short b: 8; ++} t = {1,2}; ++ ++int main() ++{ ++ t.a = 3; ++ if (t.a !=3 || t.b !=2) abort(); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c gcc-4.6.3/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/arm/volatile-bitfields-4.c 2012-03-28 21:15:29.973365000 -0500 +@@ -0,0 +1,30 @@ ++/* { dg-require-effective-target arm_eabi } */ ++/* { dg-do compile } */ ++/* { dg-options "-O2" } */ ++/* { dg-final { scan-assembler-times "ldr\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ ++/* { dg-final { scan-assembler-times "str\[\\t \]+\[^\n\]*,\[\\t \]*\\\[\[^\n\]*\\\]" 2 } } */ ++/* { dg-final { scan-assembler-not "strb" } } */ ++ ++struct thing { ++ unsigned a: 8; ++ unsigned b: 8; ++ unsigned c: 8; ++ unsigned d: 8; ++}; ++ ++struct thing2 { ++ volatile unsigned a: 8; ++ volatile unsigned b: 8; ++ volatile unsigned c: 8; ++ volatile unsigned d: 8; ++}; ++ ++void test1(volatile struct thing *t) ++{ ++ t->a = 5; ++} ++ ++void test2(struct thing2 *t) ++{ ++ t->a = 5; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-1.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movups256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movups/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movups256/1" } } */ ++/* { dg-final { scan-assembler "avx_movups/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-2.c 2012-05-14 16:32:29.729958000 -0500 +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "\\*avx_movdqu256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movdqu/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movdqu256/1" } } */ ++/* { dg-final { scan-assembler "avx_movdqu/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-3.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + c[i] = a[i] * b[i+3]; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movupd256/1" } } */ +-/* { dg-final { scan-assembler "\\*avx_movupd/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movupd256/1" } } */ ++/* { dg-final { scan-assembler "avx_movupd/1" } } */ + /* { dg-final { scan-assembler "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,6 +14,6 @@ + b[i] = a[i+3] * 2; + } + +-/* { dg-final { scan-assembler "\\*avx_movups256/1" } } */ +-/* { dg-final { scan-assembler-not "\\*avx_movups/1" } } */ ++/* { dg-final { scan-assembler "avx_movups256/1" } } */ ++/* { dg-final { scan-assembler-not "avx_movups/1" } } */ + /* { dg-final { scan-assembler-not "vinsertf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c 2012-05-14 16:32:29.729958000 -0500 +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movups256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movups256/2" } } */ + /* { dg-final { scan-assembler "movups.*\\*avx_movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-2.c 2012-05-14 16:32:29.729958000 -0500 +@@ -24,6 +24,6 @@ + } + } + +-/* { dg-final { scan-assembler-not "\\*avx_movdqu256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movdqu256/2" } } */ + /* { dg-final { scan-assembler "movdqu.*\\*avx_movv16qi_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c 2012-05-14 16:32:29.729958000 -0500 +@@ -17,6 +17,6 @@ + d[i] = c[i] * 20.0; + } + +-/* { dg-final { scan-assembler-not "\\*avx_movupd256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movupd256/2" } } */ + /* { dg-final { scan-assembler "movupd.*\\*avx_movv2df_internal/3" } } */ + /* { dg-final { scan-assembler "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c 2011-06-28 18:27:06.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c 2012-05-14 16:32:29.729958000 -0500 +@@ -14,7 +14,7 @@ + b[i+3] = a[i] * c[i]; + } + +-/* { dg-final { scan-assembler "\\*avx_movups256/2" } } */ +-/* { dg-final { scan-assembler-not "\\*avx_movups/2" } } */ ++/* { dg-final { scan-assembler "avx_movups256/2" } } */ ++/* { dg-final { scan-assembler-not "avx_movups/2" } } */ + /* { dg-final { scan-assembler-not "\\*avx_movv4sf_internal/3" } } */ + /* { dg-final { scan-assembler-not "vextractf128" } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr52736.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr52736.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr52736.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr52736.c 2012-03-28 03:09:55.449307000 -0500 +@@ -0,0 +1,29 @@ ++/* PR target/52736 */ ++/* { dg-do run } */ ++/* { dg-options "-O1 -msse2" } */ ++/* { dg-require-effective-target sse2_runtime } */ ++ ++#include <x86intrin.h> ++ ++typedef double D __attribute__((may_alias)); ++__attribute__((aligned(16))) static const double r[4] = { 1., 5., 1., 3. }; ++ ++__attribute__((noinline, noclone)) ++void ++foo (int x) ++{ ++ asm volatile ("" : "+g" (x) : : "memory"); ++ if (x != 3) ++ __builtin_abort (); ++} ++ ++int ++main () ++{ ++ __m128d t = _mm_set1_pd (5.); ++ ((D *)(&t))[0] = 1.; ++ foo (_mm_movemask_pd (_mm_cmpeq_pd (t, _mm_load_pd (&r[0])))); ++ ((D *)(&t))[1] = 3.; ++ foo (_mm_movemask_pd (_mm_cmpeq_pd (t, _mm_load_pd (&r[2])))); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr53416.c gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr53416.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/i386/pr53416.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/i386/pr53416.c 2012-05-21 07:59:53.696085000 -0500 +@@ -0,0 +1,17 @@ ++/* PR target/53416 */ ++/* { dg-options "-O2 -mrdrnd" } */ ++ ++int test (void) ++{ ++ unsigned int number = 0; ++ int result0, result1, result2, result3; ++ ++ result0 = __builtin_ia32_rdrand32_step (&number); ++ result1 = __builtin_ia32_rdrand32_step (&number); ++ result2 = __builtin_ia32_rdrand32_step (&number); ++ result3 = __builtin_ia32_rdrand32_step (&number); ++ ++ return result0 + result1 +result2 + result3; ++} ++ ++/* { dg-final { scan-assembler-times "rdrand" 4 } } */ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-1.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvlx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc1(long a, void *p) { return __builtin_altivec_lvlx (a,p); } ++vsf llx01(long a, vsf *p) { return __builtin_vec_lvlx (a,p); } ++vsf llx02(long a, sf *p) { return __builtin_vec_lvlx (a,p); } ++vbi llx03(long a, vbi *p) { return __builtin_vec_lvlx (a,p); } ++vsi llx04(long a, vsi *p) { return __builtin_vec_lvlx (a,p); } ++vsi llx05(long a, si *p) { return __builtin_vec_lvlx (a,p); } ++vui llx06(long a, vui *p) { return __builtin_vec_lvlx (a,p); } ++vui llx07(long a, ui *p) { return __builtin_vec_lvlx (a,p); } ++vbs llx08(long a, vbs *p) { return __builtin_vec_lvlx (a,p); } ++vp llx09(long a, vp *p) { return __builtin_vec_lvlx (a,p); } ++vss llx10(long a, vss *p) { return __builtin_vec_lvlx (a,p); } ++vss llx11(long a, ss *p) { return __builtin_vec_lvlx (a,p); } ++vus llx12(long a, vus *p) { return __builtin_vec_lvlx (a,p); } ++vus llx13(long a, us *p) { return __builtin_vec_lvlx (a,p); } ++vbc llx14(long a, vbc *p) { return __builtin_vec_lvlx (a,p); } ++vsc llx15(long a, vsc *p) { return __builtin_vec_lvlx (a,p); } ++vsc llx16(long a, sc *p) { return __builtin_vec_lvlx (a,p); } ++vuc llx17(long a, vuc *p) { return __builtin_vec_lvlx (a,p); } ++vuc llx18(long a, uc *p) { return __builtin_vec_lvlx (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-2.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvlxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc2(long a, void *p) { return __builtin_altivec_lvlxl (a,p); } ++vsf llxl01(long a, vsf *p) { return __builtin_vec_lvlxl (a,p); } ++vsf llxl02(long a, sf *p) { return __builtin_vec_lvlxl (a,p); } ++vbi llxl03(long a, vbi *p) { return __builtin_vec_lvlxl (a,p); } ++vsi llxl04(long a, vsi *p) { return __builtin_vec_lvlxl (a,p); } ++vsi llxl05(long a, si *p) { return __builtin_vec_lvlxl (a,p); } ++vui llxl06(long a, vui *p) { return __builtin_vec_lvlxl (a,p); } ++vui llxl07(long a, ui *p) { return __builtin_vec_lvlxl (a,p); } ++vbs llxl08(long a, vbs *p) { return __builtin_vec_lvlxl (a,p); } ++vp llxl09(long a, vp *p) { return __builtin_vec_lvlxl (a,p); } ++vss llxl10(long a, vss *p) { return __builtin_vec_lvlxl (a,p); } ++vss llxl11(long a, ss *p) { return __builtin_vec_lvlxl (a,p); } ++vus llxl12(long a, vus *p) { return __builtin_vec_lvlxl (a,p); } ++vus llxl13(long a, us *p) { return __builtin_vec_lvlxl (a,p); } ++vbc llxl14(long a, vbc *p) { return __builtin_vec_lvlxl (a,p); } ++vsc llxl15(long a, vsc *p) { return __builtin_vec_lvlxl (a,p); } ++vsc llxl16(long a, sc *p) { return __builtin_vec_lvlxl (a,p); } ++vuc llxl17(long a, vuc *p) { return __builtin_vec_lvlxl (a,p); } ++vuc llxl18(long a, uc *p) { return __builtin_vec_lvlxl (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvrx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc3(long a, void *p) { return __builtin_altivec_lvrx (a,p); } ++vsf lrx01(long a, vsf *p) { return __builtin_vec_lvrx (a,p); } ++vsf lrx02(long a, sf *p) { return __builtin_vec_lvrx (a,p); } ++vbi lrx03(long a, vbi *p) { return __builtin_vec_lvrx (a,p); } ++vsi lrx04(long a, vsi *p) { return __builtin_vec_lvrx (a,p); } ++vsi lrx05(long a, si *p) { return __builtin_vec_lvrx (a,p); } ++vui lrx06(long a, vui *p) { return __builtin_vec_lvrx (a,p); } ++vui lrx07(long a, ui *p) { return __builtin_vec_lvrx (a,p); } ++vbs lrx08(long a, vbs *p) { return __builtin_vec_lvrx (a,p); } ++vp lrx09(long a, vp *p) { return __builtin_vec_lvrx (a,p); } ++vss lrx10(long a, vss *p) { return __builtin_vec_lvrx (a,p); } ++vss lrx11(long a, ss *p) { return __builtin_vec_lvrx (a,p); } ++vus lrx12(long a, vus *p) { return __builtin_vec_lvrx (a,p); } ++vus lrx13(long a, us *p) { return __builtin_vec_lvrx (a,p); } ++vbc lrx14(long a, vbc *p) { return __builtin_vec_lvrx (a,p); } ++vsc lrx15(long a, vsc *p) { return __builtin_vec_lvrx (a,p); } ++vsc lrx16(long a, sc *p) { return __builtin_vec_lvrx (a,p); } ++vuc lrx17(long a, vuc *p) { return __builtin_vec_lvrx (a,p); } ++vuc lrx18(long a, uc *p) { return __builtin_vec_lvrx (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-4.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "lvrxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++vsc lc4(long a, void *p) { return __builtin_altivec_lvrxl (a,p); } ++vsf lrxl01(long a, vsf *p) { return __builtin_vec_lvrxl (a,p); } ++vsf lrxl02(long a, sf *p) { return __builtin_vec_lvrxl (a,p); } ++vbi lrxl03(long a, vbi *p) { return __builtin_vec_lvrxl (a,p); } ++vsi lrxl04(long a, vsi *p) { return __builtin_vec_lvrxl (a,p); } ++vsi lrxl05(long a, si *p) { return __builtin_vec_lvrxl (a,p); } ++vui lrxl06(long a, vui *p) { return __builtin_vec_lvrxl (a,p); } ++vui lrxl07(long a, ui *p) { return __builtin_vec_lvrxl (a,p); } ++vbs lrxl08(long a, vbs *p) { return __builtin_vec_lvrxl (a,p); } ++vp lrxl09(long a, vp *p) { return __builtin_vec_lvrxl (a,p); } ++vss lrxl10(long a, vss *p) { return __builtin_vec_lvrxl (a,p); } ++vss lrxl11(long a, ss *p) { return __builtin_vec_lvrxl (a,p); } ++vus lrxl12(long a, vus *p) { return __builtin_vec_lvrxl (a,p); } ++vus lrxl13(long a, us *p) { return __builtin_vec_lvrxl (a,p); } ++vbc lrxl14(long a, vbc *p) { return __builtin_vec_lvrxl (a,p); } ++vsc lrxl15(long a, vsc *p) { return __builtin_vec_lvrxl (a,p); } ++vsc lrxl16(long a, sc *p) { return __builtin_vec_lvrxl (a,p); } ++vuc lrxl17(long a, vuc *p) { return __builtin_vec_lvrxl (a,p); } ++vuc lrxl18(long a, uc *p) { return __builtin_vec_lvrxl (a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvlx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc1(vsc v, long a, void *p) { __builtin_altivec_stvlx (v,a,p); } ++void slx01(vsf v, long a, vsf *p) { __builtin_vec_stvlx (v,a,p); } ++void slx02(vsf v, long a, sf *p) { __builtin_vec_stvlx (v,a,p); } ++void slx03(vbi v, long a, vbi *p) { __builtin_vec_stvlx (v,a,p); } ++void slx04(vsi v, long a, vsi *p) { __builtin_vec_stvlx (v,a,p); } ++void slx05(vsi v, long a, si *p) { __builtin_vec_stvlx (v,a,p); } ++void slx06(vui v, long a, vui *p) { __builtin_vec_stvlx (v,a,p); } ++void slx07(vui v, long a, ui *p) { __builtin_vec_stvlx (v,a,p); } ++void slx08(vbs v, long a, vbs *p) { __builtin_vec_stvlx (v,a,p); } ++void slx09(vp v, long a, vp *p) { __builtin_vec_stvlx (v,a,p); } ++void slx10(vss v, long a, vss *p) { __builtin_vec_stvlx (v,a,p); } ++void slx11(vss v, long a, ss *p) { __builtin_vec_stvlx (v,a,p); } ++void slx12(vus v, long a, vus *p) { __builtin_vec_stvlx (v,a,p); } ++void slx13(vus v, long a, us *p) { __builtin_vec_stvlx (v,a,p); } ++void slx14(vbc v, long a, vbc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx15(vsc v, long a, vsc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx16(vsc v, long a, sc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx17(vuc v, long a, vuc *p) { __builtin_vec_stvlx (v,a,p); } ++void slx18(vuc v, long a, uc *p) { __builtin_vec_stvlx (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvlxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc2(vsc v, long a, void *p) { __builtin_altivec_stvlxl (v,a,p); } ++void slxl01(vsf v, long a, vsf *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl02(vsf v, long a, sf *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl03(vbi v, long a, vbi *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl04(vsi v, long a, vsi *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl05(vsi v, long a, si *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl06(vui v, long a, vui *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl07(vui v, long a, ui *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl08(vbs v, long a, vbs *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl09(vp v, long a, vp *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl10(vss v, long a, vss *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl11(vss v, long a, ss *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl12(vus v, long a, vus *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl13(vus v, long a, us *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl14(vbc v, long a, vbc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl15(vsc v, long a, vsc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl16(vsc v, long a, sc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl17(vuc v, long a, vuc *p) { __builtin_vec_stvlxl (v,a,p); } ++void slxl18(vuc v, long a, uc *p) { __builtin_vec_stvlxl (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvrx" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc3(vsc v, long a, void *p) { __builtin_altivec_stvrx (v,a,p); } ++void srx01(vsf v, long a, vsf *p) { __builtin_vec_stvrx (v,a,p); } ++void srx02(vsf v, long a, sf *p) { __builtin_vec_stvrx (v,a,p); } ++void srx03(vbi v, long a, vbi *p) { __builtin_vec_stvrx (v,a,p); } ++void srx04(vsi v, long a, vsi *p) { __builtin_vec_stvrx (v,a,p); } ++void srx05(vsi v, long a, si *p) { __builtin_vec_stvrx (v,a,p); } ++void srx06(vui v, long a, vui *p) { __builtin_vec_stvrx (v,a,p); } ++void srx07(vui v, long a, ui *p) { __builtin_vec_stvrx (v,a,p); } ++void srx08(vbs v, long a, vbs *p) { __builtin_vec_stvrx (v,a,p); } ++void srx09(vp v, long a, vp *p) { __builtin_vec_stvrx (v,a,p); } ++void srx10(vss v, long a, vss *p) { __builtin_vec_stvrx (v,a,p); } ++void srx11(vss v, long a, ss *p) { __builtin_vec_stvrx (v,a,p); } ++void srx12(vus v, long a, vus *p) { __builtin_vec_stvrx (v,a,p); } ++void srx13(vus v, long a, us *p) { __builtin_vec_stvrx (v,a,p); } ++void srx14(vbc v, long a, vbc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx15(vsc v, long a, vsc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx16(vsc v, long a, sc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx17(vuc v, long a, vuc *p) { __builtin_vec_stvrx (v,a,p); } ++void srx18(vuc v, long a, uc *p) { __builtin_vec_stvrx (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c 2012-06-04 12:42:25.267281000 -0500 +@@ -0,0 +1,48 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-require-effective-target powerpc_altivec_ok } */ ++/* { dg-options "-O2 -maltivec -mcpu=cell" } */ ++/* { dg-final { scan-assembler-times "stvrxl" 19 } } */ ++ ++#include <altivec.h> ++ ++typedef __vector signed char vsc; ++typedef __vector signed short vss; ++typedef __vector signed int vsi; ++typedef __vector unsigned char vuc; ++typedef __vector unsigned short vus; ++typedef __vector unsigned int vui; ++typedef __vector bool char vbc; ++typedef __vector bool short vbs; ++typedef __vector bool int vbi; ++typedef __vector float vsf; ++typedef __vector pixel vp; ++typedef signed char sc; ++typedef signed short ss; ++typedef signed int si; ++typedef signed long sl; ++typedef unsigned char uc; ++typedef unsigned short us; ++typedef unsigned int ui; ++typedef unsigned long ul; ++typedef float sf; ++ ++void sc4(vsc v, long a, void *p) { __builtin_altivec_stvrxl (v,a,p); } ++void srxl01(vsf v, long a, vsf *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl02(vsf v, long a, sf *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl03(vbi v, long a, vbi *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl04(vsi v, long a, vsi *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl05(vsi v, long a, si *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl06(vui v, long a, vui *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl07(vui v, long a, ui *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl08(vbs v, long a, vbs *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl09(vp v, long a, vp *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl10(vss v, long a, vss *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl11(vss v, long a, ss *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl12(vus v, long a, vus *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl13(vus v, long a, us *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl14(vbc v, long a, vbc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl15(vsc v, long a, vsc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl16(vsc v, long a, sc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl17(vuc v, long a, vuc *p) { __builtin_vec_stvrxl (v,a,p); } ++void srxl18(vuc v, long a, uc *p) { __builtin_vec_stvrxl (v,a,p); } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52457.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52457.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52457.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52457.c 2012-03-02 16:12:52.237313000 -0600 +@@ -0,0 +1,34 @@ ++/* { dg-do run { target { powerpc*-*-linux* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-skip-if "" { powerpc*-*-*spe* } { "*" } { "" } } */ ++/* { dg-require-effective-target vsx_hw } */ ++/* { dg-options "-O1 -mcpu=power7" } */ ++ ++extern void abort (void); ++ ++typedef long long T; ++typedef T vl_t __attribute__((vector_size(2 * sizeof (T)))); ++ ++vl_t ++buggy_func (T x) ++{ ++ vl_t w; ++ T *p = (T *)&w; ++ p[0] = p[1] = x; ++ return w; ++} ++ ++int ++main(void) ++{ ++ vl_t rval; ++ T *pl; ++ ++ pl = (T *) &rval; ++ rval = buggy_func (2); ++ ++ if (pl[0] != 2 || pl[1] != 2) ++ abort (); ++ ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52775.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52775.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr52775.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr52775.c 2012-04-13 16:55:15.746111000 -0500 +@@ -0,0 +1,16 @@ ++/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-options "-O1 -mcpu=power4" } */ ++/* { dg-final { scan-assembler-times "fcfid" 2 } } */ ++ ++double ++int_to_double (int *p) ++{ ++ return (double)*p; ++} ++ ++double ++long_long_to_double (long long *p) ++{ ++ return (double)*p; ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr53199.c gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr53199.c +--- gcc-4.6.3.orig/gcc/testsuite/gcc.target/powerpc/pr53199.c 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gcc.target/powerpc/pr53199.c 2012-05-03 19:31:50.505528000 -0500 +@@ -0,0 +1,50 @@ ++/* { dg-do compile { target { powerpc*-*-* } } } */ ++/* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */ ++/* { dg-options "-O2 -mcpu=power6 -mavoid-indexed-addresses" } */ ++/* { dg-final { scan-assembler-times "lwbrx" 6 } } */ ++/* { dg-final { scan-assembler-times "stwbrx" 6 } } */ ++ ++/* PR 51399: bswap gets an error if -mavoid-indexed-addresses was used in ++ creating the two lwbrx instructions. */ ++ ++long long ++load64_reverse_1 (long long *p) ++{ ++ return __builtin_bswap64 (*p); ++} ++ ++long long ++load64_reverse_2 (long long *p) ++{ ++ return __builtin_bswap64 (p[1]); ++} ++ ++long long ++load64_reverse_3 (long long *p, int i) ++{ ++ return __builtin_bswap64 (p[i]); ++} ++ ++void ++store64_reverse_1 (long long *p, long long x) ++{ ++ *p = __builtin_bswap64 (x); ++} ++ ++void ++store64_reverse_2 (long long *p, long long x) ++{ ++ p[1] = __builtin_bswap64 (x); ++} ++ ++void ++store64_reverse_3 (long long *p, long long x, int i) ++{ ++ p[i] = __builtin_bswap64 (x); ++} ++ ++long long ++reg_reverse (long long x) ++{ ++ return __builtin_bswap64 (x); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/nullptr28.C gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/nullptr28.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/nullptr28.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/nullptr28.C 2012-07-03 18:29:03.323158000 -0500 +@@ -0,0 +1,17 @@ ++// { dg-do run } ++// { dg-options "-std=c++0x -pedantic-errors" } ++ ++typedef decltype(nullptr) nullptr_t; ++ ++int i; ++nullptr_t n; ++const nullptr_t& f() { ++i; return n; } ++ ++nullptr_t g() { return f(); } ++ ++int main() ++{ ++ g(); ++ if (i != 1) ++ __builtin_abort (); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/cpp0x/variadic-value1.C 2012-05-23 16:29:55.463235000 -0500 +@@ -0,0 +1,24 @@ ++// PR c++/52796 ++// { dg-options "-std=c++0x -pedantic-errors" } ++ ++inline void *operator new(__SIZE_TYPE__ s, void *p) { return p; } ++ ++struct A ++{ ++ int i; ++ template<class... Ts> ++ A(Ts&&... ts): i(ts...) { } ++}; ++ ++static union { ++ unsigned char c[sizeof(A)]; ++ int i; ++}; ++ ++int main() ++{ ++ i = 0xdeadbeef; ++ new(c) A; ++ if (i != 0) ++ __builtin_abort(); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/template/anonunion2.C gcc-4.6.3/gcc/testsuite/g++.dg/template/anonunion2.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/template/anonunion2.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/template/anonunion2.C 2012-09-13 10:13:08.240418000 -0500 +@@ -0,0 +1,6 @@ ++template <int i> ++struct S ++{ ++ S () { union { int a; }; a = 0; } ++}; ++S<0> s; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/g++.dg/tree-ssa/pr54515.C gcc-4.6.3/gcc/testsuite/g++.dg/tree-ssa/pr54515.C +--- gcc-4.6.3.orig/gcc/testsuite/g++.dg/tree-ssa/pr54515.C 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/g++.dg/tree-ssa/pr54515.C 2012-09-10 04:50:02.938856000 -0500 +@@ -0,0 +1,19 @@ ++// { dg-do compile } ++// { dg-options "-O2" } ++ ++template < typename T > T h2le (T) ++{ ++ T a; ++ unsigned short &b = a; ++ short c = 0; ++ unsigned char (&d)[2] = reinterpret_cast < unsigned char (&)[2] > (c); ++ unsigned char (&e)[2] = reinterpret_cast < unsigned char (&)[2] > (b); ++ e[0] = d[0]; ++ return a; ++} ++ ++void ++bar () ++{ ++ h2le ((unsigned short) 0); ++} +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/array_section_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/array_section_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/array_section_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/array_section_3.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -0,0 +1,17 @@ ++! { dg-do compile } ++! ++! PR fortran/54225 ++! ++! Contributed by robb wu ++! ++program test ++ implicit none ++ real :: A(2,3) ++ ++ print *, A(1, *) ! { dg-error "Expected array subscript" } ++end program ++ ++subroutine test2 ++integer, dimension(2) :: a ++a(*) = 1 ! { dg-error "Expected array subscript" } ++end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/bound_simplification_3.f90 2012-09-12 16:54:50.523207000 -0500 +@@ -0,0 +1,23 @@ ++! { dg-do compile } ++! { dg-options "-fdump-tree-original" } ++! ++! PR fortran/54208 ++! The I and J definitions used to raise an error because ARR's array spec ++! was resolved to late for the LBOUND and UBOUND calls to be simplified to ++! a constant. ++! ++! Contributed by Carlos A. Cruz <carlos.a.cruz@nasa.gov> ++ ++program testit ++ integer, parameter :: n=2 ++ integer, dimension(1-min(n,2)/2:n) :: arr ++ integer, parameter :: i=lbound(arr,1) ++ integer, parameter :: j=ubound(arr,1) ++ ! write(6,*) i, j ++ if (i /= 0) call abort ++ if (j /= 2) call abort ++end program testit ++ ++! { dg-final { scan-tree-dump-times "bound" 0 "original" } } ++! { dg-final { scan-tree-dump-times "abort" 0 "original" } } ++! { dg-final { cleanup-tree-dump "original" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_10.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_10.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_10.f90 2010-07-08 10:17:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_10.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -30,12 +30,12 @@ + subroutine rank_mismatch() + implicit none + integer,allocatable :: A(:)[:,:,:,:] +- allocate(A(1)[1,1,1:*]) ! { dg-error "Unexpected ... for codimension" } ++ allocate(A(1)[1,1,1:*]) ! { dg-error "Too few codimensions" } + allocate(A(1)[1,1,1,1,1,*]) ! { dg-error "Invalid codimension 5" } + allocate(A(1)[1,1,1,*]) + allocate(A(1)[1,1]) ! { dg-error "Too few codimensions" } + allocate(A(1)[1,*]) ! { dg-error "Too few codimensions" } +- allocate(A(1)[1,1:*]) ! { dg-error "Unexpected ... for codimension" } ++ allocate(A(1)[1,1:*]) ! { dg-error "Too few codimensions" } + + A(1)[1,1,1] = 1 ! { dg-error "Too few codimensions" } + A(1)[1,1,1,1,1,1] = 1 ! { dg-error "Invalid codimension 5" } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_28.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_28.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/coarray_28.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/coarray_28.f90 2012-09-13 13:19:22.374742000 -0500 +@@ -0,0 +1,10 @@ ++! { dg-do compile } ++! { dg-options "-fcoarray=single" } ++! ++! PR fortran/54225 ++! ++ ++integer, allocatable :: a[:,:] ++ ++allocate (a[*,4]) ! { dg-error "Unexpected '.' for codimension 1 of 2" } ++end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/implicit_pure_3.f90 2012-09-13 13:15:52.599419000 -0500 +@@ -0,0 +1,109 @@ ++! { dg-do compile } ++! { dg-options "-O2 -fdump-tree-optimized" } ++! ++! PR fortran/54556 ++! ++! Contributed by Joost VandeVondele ++! ++MODULE parallel_rng_types ++ ++ IMPLICIT NONE ++ ++ ! Global parameters in this module ++ INTEGER, PARAMETER :: dp=8 ++ ++ TYPE rng_stream_type ++ PRIVATE ++ CHARACTER(LEN=40) :: name ++ INTEGER :: distribution_type ++ REAL(KIND=dp), DIMENSION(3,2) :: bg,cg,ig ++ LOGICAL :: antithetic,extended_precision ++ REAL(KIND=dp) :: buffer ++ LOGICAL :: buffer_filled ++ END TYPE rng_stream_type ++ ++ REAL(KIND=dp), DIMENSION(3,3) :: a1p0,a1p76,a1p127,& ++ a2p0,a2p76,a2p127,& ++ inv_a1,inv_a2 ++ ++ INTEGER, PARAMETER :: GAUSSIAN = 1,& ++ UNIFORM = 2 ++ ++ REAL(KIND=dp), PARAMETER :: norm = 2.328306549295727688e-10_dp,& ++ m1 = 4294967087.0_dp,& ++ m2 = 4294944443.0_dp,& ++ a12 = 1403580.0_dp,& ++ a13n = 810728.0_dp,& ++ a21 = 527612.0_dp,& ++ a23n = 1370589.0_dp,& ++ two17 = 131072.0_dp,& ! 2**17 ++ two53 = 9007199254740992.0_dp,& ! 2**53 ++ fact = 5.9604644775390625e-8_dp ! 1/2**24 ++ ++ ++CONTAINS ++ ++ FUNCTION rn32(rng_stream) RESULT(u) ++ ++ TYPE(rng_stream_type), POINTER :: rng_stream ++ REAL(KIND=dp) :: u ++ ++ INTEGER :: k ++ REAL(KIND=dp) :: p1, p2 ++ ++! ------------------------------------------------------------------------- ++! Component 1 ++ ++ p1 = a12*rng_stream%cg(2,1) - a13n*rng_stream%cg(1,1) ++ k = INT(p1/m1) ++ p1 = p1 - k*m1 ++ IF (p1 < 0.0_dp) p1 = p1 + m1 ++ rng_stream%cg(1,1) = rng_stream%cg(2,1) ++ rng_stream%cg(2,1) = rng_stream%cg(3,1) ++ rng_stream%cg(3,1) = p1 ++ ++ ! Component 2 ++ ++ p2 = a21*rng_stream%cg(3,2) - a23n*rng_stream%cg(1,2) ++ k = INT(p2/m2) ++ p2 = p2 - k*m2 ++ IF (p2 < 0.0_dp) p2 = p2 + m2 ++ rng_stream%cg(1,2) = rng_stream%cg(2,2) ++ rng_stream%cg(2,2) = rng_stream%cg(3,2) ++ rng_stream%cg(3,2) = p2 ++ ++ ! Combination ++ ++ IF (p1 > p2) THEN ++ u = (p1 - p2)*norm ++ ELSE ++ u = (p1 - p2 + m1)*norm ++ END IF ++ ++ IF (rng_stream%antithetic) u = 1.0_dp - u ++ ++ END FUNCTION rn32 ++ ++! ***************************************************************************** ++ FUNCTION rn53(rng_stream) RESULT(u) ++ ++ TYPE(rng_stream_type), POINTER :: rng_stream ++ REAL(KIND=dp) :: u ++ ++ u = rn32(rng_stream) ++ ++ IF (rng_stream%antithetic) THEN ++ u = u + (rn32(rng_stream) - 1.0_dp)*fact ++ IF (u < 0.0_dp) u = u + 1.0_dp ++ ELSE ++ u = u + rn32(rng_stream)*fact ++ IF (u >= 1.0_dp) u = u - 1.0_dp ++ END IF ++ ++ END FUNCTION rn53 ++ ++END MODULE ++ ++! { dg-final { scan-module-absence "parallel_rng_types" "IMPLICIT_PURE" } } ++! { dg-final { scan-tree-dump-times "rn32 \\(rng_stream" 3 "optimized" } } ++! { dg-final { cleanup-tree-dump "optimized" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/init_flag_10.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/init_flag_10.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/init_flag_10.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/init_flag_10.f90 2012-06-05 08:05:31.580646000 -0500 +@@ -0,0 +1,43 @@ ++! { dg-do run } ++! { dg-options "-finit-real=NAN" } ++! { dg-add-options ieee } ++! { dg-skip-if "NaN not supported" { spu-*-* } { "*" } { "" } } ++! ++! PR fortran/50619 ++! ++! Contributed by Fred Krogh ++! ++! The NaN initialization used to set the associate name to NaN! ++! ++ ++module testa2 ++type, public :: test_ty ++ real :: rmult = 1.0e0 ++end type test_ty ++ ++contains ++ subroutine test(e, var1) ++ type(test_ty) :: e ++ real :: var1, var2 ! Should get NaN initialized ++ ++ ! Should be the default value ++ if (e%rmult /= 1.0) call abort () ++ ++ ! Check that NaN initialization is really turned on ++ if (var1 == var1) call abort () ++ if (var2 == var2) call abort () ++ ++ ! The following was failing: ++ associate (rmult=>e%rmult) ++ if (e%rmult /= 1.0) call abort () ++ end associate ++ end subroutine test ++end module testa2 ++ ++program testa1 ++ use testa2 ++ type(test_ty) :: e ++ real :: var1 ! Should get NaN initialized ++ call test(e, var1) ++ stop ++end program testa1 +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/intrinsic_8.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/intrinsic_8.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/intrinsic_8.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/intrinsic_8.f90 2012-03-06 11:08:01.409469000 -0600 +@@ -0,0 +1,23 @@ ++! { dg-do compile } ++! ++! PR fortran/52452 ++! ++! Contributed by Roger Ferrer Ibanez ++! ++PROGRAM test_etime ++ IMPLICIT NONE ++ INTRINSIC :: etime ++ REAL(4) :: tarray(1:2) ++ REAL(4) :: result ++ ++ CALL etime(tarray, result) ++END PROGRAM test_etime ++ ++subroutine test_etime2 ++ IMPLICIT NONE ++ INTRINSIC :: etime ++ REAL(4) :: tarray(1:2) ++ REAL(4) :: result ++ ++ result = etime(tarray) ++END subroutine test_etime2 +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/optional_absent_2.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/optional_absent_2.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/optional_absent_2.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/optional_absent_2.f90 2012-07-14 10:24:12.262320000 -0500 +@@ -0,0 +1,53 @@ ++! { dg-do run } ++! ++! PR fortran/51758 ++! ++! Contributed by Mikael Morin ++! ++! Check whether passing NULL() to an elemental procedure works, ++! where NULL() denotes an absent optional argument. ++! ++program p ++ ++ integer :: a(2) ++ integer :: b ++ ++ a = 0 ++ a = foo((/ 1, 1 /), null()) ++! print *, a ++ if (any(a /= 2)) call abort ++ ++ a = 0 ++ a = bar((/ 1, 1 /), null()) ++! print *, a ++ if (any(a /= 2)) call abort ++ ++ b = 0 ++ b = bar(1, null()) ++! print *, b ++ if (b /= 2) call abort ++ ++contains ++ ++ function foo(a, b) ++ integer :: a(:) ++ integer, optional :: b(:) ++ integer :: foo(size(a)) ++ ++ if (present(b)) call abort ++ ++ foo = 2 ++ end function foo ++ ++ elemental function bar(a, b) ++ integer, intent(in) :: a ++ integer, intent(in), optional :: b ++ integer :: bar ++ ++ bar = 2 ++ ++ if (present(b)) bar = 1 ++ ++ end function bar ++ ++end program p +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/pointer_intent_6.f90 2012-05-02 07:53:20.873985000 -0500 +@@ -0,0 +1,19 @@ ++! { dg-do compile } ++! ++! PR fortran/52864 ++! ++! Assigning to an intent(in) pointer (which is valid). ++! ++ program test ++ type PoisFFT_Solver3D ++ complex, dimension(:,:,:), & ++ pointer :: work => null() ++ end type PoisFFT_Solver3D ++ contains ++ subroutine PoisFFT_Solver3D_FullPeriodic(D, p) ++ type(PoisFFT_Solver3D), intent(in) :: D ++ real, intent(in), pointer :: p(:) ++ D%work(i,j,k) = 0.0 ++ p = 0.0 ++ end subroutine ++ end +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/proc_ptr_34.f90 2012-03-10 03:20:22.792570000 -0600 +@@ -0,0 +1,79 @@ ++! { dg-do compile } ++! ++! PR fortran/52469 ++! ++! This was failing as the DECL of the proc pointer "func" ++! was used for the interface of the proc-pointer component "my_f_ptr" ++! rather than the decl of the proc-pointer target ++! ++! Contributed by palott@gmail.com ++! ++ ++module ExampleFuncs ++ implicit none ++ ++ ! NOTE: "func" is a procedure pointer! ++ pointer :: func ++ interface ++ function func (z) ++ real :: func ++ real, intent (in) :: z ++ end function func ++ end interface ++ ++ type Contains_f_ptr ++ procedure (func), pointer, nopass :: my_f_ptr ++ end type Contains_f_ptr ++contains ++ ++function f1 (x) ++ real :: f1 ++ real, intent (in) :: x ++ ++ f1 = 2.0 * x ++ ++ return ++end function f1 ++ ++function f2 (x) ++ real :: f2 ++ real, intent (in) :: x ++ ++ f2 = 3.0 * x**2 ++ ++ return ++end function f2 ++ ++function fancy (func, x) ++ real :: fancy ++ real, intent (in) :: x ++ ++ interface AFunc ++ function func (y) ++ real :: func ++ real, intent (in) ::y ++ end function func ++ end interface AFunc ++ ++ fancy = func (x) + 3.3 * x ++end function fancy ++ ++end module ExampleFuncs ++ ++ ++program test_proc_ptr ++ use ExampleFuncs ++ implicit none ++ ++ type (Contains_f_ptr), dimension (2) :: NewType ++ ++ !NewType(1) % my_f_ptr => f1 ++ NewType(2) % my_f_ptr => f2 ++ ++ !write (*, *) NewType(1) % my_f_ptr (3.0), NewType(2) % my_f_ptr (3.0) ++ write (6, *) NewType(2) % my_f_ptr (3.0) ! < Shall print '27.0' ++ ++ stop ++end program test_proc_ptr ++ ++! { dg-final { cleanup-modules "examplefuncs" } } +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/realloc_on_assign_15.f90 2012-05-23 14:13:27.735982000 -0500 +@@ -0,0 +1,40 @@ ++! { dg-do run } ++! ++! PR fortran/53389 ++! ++! The program was leaking memory before due to ++! realloc on assignment and nested functions. ++! ++module foo ++ implicit none ++ contains ++ ++ function filler(array, val) ++ real, dimension(:), intent(in):: array ++ real, dimension(size(array)):: filler ++ real, intent(in):: val ++ ++ filler=val ++ ++ end function filler ++end module ++ ++program test ++ use foo ++ implicit none ++ ++ real, dimension(:), allocatable:: x, y ++ integer, parameter:: N=1000 !*1000 ++ integer:: i ++ ++! allocate( x(N) ) ++ allocate( y(N) ) ++ y=0.0 ++ ++ do i=1, N ++! print *,i ++ x=filler(filler(y, real(2*i)), real(i)) ++ y=y+x ++ end do ++ ++end program test +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/save_4.f90 gcc-4.6.3/gcc/testsuite/gfortran.dg/save_4.f90 +--- gcc-4.6.3.orig/gcc/testsuite/gfortran.dg/save_4.f90 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gfortran.dg/save_4.f90 2012-06-14 08:11:27.149798000 -0500 +@@ -0,0 +1,13 @@ ++! { dg-do compile } ++! { dg-options "-std=f2003" } ++! ++! PR fortran/53597 ++! ++MODULE somemodule ++ IMPLICIT NONE ++ TYPE sometype ++ INTEGER :: i ++ DOUBLE PRECISION, POINTER, DIMENSION(:,:) :: coef => NULL() ++ END TYPE sometype ++ TYPE(sometype) :: somevariable ! { dg-error "Fortran 2008: Implied SAVE for module variable 'somevariable' at .1., needed due to the default initialization" } ++END MODULE somemodule +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.adb gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.adb 2007-06-06 05:54:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + with System; + package body addr1 is + task type T is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.ads gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/addr1.ads 2007-06-06 05:54:25.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/addr1.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package addr1 is + pragma Elaborate_Body; + end; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.adb gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.adb 2011-09-11 14:00:13.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Atomic5 is + + function Create return R is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.ads gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/atomic5.ads 2011-09-11 14:00:13.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/atomic5.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + with Unchecked_Conversion; + + package Atomic5 is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr23.ads gcc-4.6.3/gcc/testsuite/gnat.dg/discr23.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr23.ads 2010-05-19 12:53:58.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr23.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr23 is + + procedure Dummy; +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.adb gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.adb +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.adb 2011-05-05 11:27:03.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.adb 2012-09-20 17:01:34.089642000 -0500 +@@ -1,3 +1,5 @@ ++-- { dg-do compile } ++ + package body Discr29 is + + procedure Proc (R : out Rec3) is +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.ads gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/discr29.ads 2011-05-05 11:27:03.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/discr29.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Discr29 is + + type Rec1 is record +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/nested_float_packed.ads gcc-4.6.3/gcc/testsuite/gnat.dg/nested_float_packed.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/nested_float_packed.ads 2009-06-01 10:27:59.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/nested_float_packed.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -1,5 +1,3 @@ +--- { dg-do compile } +- + package Nested_Float_Packed is + + type Float_Type is record +@@ -20,5 +18,3 @@ + Data_Block : array (Range_Type) + of Data_Type := (others => Default_Data); + end; +- +- +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/oconst6.ads gcc-4.6.3/gcc/testsuite/gnat.dg/oconst6.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/oconst6.ads 2009-06-01 09:42:56.000000000 -0500 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/oconst6.ads 1969-12-31 18:00:00.000000000 -0600 +@@ -1,18 +0,0 @@ +--- { dg-do compile } +--- { dg-final { scan-assembler-not "elabs" } } +- +-package OCONST6 is +- +- type Sequence is array (1 .. 1) of Natural; +- +- type Message is record +- Data : Sequence; +- end record; +- +- for Message'Alignment use 1; +- pragma PACK (Message); +- +- ACK : Message := (Data => (others => 1)); +- +-end; +- +diff -Naur gcc-4.6.3.orig/gcc/testsuite/gnat.dg/specs/oconst6.ads gcc-4.6.3/gcc/testsuite/gnat.dg/specs/oconst6.ads +--- gcc-4.6.3.orig/gcc/testsuite/gnat.dg/specs/oconst6.ads 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/gnat.dg/specs/oconst6.ads 2012-09-20 17:01:34.089642000 -0500 +@@ -0,0 +1,18 @@ ++-- { dg-do compile } ++-- { dg-final { scan-assembler-not "elabs" } } ++ ++package OCONST6 is ++ ++ type Sequence is array (1 .. 1) of Natural; ++ ++ type Message is record ++ Data : Sequence; ++ end record; ++ ++ for Message'Alignment use 1; ++ pragma PACK (Message); ++ ++ ACK : Message := (Data => (others => 1)); ++ ++end; ++ +diff -Naur gcc-4.6.3.orig/gcc/testsuite/lib/target-supports.exp gcc-4.6.3/gcc/testsuite/lib/target-supports.exp +--- gcc-4.6.3.orig/gcc/testsuite/lib/target-supports.exp 2012-02-22 11:38:22.000000000 -0600 ++++ gcc-4.6.3/gcc/testsuite/lib/target-supports.exp 2012-08-10 08:26:44.694722000 -0500 +@@ -2976,6 +2976,26 @@ + return $et_natural_alignment_64_saved + } + ++# Return 1 if all vector types are naturally aligned (aligned to their ++# type-size), 0 otherwise. ++# ++# This won't change for different subtargets so cache the result. ++ ++proc check_effective_target_vect_natural_alignment { } { ++ global et_vect_natural_alignment ++ ++ if [info exists et_vect_natural_alignment_saved] { ++ verbose "check_effective_target_vect_natural_alignment: using cached result" 2 ++ } else { ++ set et_vect_natural_alignment_saved 1 ++ if { [check_effective_target_arm_eabi] } { ++ set et_vect_natural_alignment_saved 0 ++ } ++ } ++ verbose "check_effective_target_vect_natural_alignment: returning $et_vect_natural_alignment_saved" 2 ++ return $et_vect_natural_alignment_saved ++} ++ + # Return 1 if vector alignment (for types of size 32 bit or less) is reachable, 0 otherwise. + # + # This won't change for different subtargets so cache the result. +diff -Naur gcc-4.6.3.orig/gcc/toplev.c gcc-4.6.3/gcc/toplev.c +--- gcc-4.6.3.orig/gcc/toplev.c 2011-02-03 02:29:03.000000000 -0600 ++++ gcc-4.6.3/gcc/toplev.c 2012-03-28 21:15:29.973365000 -0500 +@@ -1326,6 +1326,13 @@ + "and -ftree-loop-linear)"); + #endif + ++ if (flag_strict_volatile_bitfields > 0 && !abi_version_at_least (2)) ++ { ++ warning (0, "-fstrict-volatile-bitfields disabled; " ++ "it is incompatible with ABI versions < 2"); ++ flag_strict_volatile_bitfields = 0; ++ } ++ + /* Unrolling all loops implies that standard loop unrolling must also + be done. */ + if (flag_unroll_all_loops) +diff -Naur gcc-4.6.3.orig/gcc/tree-inline.c gcc-4.6.3/gcc/tree-inline.c +--- gcc-4.6.3.orig/gcc/tree-inline.c 2011-07-26 02:52:24.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-inline.c 2012-10-05 07:01:59.135703000 -0500 +@@ -3809,6 +3809,12 @@ + goto egress; + + if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) ++ /* For extern inline functions that get redefined we always ++ silently ignored always_inline flag. Better behaviour would ++ be to be able to keep both bodies and use extern inline body ++ for inlining, but we can't do that because frontends overwrite ++ the body. */ ++ && !cg_edge->callee->local.redefined_extern_inline + /* Avoid warnings during early inline pass. */ + && cgraph_global_info_ready) + { +@@ -4947,7 +4953,7 @@ + if ((e = cgraph_edge (id->dst_node, gsi_stmt (bsi))) != NULL) + { + if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ cgraph_remove_node_and_inline_clones (e->callee, id->dst_node); + else + cgraph_remove_edge (e); + } +@@ -4957,8 +4963,8 @@ + { + if ((e = cgraph_edge (node, gsi_stmt (bsi))) != NULL) + { +- if (!e->inline_failed) +- cgraph_remove_node_and_inline_clones (e->callee); ++ if (!e->inline_failed && e->callee != id->src_node) ++ cgraph_remove_node_and_inline_clones (e->callee, id->dst_node); + else + cgraph_remove_edge (e); + } +diff -Naur gcc-4.6.3.orig/gcc/tree-pretty-print.c gcc-4.6.3/gcc/tree-pretty-print.c +--- gcc-4.6.3.orig/gcc/tree-pretty-print.c 2010-11-05 04:00:50.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-pretty-print.c 2012-05-31 10:03:37.575990000 -0500 +@@ -805,6 +805,8 @@ + infer them and MEM_ATTR caching will share MEM_REFs + with differently-typed op0s. */ + && TREE_CODE (TREE_OPERAND (node, 0)) != INTEGER_CST ++ /* Released SSA_NAMES have no TREE_TYPE. */ ++ && TREE_TYPE (TREE_OPERAND (node, 0)) != NULL_TREE + /* Same pointer types, but ignoring POINTER_TYPE vs. + REFERENCE_TYPE. */ + && (TREE_TYPE (TREE_TYPE (TREE_OPERAND (node, 0))) +@@ -1171,6 +1173,8 @@ + can't infer them and MEM_ATTR caching will share + MEM_REFs with differently-typed op0s. */ + && TREE_CODE (TREE_OPERAND (op0, 0)) != INTEGER_CST ++ /* Released SSA_NAMES have no TREE_TYPE. */ ++ && TREE_TYPE (TREE_OPERAND (op0, 0)) != NULL_TREE + /* Same pointer types, but ignoring POINTER_TYPE vs. + REFERENCE_TYPE. */ + && (TREE_TYPE (TREE_TYPE (TREE_OPERAND (op0, 0))) +diff -Naur gcc-4.6.3.orig/gcc/tree-sra.c gcc-4.6.3/gcc/tree-sra.c +--- gcc-4.6.3.orig/gcc/tree-sra.c 2012-01-05 16:24:45.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-sra.c 2012-09-10 04:50:02.938856000 -0500 +@@ -910,7 +910,8 @@ + disqualify_base_of_expr (tree t, const char *reason) + { + t = get_base_address (t); +- if (sra_mode == SRA_MODE_EARLY_IPA ++ if (t ++ && sra_mode == SRA_MODE_EARLY_IPA + && TREE_CODE (t) == MEM_REF) + t = get_ssa_base_param (TREE_OPERAND (t, 0)); + +@@ -2937,7 +2938,13 @@ + } + else + { +- if (access_has_children_p (lacc) && access_has_children_p (racc)) ++ if (access_has_children_p (lacc) ++ && access_has_children_p (racc) ++ /* When an access represents an unscalarizable region, it usually ++ represents accesses with variable offset and thus must not be used ++ to generate new memory accesses. */ ++ && !lacc->grp_unscalarizable_region ++ && !racc->grp_unscalarizable_region) + { + gimple_stmt_iterator orig_gsi = *gsi; + enum unscalarized_data_handling refreshed; +diff -Naur gcc-4.6.3.orig/gcc/tree-ssa-ccp.c gcc-4.6.3/gcc/tree-ssa-ccp.c +--- gcc-4.6.3.orig/gcc/tree-ssa-ccp.c 2011-09-26 09:08:53.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-ssa-ccp.c 2012-07-04 08:56:00.524689000 -0500 +@@ -1364,6 +1364,10 @@ + if (!DECL_INITIAL (base) + && (TREE_STATIC (base) || DECL_EXTERNAL (base))) + return error_mark_node; ++ /* Do not return an error_mark_node DECL_INITIAL. LTO uses this ++ as special marker (_not_ zero ...) for its own purposes. */ ++ if (DECL_INITIAL (base) == error_mark_node) ++ return NULL_TREE; + return DECL_INITIAL (base); + + case ARRAY_REF: +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-data-refs.c gcc-4.6.3/gcc/tree-vect-data-refs.c +--- gcc-4.6.3.orig/gcc/tree-vect-data-refs.c 2011-12-12 13:43:06.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-vect-data-refs.c 2012-08-10 08:26:44.694722000 -0500 +@@ -1019,7 +1019,7 @@ + int misal = DR_MISALIGNMENT (dr); + tree vectype = STMT_VINFO_VECTYPE (stmt_info); + misal += negative ? -npeel * dr_size : npeel * dr_size; +- misal &= GET_MODE_SIZE (TYPE_MODE (vectype)) - 1; ++ misal &= (TYPE_ALIGN (vectype) / BITS_PER_UNIT) - 1; + SET_DR_MISALIGNMENT (dr, misal); + return; + } +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-loop.c gcc-4.6.3/gcc/tree-vect-loop.c +--- gcc-4.6.3.orig/gcc/tree-vect-loop.c 2011-06-04 04:20:00.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-vect-loop.c 2012-03-02 08:51:58.551861000 -0600 +@@ -2104,7 +2104,8 @@ + if (stmt_info + && !STMT_VINFO_RELEVANT_P (stmt_info) + && (!STMT_VINFO_LIVE_P (stmt_info) +- || STMT_VINFO_DEF_TYPE (stmt_info) != vect_reduction_def)) ++ || !VECTORIZABLE_CYCLE_DEF (STMT_VINFO_DEF_TYPE (stmt_info))) ++ && !STMT_VINFO_IN_PATTERN_P (stmt_info)) + continue; + + if (STMT_VINFO_DATA_REF (vinfo_for_stmt (stmt))) +@@ -2251,11 +2252,19 @@ + { + gimple stmt = gsi_stmt (si); + stmt_vec_info stmt_info = vinfo_for_stmt (stmt); ++ ++ if (STMT_VINFO_IN_PATTERN_P (stmt_info)) ++ { ++ stmt = STMT_VINFO_RELATED_STMT (stmt_info); ++ stmt_info = vinfo_for_stmt (stmt); ++ } ++ + /* Skip stmts that are not vectorized inside the loop. */ + if (!STMT_VINFO_RELEVANT_P (stmt_info) + && (!STMT_VINFO_LIVE_P (stmt_info) +- || STMT_VINFO_DEF_TYPE (stmt_info) != vect_reduction_def)) ++ || !VECTORIZABLE_CYCLE_DEF (STMT_VINFO_DEF_TYPE (stmt_info)))) + continue; ++ + vec_inside_cost += STMT_VINFO_INSIDE_OF_LOOP_COST (stmt_info) * factor; + /* FIXME: for stmts in the inner-loop in outer-loop vectorization, + some of the "outside" costs are generated inside the outer-loop. */ +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-loop-manip.c gcc-4.6.3/gcc/tree-vect-loop-manip.c +--- gcc-4.6.3.orig/gcc/tree-vect-loop-manip.c 2011-06-04 04:20:00.000000000 -0500 ++++ gcc-4.6.3/gcc/tree-vect-loop-manip.c 2012-08-10 08:26:44.694722000 -0500 +@@ -2008,7 +2008,7 @@ + If the misalignment of DR is known at compile time: + addr_mis = int mis = DR_MISALIGNMENT (dr); + Else, compute address misalignment in bytes: +- addr_mis = addr & (vectype_size - 1) ++ addr_mis = addr & (vectype_align - 1) + + prolog_niters = min (LOOP_NITERS, ((VF - addr_mis/elem_size)&(VF-1))/step) + +@@ -2065,9 +2065,10 @@ + tree ptr_type = TREE_TYPE (start_addr); + tree size = TYPE_SIZE (ptr_type); + tree type = lang_hooks.types.type_for_size (tree_low_cst (size, 1), 1); +- tree vectype_size_minus_1 = build_int_cst (type, vectype_align - 1); +- tree elem_size_log = +- build_int_cst (type, exact_log2 (vectype_align/nelements)); ++ tree vectype_align_minus_1 = build_int_cst (type, vectype_align - 1); ++ HOST_WIDE_INT elem_size = ++ int_cst_value (TYPE_SIZE_UNIT (TREE_TYPE (vectype))); ++ tree elem_size_log = build_int_cst (type, exact_log2 (elem_size)); + tree nelements_minus_1 = build_int_cst (type, nelements - 1); + tree nelements_tree = build_int_cst (type, nelements); + tree byte_misalign; +@@ -2076,10 +2077,10 @@ + new_bb = gsi_insert_seq_on_edge_immediate (pe, new_stmts); + gcc_assert (!new_bb); + +- /* Create: byte_misalign = addr & (vectype_size - 1) */ ++ /* Create: byte_misalign = addr & (vectype_align - 1) */ + byte_misalign = + fold_build2 (BIT_AND_EXPR, type, fold_convert (type, start_addr), +- vectype_size_minus_1); ++ vectype_align_minus_1); + + /* Create: elem_misalign = byte_misalign / element_size */ + elem_misalign = +diff -Naur gcc-4.6.3.orig/gcc/tree-vect-stmts.c gcc-4.6.3/gcc/tree-vect-stmts.c +--- gcc-4.6.3.orig/gcc/tree-vect-stmts.c 2012-02-10 06:34:17.000000000 -0600 ++++ gcc-4.6.3/gcc/tree-vect-stmts.c 2012-03-02 08:51:58.551861000 -0600 +@@ -623,6 +623,46 @@ + } + + ++/* Model cost for type demotion and promotion operations. PWR is normally ++ zero for single-step promotions and demotions. It will be one if ++ two-step promotion/demotion is required, and so on. Each additional ++ step doubles the number of instructions required. */ ++ ++static void ++vect_model_promotion_demotion_cost (stmt_vec_info stmt_info, ++ enum vect_def_type *dt, int pwr) ++{ ++ int i, tmp; ++ int inside_cost = 0, outside_cost = 0, single_stmt_cost; ++ ++ /* The SLP costs were already calculated during SLP tree build. */ ++ if (PURE_SLP_STMT (stmt_info)) ++ return; ++ ++ single_stmt_cost = vect_get_stmt_cost (vec_promote_demote); ++ for (i = 0; i < pwr + 1; i++) ++ { ++ tmp = (STMT_VINFO_TYPE (stmt_info) == type_promotion_vec_info_type) ? ++ (i + 1) : i; ++ inside_cost += vect_pow2 (tmp) * single_stmt_cost; ++ } ++ ++ /* FORNOW: Assuming maximum 2 args per stmts. */ ++ for (i = 0; i < 2; i++) ++ { ++ if (dt[i] == vect_constant_def || dt[i] == vect_external_def) ++ outside_cost += vect_get_stmt_cost (vector_stmt); ++ } ++ ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, "vect_model_promotion_demotion_cost: inside_cost = %d, " ++ "outside_cost = %d .", inside_cost, outside_cost); ++ ++ /* Set the costs in STMT_INFO. */ ++ stmt_vinfo_set_inside_of_loop_cost (stmt_info, NULL, inside_cost); ++ stmt_vinfo_set_outside_of_loop_cost (stmt_info, NULL, outside_cost); ++} ++ + /* Function vect_cost_strided_group_size + + For strided load or store, return the group_size only if it is the first +@@ -691,7 +731,7 @@ + { + /* Uses a high and low interleave operation for each needed permute. */ + inside_cost = ncopies * exact_log2(group_size) * group_size +- * vect_get_stmt_cost (vector_stmt); ++ * vect_get_stmt_cost (vec_perm); + + if (vect_print_dump_info (REPORT_COST)) + fprintf (vect_dump, "vect_model_store_cost: strided group_size = %d .", +@@ -795,7 +835,7 @@ + { + /* Uses an even and odd extract operations for each needed permute. */ + inside_cost = ncopies * exact_log2(group_size) * group_size +- * vect_get_stmt_cost (vector_stmt); ++ * vect_get_stmt_cost (vec_perm); + + if (vect_print_dump_info (REPORT_COST)) + fprintf (vect_dump, "vect_model_load_cost: strided group_size = %d .", +@@ -855,7 +895,7 @@ + case dr_explicit_realign: + { + *inside_cost += ncopies * (2 * vect_get_stmt_cost (vector_load) +- + vect_get_stmt_cost (vector_stmt)); ++ + vect_get_stmt_cost (vec_perm)); + + /* FIXME: If the misalignment remains fixed across the iterations of + the containing loop, the following cost should be added to the +@@ -863,6 +903,9 @@ + if (targetm.vectorize.builtin_mask_for_load) + *inside_cost += vect_get_stmt_cost (vector_stmt); + ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, "vect_model_load_cost: explicit realign"); ++ + break; + } + case dr_explicit_realign_optimized: +@@ -886,7 +929,12 @@ + } + + *inside_cost += ncopies * (vect_get_stmt_cost (vector_load) +- + vect_get_stmt_cost (vector_stmt)); ++ + vect_get_stmt_cost (vec_perm)); ++ ++ if (vect_print_dump_info (REPORT_COST)) ++ fprintf (vect_dump, ++ "vect_model_load_cost: explicit realign optimized"); ++ + break; + } + +@@ -2919,7 +2967,7 @@ + STMT_VINFO_TYPE (stmt_info) = type_demotion_vec_info_type; + if (vect_print_dump_info (REPORT_DETAILS)) + fprintf (vect_dump, "=== vectorizable_demotion ==="); +- vect_model_simple_cost (stmt_info, ncopies, dt, NULL); ++ vect_model_promotion_demotion_cost (stmt_info, dt, multi_step_cvt); + return true; + } + +@@ -3217,7 +3265,7 @@ + STMT_VINFO_TYPE (stmt_info) = type_promotion_vec_info_type; + if (vect_print_dump_info (REPORT_DETAILS)) + fprintf (vect_dump, "=== vectorizable_promotion ==="); +- vect_model_simple_cost (stmt_info, 2*ncopies, dt, NULL); ++ vect_model_promotion_demotion_cost (stmt_info, dt, multi_step_cvt); + return true; + } + +diff -Naur gcc-4.6.3.orig/gcc/varasm.c gcc-4.6.3/gcc/varasm.c +--- gcc-4.6.3.orig/gcc/varasm.c 2011-12-09 13:11:01.000000000 -0600 ++++ gcc-4.6.3/gcc/varasm.c 2012-04-24 01:14:37.854759000 -0500 +@@ -1,7 +1,7 @@ + /* Output variables, constants and external declarations, for GNU compiler. + Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +- 2010, 2011 Free Software Foundation, Inc. ++ 2010, 2011, 2012 Free Software Foundation, Inc. + + This file is part of GCC. + +@@ -30,6 +30,7 @@ + #include "config.h" + #include "system.h" + #include "coretypes.h" ++#include "pointer-set.h" + #include "tm.h" + #include "rtl.h" + #include "tree.h" +@@ -2097,6 +2098,19 @@ + it all the way to final. See PR 17982 for further discussion. */ + static GTY(()) tree pending_assemble_externals; + ++/* FIXME: Trunk is at GCC 4.8 now and the above problem still hasn't been ++ addressed properly. This caused PR 52640 due to O(external_decls**2) ++ lookups in the pending_assemble_externals TREE_LIST in assemble_external. ++ Paper over with this pointer set, which we use to see if we have already ++ added a decl to pending_assemble_externals without first traversing ++ the entire pending_assemble_externals list. See assemble_external(). */ ++static struct pointer_set_t *pending_assemble_externals_set; ++ ++/* Some targets delay some output to final using TARGET_ASM_FILE_END. ++ As a result, assemble_external can be called after the list of externals ++ is processed and the pointer set destroyed. */ ++static bool pending_assemble_externals_processed; ++ + #ifdef ASM_OUTPUT_EXTERNAL + /* True if DECL is a function decl for which no out-of-line copy exists. + It is assumed that DECL's assembler name has been set. */ +@@ -2146,6 +2160,8 @@ + assemble_external_real (TREE_VALUE (list)); + + pending_assemble_externals = 0; ++ pending_assemble_externals_processed = true; ++ pointer_set_destroy (pending_assemble_externals_set); + #endif + } + +@@ -2186,7 +2202,13 @@ + weak_decls = tree_cons (NULL, decl, weak_decls); + + #ifdef ASM_OUTPUT_EXTERNAL +- if (value_member (decl, pending_assemble_externals) == NULL_TREE) ++ if (pending_assemble_externals_processed) ++ { ++ assemble_external_real (decl); ++ return; ++ } ++ ++ if (! pointer_set_insert (pending_assemble_externals_set, decl)) + pending_assemble_externals = tree_cons (NULL, decl, + pending_assemble_externals); + #endif +@@ -3922,6 +3944,13 @@ + tem = TREE_OPERAND (tem, 0)) + ; + ++ if (TREE_CODE (tem) == MEM_REF ++ && TREE_CODE (TREE_OPERAND (tem, 0)) == ADDR_EXPR) ++ { ++ reloc = compute_reloc_for_constant (TREE_OPERAND (tem, 0)); ++ break; ++ } ++ + if (TREE_PUBLIC (tem)) + reloc |= 2; + else +@@ -3990,6 +4019,9 @@ + + if (CONSTANT_CLASS_P (tem) || TREE_CODE (tem) == CONSTRUCTOR) + output_constant_def (tem, 0); ++ ++ if (TREE_CODE (tem) == MEM_REF) ++ output_addressed_constants (TREE_OPERAND (tem, 0)); + break; + + case PLUS_EXPR: +@@ -6019,6 +6051,10 @@ + + if (readonly_data_section == NULL) + readonly_data_section = text_section; ++ ++#ifdef ASM_OUTPUT_EXTERNAL ++ pending_assemble_externals_set = pointer_set_create (); ++#endif + } + + enum tls_model +diff -Naur gcc-4.6.3.orig/gcc/version.c gcc-4.6.3/gcc/version.c +--- gcc-4.6.3.orig/gcc/version.c 2009-04-21 14:03:23.000000000 -0500 ++++ gcc-4.6.3/gcc/version.c 2012-11-05 15:59:56.218466326 -0600 +@@ -33,4 +33,4 @@ + Makefile. */ + + const char version_string[] = BASEVER DATESTAMP DEVPHASE REVISION; +-const char pkgversion_string[] = PKGVERSION; ++const char pkgversion_string[] = "(GCC for Cross-LFS 4.6.3.20121105) "; +diff -Naur gcc-4.6.3.orig/libffi/configure.ac gcc-4.6.3/libffi/configure.ac +--- gcc-4.6.3.orig/libffi/configure.ac 2012-02-10 10:45:53.000000000 -0600 ++++ gcc-4.6.3/libffi/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -12,7 +12,7 @@ + + . ${srcdir}/configure.host + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([no-dist]) + + # The same as in boehm-gc and libstdc++. Have to borrow it from there. + # We must force CC to /not/ be precious variables; otherwise +diff -Naur gcc-4.6.3.orig/libffi/include/Makefile.in gcc-4.6.3/libffi/include/Makefile.in +--- gcc-4.6.3.orig/libffi/include/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/include/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/ffi.h.in $(toollibffi_HEADERS) + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +@@ -54,7 +54,6 @@ + CONFIG_CLEAN_FILES = ffi.h ffitarget.h + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -80,7 +79,6 @@ + HEADERS = $(toollibffi_HEADERS) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -329,37 +327,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(HEADERS) +@@ -463,17 +430,16 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip \ +- install-toollibffiHEADERS installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am tags uninstall uninstall-am \ +- uninstall-toollibffiHEADERS ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip install-toollibffiHEADERS \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-toollibffiHEADERS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libffi/Makefile.in gcc-4.6.3/libffi/Makefile.in +--- gcc-4.6.3.orig/libffi/Makefile.in 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/libffi/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -61,13 +61,10 @@ + @PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c + @PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ +- $(srcdir)/../config.guess $(srcdir)/../config.sub \ +- $(srcdir)/../depcomp $(srcdir)/../install-sh \ +- $(srcdir)/../ltmain.sh $(srcdir)/../missing \ +- $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ +- $(srcdir)/Makefile.in $(srcdir)/fficonfig.h.in \ +- $(top_srcdir)/configure ChangeLog ++DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ ++ $(srcdir)/Makefile.am $(top_srcdir)/configure \ ++ $(am__configure_deps) $(srcdir)/fficonfig.h.in \ ++ $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -201,7 +198,6 @@ + SOURCES = $(libffi_la_SOURCES) $(nodist_libffi_la_SOURCES) \ + $(libffi_convenience_la_SOURCES) \ + $(nodist_libffi_convenience_la_SOURCES) +-DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -218,47 +214,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -1184,182 +1143,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile $(LTLIBRARIES) all-multi fficonfig.h +@@ -1510,18 +1293,15 @@ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi \ + clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-multi distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install 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-multi install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- install-toolexeclibLTLIBRARIES installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-multi distclean-tags \ ++ dvi dvi-am html html-am info info-am install 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-multi \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-toolexeclibLTLIBRARIES installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-multi mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \ +diff -Naur gcc-4.6.3.orig/libffi/man/Makefile.in gcc-4.6.3/libffi/man/Makefile.in +--- gcc-4.6.3.orig/libffi/man/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/man/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = man +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -52,7 +52,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -78,7 +77,6 @@ + am__installdirs = "$(DESTDIR)$(man3dir)" + NROFF = nroff + MANS = $(man_MANS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -292,50 +290,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(MANS) +@@ -439,16 +393,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-man3 \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-man uninstall-man3 ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-man3 install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-man uninstall-man3 + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libffi/src/powerpc/aix_closure.S gcc-4.6.3/libffi/src/powerpc/aix_closure.S +--- gcc-4.6.3.orig/libffi/src/powerpc/aix_closure.S 2009-12-07 18:41:10.000000000 -0600 ++++ gcc-4.6.3/libffi/src/powerpc/aix_closure.S 2012-03-22 09:35:34.814561000 -0500 +@@ -79,6 +79,8 @@ + .set f20,20 + .set f21,21 + ++ .extern .ffi_closure_helper_DARWIN ++ + #define LIBFFI_ASM + #define JUMPTARGET(name) name + #define L(x) x +@@ -165,6 +167,7 @@ + + /* look up the proper starting point in table */ + /* by using return type as offset */ ++ lhz r3, 10(r3) /* load type from return type */ + ld r4, LC..60(2) /* get address of jump table */ + sldi r3, r3, 4 /* now multiply return type by 16 */ + ld r0, 240+16(r1) /* load return address */ +@@ -337,8 +340,9 @@ + + /* look up the proper starting point in table */ + /* by using return type as offset */ ++ lhz r3, 6(r3) /* load type from return type */ + lwz r4, LC..60(2) /* get address of jump table */ +- slwi r3, r3, 4 /* now multiply return type by 4 */ ++ slwi r3, r3, 4 /* now multiply return type by 16 */ + lwz r0, 176+8(r1) /* load return address */ + add r3, r3, r4 /* add contents of table to table address */ + mtctr r3 +diff -Naur gcc-4.6.3.orig/libffi/src/powerpc/aix.S gcc-4.6.3/libffi/src/powerpc/aix.S +--- gcc-4.6.3.orig/libffi/src/powerpc/aix.S 2009-12-05 15:48:58.000000000 -0600 ++++ gcc-4.6.3/libffi/src/powerpc/aix.S 2012-03-22 09:35:34.814561000 -0500 +@@ -1,5 +1,5 @@ + /* ----------------------------------------------------------------------- +- aix.S - Copyright (c) 2002,2009 Free Software Foundation, Inc. ++ aix.S - Copyright (c) 2002, 2009 Free Software Foundation, Inc. + based on darwin.S by John Hornkvist + + PowerPC Assembly glue. +@@ -79,6 +79,8 @@ + .set f20,20 + .set f21,21 + ++ .extern .ffi_prep_args ++ + #define LIBFFI_ASM + #include <fficonfig.h> + #include <ffi.h> +@@ -125,6 +127,7 @@ + /* Call ffi_prep_args. */ + mr r4, r1 + bl .ffi_prep_args ++ nop + + /* Now do the call. */ + ld r0, 0(r29) +@@ -226,6 +229,7 @@ + /* Call ffi_prep_args. */ + mr r4, r1 + bl .ffi_prep_args ++ nop + + /* Now do the call. */ + lwz r0, 0(r29) +diff -Naur gcc-4.6.3.orig/libffi/testsuite/Makefile.in gcc-4.6.3/libffi/testsuite/Makefile.in +--- gcc-4.6.3.orig/libffi/testsuite/Makefile.in 2010-04-02 13:18:06.000000000 -0500 ++++ gcc-4.6.3/libffi/testsuite/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -52,10 +52,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ALLOCA = @ALLOCA@ + AMTAR = @AMTAR@ +@@ -278,37 +276,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -410,8 +377,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libgfortran/intrinsics/eoshift2.c gcc-4.6.3/libgfortran/intrinsics/eoshift2.c +--- gcc-4.6.3.orig/libgfortran/intrinsics/eoshift2.c 2009-07-19 10:07:21.000000000 -0500 ++++ gcc-4.6.3/libgfortran/intrinsics/eoshift2.c 2012-05-11 17:33:21.046165000 -0500 +@@ -77,6 +77,12 @@ + + ret->offset = 0; + ret->dtype = array->dtype; ++ ++ if (arraysize > 0) ++ ret->data = internal_malloc_size (size * arraysize); ++ else ++ ret->data = internal_malloc_size (1); ++ + for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++) + { + index_type ub, str; +@@ -90,12 +96,6 @@ + * GFC_DESCRIPTOR_STRIDE(ret,i-1); + + GFC_DIMENSION_SET(ret->dim[i], 0, ub, str); +- +- if (arraysize > 0) +- ret->data = internal_malloc_size (size * arraysize); +- else +- ret->data = internal_malloc_size (1); +- + } + } + else if (unlikely (compile_options.bounds_check)) +diff -Naur gcc-4.6.3.orig/libgfortran/runtime/environ.c gcc-4.6.3/libgfortran/runtime/environ.c +--- gcc-4.6.3.orig/libgfortran/runtime/environ.c 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libgfortran/runtime/environ.c 2012-10-21 08:43:32.465342000 -0500 +@@ -453,21 +453,35 @@ + { + int low, high, mid; + +- low = -1; +- high = n_elist; +- while (high - low > 1) ++ if (n_elist == 0) ++ { ++ *ip = 0; ++ return 0; ++ } ++ ++ low = 0; ++ high = n_elist - 1; ++ ++ do + { + mid = (low + high) / 2; +- if (unit <= elist[mid].unit) +- high = mid; ++ if (unit == elist[mid].unit) ++ { ++ *ip = mid; ++ return 1; ++ } ++ else if (unit > elist[mid].unit) ++ low = mid + 1; + else +- low = mid; +- } +- *ip = high; +- if (elist[high].unit == unit) +- return 1; ++ high = mid - 1; ++ } while (low <= high); ++ ++ if (unit > elist[mid].unit) ++ *ip = mid + 1; + else +- return 0; ++ *ip = mid; ++ ++ return 0; + } + + /* This matches a keyword. If it is found, return the token supplied, +@@ -582,13 +596,13 @@ + } + if (search_unit (unit, &i)) + { +- elist[unit].conv = endian; ++ elist[i].conv = endian; + } + else + { +- for (j=n_elist; j>=i; j--) ++ for (j=n_elist-1; j>=i; j--) + elist[j+1] = elist[j]; +- ++ + n_elist += 1; + elist[i].unit = unit; + elist[i].conv = endian; +diff -Naur gcc-4.6.3.orig/libgo/configure.ac gcc-4.6.3/libgo/configure.ac +--- gcc-4.6.3.orig/libgo/configure.ac 2011-02-20 22:17:20.000000000 -0600 ++++ gcc-4.6.3/libgo/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -19,7 +19,7 @@ + AC_CANONICAL_SYSTEM + target_alias=${target_alias-$host_alias} + +-AM_INIT_AUTOMAKE([1.9.3 no-define foreign -Wall]) ++AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dist -Wall]) + AH_TEMPLATE(PACKAGE, [Name of package]) + AH_TEMPLATE(VERSION, [Version number of package]) + +diff -Naur gcc-4.6.3.orig/libgo/Makefile.in gcc-4.6.3/libgo/Makefile.in +--- gcc-4.6.3.orig/libgo/Makefile.in 2011-03-10 19:00:15.000000000 -0600 ++++ gcc-4.6.3/libgo/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -46,12 +46,10 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \ +- $(srcdir)/../config.sub $(srcdir)/../depcomp \ +- $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \ +- $(srcdir)/../missing $(srcdir)/../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/config.h.in $(top_srcdir)/configure ++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \ ++ $(srcdir)/../depcomp + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -162,52 +160,6 @@ + libgo_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-am__libgo_la_SOURCES_DIST = runtime/go-append.c runtime/go-assert.c \ +- runtime/go-assert-interface.c \ +- runtime/go-byte-array-to-string.c runtime/go-breakpoint.c \ +- runtime/go-caller.c runtime/go-can-convert-interface.c \ +- runtime/go-cgo.c runtime/go-chan-cap.c runtime/go-chan-len.c \ +- runtime/go-check-interface.c runtime/go-close.c \ +- runtime/go-closed.c runtime/go-construct-map.c \ +- runtime/go-convert-interface.c runtime/go-copy.c \ +- runtime/go-defer.c runtime/go-deferred-recover.c \ +- runtime/go-eface-compare.c runtime/go-eface-val-compare.c \ +- runtime/go-getgoroot.c runtime/go-go.c runtime/go-gomaxprocs.c \ +- runtime/go-int-array-to-string.c runtime/go-int-to-string.c \ +- runtime/go-interface-compare.c \ +- runtime/go-interface-eface-compare.c \ +- runtime/go-interface-val-compare.c runtime/go-lock-os-thread.c \ +- runtime/go-map-delete.c runtime/go-map-index.c \ +- runtime/go-map-len.c runtime/go-map-range.c \ +- runtime/go-nanotime.c runtime/go-new-channel.c \ +- runtime/go-new-map.c runtime/go-new.c runtime/go-note.c \ +- runtime/go-panic.c runtime/go-panic-defer.c runtime/go-print.c \ +- runtime/go-rec-big.c runtime/go-rec-nb-big.c \ +- runtime/go-rec-nb-small.c runtime/go-rec-small.c \ +- runtime/go-recover.c runtime/go-reflect.c \ +- runtime/go-reflect-call.c runtime/go-reflect-chan.c \ +- runtime/go-reflect-map.c runtime/go-rune.c \ +- runtime/go-runtime-error.c runtime/go-sched.c \ +- runtime/go-select.c runtime/go-semacquire.c \ +- runtime/go-send-big.c runtime/go-send-nb-big.c \ +- runtime/go-send-nb-small.c runtime/go-send-small.c \ +- runtime/go-signal.c runtime/go-strcmp.c \ +- runtime/go-string-to-byte-array.c \ +- runtime/go-string-to-int-array.c runtime/go-strplus.c \ +- runtime/go-strslice.c runtime/go-trampoline.c \ +- runtime/go-type-eface.c runtime/go-type-error.c \ +- runtime/go-type-identity.c runtime/go-type-interface.c \ +- runtime/go-type-string.c runtime/go-typedesc-equal.c \ +- runtime/go-typestring.c runtime/go-unreflect.c \ +- runtime/go-unsafe-new.c runtime/go-unsafe-newarray.c \ +- runtime/go-unsafe-pointer.c runtime/go-unwind.c \ +- runtime/mcache.c runtime/mcentral.c \ +- runtime/mem_posix_memalign.c runtime/mem.c runtime/mfinal.c \ +- runtime/mfixalloc.c runtime/mgc0.c runtime/mheap.c \ +- runtime/mheapmap32.c runtime/mheapmap64.c runtime/msize.c \ +- runtime/proc.c runtime/thread.c \ +- runtime/rtems-task-variable-add.c chan.c iface.c malloc.c \ +- map.c mprof.c reflect.c sigqueue.c string.c + @HAVE_SYS_MMAN_H_FALSE@am__objects_1 = mem_posix_memalign.lo + @HAVE_SYS_MMAN_H_TRUE@am__objects_1 = mem.lo + @LIBGO_IS_RTEMS_TRUE@am__objects_2 = rtems-task-variable-add.lo +@@ -256,7 +208,6 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgobegin_a_SOURCES) $(libgo_la_SOURCES) +-DIST_SOURCES = $(libgobegin_a_SOURCES) $(am__libgo_la_SOURCES_DIST) + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -284,47 +235,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = testsuite +-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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -3416,182 +3330,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) all-multi $(DATA) \ +@@ -3743,18 +3481,16 @@ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-local clean-multi \ + clean-toolexeclibLIBRARIES clean-toolexeclibLTLIBRARIES ctags \ +- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-compile distclean-generic distclean-hdr \ +- distclean-libtool distclean-multi distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install 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-multi install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- install-toolexeclibLIBRARIES install-toolexeclibLTLIBRARIES \ +- install-toolexeclibgoDATA install-toolexeclibgoarchiveDATA \ ++ ctags-recursive distclean distclean-compile distclean-generic \ ++ distclean-hdr distclean-libtool distclean-multi distclean-tags \ ++ dvi dvi-am html html-am info info-am install 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-multi \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-toolexeclibLIBRARIES \ ++ install-toolexeclibLTLIBRARIES install-toolexeclibgoDATA \ ++ install-toolexeclibgoarchiveDATA \ + install-toolexeclibgocompressDATA \ + install-toolexeclibgocontainerDATA \ + install-toolexeclibgocryptoDATA \ +diff -Naur gcc-4.6.3.orig/libgo/testsuite/Makefile.in gcc-4.6.3/libgo/testsuite/Makefile.in +--- gcc-4.6.3.orig/libgo/testsuite/Makefile.in 2011-01-24 17:42:22.000000000 -0600 ++++ gcc-4.6.3/libgo/testsuite/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = testsuite +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ +@@ -54,10 +54,8 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -298,37 +296,6 @@ + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU + check: check-am +@@ -430,8 +397,8 @@ + + .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ + clean-libtool distclean distclean-DEJAGNU distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/configure.ac gcc-4.6.3/libjava/classpath/configure.ac +--- gcc-4.6.3.orig/libjava/classpath/configure.ac 2011-01-30 23:34:09.000000000 -0600 ++++ gcc-4.6.3/libjava/classpath/configure.ac 2012-09-20 09:55:03.645689000 -0500 +@@ -75,7 +75,7 @@ + AC_SUBST(CLASSPATH_CONVENIENCE) + + AC_PREREQ(2.64) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability]) + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + +diff -Naur gcc-4.6.3.orig/libjava/classpath/doc/api/Makefile.in gcc-4.6.3/libjava/classpath/doc/api/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/doc/api/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/doc/api/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc/api +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,9 +69,7 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -330,37 +328,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -459,16 +426,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local distclean distclean-generic distclean-libtool \ +- distdir dvi dvi-am html html-am info info-am install \ +- install-am install-data install-data-am install-data-local \ +- 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-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ +- ps ps-am uninstall uninstall-am uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local 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-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + @CREATE_API_DOCS_TRUE@install-data-local: +diff -Naur gcc-4.6.3.orig/libjava/classpath/doc/Makefile.in gcc-4.6.3/libjava/classpath/doc/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/doc/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/doc/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = doc +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + INFO_DEPS = cp-tools.info + am__TEXINFO_TEX_DIR = $(srcdir)/../../gcc/doc/include + DVIS = cp-tools.dvi +@@ -116,37 +115,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -756,81 +728,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-info + check-am: all-am + check: check-recursive + all-am: Makefile $(INFO_DEPS) $(MANS) all-local +@@ -1020,18 +917,18 @@ + all all-am all-local check check-am clean clean-aminfo \ + clean-generic clean-libtool ctags ctags-recursive dist-info \ + distclean distclean-generic distclean-libtool distclean-tags \ +- distdir dvi dvi-am html html-am info info-am install \ +- 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-man1 install-pdf install-pdf-am install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ +- maintainer-clean-aminfo maintainer-clean-generic mostlyclean \ +- mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \ +- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +- uninstall-dvi-am uninstall-html-am uninstall-info-am \ +- uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am ++ dvi dvi-am html html-am info info-am install 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-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-aminfo \ ++ maintainer-clean-generic mostlyclean mostlyclean-aminfo \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-dvi-am \ ++ uninstall-html-am uninstall-info-am uninstall-man \ ++ uninstall-man1 uninstall-pdf-am uninstall-ps-am + + + .texinfo.dvi: +diff -Naur gcc-4.6.3.orig/libjava/classpath/examples/Makefile.in gcc-4.6.3/libjava/classpath/examples/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/examples/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/examples/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,8 +36,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = examples +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.java2d.in $(srcdir)/Makefile.jawt.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/Makefile.jawt.in $(srcdir)/Makefile.java2d.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -70,7 +70,6 @@ + CONFIG_CLEAN_FILES = Makefile.jawt Makefile.java2d + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -94,7 +93,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(exampledir)" + DATA = $(example_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -419,40 +417,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -557,17 +521,17 @@ + .MAKE: all check install install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local install-dvi install-dvi-am \ +- install-exampleDATA install-exec 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 \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-exampleDATA uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local install-dvi \ ++ install-dvi-am install-exampleDATA install-exec \ ++ 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 install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-exampleDATA uninstall-local + + + # Make sure all sources and icons are also installed so users can use them. +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/jsr166/Makefile.in gcc-4.6.3/libjava/classpath/external/jsr166/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/jsr166/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/jsr166/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/jsr166 +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -398,37 +396,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -527,13 +494,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/Makefile.in gcc-4.6.3/libjava/classpath/external/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,37 +78,10 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,65 +468,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -657,13 +570,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/relaxngDatatype/Makefile.in gcc-4.6.3/libjava/classpath/external/relaxngDatatype/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/relaxngDatatype/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/relaxngDatatype/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/relaxngDatatype +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -338,37 +336,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -467,13 +434,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/sax/Makefile.in gcc-4.6.3/libjava/classpath/external/sax/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/sax/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/sax/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/sax +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -366,37 +364,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -495,13 +462,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/external/w3c_dom/Makefile.in gcc-4.6.3/libjava/classpath/external/w3c_dom/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/external/w3c_dom/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/external/w3c_dom/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = external/w3c_dom +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,8 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -473,37 +471,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -602,13 +569,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/include/Makefile.in gcc-4.6.3/libjava/classpath/include/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/include/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/include/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = include +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/config.h.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -500,37 +498,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + @CREATE_JNI_HEADERS_FALSE@all-local: +@@ -632,8 +599,8 @@ + + .PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-hdr \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-libtool dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/lib/Makefile.in gcc-4.6.3/libjava/classpath/lib/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/lib/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/lib/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,9 +36,9 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \ +- $(srcdir)/mkcollections.pl.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/mkcollections.pl.in $(srcdir)/gen-classlist.sh.in \ ++ $(srcdir)/copy-vmresources.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -72,9 +72,7 @@ + copy-vmresources.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + DATA = $(noinst_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -356,40 +354,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -492,17 +456,16 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- clean-local dist-hook distclean distclean-generic \ +- distclean-libtool distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-local 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-local ++ clean-local distclean distclean-generic distclean-libtool dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-data-local 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-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-local + + + sinclude $(JAVA_DEPEND) +diff -Naur gcc-4.6.3.orig/libjava/classpath/Makefile.in gcc-4.6.3/libjava/classpath/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,25 +35,15 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = . +-DIST_COMMON = README $(am__configure_deps) $(srcdir)/../../compile \ +- $(srcdir)/../../config.guess $(srcdir)/../../config.sub \ +- $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \ +- $(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \ +- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(top_srcdir)/configure \ ++DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ ++ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(top_srcdir)/configure $(am__configure_deps) \ ++ $(srcdir)/../../mkinstalldirs \ + $(top_srcdir)/gnu/classpath/Configuration.java.in \ + $(top_srcdir)/gnu/java/security/Configuration.java.in \ + $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \ + $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in \ +- $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in \ +- ../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \ +- ../../ChangeLog ../../README ../../compile ../../config.guess \ +- ../../config.rpath ../../config.sub ../../depcomp \ +- ../../install-sh ../../ltmain.sh ../../missing \ +- ../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \ +- INSTALL NEWS TODO compile config.guess config.rpath config.sub \ +- depcomp install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \ +- ltmain.sh missing mkinstalldirs ++ $(top_srcdir)/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -92,7 +82,6 @@ + resource/META-INF/services/javax.sound.sampled.spi.MixerProvider + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + MULTISRCTOP = + MULTIBUILDTOP = + MULTIDIRS = +@@ -109,46 +98,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + 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)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" +-DIST_ARCHIVES = $(distdir).tar.gz +-GZIP_ENV = --best +-distuninstallcheck_listfiles = find . -type f -print +-distcleancheck_listfiles = find . -type f -print + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -582,185 +534,6 @@ + + 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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -755 \ +- -exec chmod u+rwx,go+rx {} \; -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-lzma: distdir +- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma +- $(am__remove_distdir) +- +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(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 +- $(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ +- *.tar.bz2*) \ +- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ +- *.tar.lzma*) \ +- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ +- *.tar.Z*) \ +- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ +- *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gzip -dc $(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) +- test -d $(distdir)/_build || exit 0; \ +- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ +- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__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 \ +- && cd "$$am__cwd" \ +- || exit 1 +- $(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: +- @$(am__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-recursive + all-am: Makefile all-multi +@@ -869,20 +642,17 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-multi am--refresh check check-am clean \ + clean-generic clean-libtool clean-multi ctags ctags-recursive \ +- dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \ +- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ +- distclean-generic distclean-libtool distclean-multi \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install 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-multi \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip installcheck installcheck-am installdirs \ +- installdirs-am maintainer-clean maintainer-clean-generic \ +- maintainer-clean-multi mostlyclean mostlyclean-generic \ +- mostlyclean-libtool mostlyclean-multi pdf pdf-am ps ps-am tags \ +- tags-recursive uninstall uninstall-am ++ distclean distclean-generic distclean-libtool distclean-multi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-multi install-pdf install-pdf-am install-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic maintainer-clean-multi mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \ ++ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am + + + native: lib +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/fdlibm/Makefile.in gcc-4.6.3/libjava/classpath/native/fdlibm/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/fdlibm/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/fdlibm/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/fdlibm +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -95,10 +95,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libfdlibm_la_SOURCES) +-DIST_SOURCES = $(libfdlibm_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -553,37 +551,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -689,8 +656,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jawt/Makefile.in gcc-4.6.3/libjava/classpath/native/jawt/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jawt/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jawt/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jawt +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjawt_la_SOURCES) +-DIST_SOURCES = $(libjawt_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -492,37 +490,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -631,8 +598,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/classpath/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/classpath/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/classpath/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/classpath/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/classpath +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspath_la_SOURCES) +-DIST_SOURCES = $(libclasspath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -445,37 +443,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -581,8 +548,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gconf-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gconf-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gconf-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gconf-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gconf-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgconfpeer_la_SOURCES) +-DIST_SOURCES = $(libgconfpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -489,37 +487,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -628,8 +595,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gstreamer-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gstreamer-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gstreamer-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gstreamer-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gstreamer-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgstreamerpeer_la_SOURCES) +-DIST_SOURCES = $(libgstreamerpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -514,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -653,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/gtk-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/gtk-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/gtk-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/gtk-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/gtk-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -150,10 +150,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgtkpeer_la_SOURCES) +-DIST_SOURCES = $(libgtkpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -620,37 +618,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -759,8 +726,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-io/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-io/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-io/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-io/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-io +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -111,10 +111,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavaio_la_SOURCES) +-DIST_SOURCES = $(libjavaio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -494,37 +492,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -633,8 +600,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-lang/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-lang/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-lang/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-lang/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-lang +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -123,12 +123,8 @@ + SOURCES = $(libjavalang_la_SOURCES) \ + $(libjavalangmanagement_la_SOURCES) \ + $(libjavalangreflect_la_SOURCES) +-DIST_SOURCES = $(libjavalang_la_SOURCES) \ +- $(libjavalangmanagement_la_SOURCES) \ +- $(libjavalangreflect_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -521,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -660,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-math/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-math/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-math/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-math/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-math +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavamath_la_SOURCES) +-DIST_SOURCES = $(libjavamath_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -487,37 +485,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -626,8 +593,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-net/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-net/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-net/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-net/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-net +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,10 +96,6 @@ + $(top_builddir)/native/jni/classpath/jcl.lo \ + $(top_builddir)/native/jni/native-lib/libclasspathnative.la \ + $(am__DEPENDENCIES_1) +-am__libjavanet_la_SOURCES_DIST = javanet.c javanet.h \ +- java_net_VMInetAddress.c java_net_VMNetworkInterface.c \ +- java_net_VMURLConnection.c gnu_java_net_VMPlainSocketImpl.c \ +- gnu_java_net_local_LocalSocketImpl.c local.c local.h + @ENABLE_LOCAL_SOCKETS_FALSE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo + @ENABLE_LOCAL_SOCKETS_TRUE@am__objects_1 = gnu_java_net_local_LocalSocketImpl.lo \ + @ENABLE_LOCAL_SOCKETS_TRUE@ local.lo +@@ -121,10 +117,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanet_la_SOURCES) +-DIST_SOURCES = $(am__libjavanet_la_SOURCES_DIST) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -518,37 +512,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -657,8 +620,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-nio/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-nio/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-nio/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-nio/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-nio +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -119,10 +119,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavanio_la_SOURCES) +-DIST_SOURCES = $(libjavanio_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -519,37 +517,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -658,8 +625,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/java-util/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/java-util/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/java-util/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/java-util/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/java-util +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -108,10 +108,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libjavautil_la_SOURCES) +-DIST_SOURCES = $(libjavautil_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -483,37 +481,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -622,8 +589,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -510,65 +482,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile all-local +@@ -671,16 +584,16 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive distclean \ +- distclean-generic distclean-libtool distclean-tags distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- tags tags-recursive uninstall uninstall-am ++ distclean-generic distclean-libtool distclean-tags dvi dvi-am \ ++ html html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ ++ uninstall uninstall-am + + + all-local: +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/midi-alsa/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/midi-alsa/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/midi-alsa/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/midi-alsa/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-alsa +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmalsa_la_SOURCES) +-DIST_SOURCES = $(libgjsmalsa_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/midi-dssi/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/midi-dssi/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/midi-dssi/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/midi-dssi/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/midi-dssi +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -114,10 +114,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgjsmdssi_la_SOURCES) +-DIST_SOURCES = $(libgjsmdssi_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -496,37 +494,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -635,8 +602,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/native-lib/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/native-lib/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/native-lib/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/native-lib/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/native-lib +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -86,10 +86,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libclasspathnative_la_SOURCES) +-DIST_SOURCES = $(libclasspathnative_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -448,37 +446,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -584,8 +551,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/qt-peer/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/qt-peer/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/qt-peer/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/qt-peer/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -39,7 +39,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/qt-peer +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -116,10 +116,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES) +-DIST_SOURCES = $(libqtpeer_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -577,37 +575,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -717,8 +684,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-ps install-ps-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/jni/xmlj/Makefile.in gcc-4.6.3/libjava/classpath/native/jni/xmlj/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/jni/xmlj/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/jni/xmlj/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/jni/xmlj +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -110,10 +110,8 @@ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libxmlj_la_SOURCES) +-DIST_SOURCES = $(libxmlj_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -511,37 +509,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -650,8 +617,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/Makefile.in gcc-4.6.3/libjava/classpath/native/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,7 +35,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -68,7 +68,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ +@@ -79,36 +78,9 @@ + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir ++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -498,65 +470,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- test -d "$(distdir)/$$subdir" \ +- || $(MKDIR_P) "$(distdir)/$$subdir" \ +- || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ +- am__remove_distdir=: \ +- am__skip_length_check=: \ +- am__skip_mode_fix=: \ +- distdir) \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-recursive + all-am: Makefile +@@ -659,13 +572,13 @@ + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install 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-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install 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-ps \ ++ install-ps-am install-strip installcheck installcheck-am \ ++ installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am +diff -Naur gcc-4.6.3.orig/libjava/classpath/native/plugin/Makefile.in gcc-4.6.3/libjava/classpath/native/plugin/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/native/plugin/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/native/plugin/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = native/plugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -112,10 +112,8 @@ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ + SOURCES = $(libgcjwebplugin_la_SOURCES) +-DIST_SOURCES = $(libgcjwebplugin_la_SOURCES) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -497,37 +495,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(LTLIBRARIES) +@@ -636,8 +603,8 @@ + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-nativeexeclibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-dvi \ ++ distclean-tags dvi dvi-am html html-am info info-am install \ ++ 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-nativeexeclibLTLIBRARIES install-pdf install-pdf-am \ +diff -Naur gcc-4.6.3.orig/libjava/classpath/resource/Makefile.in gcc-4.6.3/libjava/classpath/resource/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/resource/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/resource/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -36,7 +36,7 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = resource +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,7 +69,6 @@ + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + 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/||"`;; \ +@@ -93,7 +92,6 @@ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(loggingdir)" "$(DESTDIR)$(securitydir)" + DATA = $(logging_DATA) $(security_DATA) +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -393,37 +391,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile $(DATA) +@@ -525,17 +492,17 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-loggingDATA install-man \ +- install-pdf install-pdf-am install-ps install-ps-am \ +- install-securityDATA install-strip installcheck \ +- installcheck-am installdirs maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ +- uninstall-loggingDATA uninstall-securityDATA ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-loggingDATA install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-securityDATA \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-loggingDATA \ ++ uninstall-securityDATA + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +diff -Naur gcc-4.6.3.orig/libjava/classpath/scripts/Makefile.in gcc-4.6.3/libjava/classpath/scripts/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/scripts/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/scripts/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -35,8 +35,8 @@ + host_triplet = @host@ + target_triplet = @target@ + subdir = scripts +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/check_jni_methods.sh.in $(srcdir)/classpath.spec.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/classpath.spec.in $(srcdir)/check_jni_methods.sh.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -69,8 +69,6 @@ + CONFIG_CLEAN_FILES = classpath.spec check_jni_methods.sh + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +-DIST_SOURCES = +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -331,37 +329,6 @@ + ctags: CTAGS + CTAGS: + +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done + check-am: all-am + check: check-am + all-am: Makefile +@@ -460,13 +427,13 @@ + .MAKE: install-am install-strip + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ +- distclean distclean-generic distclean-libtool distdir dvi \ +- dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ ++ distclean distclean-generic distclean-libtool dvi dvi-am html \ ++ html-am info info-am install 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-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +diff -Naur gcc-4.6.3.orig/libjava/classpath/tools/Makefile.in gcc-4.6.3/libjava/classpath/tools/Makefile.in +--- gcc-4.6.3.orig/libjava/classpath/tools/Makefile.in 2010-10-12 10:55:12.000000000 -0500 ++++ gcc-4.6.3/libjava/classpath/tools/Makefile.in 2012-09-20 09:55:03.645689000 -0500 +@@ -44,13 +44,13 @@ + @CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@ $(am__EXEEXT_2) + @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc + subdir = tools +-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +- $(srcdir)/gappletviewer.in $(srcdir)/gjar.in \ +- $(srcdir)/gjarsigner.in $(srcdir)/gjavah.in $(srcdir)/gjdoc.in \ +- $(srcdir)/gkeytool.in $(srcdir)/gnative2ascii.in \ +- $(srcdir)/gorbd.in $(srcdir)/grmic.in $(srcdir)/grmid.in \ +- $(srcdir)/grmiregistry.in $(srcdir)/gserialver.in \ +- $(srcdir)/gtnameserv.in ++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ++ $(srcdir)/gappletviewer.in $(srcdir)/gjarsigner.in \ ++ $(srcdir)/gkeytool.in $(srcdir)/gjar.in \ ++ $(srcdir)/gnative2ascii.in $(srcdir)/gserialver.in \ ++ $(srcdir)/grmiregistry.in $(srcdir)/gtnameserv.in \ ++ $(srcdir)/gorbd.in $(srcdir)/grmid.in $(srcdir)/grmic.in \ ++ $(srcdir)/gjavah.in $(srcdir)/gjdoc.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ + $(top_srcdir)/../../config/lead-dot.m4 \ +@@ -96,7 +96,6 @@ + @CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1) + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +-am__gappletviewer_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT) + gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS) +@@ -104,14 +103,12 @@ + gappletviewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gappletviewer_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjar_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjar_OBJECTS = gjar-toolwrapper.$(OBJEXT) + gjar_OBJECTS = $(am_gjar_OBJECTS) + gjar_LDADD = $(LDADD) + gjar_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjar_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjarsigner_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjarsigner-toolwrapper.$(OBJEXT) + gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) +@@ -119,7 +116,6 @@ + gjarsigner_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjarsigner_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gjavah_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjavah_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gjavah-toolwrapper.$(OBJEXT) + gjavah_OBJECTS = $(am_gjavah_OBJECTS) +@@ -127,14 +123,12 @@ + gjavah_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjavah_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gjdoc_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gjdoc_OBJECTS = gjdoc-toolwrapper.$(OBJEXT) + gjdoc_OBJECTS = $(am_gjdoc_OBJECTS) + gjdoc_LDADD = $(LDADD) + gjdoc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gjdoc_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gkeytool_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gkeytool-toolwrapper.$(OBJEXT) + gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) +@@ -142,7 +136,6 @@ + gkeytool_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gkeytool_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__gnative2ascii_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gnative2ascii_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gnative2ascii-toolwrapper.$(OBJEXT) + gnative2ascii_OBJECTS = $(am_gnative2ascii_OBJECTS) +@@ -150,28 +143,24 @@ + gnative2ascii_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gnative2ascii_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gorbd_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gorbd_OBJECTS = gorbd-toolwrapper.$(OBJEXT) + gorbd_OBJECTS = $(am_gorbd_OBJECTS) + gorbd_LDADD = $(LDADD) + gorbd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(gorbd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmic_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmic_OBJECTS = grmic-toolwrapper.$(OBJEXT) + grmic_OBJECTS = $(am_grmic_OBJECTS) + grmic_LDADD = $(LDADD) + grmic_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmic_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmid_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmid_OBJECTS = grmid-toolwrapper.$(OBJEXT) + grmid_OBJECTS = $(am_grmid_OBJECTS) + grmid_LDADD = $(LDADD) + grmid_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(grmid_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-am__grmiregistry_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_grmiregistry_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ grmiregistry-toolwrapper.$(OBJEXT) + grmiregistry_OBJECTS = $(am_grmiregistry_OBJECTS) +@@ -179,7 +168,6 @@ + grmiregistry_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(grmiregistry_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gserialver_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gserialver_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gserialver-toolwrapper.$(OBJEXT) + gserialver_OBJECTS = $(am_gserialver_OBJECTS) +@@ -187,7 +175,6 @@ + gserialver_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gserialver_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-am__gtnameserv_SOURCES_DIST = toolwrapper.c + @CREATE_WRAPPERS_TRUE@am_gtnameserv_OBJECTS = \ + @CREATE_WRAPPERS_TRUE@ gtnameserv-toolwrapper.$(OBJEXT) + gtnameserv_OBJECTS = $(am_gtnameserv_OBJECTS) +@@ -235,17 +222,9 @@ + $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \ + $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \ + $(gserialver_SOURCES) $(gtnameserv_SOURCES) +-DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \ +- $(am__gjar_SOURCES_DIST) $(am__gjarsigner_SOURCES_DIST) \ +- $(am__gjavah_SOURCES_DIST) $(am__gjdoc_SOURCES_DIST) \ +- $(am__gkeytool_SOURCES_DIST) $(am__gnative2ascii_SOURCES_DIST) \ +- $(am__gorbd_SOURCES_DIST) $(am__grmic_SOURCES_DIST) \ +- $(am__grmid_SOURCES_DIST) $(am__grmiregistry_SOURCES_DIST) \ +- $(am__gserialver_SOURCES_DIST) $(am__gtnameserv_SOURCES_DIST) + DATA = $(noinst_DATA) + ETAGS = etags + CTAGS = ctags +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + ANTLR = @ANTLR@ +@@ -1199,40 +1178,6 @@ + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @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 "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ +- else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ +- || exit 1; \ +- fi; \ +- done +- $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$(top_distdir)" distdir="$(distdir)" \ +- dist-hook + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +@@ -1343,9 +1288,9 @@ + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ +- ctags dist-hook distclean distclean-compile distclean-generic \ +- distclean-libtool distclean-tags distdir dvi dvi-am html \ +- html-am info info-am install install-am install-binPROGRAMS \ ++ ctags distclean distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags dvi dvi-am html html-am info \ ++ info-am install install-am install-binPROGRAMS \ + install-binSCRIPTS 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 \ +diff -Naur gcc-4.6.3.orig/libjava/configure gcc-4.6.3/libjava/configure +--- gcc-4.6.3.orig/libjava/configure 2012-03-01 06:03:46.000000000 -0600 ++++ gcc-4.6.3/libjava/configure 2012-03-02 12:21:41.598223000 -0600 +@@ -19775,14 +19775,9 @@ + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi + ;; +- *-*-darwin9*) ++ *-*-darwin[912]*) + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" + ;; +- *-*-darwin[12]*) +- # Something is incompatible with pie, would be nice to fix it and +- # remove -no_pie. PR49461 +- SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" +- ;; + *) + SYSTEMSPEC= + ;; +diff -Naur gcc-4.6.3.orig/libjava/configure.ac gcc-4.6.3/libjava/configure.ac +--- gcc-4.6.3.orig/libjava/configure.ac 2012-02-03 04:35:06.000000000 -0600 ++++ gcc-4.6.3/libjava/configure.ac 2012-03-02 12:21:41.598223000 -0600 +@@ -886,14 +886,9 @@ + SYSTEMSPEC="-lunicows $SYSTEMSPEC" + fi + ;; +- *-*-darwin9*) ++ *-*-darwin[[912]]*) + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" + ;; +- *-*-darwin[[12]]*) +- # Something is incompatible with pie, would be nice to fix it and +- # remove -no_pie. PR49461 +- SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" +- ;; + *) + SYSTEMSPEC= + ;; +diff -Naur gcc-4.6.3.orig/libquadmath/libquadmath.info gcc-4.6.3/libquadmath/libquadmath.info +--- gcc-4.6.3.orig/libquadmath/libquadmath.info 2012-03-01 06:41:20.000000000 -0600 ++++ gcc-4.6.3/libquadmath/libquadmath.info 1969-12-31 18:00:00.000000000 -0600 +@@ -1,924 +0,0 @@ +-This is libquadmath.info, produced by makeinfo version 4.13 from +-/d//gcc-4.6.3/gcc-4.6.3/libquadmath/libquadmath.texi. +- +-Copyright (C) 2010 Free Software Foundation, Inc. +- +- Permission is granted to copy, distribute and/or modify this +- document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover Texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have the freedom to copy +- and modify this GNU manual. +- +-INFO-DIR-SECTION GNU Libraries +-START-INFO-DIR-ENTRY +-* libquadmath: (libquadmath). GCC Quad-Precision Math Library +-END-INFO-DIR-ENTRY +- +- This manual documents the GCC Quad-Precision Math Library API. +- +- Published by the Free Software Foundation 51 Franklin Street, Fifth +-Floor Boston, MA 02110-1301 USA +- +- Copyright (C) 2010 Free Software Foundation, Inc. +- +- Permission is granted to copy, distribute and/or modify this +- document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover Texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have the freedom to copy +- and modify this GNU manual. +- +- +-File: libquadmath.info, Node: Top, Next: Typedef and constants, Up: (dir) +- +-Introduction +-************ +- +-This manual documents the usage of libquadmath, the GCC Quad-Precision +-Math Library Application Programming Interface (API). +- +-* Menu: +- +-* Typedef and constants:: Defined data types and constants +-* Math Library Routines:: The Libquadmath math runtime application +- programming interface. +-* I/O Library Routines:: The Libquadmath I/O runtime application +- programming interface. +-* GNU Free Documentation License:: +- How you can copy and share this manual. +-* Reporting Bugs:: How to report bugs in GCC Libquadmath. +- +- +-File: libquadmath.info, Node: Typedef and constants, Next: Math Library Routines, Prev: Top, Up: Top +- +-1 Typedef and constants +-*********************** +- +-The following data type has been defined via `typedef'. +- +-`__complex128': `__float128'-based complex number +- +- The following macros are defined, which give the numeric limits of +-the `__float128' data type. +- +-`FLT128_MAX': largest finite number +- +-`FLT128_MIN': smallest positive number with full precision +- +-`FLT128_EPSILON': difference between 1 and the next larger +- representable number +- +-`FLT128_DENORM_MIN': smallest positive denormalized number +- +-`FLT128_MANT_DIG': number of digits in the mantissa (bit precision) +- +-`FLT128_MIN_EXP': maximal negative exponent +- +-`FLT128_MAX_EXP': maximal positive exponent +- +-`FLT128_DIG': number of decimal digits in the mantissa +- +-`FLT128_MIN_10_EXP': maximal negative decimal exponent +- +-`FLT128_MAX_10_EXP': maximal positive decimal exponent +- +- The following mathematical constants of type `__float128' are +-defined. +- +-`M_Eq': the constant e (Euler's number) +- +-`M_LOG2Eq': binary logarithm of 2 +- +-`M_LOG10Eq': common, decimal logarithm of 2 +- +-`M_LN2q': natural logarithm of 2 +- +-`M_LN10q': natural logarithm of 10 +- +-`M_PIq': pi +- +-`M_PI_2q': two pi +- +-`M_PI_4q': four pi +- +-`M_1_PIq': one over pi +- +-`M_2_PIq': one over two pi +- +-`M_2_SQRTPIq': two over square root of pi +- +-`M_SQRT2q': square root of 2 +- +-`M_SQRT1_2q': one over square root of 2 +- +- +-File: libquadmath.info, Node: Math Library Routines, Next: I/O Library Routines, Prev: Typedef and constants, Up: Top +- +-2 Math Library Routines +-*********************** +- +-The following mathematical functions are available: +- +-`acosq': arc cosine function +- +-`acoshq': inverse hyperbolic cosine function +- +-`asinq': arc sine function +- +-`asinhq': inverse hyperbolic sine function +- +-`atanq': arc tangent function +- +-`atanhq': inverse hyperbolic tangent function +- +-`atan2q': arc tangent function +- +-`cbrtq': cube root function +- +-`ceilq': ceiling value function +- +-`copysignq': copy sign of a number +- +-`coshq': hyperbolic cosine function +- +-`cosq': cosine function +- +-`erfq': error function +- +-`erfcq': complementary error function +- +-`expq': exponential function +- +-`expm1q': exponential minus 1 function +- +-`fabsq': absolute value function +- +-`fdimq': positive difference function +- +-`finiteq': check finiteness of value +- +-`floorq': floor value function +- +-`fmaq': fused multiply and add +- +-`fmaxq': determine maximum of two values +- +-`fminq': determine minimum of two values +- +-`fmodq': remainder value function +- +-`frexpq': extract mantissa and exponent +- +-`hypotq': Eucledian distance function +- +-`ilogbq': get exponent of the value +- +-`isinfq': check for infinity +- +-`isnanq': check for not a number +- +-`j0q': Bessel function of the first kind, first order +- +-`j1q': Bessel function of the first kind, second order +- +-`jnq': Bessel function of the first kind, N-th order +- +-`ldexpq': load exponent of the value +- +-`lgammaq': logarithmic gamma function +- +-`llrintq': round to nearest integer value +- +-`llroundq': round to nearest integer value away from zero +- +-`logq': natural logarithm function +- +-`log10q': base 10 logarithm function +- +-`log1pq': compute natural logarithm of the value plus one +- +-`log2q': base 2 logarithm function +- +-`lrintq': round to nearest integer value +- +-`lroundq': round to nearest integer value away from zero +- +-`modfq': decompose the floating-point number +- +-`nanq': return quiet NaN +- +-`nearbyintq': round to nearest integer +- +-`nextafterq': next representable floating-point number +- +-`powq': power function +- +-`remainderq': remainder function +- +-`remquoq': remainder and part of quotient +- +-`rintq': round-to-nearest integral value +- +-`roundq': round-to-nearest integral value, return `__float128' +- +-`scalblnq': compute exponent using `FLT_RADIX' +- +-`scalbnq': compute exponent using `FLT_RADIX' +- +-`signbitq': return sign bit +- +-`sincosq': calculate sine and cosine simulataneously +- +-`sinhq': hyperbolic sine function +- +-`sinq': sine function +- +-`sqrtq': square root function +- +-`tanq': tangent function +- +-`tanhq': hyperbolic tangent function +- +-`tgammaq': true gamma function +- +-`truncq': round to integer, towards zero +- +-`y0q': Bessel function of the second kind, first order +- +-`y1q': Bessel function of the second kind, second order +- +-`ynq': Bessel function of the second kind, N-th order +- +-`cabsq' complex absolute value function +- +-`cargq': calculate the argument +- +-`cimagq' imaginary part of complex number +- +-`crealq': real part of complex number +- +-`cacoshq': complex arc hyperbolic cosine function +- +-`cacosq': complex arc cosine function +- +-`casinhq': complex arc hyperbolic sine function +- +-`casinq': complex arc sine function +- +-`catanhq': complex arc hyperbolic tangent function +- +-`catanq': complex arc tangent function +- +-`ccosq' complex cosine function: +- +-`ccoshq': complex hyperbolic cosine function +- +-`cexpq': complex exponential function +- +-`cexpiq': computes the exponential function of "i" times a +- real value +- +-`clogq': complex natural logarithm +- +-`clog10q': complex base 10 logarithm +- +-`conjq': complex conjugate function +- +-`cpowq': complex power function +- +-`cprojq': project into Riemann Sphere +- +-`csinq': complex sine function +- +-`csinhq': complex hyperbolic sine function +- +-`csqrtq': complex square root +- +-`ctanq': complex tangent function +- +-`ctanhq': complex hyperbolic tangent function +- +- +-File: libquadmath.info, Node: I/O Library Routines, Next: GNU Free Documentation License, Prev: Math Library Routines, Up: Top +- +-3 I/O Library Routines +-********************** +- +-* Menu: +- +-* `strtoflt128': strtoflt128, Convert from string +-* `quadmath_snprintf': quadmath_snprintf, Convert to string +- +- +-File: libquadmath.info, Node: strtoflt128, Next: quadmath_snprintf, Up: I/O Library Routines +- +-3.1 `strtoflt128' -- Convert from string +-======================================== +- +-The function `dmath_strtopQ' converts a string into a `__float128' +-number. +- +-Syntax +- `__float128 strtoflt128 (const char *s, char **sp)' +- +-_Arguments_: +- S input string +- SP the address of the next character in the string +- +- The argument SP contains, if not `NULL', the address of the next +- character following the parts of the string, which have been read. +- +-Example +- #include <quadmath.h> +- +- int main () +- { +- __float128 r; +- +- r = strtoflt128 ("1.2345678", NULL); +- +- return 0; +- } +- +- +-File: libquadmath.info, Node: quadmath_snprintf, Prev: strtoflt128, Up: I/O Library Routines +- +-3.2 `quadmath_snprintf' -- Convert to string +-============================================ +- +-The function `quadmath_snprintf' converts a `__float128' floating-point +-number into a string. It is a specialized alternative to `snprintf', +-where the format string is restricted to a single conversion specifier +-with `Q' modifier and conversion specifier `e', `E', `f', `F', `g', +-`G', `a' or `A', with no extra characters before or after the +-conversion specifier. The `%m$' or `*m$' style must not be used in the +-format. +- +-Syntax +- `int quadmath_snprintf (char *s, size_t size, const char *format, +- ...)' +- +-_Arguments_: +- S output string +- SIZE byte size of the string, including tailing NUL +- FORMAT conversion specifier string +- +-Example +- #include <quadmath.h> +- #include <stdlib.h> +- #include <stdio.h> +- +- int main () +- { +- __float128 r; +- int prec = 20; +- int width = 46; +- char buf[128]; +- +- r = 2.0q; +- r = sqrtq (r); +- int n = quadmath_snprintf (buf, sizeof buf, "%+-#*.20Qe", width, r); +- if ((size_t) n < sizeof buf) +- printf ("%s\n", buf); +- /* Prints: +1.41421356237309504880e+00 */ +- quadmath_snprintf (buf, sizeof buf, "%Qa", r); +- if ((size_t) n < sizeof buf) +- printf ("%s\n", buf); +- /* Prints: 0x1.6a09e667f3bcc908b2fb1366ea96p+0 */ +- n = quadmath_snprintf (NULL, 0, "%+-#46.*Qe", prec, r); +- if (n > -1) +- { +- char *str = malloc (n + 1); +- if (str) +- { +- quadmath_snprintf (str, n + 1, "%+-#46.*Qe", prec, r); +- printf ("%s\n", str); +- /* Prints: +1.41421356237309504880e+00 */ +- } +- free (str); +- } +- return 0; +- } +- +- +- On some targets when supported by the C library hooks are installed +-for `printf' family of functions, so that `printf ("%Qe", 1.2Q);' etc. +-works too. +- +- +-File: libquadmath.info, Node: GNU Free Documentation License, Next: Reporting Bugs, Prev: I/O Library Routines, Up: Top +- +-GNU Free Documentation License +-****************************** +- +- Version 1.3, 3 November 2008 +- +- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +- `http://fsf.org/' +- +- Everyone is permitted to copy and distribute verbatim copies +- of this license document, but changing it is not allowed. +- +- 0. PREAMBLE +- +- The purpose of this License is to make a manual, textbook, or other +- functional and useful document "free" in the sense of freedom: to +- assure everyone the effective freedom to copy and redistribute it, +- with or without modifying it, either commercially or +- noncommercially. Secondarily, this License preserves for the +- author and publisher a way to get credit for their work, while not +- being considered responsible for modifications made by others. +- +- This License is a kind of "copyleft", which means that derivative +- works of the document must themselves be free in the same sense. +- It complements the GNU General Public License, which is a copyleft +- license designed for free software. +- +- We have designed this License in order to use it for manuals for +- free software, because free software needs free documentation: a +- free program should come with manuals providing the same freedoms +- that the software does. But this License is not limited to +- software manuals; it can be used for any textual work, regardless +- of subject matter or whether it is published as a printed book. +- We recommend this License principally for works whose purpose is +- instruction or reference. +- +- 1. APPLICABILITY AND DEFINITIONS +- +- This License applies to any manual or other work, in any medium, +- that contains a notice placed by the copyright holder saying it +- can be distributed under the terms of this License. Such a notice +- grants a world-wide, royalty-free license, unlimited in duration, +- to use that work under the conditions stated herein. The +- "Document", below, refers to any such manual or work. Any member +- of the public is a licensee, and is addressed as "you". You +- accept the license if you copy, modify or distribute the work in a +- way requiring permission under copyright law. +- +- A "Modified Version" of the Document means any work containing the +- Document or a portion of it, either copied verbatim, or with +- modifications and/or translated into another language. +- +- A "Secondary Section" is a named appendix or a front-matter section +- of the Document that deals exclusively with the relationship of the +- publishers or authors of the Document to the Document's overall +- subject (or to related matters) and contains nothing that could +- fall directly within that overall subject. (Thus, if the Document +- is in part a textbook of mathematics, a Secondary Section may not +- explain any mathematics.) The relationship could be a matter of +- historical connection with the subject or with related matters, or +- of legal, commercial, philosophical, ethical or political position +- regarding them. +- +- The "Invariant Sections" are certain Secondary Sections whose +- titles are designated, as being those of Invariant Sections, in +- the notice that says that the Document is released under this +- License. If a section does not fit the above definition of +- Secondary then it is not allowed to be designated as Invariant. +- The Document may contain zero Invariant Sections. If the Document +- does not identify any Invariant Sections then there are none. +- +- The "Cover Texts" are certain short passages of text that are +- listed, as Front-Cover Texts or Back-Cover Texts, in the notice +- that says that the Document is released under this License. A +- Front-Cover Text may be at most 5 words, and a Back-Cover Text may +- be at most 25 words. +- +- A "Transparent" copy of the Document means a machine-readable copy, +- represented in a format whose specification is available to the +- general public, that is suitable for revising the document +- straightforwardly with generic text editors or (for images +- composed of pixels) generic paint programs or (for drawings) some +- widely available drawing editor, and that is suitable for input to +- text formatters or for automatic translation to a variety of +- formats suitable for input to text formatters. A copy made in an +- otherwise Transparent file format whose markup, or absence of +- markup, has been arranged to thwart or discourage subsequent +- modification by readers is not Transparent. An image format is +- not Transparent if used for any substantial amount of text. A +- copy that is not "Transparent" is called "Opaque". +- +- Examples of suitable formats for Transparent copies include plain +- ASCII without markup, Texinfo input format, LaTeX input format, +- SGML or XML using a publicly available DTD, and +- standard-conforming simple HTML, PostScript or PDF designed for +- human modification. Examples of transparent image formats include +- PNG, XCF and JPG. Opaque formats include proprietary formats that +- can be read and edited only by proprietary word processors, SGML or +- XML for which the DTD and/or processing tools are not generally +- available, and the machine-generated HTML, PostScript or PDF +- produced by some word processors for output purposes only. +- +- The "Title Page" means, for a printed book, the title page itself, +- plus such following pages as are needed to hold, legibly, the +- material this License requires to appear in the title page. For +- works in formats which do not have any title page as such, "Title +- Page" means the text near the most prominent appearance of the +- work's title, preceding the beginning of the body of the text. +- +- The "publisher" means any person or entity that distributes copies +- of the Document to the public. +- +- A section "Entitled XYZ" means a named subunit of the Document +- whose title either is precisely XYZ or contains XYZ in parentheses +- following text that translates XYZ in another language. (Here XYZ +- stands for a specific section name mentioned below, such as +- "Acknowledgements", "Dedications", "Endorsements", or "History".) +- To "Preserve the Title" of such a section when you modify the +- Document means that it remains a section "Entitled XYZ" according +- to this definition. +- +- The Document may include Warranty Disclaimers next to the notice +- which states that this License applies to the Document. These +- Warranty Disclaimers are considered to be included by reference in +- this License, but only as regards disclaiming warranties: any other +- implication that these Warranty Disclaimers may have is void and +- has no effect on the meaning of this License. +- +- 2. VERBATIM COPYING +- +- You may copy and distribute the Document in any medium, either +- commercially or noncommercially, provided that this License, the +- copyright notices, and the license notice saying this License +- applies to the Document are reproduced in all copies, and that you +- add no other conditions whatsoever to those of this License. You +- may not use technical measures to obstruct or control the reading +- or further copying of the copies you make or distribute. However, +- you may accept compensation in exchange for copies. If you +- distribute a large enough number of copies you must also follow +- the conditions in section 3. +- +- You may also lend copies, under the same conditions stated above, +- and you may publicly display copies. +- +- 3. COPYING IN QUANTITY +- +- If you publish printed copies (or copies in media that commonly +- have printed covers) of the Document, numbering more than 100, and +- the Document's license notice requires Cover Texts, you must +- enclose the copies in covers that carry, clearly and legibly, all +- these Cover Texts: Front-Cover Texts on the front cover, and +- Back-Cover Texts on the back cover. Both covers must also clearly +- and legibly identify you as the publisher of these copies. The +- front cover must present the full title with all words of the +- title equally prominent and visible. You may add other material +- on the covers in addition. Copying with changes limited to the +- covers, as long as they preserve the title of the Document and +- satisfy these conditions, can be treated as verbatim copying in +- other respects. +- +- If the required texts for either cover are too voluminous to fit +- legibly, you should put the first ones listed (as many as fit +- reasonably) on the actual cover, and continue the rest onto +- adjacent pages. +- +- If you publish or distribute Opaque copies of the Document +- numbering more than 100, you must either include a +- machine-readable Transparent copy along with each Opaque copy, or +- state in or with each Opaque copy a computer-network location from +- which the general network-using public has access to download +- using public-standard network protocols a complete Transparent +- copy of the Document, free of added material. If you use the +- latter option, you must take reasonably prudent steps, when you +- begin distribution of Opaque copies in quantity, to ensure that +- this Transparent copy will remain thus accessible at the stated +- location until at least one year after the last time you +- distribute an Opaque copy (directly or through your agents or +- retailers) of that edition to the public. +- +- It is requested, but not required, that you contact the authors of +- the Document well before redistributing any large number of +- copies, to give them a chance to provide you with an updated +- version of the Document. +- +- 4. MODIFICATIONS +- +- You may copy and distribute a Modified Version of the Document +- under the conditions of sections 2 and 3 above, provided that you +- release the Modified Version under precisely this License, with +- the Modified Version filling the role of the Document, thus +- licensing distribution and modification of the Modified Version to +- whoever possesses a copy of it. In addition, you must do these +- things in the Modified Version: +- +- A. Use in the Title Page (and on the covers, if any) a title +- distinct from that of the Document, and from those of +- previous versions (which should, if there were any, be listed +- in the History section of the Document). You may use the +- same title as a previous version if the original publisher of +- that version gives permission. +- +- B. List on the Title Page, as authors, one or more persons or +- entities responsible for authorship of the modifications in +- the Modified Version, together with at least five of the +- principal authors of the Document (all of its principal +- authors, if it has fewer than five), unless they release you +- from this requirement. +- +- C. State on the Title page the name of the publisher of the +- Modified Version, as the publisher. +- +- D. Preserve all the copyright notices of the Document. +- +- E. Add an appropriate copyright notice for your modifications +- adjacent to the other copyright notices. +- +- F. Include, immediately after the copyright notices, a license +- notice giving the public permission to use the Modified +- Version under the terms of this License, in the form shown in +- the Addendum below. +- +- G. Preserve in that license notice the full lists of Invariant +- Sections and required Cover Texts given in the Document's +- license notice. +- +- H. Include an unaltered copy of this License. +- +- I. Preserve the section Entitled "History", Preserve its Title, +- and add to it an item stating at least the title, year, new +- authors, and publisher of the Modified Version as given on +- the Title Page. If there is no section Entitled "History" in +- the Document, create one stating the title, year, authors, +- and publisher of the Document as given on its Title Page, +- then add an item describing the Modified Version as stated in +- the previous sentence. +- +- J. Preserve the network location, if any, given in the Document +- for public access to a Transparent copy of the Document, and +- likewise the network locations given in the Document for +- previous versions it was based on. These may be placed in +- the "History" section. You may omit a network location for a +- work that was published at least four years before the +- Document itself, or if the original publisher of the version +- it refers to gives permission. +- +- K. For any section Entitled "Acknowledgements" or "Dedications", +- Preserve the Title of the section, and preserve in the +- section all the substance and tone of each of the contributor +- acknowledgements and/or dedications given therein. +- +- L. Preserve all the Invariant Sections of the Document, +- unaltered in their text and in their titles. Section numbers +- or the equivalent are not considered part of the section +- titles. +- +- M. Delete any section Entitled "Endorsements". Such a section +- may not be included in the Modified Version. +- +- N. Do not retitle any existing section to be Entitled +- "Endorsements" or to conflict in title with any Invariant +- Section. +- +- O. Preserve any Warranty Disclaimers. +- +- If the Modified Version includes new front-matter sections or +- appendices that qualify as Secondary Sections and contain no +- material copied from the Document, you may at your option +- designate some or all of these sections as invariant. To do this, +- add their titles to the list of Invariant Sections in the Modified +- Version's license notice. These titles must be distinct from any +- other section titles. +- +- You may add a section Entitled "Endorsements", provided it contains +- nothing but endorsements of your Modified Version by various +- parties--for example, statements of peer review or that the text +- has been approved by an organization as the authoritative +- definition of a standard. +- +- You may add a passage of up to five words as a Front-Cover Text, +- and a passage of up to 25 words as a Back-Cover Text, to the end +- of the list of Cover Texts in the Modified Version. Only one +- passage of Front-Cover Text and one of Back-Cover Text may be +- added by (or through arrangements made by) any one entity. If the +- Document already includes a cover text for the same cover, +- previously added by you or by arrangement made by the same entity +- you are acting on behalf of, you may not add another; but you may +- replace the old one, on explicit permission from the previous +- publisher that added the old one. +- +- The author(s) and publisher(s) of the Document do not by this +- License give permission to use their names for publicity for or to +- assert or imply endorsement of any Modified Version. +- +- 5. COMBINING DOCUMENTS +- +- You may combine the Document with other documents released under +- this License, under the terms defined in section 4 above for +- modified versions, provided that you include in the combination +- all of the Invariant Sections of all of the original documents, +- unmodified, and list them all as Invariant Sections of your +- combined work in its license notice, and that you preserve all +- their Warranty Disclaimers. +- +- The combined work need only contain one copy of this License, and +- multiple identical Invariant Sections may be replaced with a single +- copy. If there are multiple Invariant Sections with the same name +- but different contents, make the title of each such section unique +- by adding at the end of it, in parentheses, the name of the +- original author or publisher of that section if known, or else a +- unique number. Make the same adjustment to the section titles in +- the list of Invariant Sections in the license notice of the +- combined work. +- +- In the combination, you must combine any sections Entitled +- "History" in the various original documents, forming one section +- Entitled "History"; likewise combine any sections Entitled +- "Acknowledgements", and any sections Entitled "Dedications". You +- must delete all sections Entitled "Endorsements." +- +- 6. COLLECTIONS OF DOCUMENTS +- +- You may make a collection consisting of the Document and other +- documents released under this License, and replace the individual +- copies of this License in the various documents with a single copy +- that is included in the collection, provided that you follow the +- rules of this License for verbatim copying of each of the +- documents in all other respects. +- +- You may extract a single document from such a collection, and +- distribute it individually under this License, provided you insert +- a copy of this License into the extracted document, and follow +- this License in all other respects regarding verbatim copying of +- that document. +- +- 7. AGGREGATION WITH INDEPENDENT WORKS +- +- A compilation of the Document or its derivatives with other +- separate and independent documents or works, in or on a volume of +- a storage or distribution medium, is called an "aggregate" if the +- copyright resulting from the compilation is not used to limit the +- legal rights of the compilation's users beyond what the individual +- works permit. When the Document is included in an aggregate, this +- License does not apply to the other works in the aggregate which +- are not themselves derivative works of the Document. +- +- If the Cover Text requirement of section 3 is applicable to these +- copies of the Document, then if the Document is less than one half +- of the entire aggregate, the Document's Cover Texts may be placed +- on covers that bracket the Document within the aggregate, or the +- electronic equivalent of covers if the Document is in electronic +- form. Otherwise they must appear on printed covers that bracket +- the whole aggregate. +- +- 8. TRANSLATION +- +- Translation is considered a kind of modification, so you may +- distribute translations of the Document under the terms of section +- 4. Replacing Invariant Sections with translations requires special +- permission from their copyright holders, but you may include +- translations of some or all Invariant Sections in addition to the +- original versions of these Invariant Sections. You may include a +- translation of this License, and all the license notices in the +- Document, and any Warranty Disclaimers, provided that you also +- include the original English version of this License and the +- original versions of those notices and disclaimers. In case of a +- disagreement between the translation and the original version of +- this License or a notice or disclaimer, the original version will +- prevail. +- +- If a section in the Document is Entitled "Acknowledgements", +- "Dedications", or "History", the requirement (section 4) to +- Preserve its Title (section 1) will typically require changing the +- actual title. +- +- 9. TERMINATION +- +- You may not copy, modify, sublicense, or distribute the Document +- except as expressly provided under this License. Any attempt +- otherwise to copy, modify, sublicense, or distribute it is void, +- and will automatically terminate your rights under this License. +- +- However, if you cease all violation of this License, then your +- license from a particular copyright holder is reinstated (a) +- provisionally, unless and until the copyright holder explicitly +- and finally terminates your license, and (b) permanently, if the +- copyright holder fails to notify you of the violation by some +- reasonable means prior to 60 days after the cessation. +- +- Moreover, your license from a particular copyright holder is +- reinstated permanently if the copyright holder notifies you of the +- violation by some reasonable means, this is the first time you have +- received notice of violation of this License (for any work) from +- that copyright holder, and you cure the violation prior to 30 days +- after your receipt of the notice. +- +- Termination of your rights under this section does not terminate +- the licenses of parties who have received copies or rights from +- you under this License. If your rights have been terminated and +- not permanently reinstated, receipt of a copy of some or all of +- the same material does not give you any rights to use it. +- +- 10. FUTURE REVISIONS OF THIS LICENSE +- +- The Free Software Foundation may publish new, revised versions of +- the GNU Free Documentation License from time to time. Such new +- versions will be similar in spirit to the present version, but may +- differ in detail to address new problems or concerns. See +- `http://www.gnu.org/copyleft/'. +- +- Each version of the License is given a distinguishing version +- number. If the Document specifies that a particular numbered +- version of this License "or any later version" applies to it, you +- have the option of following the terms and conditions either of +- that specified version or of any later version that has been +- published (not as a draft) by the Free Software Foundation. If +- the Document does not specify a version number of this License, +- you may choose any version ever published (not as a draft) by the +- Free Software Foundation. If the Document specifies that a proxy +- can decide which future versions of this License can be used, that +- proxy's public statement of acceptance of a version permanently +- authorizes you to choose that version for the Document. +- +- 11. RELICENSING +- +- "Massive Multiauthor Collaboration Site" (or "MMC Site") means any +- World Wide Web server that publishes copyrightable works and also +- provides prominent facilities for anybody to edit those works. A +- public wiki that anybody can edit is an example of such a server. +- A "Massive Multiauthor Collaboration" (or "MMC") contained in the +- site means any set of copyrightable works thus published on the MMC +- site. +- +- "CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +- license published by Creative Commons Corporation, a not-for-profit +- corporation with a principal place of business in San Francisco, +- California, as well as future copyleft versions of that license +- published by that same organization. +- +- "Incorporate" means to publish or republish a Document, in whole or +- in part, as part of another Document. +- +- An MMC is "eligible for relicensing" if it is licensed under this +- License, and if all works that were first published under this +- License somewhere other than this MMC, and subsequently +- incorporated in whole or in part into the MMC, (1) had no cover +- texts or invariant sections, and (2) were thus incorporated prior +- to November 1, 2008. +- +- The operator of an MMC Site may republish an MMC contained in the +- site under CC-BY-SA on the same site at any time before August 1, +- 2009, provided the MMC is eligible for relicensing. +- +- +-ADDENDUM: How to use this License for your documents +-==================================================== +- +-To use this License in a document you have written, include a copy of +-the License in the document and put the following copyright and license +-notices just after the title page: +- +- Copyright (C) YEAR YOUR NAME. +- Permission is granted to copy, distribute and/or modify this document +- under the terms of the GNU Free Documentation License, Version 1.3 +- or any later version published by the Free Software Foundation; +- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover +- Texts. A copy of the license is included in the section entitled ``GNU +- Free Documentation License''. +- +- If you have Invariant Sections, Front-Cover Texts and Back-Cover +-Texts, replace the "with...Texts." line with this: +- +- with the Invariant Sections being LIST THEIR TITLES, with +- the Front-Cover Texts being LIST, and with the Back-Cover Texts +- being LIST. +- +- If you have Invariant Sections without Cover Texts, or some other +-combination of the three, merge those two alternatives to suit the +-situation. +- +- If your document contains nontrivial examples of program code, we +-recommend releasing these examples in parallel under your choice of +-free software license, such as the GNU General Public License, to +-permit their use in free software. +- +- +-File: libquadmath.info, Node: Reporting Bugs, Prev: GNU Free Documentation License, Up: Top +- +-4 Reporting Bugs +-**************** +- +-Bugs in the GCC Quad-Precision Math Library implementation should be +-reported via `http://gcc.gnu.org/bugs.html'. +- +- +- +-Tag Table: +-Node: Top1661 +-Node: Typedef and constants2395 +-Node: Math Library Routines3813 +-Node: I/O Library Routines7618 +-Node: strtoflt1287943 +-Node: quadmath_snprintf8703 +-Node: GNU Free Documentation License10894 +-Node: Reporting Bugs36060 +- +-End Tag Table +diff -Naur gcc-4.6.3.orig/libstdc++-v3/acinclude.m4 gcc-4.6.3/libstdc++-v3/acinclude.m4 +--- gcc-4.6.3.orig/libstdc++-v3/acinclude.m4 2011-10-05 18:09:51.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/acinclude.m4 2012-07-22 11:46:02.814828000 -0500 +@@ -3213,6 +3213,58 @@ + ]) + ]) + ++dnl ++dnl Check whether gthreads types can be copy-assigned in C++11 mode. ++dnl ++AC_DEFUN([GLIBCXX_GTHREADS_CXX11_COPY_ASSIGN], [ ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS -std=c++0x -I${toplevel_srcdir}/gcc" ++ ++ target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` ++ case $target_thread_file in ++ posix) ++ CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" ++ esac ++ ++ AC_MSG_CHECKING([whether gthreads types are copy-assignable in C++11 mode]) ++ ++ AC_TRY_COMPILE([#include "gthr.h"], ++ [ ++ #ifdef __GTHREAD_MUTEX_INIT ++ __gthread_mutex_t m1; ++ __gthread_mutex_t m2 = __GTHREAD_MUTEX_INIT; ++ m1 = m2; ++ #endif ++ #ifdef __GTHREAD_RECURSIVE_MUTEX_INIT ++ __gthread_recursive_mutex_t r1; ++ __gthread_recursive_mutex_t r2 = __GTHREAD_RECURSIVE_MUTEX_INIT; ++ r1 = r2; ++ #endif ++ #ifdef __GTHREAD_HAS_COND ++ #ifdef __GTHREAD_COND_INIT ++ __gthread_cond_t c1; ++ __gthread_cond_t c2 = __GTHREAD_COND_INIT; ++ c1 = c2; ++ #endif ++ #endif ++ ], [ac_gthread_cxx11_copy_assign=1], [ac_gthread_cxx11_copy_assign=0]) ++ ++ if test $ac_gthread_cxx11_copy_assign = 1 ; then res_gthr_copy_assign=yes ; ++ else res_gthr_copy_assign=no ; fi ++ AC_MSG_RESULT([$res_gthr_copy_assign]) ++ ++ if test x"$res_gthr_copy_assign" = x"no"; then ++ AC_DEFINE(_GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11, 1, ++ [Define if gthreads types cannot be copy-assigned in C++11.]) ++ fi ++ ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ AC_LANG_RESTORE ++]) ++ + # Macros from the top-level gcc directory. + m4_include([../config/gc++filt.m4]) + m4_include([../config/tls.m4]) +diff -Naur gcc-4.6.3.orig/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h gcc-4.6.3/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h +--- gcc-4.6.3.orig/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h 2012-06-20 03:30:55.151768000 -0500 +@@ -1,6 +1,6 @@ + // Locale support -*- C++ -*- + +-// Copyright (C) 2000, 2009 Free Software Foundation, Inc. ++// Copyright (C) 2000, 2009, 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -31,8 +31,6 @@ + // anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h + // See www.netbsd.org for details of access. + +-#include <sys/param.h> +- + namespace std _GLIBCXX_VISIBILITY(default) + { + _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -47,7 +45,7 @@ + // on the mask type. Because of this, we don't use an enum. + typedef unsigned char mask; + +-#if __NetBSD_Version__ < 599004100 ++#ifndef _CTYPE_U + static const mask upper = _U; + static const mask lower = _L; + static const mask alpha = _U | _L; +diff -Naur gcc-4.6.3.orig/libstdc++-v3/config.h.in gcc-4.6.3/libstdc++-v3/config.h.in +--- gcc-4.6.3.orig/libstdc++-v3/config.h.in 2010-07-27 05:36:50.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/config.h.in 2012-07-22 11:46:02.814828000 -0500 +@@ -692,6 +692,9 @@ + /* Define if a fully dynamic basic_string is wanted. */ + #undef _GLIBCXX_FULLY_DYNAMIC_STRING + ++/* Define if gthreads types cannot be copy-assigned in C++11. */ ++#undef _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ + /* Define if gthreads library is available. */ + #undef _GLIBCXX_HAS_GTHREADS + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/configure gcc-4.6.3/libstdc++-v3/configure +--- gcc-4.6.3.orig/libstdc++-v3/configure 2011-11-20 15:24:07.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/configure 2012-07-22 11:46:02.814828000 -0500 +@@ -19477,6 +19477,84 @@ + + + ++# For copy-assignable gthreads types ++ ++ ++ ++ ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ++ ++ ac_save_CXXFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS -std=c++0x -I${toplevel_srcdir}/gcc" ++ ++ target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'` ++ case $target_thread_file in ++ posix) ++ CXXFLAGS="$CXXFLAGS -DSUPPORTS_WEAK -DGTHREAD_USE_WEAK -D_PTHREADS" ++ esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gthreads types are copy-assignable in C++11 mode" >&5 ++$as_echo_n "checking whether gthreads types are copy-assignable in C++11 mode... " >&6; } ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include "gthr.h" ++int ++main () ++{ ++ ++ #ifdef __GTHREAD_MUTEX_INIT ++ __gthread_mutex_t m1; ++ __gthread_mutex_t m2 = __GTHREAD_MUTEX_INIT; ++ m1 = m2; ++ #endif ++ #ifdef __GTHREAD_RECURSIVE_MUTEX_INIT ++ __gthread_recursive_mutex_t r1; ++ __gthread_recursive_mutex_t r2 = __GTHREAD_RECURSIVE_MUTEX_INIT; ++ r1 = r2; ++ #endif ++ #ifdef __GTHREAD_HAS_COND ++ #ifdef __GTHREAD_COND_INIT ++ __gthread_cond_t c1; ++ __gthread_cond_t c2 = __GTHREAD_COND_INIT; ++ c1 = c2; ++ #endif ++ #endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_cxx_try_compile "$LINENO"; then : ++ ac_gthread_cxx11_copy_assign=1 ++else ++ ac_gthread_cxx11_copy_assign=0 ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++ if test $ac_gthread_cxx11_copy_assign = 1 ; then res_gthr_copy_assign=yes ; ++ else res_gthr_copy_assign=no ; fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $res_gthr_copy_assign" >&5 ++$as_echo "$res_gthr_copy_assign" >&6; } ++ ++ if test x"$res_gthr_copy_assign" = x"no"; then ++ ++$as_echo "#define _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 1" >>confdefs.h ++ ++ fi ++ ++ CXXFLAGS="$ac_save_CXXFLAGS" ++ 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 ++ ++ ++ + + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" + if test "x$ac_cv_header_locale_h" = x""yes; then : +diff -Naur gcc-4.6.3.orig/libstdc++-v3/configure.ac gcc-4.6.3/libstdc++-v3/configure.ac +--- gcc-4.6.3.orig/libstdc++-v3/configure.ac 2011-10-05 18:09:51.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/configure.ac 2012-07-22 11:46:02.814828000 -0500 +@@ -164,6 +164,9 @@ + # For gthread support + GLIBCXX_CHECK_GTHREADS + ++# For copy-assignable gthreads types ++GLIBCXX_GTHREADS_CXX11_COPY_ASSIGN ++ + AC_LC_MESSAGES + + # Check for available headers. +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/bits/stl_algo.h gcc-4.6.3/libstdc++-v3/include/bits/stl_algo.h +--- gcc-4.6.3.orig/libstdc++-v3/include/bits/stl_algo.h 2011-09-27 03:22:07.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/include/bits/stl_algo.h 2012-04-12 17:26:02.694716000 -0500 +@@ -1811,7 +1811,8 @@ + for (; __first != __last; ++__first) + if (__pred(*__first)) + { +- *__result1 = _GLIBCXX_MOVE(*__first); ++ if (__result1 != __first) ++ *__result1 = _GLIBCXX_MOVE(*__first); + ++__result1; + } + else +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/debug/safe_iterator.h gcc-4.6.3/libstdc++-v3/include/debug/safe_iterator.h +--- gcc-4.6.3.orig/libstdc++-v3/include/debug/safe_iterator.h 2011-01-21 13:41:13.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/debug/safe_iterator.h 2012-03-08 16:31:19.955944000 -0600 +@@ -1,6 +1,6 @@ + // Safe iterator implementation -*- C++ -*- + +-// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011 ++// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2012 + // Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free +@@ -142,6 +142,24 @@ + ._M_iterator(__x, "other")); + } + ++#ifdef __GXX_EXPERIMENTAL_CXX0X__ ++ /** ++ * @brief Move construction. ++ * @post __x is singular and unattached ++ */ ++ _Safe_iterator(_Safe_iterator&& __x) : _M_current() ++ { ++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() ++ || __x._M_current == _Iterator(), ++ _M_message(__msg_init_copy_singular) ++ ._M_iterator(*this, "this") ++ ._M_iterator(__x, "other")); ++ std::swap(_M_current, __x._M_current); ++ this->_M_attach(__x._M_sequence); ++ __x._M_detach(); ++ } ++#endif ++ + /** + * @brief Converting constructor from a mutable iterator to a + * constant iterator. +@@ -181,6 +199,27 @@ + return *this; + } + ++#ifdef __GXX_EXPERIMENTAL_CXX0X__ ++ /** ++ * @brief Move assignment. ++ * @post __x is singular and unattached ++ */ ++ _Safe_iterator& ++ operator=(_Safe_iterator&& __x) ++ { ++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() ++ || __x._M_current == _Iterator(), ++ _M_message(__msg_copy_singular) ++ ._M_iterator(*this, "this") ++ ._M_iterator(__x, "other")); ++ _M_current = __x._M_current; ++ _M_attach(__x._M_sequence); ++ __x._M_detach(); ++ __x._M_current = _Iterator(); ++ return *this; ++ } ++#endif ++ + /** + * @brief Iterator dereference. + * @pre iterator is dereferenceable +@@ -415,7 +454,9 @@ + /// Is this iterator equal to the sequence's before_begin() iterator if + /// any? + bool _M_is_before_begin() const +- { return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence()); } ++ { ++ return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence()); ++ } + }; + + template<typename _IteratorL, typename _IteratorR, typename _Sequence> +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/ext/concurrence.h gcc-4.6.3/libstdc++-v3/include/ext/concurrence.h +--- gcc-4.6.3.orig/libstdc++-v3/include/ext/concurrence.h 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/ext/concurrence.h 2012-07-22 11:46:02.814828000 -0500 +@@ -1,6 +1,6 @@ + // Support for concurrent programing -*- C++ -*- + +-// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 + // Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free +@@ -140,6 +140,18 @@ + } + #endif + ++ template<typename _Tp> ++ static inline void ++ __copy_gthr_type(_Tp& __to, const _Tp& __from) ++ { ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&__to, &__from, sizeof(__to)); ++#else ++ __to = __from; ++#endif ++ } ++ + class __mutex + { + private: +@@ -156,7 +168,7 @@ + { + #if defined __GTHREAD_MUTEX_INIT + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_mutex = __tmp; ++ __copy_gthr_type(_M_mutex, __tmp); + #else + __GTHREAD_MUTEX_INIT_FUNCTION(&_M_mutex); + #endif +@@ -214,7 +226,7 @@ + { + #if defined __GTHREAD_RECURSIVE_MUTEX_INIT + __gthread_recursive_mutex_t __tmp = __GTHREAD_RECURSIVE_MUTEX_INIT; +- _M_mutex = __tmp; ++ __copy_gthr_type(_M_mutex, __tmp); + #else + __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION(&_M_mutex); + #endif +@@ -270,7 +282,7 @@ + + // matches a gthr-win32.h recursive mutex + template<typename _Rm> +- static typename __enable_if<sizeof(&_Rm::sema), void>::__type ++ static typename __enable_if<(bool)sizeof(&_Rm::sema), void>::__type + _S_destroy(_Rm* __mx) + { + __gthread_mutex_t __tmp; +@@ -279,7 +291,7 @@ + + // matches a recursive mutex with a member 'actual' + template<typename _Rm> +- static typename __enable_if<sizeof(&_Rm::actual), void>::__type ++ static typename __enable_if<(bool)sizeof(&_Rm::actual), void>::__type + _S_destroy(_Rm* __mx) + { __gthread_mutex_destroy(&__mx->actual); } + +@@ -332,7 +344,7 @@ + { + #if defined __GTHREAD_COND_INIT + __gthread_cond_t __tmp = __GTHREAD_COND_INIT; +- _M_cond = __tmp; ++ __copy_gthr_type(_M_cond, __tmp); + #else + __GTHREAD_COND_INIT_FUNCTION(&_M_cond); + #endif +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/ext/rope gcc-4.6.3/libstdc++-v3/include/ext/rope +--- gcc-4.6.3.orig/libstdc++-v3/include/ext/rope 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/ext/rope 2012-07-22 11:46:02.814828000 -0500 +@@ -1,7 +1,7 @@ + // SGI's rope class -*- C++ -*- + +-// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-// Free Software Foundation, Inc. ++// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, ++// 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -445,6 +445,17 @@ + identity_element(_Rope_Concat_fn<_CharT, _Alloc>) + { return rope<_CharT, _Alloc>(); } + ++ static inline void ++ __copy_gthr_mutex(__gthread_mutex_t& __to, const __gthread_mutex_t& __from) ++ { ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&__to, &__from, sizeof(__to)); ++#else ++ __to = __from; ++#endif ++ } ++ + // Class _Refcount_Base provides a type, _RC_t, a data member, + // _M_ref_count, and member functions _M_incr and _M_decr, which perform + // atomic preincrement/predecrement. The constructor initializes +@@ -464,7 +475,7 @@ + { + #ifdef __GTHREAD_MUTEX_INIT + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_ref_count_lock = __tmp; ++ __copy_gthr_mutex(_M_ref_count_lock, __tmp); + #elif defined(__GTHREAD_MUTEX_INIT_FUNCTION) + __GTHREAD_MUTEX_INIT_FUNCTION (&_M_ref_count_lock); + #else +@@ -605,7 +616,7 @@ + { + // Do not copy a POSIX/gthr mutex once in use. However, bits are bits. + __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT; +- _M_c_string_lock = __tmp; ++ __copy_gthr_mutex(_M_c_string_lock, __tmp); + } + #else + { __GTHREAD_MUTEX_INIT_FUNCTION (&_M_c_string_lock); } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/std/condition_variable gcc-4.6.3/libstdc++-v3/include/std/condition_variable +--- gcc-4.6.3.orig/libstdc++-v3/include/std/condition_variable 2011-12-18 18:34:29.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/std/condition_variable 2012-07-04 20:10:10.791368000 -0500 +@@ -1,6 +1,6 @@ + // <condition_variable> -*- C++ -*- + +-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -171,6 +171,26 @@ + condition_variable _M_cond; + mutex _M_mutex; + ++ // scoped unlock - unlocks in ctor, re-locks in dtor ++ template<typename _Lock> ++ struct _Unlock ++ { ++ explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); } ++ ++ ~_Unlock() noexcept(false) ++ { ++ if (uncaught_exception()) ++ __try { _M_lock.lock(); } __catch(...) { } ++ else ++ _M_lock.lock(); ++ } ++ ++ _Unlock(const _Unlock&) = delete; ++ _Unlock& operator=(const _Unlock&) = delete; ++ ++ _Lock& _M_lock; ++ }; ++ + public: + typedef condition_variable::native_handle_type native_handle_type; + +@@ -198,21 +218,8 @@ + void + wait(_Lock& __lock) + { +- // scoped unlock - unlocks in ctor, re-locks in dtor +- struct _Unlock { +- explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); } +- ~_Unlock() noexcept(false) +- { +- if (uncaught_exception()) +- __try { _M_lock.lock(); } __catch(...) { } +- else +- _M_lock.lock(); +- } +- _Lock& _M_lock; +- }; +- + unique_lock<mutex> __my_lock(_M_mutex); +- _Unlock __unlock(__lock); ++ _Unlock<_Lock> __unlock(__lock); + // _M_mutex must be unlocked before re-locking __lock so move + // ownership of _M_mutex lock to an object with shorter lifetime. + unique_lock<mutex> __my_lock2(std::move(__my_lock)); +@@ -233,11 +240,12 @@ + wait_until(_Lock& __lock, + const chrono::time_point<_Clock, _Duration>& __atime) + { +- unique_lock<mutex> __my_lock(_M_mutex); +- __lock.unlock(); +- cv_status __status = _M_cond.wait_until(__my_lock, __atime); +- __lock.lock(); +- return __status; ++ unique_lock<mutex> __my_lock(_M_mutex); ++ _Unlock<_Lock> __unlock(__lock); ++ // _M_mutex must be unlocked before re-locking __lock so move ++ // ownership of _M_mutex lock to an object with shorter lifetime. ++ unique_lock<mutex> __my_lock2(std::move(__my_lock)); ++ return _M_cond.wait_until(__my_lock2, __atime); + } + + template<typename _Lock, typename _Clock, +diff -Naur gcc-4.6.3.orig/libstdc++-v3/include/std/mutex gcc-4.6.3/libstdc++-v3/include/std/mutex +--- gcc-4.6.3.orig/libstdc++-v3/include/std/mutex 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/include/std/mutex 2012-07-07 13:35:52.084223000 -0500 +@@ -130,7 +130,7 @@ + public: + // matches a gthr-win32.h recursive mutex + template<typename _Rm> +- static typename enable_if<sizeof(&_Rm::sema), void>::type ++ static typename enable_if<(bool)sizeof(&_Rm::sema), void>::type + _S_destroy(_Rm* __mx) + { + __gthread_mutex_t __tmp; +@@ -139,7 +139,7 @@ + + // matches a recursive mutex with a member 'actual' + template<typename _Rm> +- static typename enable_if<sizeof(&_Rm::actual), void>::type ++ static typename enable_if<(bool)sizeof(&_Rm::actual), void>::type + _S_destroy(_Rm* __mx) + { __gthread_mutex_destroy(&__mx->actual); } + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/src/condition_variable.cc gcc-4.6.3/libstdc++-v3/src/condition_variable.cc +--- gcc-4.6.3.orig/libstdc++-v3/src/condition_variable.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/src/condition_variable.cc 2012-07-22 11:46:02.814828000 -0500 +@@ -1,6 +1,6 @@ + // condition_variable -*- C++ -*- + +-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2008, 2009, 2010, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -34,7 +34,12 @@ + { + #ifdef __GTHREAD_COND_INIT + __native_type __tmp = __GTHREAD_COND_INIT; ++#if defined __GXX_EXPERIMENTAL_CXX0X__ \ ++ && defined _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11 ++ __builtin_memcpy(&_M_cond, &__tmp, sizeof(_M_cond)); ++#else + _M_cond = __tmp; ++#endif + #else + int __e = __gthread_cond_init(&_M_cond, 0); + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/18_support/initializer_list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy_n/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/21_strings/basic_string/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc gcc-4.6.3/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/22_locale/ctype_base/53678.cc 2012-06-20 03:30:55.151768000 -0500 +@@ -0,0 +1,28 @@ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// { dg-do compile } ++ ++// 22.2.1 The ctype category ++ ++#include <locale> ++ ++// libstdc++/53678 ++void test01() ++{ ++ bool NetBSD __attribute__((unused)) = true; ++} +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc gcc-4.6.3/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc 2010-09-15 05:46:39.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc 2012-09-27 16:00:14.870001000 -0500 +@@ -1,7 +1,7 @@ + // { dg-require-namedlocale "de_DE" } + // { dg-require-namedlocale "es_ES" } + +-// Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. ++// Copyright (C) 2004-2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -22,23 +22,60 @@ + #include <locale> + #include <testsuite_hooks.h> + +-int main() ++// Make sure that formatted output uses the locale in the output stream. ++using namespace std; ++locale l1 = locale("de_DE"); ++const num_put<char>& np = use_facet<num_put<char> >(l1); ++const numpunct<char>& npunct = use_facet<numpunct<char> >(l1); ++ ++void test01() + { +- using namespace std; ++ bool test __attribute__((unused)) = true; ++ ++ locale l2 = locale("C"); ++ const numpunct<char>& npunct2 = use_facet<numpunct<char> >(l2); ++ char c = npunct2.thousands_sep(); ++ string s = npunct2.grouping(); ++ ++ ostringstream oss; ++ oss.imbue(l2); ++ ++ long l = 1234567890; ++ np.put(oss.rdbuf(), oss, ' ', l); ++ string res = oss.str(); ++ ++ VERIFY( res == "1234567890" ); ++} + ++void test02() ++{ + bool test __attribute__((unused)) = true; +- locale l1 = locale("de_DE"); ++ + locale l2 = locale("es_ES"); +- +- const num_put<char>& np = use_facet<num_put<char> >(l1); ++ const numpunct<char>& npunct3 = use_facet<numpunct<char> >(l2); ++ char c = npunct3.thousands_sep(); ++ string s = npunct3.grouping(); ++ + ostringstream oss; + oss.imbue(l2); + + long l = 1234567890; +- np.put(oss.rdbuf(), oss, ' ', l); // 1234567890 ++ np.put(oss.rdbuf(), oss, ' ', l); + string res = oss.str(); +- +- VERIFY( res == "1234567890" ); + ++ if (!s.empty()) ++ VERIFY( res == "1.234.567.890" ); ++ else ++ VERIFY( res == "1234567890" ); ++} ++ ++int main() ++{ ++ // Sanity check. ++ char c = npunct.thousands_sep(); ++ string s = npunct.grouping(); ++ ++ test01(); ++ test02(); + return 0; + } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/array/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/array/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/array/range_access.cc 2010-08-10 05:28:47.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/array/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134-2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/deque/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/deque/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/6.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/7.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/8.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/cons/9.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/clear.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after4_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after5_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after6_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after7_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after8_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/erase_after9_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/insert_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/move_constructor.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after1_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after2_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after3_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc 2011-01-16 04:35:28.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after4_neg.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc 2010-11-25 14:53:39.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/splice_after.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc 2011-01-05 14:52:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/debug/swap.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc 2010-03-15 20:32:53.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc 2010-10-17 12:34:38.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/modifiers/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc 2009-07-31 21:26:32.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc 2009-07-31 21:26:32.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/6.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/operations/7.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/forward_list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/1.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/2.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h 2009-11-19 13:21:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/3.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc 2009-12-15 23:16:46.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h 2009-12-15 23:16:46.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/modifiers/insert/25288.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/1.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/1.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/2.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/2.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc 2009-12-14 04:26:09.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3_c++0x.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/3.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/3.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc 2009-12-11 16:04:56.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/42352.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/4.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/4.h 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.cc 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.h gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.h +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/operations/5.h 2009-06-17 20:40:44.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/operations/5.h 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/list/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/list/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/map/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/map/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multimap/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/multiset/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/set/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/set/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_map/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multimap/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_multiset/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/unordered_set/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc 2011-01-30 16:39:36.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134-2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc 2012-03-08 16:31:19.955944000 -0600 +@@ -0,0 +1,43 @@ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++// ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++// ++// { dg-require-debug-mode "" } ++// { dg-options "-std=gnu++0x" } ++// { dg-do compile } ++ ++// PR libstdc++/52433 ++ ++#include <vector> ++ ++struct X ++{ ++ std::vector<int>::iterator i; ++ ++ X() = default; ++ X(const X&) = default; ++ X(X&&) = default; ++ X& operator=(const X&) = default; ++ X& operator=(X&&) = default; ++}; ++ ++X test01() ++{ ++ X x; ++ x = X(); ++ return x; ++} ++ +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/23_containers/vector/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/23_containers/vector/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/24_iterators/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/24_iterators/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/24_iterators/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/24_iterators/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/34595.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc 2009-12-23 12:45:41.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/char/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/3.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/copy_n/move_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill/4.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill/4.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill/4.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill/4.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc 2009-11-04 20:55:08.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/fill_n/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/char/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -8,7 +8,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable2.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_heap_until/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/is_sorted_until/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc 2009-12-23 12:45:41.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc 2009-09-01 05:19:11.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/move_backward/deque_iterators/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/partition/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc 2010-01-12 11:16:25.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/moveable.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -1,6 +1,6 @@ + // { dg-options "-std=gnu++0x" } + +-// Copyright (C) 2009, 2010 Free Software Foundation, Inc. ++// Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc. + // + // This file is part of the GNU ISO C++ Library. This library is free + // software; you can redistribute it and/or modify it under the +@@ -9,7 +9,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +@@ -39,6 +39,11 @@ + const int B[] = {2, 4, 6, 8, 10, 12, 14, 16, 1, 3, 5, 7, 9, 11, 13, 15, 17}; + const int N = sizeof(A) / sizeof(int); + ++// Check that starting with a true predicate works too. (PR52822) ++const int A2[] = {2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; ++const int B2[] = {2, 4, 6, 8, 10, 12, 14, 16, 3, 5, 7, 9, 11, 13, 15, 17}; ++const int N2 = sizeof(A2) / sizeof(int); ++ + struct Pred + { + bool +@@ -46,7 +51,7 @@ + { return (x.val % 2) == 0; } + }; + +-// 25.2.12 stable_partition() ++// 25.2.12 stable_partition(), starting with a false predicate. + void + test01() + { +@@ -60,9 +65,24 @@ + VERIFY( std::equal(s1, s1 + N, B) ); + } + ++// 25.2.12 stable_partition(), starting with a true predicate. ++void ++test02() ++{ ++ bool test __attribute__((unused)) = true; ++ ++ rvalstruct s1[N2]; ++ std::copy(A2, A2 + N2, s1); ++ Container con(s1, s1 + N2); ++ ++ std::stable_partition(con.begin(), con.end(), Pred()); ++ VERIFY( std::equal(s1, s1 + N2, B2) ); ++} ++ + int + main() + { + test01(); ++ test02(); + return 0; + } +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/25_algorithms/stable_partition/pr52822.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -0,0 +1,43 @@ ++// { dg-options "-std=gnu++0x" } ++ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// 25.2.12 [lib.alg.partitions] Partitions. ++ ++#include <algorithm> ++#include <vector> ++#include <testsuite_hooks.h> ++ ++bool true_vector_pred(const std::vector<int>&) { return true; } ++ ++void ++test01() ++{ ++ std::vector<std::vector<int> > v(1); ++ v[0].push_back(7); ++ VERIFY( v[0].size() == 1 ); ++ std::stable_partition(v.begin(), v.end(), &true_vector_pred); ++ VERIFY( v[0].size() == 1 ); ++} ++ ++int ++main() ++{ ++ test01(); ++ return 0; ++} +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/28_regex/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/28_regex/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/28_regex/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/28_regex/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc gcc-4.6.3/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc 1969-12-31 18:00:00.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/30_threads/condition_variable_any/53830.cc 2012-07-04 20:10:10.791368000 -0500 +@@ -0,0 +1,68 @@ ++// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* powerpc-ibm-aix* } } ++// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* powerpc-ibm-aix* } } ++// { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } } ++// { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } } ++// { dg-require-cstdint "" } ++// { dg-require-gthreads "" } ++// { dg-require-sched-yield "" } ++// { dg-require-nanosleep "" } ++ ++// Copyright (C) 2012 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) ++// any later version. ++ ++// This library 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 library; see the file COPYING3. If not see ++// <http://www.gnu.org/licenses/>. ++ ++// PR libstdc++/53830 ++// Test for deadlock in condition_variable_any::wait_for ++ ++#include <thread> ++#include <mutex> ++#include <condition_variable> ++#include <chrono> ++#include <atomic> ++ ++std::mutex mutex; ++std::condition_variable_any cv; ++ ++std::atomic<int> barrier(0); ++ ++// waits for data from another thread ++void wait_for_data() ++{ ++ std::unique_lock<std::mutex> lock(mutex); ++ barrier = 1; ++ cv.wait_for(lock, std::chrono::milliseconds(100), []{ return false; }); ++ // read data ++} ++ ++// passes data to waiting thread ++void provide_data() ++{ ++ while (barrier == 0) ++ std::this_thread::yield(); ++ std::unique_lock<std::mutex> lock(mutex); ++ // pass data ++ std::this_thread::sleep_for(std::chrono::seconds(1)); ++ cv.notify_one(); ++} ++ ++int main() ++{ ++ std::thread thread1(wait_for_data); ++ provide_data(); ++ thread1.join(); ++ return 0; ++} ++ +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/29134.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc 2010-01-08 07:01:24.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/capacity/shrink_to_fit.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -11,7 +11,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc 2011-02-17 02:38:11.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/char/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc 2011-02-17 02:38:11.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/hash/wchar_t/1.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/range_access.cc gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/range_access.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/ext/vstring/range_access.cc 2010-07-27 12:27:06.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/ext/vstring/range_access.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -10,7 +10,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.am gcc-4.6.3/libstdc++-v3/testsuite/Makefile.am +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.am 2011-03-02 17:32:56.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/Makefile.am 2012-04-08 20:42:09.946040000 -0500 +@@ -59,6 +59,7 @@ + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp ++ @echo 'set TEST_GCC_EXEC_PREFIX "$(libdir)/gcc/"' >> site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.in gcc-4.6.3/libstdc++-v3/testsuite/Makefile.in +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/Makefile.in 2011-03-07 18:04:05.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/Makefile.in 2012-04-08 20:42:09.946040000 -0500 +@@ -502,6 +502,7 @@ + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo 'set baseline_dir "$(baseline_dir)"' >> site.tmp ++ @echo 'set TEST_GCC_EXEC_PREFIX "$(libdir)/gcc/"' >> site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc 2009-12-24 06:47:37.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_backward_deque_iterators.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc 2009-12-23 11:14:15.000000000 -0600 ++++ gcc-4.6.3/libstdc++-v3/testsuite/performance/25_algorithms/copy_deque_iterators.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_map/capacity/29134-map.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multimap/capacity/29134-multimap.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_multiset/capacity/29134-multiset.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + +diff -Naur gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc +--- gcc-4.6.3.orig/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc 2009-04-09 10:00:19.000000000 -0500 ++++ gcc-4.6.3/libstdc++-v3/testsuite/tr1/6_containers/unordered_set/capacity/29134-set.cc 2012-11-01 19:04:58.512898000 -0500 +@@ -7,7 +7,7 @@ + // any later version. + + // This library is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without Pred the implied warranty of ++// 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. + diff --git a/stage1/patches/common/linux-3.14.4-noperl-timeconst.patch b/stage1/patches/common/linux-3.14.4-noperl-timeconst.patch new file mode 120000 index 0000000..81065c3 --- /dev/null +++ b/stage1/patches/common/linux-3.14.4-noperl-timeconst.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/linux-3.14.4-noperl-timeconst.patch \ No newline at end of file diff --git a/stage1/patches/common/make-3.82-fixes-1.patch b/stage1/patches/common/make-3.82-fixes-1.patch new file mode 100644 index 0000000..6e021a3 --- /dev/null +++ b/stage1/patches/common/make-3.82-fixes-1.patch @@ -0,0 +1,331 @@ +Submitted By: William Harrington at <kb0iic at cross-lfs dot org> +Date: 2013-08-01 +Initial Package Version: 3.82 +Upstream Status: Fixed Upstream +Origin: Upstream +Description: Several bug fixes from upstream git + +diff -Naur make-3.82.orig/expand.c make-3.82/expand.c +--- make-3.82.orig/expand.c 2010-07-13 01:20:39.000000000 +0000 ++++ make-3.82/expand.c 2013-08-01 20:44:22.773645293 +0000 +@@ -197,7 +197,7 @@ + { + struct variable *v; + const char *p, *p1; +- char *abuf = NULL; ++ char *save; + char *o; + unsigned int line_offset; + +@@ -212,16 +212,11 @@ + return (variable_buffer); + } + +- /* If we want a subset of the string, allocate a temporary buffer for it. +- Most of the functions we use here don't work with length limits. */ +- if (length > 0 && string[length] != '\0') +- { +- abuf = xmalloc(length+1); +- memcpy(abuf, string, length); +- abuf[length] = '\0'; +- string = abuf; +- } +- p = string; ++ /* We need a copy of STRING: due to eval, it's possible that it will get ++ freed as we process it (it might be the value of a variable that's reset ++ for example). Also having a nil-terminated string is handy. */ ++ save = length < 0 ? xstrdup (string) : xstrndup (string, length); ++ p = save; + + while (1) + { +@@ -411,8 +406,7 @@ + ++p; + } + +- if (abuf) +- free (abuf); ++ free (save); + + variable_buffer_output (o, "", 1); + return (variable_buffer + line_offset); +diff -Naur make-3.82.orig/function.c make-3.82/function.c +--- make-3.82.orig/function.c 2010-07-13 01:20:39.000000000 +0000 ++++ make-3.82/function.c 2013-08-01 20:45:09.100176320 +0000 +@@ -706,7 +706,7 @@ + const char *word_iterator = argv[0]; + char buf[20]; + +- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0) ++ while (find_next_token (&word_iterator, NULL) != 0) + ++i; + + sprintf (buf, "%d", i); +@@ -1133,21 +1133,14 @@ + + /* Find the maximum number of words we'll have. */ + t = argv[0]; +- wordi = 1; +- while (*t != '\0') ++ wordi = 0; ++ while ((p = find_next_token (&t, NULL)) != 0) + { +- char c = *(t++); +- +- if (! isspace ((unsigned char)c)) +- continue; +- ++ ++t; + ++wordi; +- +- while (isspace ((unsigned char)*t)) +- ++t; + } + +- words = xmalloc (wordi * sizeof (char *)); ++ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *)); + + /* Now assign pointers to each string in the array. */ + t = argv[0]; +diff -Naur make-3.82.orig/job.c make-3.82/job.c +--- make-3.82.orig/job.c 2010-07-24 08:27:50.000000000 +0000 ++++ make-3.82/job.c 2013-08-01 20:44:54.400222908 +0000 +@@ -29,6 +29,15 @@ + + #include <string.h> + ++#if defined(__linux__) /* defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) */ ++#include <sys/user.h> ++#include <unistd.h> ++#ifndef PAGE_SIZE ++#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) ++#endif ++#include <linux/binfmts.h> ++#endif ++ + /* Default shell to use. */ + #ifdef WINDOWS32 + #include <windows.h> +@@ -2791,6 +2800,15 @@ + argument list. */ + + unsigned int shell_len = strlen (shell); ++#ifdef MAX_ARG_STRLEN ++ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ "; ++#define ARG_NUMBER_DIGITS 5 ++#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \ ++ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2)) ++#else ++#define EVAL_LEN 0 ++#endif ++ char *args_ptr; + unsigned int line_len = strlen (line); + unsigned int sflags_len = strlen (shellflags); + char *command_ptr = NULL; /* used for batch_mode_shell mode */ +@@ -2866,7 +2884,7 @@ + } + + new_line = alloca (shell_len + 1 + sflags_len + 1 +- + (line_len*2) + 1); ++ + (line_len*2) + 1 + EVAL_LEN); + ap = new_line; + memcpy (ap, shell, shell_len); + ap += shell_len; +@@ -2875,6 +2893,30 @@ + ap += sflags_len; + *(ap++) = ' '; + command_ptr = ap; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN) ++ { ++ unsigned j; ++ memcpy (ap, eval_line, sizeof (eval_line) - 1); ++ ap += sizeof (eval_line) - 1; ++ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++) ++ ap += sprintf (ap, "\\$\\{%u\\}", j); ++ *ap++ = '\\'; ++ *ap++ = '"'; ++ *ap++ = ' '; ++ /* Copy only the first word of SHELL to $0. */ ++ for (p = shell; *p != '\0'; ++p) ++ { ++ if (isspace ((unsigned char)*p)) ++ break; ++ *ap++ = *p; ++ } ++ *ap++ = ' '; ++ } ++#endif ++ args_ptr = ap; ++ + for (p = line; *p != '\0'; ++p) + { + if (restp != NULL && *p == '\n') +@@ -2922,6 +2964,14 @@ + } + #endif + *ap++ = *p; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2)) ++ { ++ *ap++ = ' '; ++ args_ptr = ap; ++ } ++#endif + } + if (ap == new_line + shell_len + sflags_len + 2) + /* Line was empty. */ +diff -Naur make-3.82.orig/main.c make-3.82/main.c +--- make-3.82.orig/main.c 2010-07-19 07:10:53.000000000 +0000 ++++ make-3.82/main.c 2013-08-01 20:45:20.540147980 +0000 +@@ -1138,7 +1138,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) +diff -Naur make-3.82.orig/read.c make-3.82/read.c +--- make-3.82.orig/read.c 2010-07-13 01:20:42.000000000 +0000 ++++ make-3.82/read.c 2013-08-01 20:44:39.690263962 +0000 +@@ -2904,6 +2904,7 @@ + const char *name; + const char **nlist = 0; + char *tildep = 0; ++ int globme = 1; + #ifndef NO_ARCHIVES + char *arname = 0; + char *memname = 0; +@@ -3028,7 +3029,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3085,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3112,32 +3113,40 @@ + } + #endif /* !NO_ARCHIVES */ + +- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) +- { +- case GLOB_NOSPACE: +- fatal (NILF, _("virtual memory exhausted")); +- +- case 0: +- /* Success. */ +- i = gl.gl_pathc; +- nlist = (const char **)gl.gl_pathv; +- break; +- +- case GLOB_NOMATCH: +- /* If we want only existing items, skip this one. */ +- if (flags & PARSEFS_EXISTS) +- { +- i = 0; +- break; +- } +- /* FALLTHROUGH */ +- +- default: +- /* By default keep this name. */ ++ /* glob() is expensive: don't call it unless we need to. */ ++ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL) ++ { ++ globme = 0; + i = 1; + nlist = &name; +- break; +- } ++ } ++ else ++ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) ++ { ++ case GLOB_NOSPACE: ++ fatal (NILF, _("virtual memory exhausted")); ++ ++ case 0: ++ /* Success. */ ++ i = gl.gl_pathc; ++ nlist = (const char **)gl.gl_pathv; ++ break; ++ ++ case GLOB_NOMATCH: ++ /* If we want only existing items, skip this one. */ ++ if (flags & PARSEFS_EXISTS) ++ { ++ i = 0; ++ break; ++ } ++ /* FALLTHROUGH */ ++ ++ default: ++ /* By default keep this name. */ ++ i = 1; ++ nlist = &name; ++ break; ++ } + + /* For each matched element, add it to the list. */ + while (i-- > 0) +@@ -3152,7 +3161,10 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; + + /* Find and set the new end. Massage names if necessary. */ + while (1) +@@ -3174,7 +3186,8 @@ + #endif /* !NO_ARCHIVES */ + NEWELT (concat (2, prefix, nlist[i])); + +- globfree (&gl); ++ if (globme) ++ globfree (&gl); + + #ifndef NO_ARCHIVES + if (arname) diff --git a/stage1/patches/common/ncurses-5.9-bash_fix-1.patch b/stage1/patches/common/ncurses-5.9-bash_fix-1.patch new file mode 120000 index 0000000..a68d51b --- /dev/null +++ b/stage1/patches/common/ncurses-5.9-bash_fix-1.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ncurses-5.9-bash_fix-1.patch \ No newline at end of file diff --git a/stage1/patches/common/ncurses-5.9-branch_update-4.patch b/stage1/patches/common/ncurses-5.9-branch_update-4.patch new file mode 120000 index 0000000..3960404 --- /dev/null +++ b/stage1/patches/common/ncurses-5.9-branch_update-4.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ncurses-5.9-branch_update-4.patch \ No newline at end of file diff --git a/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch new file mode 120000 index 0000000..8715724 --- /dev/null +++ b/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch \ No newline at end of file diff --git a/stage1/patches/common/sysvinit-2.88dsf-tools_updates-1.patch b/stage1/patches/common/sysvinit-2.88dsf-tools_updates-1.patch new file mode 100644 index 0000000..3dae7da --- /dev/null +++ b/stage1/patches/common/sysvinit-2.88dsf-tools_updates-1.patch @@ -0,0 +1,77 @@ +Author: Hugo Villeneuve (hugo at hugovil dot com) +Date: 2014-08-08 +Initial Package Version: 2.88dsf +Origin: Based on CLFS patch sysvinit-2.88dsf-tools_updates-1.patch +Description: Point libraries to /tools/lib and remove unneded programs + from being installed. + +diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile +--- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 05:30:27.000000000 -0400 ++++ sysvinit-2.88dsf/src/Makefile 2014-04-14 17:00:32.000000000 -0400 +@@ -16,27 +16,20 @@ + # For some known distributions we do not build all programs, otherwise we do. + BIN = + SBIN = init halt shutdown runlevel killall5 fstab-decode +-USRBIN = last mesg + +-MAN1 = last.1 lastb.1 mesg.1 + MAN5 = initscript.5 inittab.5 + MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 + MAN8 += shutdown.8 telinit.8 fstab-decode.8 + + ifeq ($(DISTRO),) +-BIN += mountpoint +-SBIN += sulogin bootlogd +-USRBIN += utmpdump wall +-MAN1 += utmpdump.1 mountpoint.1 wall.1 +-MAN8 += sulogin.8 bootlogd.8 ++SBIN += bootlogd ++MAN8 += bootlogd.8 + endif + + ifeq ($(DISTRO),Debian) + CPPFLAGS+= -DACCTON_OFF +-BIN += mountpoint +-SBIN += sulogin bootlogd +-MAN1 += mountpoint.1 +-MAN8 += sulogin.8 bootlogd.8 ++SBIN += bootlogd ++MAN8 += bootlogd.8 + endif + + ifeq ($(DISTRO),Owl) +@@ -46,11 +39,8 @@ + + ifeq ($(DISTRO),SuSE) + CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE +-BIN += mountpoint +-SBIN += sulogin +-USRBIN += utmpdump +-MAN1 += utmpdump.1 mountpoint.1 +-MAN8 += sulogin.8 ++SBIN += ++MAN8 += + endif + + ID = $(shell id -u) +@@ -78,7 +68,7 @@ + endif + + # Additional libs for GNU libc. +-ifneq ($(wildcard /usr/lib*/libcrypt.a),) ++ifneq ($(wildcard /tools/lib*/libcrypt.a),) + SULOGINLIBS += -lcrypt + endif + +@@ -96,11 +86,8 @@ + + last: last.o oldutmp.h + +-mesg: mesg.o + +-mountpoint: mountpoint.o + +-utmpdump: utmpdump.o + + runlevel: runlevel.o + diff --git a/stage1/patches/common/tar-1.26-man-1.patch b/stage1/patches/common/tar-1.26-man-1.patch new file mode 100644 index 0000000..83dac2b --- /dev/null +++ b/stage1/patches/common/tar-1.26-man-1.patch @@ -0,0 +1,2073 @@ +Submitted By: Jonathan Norman <jonathan at bluesquarelinux.co.uk > +Date: 2011-05-18 +Initial Package Version: 1.22 +Origin: Debian +Upstream Status: Unknown +Description: This patch adds a man page for tar generated by the perl script + from debian. + +Rediffed: Against 1.26 by Jonathan Norman 2011-05-18 + +diff -Naur tar-1.26.orig/doc/Makefile.am tar-1.26/doc/Makefile.am +--- tar-1.26.orig/doc/Makefile.am 2011-05-18 17:55:21.025857021 +0000 ++++ tar-1.26/doc/Makefile.am 2011-05-18 17:55:36.872098438 +0000 +@@ -17,6 +17,7 @@ + ## along with this program; if not, write to the Free Software Foundation, + ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + ++man_MANS = tar.1 + info_TEXINFOS = tar.texi + tar_TEXINFOS = \ + dumpdir.texi\ +diff -Naur tar-1.26.orig/doc/Makefile.in tar-1.26/doc/Makefile.in +--- tar-1.26.orig/doc/Makefile.in 2011-05-18 17:55:21.029856577 +0000 ++++ tar-1.26/doc/Makefile.in 2011-05-18 17:55:36.872098438 +0000 +@@ -172,7 +172,7 @@ + MAKEINFOHTML = $(MAKEINFO) --html + AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) + DVIPS = dvips +-am__installdirs = "$(DESTDIR)$(infodir)" ++am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +@@ -194,6 +194,9 @@ + am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++man1dir = $(mandir)/man1 ++NROFF = nroff ++MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ + ACLOCAL = @ACLOCAL@ +@@ -956,6 +959,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ ++man_MANS = tar.1 + info_TEXINFOS = tar.texi + tar_TEXINFOS = \ + dumpdir.texi\ +@@ -1178,6 +1182,44 @@ + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ + done ++install-man1: $(man_MANS) ++ @$(NORMAL_INSTALL) ++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ { for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | while read p; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; echo "$$p"; \ ++ done | \ ++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ ++ sed 'N;N;s,\n, ,g' | { \ ++ list=; while read file base inst; do \ ++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ ++ fi; \ ++ done; \ ++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ ++ while read files; do \ ++ test -z "$$files" || { \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ ++ done; } ++ ++uninstall-man1: ++ @$(NORMAL_UNINSTALL) ++ @list=''; test -n "$(man1dir)" || exit 0; \ ++ files=`{ for i in $$list; do echo "$$i"; done; \ ++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ ++ sed -n '/\.1[a-z]*$$/p'; \ ++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ ++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ ++ test -z "$$files" || { \ ++ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ ++ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + tags: TAGS + TAGS: + +@@ -1186,6 +1228,19 @@ + + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -1220,9 +1275,9 @@ + dist-info + check-am: all-am + check: check-am +-all-am: Makefile $(INFO_DEPS) ++all-am: Makefile $(INFO_DEPS) $(MANS) + installdirs: +- for dir in "$(DESTDIR)$(infodir)"; do \ ++ for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: install-am +@@ -1270,7 +1325,7 @@ + + info-am: $(INFO_DEPS) + +-install-data-am: install-info-am ++install-data-am: install-info-am install-man + + install-dvi: install-dvi-am + +@@ -1344,7 +1399,7 @@ + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ + done; \ + else : ; fi +-install-man: ++install-man: install-man1 + + install-pdf: install-pdf-am + +@@ -1392,7 +1447,9 @@ + ps-am: $(PSS) + + uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ +- uninstall-pdf-am uninstall-ps-am ++ uninstall-man uninstall-pdf-am uninstall-ps-am ++ ++uninstall-man: uninstall-man1 + + .MAKE: install-am install-strip + +@@ -1401,14 +1458,15 @@ + dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs maintainer-clean \ +- maintainer-clean-aminfo maintainer-clean-generic \ +- maintainer-clean-vti mostlyclean mostlyclean-aminfo \ +- mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ +- uninstall-info-am uninstall-pdf-am uninstall-ps-am ++ install-info install-info-am install-man install-man1 \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-aminfo \ ++ maintainer-clean-generic maintainer-clean-vti mostlyclean \ ++ mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ ++ pdf-am ps ps-am uninstall uninstall-am uninstall-dvi-am \ ++ uninstall-html-am uninstall-info-am uninstall-man \ ++ uninstall-man1 uninstall-pdf-am uninstall-ps-am + + + header.texi: $(top_srcdir)/src/tar.h +diff -Naur tar-1.26.orig/doc/Makefile.in.orig tar-1.26/doc/Makefile.in.orig +--- tar-1.26.orig/doc/Makefile.in.orig 1970-01-01 00:00:00.000000000 +0000 ++++ tar-1.26/doc/Makefile.in.orig 2011-03-12 09:50:09.000000000 +0000 +@@ -0,0 +1,1518 @@ ++# Makefile.in generated by automake 1.11.1 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@ ++ ++# Makefile for GNU tar documentation. ++ ++# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2006, ++# 2007 Free Software Foundation, Inc. ++VPATH = @srcdir@ ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@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 = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = doc ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ++ $(srcdir)/stamp-vti $(srcdir)/version.texi $(tar_TEXINFOS) ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ ++ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ ++ $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ ++ $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ ++ $(top_srcdir)/m4/canonicalize.m4 \ ++ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ ++ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ ++ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ ++ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ ++ $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ ++ $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ ++ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ ++ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ ++ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ ++ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ ++ $(top_srcdir)/m4/exclude.m4 $(top_srcdir)/m4/extensions.m4 \ ++ $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ ++ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ ++ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ ++ $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/filenamecat.m4 \ ++ $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ ++ $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ ++ $(top_srcdir)/m4/futimens.m4 \ ++ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ ++ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ ++ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ ++ $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ ++ $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ ++ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ ++ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ ++ $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/hash.m4 \ ++ $(top_srcdir)/m4/human.m4 $(top_srcdir)/m4/iconv.m4 \ ++ $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inline.m4 \ ++ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ ++ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ ++ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ ++ $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ ++ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ ++ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ ++ $(top_srcdir)/m4/libunistring-base.m4 \ ++ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ ++ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ ++ $(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \ ++ $(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/longlong.m4 \ ++ $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ ++ $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ ++ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ ++ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ ++ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ ++ $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ ++ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ ++ $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ ++ $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ ++ $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ ++ $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ ++ $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ ++ $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ ++ $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ ++ $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ ++ $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ ++ $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ ++ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ ++ $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ ++ $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ ++ $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ ++ $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ ++ $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ ++ $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ ++ $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ ++ $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ ++ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ ++ $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ ++ $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ ++ $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ ++ $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ ++ $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ ++ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ ++ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ ++ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ ++ $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ ++ $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ ++ $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ ++ $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ ++ $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ ++ $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ ++ $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ ++ $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ ++ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ ++ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ ++ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ ++ $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ ++ $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ ++ $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ ++ $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ ++ $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ ++ $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ ++ $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ ++ $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ ++ $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ ++ $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ ++ $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ ++ $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ ++ $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ ++ $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++AM_V_GEN = $(am__v_GEN_$(V)) ++am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) ++am__v_GEN_0 = @echo " GEN " $@; ++AM_V_at = $(am__v_at_$(V)) ++am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) ++am__v_at_0 = @ ++SOURCES = ++DIST_SOURCES = ++INFO_DEPS = $(srcdir)/tar.info ++TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex ++am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux ++DVIS = tar.dvi ++PDFS = tar.pdf ++PSS = tar.ps ++HTMLS = tar.html ++TEXINFOS = tar.texi ++TEXI2PDF = $(TEXI2DVI) --pdf --batch ++MAKEINFOHTML = $(MAKEINFO) --html ++AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) ++DVIPS = dvips ++am__installdirs = "$(DESTDIR)$(infodir)" ++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 = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++pkglibexecdir = @pkglibexecdir@ ++ACLOCAL = @ACLOCAL@ ++ALLOCA = @ALLOCA@ ++ALLOCA_H = @ALLOCA_H@ ++AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOM4TE = @AUTOM4TE@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++BACKUP_LIBEXEC_SCRIPTS = @BACKUP_LIBEXEC_SCRIPTS@ ++BACKUP_SBIN_SCRIPTS = @BACKUP_SBIN_SCRIPTS@ ++BACKUP_SED_COND = @BACKUP_SED_COND@ ++BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@ ++BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@ ++BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@ ++BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@ ++BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFAULT_ARCHIVE = @DEFAULT_ARCHIVE@ ++DEFAULT_ARCHIVE_FORMAT = @DEFAULT_ARCHIVE_FORMAT@ ++DEFAULT_BLOCKING = @DEFAULT_BLOCKING@ ++DEFAULT_QUOTING_STYLE = @DEFAULT_QUOTING_STYLE@ ++DEFAULT_RMT_COMMAND = @DEFAULT_RMT_COMMAND@ ++DEFAULT_RMT_DIR = @DEFAULT_RMT_DIR@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ ++EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ ++ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ ++ENOLINK_VALUE = @ENOLINK_VALUE@ ++EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ ++EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ ++ERRNO_H = @ERRNO_H@ ++EXEEXT = @EXEEXT@ ++FLOAT_H = @FLOAT_H@ ++FNMATCH_H = @FNMATCH_H@ ++GETOPT_H = @GETOPT_H@ ++GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ ++GLIBC21 = @GLIBC21@ ++GMSGFMT = @GMSGFMT@ ++GMSGFMT_015 = @GMSGFMT_015@ ++GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ ++GNULIB_ATOLL = @GNULIB_ATOLL@ ++GNULIB_BTOWC = @GNULIB_BTOWC@ ++GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ ++GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@ ++GNULIB_CHOWN = @GNULIB_CHOWN@ ++GNULIB_CLOSE = @GNULIB_CLOSE@ ++GNULIB_DIRFD = @GNULIB_DIRFD@ ++GNULIB_DPRINTF = @GNULIB_DPRINTF@ ++GNULIB_DUP2 = @GNULIB_DUP2@ ++GNULIB_DUP3 = @GNULIB_DUP3@ ++GNULIB_ENVIRON = @GNULIB_ENVIRON@ ++GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ ++GNULIB_FACCESSAT = @GNULIB_FACCESSAT@ ++GNULIB_FCHDIR = @GNULIB_FCHDIR@ ++GNULIB_FCHMODAT = @GNULIB_FCHMODAT@ ++GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@ ++GNULIB_FCLOSE = @GNULIB_FCLOSE@ ++GNULIB_FCNTL = @GNULIB_FCNTL@ ++GNULIB_FDOPENDIR = @GNULIB_FDOPENDIR@ ++GNULIB_FFLUSH = @GNULIB_FFLUSH@ ++GNULIB_FOPEN = @GNULIB_FOPEN@ ++GNULIB_FPRINTF = @GNULIB_FPRINTF@ ++GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ ++GNULIB_FPURGE = @GNULIB_FPURGE@ ++GNULIB_FPUTC = @GNULIB_FPUTC@ ++GNULIB_FPUTS = @GNULIB_FPUTS@ ++GNULIB_FREOPEN = @GNULIB_FREOPEN@ ++GNULIB_FSEEK = @GNULIB_FSEEK@ ++GNULIB_FSEEKO = @GNULIB_FSEEKO@ ++GNULIB_FSTATAT = @GNULIB_FSTATAT@ ++GNULIB_FSYNC = @GNULIB_FSYNC@ ++GNULIB_FTELL = @GNULIB_FTELL@ ++GNULIB_FTELLO = @GNULIB_FTELLO@ ++GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ ++GNULIB_FUTIMENS = @GNULIB_FUTIMENS@ ++GNULIB_FWRITE = @GNULIB_FWRITE@ ++GNULIB_GETCWD = @GNULIB_GETCWD@ ++GNULIB_GETDELIM = @GNULIB_GETDELIM@ ++GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ ++GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ ++GNULIB_GETGROUPS = @GNULIB_GETGROUPS@ ++GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ ++GNULIB_GETLINE = @GNULIB_GETLINE@ ++GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ ++GNULIB_GETLOGIN = @GNULIB_GETLOGIN@ ++GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ ++GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ ++GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ ++GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@ ++GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ ++GNULIB_GRANTPT = @GNULIB_GRANTPT@ ++GNULIB_IMAXABS = @GNULIB_IMAXABS@ ++GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ ++GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ ++GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ ++GNULIB_LCHMOD = @GNULIB_LCHMOD@ ++GNULIB_LCHOWN = @GNULIB_LCHOWN@ ++GNULIB_LINK = @GNULIB_LINK@ ++GNULIB_LINKAT = @GNULIB_LINKAT@ ++GNULIB_LSEEK = @GNULIB_LSEEK@ ++GNULIB_LSTAT = @GNULIB_LSTAT@ ++GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ ++GNULIB_MBRLEN = @GNULIB_MBRLEN@ ++GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ ++GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ ++GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ ++GNULIB_MBSCHR = @GNULIB_MBSCHR@ ++GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ ++GNULIB_MBSINIT = @GNULIB_MBSINIT@ ++GNULIB_MBSLEN = @GNULIB_MBSLEN@ ++GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ ++GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ ++GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ ++GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ ++GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ ++GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ ++GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ ++GNULIB_MBSSEP = @GNULIB_MBSSEP@ ++GNULIB_MBSSPN = @GNULIB_MBSSPN@ ++GNULIB_MBSSTR = @GNULIB_MBSSTR@ ++GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ ++GNULIB_MBTOWC = @GNULIB_MBTOWC@ ++GNULIB_MEMCHR = @GNULIB_MEMCHR@ ++GNULIB_MEMMEM = @GNULIB_MEMMEM@ ++GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ ++GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ ++GNULIB_MKDIRAT = @GNULIB_MKDIRAT@ ++GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ ++GNULIB_MKFIFO = @GNULIB_MKFIFO@ ++GNULIB_MKFIFOAT = @GNULIB_MKFIFOAT@ ++GNULIB_MKNOD = @GNULIB_MKNOD@ ++GNULIB_MKNODAT = @GNULIB_MKNODAT@ ++GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@ ++GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@ ++GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ ++GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@ ++GNULIB_MKTIME = @GNULIB_MKTIME@ ++GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@ ++GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@ ++GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ ++GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ ++GNULIB_OPEN = @GNULIB_OPEN@ ++GNULIB_OPENAT = @GNULIB_OPENAT@ ++GNULIB_PERROR = @GNULIB_PERROR@ ++GNULIB_PIPE = @GNULIB_PIPE@ ++GNULIB_PIPE2 = @GNULIB_PIPE2@ ++GNULIB_POPEN = @GNULIB_POPEN@ ++GNULIB_PREAD = @GNULIB_PREAD@ ++GNULIB_PRINTF = @GNULIB_PRINTF@ ++GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ ++GNULIB_PTSNAME = @GNULIB_PTSNAME@ ++GNULIB_PUTC = @GNULIB_PUTC@ ++GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ ++GNULIB_PUTENV = @GNULIB_PUTENV@ ++GNULIB_PUTS = @GNULIB_PUTS@ ++GNULIB_PWRITE = @GNULIB_PWRITE@ ++GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ ++GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ ++GNULIB_READLINK = @GNULIB_READLINK@ ++GNULIB_READLINKAT = @GNULIB_READLINKAT@ ++GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ ++GNULIB_REALPATH = @GNULIB_REALPATH@ ++GNULIB_REMOVE = @GNULIB_REMOVE@ ++GNULIB_RENAME = @GNULIB_RENAME@ ++GNULIB_RENAMEAT = @GNULIB_RENAMEAT@ ++GNULIB_RMDIR = @GNULIB_RMDIR@ ++GNULIB_RPMATCH = @GNULIB_RPMATCH@ ++GNULIB_SCANDIR = @GNULIB_SCANDIR@ ++GNULIB_SETENV = @GNULIB_SETENV@ ++GNULIB_SLEEP = @GNULIB_SLEEP@ ++GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ ++GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ ++GNULIB_STAT = @GNULIB_STAT@ ++GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ ++GNULIB_STPCPY = @GNULIB_STPCPY@ ++GNULIB_STPNCPY = @GNULIB_STPNCPY@ ++GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ ++GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ ++GNULIB_STRDUP = @GNULIB_STRDUP@ ++GNULIB_STRERROR = @GNULIB_STRERROR@ ++GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ ++GNULIB_STRNCAT = @GNULIB_STRNCAT@ ++GNULIB_STRNDUP = @GNULIB_STRNDUP@ ++GNULIB_STRNLEN = @GNULIB_STRNLEN@ ++GNULIB_STRPBRK = @GNULIB_STRPBRK@ ++GNULIB_STRPTIME = @GNULIB_STRPTIME@ ++GNULIB_STRSEP = @GNULIB_STRSEP@ ++GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@ ++GNULIB_STRSTR = @GNULIB_STRSTR@ ++GNULIB_STRTOD = @GNULIB_STRTOD@ ++GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ ++GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ ++GNULIB_STRTOLL = @GNULIB_STRTOLL@ ++GNULIB_STRTOULL = @GNULIB_STRTOULL@ ++GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ ++GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ ++GNULIB_SYMLINK = @GNULIB_SYMLINK@ ++GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@ ++GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ ++GNULIB_TIMEGM = @GNULIB_TIMEGM@ ++GNULIB_TIME_R = @GNULIB_TIME_R@ ++GNULIB_TMPFILE = @GNULIB_TMPFILE@ ++GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ ++GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ ++GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ ++GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ ++GNULIB_UNLINK = @GNULIB_UNLINK@ ++GNULIB_UNLINKAT = @GNULIB_UNLINKAT@ ++GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@ ++GNULIB_UNSETENV = @GNULIB_UNSETENV@ ++GNULIB_USLEEP = @GNULIB_USLEEP@ ++GNULIB_UTIMENSAT = @GNULIB_UTIMENSAT@ ++GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ ++GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ ++GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ ++GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ ++GNULIB_VPRINTF = @GNULIB_VPRINTF@ ++GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ ++GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ ++GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ ++GNULIB_WCPCPY = @GNULIB_WCPCPY@ ++GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ ++GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ ++GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ ++GNULIB_WCSCAT = @GNULIB_WCSCAT@ ++GNULIB_WCSCHR = @GNULIB_WCSCHR@ ++GNULIB_WCSCMP = @GNULIB_WCSCMP@ ++GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ ++GNULIB_WCSCPY = @GNULIB_WCSCPY@ ++GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ ++GNULIB_WCSDUP = @GNULIB_WCSDUP@ ++GNULIB_WCSLEN = @GNULIB_WCSLEN@ ++GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ ++GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ ++GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ ++GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ ++GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ ++GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ ++GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ ++GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ ++GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ ++GNULIB_WCSSPN = @GNULIB_WCSSPN@ ++GNULIB_WCSSTR = @GNULIB_WCSSTR@ ++GNULIB_WCSTOK = @GNULIB_WCSTOK@ ++GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ ++GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ ++GNULIB_WCTOB = @GNULIB_WCTOB@ ++GNULIB_WCTOMB = @GNULIB_WCTOMB@ ++GNULIB_WCTRANS = @GNULIB_WCTRANS@ ++GNULIB_WCTYPE = @GNULIB_WCTYPE@ ++GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ ++GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ ++GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ ++GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ ++GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ ++GNULIB_WMEMSET = @GNULIB_WMEMSET@ ++GNULIB_WRITE = @GNULIB_WRITE@ ++GNULIB__EXIT = @GNULIB__EXIT@ ++GREP = @GREP@ ++HAVE_ALPHASORT = @HAVE_ALPHASORT@ ++HAVE_ATOLL = @HAVE_ATOLL@ ++HAVE_BTOWC = @HAVE_BTOWC@ ++HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ ++HAVE_CHOWN = @HAVE_CHOWN@ ++HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ ++HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ ++HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ ++HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ ++HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ ++HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ ++HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ ++HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ ++HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ ++HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ ++HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ ++HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ ++HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ ++HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ ++HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ ++HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ ++HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ ++HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ ++HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ ++HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ ++HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ ++HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ ++HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ ++HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ ++HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ ++HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ ++HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ ++HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ ++HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ ++HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ ++HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ ++HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ ++HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ ++HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ ++HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ ++HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ ++HAVE_DPRINTF = @HAVE_DPRINTF@ ++HAVE_DUP2 = @HAVE_DUP2@ ++HAVE_DUP3 = @HAVE_DUP3@ ++HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ ++HAVE_FACCESSAT = @HAVE_FACCESSAT@ ++HAVE_FCHDIR = @HAVE_FCHDIR@ ++HAVE_FCHMODAT = @HAVE_FCHMODAT@ ++HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ ++HAVE_FCNTL = @HAVE_FCNTL@ ++HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ ++HAVE_FEATURES_H = @HAVE_FEATURES_H@ ++HAVE_FSEEKO = @HAVE_FSEEKO@ ++HAVE_FSTATAT = @HAVE_FSTATAT@ ++HAVE_FSYNC = @HAVE_FSYNC@ ++HAVE_FTELLO = @HAVE_FTELLO@ ++HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ ++HAVE_FUTIMENS = @HAVE_FUTIMENS@ ++HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ ++HAVE_GETGROUPS = @HAVE_GETGROUPS@ ++HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ ++HAVE_GETLOGIN = @HAVE_GETLOGIN@ ++HAVE_GETOPT_H = @HAVE_GETOPT_H@ ++HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ ++HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ ++HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@ ++HAVE_GRANTPT = @HAVE_GRANTPT@ ++HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ ++HAVE_ISWBLANK = @HAVE_ISWBLANK@ ++HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ ++HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@ ++HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@ ++HAVE_LANGINFO_H = @HAVE_LANGINFO_H@ ++HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@ ++HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@ ++HAVE_LCHMOD = @HAVE_LCHMOD@ ++HAVE_LCHOWN = @HAVE_LCHOWN@ ++HAVE_LINK = @HAVE_LINK@ ++HAVE_LINKAT = @HAVE_LINKAT@ ++HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ ++HAVE_LSTAT = @HAVE_LSTAT@ ++HAVE_MBRLEN = @HAVE_MBRLEN@ ++HAVE_MBRTOWC = @HAVE_MBRTOWC@ ++HAVE_MBSINIT = @HAVE_MBSINIT@ ++HAVE_MBSLEN = @HAVE_MBSLEN@ ++HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ ++HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ ++HAVE_MEMCHR = @HAVE_MEMCHR@ ++HAVE_MEMPCPY = @HAVE_MEMPCPY@ ++HAVE_MKDIRAT = @HAVE_MKDIRAT@ ++HAVE_MKDTEMP = @HAVE_MKDTEMP@ ++HAVE_MKFIFO = @HAVE_MKFIFO@ ++HAVE_MKFIFOAT = @HAVE_MKFIFOAT@ ++HAVE_MKNOD = @HAVE_MKNOD@ ++HAVE_MKNODAT = @HAVE_MKNODAT@ ++HAVE_MKOSTEMP = @HAVE_MKOSTEMP@ ++HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@ ++HAVE_MKSTEMP = @HAVE_MKSTEMP@ ++HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ ++HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ ++HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ ++HAVE_OPENAT = @HAVE_OPENAT@ ++HAVE_OS_H = @HAVE_OS_H@ ++HAVE_PIPE = @HAVE_PIPE@ ++HAVE_PIPE2 = @HAVE_PIPE2@ ++HAVE_PREAD = @HAVE_PREAD@ ++HAVE_PTSNAME = @HAVE_PTSNAME@ ++HAVE_PWRITE = @HAVE_PWRITE@ ++HAVE_RANDOM_H = @HAVE_RANDOM_H@ ++HAVE_RANDOM_R = @HAVE_RANDOM_R@ ++HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ ++HAVE_READLINK = @HAVE_READLINK@ ++HAVE_READLINKAT = @HAVE_READLINKAT@ ++HAVE_REALPATH = @HAVE_REALPATH@ ++HAVE_RENAMEAT = @HAVE_RENAMEAT@ ++HAVE_RPMATCH = @HAVE_RPMATCH@ ++HAVE_SCANDIR = @HAVE_SCANDIR@ ++HAVE_SETENV = @HAVE_SETENV@ ++HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ ++HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ ++HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@ ++HAVE_SLEEP = @HAVE_SLEEP@ ++HAVE_STDINT_H = @HAVE_STDINT_H@ ++HAVE_STPCPY = @HAVE_STPCPY@ ++HAVE_STPNCPY = @HAVE_STPNCPY@ ++HAVE_STRCASECMP = @HAVE_STRCASECMP@ ++HAVE_STRCASESTR = @HAVE_STRCASESTR@ ++HAVE_STRCHRNUL = @HAVE_STRCHRNUL@ ++HAVE_STRPBRK = @HAVE_STRPBRK@ ++HAVE_STRPTIME = @HAVE_STRPTIME@ ++HAVE_STRSEP = @HAVE_STRSEP@ ++HAVE_STRTOD = @HAVE_STRTOD@ ++HAVE_STRTOLL = @HAVE_STRTOLL@ ++HAVE_STRTOULL = @HAVE_STRTOULL@ ++HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ ++HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ ++HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ ++HAVE_SYMLINK = @HAVE_SYMLINK@ ++HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ ++HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ ++HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ ++HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ ++HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ ++HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ ++HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ ++HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ ++HAVE_TIMEGM = @HAVE_TIMEGM@ ++HAVE_UNISTD_H = @HAVE_UNISTD_H@ ++HAVE_UNLINKAT = @HAVE_UNLINKAT@ ++HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ ++HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ ++HAVE_USLEEP = @HAVE_USLEEP@ ++HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ ++HAVE_VASPRINTF = @HAVE_VASPRINTF@ ++HAVE_VDPRINTF = @HAVE_VDPRINTF@ ++HAVE_WCHAR_H = @HAVE_WCHAR_H@ ++HAVE_WCHAR_T = @HAVE_WCHAR_T@ ++HAVE_WCPCPY = @HAVE_WCPCPY@ ++HAVE_WCPNCPY = @HAVE_WCPNCPY@ ++HAVE_WCRTOMB = @HAVE_WCRTOMB@ ++HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ ++HAVE_WCSCAT = @HAVE_WCSCAT@ ++HAVE_WCSCHR = @HAVE_WCSCHR@ ++HAVE_WCSCMP = @HAVE_WCSCMP@ ++HAVE_WCSCOLL = @HAVE_WCSCOLL@ ++HAVE_WCSCPY = @HAVE_WCSCPY@ ++HAVE_WCSCSPN = @HAVE_WCSCSPN@ ++HAVE_WCSDUP = @HAVE_WCSDUP@ ++HAVE_WCSLEN = @HAVE_WCSLEN@ ++HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ ++HAVE_WCSNCAT = @HAVE_WCSNCAT@ ++HAVE_WCSNCMP = @HAVE_WCSNCMP@ ++HAVE_WCSNCPY = @HAVE_WCSNCPY@ ++HAVE_WCSNLEN = @HAVE_WCSNLEN@ ++HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ ++HAVE_WCSPBRK = @HAVE_WCSPBRK@ ++HAVE_WCSRCHR = @HAVE_WCSRCHR@ ++HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ ++HAVE_WCSSPN = @HAVE_WCSSPN@ ++HAVE_WCSSTR = @HAVE_WCSSTR@ ++HAVE_WCSTOK = @HAVE_WCSTOK@ ++HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ ++HAVE_WCSXFRM = @HAVE_WCSXFRM@ ++HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ ++HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ ++HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ ++HAVE_WINT_T = @HAVE_WINT_T@ ++HAVE_WMEMCHR = @HAVE_WMEMCHR@ ++HAVE_WMEMCMP = @HAVE_WMEMCMP@ ++HAVE_WMEMCPY = @HAVE_WMEMCPY@ ++HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ ++HAVE_WMEMSET = @HAVE_WMEMSET@ ++HAVE__BOOL = @HAVE__BOOL@ ++HAVE__EXIT = @HAVE__EXIT@ ++INCLUDE_NEXT = @INCLUDE_NEXT@ ++INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ ++INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ ++INTLLIBS = @INTLLIBS@ ++INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ++LDFLAGS = @LDFLAGS@ ++LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@ ++LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@ ++LIBICONV = @LIBICONV@ ++LIBINTL = @LIBINTL@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ ++LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ ++LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ ++LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ ++LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ ++LOCALE_FR = @LOCALE_FR@ ++LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ ++LOCALE_JA = @LOCALE_JA@ ++LOCALE_ZH_CN = @LOCALE_ZH_CN@ ++LTLIBICONV = @LTLIBICONV@ ++LTLIBINTL = @LTLIBINTL@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAKEINFO = @MAKEINFO@ ++MKDIR_P = @MKDIR_P@ ++MSGFMT = @MSGFMT@ ++MSGFMT_015 = @MSGFMT_015@ ++MSGMERGE = @MSGMERGE@ ++NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ ++NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ ++NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ ++NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ ++NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ ++NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDARG_H = @NEXT_AS_FIRST_DIRECTIVE_STDARG_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@ ++NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@ ++NEXT_AS_FIRST_DIRECTIVE_STRINGS_H = @NEXT_AS_FIRST_DIRECTIVE_STRINGS_H@ ++NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@ ++NEXT_AS_FIRST_DIRECTIVE_SYSEXITS_H = @NEXT_AS_FIRST_DIRECTIVE_SYSEXITS_H@ ++NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ ++NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ ++NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ ++NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ ++NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@ ++NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@ ++NEXT_DIRENT_H = @NEXT_DIRENT_H@ ++NEXT_ERRNO_H = @NEXT_ERRNO_H@ ++NEXT_FCNTL_H = @NEXT_FCNTL_H@ ++NEXT_FLOAT_H = @NEXT_FLOAT_H@ ++NEXT_GETOPT_H = @NEXT_GETOPT_H@ ++NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ ++NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ ++NEXT_STDARG_H = @NEXT_STDARG_H@ ++NEXT_STDDEF_H = @NEXT_STDDEF_H@ ++NEXT_STDINT_H = @NEXT_STDINT_H@ ++NEXT_STDIO_H = @NEXT_STDIO_H@ ++NEXT_STDLIB_H = @NEXT_STDLIB_H@ ++NEXT_STRINGS_H = @NEXT_STRINGS_H@ ++NEXT_STRING_H = @NEXT_STRING_H@ ++NEXT_SYSEXITS_H = @NEXT_SYSEXITS_H@ ++NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ ++NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ ++NEXT_TIME_H = @NEXT_TIME_H@ ++NEXT_UNISTD_H = @NEXT_UNISTD_H@ ++NEXT_WCHAR_H = @NEXT_WCHAR_H@ ++NEXT_WCTYPE_H = @NEXT_WCTYPE_H@ ++OBJEXT = @OBJEXT@ ++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@ ++POSUB = @POSUB@ ++PRAGMA_COLUMNS = @PRAGMA_COLUMNS@ ++PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ ++PRIPTR_PREFIX = @PRIPTR_PREFIX@ ++PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ ++PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ ++PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ ++PU_RMT_PROG = @PU_RMT_PROG@ ++RANLIB = @RANLIB@ ++REPLACE_BTOWC = @REPLACE_BTOWC@ ++REPLACE_CALLOC = @REPLACE_CALLOC@ ++REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ ++REPLACE_CHOWN = @REPLACE_CHOWN@ ++REPLACE_CLOSE = @REPLACE_CLOSE@ ++REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ ++REPLACE_DIRFD = @REPLACE_DIRFD@ ++REPLACE_DPRINTF = @REPLACE_DPRINTF@ ++REPLACE_DUP = @REPLACE_DUP@ ++REPLACE_DUP2 = @REPLACE_DUP2@ ++REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@ ++REPLACE_FCLOSE = @REPLACE_FCLOSE@ ++REPLACE_FCNTL = @REPLACE_FCNTL@ ++REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@ ++REPLACE_FFLUSH = @REPLACE_FFLUSH@ ++REPLACE_FOPEN = @REPLACE_FOPEN@ ++REPLACE_FPRINTF = @REPLACE_FPRINTF@ ++REPLACE_FPURGE = @REPLACE_FPURGE@ ++REPLACE_FREOPEN = @REPLACE_FREOPEN@ ++REPLACE_FSEEK = @REPLACE_FSEEK@ ++REPLACE_FSEEKO = @REPLACE_FSEEKO@ ++REPLACE_FSTAT = @REPLACE_FSTAT@ ++REPLACE_FSTATAT = @REPLACE_FSTATAT@ ++REPLACE_FTELL = @REPLACE_FTELL@ ++REPLACE_FTELLO = @REPLACE_FTELLO@ ++REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ ++REPLACE_GETCWD = @REPLACE_GETCWD@ ++REPLACE_GETDELIM = @REPLACE_GETDELIM@ ++REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ ++REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ ++REPLACE_GETLINE = @REPLACE_GETLINE@ ++REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ ++REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ ++REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ ++REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ ++REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ ++REPLACE_LCHOWN = @REPLACE_LCHOWN@ ++REPLACE_LINK = @REPLACE_LINK@ ++REPLACE_LINKAT = @REPLACE_LINKAT@ ++REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ ++REPLACE_LSEEK = @REPLACE_LSEEK@ ++REPLACE_LSTAT = @REPLACE_LSTAT@ ++REPLACE_MALLOC = @REPLACE_MALLOC@ ++REPLACE_MBRLEN = @REPLACE_MBRLEN@ ++REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ ++REPLACE_MBSINIT = @REPLACE_MBSINIT@ ++REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ ++REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ ++REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ ++REPLACE_MBTOWC = @REPLACE_MBTOWC@ ++REPLACE_MEMCHR = @REPLACE_MEMCHR@ ++REPLACE_MEMMEM = @REPLACE_MEMMEM@ ++REPLACE_MKDIR = @REPLACE_MKDIR@ ++REPLACE_MKFIFO = @REPLACE_MKFIFO@ ++REPLACE_MKNOD = @REPLACE_MKNOD@ ++REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ ++REPLACE_MKTIME = @REPLACE_MKTIME@ ++REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ ++REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@ ++REPLACE_NULL = @REPLACE_NULL@ ++REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ ++REPLACE_OPEN = @REPLACE_OPEN@ ++REPLACE_OPENAT = @REPLACE_OPENAT@ ++REPLACE_OPENDIR = @REPLACE_OPENDIR@ ++REPLACE_PERROR = @REPLACE_PERROR@ ++REPLACE_POPEN = @REPLACE_POPEN@ ++REPLACE_PREAD = @REPLACE_PREAD@ ++REPLACE_PRINTF = @REPLACE_PRINTF@ ++REPLACE_PUTENV = @REPLACE_PUTENV@ ++REPLACE_PWRITE = @REPLACE_PWRITE@ ++REPLACE_READLINK = @REPLACE_READLINK@ ++REPLACE_REALLOC = @REPLACE_REALLOC@ ++REPLACE_REALPATH = @REPLACE_REALPATH@ ++REPLACE_REMOVE = @REPLACE_REMOVE@ ++REPLACE_RENAME = @REPLACE_RENAME@ ++REPLACE_RENAMEAT = @REPLACE_RENAMEAT@ ++REPLACE_RMDIR = @REPLACE_RMDIR@ ++REPLACE_SETENV = @REPLACE_SETENV@ ++REPLACE_SLEEP = @REPLACE_SLEEP@ ++REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ ++REPLACE_SPRINTF = @REPLACE_SPRINTF@ ++REPLACE_STAT = @REPLACE_STAT@ ++REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ ++REPLACE_STPNCPY = @REPLACE_STPNCPY@ ++REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ ++REPLACE_STRDUP = @REPLACE_STRDUP@ ++REPLACE_STRERROR = @REPLACE_STRERROR@ ++REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ ++REPLACE_STRNCAT = @REPLACE_STRNCAT@ ++REPLACE_STRNDUP = @REPLACE_STRNDUP@ ++REPLACE_STRNLEN = @REPLACE_STRNLEN@ ++REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ ++REPLACE_STRSTR = @REPLACE_STRSTR@ ++REPLACE_STRTOD = @REPLACE_STRTOD@ ++REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ ++REPLACE_SYMLINK = @REPLACE_SYMLINK@ ++REPLACE_TIMEGM = @REPLACE_TIMEGM@ ++REPLACE_TMPFILE = @REPLACE_TMPFILE@ ++REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ ++REPLACE_UNLINK = @REPLACE_UNLINK@ ++REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ ++REPLACE_UNSETENV = @REPLACE_UNSETENV@ ++REPLACE_USLEEP = @REPLACE_USLEEP@ ++REPLACE_UTIMENSAT = @REPLACE_UTIMENSAT@ ++REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ ++REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ ++REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ ++REPLACE_VPRINTF = @REPLACE_VPRINTF@ ++REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ ++REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ ++REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ ++REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ ++REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ ++REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ ++REPLACE_WCTOB = @REPLACE_WCTOB@ ++REPLACE_WCTOMB = @REPLACE_WCTOMB@ ++REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ ++REPLACE_WRITE = @REPLACE_WRITE@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ ++SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ ++STDARG_H = @STDARG_H@ ++STDBOOL_H = @STDBOOL_H@ ++STDDEF_H = @STDDEF_H@ ++STDINT_H = @STDINT_H@ ++STRIP = @STRIP@ ++SYSEXITS_H = @SYSEXITS_H@ ++SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ ++TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ ++UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ ++UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ ++UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ ++UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ ++UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ ++USE_NLS = @USE_NLS@ ++VERSION = @VERSION@ ++WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ ++WINT_T_SUFFIX = @WINT_T_SUFFIX@ ++XGETTEXT = @XGETTEXT@ ++XGETTEXT_015 = @XGETTEXT_015@ ++XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ++YACC = @YACC@ ++YFLAGS = @YFLAGS@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_CC = @ac_ct_CC@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++gl_LIBOBJS = @gl_LIBOBJS@ ++gl_LTLIBOBJS = @gl_LTLIBOBJS@ ++gltests_LIBOBJS = @gltests_LIBOBJS@ ++gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ ++gltests_WITNESS = @gltests_WITNESS@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++lispdir = @lispdir@ ++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_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++info_TEXINFOS = tar.texi ++tar_TEXINFOS = \ ++ dumpdir.texi\ ++ tar-snapshot-edit.texi\ ++ fdl.texi\ ++ freemanuals.texi\ ++ genfile.texi\ ++ header.texi\ ++ intern.texi\ ++ parse-datetime.texi\ ++ rendition.texi\ ++ snapshot.texi\ ++ sparse.texi\ ++ value.texi ++ ++EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el ++ ++# The rendering level is anyone of PUBLISH, DISTRIB or PROOF. ++# Just call `make RENDITION=PROOF [target]' if you want PROOF rendition. ++RENDITION = DISTRIB ++MAKEINFOFLAGS = -D$(RENDITION) ++GENDOCS = gendocs.sh ++TEXI2DVI = texi2dvi -t '@set $(RENDITION)' -E ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .dvi .html .info .pdf .ps .texi ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --gnits doc/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++ ++.texi.info: ++ restore=: && backupdir="$(am__leading_dot)am$$$$" && \ ++ am__cwd=`pwd` && $(am__cd) $(srcdir) && \ ++ rm -rf $$backupdir && mkdir $$backupdir && \ ++ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ ++ for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ ++ if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ ++ done; \ ++ else :; fi && \ ++ cd "$$am__cwd"; \ ++ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ ++ -o $@ $<; \ ++ then \ ++ rc=0; \ ++ $(am__cd) $(srcdir); \ ++ else \ ++ rc=$$?; \ ++ $(am__cd) $(srcdir) && \ ++ $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ ++ fi; \ ++ rm -rf $$backupdir; exit $$rc ++ ++.texi.dvi: ++ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ ++ $(TEXI2DVI) $< ++ ++.texi.pdf: ++ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ ++ $(TEXI2PDF) $< ++ ++.texi.html: ++ rm -rf $(@:.html=.htp) ++ if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ ++ -o $(@:.html=.htp) $<; \ ++ then \ ++ rm -rf $@; \ ++ if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ ++ mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ ++ else \ ++ if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ ++ rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ ++ exit 1; \ ++ fi ++$(srcdir)/tar.info: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) ++tar.dvi: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) ++tar.pdf: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) ++tar.html: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) ++$(srcdir)/version.texi: $(srcdir)/stamp-vti ++$(srcdir)/stamp-vti: tar.texi $(top_srcdir)/configure ++ @(dir=.; test -f ./tar.texi || dir=$(srcdir); \ ++ set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/tar.texi`; \ ++ echo "@set UPDATED $$1 $$2 $$3"; \ ++ echo "@set UPDATED-MONTH $$2 $$3"; \ ++ echo "@set EDITION $(VERSION)"; \ ++ echo "@set VERSION $(VERSION)") > vti.tmp ++ @cmp -s vti.tmp $(srcdir)/version.texi \ ++ || (echo "Updating $(srcdir)/version.texi"; \ ++ cp vti.tmp $(srcdir)/version.texi) ++ -@rm -f vti.tmp ++ @cp $(srcdir)/version.texi $@ ++ ++mostlyclean-vti: ++ -rm -f vti.tmp ++ ++maintainer-clean-vti: ++ -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi ++.dvi.ps: ++ TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ ++ $(DVIPS) -o $@ $< ++ ++uninstall-dvi-am: ++ @$(NORMAL_UNINSTALL) ++ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(dvidir)/$$f"; \ ++ done ++ ++uninstall-html-am: ++ @$(NORMAL_UNINSTALL) ++ @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ ++ rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ ++ done ++ ++uninstall-info-am: ++ @$(PRE_UNINSTALL) ++ @if test -d '$(DESTDIR)$(infodir)' && \ ++ (install-info --version && \ ++ install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ ++ list='$(INFO_DEPS)'; \ ++ for file in $$list; do \ ++ relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++ echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ ++ if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ ++ then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ ++ done; \ ++ else :; fi ++ @$(NORMAL_UNINSTALL) ++ @list='$(INFO_DEPS)'; \ ++ for file in $$list; do \ ++ relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++ relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ ++ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ ++ echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ ++ rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ ++ else :; fi); \ ++ done ++ ++uninstall-pdf-am: ++ @$(NORMAL_UNINSTALL) ++ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ ++ done ++ ++uninstall-ps-am: ++ @$(NORMAL_UNINSTALL) ++ @list='$(PSS)'; test -n "$(psdir)" || list=; \ ++ for p in $$list; do \ ++ $(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(psdir)/$$f"; \ ++ done ++ ++dist-info: $(INFO_DEPS) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ list='$(INFO_DEPS)'; \ ++ for base in $$list; do \ ++ case $$base in \ ++ $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ ++ esac; \ ++ if test -f $$base; then d=.; else d=$(srcdir); fi; \ ++ base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ ++ for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ ++ if test -f $$file; then \ ++ relfile=`expr "$$file" : "$$d/\(.*\)"`; \ ++ test -f "$(distdir)/$$relfile" || \ ++ cp -p $$file "$(distdir)/$$relfile"; \ ++ else :; fi; \ ++ done; \ ++ done ++ ++mostlyclean-aminfo: ++ -rm -rf tar.aux tar.cp tar.cps tar.fn tar.kw tar.ky tar.log tar.op tar.ops \ ++ tar.pg tar.tmp tar.toc tar.tp tar.tps tar.vr ++ ++clean-aminfo: ++ -test -z "tar.dvi tar.pdf tar.ps tar.html" \ ++ || rm -rf tar.dvi tar.pdf tar.ps tar.html ++ ++maintainer-clean-aminfo: ++ @list='$(INFO_DEPS)'; for i in $$list; do \ ++ i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ ++ echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ ++ rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ ++ done ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++ ++distdir: $(DISTFILES) ++ @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 "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" distdir="$(distdir)" \ ++ dist-info ++check-am: all-am ++check: check-am ++all-am: Makefile $(INFO_DEPS) ++installdirs: ++ for dir in "$(DESTDIR)$(infodir)"; 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) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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-aminfo clean-generic clean-local mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: $(DVIS) ++ ++html: html-am ++ ++html-am: $(HTMLS) ++ ++info: info-am ++ ++info-am: $(INFO_DEPS) ++ ++install-data-am: install-info-am ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: $(DVIS) ++ @$(NORMAL_INSTALL) ++ test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" ++ @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ ++ done ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-html-am: $(HTMLS) ++ @$(NORMAL_INSTALL) ++ test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" ++ @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ $(am__strip_dir) \ ++ if test -d "$$d$$p"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ ++ echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ ++ $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ ++ else \ ++ list2="$$list2 $$d$$p"; \ ++ fi; \ ++ done; \ ++ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ ++ done; } ++install-info: install-info-am ++ ++install-info-am: $(INFO_DEPS) ++ @$(NORMAL_INSTALL) ++ test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ ++ for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ esac; \ ++ if test -f $$file; then d=.; else d=$(srcdir); fi; \ ++ file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ ++ for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ ++ $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ ++ if test -f $$ifile; then \ ++ echo "$$ifile"; \ ++ else : ; fi; \ ++ done; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done ++ @$(POST_INSTALL) ++ @if (install-info --version && \ ++ install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ ++ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ ++ for file in $$list; do \ ++ relfile=`echo "$$file" | sed 's|^.*/||'`; \ ++ echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ ++ install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ ++ done; \ ++ else : ; fi ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: $(PDFS) ++ @$(NORMAL_INSTALL) ++ test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" ++ @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done ++install-ps: install-ps-am ++ ++install-ps-am: $(PSS) ++ @$(NORMAL_INSTALL) ++ test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" ++ @list='$(PSS)'; test -n "$(psdir)" || list=; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-aminfo \ ++ maintainer-clean-generic maintainer-clean-vti ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti ++ ++pdf: pdf-am ++ ++pdf-am: $(PDFS) ++ ++ps: ps-am ++ ++ps-am: $(PSS) ++ ++uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ ++ uninstall-pdf-am uninstall-ps-am ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-aminfo clean-generic \ ++ clean-local dist-info distclean distclean-generic distdir dvi \ ++ dvi-am html html-am info info-am install 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-ps install-ps-am install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-aminfo maintainer-clean-generic \ ++ maintainer-clean-vti mostlyclean mostlyclean-aminfo \ ++ mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ ++ uninstall-info-am uninstall-pdf-am uninstall-ps-am ++ ++ ++header.texi: $(top_srcdir)/src/tar.h ++ sed -f $(srcdir)/texify.sed $(top_srcdir)/src/tar.h \ ++ | expand >$@ ++ ++master-menu: $(tar_TEXINFOS) ++ emacs -batch -l mastermenu.el -f make-master-menu $(info_TEXINFOS) ++ ++untabify: ++ emacs -batch -l untabify.el $(info_TEXINFOS) $(tar_TEXINFOS) ++ ++final: untabify master-menu ++ ++# Checking ++check-format: ++ @if test -n "`cat $(info_TEXINFOS) $(tar_TEXINFOS) | tr -d -c '\t'`"; then \ ++ echo "Sources contain tabs; run make untabify"; \ ++ false; \ ++ fi ++ ++check-options: ++ @ARGP_HELP_FMT='usage-indent=0,short-opt-col=0,long-opt-col=0,doc-opt-col=0,opt-doc-col=0,header-col=0,rmargin=1' \ ++ $(top_builddir)/src/tar --usage | \ ++ sed -n 's/^\[--\([^]\=\[]*\).*/\1/p' | sort | uniq > opts.$$$$;\ ++ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ ++ $(info_TEXINFOS) | \ ++ sed -n '/^@macro/,/^@end macro/d;s/@opindex *\([^@,]*\).*/\1/p' \ ++ | sort | uniq > docs.$$$$;\ ++ status=0;\ ++ join -v1 opts.$$$$ docs.$$$$ > report.$$$$;\ ++ if test -s report.$$$$; then \ ++ echo 'Not documented options:'; \ ++ cat report.$$$$; \ ++ status=1; \ ++ fi; \ ++ join -v2 opts.$$$$ docs.$$$$ > report.$$$$;\ ++ if test -s report.$$$$; then \ ++ echo 'Non-existing options:';\ ++ cat report.$$$$; \ ++ status=1; \ ++ fi; \ ++ rm opts.$$$$ docs.$$$$ report.$$$$;\ ++ test $$status -ne 0 && exit $$status ++ ++check-refs: ++ @for file in $(info_TEXINFOS) $(tar_TEXINFOS); \ ++ do \ ++ sed -e = $$file | \ ++ sed -n 'N;/@FIXME-.*ref/{s/\(^[0-9][0-9]*\).*@FIXME-.*ref{\([^}]*\).*/'$$file':\1: \2/gp}'; \ ++ done > $@-t; \ ++ if [ -s $@-t ]; then \ ++ echo "Unresolved cross-references:"; \ ++ cat $@-t;\ ++ rm $@-t; \ ++ else \ ++ rm -f $@-t; \ ++ fi ++ ++check-fixmes: ++ @for file in $(info_TEXINFOS); \ ++ do \ ++ sed -e = $$file | \ ++ sed -n 'N;/@FIXME{/{s/\(^[0-9][0-9]*\).*@FIXME{\([^}]*\).*/'$$file':\1: \2/gp}'; \ ++ done > $@-t; \ ++ if [ -s $@-t ]; then \ ++ echo "Unresolved FIXMEs:"; \ ++ cat $@-t; \ ++ rm $@-t; \ ++ false; \ ++ else \ ++ rm -f $@-t; \ ++ fi ++ ++check-unrevised: ++ @grep -Hn @UNREVISED $(info_TEXINFOS) > $@-t; \ ++ if [ -s $@-t ]; then \ ++ echo "Unrevised nodes:"; \ ++ cat $@-t; \ ++ rm $@-t; \ ++ false;\ ++ else \ ++ rm $@-t; \ ++ fi ++ ++all-check-docs: check-format check-options check-refs check-fixmes check-unrevised ++ ++check-docs: ++ $(MAKE) -k all-check-docs ++ ++# ++ ++clean-local: ++ rm -rf manual ++ ++# Make sure you set TEXINPUTS ++# Usual value is: ++# /usr/share/texmf/pdftex/plain/misc:/usr/share/texmf/pdftex/config ++manual: ++ TEXINPUTS=$(srcdir):$(top_srcdir)/build-tex:$(TEXINPUTS) \ ++ MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \ ++ TEXI2DVI="$(TEXI2DVI) -t @finalout" \ ++ $(GENDOCS) --texi2html tar 'GNU tar manual' ++ ++# 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 -Naur tar-1.26.orig/doc/tar.1 tar-1.26/doc/tar.1 +--- tar-1.26.orig/doc/tar.1 1970-01-01 00:00:00.000000000 +0000 ++++ tar-1.26/doc/tar.1 2011-05-18 17:55:36.872098438 +0000 +@@ -0,0 +1,366 @@ ++.\" generated by script on Sat Jan 8 16:53:11 2011 ++.Dd Jan 8, 2011 ++.Dt TAR 1 ++.Sh NAME ++.Nm tar ++.Nd The GNU version of the tar archiving utility ++.Sh SYNOPSIS ++.Nm tar ++.Oo Fl Oc Cm A Fl \-catenate \-concatenate Cm \||\| c Fl \-create Cm \||\| d Fl \-diff \-compare Cm \||\| Fl \-delete Cm \||\| r Fl \-append Cm \||\| t Fl \-list Cm \||\| Fl \-test\-label Cm \||\| u Fl \-update Cm \||\| x Fl \-extract \-get ++.Op Ar options ++.Op Ar pathname ... ++.Sh DESCRIPTION ++.Nm Tar ++stores and extracts files from a tape or disk archive. ++.Pp ++The first argument to ++tar ++should be a function; either one of the letters ++.Cm Acdrtux , ++or one of the long function names. ++A function letter need not be prefixed with ``\-'', and may be combined ++with other single-letter options. ++A long function name must be prefixed with ++.Cm \\-\\- . ++Some options take a parameter; with the single-letter form ++these must be given as separate arguments. ++With the long form, they may be given by appending ++.Cm = Ns Ar value ++to the option. ++.Sh FUNCTION LETTERS ++Main operation mode: ++.Bl -tag -width flag ++.It Fl A , Fl \-catenate , Fl \-concatenate ++append tar files to an archive ++.It Fl c , Fl \-create ++create a new archive ++.It Fl d , Fl \-diff , Fl \-compare ++find differences between archive and file system ++.It Fl \-delete ++delete from the archive (not on mag tapes!) ++.It Fl r , Fl \-append ++append files to the end of an archive ++.It Fl t , Fl \-list ++list the contents of an archive ++.It Fl \-test\-label ++test the archive volume label and exit ++.It Fl u , Fl \-update ++only append files newer than copy in archive ++.It Fl x , Fl \-extract , Fl \-get ++extract files from an archive ++.El ++.Sh OTHER OPTIONS ++Operation modifiers: ++.Bl -tag -width flag ++.It \-[0\-7][lmh] ++specify drive and density ++.It Fl a , Fl \-auto\-compress ++use archive suffix to determine the compression program ++.It Fl \-add\-file Ns \= Ns Ar FILE ++add given FILE to the archive (useful if its name starts with a dash) ++.It Fl \-anchored ++patterns match file name start ++.It Fl \-no\-anchored ++patterns match after any `/' (default for exclusion) ++.It Fl \-atime\-preserve ++preserve access times on dumped files, either by restoring the times ++.It Fl \-no\-auto\-compress ++do not use archive suffix to determine the compression program ++.It Fl b , Fl \-blocking\-factor Ar BLOCKS ++BLOCKS x 512 bytes per record ++.It Fl B , Fl \-read\-full\-records ++reblock as we read (for 4.2BSD pipes) ++.It Fl \-backup ++backup before removal, choose version CONTROL ++.It Fl C , Fl \-directory Ar DIR ++change to directory DIR ++.It Fl \-check\-device ++check device numbers when creating incremental archives (default) ++.It Fl \-no\-check\-device ++do not check device numbers when creating incremental archives ++.It Fl \-checkpoint ++display progress messages every NUMBERth record (default 10) ++.It Fl \-checkpoint\-action Ns \= Ns Ar ACTION ++execute ACTION on each checkpoint ++.It Fl \-delay\-directory\-restore ++delay setting modification times and permissions of extracted ++.It Fl \-no\-delay\-directory\-restore ++cancel the effect of --delay-directory-restore option ++.It Fl \-exclude Ns \= Ns Ar PATTERN ++exclude files, given as a PATTERN ++.It Fl \-exclude\-backups ++exclude backup and lock files ++.It Fl \-exclude\-caches ++exclude contents of directories containing CACHEDIR.TAG, ++.It Fl \-exclude\-caches\-all ++exclude directories containing CACHEDIR.TAG ++.It Fl \-exclude\-caches\-under ++exclude everything under directories containing CACHEDIR.TAG ++.It Fl \-exclude\-tag Ns \= Ns Ar FILE ++exclude contents of directories containing FILE, except ++.It Fl \-exclude\-tag\-all Ns \= Ns Ar FILE ++exclude directories containing FILE ++.It Fl \-exclude\-tag\-under Ns \= Ns Ar FILE ++exclude everything under directories containing FILE ++.It Fl \-exclude\-vcs ++exclude version control system directories ++.It Fl f , Fl \-file Ar ARCHIVE ++use archive file or device ARCHIVE ++.It Fl F , Fl \-info\-script , Fl \-new\-volume\-script Ar NAME ++run script at end of each tape (implies -M) ++.It Fl \-force\-local ++archive file is local even if it has a colon ++.It Fl \-full\-time ++print file time to its full resolution ++.It Fl g , Fl \-listed\-incremental Ar FILE ++handle new GNU-format incremental backup ++.It Fl G , Fl \-incremental ++handle old GNU-format incremental backup ++.It Fl \-group Ns \= Ns Ar NAME ++force NAME as group for added files ++.It Fl h , Fl \-dereference ++follow symlinks; archive and dump the files they point to ++.It Fl H , Fl \-format Ar FORMAT ++create archive of the given formatFORMAT is one of the following: ++.Bl -tag -width flag ++.It Fl \-format=gnu ++GNU tar 1.13.x format ++.It Fl \-format=oldgnu ++GNU format as per tar <= 1.12 ++.It Fl \-format=pax ++POSIX 1003.1-2001 (pax) format ++.It Fl \-format=posix ++same as pax ++.It Fl \-format=ustar ++POSIX 1003.1-1988 (ustar) format ++.It Fl \-format=v7 ++old V7 tar format ++.El ++.It Fl \-hard\-dereference ++follow hard links; archive and dump the files they refer to ++.It Fl i , Fl \-ignore\-zeros ++ignore zeroed blocks in archive (means EOF) ++.It Fl I , Fl \-use\-compress\-program Ar PROG ++filter through PROG (must accept -d) ++.It Fl \-ignore\-case ++ignore case ++.It Fl \-no\-ignore\-case ++case sensitive matching (default) ++.It Fl \-ignore\-command\-error ++ignore exit codes of children ++.It Fl \-no\-ignore\-command\-error ++treat non-zero exit codes of children as error ++.It Fl \-ignore\-failed\-read ++do not exit with nonzero on unreadable files ++.It Fl \-index\-file Ns \= Ns Ar FILE ++send verbose output to FILE ++.It Fl j , Fl \-bzip2 ++ ++.It Fl J , Fl \-xz ++ ++.It Fl k , Fl \-keep\-old\-files ++don't replace existing files when extracting ++.It Fl K , Fl \-starting\-file Ar MEMBER-NAME ++begin at member MEMBER-NAME in the archive ++.It Fl \-keep\-newer\-files ++don't replace existing files that are newer than their archive copies ++.It Fl l , Fl \-check\-links ++print a message if not all links are dumped ++.It Fl L , Fl \-tape\-length Ar NUMBER ++change tape after writing NUMBER x 1024 bytes ++.It Fl \-level Ns \= Ns Ar NUMBER ++dump level for created listed-incremental archive ++.It Fl \-lzip ++ ++.It Fl \-lzma ++ ++.It Fl \-lzop ++ ++.It Fl m , Fl \-touch ++don't extract file modified time ++.It Fl M , Fl \-multi\-volume ++create/list/extract multi-volume archive ++.It Fl \-mode Ns \= Ns Ar CHANGES ++force (symbolic) mode CHANGES for added files ++.It Fl \-mtime Ns \= Ns Ar DATE-OR-FILE ++set mtime for added files from DATE-OR-FILE ++.It Fl n , Fl \-seek ++archive is seekable ++.It Fl N , Fl \-newer , Fl \-after\-date Ar DATE-OR-FILE ++only store files newer than DATE-OR-FILE ++.It Fl \-newer\-mtime Ns \= Ns Ar DATE ++compare date and time when data changed only ++.It Fl \-null ++-T reads null-terminated names, disable -C ++.It Fl \-no\-null ++disable the effect of the previous --null option ++.It Fl \-numeric\-owner ++always use numbers for user/group names ++.It Fl O , Fl \-to\-stdout ++extract files to standard output ++.It Fl \-occurrence ++process only the NUMBERth occurrence of each file in the archive; ++.It Fl \-old\-archive , Fl \-portability ++same as --format=v7 ++.It Fl \-one\-file\-system ++stay in local file system when creating archive ++.It Fl \-overwrite ++overwrite existing files when extracting ++.It Fl \-overwrite\-dir ++overwrite metadata of existing directories when extracting (default) ++.It Fl \-no\-overwrite\-dir ++preserve metadata of existing directories ++.It Fl \-owner Ns \= Ns Ar NAME ++force NAME as owner for added files ++.It Fl p , Fl \-preserve\-permissions , Fl \-same\-permissions ++extract information about file permissions (default for superuser) ++.It Fl P , Fl \-absolute\-names ++don't strip leading `/'s from file names ++.It Fl \-pax\-option Ns \= Ns Ar keyword[[:]=value][,keyword[[:]=value]]... ++control pax keywords ++.It Fl \-posix ++same as --format=posix ++.It Fl \-preserve ++same as both -p and -s ++.It Fl \-quote\-chars Ns \= Ns Ar STRING ++additionally quote characters from STRING ++.It Fl \-no\-quote\-chars Ns \= Ns Ar STRING ++disable quoting for characters from STRING ++.It Fl \-quoting\-style Ns \= Ns Ar STYLE ++set name quoting style; see below for valid STYLE values ++.It Fl R , Fl \-block\-number ++show block number within archive with each message ++.It Fl \-record\-size Ns \= Ns Ar NUMBER ++NUMBER of bytes per record, multiple of 512 ++.It Fl \-recursion ++recurse into directories (default) ++.It Fl \-no\-recursion ++avoid descending automatically in directories ++.It Fl \-recursive\-unlink ++empty hierarchies prior to extracting directory ++.It Fl \-remove\-files ++remove files after adding them to the archive ++.It Fl \-restrict ++disable use of some potentially harmful options ++.It Fl \-rmt\-command Ns \= Ns Ar COMMAND ++use given rmt COMMAND instead of rmt ++.It Fl \-rsh\-command Ns \= Ns Ar COMMAND ++use remote COMMAND instead of rsh ++.It Fl s , Fl \-preserve\-order , Fl \-same\-order ++sort names to extract to match archive ++.It Fl S , Fl \-sparse ++handle sparse files efficiently ++.It Fl \-same\-owner ++try extracting files with the same ownership as exists in the archive (default for superuser) ++.It Fl \-no\-same\-owner ++extract files as yourself (default for ordinary users) ++.It Fl \-no\-same\-permissions ++apply the user's umask when extracting permissions from the archive (default for ordinary users) ++.It Fl \-no\-seek ++archive is not seekable ++.It Fl \-show\-defaults ++show tar defaults ++.It Fl \-show\-omitted\-dirs ++when listing or extracting, list each directory that does not match search criteria ++.It Fl \-show\-transformed\-names , Fl \-show\-stored\-names ++show file or archive names after transformation ++.It Fl \-sparse\-version Ns \= Ns Ar MAJOR[.MINOR] ++set version of the sparse format to use (implies --sparse) ++.It Fl \-strip\-components Ns \= Ns Ar NUMBER ++strip NUMBER leading components from file names on extraction ++.It Fl \-suffix Ns \= Ns Ar STRING ++backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX) ++.It Fl T , Fl \-files\-from Ar FILE ++get names to extract or create from FILE ++.It Fl \-to\-command Ns \= Ns Ar COMMAND ++pipe extracted files to another program ++.It Fl \-totals ++print total bytes after processing the archive; ++.It Fl \-transform , Fl \-xform Ar EXPRESSION ++use sed replace EXPRESSION to transform file names ++.It Fl U , Fl \-unlink\-first ++remove each file prior to extracting over it ++.It Fl \-unquote ++unquote filenames read with -T (default) ++.It Fl \-no\-unquote ++do not unquote filenames read with -T ++.It Fl \-utc ++print file modification times in UTC ++.It Fl v , Fl \-verbose ++verbosely list files processed ++.It Fl V , Fl \-label Ar TEXT ++create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name ++.It Fl \-volno\-file Ns \= Ns Ar FILE ++use/update the volume number in FILE ++.It Fl w , Fl \-interactive , Fl \-confirmation ++ask for confirmation for every action ++.It Fl W , Fl \-verify ++attempt to verify the archive after writing it ++.It Fl \-warning Ns \= Ns Ar KEYWORD ++warning control ++.It Fl \-wildcards ++use wildcards (default for exclusion) ++.It Fl \-wildcards\-match\-slash ++wildcards match `/' (default for exclusion) ++.It Fl \-no\-wildcards\-match\-slash ++wildcards do not match `/' ++.It Fl \-no\-wildcards ++verbatim string matching ++.It Fl X , Fl \-exclude\-from Ar FILE ++exclude patterns listed in FILE ++.It Fl z , Fl \-gzip , Fl \-gunzip Fl \-ungzip ++ ++.It Fl Z , Fl \-compress , Fl \-uncompress ++ ++.El ++.Sh ENVIRONMENT ++The behavior of tar is controlled by the following environment variables, ++among others: ++.Bl -tag -width Ds ++.It Ev SIMPLE_BACKUP_SUFFIX ++Backup prefix to use when extracting, if ++.Fl \-suffix ++is not specified. ++The backup suffix defaults to `~' if neither is specified. ++.It Ev TAR_OPTIONS ++Options to prepend to those specified on the command line, separated by ++whitespace. Embedded backslashes may be used to escape whitespace or ++backslashes within an option. ++.It Ev TAPE ++Device or file to use for the archive if ++.Fl \-file ++is not specified. ++If this environment variable is unset, use stdin or stdout instead. ++.El ++.Sh EXAMPLES ++Create archive.tar from files foo and bar. ++.Bd -literal -offset indent -compact ++tar \-cf archive.tar foo bar ++.Ed ++List all files in archive.tar verbosely. ++.Bd -literal -offset indent -compact ++tar \-tvf archive.tar ++.Ed ++Extract all files from archive.tar. ++.Bd -literal -offset indent -compact ++tar \-xf archive.tar ++.Ed ++.Sh SEE ALSO ++.\" libarchive ++.Xr tar 5 , ++.\" man-pages ++.Xr symlink 7 , ++.Xr rmt 8 ++.Sh HISTORY ++The ++.Nm tar ++command appeared in ++.At v7 . ++.Sh BUGS ++The GNU folks, in general, abhor man pages, and create info documents instead. ++Unfortunately, the info document describing tar is licensed under the GFDL with ++invariant cover texts, which makes it impossible to include any text ++from that document in this man page. ++Most of the text in this document was automatically extracted from the usage ++text in the source. ++It may not completely describe all features of the program. diff --git a/stage1/patches/common/texinfo-4.13a-new_compressors-1.patch b/stage1/patches/common/texinfo-4.13a-new_compressors-1.patch new file mode 100644 index 0000000..6a3dd06 --- /dev/null +++ b/stage1/patches/common/texinfo-4.13a-new_compressors-1.patch @@ -0,0 +1,68 @@ +Submitted By: Jim Gifford <jim at cross-lfs dot org> +Date: 2009-02-21 +Initial Package Version: 4.13a +Upstream Status: Unknown +Origin: Jim Gifford +Description: For using xz compression + +diff -Naur texinfo-4.13.orig/doc/texinfo.txi texinfo-4.13/doc/texinfo.txi +--- texinfo-4.13.orig/doc/texinfo.txi 2008-09-18 11:31:57.000000000 -0700 ++++ texinfo-4.13/doc/texinfo.txi 2009-02-22 19:41:37.874296689 -0800 +@@ -16488,6 +16488,7 @@ + + @cindex Compressed dir files, reading + @cindex Bzipped dir files, reading ++@cindex XZ-compressed dir files, reading + @cindex LZMA-compressed dir files, reading + @cindex Dir files, compressed + If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip, +@@ -16495,8 +16496,8 @@ + for reading. And if @var{dir-file} is compressed, @code{install-info} + also automatically leaves it compressed after writing any changes. + If @var{dir-file} itself does not exist, @code{install-info} tries to +-open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, and +-@file{@var{dir-file}.lzma}, in that order. ++open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, ++@file{@var{dir-file}.xz} and @file{@var{dir-file}.lzma}, in that order. + + Options: + +diff -Naur texinfo-4.13.orig/info/filesys.c texinfo-4.13/info/filesys.c +--- texinfo-4.13.orig/info/filesys.c 2008-06-12 05:39:20.000000000 -0700 ++++ texinfo-4.13/info/filesys.c 2009-02-22 19:41:37.874296689 -0800 +@@ -55,6 +55,7 @@ + static COMPRESSION_ALIST compress_suffixes[] = { + { ".gz", "gunzip" }, + { ".bz2", "bunzip2" }, ++ { ".xz", "unxz" }, + { ".lzma", "unlzma" }, + { ".z", "gunzip" }, + { ".Z", "uncompress" }, +diff -Naur texinfo-4.13.orig/install-info/install-info.c texinfo-4.13/install-info/install-info.c +--- texinfo-4.13.orig/install-info/install-info.c 2008-05-22 05:11:33.000000000 -0700 ++++ texinfo-4.13/install-info/install-info.c 2009-02-22 19:41:37.874296689 -0800 +@@ -739,15 +739,20 @@ + #else + *compression_program = "bzip"; + #endif ++ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z' ++ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0x00) ++#ifndef STRIP_DOT_EXE ++ *compression_program = "xz.exe"; ++#else ++ *compression_program = "xz"; ++#endif + /* We (try to) match against old lzma format (which lacks proper +- header, two first matches), as well as the new format (last match). */ ++ header, two first matches). */ + else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00 + && data[12] == 0x00) + || (data[5] == '\xFF' && data[6] == '\xFF' && data[7] == '\xFF' + && data[8] == '\xFF' && data[9] == '\xFF' && data[10] == '\xFF' +- && data[11] == '\xFF' && data[12] == '\xFF') +- || (data[0] == '\xFF' && data[1] == 'L' && data[2] == 'Z' +- && data[3] == 'M' && data[4] == 'A' && data[5] == 0x00)) ++ && data[11] == '\xFF' && data[12] == '\xFF')) + #ifndef STRIP_DOT_EXE + *compression_program = "lzma.exe"; + #else diff --git a/stage1/patches/x86/gcc-4.6.3-specs-1.patch b/stage1/patches/x86/gcc-4.6.3-specs-1.patch new file mode 120000 index 0000000..538ebda --- /dev/null +++ b/stage1/patches/x86/gcc-4.6.3-specs-1.patch @@ -0,0 +1 @@ +../../../stage0/patches/x86/gcc-4.6.3-specs-1.patch \ No newline at end of file diff --git a/stage1/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch b/stage1/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch new file mode 120000 index 0000000..a8bcc51 --- /dev/null +++ b/stage1/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch @@ -0,0 +1 @@ +../../../stage0/patches/x86_64/gcc-4.6.3-pure64_specs-1.patch \ No newline at end of file diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc index 2a2c2ea..ebca3fe 100644 --- a/stage1/pkg/gcc +++ b/stage1/pkg/gcc @@ -1,24 +1,5 @@ #!/bin/bash -hvpatch() -{ - # Manually applying patches if specified - if [ -n "${GCC_PATCHES}" ]; then - for p in ${GCC_PATCHES}; do - apply_patch ${PACKAGE}-${p}.patch ${PACKAGE} - done - fi - - case "${HVL_TARGET}" in - "x86") - apply_patch ${PACKAGE}-specs-1.patch ${PACKAGE} - ;; - "x86_64") - apply_patch ${PACKAGE}-pure64_specs-1.patch ${PACKAGE} - ;; - esac -} - hvconfig_pre() { CONFIGURE_OPTS="\ diff --git a/stage2/patches/common/automake-1.14-test-1.patch b/stage2/patches/common/automake-1.14-test-1.patch new file mode 100644 index 0000000..d2a87a9 --- /dev/null +++ b/stage2/patches/common/automake-1.14-test-1.patch @@ -0,0 +1,66 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2013-08-18 +Initial Package Version: 1.14 +Upstream Status: From Upstream +Origin: https://lists.nongnu.org/archive/html/bug-automake/2013-07/msg00022.html +Description: Fixes an intermittent test failure in + t/primary-prefix-invalid-couples.tap caused by + Perl-5.18. + +diff -Naur automake-1.14.orig/lib/Automake/Variable.pm automake-1.14/lib/Automake/Variable.pm +--- automake-1.14.orig/lib/Automake/Variable.pm 2013-06-20 08:44:16.000000000 +0000 ++++ automake-1.14/lib/Automake/Variable.pm 2013-08-17 19:46:26.841630215 +0000 +@@ -317,21 +317,21 @@ + sub variables (;$) + { + my ($suffix) = @_; ++ my @vars = (); + if ($suffix) + { + if (exists $_primary_dict{$suffix}) + { +- return values %{$_primary_dict{$suffix}}; +- } +- else +- { +- return (); ++ @vars = values %{$_primary_dict{$suffix}}; + } + } + else + { +- return values %_variable_dict; ++ @vars = values %_variable_dict; + } ++ # The behaviour of the 'sort' built-in is undefined in scalar ++ # context, hence we need an ad-hoc handling for such context. ++ return wantarray ? sort { $a->name cmp $b->name } @vars : scalar @vars; + } + + =item C<Automake::Variable::reset> +@@ -1080,7 +1080,7 @@ + sub variables_dump () + { + my $text = "all variables:\n{\n"; +- foreach my $var (sort { $a->name cmp $b->name } variables) ++ foreach my $var (variables()) + { + $text .= $var->dump; + } +diff -Naur automake-1.14.orig/t/preproc-errmsg.sh automake-1.14/t/preproc-errmsg.sh +--- automake-1.14.orig/t/preproc-errmsg.sh 2013-06-19 09:29:50.000000000 +0000 ++++ automake-1.14/t/preproc-errmsg.sh 2013-08-17 19:47:30.491966226 +0000 +@@ -58,11 +58,11 @@ + sub/local.mk:3: 'sub-two.a' is not a standard library name + sub/local.mk:3: did you mean 'libsub-two.a'? + Makefile.am:2: 'sub/local.mk' included from here +-Makefile.am:1: variable 'x1_SOURCES' is defined but no program or +-Makefile.am:1: library has 'x1' as canonical name (possible typo) + sub/local.mk:4: variable 'sub_x2_SOURCES' is defined but no program or + sub/local.mk:4: library has 'sub_x2' as canonical name (possible typo) + Makefile.am:2: 'sub/local.mk' included from here ++Makefile.am:1: variable 'x1_SOURCES' is defined but no program or ++Makefile.am:1: library has 'x1' as canonical name (possible typo) + END + + # We need to break these substitutions into multiple sed invocations diff --git a/stage2/patches/common/bc-1.06.95-memory_leak-1.patch b/stage2/patches/common/bc-1.06.95-memory_leak-1.patch new file mode 100644 index 0000000..65703f9 --- /dev/null +++ b/stage2/patches/common/bc-1.06.95-memory_leak-1.patch @@ -0,0 +1,41 @@ +Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org) +Date: 2014-04-18 +Initial Package Version: 1.06.95 +Origin: Gentoo +Description: Fixes memory leaks and an uninitialized variable + +diff -Naur bc-1.06.95.orig/bc/bc.y bc-1.06.95/bc/bc.y +--- bc-1.06.95.orig/bc/bc.y 2006-09-04 21:39:31.000000000 -0500 ++++ bc-1.06.95/bc/bc.y 2014-04-09 13:27:04.602661243 -0500 +@@ -569,6 +569,7 @@ + generate (">"); + break; + } ++ free($2); + } + | expression '+' expression + { +diff -Naur bc-1.06.95.orig/bc/storage.c bc-1.06.95/bc/storage.c +--- bc-1.06.95.orig/bc/storage.c 2006-09-04 21:39:31.000000000 -0500 ++++ bc-1.06.95/bc/storage.c 2014-04-09 13:28:11.770763410 -0500 +@@ -99,6 +99,7 @@ + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; +diff -Naur bc-1.06.95.orig/bc/util.c bc-1.06.95/bc/util.c +--- bc-1.06.95.orig/bc/util.c 2006-09-04 21:39:31.000000000 -0500 ++++ bc-1.06.95/bc/util.c 2014-04-09 13:27:39.841190064 -0500 +@@ -602,8 +602,7 @@ + case FUNCTDEF: + if (id->f_name != 0) + { +- if (namekind != FUNCT) +- free(name); ++ free(name); + /* Check to see if we are redefining a math lib function. */ + if (use_math && namekind == FUNCTDEF && id->f_name <= 6) + id->f_name = next_func++; diff --git a/stage2/patches/common/bzip2-1.0.6-install_docs-1.patch b/stage2/patches/common/bzip2-1.0.6-install_docs-1.patch new file mode 120000 index 0000000..49bfc51 --- /dev/null +++ b/stage2/patches/common/bzip2-1.0.6-install_docs-1.patch @@ -0,0 +1 @@ +../../../stage1/patches/common/bzip2-1.0.6-install_docs-1.patch \ No newline at end of file diff --git a/stage2/patches/common/dhcp-4.2.3-P2-iproute2-1.patch b/stage2/patches/common/dhcp-4.2.3-P2-iproute2-1.patch new file mode 100644 index 0000000..909e29c --- /dev/null +++ b/stage2/patches/common/dhcp-4.2.3-P2-iproute2-1.patch @@ -0,0 +1,192 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2011-11-23 +Initial Package Version: 4.2.2 +Upstream Status: ignored +Origin: Peter Marschall, modified by Ken Moffat +Description: Fixes dhclient-script to work with iproute2 + +originally from Peter Marschall, +https://lists.isc.org/pipermail/dhcp-users/2011-January/012539.html + + Extended to handle other 'route' invocations in 4.2.2, and output to +/dev/null removed. This replaces the earlier dhcp patch by Jim Gifford, +Bruce Dubbs, and DJ Lucas which no longer applies. Reinstated one +output to /dev/null because the script tries to add an interface during +reboot. + +--- dhcp-4.2.2/client/scripts/linux.orig 2011-05-18 21:01:54.000000000 +0100 ++++ dhcp-4.2.2/client/scripts/linux 2011-09-06 01:04:13.000000000 +0100 +@@ -3,6 +3,8 @@ + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. + # No guarantees about this. I'm a novice at the details of Linux + # networking. ++# Conversion to use ip for ipv4 (instead of ifconfig, route) by Peter Marschall ++# Extended for 4.2.2, and ip output to /dev/null removed, by Ken Moffat + + # Notes: + +@@ -98,17 +100,11 @@ + if [ x$old_broadcast_address != x ]; then + old_broadcast_arg="broadcast $old_broadcast_address" + fi +-if [ x$new_subnet_mask != x ]; then +- new_subnet_arg="netmask $new_subnet_mask" ++if [ -n "$new_subnet_mask" ]; then ++ new_mask="/$new_subnet_mask" + fi +-if [ x$old_subnet_mask != x ]; then +- old_subnet_arg="netmask $old_subnet_mask" +-fi +-if [ x$alias_subnet_mask != x ]; then +- alias_subnet_arg="netmask $alias_subnet_mask" +-fi +-if [ x$new_interface_mtu != x ]; then +- mtu_arg="mtu $new_interface_mtu" ++if [ -n "$alias_subnet_mask" ]; then ++ alias_mask="/$alias_subnet_mask" + fi + if [ x$IF_METRIC != x ]; then + metric_arg="metric $IF_METRIC" +@@ -122,9 +118,9 @@ + if [ x$reason = xPREINIT ]; then + if [ x$alias_ip_address != x ]; then + # Bring down alias interface. Its routes will disappear too. +- ifconfig $interface:0- inet 0 ++ ${ip} -4 addr flush dev ${interface} label ${interface}:0 + fi +- ifconfig $interface 0 up ++ ${ip} link set dev ${interface} up + + # We need to give the kernel some time to get the interface up. + sleep 1 +@@ -151,25 +147,32 @@ + if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ + [ x$alias_ip_address != x$old_ip_address ]; then + # Possible new alias. Remove old alias. +- ifconfig $interface:0- inet 0 ++ ${ip} -4 addr flush dev ${interface} label ${interface}:0 + fi + if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then + # IP address changed. Bringing down the interface will delete all routes, + # and clear the ARP cache. +- ifconfig $interface inet 0 down ++ ${ip} -4 addr flush dev ${interface} label ${interface} ++ fi ++ + + fi + if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ + [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then + +- ifconfig $interface inet $new_ip_address $new_subnet_arg \ +- $new_broadcast_arg $mtu_arg ++ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \ ++ dev ${interface} label ${interface} 2>/dev/null ++ if [ -n "$new_interface_mtu" ]; then ++ # set MTU ++ ${ip} link set dev ${interface} mtu ${new_interface_mtu} ++ fi + # Add a network route to the computed network address. + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ ${ip} -4 route add ${router} dev $interface + fi +- route add default gw $router $metric_arg dev $interface ++ ${ip} -4 route add default via ${router} dev ${interface} \ ++ ${metric_arg} + done + else + # we haven't changed the address, have we changed other options +@@ -177,21 +180,24 @@ + if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then + # if we've changed routers delete the old and add the new. + for router in $old_routers; do +- route del default gw $router ++ ${ip} -4 route del via $router + done + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ ${ip} -4 route add $router dev $interface + fi + route add default gw $router $metric_arg dev $interface ++ ${ip} -4 route add default via $router dev $interface \ ++ $metric_arg + done + fi + fi + if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; + then +- ifconfig $interface:0- inet 0 +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address $interface:0 ++ ${ip} -4 addr flush dev ${interface} label ${interface}:0 ++ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \ ++ dev ${interface} label ${interface}:0 ++ ${ip} -4 route add ${alias_ip_address} dev ${interface} + fi + make_resolv_conf + exit_with_hooks 0 +@@ -201,42 +207,49 @@ + || [ x$reason = xSTOP ]; then + if [ x$alias_ip_address != x ]; then + # Turn off alias interface. +- ifconfig $interface:0- inet 0 ++ ${ip} -4 addr flush dev ${interface} label ${interface}:0 + fi + if [ x$old_ip_address != x ]; then + # Shut down interface, which will delete routes and clear arp cache. +- ifconfig $interface inet 0 down ++ ${ip} -4 addr flush dev ${interface} label ${interface} + fi + if [ x$alias_ip_address != x ]; then +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address $interface:0 ++ ${ip} -4 addr add ${alias_ip_address}${alias_network_arg} \ ++ dev ${interface} label ${interface}:0 ++ ${ip} -4 route add ${alias_ip_address} dev ${interface} + fi + exit_with_hooks 0 + fi + + if [ x$reason = xTIMEOUT ]; then + if [ x$alias_ip_address != x ]; then +- ifconfig $interface:0- inet 0 ++ ${ip} -4 addr flush dev ${interface} label ${interface}:0 ++ fi ++ ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \ ++ dev ${interface} label ${interface} ++ if [ -n "$new_interface_mtu" ]; then ++ # set MTU ++ ip link set dev ${interface} mtu ${new_interface_mtu} + fi +- ifconfig $interface inet $new_ip_address $new_subnet_arg \ +- $new_broadcast_arg $mtu_arg + set $new_routers + if ping -q -c 1 $1; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then +- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +- route add -host $alias_ip_address dev $interface:0 ++ ${ip} -4 addr add ${alias_ip_address}${alias_mask} \ ++ dev ${interface} label ${interface}:0 ++ ${ip} -4 route add ${alias_ip_address} dev ${interface} + fi + for router in $new_routers; do + if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then +- route add -host $router dev $interface ++ ${ip} -4 route add ${router} dev $interface + fi +- route add default gw $router $metric_arg dev $interface ++ ${ip} -4 route add default via ${router} dev ${interface} \ ++ ${metric_arg} + done + make_resolv_conf + exit_with_hooks 0 + fi +- ifconfig $interface inet 0 down ++ ${ip} -4 addr flush dev ${interface} + exit_with_hooks 1 + fi + diff --git a/stage2/patches/common/dhcp-4.2.3-P2-missing_ipv6-1.patch b/stage2/patches/common/dhcp-4.2.3-P2-missing_ipv6-1.patch new file mode 100644 index 0000000..3a034c0 --- /dev/null +++ b/stage2/patches/common/dhcp-4.2.3-P2-missing_ipv6-1.patch @@ -0,0 +1,48 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2011-11-23 +Initial Package Version: 4.2.2 +Upstream Status: unknown +Origin: found at fedora +Description: Allow dhcp4 to work even if the kernel doesn't support ipv6. +Fixed up by hand to apply to 4.2.2 (to me, it looks identical to the 4.2.0 +version, but patch failed in one hunk when I tried to apply that one). + +--- dhcp-4.2.2/common/discover.c.orig 2011-07-19 23:22:48.000000000 +0100 ++++ dhcp-4.2.2/common/discover.c 2011-09-06 01:28:15.000000000 +0100 +@@ -455,7 +455,7 @@ + } + + #ifdef DHCPv6 +- if (local_family == AF_INET6) { ++ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) { + ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); + if (ifaces->fp6 == NULL) { + log_error("Error opening '/proc/net/if_inet6' to " +@@ -466,6 +466,8 @@ + ifaces->fp = NULL; + return 0; + } ++ } else { ++ ifaces->fp6 = NULL; + } + #endif + +@@ -733,7 +735,7 @@ + return 1; + } + #ifdef DHCPv6 +- if (!(*err)) { ++ if (!(*err) && ifaces->fp6) { + if (local_family == AF_INET6) + return next_iface6(info, err, ifaces); + } +@@ -752,7 +754,8 @@ + ifaces->sock = -1; + #ifdef DHCPv6 + if (local_family == AF_INET6) { +- fclose(ifaces->fp6); ++ if (ifaces->fp6) ++ fclose(ifaces->fp6); + ifaces->fp6 = NULL; + } + #endif diff --git a/stage2/patches/common/eglibc-2.15-r17386-fixes-1.patch b/stage2/patches/common/eglibc-2.15-r17386-fixes-1.patch new file mode 100644 index 0000000..cb709c9 --- /dev/null +++ b/stage2/patches/common/eglibc-2.15-r17386-fixes-1.patch @@ -0,0 +1,107 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) +Date: 2012-02-16 +Initial Package Version: 2.15 +Origin: http://sourceware.org/ml/libc-alpha/2011-06/msg00010.html +Upstream Status: Submitted +Description: Fixes segfault with sound devices / output. + +diff -Naur eglibc-2_15.orig/elf/dl-close.c eglibc-2_15/elf/dl-close.c +--- eglibc-2_15.orig/elf/dl-close.c 2012-02-16 09:31:47.478224779 +0000 ++++ eglibc-2_15/elf/dl-close.c 2012-02-16 09:37:17.287098571 +0000 +@@ -119,17 +119,8 @@ + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)) +diff -Naur eglibc-2_15.orig/elf/dl-deps.c eglibc-2_15/elf/dl-deps.c +--- eglibc-2_15.orig/elf/dl-deps.c 2012-02-16 09:31:47.474224671 +0000 ++++ eglibc-2_15/elf/dl-deps.c 2012-02-16 09:39:54.791335897 +0000 +@@ -489,6 +489,8 @@ + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; ++ + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -689,6 +691,7 @@ + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -697,7 +700,7 @@ + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +diff -Naur eglibc-2_15.orig/elf/dl-libc.c eglibc-2_15/elf/dl-libc.c +--- eglibc-2_15.orig/elf/dl-libc.c 2012-02-16 09:31:47.478224779 +0000 ++++ eglibc-2_15/elf/dl-libc.c 2012-02-16 09:32:43.619735410 +0000 +@@ -284,6 +284,10 @@ + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff -Naur eglibc-2_15.orig/elf/rtld.c eglibc-2_15/elf/rtld.c +--- eglibc-2_15.orig/elf/rtld.c 2012-02-16 09:31:47.470224563 +0000 ++++ eglibc-2_15/elf/rtld.c 2012-02-16 09:35:01.611448263 +0000 +@@ -2277,6 +2277,7 @@ + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff -Naur eglibc-2_15.orig/include/link.h eglibc-2_15/include/link.h +--- eglibc-2_15.orig/include/link.h 2012-02-16 09:31:47.710231021 +0000 ++++ eglibc-2_15/include/link.h 2012-02-16 09:42:04.610828212 +0000 +@@ -192,6 +192,9 @@ + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/stage2/patches/common/gcc-4.6.3-branch_update-2.patch b/stage2/patches/common/gcc-4.6.3-branch_update-2.patch new file mode 120000 index 0000000..46fb1d5 --- /dev/null +++ b/stage2/patches/common/gcc-4.6.3-branch_update-2.patch @@ -0,0 +1 @@ +../../../stage1/patches/common/gcc-4.6.3-branch_update-2.patch \ No newline at end of file diff --git a/stage2/patches/common/iana-etc-2.30-get_fix-1.patch b/stage2/patches/common/iana-etc-2.30-get_fix-1.patch new file mode 100644 index 0000000..8c865d1 --- /dev/null +++ b/stage2/patches/common/iana-etc-2.30-get_fix-1.patch @@ -0,0 +1,27 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux dot co dot uk) +Date: 2012-02-17 +Initial Package Version: 2.30 +Origin: Myself +Upstream Status: None +Description: Updated filenames and online locations of port numbers and protocol files. + +diff -Naur iana-etc-2.30.orig/Makefile iana-etc-2.30/Makefile +--- iana-etc-2.30.orig/Makefile 2012-02-17 22:57:44.000000000 +0000 ++++ iana-etc-2.30/Makefile 2012-02-17 23:24:00.000000000 +0000 +@@ -42,12 +42,12 @@ + protocol-numbers.iana port-numbers.iana + + protocol-numbers.iana: +- $(AWK) -f get.gawk -v file=protocol-numbers >protocol-numbers.iana +- rm -f protocol-numbers ++ $(AWK) -f get.gawk -v file=protocol-numbers/protocol-numbers.txt >protocol-numbers.iana ++ rm -f protocol-numbers.txt + + port-numbers.iana: +- $(AWK) -f get.gawk -v file=port-numbers >port-numbers.iana +- rm -f port-numbers ++ $(AWK) -f get.gawk -v file=service-names-port-numbers/service-names-port-numbers.txt >port-numbers.iana ++ rm -f service-names-port-numbers.txt + + protocol-numbers: + ifeq (protocol-numbers.iana, $(wildcard protocol-numbers.iana)) diff --git a/stage2/patches/common/iana-etc-2.30-numbers_update-20120610-2.patch b/stage2/patches/common/iana-etc-2.30-numbers_update-20120610-2.patch new file mode 100644 index 0000000..06d27f1 --- /dev/null +++ b/stage2/patches/common/iana-etc-2.30-numbers_update-20120610-2.patch @@ -0,0 +1,37791 @@ +Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk) +Date: 2012-06-10 +Initial Package Version: 2.30 +Origin: Upstream +Upstream Status: Applied +Description: Updates the default Service and Protocol files for iana-etc. + +diff -Naur iana-etc-2.30.orig/port-numbers.dist iana-etc-2.30/port-numbers.dist +--- iana-etc-2.30.orig/port-numbers.dist 2012-06-10 10:24:26.651533631 +0000 ++++ iana-etc-2.30/port-numbers.dist 2012-06-10 10:25:04.048544333 +0000 +@@ -1,15549 +1,21441 @@ +-(last updated 2008-02-29) ++ Last Updated ++ 2012-06-08 + +-The port numbers are divided into three ranges: the Well Known Ports, +-the Registered Ports, and the Dynamic and/or Private Ports. ++ Note + +-The Well Known Ports are those from 0 through 1023. ++ ************************************************************************ ++ * Since we merged and converted this registry it loads more slowly. We * ++ * know it should load faster and are working on ways to achieve that. * ++ * Thank you for your patience. * ++ ************************************************************************ + +-DCCP Well Known ports SHOULD NOT be used without IANA registration. +-The registration procedure is defined in [RFC4340], Section 19.9. +- +-The Registered Ports are those from 1024 through 49151 +- +-DCCP Registered ports SHOULD NOT be used without IANA registration. +-The registration procedure is defined in [RFC4340], Section 19.9. +- +-The Dynamic and/or Private Ports are those from 49152 through 65535 +- +-A value of 0 in the port numbers registry below indicates that no port +-has been allocated. +- +-************************************************************************ +-* PLEASE NOTE THE FOLLOWING: * +-* * +-* IESG STATEMENT TO THE IANA * +-* THE IESG BELIEVES THAT IANA MAY ALLOCATE AN ADDITIONAL PORT IN * +-* THE 'USER PORT' RANGE TO PROTOCOLS WHOSE CURRENT PORT ALLOCATION * +-* REQUIRES ACCESS TO A PRIVILEGED PORT. THIS ALLOCATION SHOULD NOT * +-* BE AUTOMATIC, BUT MAY OCCUR UPON APPLICATION BY AN INTERESTED * +-* PARTY WHOSE APPLICATION WOULD OTHERWISE FIT IANA'S POLICIES. * +-* * +-* 1. UNASSIGNED PORT NUMBERS SHOULD NOT BE USED. THE IANA WILL ASSIGN * +-* THE NUMBER FOR THE PORT AFTER YOUR APPLICATION HAS BEEN APPROVED. * +-* * +-* 2. ASSIGNMENT OF A PORT NUMBER DOES NOT IN ANY WAY IMPLY AN * +-* ENDORSEMENT OF AN APPLICATION OR PRODUCT, AND THE FACT THAT NETWORK * +-* TRAFFIC IS FLOWING TO OR FROM A REGISTERED PORT DOES NOT MEAN THAT * +-* IT IS "GOOD" TRAFFIC. FIREWALL AND SYSTEM ADMINISTRATORS SHOULD * +-* CHOOSE HOW TO CONFIGURE THEIR SYSTEMS BASED ON THEIR KNOWLEDGE OF * +-* THE TRAFFIC IN QUESTION, NOT WHETHER THERE IS A PORT NUMBER * +-* REGISTERED OR NOT. * +-************************************************************************ +- +- +-WELL KNOWN PORT NUMBERS +- +-The Well Known Ports are assigned by the IANA and on most systems can +-only be used by system (or root) processes or by programs executed by +-privileged users. +- +-Ports are used in the TCP [RFC793] to name the ends of logical +-connections which carry long term conversations. For the purpose of +-providing services to unknown callers, a service contact port is +-defined. This list specifies the port used by the server process as +-its contact port. The contact port is sometimes called the +-"well-known port". +- +-To the extent possible, these same port assignments are used with the +-UDP [RFC768]. +- +-The range for assigned ports managed by the IANA is 0-1023. +- +-Port Assignments: +- +-Keyword Decimal Description References +-------- ------- ----------- ---------- +- 0/tcp Reserved +- 0/udp Reserved +-# Jon Postel <postel&isi.edu> +-spr-itunes 0/tcp Shirt Pocket netTunes +-spl-itunes 0/tcp Shirt Pocket launchTunes +-# David Nanian <dnanian&shirt-pocket.com> 28 September 2007 +-tcpmux 1/tcp TCP Port Service Multiplexer +-tcpmux 1/udp TCP Port Service Multiplexer +-# Mark Lottor <MKL&nisc.sri.com> +-compressnet 2/tcp Management Utility +-compressnet 2/udp Management Utility +-compressnet 3/tcp Compression Process +-compressnet 3/udp Compression Process +-# Bernie Volz <volz&cisco.com> +-# 4/tcp Unassigned +-# 4/udp Unassigned +-rje 5/tcp Remote Job Entry +-rje 5/udp Remote Job Entry +-# Jon Postel <postel&isi.edu> +-# 6/tcp Unassigned +-# 6/udp Unassigned +-echo 7/tcp Echo +-echo 7/udp Echo +-# Jon Postel <postel&isi.edu> +-# 8/tcp Unassigned +-# 8/udp Unassigned +-discard 9/tcp Discard +-discard 9/udp Discard +-# Jon Postel <postel&isi.edu> +-discard 9/sctp Discard +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-discard 9/dccp Discard SC:DISC +-# IETF dccp WG, Eddie Kohler <kohler&cs.ucla.edu>, [RFC4340] +-# 10/tcp Unassigned +-# 10/udp Unassigned +-systat 11/tcp Active Users +-systat 11/udp Active Users +-# Jon Postel <postel&isi.edu> +-# 12/tcp Unassigned +-# 12/udp Unassigned +-daytime 13/tcp Daytime (RFC 867) +-daytime 13/udp Daytime (RFC 867) +-# Jon Postel <postel&isi.edu> +-# 14/tcp Unassigned +-# 14/udp Unassigned +-# 15/tcp Unassigned [was netstat] +-# 15/udp Unassigned +-# 16/tcp Unassigned +-# 16/udp Unassigned +-qotd 17/tcp Quote of the Day +-qotd 17/udp Quote of the Day +-# Jon Postel <postel&isi.edu> +-msp 18/tcp Message Send Protocol +-msp 18/udp Message Send Protocol +-# Rina Nethaniel <---none---> +-chargen 19/tcp Character Generator +-chargen 19/udp Character Generator +-ftp-data 20/tcp File Transfer [Default Data] +-ftp-data 20/udp File Transfer [Default Data] +-# Jon Postel <postel&isi.edu> +-ftp-data 20/sctp FTP +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-ftp 21/tcp File Transfer [Control] +-ftp 21/udp File Transfer [Control] +-# Jon Postel <postel&isi.edu> +-ftp 21/sctp FTP +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-ssh 22/tcp SSH Remote Login Protocol +-ssh 22/udp SSH Remote Login Protocol +-# Tatu Ylonen <ylo&cs.hut.fi> +-ssh 22/sctp SSH +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-telnet 23/tcp Telnet +-telnet 23/udp Telnet +-# Jon Postel <postel&isi.edu> +- 24/tcp any private mail system +- 24/udp any private mail system +-# Rick Adams <rick&UUNET.UU.NET> +-smtp 25/tcp Simple Mail Transfer +-smtp 25/udp Simple Mail Transfer +-# Jon Postel <postel&isi.edu> +-# 26/tcp Unassigned +-# 26/udp Unassigned +-nsw-fe 27/tcp NSW User System FE +-nsw-fe 27/udp NSW User System FE +-# Robert Thomas <BThomas&F.BBN.COM> +-# 28/tcp Unassigned +-# 28/udp Unassigned +-msg-icp 29/tcp MSG ICP +-msg-icp 29/udp MSG ICP +-# Robert Thomas <BThomas&F.BBN.COM> +-# 30/tcp Unassigned +-# 30/udp Unassigned +-msg-auth 31/tcp MSG Authentication +-msg-auth 31/udp MSG Authentication +-# Robert Thomas <BThomas&F.BBN.COM> +-# 32/tcp Unassigned +-# 32/udp Unassigned +-dsp 33/tcp Display Support Protocol +-dsp 33/udp Display Support Protocol +-# Ed Cain <cain&edn-unix.dca.mil> +-# 34/tcp Unassigned +-# 34/udp Unassigned +- 35/tcp any private printer server +- 35/udp any private printer server +-# Jon Postel <postel&isi.edu> +-# 36/tcp Unassigned +-# 36/udp Unassigned +-time 37/tcp Time +-time 37/udp Time +-# Jon Postel <postel&isi.edu> +-rap 38/tcp Route Access Protocol +-rap 38/udp Route Access Protocol +-# Robert Ullmann <ariel&world.std.com> +-rlp 39/tcp Resource Location Protocol +-rlp 39/udp Resource Location Protocol +-# Mike Accetta <MIKE.ACCETTA&CMU-CS-A.EDU> +-# 40/tcp Unassigned +-# 40/udp Unassigned +-graphics 41/tcp Graphics +-graphics 41/udp Graphics +-name 42/tcp Host Name Server +-name 42/udp Host Name Server +-nameserver 42/tcp Host Name Server +-nameserver 42/udp Host Name Server +-nicname 43/tcp Who Is +-nicname 43/udp Who Is +-mpm-flags 44/tcp MPM FLAGS Protocol +-mpm-flags 44/udp MPM FLAGS Protocol +-mpm 45/tcp Message Processing Module [recv] +-mpm 45/udp Message Processing Module [recv] +-mpm-snd 46/tcp MPM [default send] +-mpm-snd 46/udp MPM [default send] +-# Jon Postel <postel&isi.edu> +-ni-ftp 47/tcp NI FTP +-ni-ftp 47/udp NI FTP +-# Steve Kille <S.Kille&isode.com> +-auditd 48/tcp Digital Audit Daemon +-auditd 48/udp Digital Audit Daemon +-# Larry Scott <scott&zk3.dec.com> +-tacacs 49/tcp Login Host Protocol (TACACS) +-tacacs 49/udp Login Host Protocol (TACACS) +-# Pieter Ditmars <pditmars&BBN.COM> +-re-mail-ck 50/tcp Remote Mail Checking Protocol +-re-mail-ck 50/udp Remote Mail Checking Protocol +-# Steve Dorner <s-dorner&UIUC.EDU> +-la-maint 51/tcp IMP Logical Address Maintenance +-la-maint 51/udp IMP Logical Address Maintenance +-# Andy Malis <malis_a&timeplex.com> +-xns-time 52/tcp XNS Time Protocol +-xns-time 52/udp XNS Time Protocol +-# Susie Armstrong <Armstrong.wbst128@XEROX> +-domain 53/tcp Domain Name Server +-domain 53/udp Domain Name Server +-# Paul Mockapetris <PVM&ISI.EDU> +-xns-ch 54/tcp XNS Clearinghouse +-xns-ch 54/udp XNS Clearinghouse +-# Susie Armstrong <Armstrong.wbst128@XEROX> +-isi-gl 55/tcp ISI Graphics Language +-isi-gl 55/udp ISI Graphics Language +-xns-auth 56/tcp XNS Authentication +-xns-auth 56/udp XNS Authentication +-# Susie Armstrong <Armstrong.wbst128@XEROX> +- 57/tcp any private terminal access +- 57/udp any private terminal access +-# Jon Postel <postel&isi.edu> +-xns-mail 58/tcp XNS Mail +-xns-mail 58/udp XNS Mail +-# Susie Armstrong <Armstrong.wbst128@XEROX> +- 59/tcp any private file service +- 59/udp any private file service +-# Jon Postel <postel&isi.edu> +- 60/tcp Unassigned +- 60/udp Unassigned +-ni-mail 61/tcp NI MAIL +-ni-mail 61/udp NI MAIL +-# Steve Kille <S.Kille&isode.com> +-acas 62/tcp ACA Services +-acas 62/udp ACA Services +-# E. Wald <ewald&via.enet.dec.com> +-whois++ 63/tcp whois++ +-whois++ 63/udp whois++ +-# Rickard Schoultz <schoultz&sunet.se> +-covia 64/tcp Communications Integrator (CI) +-covia 64/udp Communications Integrator (CI) +-# Dan Smith <dan.smith&den.galileo.com> +-tacacs-ds 65/tcp TACACS-Database Service +-tacacs-ds 65/udp TACACS-Database Service +-# Kathy Huber <khuber&bbn.com> +-sql*net 66/tcp Oracle SQL*NET +-sql*net 66/udp Oracle SQL*NET +-# Jack Haverty <jhaverty&ORACLE.COM> +-bootps 67/tcp Bootstrap Protocol Server +-bootps 67/udp Bootstrap Protocol Server +-bootpc 68/tcp Bootstrap Protocol Client +-bootpc 68/udp Bootstrap Protocol Client +-# Bill Croft <Croft&SUMEX-AIM.STANFORD.EDU> +-tftp 69/tcp Trivial File Transfer +-tftp 69/udp Trivial File Transfer +-# David Clark <ddc&LCS.MIT.EDU> +-gopher 70/tcp Gopher +-gopher 70/udp Gopher +-# Mark McCahill <mpm&boombox.micro.umn.edu> +-netrjs-1 71/tcp Remote Job Service +-netrjs-1 71/udp Remote Job Service +-netrjs-2 72/tcp Remote Job Service +-netrjs-2 72/udp Remote Job Service +-netrjs-3 73/tcp Remote Job Service +-netrjs-3 73/udp Remote Job Service +-netrjs-4 74/tcp Remote Job Service +-netrjs-4 74/udp Remote Job Service +-# Bob Braden <Braden&ISI.EDU> +- 75/tcp any private dial out service +- 75/udp any private dial out service +-# Jon Postel <postel&isi.edu> +-deos 76/tcp Distributed External Object Store +-deos 76/udp Distributed External Object Store +-# Robert Ullmann <ariel&world.std.com> +- 77/tcp any private RJE service +- 77/udp any private RJE service +-# Jon Postel <postel&isi.edu> +-vettcp 78/tcp vettcp +-vettcp 78/udp vettcp +-# Christopher Leong <leong&kolmod.mlo.dec.com> +-finger 79/tcp Finger +-finger 79/udp Finger +-# David Zimmerman <dpz&RUTGERS.EDU> +-http 80/tcp World Wide Web HTTP +-http 80/udp World Wide Web HTTP +-www 80/tcp World Wide Web HTTP +-www 80/udp World Wide Web HTTP +-www-http 80/tcp World Wide Web HTTP +-www-http 80/udp World Wide Web HTTP +-# Tim Berners-Lee <timbl&W3.org> +-http 80/sctp HTTP +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-# 81 Unassigned (Removed on 2007-09-06) +-xfer 82/tcp XFER Utility +-xfer 82/udp XFER Utility +-# Thomas M. Smith <Thomas.M.Smith&lmco.com> +-mit-ml-dev 83/tcp MIT ML Device +-mit-ml-dev 83/udp MIT ML Device +-# David Reed <--none---> +-ctf 84/tcp Common Trace Facility +-ctf 84/udp Common Trace Facility +-# Hugh Thomas <thomas&oils.enet.dec.com> +-mit-ml-dev 85/tcp MIT ML Device +-mit-ml-dev 85/udp MIT ML Device +-# David Reed <--none---> +-mfcobol 86/tcp Micro Focus Cobol +-mfcobol 86/udp Micro Focus Cobol +-# Simon Edwards <--none---> +- 87/tcp any private terminal link +- 87/udp any private terminal link +-# Jon Postel <postel&isi.edu> +-kerberos 88/tcp Kerberos +-kerberos 88/udp Kerberos +-# B. Clifford Neuman <bcn&isi.edu> +-su-mit-tg 89/tcp SU/MIT Telnet Gateway +-su-mit-tg 89/udp SU/MIT Telnet Gateway +-# Mark Crispin <MRC&PANDA.COM> +-########### PORT 90 also being used unofficially by Pointcast ######### +-dnsix 90/tcp DNSIX Securit Attribute Token Map +-dnsix 90/udp DNSIX Securit Attribute Token Map +-# Charles Watt <watt&sware.com> +-mit-dov 91/tcp MIT Dover Spooler +-mit-dov 91/udp MIT Dover Spooler +-# Eliot Moss <EBM&XX.LCS.MIT.EDU> +-npp 92/tcp Network Printing Protocol +-npp 92/udp Network Printing Protocol +-# Louis Mamakos <louie&sayshell.umd.edu> +-dcp 93/tcp Device Control Protocol +-dcp 93/udp Device Control Protocol +-# Daniel Tappan <Tappan&BBN.COM> +-objcall 94/tcp Tivoli Object Dispatcher +-objcall 94/udp Tivoli Object Dispatcher +-# Tom Bereiter <--none---> +-supdup 95/tcp SUPDUP +-supdup 95/udp SUPDUP +-# Mark Crispin <MRC&PANDA.COM> +-dixie 96/tcp DIXIE Protocol Specification +-dixie 96/udp DIXIE Protocol Specification +-# Tim Howes <Tim.Howes&terminator.cc.umich.edu> +-swift-rvf 97/tcp Swift Remote Virtural File Protocol +-swift-rvf 97/udp Swift Remote Virtural File Protocol +-# Maurice R. Turcotte +-# <mailrus!uflorida!rm1!dnmrt%rmatl&uunet.UU.NET> +-tacnews 98/tcp TAC News +-tacnews 98/udp TAC News +-# Jon Postel <postel&isi.edu> +-metagram 99/tcp Metagram Relay +-metagram 99/udp Metagram Relay +-# Geoff Goodfellow <Geoff&FERNWOOD.MPK.CA.US> +-newacct 100/tcp [unauthorized use] +-hostname 101/tcp NIC Host Name Server +-hostname 101/udp NIC Host Name Server +-# Jon Postel <postel&isi.edu> +-iso-tsap 102/tcp ISO-TSAP Class 0 +-iso-tsap 102/udp ISO-TSAP Class 0 +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-gppitnp 103/tcp Genesis Point-to-Point Trans Net +-gppitnp 103/udp Genesis Point-to-Point Trans Net +-acr-nema 104/tcp ACR-NEMA Digital Imag. & Comm. 300 +-acr-nema 104/udp ACR-NEMA Digital Imag. & Comm. 300 +-# Patrick McNamee <--none---> +-cso 105/tcp CCSO name server protocol +-cso 105/udp CCSO name server protocol +-# Martin Hamilton <martin&mrrl.lut.as.uk> +-csnet-ns 105/tcp Mailbox Name Nameserver +-csnet-ns 105/udp Mailbox Name Nameserver +-# Marvin Solomon <solomon&CS.WISC.EDU> +-3com-tsmux 106/tcp 3COM-TSMUX +-3com-tsmux 106/udp 3COM-TSMUX +-# Jeremy Siegel <jzs&NSD.3Com.COM> +-########## 106 Unauthorized use by insecure poppassd protocol +-rtelnet 107/tcp Remote Telnet Service +-rtelnet 107/udp Remote Telnet Service +-# Jon Postel <postel&isi.edu> +-snagas 108/tcp SNA Gateway Access Server +-snagas 108/udp SNA Gateway Access Server +-# Kevin Murphy <murphy&sevens.lkg.dec.com> +-pop2 109/tcp Post Office Protocol - Version 2 +-pop2 109/udp Post Office Protocol - Version 2 +-# Joyce K. Reynolds <jkrey&isi.edu> +-pop3 110/tcp Post Office Protocol - Version 3 +-pop3 110/udp Post Office Protocol - Version 3 +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-sunrpc 111/tcp SUN Remote Procedure Call +-sunrpc 111/udp SUN Remote Procedure Call +-# Chuck McManis <cmcmanis&freegate.net> +-mcidas 112/tcp McIDAS Data Transmission Protocol +-mcidas 112/udp McIDAS Data Transmission Protocol +-# Glenn Davis <support&unidata.ucar.edu> +-ident 113/tcp +-auth 113/tcp Authentication Service +-auth 113/udp Authentication Service +-# Mike St. Johns <stjohns&arpa.mil> +-# 114 Deprecated June 2004 +-sftp 115/tcp Simple File Transfer Protocol +-sftp 115/udp Simple File Transfer Protocol +-# Mark Lottor <MKL&nisc.sri.com> +-ansanotify 116/tcp ANSA REX Notify +-ansanotify 116/udp ANSA REX Notify +-# Nicola J. Howarth <njh&ansa.co.uk> +-uucp-path 117/tcp UUCP Path Service +-uucp-path 117/udp UUCP Path Service +-sqlserv 118/tcp SQL Services +-sqlserv 118/udp SQL Services +-# Larry Barnes <barnes&broke.enet.dec.com> +-nntp 119/tcp Network News Transfer Protocol +-nntp 119/udp Network News Transfer Protocol +-# Phil Lapsley <phil&UCBARPA.BERKELEY.EDU> +-cfdptkt 120/tcp CFDPTKT +-cfdptkt 120/udp CFDPTKT +-# John Ioannidis <ji&close.cs.columbia.ed> +-erpc 121/tcp Encore Expedited Remote Pro.Call +-erpc 121/udp Encore Expedited Remote Pro.Call +-# Jack O'Neil <---none---> +-smakynet 122/tcp SMAKYNET +-smakynet 122/udp SMAKYNET +-# Pierre Arnaud <pierre.arnaud&iname.com> +-ntp 123/tcp Network Time Protocol +-ntp 123/udp Network Time Protocol +-# Dave Mills <Mills&HUEY.UDEL.EDU> +-ansatrader 124/tcp ANSA REX Trader +-ansatrader 124/udp ANSA REX Trader +-# Nicola J. Howarth <njh&ansa.co.uk> +-locus-map 125/tcp Locus PC-Interface Net Map Ser +-locus-map 125/udp Locus PC-Interface Net Map Ser +-# Eric Peterson <lcc.eric&SEAS.UCLA.EDU> +-nxedit 126/tcp NXEdit +-nxedit 126/udp NXEdit +-# Don Payette <Don.Payette&unisys.com> +-###########Port 126 Previously assigned to application below####### +-#unitary 126/tcp Unisys Unitary Login +-#unitary 126/udp Unisys Unitary Login +-# <feil&kronos.nisd.cam.unisys.com> +-###########Port 126 Previously assigned to application above####### +-locus-con 127/tcp Locus PC-Interface Conn Server +-locus-con 127/udp Locus PC-Interface Conn Server +-# Eric Peterson <lcc.eric&SEAS.UCLA.EDU> +-gss-xlicen 128/tcp GSS X License Verification +-gss-xlicen 128/udp GSS X License Verification +-# John Light <johnl&gssc.gss.com> +-pwdgen 129/tcp Password Generator Protocol +-pwdgen 129/udp Password Generator Protocol +-# Frank J. Wacho <WANCHO&WSMR-SIMTEL20.ARMY.MIL> +-cisco-fna 130/tcp cisco FNATIVE +-cisco-fna 130/udp cisco FNATIVE +-cisco-tna 131/tcp cisco TNATIVE +-cisco-tna 131/udp cisco TNATIVE +-cisco-sys 132/tcp cisco SYSMAINT +-cisco-sys 132/udp cisco SYSMAINT +-statsrv 133/tcp Statistics Service +-statsrv 133/udp Statistics Service +-# Dave Mills <Mills&HUEY.UDEL.EDU> +-ingres-net 134/tcp INGRES-NET Service +-ingres-net 134/udp INGRES-NET Service +-# Mike Berrow <---none---> +-epmap 135/tcp DCE endpoint resolution +-epmap 135/udp DCE endpoint resolution +-# Joe Pato <pato&apollo.hp.com> +-profile 136/tcp PROFILE Naming System +-profile 136/udp PROFILE Naming System +-# Larry Peterson <llp&ARIZONA.EDU> +-netbios-ns 137/tcp NETBIOS Name Service +-netbios-ns 137/udp NETBIOS Name Service +-netbios-dgm 138/tcp NETBIOS Datagram Service +-netbios-dgm 138/udp NETBIOS Datagram Service +-netbios-ssn 139/tcp NETBIOS Session Service +-netbios-ssn 139/udp NETBIOS Session Service +-# Jon Postel <postel&isi.edu> +-emfis-data 140/tcp EMFIS Data Service +-emfis-data 140/udp EMFIS Data Service +-emfis-cntl 141/tcp EMFIS Control Service +-emfis-cntl 141/udp EMFIS Control Service +-# Gerd Beling <GBELING&ISI.EDU> +-bl-idm 142/tcp Britton-Lee IDM +-bl-idm 142/udp Britton-Lee IDM +-# Susie Snitzer <---none---> +-imap 143/tcp Internet Message Access Protocol +-imap 143/udp Internet Message Access Protocol +-# Mark Crispin <MRC&CAC.Washington.EDU> +-uma 144/tcp Universal Management Architecture +-uma 144/udp Universal Management Architecture +-# Jay Whitney <jw&powercenter.com> +-uaac 145/tcp UAAC Protocol +-uaac 145/udp UAAC Protocol +-# David A. Gomberg <gomberg&GATEWAY.MITRE.ORG> +-iso-tp0 146/tcp ISO-IP0 +-iso-tp0 146/udp ISO-IP0 +-iso-ip 147/tcp ISO-IP +-iso-ip 147/udp ISO-IP +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-jargon 148/tcp Jargon +-jargon 148/udp Jargon +-# Bill Weinman <wew&bearnet.com> +-aed-512 149/tcp AED 512 Emulation Service +-aed-512 149/udp AED 512 Emulation Service +-# Albert G. Broscius <broscius&DSL.CIS.UPENN.EDU> +-sql-net 150/tcp SQL-NET +-sql-net 150/udp SQL-NET +-# Martin Picard <<---none---> +-hems 151/tcp HEMS +-hems 151/udp HEMS +-bftp 152/tcp Background File Transfer Program +-bftp 152/udp Background File Transfer Program +-# Annette DeSchon <DESCHON&ISI.EDU> +-sgmp 153/tcp SGMP +-sgmp 153/udp SGMP +-# Marty Schoffstahl <schoff&NISC.NYSER.NET> +-netsc-prod 154/tcp NETSC +-netsc-prod 154/udp NETSC +-netsc-dev 155/tcp NETSC +-netsc-dev 155/udp NETSC +-# Sergio Heker <heker&JVNCC.CSC.ORG> +-sqlsrv 156/tcp SQL Service +-sqlsrv 156/udp SQL Service +-# Craig Rogers <Rogers&ISI.EDU> +-knet-cmp 157/tcp KNET/VM Command/Message Protocol +-knet-cmp 157/udp KNET/VM Command/Message Protocol +-# Gary S. Malkin <GMALKIN&XYLOGICS.COM> +-pcmail-srv 158/tcp PCMail Server +-pcmail-srv 158/udp PCMail Server +-# Mark L. Lambert <markl&PTT.LCS.MIT.EDU> +-nss-routing 159/tcp NSS-Routing +-nss-routing 159/udp NSS-Routing +-# Yakov Rekhter <Yakov&IBM.COM> +-sgmp-traps 160/tcp SGMP-TRAPS +-sgmp-traps 160/udp SGMP-TRAPS +-# Marty Schoffstahl <schoff&NISC.NYSER.NET> +-snmp 161/tcp SNMP +-snmp 161/udp SNMP +-snmptrap 162/tcp SNMPTRAP +-snmptrap 162/udp SNMPTRAP +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-cmip-man 163/tcp CMIP/TCP Manager +-cmip-man 163/udp CMIP/TCP Manager +-cmip-agent 164/tcp CMIP/TCP Agent +-cmip-agent 164/udp CMIP/TCP Agent +-# Amatzia Ben-Artzi <---none---> +-xns-courier 165/tcp Xerox +-xns-courier 165/udp Xerox +-# Susie Armstrong <Armstrong.wbst128&XEROX.COM> +-s-net 166/tcp Sirius Systems +-s-net 166/udp Sirius Systems +-# Brian Lloyd <brian&lloyd.com> +-namp 167/tcp NAMP +-namp 167/udp NAMP +-# Marty Schoffstahl <schoff&NISC.NYSER.NET> +-rsvd 168/tcp RSVD +-rsvd 168/udp RSVD +-# Neil Todd <mcvax!ist.co.uk!neil&UUNET.UU.NET> +-send 169/tcp SEND +-send 169/udp SEND +-# William D. Wisner <wisner&HAYES.FAI.ALASKA.EDU> +-print-srv 170/tcp Network PostScript +-print-srv 170/udp Network PostScript +-# Brian Reid <reid&DECWRL.DEC.COM> +-multiplex 171/tcp Network Innovations Multiplex +-multiplex 171/udp Network Innovations Multiplex +-cl/1 172/tcp Network Innovations CL/1 +-cl/1 172/udp Network Innovations CL/1 +-# Kevin DeVault <<---none---> +-xyplex-mux 173/tcp Xyplex +-xyplex-mux 173/udp Xyplex +-# Bob Stewart <STEWART&XYPLEX.COM> +-mailq 174/tcp MAILQ +-mailq 174/udp MAILQ +-# Rayan Zachariassen <rayan&AI.TORONTO.EDU> +-vmnet 175/tcp VMNET +-vmnet 175/udp VMNET +-# Christopher Tengi <tengi&Princeton.EDU> +-genrad-mux 176/tcp GENRAD-MUX +-genrad-mux 176/udp GENRAD-MUX +-# Ron Thornton <thornton&qm7501.genrad.com> +-xdmcp 177/tcp X Display Manager Control Protocol +-xdmcp 177/udp X Display Manager Control Protocol +-# Robert W. Scheifler <RWS&XX.LCS.MIT.EDU> +-nextstep 178/tcp NextStep Window Server +-nextstep 178/udp NextStep Window Server +-# Leo Hourvitz <leo&NEXT.COM> +-bgp 179/tcp Border Gateway Protocol +-bgp 179/udp Border Gateway Protocol +-# Kirk Lougheed <LOUGHEED&MATHOM.CISCO.COM> +-bgp 179/sctp BGP +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-ris 180/tcp Intergraph +-ris 180/udp Intergraph +-# Dave Buehmann <ingr!daveb&UUNET.UU.NET> +-unify 181/tcp Unify +-unify 181/udp Unify +-# Mark Ainsley <ianaportmaster&unify.com> +-audit 182/tcp Unisys Audit SITP +-audit 182/udp Unisys Audit SITP +-# Gil Greenbaum <gcole&nisd.cam.unisys.com> +-ocbinder 183/tcp OCBinder +-ocbinder 183/udp OCBinder +-ocserver 184/tcp OCServer +-ocserver 184/udp OCServer +-# Jerrilynn Okamura <--none---> +-remote-kis 185/tcp Remote-KIS +-remote-kis 185/udp Remote-KIS +-kis 186/tcp KIS Protocol +-kis 186/udp KIS Protocol +-# Ralph Droms <rdroms&NRI.RESTON.VA.US> +-aci 187/tcp Application Communication Interface +-aci 187/udp Application Communication Interface +-# Rick Carlos <rick.ticipa.csc.ti.com> +-mumps 188/tcp Plus Five's MUMPS +-mumps 188/udp Plus Five's MUMPS +-# Hokey Stenn <hokey&PLUS5.COM> +-qft 189/tcp Queued File Transport +-qft 189/udp Queued File Transport +-# Wayne Schroeder <schroeder&SDS.SDSC.EDU> +-gacp 190/tcp Gateway Access Control Protocol +-gacp 190/udp Gateway Access Control Protocol +-# C. Philip Wood <cpw&LANL.GOV> +-prospero 191/tcp Prospero Directory Service +-prospero 191/udp Prospero Directory Service +-# B. Clifford Neuman <bcn&isi.edu> +-osu-nms 192/tcp OSU Network Monitoring System +-osu-nms 192/udp OSU Network Monitoring System +-# Doug Karl <KARL-D&OSU-20.IRCC.OHIO-STATE.EDU> +-srmp 193/tcp Spider Remote Monitoring Protocol +-srmp 193/udp Spider Remote Monitoring Protocol +-# Ted J. Socolofsky <Teds&SPIDER.CO.UK> +-irc 194/tcp Internet Relay Chat Protocol +-irc 194/udp Internet Relay Chat Protocol +-# Jarkko Oikarinen <jto&TOLSUN.OULU.FI> +-dn6-nlm-aud 195/tcp DNSIX Network Level Module Audit +-dn6-nlm-aud 195/udp DNSIX Network Level Module Audit +-dn6-smm-red 196/tcp DNSIX Session Mgt Module Audit Redir +-dn6-smm-red 196/udp DNSIX Session Mgt Module Audit Redir +-# Lawrence Lebahn <DIA3&PAXRV-NES.NAVY.MIL> +-dls 197/tcp Directory Location Service +-dls 197/udp Directory Location Service +-dls-mon 198/tcp Directory Location Service Monitor +-dls-mon 198/udp Directory Location Service Monitor +-# Scott Bellew <smb&cs.purdue.edu> +-smux 199/tcp SMUX +-smux 199/udp SMUX +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-src 200/tcp IBM System Resource Controller +-src 200/udp IBM System Resource Controller +-# Gerald McBrearty <---none---> +-at-rtmp 201/tcp AppleTalk Routing Maintenance +-at-rtmp 201/udp AppleTalk Routing Maintenance +-at-nbp 202/tcp AppleTalk Name Binding +-at-nbp 202/udp AppleTalk Name Binding +-at-3 203/tcp AppleTalk Unused +-at-3 203/udp AppleTalk Unused +-at-echo 204/tcp AppleTalk Echo +-at-echo 204/udp AppleTalk Echo +-at-5 205/tcp AppleTalk Unused +-at-5 205/udp AppleTalk Unused +-at-zis 206/tcp AppleTalk Zone Information +-at-zis 206/udp AppleTalk Zone Information +-at-7 207/tcp AppleTalk Unused +-at-7 207/udp AppleTalk Unused +-at-8 208/tcp AppleTalk Unused +-at-8 208/udp AppleTalk Unused +-# Rob Chandhok <chandhok&gnome.cs.cmu.edu> +-qmtp 209/tcp The Quick Mail Transfer Protocol +-qmtp 209/udp The Quick Mail Transfer Protocol +-# Dan Bernstein <djb&silverton.berkeley.edu> +-z39.50 210/tcp ANSI Z39.50 +-z39.50 210/udp ANSI Z39.50 +-# Mark H. Needleman <markn&sirsi.com> +-914c/g 211/tcp Texas Instruments 914C/G Terminal +-914c/g 211/udp Texas Instruments 914C/G Terminal +-# Bill Harrell <---none---> +-anet 212/tcp ATEXSSTR +-anet 212/udp ATEXSSTR +-# Jim Taylor <taylor&heart.epps.kodak.com> +-ipx 213/tcp IPX +-ipx 213/udp IPX +-# Don Provan <donp&xlnvax.novell.com> +-vmpwscs 214/tcp VM PWSCS +-vmpwscs 214/udp VM PWSCS +-# Dan Shia <dset!shia&uunet.UU.NET> +-softpc 215/tcp Insignia Solutions +-softpc 215/udp Insignia Solutions +-# Martyn Thomas <---none---> +-CAIlic 216/tcp Computer Associates Int'l License Server +-CAIlic 216/udp Computer Associates Int'l License Server +-# Chuck Spitz <spich04&cai.com> +-dbase 217/tcp dBASE Unix +-dbase 217/udp dBASE Unix +-# Don Gibson +-# <sequent!aero!twinsun!ashtate.A-T.COM!dong&uunet.UU.NET> +-mpp 218/tcp Netix Message Posting Protocol +-mpp 218/udp Netix Message Posting Protocol +-# Shannon Yeh <yeh&netix.com> +-uarps 219/tcp Unisys ARPs +-uarps 219/udp Unisys ARPs +-# Ashok Marwaha <---none---> +-imap3 220/tcp Interactive Mail Access Protocol v3 +-imap3 220/udp Interactive Mail Access Protocol v3 +-# James Rice <RICE&SUMEX-AIM.STANFORD.EDU> +-fln-spx 221/tcp Berkeley rlogind with SPX auth +-fln-spx 221/udp Berkeley rlogind with SPX auth +-rsh-spx 222/tcp Berkeley rshd with SPX auth +-rsh-spx 222/udp Berkeley rshd with SPX auth +-cdc 223/tcp Certificate Distribution Center +-cdc 223/udp Certificate Distribution Center +-# Kannan Alagappan <kannan&sejour.enet.dec.com> +-########### Possible Conflict of Port 222 with "Masqdialer"############## +-### Contact for Masqdialer is Charles Wright <cpwright&villagenet.com>### +-masqdialer 224/tcp masqdialer +-masqdialer 224/udp masqdialer +-# Charles Wright <cpwright&villagenet.com> +-# 225-241 Reserved +-# Jon Postel <postel&isi.edu> +-direct 242/tcp Direct +-direct 242/udp Direct +-# Herb Sutter <HerbS&cntc.com> +-sur-meas 243/tcp Survey Measurement +-sur-meas 243/udp Survey Measurement +-# Dave Clark <ddc&LCS.MIT.EDU> +-inbusiness 244/tcp inbusiness +-inbusiness 244/udp inbusiness +-# Derrick Hisatake <derrick.i.hisatake&intel.com> +-link 245/tcp LINK +-link 245/udp LINK +-dsp3270 246/tcp Display Systems Protocol +-dsp3270 246/udp Display Systems Protocol +-# Weldon J. Showalter <Gamma&MINTAKA.DCA.MIL> +-subntbcst_tftp 247/tcp SUBNTBCST_TFTP +-subntbcst_tftp 247/udp SUBNTBCST_TFTP +-# John Fake <fake&us.ibm.com> +-bhfhs 248/tcp bhfhs +-bhfhs 248/udp bhfhs +-# John Kelly <johnk&bellhow.com> +-# 249-255 Reserved +-# Jon Postel <postel&isi.edu> +-rap 256/tcp RAP +-rap 256/udp RAP +-# J.S. Greenfield <greeny&raleigh.ibm.com> +-set 257/tcp Secure Electronic Transaction +-set 257/udp Secure Electronic Transaction +-# Donald Eastlake <dee3&torque.pothole.com> +-# 258 Unassigned (Removed 2006-09-13) +-esro-gen 259/tcp Efficient Short Remote Operations +-esro-gen 259/udp Efficient Short Remote Operations +-# Mohsen Banan <mohsen&rostam.neda.com> +-openport 260/tcp Openport +-openport 260/udp Openport +-# John Marland <jmarland&dean.openport.com> +-nsiiops 261/tcp IIOP Name Service over TLS/SSL +-nsiiops 261/udp IIOP Name Service over TLS/SSL +-# Jeff Stewart <jstewart&netscape.com> +-arcisdms 262/tcp Arcisdms +-arcisdms 262/udp Arcisdms +-# Russell Crook (rmc&sni.ca> +-hdap 263/tcp HDAP +-hdap 263/udp HDAP +-# Troy Gau <troy&zyxel.com> +-bgmp 264/tcp BGMP +-bgmp 264/udp BGMP +-# Dave Thaler <thalerd&eecs.umich.edu> +-x-bone-ctl 265/tcp X-Bone CTL +-x-bone-ctl 265/udp X-Bone CTL +-# Joe Touch <touch&isi.edu> +-sst 266/tcp SCSI on ST +-sst 266/udp SCSI on ST +-# Donald D. Woelz <don&genroco.com> +-td-service 267/tcp Tobit David Service Layer +-td-service 267/udp Tobit David Service Layer +-td-replica 268/tcp Tobit David Replica +-td-replica 268/udp Tobit David Replica +-# Franz-Josef Leuders <development&tobit.com> +-manet 269/tcp MANET Protocols +-manet 269/udp MANET Protocols [RFC-ietf-manet-iana-07.txt] +-# 270-279 Unassigned +-http-mgmt 280/tcp http-mgmt +-http-mgmt 280/udp http-mgmt +-# Adrian Pell +-# <PELL_ADRIAN/HP-UnitedKingdom_om6&hplb.hpl.hp.com> +-personal-link 281/tcp Personal Link +-personal-link 281/udp Personal Link +-# Dan Cummings <doc&cnr.com> +-cableport-ax 282/tcp Cable Port A/X +-cableport-ax 282/udp Cable Port A/X +-# Craig Langfahl <Craig_J_Langfahl&ccm.ch.intel.com> +-rescap 283/tcp rescap +-rescap 283/udp rescap +-# Paul Hoffman <phoffman&imc.org> +-corerjd 284/tcp corerjd +-corerjd 284/udp corerjd +-# Chris Thornhill <port_contact&cjt.ca> +-# 285 Unassigned +-fxp 286/tcp FXP Communication +-fxp 286/udp FXP Communication +-# James Darnall <james_r_darnall&sbcglobal.net> +-k-block 287/tcp K-BLOCK +-k-block 287/udp K-BLOCK +-# Simon P Jackson <jacko&kring.co.uk> +-# 288-307 Unassigned +-novastorbakcup 308/tcp Novastor Backup +-novastorbakcup 308/udp Novastor Backup +-# Brian Dickman <brian&novastor.com> +-entrusttime 309/tcp EntrustTime +-entrusttime 309/udp EntrustTime +-# Peter Whittaker <pww&entrust.com> +-bhmds 310/tcp bhmds +-bhmds 310/udp bhmds +-# John Kelly <johnk&bellhow.com> +-asip-webadmin 311/tcp AppleShare IP WebAdmin +-asip-webadmin 311/udp AppleShare IP WebAdmin +-# Ann Huang <annhuang&apple.com> +-vslmp 312/tcp VSLMP +-vslmp 312/udp VSLMP +-# Gerben Wierda <Gerben_Wierda&RnA.nl> +-magenta-logic 313/tcp Magenta Logic +-magenta-logic 313/udp Magenta Logic +-# Karl Rousseau <kr&netfusion.co.uk> +-opalis-robot 314/tcp Opalis Robot +-opalis-robot 314/udp Opalis Robot +-# Laurent Domenech, Opalis <ldomenech&opalis.com> +-dpsi 315/tcp DPSI +-dpsi 315/udp DPSI +-# Tony Scamurra <Tony&DesktopPaging.com> +-decauth 316/tcp decAuth +-decauth 316/udp decAuth +-# Michael Agishtein <misha&unx.dec.com> +-zannet 317/tcp Zannet +-zannet 317/udp Zannet +-# Zan Oliphant <zan&accessone.com> +-pkix-timestamp 318/tcp PKIX TimeStamp +-pkix-timestamp 318/udp PKIX TimeStamp +-# Robert Zuccherato <robert.zuccherato&entrust.com> +-ptp-event 319/tcp PTP Event +-ptp-event 319/udp PTP Event +-ptp-general 320/tcp PTP General +-ptp-general 320/udp PTP General +-# John Eidson <eidson&hpl.hp.com> +-pip 321/tcp PIP +-pip 321/udp PIP +-# Gordon Mohr <gojomo&usa.net> +-rtsps 322/tcp RTSPS +-rtsps 322/udp RTSPS +-# Anders Klemets <andersklµsoft.com> +-# 323-332 Unassigned +-texar 333/tcp Texar Security Port +-texar 333/udp Texar Security Port +-# Eugen Bacic <ebacic&texar.com> +-# 334-343 Unassigned +-pdap 344/tcp Prospero Data Access Protocol +-pdap 344/udp Prospero Data Access Protocol +-# B. Clifford Neuman <bcn&isi.edu> +-pawserv 345/tcp Perf Analysis Workbench +-pawserv 345/udp Perf Analysis Workbench +-zserv 346/tcp Zebra server +-zserv 346/udp Zebra server +-fatserv 347/tcp Fatmen Server +-fatserv 347/udp Fatmen Server +-csi-sgwp 348/tcp Cabletron Management Protocol +-csi-sgwp 348/udp Cabletron Management Protocol +-mftp 349/tcp mftp +-mftp 349/udp mftp +-# Dave Feinleib <davefeµsoft.com> +-matip-type-a 350/tcp MATIP Type A +-matip-type-a 350/udp MATIP Type A +-matip-type-b 351/tcp MATIP Type B +-matip-type-b 351/udp MATIP Type B +-# Alain Robert <arobert&par.sita.int> +-# The following entry records an unassigned but widespread use +-bhoetty 351/tcp bhoetty (added 5/21/97) +-bhoetty 351/udp bhoetty +-# John Kelly <johnk&bellhow.com> +-dtag-ste-sb 352/tcp DTAG (assigned long ago) +-dtag-ste-sb 352/udp DTAG +-# Ruediger Wald <wald&ez-darmstadt.telekom.de> +-# The following entry records an unassigned but widespread use +-bhoedap4 352/tcp bhoedap4 (added 5/21/97) +-bhoedap4 352/udp bhoedap4 +-# John Kelly <johnk&bellhow.com> +-ndsauth 353/tcp NDSAUTH +-ndsauth 353/udp NDSAUTH +-# Jayakumar Ramalingam <jayakumar&novell.com> +-bh611 354/tcp bh611 +-bh611 354/udp bh611 +-# John Kelly <johnk&bellhow.com> +-datex-asn 355/tcp DATEX-ASN +-datex-asn 355/udp DATEX-ASN +-# Kenneth Vaughn <kvaughn&mail.viggen.com> +-cloanto-net-1 356/tcp Cloanto Net 1 +-cloanto-net-1 356/udp Cloanto Net 1 +-# Michael Battilana <mcb-iana&cloanto.com> +-bhevent 357/tcp bhevent +-bhevent 357/udp bhevent +-# John Kelly <johnk&bellhow.com> +-shrinkwrap 358/tcp Shrinkwrap +-shrinkwrap 358/udp Shrinkwrap +-# Bill Simpson <wsimpson&greendragon.com> +-nsrmp 359/tcp Network Security Risk Management Protocol +-nsrmp 359/udp Network Security Risk Management Protocol +-# Eric Jacksch <jacksch&tenebris.ca> +-scoi2odialog 360/tcp scoi2odialog +-scoi2odialog 360/udp scoi2odialog +-# Keith Petley <keithp&sco.COM> +-semantix 361/tcp Semantix +-semantix 361/udp Semantix +-# Semantix <xsSupport&semantix.com> +-srssend 362/tcp SRS Send +-srssend 362/udp SRS Send +-# Curt Mayer <curt&emergent.com> +-rsvp_tunnel 363/tcp RSVP Tunnel +-rsvp_tunnel 363/udp RSVP Tunnel +-# Andreas Terzis <terzis&cs.ucla.edu> +-aurora-cmgr 364/tcp Aurora CMGR +-aurora-cmgr 364/udp Aurora CMGR +-# Philip Budne <budne&auroratech.com> +-dtk 365/tcp DTK +-dtk 365/udp DTK +-# Fred Cohen <fc&all.net> +-odmr 366/tcp ODMR +-odmr 366/udp ODMR +-# Randall Gellens <randy&qualcomm.com> +-mortgageware 367/tcp MortgageWare +-mortgageware 367/udp MortgageWare +-# Ole Hellevik <oleh&interlinq.com> +-qbikgdp 368/tcp QbikGDP +-qbikgdp 368/udp QbikGDP +-# Adrien de Croy <adrien&qbik.com> +-rpc2portmap 369/tcp rpc2portmap +-rpc2portmap 369/udp rpc2portmap +-codaauth2 370/tcp codaauth2 +-codaauth2 370/udp codaauth2 +-# Robert Watson <robert&cyrus.watson.org> +-clearcase 371/tcp Clearcase +-clearcase 371/udp Clearcase +-# Dave LeBlang <leglang&atria.com> +-ulistproc 372/tcp ListProcessor +-ulistproc 372/udp ListProcessor +-# Anastasios Kotsikonas <tasos&cs.bu.edu> +-legent-1 373/tcp Legent Corporation +-legent-1 373/udp Legent Corporation +-legent-2 374/tcp Legent Corporation +-legent-2 374/udp Legent Corporation +-# Keith Boyce <---none---> +-hassle 375/tcp Hassle +-hassle 375/udp Hassle +-# Reinhard Doelz <doelz&comp.bioz.unibas.ch> +-nip 376/tcp Amiga Envoy Network Inquiry Proto +-nip 376/udp Amiga Envoy Network Inquiry Proto +-# Heinz Wrobel <hwrobel&gmx.de> +-tnETOS 377/tcp NEC Corporation +-tnETOS 377/udp NEC Corporation +-dsETOS 378/tcp NEC Corporation +-dsETOS 378/udp NEC Corporation +-# Tomoo Fujita <tf&arc.bs1.fc.nec.co.jp> +-is99c 379/tcp TIA/EIA/IS-99 modem client +-is99c 379/udp TIA/EIA/IS-99 modem client +-is99s 380/tcp TIA/EIA/IS-99 modem server +-is99s 380/udp TIA/EIA/IS-99 modem server +-# Frank Quick <fquick&qualcomm.com> +-hp-collector 381/tcp hp performance data collector +-hp-collector 381/udp hp performance data collector +-hp-managed-node 382/tcp hp performance data managed node +-hp-managed-node 382/udp hp performance data managed node +-hp-alarm-mgr 383/tcp hp performance data alarm manager +-hp-alarm-mgr 383/udp hp performance data alarm manager +-# Frank Blakely <frankb&hpptc16.rose.hp.com> +-arns 384/tcp A Remote Network Server System +-arns 384/udp A Remote Network Server System +-# David Hornsby <djh&munnari.OZ.AU> +-ibm-app 385/tcp IBM Application +-ibm-app 385/udp IBM Application +-# Lisa Tomita <---none---> +-asa 386/tcp ASA Message Router Object Def. +-asa 386/udp ASA Message Router Object Def. +-# Steve Laitinen <laitinen&brutus.aa.ab.com> +-aurp 387/tcp Appletalk Update-Based Routing Pro. +-aurp 387/udp Appletalk Update-Based Routing Pro. +-# Chris Ranch <cranch&novell.com> +-unidata-ldm 388/tcp Unidata LDM +-unidata-ldm 388/udp Unidata LDM +-# Glenn Davis <support&unidata.ucar.edu> +-ldap 389/tcp Lightweight Directory Access Protocol +-ldap 389/udp Lightweight Directory Access Protocol +-# Tim Howes <Tim.Howes&terminator.cc.umich.edu> +-uis 390/tcp UIS +-uis 390/udp UIS +-# Ed Barron <---none---> +-synotics-relay 391/tcp SynOptics SNMP Relay Port +-synotics-relay 391/udp SynOptics SNMP Relay Port +-synotics-broker 392/tcp SynOptics Port Broker Port +-synotics-broker 392/udp SynOptics Port Broker Port +-# Illan Raab <iraab&synoptics.com> +-meta5 393/tcp Meta5 +-meta5 393/udp Meta5 +-# Jim Kanzler <jim.kanzler&meta5.com> +-embl-ndt 394/tcp EMBL Nucleic Data Transfer +-embl-ndt 394/udp EMBL Nucleic Data Transfer +-# Peter Gad <peter&bmc.uu.se> +-netcp 395/tcp NETscout Control Protocol +-netcp 395/udp NETscout Control Protocol +-# Anil Singhal <---none---> +-netware-ip 396/tcp Novell Netware over IP +-netware-ip 396/udp Novell Netware over IP +-mptn 397/tcp Multi Protocol Trans. Net. +-mptn 397/udp Multi Protocol Trans. Net. +-# Soumitra Sarkar <sarkar&vnet.ibm.com> +-kryptolan 398/tcp Kryptolan +-kryptolan 398/udp Kryptolan +-# Peter de Laval <pdl§ra.se> +-iso-tsap-c2 399/tcp ISO Transport Class 2 Non-Control over TCP +-iso-tsap-c2 399/udp ISO Transport Class 2 Non-Control over UDP +-# Yanick Pouffary <pouffary&taec.enet.dec.com> +-work-sol 400/tcp Workstation Solutions +-work-sol 400/udp Workstation Solutions +-# Jim Ward <jimw&worksta.com> +-ups 401/tcp Uninterruptible Power Supply +-ups 401/udp Uninterruptible Power Supply +-# Charles Bennett <chuck&benatong.com> +-genie 402/tcp Genie Protocol +-genie 402/udp Genie Protocol +-# Mark Hankin <---none---> +-decap 403/tcp decap +-decap 403/udp decap +-nced 404/tcp nced +-nced 404/udp nced +-ncld 405/tcp ncld +-ncld 405/udp ncld +-# Richard Jones <---none---> +-imsp 406/tcp Interactive Mail Support Protocol +-imsp 406/udp Interactive Mail Support Protocol +-# John Myers <jgm+&cmu.edu> +-timbuktu 407/tcp Timbuktu +-timbuktu 407/udp Timbuktu +-# Marc Epard <marc&netopia.com> +-prm-sm 408/tcp Prospero Resource Manager Sys. Man. +-prm-sm 408/udp Prospero Resource Manager Sys. Man. +-prm-nm 409/tcp Prospero Resource Manager Node Man. +-prm-nm 409/udp Prospero Resource Manager Node Man. +-# B. Clifford Neuman <bcn&isi.edu> +-decladebug 410/tcp DECLadebug Remote Debug Protocol +-decladebug 410/udp DECLadebug Remote Debug Protocol +-# Anthony Berent <anthony.berent&reo.mts.dec.com> +-rmt 411/tcp Remote MT Protocol +-rmt 411/udp Remote MT Protocol +-# Peter Eriksson <pen&lysator.liu.se> +-synoptics-trap 412/tcp Trap Convention Port +-synoptics-trap 412/udp Trap Convention Port +-# Illan Raab <iraab&synoptics.com> +-smsp 413/tcp Storage Management Services Protocol +-smsp 413/udp Storage Management Services Protocol +-# Murthy Srinivas <murthy&novell.com> +-infoseek 414/tcp InfoSeek +-infoseek 414/udp InfoSeek +-# Steve Kirsch <stk&infoseek.com> +-bnet 415/tcp BNet +-bnet 415/udp BNet +-# Jim Mertz <JMertz+RV09&rvdc.unisys.com> +-silverplatter 416/tcp Silverplatter +-silverplatter 416/udp Silverplatter +-# Peter Ciuffetti <petec&silverplatter.com> +-onmux 417/tcp Onmux +-onmux 417/udp Onmux +-# Stephen Hanna <hanna&world.std.com> +-hyper-g 418/tcp Hyper-G +-hyper-g 418/udp Hyper-G +-# Frank Kappe <fkappe&iicm.tu-graz.ac.at> +-ariel1 419/tcp Ariel 1 +-ariel1 419/udp Ariel 1 +-# Joel Karafin <jkarafin&infotrieve.com> +-smpte 420/tcp SMPTE +-smpte 420/udp SMPTE +-# Si Becker <71362.22&CompuServe.COM> +-ariel2 421/tcp Ariel 2 +-ariel2 421/udp Ariel 2 +-ariel3 422/tcp Ariel 3 +-ariel3 422/udp Ariel 3 +-# Joel Karafin <jkarafin&infotrieve.com> +-opc-job-start 423/tcp IBM Operations Planning and Control Start +-opc-job-start 423/udp IBM Operations Planning and Control Start +-opc-job-track 424/tcp IBM Operations Planning and Control Track +-opc-job-track 424/udp IBM Operations Planning and Control Track +-# Conny Larsson <cocke&VNET.IBM.COM> +-icad-el 425/tcp ICAD +-icad-el 425/udp ICAD +-# Larry Stone <lcs&icad.com> +-smartsdp 426/tcp smartsdp +-smartsdp 426/udp smartsdp +-# Marie-Pierre Belanger <belanger_marie&emc.com> +-svrloc 427/tcp Server Location +-svrloc 427/udp Server Location +-# <veizades&ftp.com> +-ocs_cmu 428/tcp OCS_CMU +-ocs_cmu 428/udp OCS_CMU +-ocs_amu 429/tcp OCS_AMU +-ocs_amu 429/udp OCS_AMU +-# Florence Wyman <wyman&peabody.plk.af.mil> +-utmpsd 430/tcp UTMPSD +-utmpsd 430/udp UTMPSD +-utmpcd 431/tcp UTMPCD +-utmpcd 431/udp UTMPCD +-iasd 432/tcp IASD +-iasd 432/udp IASD +-# Nir Baroz <nbaroz&encore.com> +-nnsp 433/tcp NNSP +-nnsp 433/udp NNSP +-# Rob Robertson <rob&gangrene.berkeley.edu> +-mobileip-agent 434/tcp MobileIP-Agent +-mobileip-agent 434/udp MobileIP-Agent +-mobilip-mn 435/tcp MobilIP-MN +-mobilip-mn 435/udp MobilIP-MN +-# Kannan Alagappan <kannan&sejour.lkg.dec.com> +-dna-cml 436/tcp DNA-CML +-dna-cml 436/udp DNA-CML +-# Dan Flowers <flowers&smaug.lkg.dec.com> +-comscm 437/tcp comscm +-comscm 437/udp comscm +-# Jim Teague <teague&zso.dec.com> +-dsfgw 438/tcp dsfgw +-dsfgw 438/udp dsfgw +-# Andy McKeen <mckeen&osf.org> +-dasp 439/tcp dasp Thomas Obermair +-dasp 439/udp dasp tommy&inlab.m.eunet.de +-# Thomas Obermair <tommy&inlab.m.eunet.de> +-sgcp 440/tcp sgcp +-sgcp 440/udp sgcp +-# Marshall Rose <mrose&dbc.mtview.ca.us> +-decvms-sysmgt 441/tcp decvms-sysmgt +-decvms-sysmgt 441/udp decvms-sysmgt +-# Lee Barton <barton&star.enet.dec.com> +-cvc_hostd 442/tcp cvc_hostd +-cvc_hostd 442/udp cvc_hostd +-# Bill Davidson <billd&equalizer.cray.com> +-https 443/tcp http protocol over TLS/SSL +-https 443/udp http protocol over TLS/SSL +-# Kipp E.B. Hickman <kipp&mcom.com> +-https 443/sctp HTTPS +-# IETF TSVWG +-# Randall Stewart <rrs&cisco.com> +-# [RFC4960] +-snpp 444/tcp Simple Network Paging Protocol +-snpp 444/udp Simple Network Paging Protocol +-# [RFC1568] +-microsoft-ds 445/tcp Microsoft-DS +-microsoft-ds 445/udp Microsoft-DS +-# Pradeep Bahl <pradeepbµsoft.com> +-ddm-rdb 446/tcp DDM-Remote Relational Database Access +-ddm-rdb 446/udp DDM-Remote Relational Database Access +-ddm-dfm 447/tcp DDM-Distributed File Management +-ddm-dfm 447/udp DDM-Distributed File Management +-# Steven Ritland <srr&us.ibm.com> +-ddm-ssl 448/tcp DDM-Remote DB Access Using Secure Sockets +-ddm-ssl 448/udp DDM-Remote DB Access Using Secure Sockets +-# Steven Ritland <srr&us.ibm.com> +-as-servermap 449/tcp AS Server Mapper +-as-servermap 449/udp AS Server Mapper +-# Barbara Foss <BGFOSS&rchvmv.vnet.ibm.com> +-tserver 450/tcp Computer Supported Telecomunication Applications +-tserver 450/udp Computer Supported Telecomunication Applications +-# Harvey S. Schultz <harvey&acm.org> +-sfs-smp-net 451/tcp Cray Network Semaphore server +-sfs-smp-net 451/udp Cray Network Semaphore server +-sfs-config 452/tcp Cray SFS config server +-sfs-config 452/udp Cray SFS config server +-# Walter Poxon <wdp&ironwood.cray.com> +-creativeserver 453/tcp CreativeServer +-creativeserver 453/udp CreativeServer +-contentserver 454/tcp ContentServer +-contentserver 454/udp ContentServer +-creativepartnr 455/tcp CreativePartnr +-creativepartnr 455/udp CreativePartnr +-# Jesus Ortiz <jesus_ortiz&emotion.com> +-macon-tcp 456/tcp macon-tcp +-macon-udp 456/udp macon-udp +-# Yoshinobu Inoue +-# <shin&hodaka.mfd.cs.fujitsu.co.jp> +-scohelp 457/tcp scohelp +-scohelp 457/udp scohelp +-# Faith Zack <faithz&sco.com> +-appleqtc 458/tcp apple quick time +-appleqtc 458/udp apple quick time +-# Murali Ranganathan +-# <murali_ranganathan&quickmail.apple.com> +-ampr-rcmd 459/tcp ampr-rcmd +-ampr-rcmd 459/udp ampr-rcmd +-# Rob Janssen <rob&sys3.pe1chl.ampr.org> +-skronk 460/tcp skronk +-skronk 460/udp skronk +-# Henry Strickland <strick&yak.net> +-datasurfsrv 461/tcp DataRampSrv +-datasurfsrv 461/udp DataRampSrv +-datasurfsrvsec 462/tcp DataRampSrvSec +-datasurfsrvsec 462/udp DataRampSrvSec +-# Diane Downie <downie&jibe.MV.COM> +-alpes 463/tcp alpes +-alpes 463/udp alpes +-# Alain Durand <Alain.Durand&imag.fr> +-kpasswd 464/tcp kpasswd +-kpasswd 464/udp kpasswd +-# Theodore Ts'o <tytso&MIT.EDU> +-urd 465/tcp URL Rendesvous Directory for SSM +-igmpv3lite 465/udp IGMP over UDP for SSM +-# Toerless Eckert <eckert&cisco.com> +-digital-vrc 466/tcp digital-vrc +-digital-vrc 466/udp digital-vrc +-# Peter Higginson <higginson&mail.dec.com> +-mylex-mapd 467/tcp mylex-mapd +-mylex-mapd 467/udp mylex-mapd +-# Gary Lewis <GaryL&hq.mylex.com> +-photuris 468/tcp proturis +-photuris 468/udp proturis +-# Bill Simpson <Bill.Simpson&um.cc.umich.edu> +-rcp 469/tcp Radio Control Protocol +-rcp 469/udp Radio Control Protocol +-# Jim Jennings +1-708-538-7241 +-scx-proxy 470/tcp scx-proxy +-scx-proxy 470/udp scx-proxy +-# Scott Narveson <sjn&cray.com> +-mondex 471/tcp Mondex +-mondex 471/udp Mondex +-# Bill Reding <redingb&nwdt.natwest.co.uk> +-ljk-login 472/tcp ljk-login +-ljk-login 472/udp ljk-login +-# LJK Software, Cambridge, Massachusetts +-# <support&ljk.com> +-hybrid-pop 473/tcp hybrid-pop +-hybrid-pop 473/udp hybrid-pop +-# Rami Rubin <rami&hybrid.com> +-tn-tl-w1 474/tcp tn-tl-w1 +-tn-tl-w2 474/udp tn-tl-w2 +-# Ed Kress <eskress&thinknet.com> +-tcpnethaspsrv 475/tcp tcpnethaspsrv +-tcpnethaspsrv 475/udp tcpnethaspsrv +-# Charlie Hava <charlie&aladdin.co.il> +-tn-tl-fd1 476/tcp tn-tl-fd1 +-tn-tl-fd1 476/udp tn-tl-fd1 +-# Ed Kress <eskress&thinknet.com> +-ss7ns 477/tcp ss7ns +-ss7ns 477/udp ss7ns +-# Jean-Michel URSCH <ursch&taec.enet.dec.com> +-spsc 478/tcp spsc +-spsc 478/udp spsc +-# Mike Rieker <mikea&sp32.com> +-iafserver 479/tcp iafserver +-iafserver 479/udp iafserver +-iafdbase 480/tcp iafdbase +-iafdbase 480/udp iafdbase +-# ricky&solect.com <Rick Yazwinski> +-ph 481/tcp Ph service +-ph 481/udp Ph service +-# Roland Hedberg <Roland.Hedberg&umdac.umu.se> +-bgs-nsi 482/tcp bgs-nsi +-bgs-nsi 482/udp bgs-nsi +-# Jon Saperia <saperia&bgs.com> +-ulpnet 483/tcp ulpnet +-ulpnet 483/udp ulpnet +-# Kevin Mooney <kevinm&bfs.unibol.com> +-integra-sme 484/tcp Integra Software Management Environment +-integra-sme 484/udp Integra Software Management Environment +-# Randall Dow <rand&randix.m.isr.de> +-powerburst 485/tcp Air Soft Power Burst +-powerburst 485/udp Air Soft Power Burst +-# <gary&airsoft.com> +-avian 486/tcp avian +-avian 486/udp avian +-# Robert Ullmann +-# <Robert_Ullmann/CAM/Lotus.LOTUS&crd.lotus.com> +-saft 487/tcp saft Simple Asynchronous File Transfer +-saft 487/udp saft Simple Asynchronous File Transfer +-# Ulli Horlacher <framstag&rus.uni-stuttgart.de> +-gss-http 488/tcp gss-http +-gss-http 488/udp gss-http +-# Doug Rosenthal <rosenthl&krypton.einet.net> +-nest-protocol 489/tcp nest-protocol +-nest-protocol 489/udp nest-protocol +-# Gilles Gameiro <ggameiro&birdland.com> +-micom-pfs 490/tcp micom-pfs +-micom-pfs 490/udp micom-pfs +-# David Misunas <DMisunas&micom.com> +-go-login 491/tcp go-login +-go-login 491/udp go-login +-# Troy Morrison <troy&graphon.com> +-ticf-1 492/tcp Transport Independent Convergence for FNA +-ticf-1 492/udp Transport Independent Convergence for FNA +-ticf-2 493/tcp Transport Independent Convergence for FNA +-ticf-2 493/udp Transport Independent Convergence for FNA +-# Mamoru Ito <Ito&pcnet.ks.pfu.co.jp> +-pov-ray 494/tcp POV-Ray +-pov-ray 494/udp POV-Ray +-# POV-Team Co-ordinator +-# <iana-port.remove-spamguard&povray.org> +-intecourier 495/tcp intecourier +-intecourier 495/udp intecourier +-# Steve Favor <sfavor&tigger.intecom.com> +-pim-rp-disc 496/tcp PIM-RP-DISC +-pim-rp-disc 496/udp PIM-RP-DISC +-# Dino Farinacci <dino&cisco.com> +-dantz 497/tcp dantz +-dantz 497/udp dantz +-# Richard Zulch <richard_zulch&dantz.com> +-siam 498/tcp siam +-siam 498/udp siam +-# Philippe Gilbert <pgilbert&cal.fr> +-iso-ill 499/tcp ISO ILL Protocol +-iso-ill 499/udp ISO ILL Protocol +-# Mark H. Needleman <markn&sirsi.com> +-isakmp 500/tcp isakmp +-isakmp 500/udp isakmp +-# Mark Schertler <mjs&tycho.ncsc.mil> +-stmf 501/tcp STMF +-stmf 501/udp STMF +-# Alan Ungar <aungar&farradyne.com> +-asa-appl-proto 502/tcp asa-appl-proto +-asa-appl-proto 502/udp asa-appl-proto +-# Dennis Dube <ddube&modicon.com> +-intrinsa 503/tcp Intrinsa +-intrinsa 503/udp Intrinsa +-# Robert Ford <robert&intrinsa.com> +-citadel 504/tcp citadel +-citadel 504/udp citadel +-# Art Cancro <ajc&uncensored.citadel.org> +-mailbox-lm 505/tcp mailbox-lm +-mailbox-lm 505/udp mailbox-lm +-# Beverly Moody <Beverly_Moody&stercomm.com> +-ohimsrv 506/tcp ohimsrv +-ohimsrv 506/udp ohimsrv +-# Scott Powell <spowell&openhorizon.com> +-crs 507/tcp crs +-crs 507/udp crs +-# Brad Wright <bradwrµsoft.com> +-xvttp 508/tcp xvttp +-xvttp 508/udp xvttp +-# Keith J. Alphonso <alphonso&ncs-ssc.com> +-snare 509/tcp snare +-snare 509/udp snare +-# Dennis Batchelder <dennis&capres.com> +-fcp 510/tcp FirstClass Protocol +-fcp 510/udp FirstClass Protocol +-# Mike Marshburn <paul&softarc.com> +-passgo 511/tcp PassGo +-passgo 511/udp PassGo +-# John Rainford <jrainford&passgo.com> +-exec 512/tcp remote process execution; +-# authentication performed using +-# passwords and UNIX login names +-comsat 512/udp +-biff 512/udp used by mail system to notify users +-# of new mail received; currently +-# receives messages only from +-# processes on the same machine +-login 513/tcp remote login a la telnet; +-# automatic authentication performed +-# based on priviledged port numbers +-# and distributed data bases which +-# identify "authentication domains" +-who 513/udp maintains data bases showing who's +-# logged in to machines on a local +-# net and the load average of the +-# machine +-shell 514/tcp cmd +-# like exec, but automatic authentication +-# is performed as for login server +-syslog 514/udp +-printer 515/tcp spooler +-printer 515/udp spooler +-videotex 516/tcp videotex +-videotex 516/udp videotex +-# Daniel Mavrakis <system&venus.mctel.fr> +-talk 517/tcp like tenex link, but across +-# machine - unfortunately, doesn't +-# use link protocol (this is actually +-# just a rendezvous port from which a +-# tcp connection is established) +-talk 517/udp like tenex link, but across +-# machine - unfortunately, doesn't +-# use link protocol (this is actually +-# just a rendezvous port from which a +-# tcp connection is established) +-ntalk 518/tcp +-ntalk 518/udp +-utime 519/tcp unixtime +-utime 519/udp unixtime +-efs 520/tcp extended file name server +-router 520/udp local routing process (on site); +-# uses variant of Xerox NS routing +-# information protocol - RIP +-ripng 521/tcp ripng +-ripng 521/udp ripng +-# Robert E. Minnear <minnear&ipsilon.com> +-ulp 522/tcp ULP +-ulp 522/udp ULP +-# Max Morris <maxm&MICROSOFT.com> +-ibm-db2 523/tcp IBM-DB2 +-ibm-db2 523/udp IBM-DB2 +-# Juliana Hsu <jhsu&ca.ibm.com> +-ncp 524/tcp NCP +-ncp 524/udp NCP +-# Don Provan <donp&sjf.novell.com> +-timed 525/tcp timeserver +-timed 525/udp timeserver +-tempo 526/tcp newdate +-tempo 526/udp newdate +-# Unknown +-stx 527/tcp Stock IXChange +-stx 527/udp Stock IXChange +-custix 528/tcp Customer IXChange +-custix 528/udp Customer IXChange +-# Ferdi Ladeira <ferdil&fraxion.biz> +-irc-serv 529/tcp IRC-SERV +-irc-serv 529/udp IRC-SERV +-# Brian Tackett <cym&acrux.net> +-courier 530/tcp rpc +-courier 530/udp rpc +-conference 531/tcp chat +-conference 531/udp chat +-netnews 532/tcp readnews +-netnews 532/udp readnews +-netwall 533/tcp for emergency broadcasts +-netwall 533/udp for emergency broadcasts +-# Andreas Heidemann <a.heidemann&ais-gmbh.de> +-windream 534/tcp windream Admin +-windream 534/udp windream Admin +-# Uwe Honermann <u.honermann&windream.com> +-iiop 535/tcp iiop +-iiop 535/udp iiop +-# Jeff M.Michaud <michaud&zk3.dec.com> +-opalis-rdv 536/tcp opalis-rdv +-opalis-rdv 536/udp opalis-rdv +-# Laurent Domenech <ldomenech&opalis.com> +-nmsp 537/tcp Networked Media Streaming Protocol +-nmsp 537/udp Networked Media Streaming Protocol +-# Paul Santinelli Jr. <psantinelli&narrative.com> +-gdomap 538/tcp gdomap +-gdomap 538/udp gdomap +-# Richard Frith-Macdonald <richard&brainstorm.co.uk> +-apertus-ldp 539/tcp Apertus Technologies Load Determination +-apertus-ldp 539/udp Apertus Technologies Load Determination +-uucp 540/tcp uucpd +-uucp 540/udp uucpd +-uucp-rlogin 541/tcp uucp-rlogin +-uucp-rlogin 541/udp uucp-rlogin +-# Stuart Lynne <sl&wimsey.com> +-commerce 542/tcp commerce +-commerce 542/udp commerce +-# Randy Epstein <repstein&hostleasing.net> +-klogin 543/tcp +-klogin 543/udp +-kshell 544/tcp krcmd +-kshell 544/udp krcmd +-appleqtcsrvr 545/tcp appleqtcsrvr +-appleqtcsrvr 545/udp appleqtcsrvr +-# Murali Ranganathan +-# <Murali_Ranganathan&quickmail.apple.com> +-dhcpv6-client 546/tcp DHCPv6 Client +-dhcpv6-client 546/udp DHCPv6 Client +-dhcpv6-server 547/tcp DHCPv6 Server +-dhcpv6-server 547/udp DHCPv6 Server +-# Jim Bound <bound&zk3.dec.com> +-afpovertcp 548/tcp AFP over TCP +-afpovertcp 548/udp AFP over TCP +-# Leland Wallace <randall&apple.com> +-idfp 549/tcp IDFP +-idfp 549/udp IDFP +-# Ramana Kovi <ramana&kovi.com> +-new-rwho 550/tcp new-who +-new-rwho 550/udp new-who +-cybercash 551/tcp cybercash +-cybercash 551/udp cybercash +-# Donald E. Eastlake 3rd <dee&cybercash.com> +-devshr-nts 552/tcp DeviceShare +-devshr-nts 552/udp DeviceShare +-# Benjamin Rosenberg <brosenberg&advsyscon.com> +-pirp 553/tcp pirp +-pirp 553/udp pirp +-# D. J. Bernstein <djb&silverton.berkeley.edu> +-rtsp 554/tcp Real Time Streaming Protocol (RTSP) +-rtsp 554/udp Real Time Streaming Protocol (RTSP) +-# Rob Lanphier <robla&prognet.com> +-dsf 555/tcp +-dsf 555/udp +-remotefs 556/tcp rfs server +-remotefs 556/udp rfs server +-openvms-sysipc 557/tcp openvms-sysipc +-openvms-sysipc 557/udp openvms-sysipc +-# Alan Potter <potter&movies.enet.dec.com> +-sdnskmp 558/tcp SDNSKMP +-sdnskmp 558/udp SDNSKMP +-teedtap 559/tcp TEEDTAP +-teedtap 559/udp TEEDTAP +-# Charlie Limoges <Charlie.Limoges&GDC4S.com> +-rmonitor 560/tcp rmonitord +-rmonitor 560/udp rmonitord +-monitor 561/tcp +-monitor 561/udp +-chshell 562/tcp chcmd +-chshell 562/udp chcmd +-nntps 563/tcp nntp protocol over TLS/SSL (was snntp) +-nntps 563/udp nntp protocol over TLS/SSL (was snntp) +-# Kipp E.B. Hickman <kipp&netscape.com> +-9pfs 564/tcp plan 9 file service +-9pfs 564/udp plan 9 file service +-whoami 565/tcp whoami +-whoami 565/udp whoami +-streettalk 566/tcp streettalk +-streettalk 566/udp streettalk +-banyan-rpc 567/tcp banyan-rpc +-banyan-rpc 567/udp banyan-rpc +-# Tom Lemaire <toml&banyan.com> +-ms-shuttle 568/tcp microsoft shuttle +-ms-shuttle 568/udp microsoft shuttle +-# Rudolph Balaz <rudolphbµsoft.com> +-ms-rome 569/tcp microsoft rome +-ms-rome 569/udp microsoft rome +-# Rudolph Balaz <rudolphbµsoft.com> +-meter 570/tcp demon +-meter 570/udp demon +-meter 571/tcp udemon +-meter 571/udp udemon +-sonar 572/tcp sonar +-sonar 572/udp sonar +-# Keith Moore <moore&cs.utk.edu> +-banyan-vip 573/tcp banyan-vip +-banyan-vip 573/udp banyan-vip +-# Denis Leclerc <DLeclerc&banyan.com> +-ftp-agent 574/tcp FTP Software Agent System +-ftp-agent 574/udp FTP Software Agent System +-# Michael S. Greenberg <arnoff&ftp.com> +-vemmi 575/tcp VEMMI +-vemmi 575/udp VEMMI +-# Daniel Mavrakis <mavrakis&mctel.fr> +-ipcd 576/tcp ipcd +-ipcd 576/udp ipcd +-vnas 577/tcp vnas +-vnas 577/udp vnas +-ipdd 578/tcp ipdd +-ipdd 578/udp ipdd +-# Jay Farhat <jfarhat&ipass.com> +-decbsrv 579/tcp decbsrv +-decbsrv 579/udp decbsrv +-# Rudi Martin <movies::martin"@movies.enet.dec.com> +-sntp-heartbeat 580/tcp SNTP HEARTBEAT +-sntp-heartbeat 580/udp SNTP HEARTBEAT +-# Louis Mamakos <louie&uu.net> +-bdp 581/tcp Bundle Discovery Protocol +-bdp 581/udp Bundle Discovery Protocol +-# Gary Malkin <gmalkin&xylogics.com> +-scc-security 582/tcp SCC Security +-scc-security 582/udp SCC Security +-# Prashant Dholakia <prashant&semaphorecom.com> +-philips-vc 583/tcp Philips Video-Conferencing +-philips-vc 583/udp Philips Video-Conferencing +-# Janna Chang <janna&pmc.philips.com> +-keyserver 584/tcp Key Server +-keyserver 584/udp Key Server +-# Gary Howland <gary&systemics.com> +-# 585 De-registered (25 April 2006) +-# Use of 585 is not recommended, use 993 instead +-password-chg 586/tcp Password Change +-password-chg 586/udp Password Change +-submission 587/tcp Submission +-submission 587/udp Submission +-# [RFC4409] +-cal 588/tcp CAL +-cal 588/udp CAL +-# Myron Hattig <Myron_Hattig&ccm.jf.intel.com> +-eyelink 589/tcp EyeLink +-eyelink 589/udp EyeLink +-# Dave Stampe <dstampe&psych.toronto.edu> +-tns-cml 590/tcp TNS CML +-tns-cml 590/udp TNS CML +-# Jerome Albin <albin&taec.enet.dec.com> +-http-alt 591/tcp FileMaker, Inc. - HTTP Alternate (see Port 80) +-http-alt 591/udp FileMaker, Inc. - HTTP Alternate (see Port 80) +-# Clay Maeckel <clay_maeckel&filemaker.com> +-eudora-set 592/tcp Eudora Set +-eudora-set 592/udp Eudora Set +-# Randall Gellens <randy&qualcomm.com> +-http-rpc-epmap 593/tcp HTTP RPC Ep Map +-http-rpc-epmap 593/udp HTTP RPC Ep Map +-# Edward Reus <edwardrµsoft.com> +-tpip 594/tcp TPIP +-tpip 594/udp TPIP +-# Brad Spear <spear&platinum.com> +-cab-protocol 595/tcp CAB Protocol +-cab-protocol 595/udp CAB Protocol +-# Winston Hetherington +-smsd 596/tcp SMSD +-smsd 596/udp SMSD +-# Wayne Barlow <web&unx.dec.com> +-ptcnameservice 597/tcp PTC Name Service +-ptcnameservice 597/udp PTC Name Service +-# Yuri Machkasov <yuri&ptc.com> +-sco-websrvrmg3 598/tcp SCO Web Server Manager 3 +-sco-websrvrmg3 598/udp SCO Web Server Manager 3 +-# Simon Baldwin <simonb&sco.com> +-acp 599/tcp Aeolon Core Protocol +-acp 599/udp Aeolon Core Protocol +-# Michael Alyn Miller <iana&aeolon.com> +-ipcserver 600/tcp Sun IPC server +-ipcserver 600/udp Sun IPC server +-# Bill Schiefelbein <schief&aspen.cray.com> +-syslog-conn 601/tcp Reliable Syslog Service +-syslog-conn 601/udp Reliable Syslog Service +-# RFC 3195 +-xmlrpc-beep 602/tcp XML-RPC over BEEP +-xmlrpc-beep 602/udp XML-RPC over BEEP +-# RFC3529 <ftp://ftp.isi.edu/in-notes/rfc3529.txt> March 2003 +-idxp 603/tcp IDXP +-idxp 603/udp IDXP +-# RFC4767 +-tunnel 604/tcp TUNNEL +-tunnel 604/udp TUNNEL +-# RFC3620 +-soap-beep 605/tcp SOAP over BEEP +-soap-beep 605/udp SOAP over BEEP +-# RFC3288 <ftp://ftp.isi.edu/in-notes/rfc3288.txt> April 2002 +-urm 606/tcp Cray Unified Resource Manager +-urm 606/udp Cray Unified Resource Manager +-nqs 607/tcp nqs +-nqs 607/udp nqs +-# Bill Schiefelbein <schief&aspen.cray.com> +-sift-uft 608/tcp Sender-Initiated/Unsolicited File Transfer +-sift-uft 608/udp Sender-Initiated/Unsolicited File Transfer +-# Rick Troth <troth&rice.edu> +-npmp-trap 609/tcp npmp-trap +-npmp-trap 609/udp npmp-trap +-npmp-local 610/tcp npmp-local +-npmp-local 610/udp npmp-local +-npmp-gui 611/tcp npmp-gui +-npmp-gui 611/udp npmp-gui +-# John Barnes <jbarnes&crl.com> +-hmmp-ind 612/tcp HMMP Indication +-hmmp-ind 612/udp HMMP Indication +-hmmp-op 613/tcp HMMP Operation +-hmmp-op 613/udp HMMP Operation +-# Andrew Sinclair <andrsinµsoft.com> +-sshell 614/tcp SSLshell +-sshell 614/udp SSLshell +-# Simon J. Gerraty <sjg&quick.com.au> +-sco-inetmgr 615/tcp Internet Configuration Manager +-sco-inetmgr 615/udp Internet Configuration Manager +-sco-sysmgr 616/tcp SCO System Administration Server +-sco-sysmgr 616/udp SCO System Administration Server +-sco-dtmgr 617/tcp SCO Desktop Administration Server +-sco-dtmgr 617/udp SCO Desktop Administration Server +-# Christopher Durham <chrisdu&sco.com> +-dei-icda 618/tcp DEI-ICDA +-dei-icda 618/udp DEI-ICDA +-# David Turner <digital&Quetico.tbaytel.net> +-compaq-evm 619/tcp Compaq EVM +-compaq-evm 619/udp Compaq EVM +-# Jem Treadwell <Jem.Treadwell&compaq.com> +-sco-websrvrmgr 620/tcp SCO WebServer Manager +-sco-websrvrmgr 620/udp SCO WebServer Manager +-# Christopher Durham <chrisdu&sco.com> +-escp-ip 621/tcp ESCP +-escp-ip 621/udp ESCP +-# Lai Zit Seng <lzs&pobox.com> +-collaborator 622/tcp Collaborator +-collaborator 622/udp Collaborator +-# Johnson Davis <johnsond&opteamasoft.com> +-oob-ws-http 623/tcp DMTF out-of-band web services management protocol +-# Jim Davis <jim.davis&wbemsolutions.com> June 2007 +-asf-rmcp 623/udp ASF Remote Management and Control Protocol +-# Carl First <Carl.L.First&intel.com> +-cryptoadmin 624/tcp Crypto Admin +-cryptoadmin 624/udp Crypto Admin +-# Tony Walker <tony&cryptocard.com> +-dec_dlm 625/tcp DEC DLM +-dec_dlm 625/udp DEC DLM +-# Rudi Martin <Rudi.Martin&edo.mts.dec.com> +-asia 626/tcp ASIA +-asia 626/udp ASIA +-# Michael Dasenbrock <dasenbro&apple.com> +-passgo-tivoli 627/tcp PassGo Tivoli +-passgo-tivoli 627/udp PassGo Tivoli +-# John Rainford <john.rainford&passgo.com> +-qmqp 628/tcp QMQP +-qmqp 628/udp QMQP +-# Dan Bernstein <djb&cr.yp.to> +-3com-amp3 629/tcp 3Com AMP3 +-3com-amp3 629/udp 3Com AMP3 +-# Prakash Banthia <prakash_banthia&3com.com> +-rda 630/tcp RDA +-rda 630/udp RDA +-# John Hadjioannou <john&minster.co.uk> +-ipp 631/tcp IPP (Internet Printing Protocol) +-ipp 631/udp IPP (Internet Printing Protocol) +-# Carl-Uno Manros <manros&cp10.es.xerox.com> +-bmpp 632/tcp bmpp +-bmpp 632/udp bmpp +-# Troy Rollo <troy&kroll.corvu.com.au> +-servstat 633/tcp Service Status update (Sterling Software) +-servstat 633/udp Service Status update (Sterling Software) +-# Greg Rose <Greg_Rose&sydney.sterling.com> +-ginad 634/tcp ginad +-ginad 634/udp ginad +-# Mark Crother <mark&eis.calstate.edu> +-rlzdbase 635/tcp RLZ DBase +-rlzdbase 635/udp RLZ DBase +-# Michael Ginn <ginn&tyxar.com> +-ldaps 636/tcp ldap protocol over TLS/SSL (was sldap) +-ldaps 636/udp ldap protocol over TLS/SSL (was sldap) +-# Pat Richard <patr&xcert.com> +-lanserver 637/tcp lanserver +-lanserver 637/udp lanserver +-# Chris Larsson <clarsson&VNET.IBM.COM> +-mcns-sec 638/tcp mcns-sec +-mcns-sec 638/udp mcns-sec +-# Kaz Ozawa <k.ozawa&cablelabs.com> +-msdp 639/tcp MSDP +-msdp 639/udp MSDP +-# Dino Farinacci <dino&cisco.com> +-entrust-sps 640/tcp entrust-sps +-entrust-sps 640/udp entrust-sps +-# Marek Buchler <Marek.Buchler&entrust.com> +-repcmd 641/tcp repcmd +-repcmd 641/udp repcmd +-# Scott Dale <scott&Replicase.com> +-esro-emsdp 642/tcp ESRO-EMSDP V1.3 +-esro-emsdp 642/udp ESRO-EMSDP V1.3 +-# Mohsen Banan <mohsen&neda.com> +-sanity 643/tcp SANity +-sanity 643/udp SANity +-# Peter Viscarola <PeterGV&osr.com> +-dwr 644/tcp dwr +-dwr 644/udp dwr +-# Bill Fenner <fenner&parc.xerox.com> +-pssc 645/tcp PSSC +-pssc 645/udp PSSC +-# Egon Meier-Engelen <egon.meier-engelen&dlr.de> +-ldp 646/tcp LDP +-ldp 646/udp LDP +-# Bob Thomas <rhthomas&cisco.com> +-dhcp-failover 647/tcp DHCP Failover +-dhcp-failover 647/udp DHCP Failover +-# Bernard Volz <volz&cisco.com> +-rrp 648/tcp Registry Registrar Protocol (RRP) +-rrp 648/udp Registry Registrar Protocol (RRP) +-# Scott Hollenbeck <shollenb&netsol.com> +-cadview-3d 649/tcp Cadview-3d - streaming 3d models over the internet +-cadview-3d 649/udp Cadview-3d - streaming 3d models over the internet +-# David Cooper <david.cooper&oracle.com> +-obex 650/tcp OBEX +-obex 650/udp OBEX +-# Jeff Garbers <FJG030&email.mot.com> +-ieee-mms 651/tcp IEEE MMS +-ieee-mms 651/udp IEEE MMS +-# Curtis Anderson <canderson&turbolinux.com> +-hello-port 652/tcp HELLO_PORT +-hello-port 652/udp HELLO_PORT +-# Patrick Cipiere <Patrick.Cipiere&UDcast.com> +-repscmd 653/tcp RepCmd +-repscmd 653/udp RepCmd +-# Scott Dale <scott&tioga.com> +-aodv 654/tcp AODV +-aodv 654/udp AODV +-# Charles Perkins <cperkins&eng.sun.com> +-tinc 655/tcp TINC +-tinc 655/udp TINC +-# Ivo Timmermans <itimmermans&bigfoot.com> +-spmp 656/tcp SPMP +-spmp 656/udp SPMP +-# Jakob Kaivo <jkaivo&nodomainname.net> +-rmc 657/tcp RMC +-rmc 657/udp RMC +-# Michael Schmidt <mmaass&us.ibm.com> +-tenfold 658/tcp TenFold +-tenfold 658/udp TenFold +-# Louis Olszyk <lolszyk&10fold.com> +-# 659 Removed (2001-06-06) +-mac-srvr-admin 660/tcp MacOS Server Admin +-mac-srvr-admin 660/udp MacOS Server Admin +-# Forest Hill <forest&apple.com> +-hap 661/tcp HAP +-hap 661/udp HAP +-# Igor Plotnikov <igor&uroam.com> +-pftp 662/tcp PFTP +-pftp 662/udp PFTP +-# Ben Schluricke <support&pftp.de> +-purenoise 663/tcp PureNoise +-purenoise 663/udp PureNoise +-# Sam Osa <pristine&mailcity.com> +-oob-ws-https 664/tcp DMTF out-of-band secure web services management protocol +-# Jim Davis <jim.davis&wbemsolutions.com> June 2007 +-asf-secure-rmcp 664/udp ASF Secure Remote Management and Control Protocol +-# Carl First <Carl.L.First&intel.com> +-sun-dr 665/tcp Sun DR +-sun-dr 665/udp Sun DR +-# Harinder Bhasin <Harinder.Bhasin&Sun.COM> +-mdqs 666/tcp +-mdqs 666/udp +-doom 666/tcp doom Id Software +-doom 666/udp doom Id Software +-# <ddt&idcube.idsoftware.com> +-disclose 667/tcp campaign contribution disclosures - SDR Technologies +-disclose 667/udp campaign contribution disclosures - SDR Technologies +-# Jim Dixon <jim&lambda.com> +-mecomm 668/tcp MeComm +-mecomm 668/udp MeComm +-meregister 669/tcp MeRegister +-meregister 669/udp MeRegister +-# Armin Sawusch <armin&esd1.esd.de> +-vacdsm-sws 670/tcp VACDSM-SWS +-vacdsm-sws 670/udp VACDSM-SWS +-vacdsm-app 671/tcp VACDSM-APP +-vacdsm-app 671/udp VACDSM-APP +-vpps-qua 672/tcp VPPS-QUA +-vpps-qua 672/udp VPPS-QUA +-cimplex 673/tcp CIMPLEX +-cimplex 673/udp CIMPLEX +-# Ulysses G. Smith Jr. <ugsmith&cesi.com> +-acap 674/tcp ACAP +-acap 674/udp ACAP +-# Chris Newman <chris.newman&sun.com> +-dctp 675/tcp DCTP +-dctp 675/udp DCTP +-# Andre Kramer <Andre.Kramer&ansa.co.uk> +-vpps-via 676/tcp VPPS Via +-vpps-via 676/udp VPPS Via +-# Ulysses G. Smith Jr. <ugsmith&cesi.com> +-vpp 677/tcp Virtual Presence Protocol +-vpp 677/udp Virtual Presence Protocol +-# Klaus Wolf <wolf&cobrow.com> +-ggf-ncp 678/tcp GNU Generation Foundation NCP +-ggf-ncp 678/udp GNU Generation Foundation NCP +-# Noah Paul <noahp&altavista.net> +-mrm 679/tcp MRM +-mrm 679/udp MRM +-# Liming Wei <lwei&cisco.com> +-entrust-aaas 680/tcp entrust-aaas +-entrust-aaas 680/udp entrust-aaas +-entrust-aams 681/tcp entrust-aams +-entrust-aams 681/udp entrust-aams +-# Adrian Mancini <adrian.mancini&entrust.com> +-xfr 682/tcp XFR +-xfr 682/udp XFR +-# Noah Paul <noahp&ultranet.com> +-corba-iiop 683/tcp CORBA IIOP +-corba-iiop 683/udp CORBA IIOP +-corba-iiop-ssl 684/tcp CORBA IIOP SSL +-corba-iiop-ssl 684/udp CORBA IIOP SSL +-# Andrew Watson <andrew&omg.org> +-mdc-portmapper 685/tcp MDC Port Mapper +-mdc-portmapper 685/udp MDC Port Mapper +-# Noah Paul <noahp&altavista.net> +-hcp-wismar 686/tcp Hardware Control Protocol Wismar +-hcp-wismar 686/udp Hardware Control Protocol Wismar +-# David Merchant <d.f.merchant&livjm.ac.uk> +-asipregistry 687/tcp asipregistry +-asipregistry 687/udp asipregistry +-# Erik Sea <sea&apple.com> +-realm-rusd 688/tcp ApplianceWare managment protocol +-realm-rusd 688/udp ApplianceWare managment protocol +-# Stacy Kenworthy <skenworthy&applianceware.com> +-nmap 689/tcp NMAP +-nmap 689/udp NMAP +-# Peter Dennis Bartok <peter&novonyx.com> +-vatp 690/tcp Velazquez Application Transfer Protocol +-vatp 690/udp Velazquez Application Transfer Protocol +-# Velneo <velneo&velneo.com> +-msexch-routing 691/tcp MS Exchange Routing +-msexch-routing 691/udp MS Exchange Routing +-# David Lemson <dlemsonµsoft.com> +-hyperwave-isp 692/tcp Hyperwave-ISP +-hyperwave-isp 692/udp Hyperwave-ISP +-# Gerald Mesaric <gmesaric&hyperwave.com> +-connendp 693/tcp almanid Connection Endpoint +-connendp 693/udp almanid Connection Endpoint +-# Ronny Bremer <rbremer&almanid.com> +-ha-cluster 694/tcp ha-cluster +-ha-cluster 694/udp ha-cluster +-# Alan Robertson <alanr&unix.sh> +-ieee-mms-ssl 695/tcp IEEE-MMS-SSL +-ieee-mms-ssl 695/udp IEEE-MMS-SSL +-# Curtis Anderson <ecanderson&turbolinux.com> +-rushd 696/tcp RUSHD +-rushd 696/udp RUSHD +-# Greg Ercolano <erco&netcom.com> +-uuidgen 697/tcp UUIDGEN +-uuidgen 697/udp UUIDGEN +-# James Falkner <james.falkner&sun.com> +-olsr 698/tcp OLSR +-olsr 698/udp OLSR +-# Thomas Clausen <thomas.clausen&inria.fr> +-accessnetwork 699/tcp Access Network +-accessnetwork 699/udp Access Network +-# Yingchun Xu <Yingchun_Xu&3com.com> +-epp 700/tcp Extensible Provisioning Protocol +-epp 700/udp Extensible Provisioning Protocol +-# [RFC4934] +-lmp 701/tcp Link Management Protocol (LMP) +-lmp 701/udp Link Management Protocol (LMP) +-# [RFC4204] +-iris-beep 702/tcp IRIS over BEEP +-iris-beep 702/udp IRIS over BEEP +-# [RFC3983] +-# 703 Unassigned +-elcsd 704/tcp errlog copy/server daemon +-elcsd 704/udp errlog copy/server daemon +-agentx 705/tcp AgentX +-agentx 705/udp AgentX +-# Bob Natale <bob.natale&appliedsnmp.com> +-silc 706/tcp SILC +-silc 706/udp SILC +-# Pekka Riikonen <priikone&poseidon.pspt.fi> +-borland-dsj 707/tcp Borland DSJ +-borland-dsj 707/udp Borland DSJ +-# Gerg Cole <gcole&corp.borland.com> +-# 708 Unassigned +-entrust-kmsh 709/tcp Entrust Key Management Service Handler +-entrust-kmsh 709/udp Entrust Key Management Service Handler +-entrust-ash 710/tcp Entrust Administration Service Handler +-entrust-ash 710/udp Entrust Administration Service Handler +-# Peter Whittaker <pww&entrust.com> +-cisco-tdp 711/tcp Cisco TDP +-cisco-tdp 711/udp Cisco TDP +-# Bruce Davie <bsd&cisco.com> +-tbrpf 712/tcp TBRPF +-tbrpf 712/udp TBRPF +-# RFC3684 +-iris-xpc 713/tcp IRIS over XPC +-iris-xpc 713/udp IRIS over XPC +-iris-xpcs 714/tcp IRIS over XPCS +-iris-xpcs 714/udp IRIS over XPCS +-# [RFC4992] +-iris-lwz 715/tcp IRIS-LWZ +-iris-lwz 715/udp IRIS-LWZ +-# [RFC4993] +-pana 716/udp PANA Messages +-# [RFC-ietf-pana-pana-18.txt] +-# 717-728 Unassigned +-netviewdm1 729/tcp IBM NetView DM/6000 Server/Client +-netviewdm1 729/udp IBM NetView DM/6000 Server/Client +-netviewdm2 730/tcp IBM NetView DM/6000 send/tcp +-netviewdm2 730/udp IBM NetView DM/6000 send/tcp +-netviewdm3 731/tcp IBM NetView DM/6000 receive/tcp +-netviewdm3 731/udp IBM NetView DM/6000 receive/tcp +-# Philippe Binet (phbinet&vnet.IBM.COM) +-# 732-740 Unassigned +-netgw 741/tcp netGW +-netgw 741/udp netGW +-# Oliver Korfmacher (okorf&netcs.com) +-netrcs 742/tcp Network based Rev. Cont. Sys. +-netrcs 742/udp Network based Rev. Cont. Sys. +-# Gordon C. Galligher <gorpong&ping.chi.il.us> +-# 743 Unassigned +-flexlm 744/tcp Flexible License Manager +-flexlm 744/udp Flexible License Manager +-# Matt Christiano +-# <globes@matt&oliveb.atc.olivetti.com> +-# 745-746 Unassigned +-fujitsu-dev 747/tcp Fujitsu Device Control +-fujitsu-dev 747/udp Fujitsu Device Control +-ris-cm 748/tcp Russell Info Sci Calendar Manager +-ris-cm 748/udp Russell Info Sci Calendar Manager +-kerberos-adm 749/tcp kerberos administration +-kerberos-adm 749/udp kerberos administration +-rfile 750/tcp +-loadav 750/udp +-kerberos-iv 750/udp kerberos version iv +-# Martin Hamilton <martin&mrrl.lut.as.uk> +-pump 751/tcp +-pump 751/udp +-qrh 752/tcp +-qrh 752/udp +-rrh 753/tcp +-rrh 753/udp +-tell 754/tcp send +-tell 754/udp send +-# Josyula R. Rao <jrrao&watson.ibm.com> +-# 755-756 Unassigned +-nlogin 758/tcp +-nlogin 758/udp +-con 759/tcp +-con 759/udp +-ns 760/tcp +-ns 760/udp +-rxe 761/tcp +-rxe 761/udp +-quotad 762/tcp +-quotad 762/udp +-cycleserv 763/tcp +-cycleserv 763/udp +-omserv 764/tcp +-omserv 764/udp +-webster 765/tcp +-webster 765/udp +-# Josyula R. Rao <jrrao&watson.ibm.com> +-# 766 Unassigned +-phonebook 767/tcp phone +-phonebook 767/udp phone +-# Josyula R. Rao <jrrao&watson.ibm.com> +-# 768 Unassigned +-vid 769/tcp +-vid 769/udp +-cadlock 770/tcp +-cadlock 770/udp +-rtip 771/tcp +-rtip 771/udp +-cycleserv2 772/tcp +-cycleserv2 772/udp +-submit 773/tcp +-notify 773/udp +-rpasswd 774/tcp +-acmaint_dbd 774/udp +-entomb 775/tcp +-acmaint_transd 775/udp +-wpages 776/tcp +-wpages 776/udp +-# Josyula R. Rao <jrrao&watson.ibm.com> +-multiling-http 777/tcp Multiling HTTP +-multiling-http 777/udp Multiling HTTP +-# Alejandro Bonet <babel&ctv.es> +-# 778-779 Unassigned +-wpgs 780/tcp +-wpgs 780/udp +-# Josyula R. Rao <jrrao&watson.ibm.com> +-# 781-785 Unassigned +-# 786 Unassigned (Removed 2002-05-08) +-# 787 Unassigned (Removed 2002-10-08) +-# 788-799 Unassigned +-mdbs_daemon 800/tcp +-mdbs_daemon 800/udp +-device 801/tcp +-device 801/udp +-# 802-809 Unassigned +-fcp-udp 810/tcp FCP +-fcp-udp 810/udp FCP Datagram +-# Paul Whittemore <paul&softarc.com> +-# 811-827 Unassigned +-itm-mcell-s 828/tcp itm-mcell-s +-itm-mcell-s 828/udp itm-mcell-s +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-pkix-3-ca-ra 829/tcp PKIX-3 CA/RA +-pkix-3-ca-ra 829/udp PKIX-3 CA/RA +-# Carlisle Adams <Cadams&entrust.com> +-netconf-ssh 830/tcp NETCONF over SSH +-netconf-ssh 830/udp NETCONF over SSH +-# [RFC4742] +-netconf-beep 831/tcp NETCONF over BEEP +-netconf-beep 831/udp NETCONF over BEEP +-# [RFC4744] +-netconfsoaphttp 832/tcp NETCONF for SOAP over HTTPS +-netconfsoaphttp 832/udp NETCONF for SOAP over HTTPS +-# [RFC4743] +-netconfsoapbeep 833/tcp NETCONF for SOAP over BEEP +-netconfsoapbeep 833/udp NETCONF for SOAP over BEEP +-# [RFC4743] +-# 834-846 Unassigned +-dhcp-failover2 847/tcp dhcp-failover 2 +-dhcp-failover2 847/udp dhcp-failover 2 +-# Bernard Volz <volz&cisco.com> +-gdoi 848/tcp GDOI +-gdoi 848/udp GDOI +-# [RFC3547] +-# 849-859 Unassigned +-iscsi 860/tcp iSCSI +-iscsi 860/udp iSCSI +-# RFC3720 +-owamp-control 861/tcp OWAMP-Control +-owamp-control 861/udp OWAMP-Control +-# [RFC4656] +-# 862-872 Unassigned +-rsync 873/tcp rsync +-rsync 873/udp rsync +-# Andrew Tridgell <tridge&samba.anu.edu.au> +-# 874-885 Unassigned +-iclcnet-locate 886/tcp ICL coNETion locate server +-iclcnet-locate 886/udp ICL coNETion locate server +-# Bob Lyon <bl&oasis.icl.co.uk> +-iclcnet_svinfo 887/tcp ICL coNETion server info +-iclcnet_svinfo 887/udp ICL coNETion server info +-# Bob Lyon <bl&oasis.icl.co.uk> +-accessbuilder 888/tcp AccessBuilder +-accessbuilder 888/udp AccessBuilder +-# Steve Sweeney <Steven_Sweeney&3mail.3com.com> +-# The following entry records an unassigned but widespread use +-cddbp 888/tcp CD Database Protocol +-# Steve Scherf <steve&moonsoft.com> +-# +-# 889-899 Unassigned +-omginitialrefs 900/tcp OMG Initial Refs +-omginitialrefs 900/udp OMG Initial Refs +-# Christian Callsen <Christian.Callsen&eng.sun.com> +-smpnameres 901/tcp SMPNAMERES +-smpnameres 901/udp SMPNAMERES +-# Leif Ekblad <leif&rdos.net> +-ideafarm-door 902/tcp self documenting Telnet Door +-ideafarm-door 902/udp self documenting Door: send 0x00 for info +-ideafarm-panic 903/tcp self documenting Telnet Panic Door +-ideafarm-panic 903/udp self documenting Panic Door: send 0x00 for info +-# Wo'o Ideafarm <c74a39f7.9ad6f42c&ideafarm.com> +-# 904-909 Unassigned +-kink 910/tcp Kerberized Internet Negotiation of Keys (KINK) +-kink 910/udp Kerberized Internet Negotiation of Keys (KINK) +-# [RFC4430] +-xact-backup 911/tcp xact-backup +-xact-backup 911/udp xact-backup +-# Bill Carroll <billc&xactlabs.com> +-apex-mesh 912/tcp APEX relay-relay service +-apex-mesh 912/udp APEX relay-relay service +-apex-edge 913/tcp APEX endpoint-relay service +-apex-edge 913/udp APEX endpoint-relay service +-# [RFC3340] +-# 914-988 Unassigned +-ftps-data 989/tcp ftp protocol, data, over TLS/SSL +-ftps-data 989/udp ftp protocol, data, over TLS/SSL +-ftps 990/tcp ftp protocol, control, over TLS/SSL +-ftps 990/udp ftp protocol, control, over TLS/SSL +-# Christopher Allen <ChristopherA&consensus.com> +-nas 991/tcp Netnews Administration System +-nas 991/udp Netnews Administration System +-# Vera Heinau <heinau&fu-berlin.de> +-# Heiko Schlichting <heiko&fu-berlin.de> +-telnets 992/tcp telnet protocol over TLS/SSL +-telnets 992/udp telnet protocol over TLS/SSL +-imaps 993/tcp imap4 protocol over TLS/SSL +-imaps 993/udp imap4 protocol over TLS/SSL +-ircs 994/tcp irc protocol over TLS/SSL +-ircs 994/udp irc protocol over TLS/SSL +-# Christopher Allen <ChristopherA&consensus.com> +-pop3s 995/tcp pop3 protocol over TLS/SSL (was spop3) +-pop3s 995/udp pop3 protocol over TLS/SSL (was spop3) +-# Gordon Mangione <gordmµsoft.com> +-vsinet 996/tcp vsinet +-vsinet 996/udp vsinet +-# Rob Juergens <robj&vsi.com> +-maitrd 997/tcp +-maitrd 997/udp +-busboy 998/tcp +-puparp 998/udp +-garcon 999/tcp +-applix 999/udp Applix ac +-puprouter 999/tcp +-puprouter 999/udp +-cadlock2 1000/tcp +-cadlock2 1000/udp +-# 1001-1009 Unassigned +-# 1008/udp Possibly used by Sun Solaris???? +-surf 1010/tcp surf +-surf 1010/udp surf +-# Joseph Geer <jgeer&peapod.com> +-# 1011-1020 Reserved +-exp1 1021/tcp RFC3692-style Experiment 1 (*) [RFC4727] +-exp1 1021/udp RFC3692-style Experiment 1 (*) [RFC4727] +-exp2 1022/tcp RFC3692-style Experiment 2 (*) [RFC4727] +-exp2 1022/udp RFC3692-style Experiment 2 (*) [RFC4727] +- 1023/tcp Reserved +- 1023/udp Reserved +-# IANA <iana&iana.org> +- +-(*) It is only appropriate to use these values in explicitly- +- configured experiments; they MUST NOT be shipped as defaults in +- implementations. See RFC 3692 for details. +- +- +- +- +- +- +-REGISTERED PORT NUMBERS +- +-The Registered Ports are listed by the IANA and on most systems can be +-used by ordinary user processes or programs executed by ordinary +-users. +- +-Ports are used in the TCP [RFC793] to name the ends of logical +-connections which carry long term conversations. For the purpose of +-providing services to unknown callers, a service contact port is +-defined. This list specifies the port used by the server process as +-its contact port. +- +-The IANA registers uses of these ports as a convenience to the +-community. +- +-To the extent possible, these same port assignments are used with the +-UDP [RFC768]. +- +-The Registered Ports are in the range 1024-49151. +- +-Port Assignments: +- +-Keyword Decimal Description References +-------- ------- ----------- ---------- +- 1024/tcp Reserved +- 1024/udp Reserved +-# IANA <iana&iana.org> +-blackjack 1025/tcp network blackjack +-blackjack 1025/udp network blackjack +-# Unknown contact +-cap 1026/tcp Calendar Access Protocol +-cap 1026/udp Calendar Access Protocol +-# Doug Royer <Doug&Royer.com> June 2002 +-# 1027/tcp Unassigned (Removed on 2005-09-16) +-# 1028 Deprecated February 2004 +-solid-mux 1029/tcp Solid Mux Server +-solid-mux 1029/udp Solid Mux Server +-# Anders Borg <anders.borg&solid.se> November 2004 +-iad1 1030/tcp BBN IAD +-iad1 1030/udp BBN IAD +-iad2 1031/tcp BBN IAD +-iad2 1031/udp BBN IAD +-iad3 1032/tcp BBN IAD +-iad3 1032/udp BBN IAD +-# Andy Malis <malis_a&timeplex.com> +-netinfo-local 1033/tcp local netinfo port +-netinfo-local 1033/udp local netinfo port +-# Marc Majka <majka&apple.com> August 2002 +-activesync 1034/tcp ActiveSync Notifications +-activesync 1034/udp ActiveSync Notifications +-# Sandra Vargas <Sandramaµsoft.com> March 2003 +-mxxrlogin 1035/tcp MX-XR RPC +-mxxrlogin 1035/udp MX-XR RPC +-# Arnold E. Mauer <amauer&vrms.com> April 2003 +-nsstp 1036/tcp Nebula Secure Segment Transfer Protocol +-nsstp 1036/udp Nebula Secure Segment Transfer Protocol +-# Steve Ravida <steve.ravida&nebulaholdings.com> +-ams 1037/tcp AMS +-ams 1037/udp AMS +-# Ronald R. Ohmer <rohmer&aisconsulting.net> October 2003 / February 2004 +-mtqp 1038/tcp Message Tracking Query Protocol +-mtqp 1038/udp Message Tracking Query Protocol +-# [RFC3887] +-sbl 1039/tcp Streamlined Blackhole +-sbl 1039/udp Streamlined Blackhole +-# Jonathan A. Zdziaraski <jonathan&nuclearelephant.com> November 2004 +-netarx 1040/tcp Netarx +-netarx 1040/udp Netarx +-# Fredrick Paul Eisele <phreed&netarx.com> +-danf-ak2 1041/tcp AK2 Product +-danf-ak2 1041/udp AK2 Product +-# Karl Palsson <karl_p&danfoss.com> November 2004 +-afrog 1042/tcp Subnet Roaming +-afrog 1042/udp Subnet Roaming +-# Michael Chapman <mchapman&fortresstech.com> November 2004 +-boinc-client 1043/tcp BOINC Client Control +-boinc-client 1043/udp BOINC Client Control +-# David Anderson <davea&ssl.berkeley.edu> November 2004 +-dcutility 1044/tcp Dev Consortium Utility +-dcutility 1044/udp Dev Consortium Utility +-# Chris Ryland <cpr&emsoftware.com> November 2004 +-fpitp 1045/tcp Fingerprint Image Transfer Protocol +-fpitp 1045/udp Fingerprint Image Transfer Protocol +-# Steven Fields <sfields&identix.com> February 2002 +-wfremotertm 1046/tcp WebFilter Remote Monitor +-wfremotertm 1046/udp WebFilter Remote Monitor +-# Tim Morgan <timm&surfcontrol.com> November 2004 +-neod1 1047/tcp Sun's NEO Object Request Broker +-neod1 1047/udp Sun's NEO Object Request Broker +-neod2 1048/tcp Sun's NEO Object Request Broker +-neod2 1048/udp Sun's NEO Object Request Broker +-# Rohit Garg <rohit.garg&eng.sun.com> +-td-postman 1049/tcp Tobit David Postman VPMN +-td-postman 1049/udp Tobit David Postman VPMN +-# Franz-Josef Leuders <development&tobit.com> +-cma 1050/tcp CORBA Management Agent +-cma 1050/udp CORBA Management Agent +-# Ramy Zaarour <ramy&lumos.com> +-optima-vnet 1051/tcp Optima VNET +-optima-vnet 1051/udp Optima VNET +-# Ralf Doewich <ralf.doewich&optimatele.com> +-ddt 1052/tcp Dynamic DNS Tools +-ddt 1052/udp Dynamic DNS Tools +-# Remi Lefebvre <remi&debian.org> +-remote-as 1053/tcp Remote Assistant (RA) +-remote-as 1053/udp Remote Assistant (RA) +-# Roman Kriis <roman&previo.ee> +-brvread 1054/tcp BRVREAD +-brvread 1054/udp BRVREAD +-# A. Boninn <aboninn&hotmail.com> +-ansyslmd 1055/tcp ANSYS - License Manager +-ansyslmd 1055/udp ANSYS - License Manager +-# Suzanne Lorrin <suzanne.lorrin&ansys.com> +-vfo 1056/tcp VFO +-vfo 1056/udp VFO +-# Anthony Gonzalez <agonzal1&telcordia.com> +-startron 1057/tcp STARTRON +-startron 1057/udp STARTRON +-# Markus Sabadello <sabadello&startron.org> +-nim 1058/tcp nim +-nim 1058/udp nim +-nimreg 1059/tcp nimreg +-nimreg 1059/udp nimreg +-# Robert Gordon <rbg&austin.ibm.com> +-polestar 1060/tcp POLESTAR +-polestar 1060/udp POLESTAR +-# Masakuni Okada <masakuni&jp.ibm.com> +-kiosk 1061/tcp KIOSK +-kiosk 1061/udp KIOSK +-# Ken Ksiazek <kksiazek&maytag.com> +-veracity 1062/tcp Veracity +-veracity 1062/udp Veracity +-# Ross Williams <ross&rocksoft.com> +-kyoceranetdev 1063/tcp KyoceraNetDev +-kyoceranetdev 1063/udp KyoceraNetDev +-# Shigenaka Kanemitsu +-# <Shigenaka_Kanemitsu&ypd.kyocera.co.jp> +-jstel 1064/tcp JSTEL +-jstel 1064/udp JSTEL +-# Duane Kiser <dkiser&jsexpress.com> +-syscomlan 1065/tcp SYSCOMLAN +-syscomlan 1065/udp SYSCOMLAN +-# Urs Ryf <urs.ryf&selectron.ch> +-fpo-fns 1066/tcp FPO-FNS +-fpo-fns 1066/udp FPO-FNS +-# Jens Klose <jklose&intercope.com> +-instl_boots 1067/tcp Installation Bootstrap Proto. Serv. +-instl_boots 1067/udp Installation Bootstrap Proto. Serv. +-instl_bootc 1068/tcp Installation Bootstrap Proto. Cli. +-instl_bootc 1068/udp Installation Bootstrap Proto. Cli. +-# David Arko <darko&hpfcrn.fc.hp.com> +-cognex-insight 1069/tcp COGNEX-INSIGHT +-cognex-insight 1069/udp COGNEX-INSIGHT +-# Steve Olson <solson&cognex.com> +-gmrupdateserv 1070/tcp GMRUpdateSERV +-gmrupdateserv 1070/udp GMRUpdateSERV +-# Steve Kellogg <stevekellogg&mezzogmr.com> +-bsquare-voip 1071/tcp BSQUARE-VOIP +-bsquare-voip 1071/udp BSQUARE-VOIP +-# Yen Lee <YenL&bsquare.com> +-cardax 1072/tcp CARDAX +-cardax 1072/udp CARDAX +-# Charles Oram <charleso&cardax.com> +-bridgecontrol 1073/tcp Bridge Control +-bridgecontrol 1073/udp Bridge Control +-# Andy Heron <btexact.ports&bt.com> +-warmspotMgmt 1074/tcp Warmspot Management Protocol +-warmspotMgmt 1074/udp Warmspot Management Protocol +-# Robert C. Henningsgard <rhenn_iana&laptwo.com> +-rdrmshc 1075/tcp RDRMSHC +-rdrmshc 1075/udp RDRMSHC +-# Ericko Shimada <eriko&kel.fujitsu.co.jp> +-dab-sti-c 1076/tcp DAB STI-C +-dab-sti-c 1076/udp DAB STI-C +-# World DAB <worlddab_irc&worlddab.org> +-imgames 1077/tcp IMGames +-imgames 1077/udp IMGames +-# Jean A. Ames <engr-admin&flipside.com> +-avocent-proxy 1078/tcp Avocent Proxy Protocol +-avocent-proxy 1078/udp Avocent Proxy Protocol +-# Steven W. Clark <steven.clark&avocent.com> +-asprovatalk 1079/tcp ASPROVATalk +-asprovatalk 1079/udp ASPROVATalk +-# Chiew Farn Chung <cfchung&asprova.com> +-socks 1080/tcp Socks +-socks 1080/udp Socks +-# Ying-Da Lee <ylee&syl.dl.nec.com +-pvuniwien 1081/tcp PVUNIWIEN +-pvuniwien 1081/udp PVUNIWIEN +-# Peter Lipp >Peter.Lipp&iaik.at> +-amt-esd-prot 1082/tcp AMT-ESD-PROT +-amt-esd-prot 1082/udp AMT-ESD-PROT +-# AMTEC S.p.A <sp.amtec&interbusiness.it> +-ansoft-lm-1 1083/tcp Anasoft License Manager +-ansoft-lm-1 1083/udp Anasoft License Manager +-ansoft-lm-2 1084/tcp Anasoft License Manager +-ansoft-lm-2 1084/udp Anasoft License Manager +-webobjects 1085/tcp Web Objects +-webobjects 1085/udp Web Objects +-# Andy Belk <abelk&apple.com> +-cplscrambler-lg 1086/tcp CPL Scrambler Logging +-cplscrambler-lg 1086/udp CPL Scrambler Logging +-cplscrambler-in 1087/tcp CPL Scrambler Internal +-cplscrambler-in 1087/udp CPL Scrambler Internal +-cplscrambler-al 1088/tcp CPL Scrambler Alarm Log +-cplscrambler-al 1088/udp CPL Scrambler Alarm Log +-# Richard Corn <rac&racc.com> +-ff-annunc 1089/tcp FF Annunciation +-ff-annunc 1089/udp FF Annunciation +-ff-fms 1090/tcp FF Fieldbus Message Specification +-ff-fms 1090/udp FF Fieldbus Message Specification +-ff-sm 1091/tcp FF System Management +-ff-sm 1091/udp FF System Management +-# Fieldbus Foundation <dave.glanzer&fieldbus.org> +-obrpd 1092/tcp Open Business Reporting Protocol +-obrpd 1092/udp Open Business Reporting Protocol +-# William Randolph Royere III +-# <william&royere.net> +-proofd 1093/tcp PROOFD +-proofd 1093/udp PROOFD +-rootd 1094/tcp ROOTD +-rootd 1094/udp ROOTD +-# Fons Rademakers <Fons.Rademakers&cern.ch> +-nicelink 1095/tcp NICELink +-nicelink 1095/udp NICELink +-# Jordi Lisbona <jlisbona&tango04.net> +-cnrprotocol 1096/tcp Common Name Resolution Protocol +-cnrprotocol 1096/udp Common Name Resolution Protocol +-# Michael Mealling <michaelm&netsol.com> +-sunclustermgr 1097/tcp Sun Cluster Manager +-sunclustermgr 1097/udp Sun Cluster Manager +-# Ashit Patel <Ashit.Patel&eng.Sun.COM> +-rmiactivation 1098/tcp RMI Activation +-rmiactivation 1098/udp RMI Activation +-rmiregistry 1099/tcp RMI Registry +-rmiregistry 1099/udp RMI Registry +-# Mark Hodapp <mark.hodapp&sun.com> +-mctp 1100/tcp MCTP +-mctp 1100/udp MCTP +-# Vitaly Revsin <vitaly&webmanage.com> +-pt2-discover 1101/tcp PT2-DISCOVER +-pt2-discover 1101/udp PT2-DISCOVER +-# Ralph Kammerlander +-# <ralph.kammerlander&khe.siemens.de> +-adobeserver-1 1102/tcp ADOBE SERVER 1 +-adobeserver-1 1102/udp ADOBE SERVER 1 +-adobeserver-2 1103/tcp ADOBE SERVER 2 +-adobeserver-2 1103/udp ADOBE SERVER 2 +-# Frank Soetebeer <frsoeteb&adobe.com> +-xrl 1104/tcp XRL +-xrl 1104/udp XRL +-# Patrick Robinson <probinson&plosive.com> +-ftranhc 1105/tcp FTRANHC +-ftranhc 1105/udp FTRANHC +-# Eriko Shimada <eriko&kel.fujitsu.co.jp> +-isoipsigport-1 1106/tcp ISOIPSIGPORT-1 +-isoipsigport-1 1106/udp ISOIPSIGPORT-1 +-isoipsigport-2 1107/tcp ISOIPSIGPORT-2 +-isoipsigport-2 1107/udp ISOIPSIGPORT-2 +-# Peter Egli <peter.egli&inalp.com> +-ratio-adp 1108/tcp ratio-adp +-ratio-adp 1108/udp ratio-adp +-# Oliver Thulke <oth&ratio.de> +-# 1109 Reserved - IANA +-webadmstart 1110/tcp Start web admin server +-nfsd-keepalive 1110/udp Client status info +-# Beth Crespo <beth.crespo&hp.com> +-lmsocialserver 1111/tcp LM Social Server +-lmsocialserver 1111/udp LM Social Server +-# Ron Lussier <coyote&likeminds.com> +-icp 1112/tcp Intelligent Communication Protocol +-icp 1112/udp Intelligent Communication Protocol +-# Mark H. David <mhd&gensym.com> +-ltp-deepspace 1113/tcp Licklider Transmission Pr +-ltp-deepspace 1113/udp Licklider Transmission Pr +-# Manikantan Ramadas <mramadas&irg.cs.ohiou.edu> September 2005 +-mini-sql 1114/tcp Mini SQL +-mini-sql 1114/udp Mini SQL +-# David Hughes <bambi&Hughes.com.au> +-ardus-trns 1115/tcp ARDUS Transfer +-ardus-trns 1115/udp ARDUS Transfer +-ardus-cntl 1116/tcp ARDUS Control +-ardus-cntl 1116/udp ARDUS Control +-ardus-mtrns 1117/tcp ARDUS Multicast Transfer +-ardus-mtrns 1117/udp ARDUS Multicast Transfer +-# Shinya Abe <abeabe&pfu.co.jp> +-sacred 1118/tcp SACRED +-sacred 1118/udp SACRED +-# RFC3767 +-bnetgame 1119/tcp Battle.net Chat/Game Protocol +-bnetgame 1119/udp Battle.net Chat/Game Protocol +-bnetfile 1120/tcp Battle.net File Transfer Protocol +-bnetfile 1120/udp Battle.net File Transfer Protocol +-# Domain Tech <Domainnametech&blizzard.com> April 2005 +-rmpp 1121/tcp Datalode RMPP +-rmpp 1121/udp Datalode RMPP +-# Dave Ruedger <daver&datalode.com> November 2003 +-availant-mgr 1122/tcp availant-mgr +-availant-mgr 1122/udp availant-mgr +-# Steven Pelletier <stevep&Availant.com> +-murray 1123/tcp Murray +-murray 1123/udp Murray +-# Stu Mark <fordii&j51.com> +-hpvmmcontrol 1124/tcp HP VMM Control +-hpvmmcontrol 1124/udp HP VMM Control +-hpvmmagent 1125/tcp HP VMM Agent +-hpvmmagent 1125/udp HP VMM Agent +-hpvmmdata 1126/tcp HP VMM Agent +-hpvmmdata 1126/udp HP VMM Agent +-# John Morton <j.morton&hp.com> November 2004 +-kwdb-commn 1127/tcp KWDB Remote Communication +-kwdb-commn 1127/udp KWDB Remote Communication +-# Lal Samuel Varghese <lalsam&hp.com> August 2005 +-saphostctrl 1128/tcp SAPHostControl over SOAP/HTTP +-saphostctrl 1128/udp SAPHostControl over SOAP/HTTP +-saphostctrls 1129/tcp SAPHostControl over SOAP/HTTPS +-saphostctrls 1129/udp SAPHostControl over SOAP/HTTPS +-# Muscarella Fabrizio <fabrizio.muscarella&sap.com> April 2006 +-casp 1130/tcp CAC App Service Protocol +-casp 1130/udp CAC App Service Protocol +-caspssl 1131/tcp CAC App Service Protocol Encripted +-caspssl 1131/udp CAC App Service Protocol Encripted +-# Enrique Corujo <enrique&caclearing.com> February 2006 +-kvm-via-ip 1132/tcp KVM-via-IP Management Service +-kvm-via-ip 1132/udp KVM-via-IP Management Service +-# Ian Miller <IANA-reg&adder.com> March 2006 +-dfn 1133/tcp Data Flow Network +-dfn 1133/udp Data Flow Network +-# Dmitry Obuvalin <pulse.cc&mail.ru> February 2006 +-aplx 1134/tcp MicroAPL APLX +-aplx 1134/udp MicroAPL APLX +-# Richard Nabavi <nabaviµapl.co.uk> February 2006 +-omnivision 1135/tcp OmniVision Communication Service +-omnivision 1135/udp OmniVision Communication Service +-# Serge Vacquier <vacquier&systar.fr> February 2006 +-hhb-gateway 1136/tcp HHB Gateway Control +-hhb-gateway 1136/udp HHB Gateway Control +-# Richard Harwell <richardcharwell&eaton.com> February 2006 +-trim 1137/tcp TRIM Workgroup Service +-trim 1137/udp TRIM Workgroup Service +-# Siva Poobalasingam <siva&towersoft.com.au> March 2006 +-encrypted_admin 1138/tcp encrypted admin requests +-encrypted_admin 1138/udp encrypted admin requests +-# Michael Elizarov <Michael.Elizarovµsoft.com> January 2007 +-evm 1139/tcp Enterprise Virtual Manager +-evm 1139/udp Enterprise Virtual Manager +-# Thomas Hennessy <thennessy&manageiq.com> 04 October 2007 +-autonoc 1140/tcp AutoNOC Network Operations Protocol +-autonoc 1140/udp AutoNOC Network Operations Protocol +-# Kyle Lussier <klussier&autonoc.com> December 2005 +-mxomss 1141/tcp User Message Service +-mxomss 1141/udp User Message Service +-# Chaoyi Lang <chao-yi_lang&maxtor.com> January 2006 +-edtools 1142/tcp User Discovery Service +-edtools 1142/udp User Discovery Service +-# Dolson, Lee <dolson&f-net.co.kr> January 2006 +-imyx 1143/tcp Infomatryx Exchange +-imyx 1143/udp Infomatryx Exchange +-# David Walling <sylvanhollow&yahoo.com> March 2006 +-fuscript 1144/tcp Fusion Script +-fuscript 1144/udp Fusion Script +-# Peter Loveday <peter&eyeonline.com> January 2006 +-x9-icue 1145/tcp X9 iCue Show Control +-x9-icue 1145/udp X9 iCue Show Control +-# Brandon Potter <iana&brandonpotter.com> January 2006 +-audit-transfer 1146/tcp audit transfer +-audit-transfer 1146/udp audit transfer +-# Mark Wahl <mark.wahl&informed-control.com> November 2005 +-capioverlan 1147/tcp CAPIoverLAN +-capioverlan 1147/udp CAPIoverLAN +-# Diego Friedel <d.friedel&avm.de> November 2005 +-elfiq-repl 1148/tcp Elfiq Replication Service +-elfiq-repl 1148/udp Elfiq Replication Service +-# Frederick Parent <fparent&elfiq.com> November 2005 +-bvtsonar 1149/tcp BVT Sonar Service +-bvtsonar 1149/udp BVT Sonar Service +-# Justin Huff <justin.huff&blueviewtech.com> November 2005 +-blaze 1150/tcp Blaze File Server +-blaze 1150/udp Blaze File Server +-# Curt Schimmel <curt&small-tree.com> November 2005 +-unizensus 1151/tcp Unizensus Login Server +-unizensus 1151/udp Unizensus Login Server +-# Dirk Materlik <materlik&blubbsoft.de> November 2005 +-winpoplanmess 1152/tcp Winpopup LAN Messenger +-winpoplanmess 1152/udp Winpopup LAN Messenger +-# Vitali Fomine <info&winpopup-lan-messenger.com> November 2005 +-c1222-acse 1153/tcp ANSI C12.22 Port +-c1222-acse 1153/udp ANSI C12.22 Port +-# Avygdor Moise <avy&fdos.ca> November 2005 +-resacommunity 1154/tcp Community Service +-resacommunity 1154/udp Community Service +-# StÃphane MONS <stephane.mons&free.fr> September 2005 +-nfa 1155/tcp Network File Access +-nfa 1155/udp Network File Access +-# James Powell <james&mailhost.unidata.com> +-iascontrol-oms 1156/tcp iasControl OMS +-iascontrol-oms 1156/udp iasControl OMS +-# Todd Guay <todd.guay&oracle.com> November 2004 +-iascontrol 1157/tcp Oracle iASControl +-iascontrol 1157/udp Oracle iASControl +-# Todd Guay <todd.guay&oracle.com> November 2004 +-dbcontrol-oms 1158/tcp dbControl OMS +-dbcontrol-oms 1158/udp dbControl OMS +-# Todd Guay <todd.guay&oracle.com> November 2004 +-oracle-oms 1159/tcp Oracle OMS +-oracle-oms 1159/udp Oracle OMS +-# Todd Guay <todd.guay&oracle.com> November 2004 +-olsv 1160/tcp DB Lite Mult-User Server +-olsv 1160/udp DB Lite Mult-User Server +-# Philip Stephenson <Philip.stephenson&oracle.com> August 2005 +-health-polling 1161/tcp Health Polling +-health-polling 1161/udp Health Polling +-health-trap 1162/tcp Health Trap +-health-trap 1162/udp Health Trap +-sddp 1163/tcp SmartDialer Data Protocol +-sddp 1163/udp SmartDialer Data Protocol +-# Lee Griffiths <lg&dataconnection.com> November 2004 +-qsm-proxy 1164/tcp QSM Proxy Service +-qsm-proxy 1164/udp QSM Proxy Service +-# Norm Lunde <norm&commvault.com> November 2004 +-qsm-gui 1165/tcp QSM GUI Service +-qsm-gui 1165/udp QSM GUI Service +-# Norm Lunde <norm&commvault.com> November 2004 +-qsm-remote 1166/tcp QSM RemoteExec +-qsm-remote 1166/udp QSM RemoteExec +-# Norm Lunde <norm&commvault.com> November 2004 +-cisco-ipsla 1167/tcp Cisco IP SLAs Control Protocol +-cisco-ipsla 1167/udp Cisco IP SLAs Control Protocol +-cisco-ipsla 1167/sctp Cisco IP SLAs Control Protocol +-# Emmanuel Tychon <etychon&cisco.com> March 2006 +-vchat 1168/tcp VChat Conference Service +-vchat 1168/udp VChat Conference Service +-# Andreas Wetzel <mickey&enforcer.cc> September 2002 +-tripwire 1169/tcp TRIPWIRE +-tripwire 1169/udp TRIPWIRE +-# Ed Metcalf <emetcalf&tripwiresecurity.com> +-# Albert Holt <alberth&triosoftware.com> +-atc-lm 1170/tcp AT+C License Manager +-atc-lm 1170/udp AT+C License Manager +-# Peter Schâ°fer <p.schaefer&nospam.atc-systeme.de> February 2004 +-atc-appserver 1171/tcp AT+C FmiApplicationServer +-atc-appserver 1171/udp AT+C FmiApplicationServer +-# Peter Schâ°fer <p.schaefer&nospam.atc-systeme.de> February 2004 +-dnap 1172/tcp DNA Protocol +-dnap 1172/udp DNA Protocol +-# David McLaughlin <davidmclaughlin&accessdata.com> November 2004 +-d-cinema-rrp 1173/tcp D-Cinema Request-Response +-d-cinema-rrp 1173/udp D-Cinema Request-Response +-# Robert Baldwin <baldwin&plusfive.com> November 2004 +-fnet-remote-ui 1174/tcp FlashNet Remote Admin +-fnet-remote-ui 1174/udp FlashNet Remote Admin +-# Terry Smyth <terry&sgluk.com> November 2004 +-dossier 1175/tcp Dossier Server +-dossier 1175/udp Dossier Server +-# Rob Minerick <rob&vortimac.com> November 2004 +-indigo-server 1176/tcp Indigo Home Server +-indigo-server 1176/udp Indigo Home Server +-# Matt Bendiksen <matt&perceptiveautomation.com> November 2004 +-dkmessenger 1177/tcp DKMessenger Protocol +-dkmessenger 1177/udp DKMessenger Protocol +-# Douglas Kadlecek <doug&dkware.com> November 2004 +-sgi-storman 1178/tcp SGI Storage Manager +-sgi-storman 1178/udp SGI Storage Manager +-# Greg Banks <gnb&sgi.com> November 2004 +-b2n 1179/tcp Backup To Neighbor +-b2n 1179/udp Backup To Neighbor +-# Thomas Fok <thomas&melody-soft.com> November 2004 +-mc-client 1180/tcp Millicent Client Proxy +-mc-client 1180/udp Millicent Client Proxy +-# Steve Glassman <steveg&pa.dec.com> +-3comnetman 1181/tcp 3Com Net Management +-3comnetman 1181/udp 3Com Net Management +-# Peter White <peter_white&3com.com> November 2004 +-accelenet 1182/tcp AcceleNet Control +-accelenet 1182/udp AcceleNet Control +-# Peter Lepeska <plepeska&ictompress.com> November 2004 +-llsurfup-http 1183/tcp LL Surfup HTTP +-llsurfup-http 1183/udp LL Surfup HTTP +-llsurfup-https 1184/tcp LL Surfup HTTPS +-llsurfup-https 1184/udp LL Surfup HTTPS +-# Katy Lynn McCullough <KatyM&LapLink.com> +-catchpole 1185/tcp Catchpole port +-catchpole 1185/udp Catchpole port +-# Christian Catchpole <christian&catchpole.net> March 2002 +-mysql-cluster 1186/tcp MySQL Cluster Manager +-mysql-cluster 1186/udp MySQL Cluster Manager +-# Arjen Lentz <arjen&mysql.com> November 2004 +-alias 1187/tcp Alias Service +-alias 1187/udp Alias Service +-# Paul Tokarchuk <ptokarch&alias.com> November 2004 +-hp-webadmin 1188/tcp HP Web Admin +-hp-webadmin 1188/udp HP Web Admin +-# Lance Kind <lance_kind&hp.com> +-unet 1189/tcp Unet Connection +-unet 1189/udp Unet Connection +-# Anthony Stahler <imunfair&yahoo.com> November 2004 +-commlinx-avl 1190/tcp CommLinx GPS / AVL System +-commlinx-avl 1190/udp CommLinx GPS / AVL System +-# Peter Johnson <peter&commlinx.com.au> November 2004 +-gpfs 1191/tcp General Parallel File System +-gpfs 1191/udp General Parallel File System +-# Dave Craft <gpfs&ibm.com> November 2004 +-caids-sensor 1192/tcp caids sensors channel +-caids-sensor 1192/udp caids sensors channel +-# Gregory Hostettler <ghostettler&caracal.ch> November 2004 +-fiveacross 1193/tcp Five Across Server +-fiveacross 1193/udp Five Across Server +-# Glenn Reid <port-reg&fiveacross.com> November 2004 +-openvpn 1194/tcp OpenVPN +-openvpn 1194/udp OpenVPN +-# James Yonan <jim&yonan.net> November 2004 +-rsf-1 1195/tcp RSF-1 clustering +-rsf-1 1195/udp RSF-1 clustering +-# Dave Hines <d.hines&high-availability.com> November 2004 +-netmagic 1196/tcp Network Magic +-netmagic 1196/udp Network Magic +-# Nick Holt <nickh&purenetworks.com> August 2005 +-carrius-rshell 1197/tcp Carrius Remote Access +-carrius-rshell 1197/udp Carrius Remote Access +-# Gerry Dubois <gdubois&carriustech.com> August 2005 +-cajo-discovery 1198/tcp cajo reference discovery +-cajo-discovery 1198/udp cajo reference discovery +-# John Catherino <cajo&dev.java.net> August 2005 +-dmidi 1199/tcp DMIDI +-dmidi 1199/udp DMIDI +-# Phil Kerr <phil&plus24.com> February 2002 +-scol 1200/tcp SCOL +-scol 1200/udp SCOL +-# Cryo-Networks <p.favre&cryo-networks.fr> +-nucleus-sand 1201/tcp Nucleus Sand Database Server +-nucleus-sand 1201/udp Nucleus Sand Database Server +-# James Marsh <James_T_Marsh&hotmail.com> +-caiccipc 1202/tcp caiccipc +-caiccipc 1202/udp caiccipc +-# Vince Re <Vincent.Re&cai.com> +-ssslic-mgr 1203/tcp License Validation +-ssslic-mgr 1203/udp License Validation +-ssslog-mgr 1204/tcp Log Request Listener +-ssslog-mgr 1204/udp Log Request Listener +-# Eric Bruno <ebruno&solution-soft.com> +-accord-mgc 1205/tcp Accord-MGC +-accord-mgc 1205/udp Accord-MGC +-# Roni Even <roni_e&accord.co.il> +-anthony-data 1206/tcp Anthony Data +-anthony-data 1206/udp Anthony Data +-# Paul Dollemore <pauld&anthonydata.com> +-metasage 1207/tcp MetaSage +-metasage 1207/udp MetaSage +-# Peter Anvelt <panvelt&xnai.com> +-seagull-ais 1208/tcp SEAGULL AIS +-seagull-ais 1208/udp SEAGULL AIS +-# Lee Breisacher <lbreisacher&seagullsw.com> +-ipcd3 1209/tcp IPCD3 +-ipcd3 1209/udp IPCD3 +-# Mark Ciskey <mlciskey&plato.com> +-eoss 1210/tcp EOSS +-eoss 1210/udp EOSS +-# Robert Armes <rarmes&axarte.com> +-groove-dpp 1211/tcp Groove DPP +-groove-dpp 1211/udp Groove DPP +-# Ken Moore <kmoore&groove.net> +-lupa 1212/tcp lupa +-lupa 1212/udp lupa +-# Barney Wolff <barney&databus.com> +-mpc-lifenet 1213/tcp MPC LIFENET +-mpc-lifenet 1213/udp MPC LIFENET +-# Ward Silver <hwardsil&wolfenet.com> +-kazaa 1214/tcp KAZAA +-kazaa 1214/udp KAZAA +-# Ahti Heinla <ahti&ahti.bluemoon.ee> +-scanstat-1 1215/tcp scanSTAT 1.0 +-scanstat-1 1215/udp scanSTAT 1.0 +-# William Scheding <wls&wls.org> +-etebac5 1216/tcp ETEBAC 5 +-etebac5 1216/udp ETEBAC 5 +-# Jean-Louis Barbut <etebac5&gsit.fr> +-hpss-ndapi 1217/tcp HPSS NonDCE Gateway +-hpss-ndapi 1217/udp HPSS NonDCE Gateway +-# Michael Gleicher <mgleicher&comcast.net> +-aeroflight-ads 1218/tcp AeroFlight-ADs +-aeroflight-ads 1218/udp AeroFlight-ADs +-aeroflight-ret 1219/tcp AeroFlight-Ret +-aeroflight-ret 1219/udp AeroFlight-Ret +-# Eric Johnson <eric&gruver.net> +-qt-serveradmin 1220/tcp QT SERVER ADMIN +-qt-serveradmin 1220/udp QT SERVER ADMIN +-# Chris LeCroy <lecroy&apple.com> +-sweetware-apps 1221/tcp SweetWARE Apps +-sweetware-apps 1221/udp SweetWARE Apps +-# David Dunetz <david&sweetware.com> +-nerv 1222/tcp SNI R&D network +-nerv 1222/udp SNI R&D network +-# Martin Freiss <freiss.pad&sni.de> +-tgp 1223/tcp TGP +-tgp 1223/udp TGP +-# Gur Kimchi <gur&mail.trulyglobal.com> +-vpnz 1224/tcp VPNz +-vpnz 1224/udp VPNz +-# Tom Strack <TSTRACK&Advnw.com> +-slinkysearch 1225/tcp SLINKYSEARCH +-slinkysearch 1225/udp SLINKYSEARCH +-# Desmond Chan <deschan&prismedia.com> +-stgxfws 1226/tcp STGXFWS +-stgxfws 1226/udp STGXFWS +-# Tetsuya Shioda <tetsuya&saint.nm.fujitsu.co.jp> +-dns2go 1227/tcp DNS2Go +-dns2go 1227/udp DNS2Go +-# Mike Courterier <mikec&deerfield.com> +-florence 1228/tcp FLORENCE +-florence 1228/udp FLORENCE +-# Brian Trammell <btrammell&iventurelab.com> +-zented 1229/tcp ZENworks Tiered Electronic Distribution +-zented 1229/udp ZENworks Tiered Electronic Distribution +-# Ty Ellis <tellis&novell.com> +-periscope 1230/tcp Periscope +-periscope 1230/udp Periscope +-# Kevin Madden <Kevin&emailxtras.com> +-menandmice-lpm 1231/tcp menandmice-lpm +-menandmice-lpm 1231/udp menandmice-lpm +-# Sigfus Magnusson <sigfusm&menandmice.com> +-##### Microsoft (unoffically) using 1232 ##### +-univ-appserver 1233/tcp Universal App Server +-univ-appserver 1233/udp Universal App Server +-# Tim Sent <tim.sent&systemsarchitects.com> +-search-agent 1234/tcp Infoseek Search Agent +-search-agent 1234/udp Infoseek Search Agent +-# Jackie Wu <jackiew&infoseek.com> +-mosaicsyssvc1 1235/tcp mosaicsyssvc1 +-mosaicsyssvc1 1235/udp mosaicsyssvc1 +-# Brian Matthews <bmatthews&mosaicsystems.com> +-bvcontrol 1236/tcp bvcontrol +-bvcontrol 1236/udp bvcontrol +-# Daniel J Walsh <dwalsh&bindview.com> +-tsdos390 1237/tcp tsdos390 +-tsdos390 1237/udp tsdos390 +-# Ben Pracht <ben.pracht&tivoli.com> +-hacl-qs 1238/tcp hacl-qs +-hacl-qs 1238/udp hacl-qs +-# Farid Faez <farid_faez&hp.com> +-nmsd 1239/tcp NMSD +-nmsd 1239/udp NMSD +-# Yuri Machkasov <yuri&ptc.com> +-instantia 1240/tcp Instantia +-instantia 1240/udp Instantia +-# Ruth Slater <ruth.slater&ideagen.co.uk> +-nessus 1241/tcp nessus +-nessus 1241/udp nessus +-# Jordan Hrycaj <jordan&mjh.teddy-net.com> +-nmasoverip 1242/tcp NMAS over IP +-nmasoverip 1242/udp NMAS over IP +-# Hal Henderson <hhenders&novell.com> +-serialgateway 1243/tcp SerialGateway +-serialgateway 1243/udp SerialGateway +-# Stephen LaValley <lavalley&lucent.com> +-isbconference1 1244/tcp isbconference1 +-isbconference1 1244/udp isbconference1 +-isbconference2 1245/tcp isbconference2 +-isbconference2 1245/udp isbconference2 +-# Arnold Dittmann <dittmann&isbcad.de> +-payrouter 1246/tcp payrouter +-payrouter 1246/udp payrouter +-# David Wilson <dwilson&integral-ie.com> +-visionpyramid 1247/tcp VisionPyramid +-visionpyramid 1247/udp VisionPyramid +-# Gavin Hutchinson <gavinh&visionlogistics.com> +-hermes 1248/tcp hermes +-hermes 1248/udp hermes +-# Not known +-mesavistaco 1249/tcp Mesa Vista Co +-mesavistaco 1249/udp Mesa Vista Co +-# Rick LaBanca <rel&mesasys.com> +-swldy-sias 1250/tcp swldy-sias +-swldy-sias 1250/udp swldy-sias +-# Peter E Williams <peter.williams&smallworld-us.com> +-servergraph 1251/tcp servergraph +-servergraph 1251/udp servergraph +-# Lindsay Morris <lmorris&servergraph.com> +-bspne-pcc 1252/tcp bspne-pcc +-bspne-pcc 1252/udp bspne-pcc +-q55-pcc 1253/tcp q55-pcc +-q55-pcc 1253/udp q55-pcc +-# Prem Tirilok <Prem.Tirilok&tellabs.com> +-de-noc 1254/tcp de-noc +-de-noc 1254/udp de-noc +-de-cache-query 1255/tcp de-cache-query +-de-cache-query 1255/udp de-cache-query +-de-server 1256/tcp de-server +-de-server 1256/udp de-server +-# Jeff Burdette <support&digitalenvoy.net> +-shockwave2 1257/tcp Shockwave 2 +-shockwave2 1257/udp Shockwave 2 +-# Dave Simmons <dsimmons¯omedia.com> +-opennl 1258/tcp Open Network Library +-opennl 1258/udp Open Network Library +-opennl-voice 1259/tcp Open Network Library Voice +-opennl-voice 1259/udp Open Network Library Voice +-# Phil Frisbie <phil&hawksoft.com> +-ibm-ssd 1260/tcp ibm-ssd +-ibm-ssd 1260/udp ibm-ssd +-# Barry Whyte <barry_whyte&uk.ibm.com> +-mpshrsv 1261/tcp mpshrsv +-mpshrsv 1261/udp mpshrsv +-# Makoto Ikeyama <ikeyama&ael.fujitsu.co.jp> +-qnts-orb 1262/tcp QNTS-ORB +-qnts-orb 1262/udp QNTS-ORB +-# Raghurama Bhat <raghu&quintus.com> +-dka 1263/tcp dka +-dka 1263/udp dka +-# Chris Griffin <cgriffin&dka.com> +-prat 1264/tcp PRAT +-prat 1264/udp PRAT +-# Keith Wood <keith.wood&epid.eurotherm.co.uk> +-dssiapi 1265/tcp DSSIAPI +-dssiapi 1265/udp DSSIAPI +-# Jim Turner <Jim.Turner&asg.com> +-dellpwrappks 1266/tcp DELLPWRAPPKS +-dellpwrappks 1266/udp DELLPWRAPPKS +-# David Troeger <David_Troeger&dell.com> +-epc 1267/tcp eTrust Policy Compliance +-epc 1267/udp eTrust Policy Compliance +-# Aaron Stein <aaron.stein&ca.com> +-propel-msgsys 1268/tcp PROPEL-MSGSYS +-propel-msgsys 1268/udp PROPEL-MSGSYS +-# Bert Van der Linden <bert&propel.com> +-watilapp 1269/tcp WATiLaPP +-watilapp 1269/udp WATiLaPP +-# Frederic Weymann <contact&fizzban.net> +-opsmgr 1270/tcp Microsoft Operations Manager +-opsmgr 1270/udp Microsoft Operations Manager +-# Ashvin Sanghvi <AshvinSµsoft.com> +-excw 1271/tcp eXcW +-excw 1271/udp eXcW +-# Norm Freedman <normfree&san.rr.com> +-cspmlockmgr 1272/tcp CSPMLockMgr +-cspmlockmgr 1272/udp CSPMLockMgr +-# Ibtsam Mahfouz <imahfouz&cisco.com> +-emc-gateway 1273/tcp EMC-Gateway +-emc-gateway 1273/udp EMC-Gateway +-# Rene Fontaine <fontaine_rene&emc.com> +-t1distproc 1274/tcp t1distproc +-t1distproc 1274/udp t1distproc +-# Julian Biddle <julian_biddle&TechnologyOneCorp.com> +-ivcollector 1275/tcp ivcollector +-ivcollector 1275/udp ivcollector +-ivmanager 1276/tcp ivmanager +-ivmanager 1276/udp ivmanager +-# Xavier Roques <xroques&infovista.fr> +-miva-mqs 1277/tcp mqs +-miva-mqs 1277/udp mqs +-# Miva Corporation <jwoods&miva.com.au> +-dellwebadmin-1 1278/tcp Dell Web Admin 1 +-dellwebadmin-1 1278/udp Dell Web Admin 1 +-dellwebadmin-2 1279/tcp Dell Web Admin 2 +-dellwebadmin-2 1279/udp Dell Web Admin 2 +-# Bridget Navoda <Bridget_Navoda&dell.com> +-pictrography 1280/tcp Pictrography +-pictrography 1280/udp Pictrography +-# Takashi Hoshino <hoshino&miya.fujifilm.co.jp> +-healthd 1281/tcp healthd +-healthd 1281/udp healthd +-# James E. Housley <jim&thehousleys.net> +-emperion 1282/tcp Emperion +-emperion 1282/udp Emperion +-# Claus Thor Barth <iana&barth.dk> +-productinfo 1283/tcp ProductInfo +-productinfo 1283/udp ProductInfo +-iee-qfx 1284/tcp IEE-QFX +-iee-qfx 1284/udp IEE-QFX +-# Kevin D. Quitt <KQuitt&IEEInc.com> +-neoiface 1285/tcp neoiface +-neoiface 1285/udp neoiface +-# Jason McManus <jasonm&neoinformatics.com> +-netuitive 1286/tcp netuitive +-netuitive 1286/udp netuitive +-# JF Huard <jfhuard&netuitive.com> +-routematch 1287/tcp RouteMatch Com +-routematch 1287/udp RouteMatch Com +-# Jeff Jones <Jeff.Jones&routematch.com> November 2005 +-navbuddy 1288/tcp NavBuddy +-navbuddy 1288/udp NavBuddy +-# Eric Hackman <ehackman&millapps.com> +-jwalkserver 1289/tcp JWalkServer +-jwalkserver 1289/udp JWalkServer +-winjaserver 1290/tcp WinJaServer +-winjaserver 1290/udp WinJaServer +-seagulllms 1291/tcp SEAGULLLMS +-seagulllms 1291/udp SEAGULLLMS +-# Lee Breisacher <lbreisacher&seagullsw.com> +-dsdn 1292/tcp dsdn +-dsdn 1292/udp dsdn +-# Stanislaw Skowronek <thesis&elementary.pl> +-pkt-krb-ipsec 1293/tcp PKT-KRB-IPSec +-pkt-krb-ipsec 1293/udp PKT-KRB-IPSec +-# Nancy Davoust <n.davoust&cablelabs.com> +-cmmdriver 1294/tcp CMMdriver +-cmmdriver 1294/udp CMMdriver +-# Lutz Karras <karras&zeiss.de> +-ehtp 1295/tcp End-by-Hop Transmission Protocol +-ehtp 1295/udp End-by-Hop Transmission Protocol +-# Alexander Bogdanov <alexandr_bgd&softhome.net> +-dproxy 1296/tcp dproxy +-dproxy 1296/udp dproxy +-sdproxy 1297/tcp sdproxy +-sdproxy 1297/udp sdproxy +-# Raimond Diederik <rdiederik&descartes.com> +-lpcp 1298/tcp lpcp +-lpcp 1298/udp lpcp +-# Christian Stredicke <stredicke&snom.de> +-hp-sci 1299/tcp hp-sci +-hp-sci 1299/udp hp-sci +-# Kim Scott <kims&cup.hp.com> +-h323hostcallsc 1300/tcp H323 Host Call Secure +-h323hostcallsc 1300/udp H323 Host Call Secure +-# Jim Toga <jtoga&ideal.jf.intel.com> +-ci3-software-1 1301/tcp CI3-Software-1 +-ci3-software-1 1301/udp CI3-Software-1 +-ci3-software-2 1302/tcp CI3-Software-2 +-ci3-software-2 1302/udp CI3-Software-2 +-# Kelli Watson <kwatson&ci3software.com> +-sftsrv 1303/tcp sftsrv +-sftsrv 1303/udp sftsrv +-# Robert Frazier <BobF&mrp3.com> +-boomerang 1304/tcp Boomerang +-boomerang 1304/udp Boomerang +-# Bruce Lueckenhoff <brucelu&cisco.com> +-pe-mike 1305/tcp pe-mike +-pe-mike 1305/udp pe-mike +-# Stephen Hemminger <shemminger&passedge.com> +-re-conn-proto 1306/tcp RE-Conn-Proto +-re-conn-proto 1306/udp RE-Conn-Proto +-# Sandeep Singhal <sandeep&reefedge.com> +-pacmand 1307/tcp Pacmand +-pacmand 1307/udp Pacmand +-# Edward T. O'Shea <oshea&bellsouth.net> +-odsi 1308/tcp Optical Domain Service Interconnect (ODSI) +-odsi 1308/udp Optical Domain Service Interconnect (ODSI) +-# K. Arvind <arvind&tenornetworks.com> +-jtag-server 1309/tcp JTAG server +-jtag-server 1309/udp JTAG server +-# Andrew Draper <adraper&altera.com> +-husky 1310/tcp Husky +-husky 1310/udp Husky +-# Mark Zang <mark&zang.com> +-rxmon 1311/tcp RxMon +-rxmon 1311/udp RxMon +-# Javier Jiminez <javier_l_jimenez&dell.com> +-sti-envision 1312/tcp STI Envision +-sti-envision 1312/udp STI Envision +-# Don Stedman <dones&stisystems.com> +-bmc_patroldb 1313/tcp BMC_PATROLDB +-bmc_patroldb 1313/udp BMC_PATROLDB +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-pdps 1314/tcp Photoscript Distributed Printing System +-pdps 1314/udp Photoscript Distributed Printing System +-# Les Klein <sgy&cix.compulink.co.uk> +-els 1315/tcp E.L.S., Event Listener Service +-els 1315/udp E.L.S., Event Listener Service +-# Jim Cleppe <clep13&hotmail.com> +-exbit-escp 1316/tcp Exbit-ESCP +-exbit-escp 1316/udp Exbit-ESCP +-# Morten Christensen <mjc&exbit.dk> +-vrts-ipcserver 1317/tcp vrts-ipcserver +-vrts-ipcserver 1317/udp vrts-ipcserver +-# Bruce Hestand <Bruce.Hestand&veritas.com> +-krb5gatekeeper 1318/tcp krb5gatekeeper +-krb5gatekeeper 1318/udp krb5gatekeeper +-# Patrick Moore <pcmoore&sandia.gov> +-amx-icsp 1319/tcp AMX-ICSP +-amx-icsp 1319/udp AMX-ICSP +-# Jeff Burch <jeff.burch&amx.com> +-amx-axbnet 1320/tcp AMX-AXBNET +-amx-axbnet 1320/udp AMX-AXBNET +-# Jeff Burch <jeff.burch&amx.com> +-pip 1321/tcp PIP +-pip 1321/udp PIP +-# Gordon Mohr <gojomo&usa.net> +-novation 1322/tcp Novation +-novation 1322/udp Novation +-# Alan Dano <wiseobject&yahoo.com> +-brcd 1323/tcp brcd +-brcd 1323/udp brcd +-# Todd Picquelle <todd&picquelle.com> +-delta-mcp 1324/tcp delta-mcp +-delta-mcp 1324/udp delta-mcp +-# Quinton Tormanen <quinton&deltacompsys.com> +-dx-instrument 1325/tcp DX-Instrument +-dx-instrument 1325/udp DX-Instrument +-# Walt Modic <Walt.Modic&dionex.com> +-wimsic 1326/tcp WIMSIC +-wimsic 1326/udp WIMSIC +-# James Brown <ender&admdev.com> +-ultrex 1327/tcp Ultrex +-ultrex 1327/udp Ultrex +-# Tim Walsh <tim&ultrex.com> +-ewall 1328/tcp EWALL +-ewall 1328/udp EWALL +-# Jeff Busma <busma&echogent.com> +-netdb-export 1329/tcp netdb-export +-netdb-export 1329/udp netdb-export +-# Konstantinos Kostis <netdb&kostis.net> +-streetperfect 1330/tcp StreetPerfect +-streetperfect 1330/udp StreetPerfect +-# Michael R. Young <michael.young&tor.sunpub.com> +-intersan 1331/tcp intersan +-intersan 1331/udp intersan +-# Barry H. Feild <barry&intersan.net> +-pcia-rxp-b 1332/tcp PCIA RXP-B +-pcia-rxp-b 1332/udp PCIA RXP-B +-# James Dabbs <jdabbs&tga.com> +-passwrd-policy 1333/tcp Password Policy +-passwrd-policy 1333/udp Password Policy +-# Tonio Pirotta <tonio&tpis.com.au> +-writesrv 1334/tcp writesrv +-writesrv 1334/udp writesrv +-# Marvin Toungate <toungate&austin.ibm.com> +-digital-notary 1335/tcp Digital Notary Protocol +-digital-notary 1335/udp Digital Notary Protocol +-# Wes Doonan +-ischat 1336/tcp Instant Service Chat +-ischat 1336/udp Instant Service Chat +-# Mike Clise <mikec&instantservice.com> +-menandmice-dns 1337/tcp menandmice DNS +-menandmice-dns 1337/udp menandmice DNS +-# Sigfus Magnusson <sigfusm&menandmice.com> +-wmc-log-svc 1338/tcp WMC-log-svr +-wmc-log-svc 1338/udp WMC-log-svr +-# Scott Anderson <sanderso&workingmachines.com> +-kjtsiteserver 1339/tcp kjtsiteserver +-kjtsiteserver 1339/udp kjtsiteserver +-# Jason Aubain <jaubain&kjt.com> +-naap 1340/tcp NAAP +-naap 1340/udp NAAP +-# Henry Haverinen <henry.haverinen&nokia.com> +-qubes 1341/tcp QuBES +-qubes 1341/udp QuBES +-# Eric Grange <egrange&creative-it.net> +-esbroker 1342/tcp ESBroker +-esbroker 1342/udp ESBroker +-# Alexander Medvinsky <smedvinsky&gi.com> +-re101 1343/tcp re101 +-re101 1343/udp re101 +-# Doriano Blengino <tecnico_remove_&_remove_xonelectronics.it> +-icap 1344/tcp ICAP +-icap 1344/udp ICAP +-# Jeremy Elson <jelson&isi.edu> +-vpjp 1345/tcp VPJP +-vpjp 1345/udp VPJP +-# Michael Collins <UBMCollins&aol.com> +-alta-ana-lm 1346/tcp Alta Analytics License Manager +-alta-ana-lm 1346/udp Alta Analytics License Manager +-bbn-mmc 1347/tcp multi media conferencing +-bbn-mmc 1347/udp multi media conferencing +-bbn-mmx 1348/tcp multi media conferencing +-bbn-mmx 1348/udp multi media conferencing +-sbook 1349/tcp Registration Network Protocol +-sbook 1349/udp Registration Network Protocol +-editbench 1350/tcp Registration Network Protocol +-editbench 1350/udp Registration Network Protocol +-# Simson L. Garfinkel <simsong&next.cambridge.ma.us> +-equationbuilder 1351/tcp Digital Tool Works (MIT) +-equationbuilder 1351/udp Digital Tool Works (MIT) +-# Terrence J. Talbot <lexcube!tjt&bu.edu> +-lotusnote 1352/tcp Lotus Note +-lotusnote 1352/udp Lotus Note +-# Greg Pflaum <iris.com!Greg_Pflaum&uunet.uu.net> (July 1992) +-relief 1353/tcp Relief Consulting +-relief 1353/udp Relief Consulting +-# John Feiler <relief!jjfeiler&uu2.psi.com> +-XSIP-network 1354/tcp Five Across XSIP Network +-XSIP-network 1354/udp Five Across XSIP Network +-# Glenn Reid <port-reg&fiveacross.com> +-intuitive-edge 1355/tcp Intuitive Edge +-intuitive-edge 1355/udp Intuitive Edge +-# Montgomery Zukowski +-# <monty&nextnorth.acs.ohio-state.edu> +-cuillamartin 1356/tcp CuillaMartin Company +-cuillamartin 1356/udp CuillaMartin Company +-pegboard 1357/tcp Electronic PegBoard +-pegboard 1357/udp Electronic PegBoard +-# Chris Cuilla +-# <balr!vpnet!cuilla!chris&clout.chi.il.us> +-connlcli 1358/tcp CONNLCLI +-connlcli 1358/udp CONNLCLI +-ftsrv 1359/tcp FTSRV +-ftsrv 1359/udp FTSRV +-# Ines Homem de Melo <sidinf&brfapesp.bitnet> +-mimer 1360/tcp MIMER +-mimer 1360/udp MIMER +-# Per Schroeder <Per.Schroder&mimer.se> +-linx 1361/tcp LinX +-linx 1361/udp LinX +-# Steffen Schilke <---none---> +-timeflies 1362/tcp TimeFlies +-timeflies 1362/udp TimeFlies +-# Doug Kent <mouthers@slugg&nwnexus.wa.com> +-ndm-requester 1363/tcp Network DataMover Requester +-ndm-requester 1363/udp Network DataMover Requester +-ndm-server 1364/tcp Network DataMover Server +-ndm-server 1364/udp Network DataMover Server +-# Toshio Watanabe +-# <watanabe&godzilla.rsc.spdd.ricoh.co.j> +-adapt-sna 1365/tcp Network Software Associates +-adapt-sna 1365/udp Network Software Associates +-# Jeffery Chiao <714-768-401> +-netware-csp 1366/tcp Novell NetWare Comm Service Platform +-netware-csp 1366/udp Novell NetWare Comm Service Platform +-# Laurie Lindsey <llindsey&novell.com> +-dcs 1367/tcp DCS +-dcs 1367/udp DCS +-# Stefan Siebert <ssiebert&dcs.de> +-screencast 1368/tcp ScreenCast +-screencast 1368/udp ScreenCast +-# Bill Tschumy <other!bill&uunet.UU.NET> +-gv-us 1369/tcp GlobalView to Unix Shell +-gv-us 1369/udp GlobalView to Unix Shell +-us-gv 1370/tcp Unix Shell to GlobalView +-us-gv 1370/udp Unix Shell to GlobalView +-# Makoto Mita <mita&ssdev.ksp.fujixerox.co.jp> +-fc-cli 1371/tcp Fujitsu Config Protocol +-fc-cli 1371/udp Fujitsu Config Protocol +-fc-ser 1372/tcp Fujitsu Config Protocol +-fc-ser 1372/udp Fujitsu Config Protocol +-# Ryuichi Horie <horie&spad.sysrap.cs.fujitsu.co.jp> +-chromagrafx 1373/tcp Chromagrafx +-chromagrafx 1373/udp Chromagrafx +-# Mike Barthelemy <msb&chromagrafx.com> +-molly 1374/tcp EPI Software Systems +-molly 1374/udp EPI Software Systems +-# Jim Vlcek <jvlcek&veeco.com> +-bytex 1375/tcp Bytex +-bytex 1375/udp Bytex +-# Mary Ann Burt <bytex!ws054!maryann&uunet.UU.NET> +-ibm-pps 1376/tcp IBM Person to Person Software +-ibm-pps 1376/udp IBM Person to Person Software +-# Simon Phipps <sphipps&vnet.ibm.com> +-cichlid 1377/tcp Cichlid License Manager +-cichlid 1377/udp Cichlid License Manager +-# Andy Burgess <aab&cichlid.com> +-elan 1378/tcp Elan License Manager +-elan 1378/udp Elan License Manager +-# Ken Greer <kg&elan.com> +-dbreporter 1379/tcp Integrity Solutions +-dbreporter 1379/udp Integrity Solutions +-# Tim Dawson <tdawson%mspboss&uunet.UU.NET> +-telesis-licman 1380/tcp Telesis Network License Manager +-telesis-licman 1380/udp Telesis Network License Manager +-# Karl Schendel, Jr. <wiz&telesis.com> +-apple-licman 1381/tcp Apple Network License Manager +-apple-licman 1381/udp Apple Network License Manager +-# Earl Wallace <earlw&apple.com> +-udt_os 1382/tcp udt_os +-udt_os 1382/udp udt_os +-gwha 1383/tcp GW Hannaway Network License Manager +-gwha 1383/udp GW Hannaway Network License Manager +-# J. Gabriel Foster <fop&gwha.com> +-os-licman 1384/tcp Objective Solutions License Manager +-os-licman 1384/udp Objective Solutions License Manager +-# Donald Cornwell <don.cornwell&objective.com> +-atex_elmd 1385/tcp Atex Publishing License Manager +-atex_elmd 1385/udp Atex Publishing License Manager +-# Brett Sorenson <bcs&atex.com> +-checksum 1386/tcp CheckSum License Manager +-checksum 1386/udp CheckSum License Manager +-# Andreas Glocker <glocker&sirius.com> +-cadsi-lm 1387/tcp Computer Aided Design Software Inc LM +-cadsi-lm 1387/udp Computer Aided Design Software Inc LM +-# Sulistio Muljadi <e-mail?> +-objective-dbc 1388/tcp Objective Solutions DataBase Cache +-objective-dbc 1388/udp Objective Solutions DataBase Cache +-# Donald Cornwell <e-mail?> +-iclpv-dm 1389/tcp Document Manager +-iclpv-dm 1389/udp Document Manager +-iclpv-sc 1390/tcp Storage Controller +-iclpv-sc 1390/udp Storage Controller +-iclpv-sas 1391/tcp Storage Access Server +-iclpv-sas 1391/udp Storage Access Server +-iclpv-pm 1392/tcp Print Manager +-iclpv-pm 1392/udp Print Manager +-iclpv-nls 1393/tcp Network Log Server +-iclpv-nls 1393/udp Network Log Server +-iclpv-nlc 1394/tcp Network Log Client +-iclpv-nlc 1394/udp Network Log Client +-iclpv-wsm 1395/tcp PC Workstation Manager software +-iclpv-wsm 1395/udp PC Workstation Manager software +-# A.P. Hobson <A.P.Hobson&bra0112.wins.icl.co.uk> +-dvl-activemail 1396/tcp DVL Active Mail +-dvl-activemail 1396/udp DVL Active Mail +-audio-activmail 1397/tcp Audio Active Mail +-audio-activmail 1397/udp Audio Active Mail +-video-activmail 1398/tcp Video Active Mail +-video-activmail 1398/udp Video Active Mail +-# Avshalom Houri <Avshalom&ubique.com> +-cadkey-licman 1399/tcp Cadkey License Manager +-cadkey-licman 1399/udp Cadkey License Manager +-cadkey-tablet 1400/tcp Cadkey Tablet Daemon +-cadkey-tablet 1400/udp Cadkey Tablet Daemon +-# Joe McCollough <joe&cadkey.com> +-goldleaf-licman 1401/tcp Goldleaf License Manager +-goldleaf-licman 1401/udp Goldleaf License Manager +-# John Fox <---none---> +-prm-sm-np 1402/tcp Prospero Resource Manager +-prm-sm-np 1402/udp Prospero Resource Manager +-prm-nm-np 1403/tcp Prospero Resource Manager +-prm-nm-np 1403/udp Prospero Resource Manager +-# B. Clifford Neuman <bcn&isi.edu> +-igi-lm 1404/tcp Infinite Graphics License Manager +-igi-lm 1404/udp Infinite Graphics License Manager +-ibm-res 1405/tcp IBM Remote Execution Starter +-ibm-res 1405/udp IBM Remote Execution Starter +-netlabs-lm 1406/tcp NetLabs License Manager +-netlabs-lm 1406/udp NetLabs License Manager +-dbsa-lm 1407/tcp DBSA License Manager +-dbsa-lm 1407/udp DBSA License Manager +-# Scott Shattuck <ss&dbsa.com> +-sophia-lm 1408/tcp Sophia License Manager +-sophia-lm 1408/udp Sophia License Manager +-# Eric Brown <sst!emerald!eric&uunet.UU.net> +-here-lm 1409/tcp Here License Manager +-here-lm 1409/udp Here License Manager +-# David Ison <here&dialup.oar.net> +-hiq 1410/tcp HiQ License Manager +-hiq 1410/udp HiQ License Manager +-# Rick Pugh <rick&bilmillennium.com> +-af 1411/tcp AudioFile +-af 1411/udp AudioFile +-# Jim Gettys <jg&crl.dec.com> +-innosys 1412/tcp InnoSys +-innosys 1412/udp InnoSys +-innosys-acl 1413/tcp Innosys-ACL +-innosys-acl 1413/udp Innosys-ACL +-# Eric Welch <--none---> +-ibm-mqseries 1414/tcp IBM MQSeries +-ibm-mqseries 1414/udp IBM MQSeries +-# Roger Meli <rmmeli%winvmd&vnet.ibm.com> +-dbstar 1415/tcp DBStar +-dbstar 1415/udp DBStar +-# Jeffrey Millman <jcm&dbstar.com> +-novell-lu6.2 1416/tcp Novell LU6.2 +-novell-lu6.2 1416/udp Novell LU6.2 +-# Peter Liu <--none---> +-timbuktu-srv1 1417/tcp Timbuktu Service 1 Port +-timbuktu-srv1 1417/udp Timbuktu Service 1 Port +-timbuktu-srv2 1418/tcp Timbuktu Service 2 Port +-timbuktu-srv2 1418/udp Timbuktu Service 2 Port +-timbuktu-srv3 1419/tcp Timbuktu Service 3 Port +-timbuktu-srv3 1419/udp Timbuktu Service 3 Port +-timbuktu-srv4 1420/tcp Timbuktu Service 4 Port +-timbuktu-srv4 1420/udp Timbuktu Service 4 Port +-# Marc Epard <marc&netopia.com> +-gandalf-lm 1421/tcp Gandalf License Manager +-gandalf-lm 1421/udp Gandalf License Manager +-# gilmer&gandalf.ca +-autodesk-lm 1422/tcp Autodesk License Manager +-autodesk-lm 1422/udp Autodesk License Manager +-# David Ko <dko&autodesk.com> +-essbase 1423/tcp Essbase Arbor Software +-essbase 1423/udp Essbase Arbor Software +-hybrid 1424/tcp Hybrid Encryption Protocol +-hybrid 1424/udp Hybrid Encryption Protocol +-# Howard Hart <hch&hybrid.com> +-zion-lm 1425/tcp Zion Software License Manager +-zion-lm 1425/udp Zion Software License Manager +-# David Ferrero <david&zion.com> +-sais 1426/tcp Satellite-data Acquisition System 1 +-sais 1426/udp Satellite-data Acquisition System 1 +-# Bill Taylor <sais&ssec.wisc.edu> +-mloadd 1427/tcp mloadd monitoring tool +-mloadd 1427/udp mloadd monitoring tool +-# Bob Braden <braden&isi.edu> +-informatik-lm 1428/tcp Informatik License Manager +-informatik-lm 1428/udp Informatik License Manager +-# Harald Schlangmann +-# <schlangm&informatik.uni-muenchen.de> +-nms 1429/tcp Hypercom NMS +-nms 1429/udp Hypercom NMS +-tpdu 1430/tcp Hypercom TPDU +-tpdu 1430/udp Hypercom TPDU +-# Noor Chowdhury <noor&hypercom.com> +-rgtp 1431/tcp Reverse Gossip Transport +-rgtp 1431/udp Reverse Gossip Transport +-# Ian Jackson <iwj&cam-orl.co.uk> +-blueberry-lm 1432/tcp Blueberry Software License Manager +-blueberry-lm 1432/udp Blueberry Software License Manager +-# Steve Beigel <ublueb!steve&uunet.uu.net> +-ms-sql-s 1433/tcp Microsoft-SQL-Server +-ms-sql-s 1433/udp Microsoft-SQL-Server +-ms-sql-m 1434/tcp Microsoft-SQL-Monitor +-ms-sql-m 1434/udp Microsoft-SQL-Monitor +-# Peter Hussey <peterhusµsoft.com> +-ibm-cics 1435/tcp IBM CICS +-ibm-cics 1435/udp IBM CICS +-# Geoff Meacock <gbibmswl&ibmmail.COM> +-saism 1436/tcp Satellite-data Acquisition System 2 +-saism 1436/udp Satellite-data Acquisition System 2 +-# Bill Taylor <sais&ssec.wisc.edu> +-tabula 1437/tcp Tabula +-tabula 1437/udp Tabula +-# Marcelo Einhorn +-# <KGUNE%HUJIVM1.bitnet&taunivm.tau.ac.il> +-eicon-server 1438/tcp Eicon Security Agent/Server +-eicon-server 1438/udp Eicon Security Agent/Server +-eicon-x25 1439/tcp Eicon X25/SNA Gateway +-eicon-x25 1439/udp Eicon X25/SNA Gateway +-eicon-slp 1440/tcp Eicon Service Location Protocol +-eicon-slp 1440/udp Eicon Service Location Protocol +-# Pat Calhoun <CALHOUN&admin.eicon.qc.ca> +-cadis-1 1441/tcp Cadis License Management +-cadis-1 1441/udp Cadis License Management +-cadis-2 1442/tcp Cadis License Management +-cadis-2 1442/udp Cadis License Management +-# Todd Wichers <twichers&csn.org> +-ies-lm 1443/tcp Integrated Engineering Software +-ies-lm 1443/udp Integrated Engineering Software +-# David Tong <David_Tong&integrated.mb.ca> +-marcam-lm 1444/tcp Marcam License Management +-marcam-lm 1444/udp Marcam License Management +-# Therese Hunt <hunt&marcam.com> +-proxima-lm 1445/tcp Proxima License Manager +-proxima-lm 1445/udp Proxima License Manager +-ora-lm 1446/tcp Optical Research Associates License Manager +-ora-lm 1446/udp Optical Research Associates License Manager +-apri-lm 1447/tcp Applied Parallel Research LM +-apri-lm 1447/udp Applied Parallel Research LM +-# Jim Dillon <jed&apri.com> +-oc-lm 1448/tcp OpenConnect License Manager +-oc-lm 1448/udp OpenConnect License Manager +-# Sue Barnhill <snb&oc.com> +-peport 1449/tcp PEport +-peport 1449/udp PEport +-# Qentin Neill <quentin&ColumbiaSC.NCR.COM> +-dwf 1450/tcp Tandem Distributed Workbench Facility +-dwf 1450/udp Tandem Distributed Workbench Facility +-# Mike Bert <BERG_MIKE&tandem.com> +-infoman 1451/tcp IBM Information Management +-infoman 1451/udp IBM Information Management +-# Karen Burns <---none---> +-gtegsc-lm 1452/tcp GTE Government Systems License Man +-gtegsc-lm 1452/udp GTE Government Systems License Man +-# Mike Gregory <Gregory_Mike&msmail.iipo.gtegsc.com> +-genie-lm 1453/tcp Genie License Manager +-genie-lm 1453/udp Genie License Manager +-# Paul Applegate <p.applegate2&genie.geis.com> +-interhdl_elmd 1454/tcp interHDL License Manager +-interhdl_elmd 1454/udp interHDL License Manager +-# Eli Sternheim eli&interhdl.com +-esl-lm 1455/tcp ESL License Manager +-esl-lm 1455/udp ESL License Manager +-# Abel Chou <abel&willy.esl.com> +-dca 1456/tcp DCA +-dca 1456/udp DCA +-# Jeff Garbers <jgarbers&netcom.com> +-valisys-lm 1457/tcp Valisys License Manager +-valisys-lm 1457/udp Valisys License Manager +-# Leslie Lincoln <leslie_lincoln&valisys.com> +-nrcabq-lm 1458/tcp Nichols Research Corp. +-nrcabq-lm 1458/udp Nichols Research Corp. +-# Howard Cole <hcole&tumbleweed.nrcabq.com> +-proshare1 1459/tcp Proshare Notebook Application +-proshare1 1459/udp Proshare Notebook Application +-proshare2 1460/tcp Proshare Notebook Application +-proshare2 1460/udp Proshare Notebook Application +-# Robin Kar <Robin_Kar&ccm.hf.intel.com> +-ibm_wrless_lan 1461/tcp IBM Wireless LAN +-ibm_wrless_lan 1461/udp IBM Wireless LAN +-# <flanne&vnet.IBM.COM> +-world-lm 1462/tcp World License Manager +-world-lm 1462/udp World License Manager +-# Michael S Amirault <ambi&world.std.com> +-nucleus 1463/tcp Nucleus +-nucleus 1463/udp Nucleus +-# Venky Nagar <venky&fafner.Stanford.EDU> +-msl_lmd 1464/tcp MSL License Manager +-msl_lmd 1464/udp MSL License Manager +-# Matt Timmermans +-pipes 1465/tcp Pipes Platform +-pipes 1465/udp Pipes Platform mfarlin&peerlogic.com +-# Mark Farlin <mfarlin&peerlogic.com> +-oceansoft-lm 1466/tcp Ocean Software License Manager +-oceansoft-lm 1466/udp Ocean Software License Manager +-# Randy Leonard <randy&oceansoft.com> +-csdmbase 1467/tcp CSDMBASE +-csdmbase 1467/udp CSDMBASE +-csdm 1468/tcp CSDM +-csdm 1468/udp CSDM +-# Robert Stabl <stabl&informatik.uni-muenchen.de> +-aal-lm 1469/tcp Active Analysis Limited License Manager +-aal-lm 1469/udp Active Analysis Limited License Manager +-# David Snocken +44 (71)437-7009 +-uaiact 1470/tcp Universal Analytics +-uaiact 1470/udp Universal Analytics +-# Mark R. Ludwig <Mark-Ludwig&uai.com> +-csdmbase 1471/tcp csdmbase +-csdmbase 1471/udp csdmbase +-csdm 1472/tcp csdm +-csdm 1472/udp csdm +-# Robert Stabl <stabl&informatik.uni-muenchen.de> +-openmath 1473/tcp OpenMath +-openmath 1473/udp OpenMath +-# Garth Mayville <mayville&maplesoft.on.ca> +-telefinder 1474/tcp Telefinder +-telefinder 1474/udp Telefinder +-# Jim White <Jim_White&spiderisland.com> +-taligent-lm 1475/tcp Taligent License Manager +-taligent-lm 1475/udp Taligent License Manager +-# Mark Sapsford <Mark_Sapsford@@taligent.com> +-clvm-cfg 1476/tcp clvm-cfg +-clvm-cfg 1476/udp clvm-cfg +-# Eric Soderberg <seric&cup.hp.com> +-ms-sna-server 1477/tcp ms-sna-server +-ms-sna-server 1477/udp ms-sna-server +-ms-sna-base 1478/tcp ms-sna-base +-ms-sna-base 1478/udp ms-sna-base +-# Gordon Mangione <gordmµsoft.com> +-dberegister 1479/tcp dberegister +-dberegister 1479/udp dberegister +-# Brian Griswold <brian&dancingbear.com> +-pacerforum 1480/tcp PacerForum +-pacerforum 1480/udp PacerForum +-# Peter Caswell <pfc&pacvax.pacersoft.com> +-airs 1481/tcp AIRS +-airs 1481/udp AIRS +-# Bruce Wilson, 905-771-6161 +-miteksys-lm 1482/tcp Miteksys License Manager +-miteksys-lm 1482/udp Miteksys License Manager +-# Shane McRoberts <mcroberts&miteksys.com> +-afs 1483/tcp AFS License Manager +-afs 1483/udp AFS License Manager +-# Michael R. Pizolato <michael&afs.com> +-confluent 1484/tcp Confluent License Manager +-confluent 1484/udp Confluent License Manager +-# James Greenfiel <jim&pa.confluent.com> +-lansource 1485/tcp LANSource +-lansource 1485/udp LANSource +-# Christopher Wells <Christopher_Wells&3com.com> +-nms_topo_serv 1486/tcp nms_topo_serv +-nms_topo_serv 1486/udp nms_topo_serv +-# Sylvia Siu <Sylvia_Siu&Novell.CO> +-localinfosrvr 1487/tcp LocalInfoSrvr +-localinfosrvr 1487/udp LocalInfoSrvr +-# Brian Matthews <brian_matthews&ibist.ibis.com> +-docstor 1488/tcp DocStor +-docstor 1488/udp DocStor +-# Brian Spears <bspears&salix.com> +-dmdocbroker 1489/tcp dmdocbroker +-dmdocbroker 1489/udp dmdocbroker +-# Razmik Abnous <abnous&documentum.com> +-insitu-conf 1490/tcp insitu-conf +-insitu-conf 1490/udp insitu-conf +-# Paul Blacknell <paul&insitu.com> +-anynetgateway 1491/tcp anynetgateway +-anynetgateway 1491/udp anynetgateway +-# Dan Poirier <poirier&VNET.IBM.COM> +-stone-design-1 1492/tcp stone-design-1 +-stone-design-1 1492/udp stone-design-1 +-# Andrew Stone <andrew&stone.com> +-netmap_lm 1493/tcp netmap_lm +-netmap_lm 1493/udp netmap_lm +-# Phillip Magson <philm&extro.ucc.su.OZ.AU> +-ica 1494/tcp ica +-ica 1494/udp ica +-# John Richardson, Citrix Systems +-cvc 1495/tcp cvc +-cvc 1495/udp cvc +-# Bill Davidson <billd&equalizer.cray.com> +-liberty-lm 1496/tcp liberty-lm +-liberty-lm 1496/udp liberty-lm +-# Jim Rogers <trane!jimbo&pacbell.com> +-rfx-lm 1497/tcp rfx-lm +-rfx-lm 1497/udp rfx-lm +-# Bill Bishop <bil&rfx.rfx.com> +-sybase-sqlany 1498/tcp Sybase SQL Any +-sybase-sqlany 1498/udp Sybase SQL Any +-# Dave Neudoerffer <Dave.Neudoerffer&ianywhere.com> +-fhc 1499/tcp Federico Heinz Consultora +-fhc 1499/udp Federico Heinz Consultora +-# Federico Heinz <federico&heinz.com> +-vlsi-lm 1500/tcp VLSI License Manager +-vlsi-lm 1500/udp VLSI License Manager +-# Shue-Lin Kuo <shuelin&mdk.sanjose.vlsi.com> +-saiscm 1501/tcp Satellite-data Acquisition System 3 +-saiscm 1501/udp Satellite-data Acquisition System 3 +-# Bill Taylor <sais&ssec.wisc.edu> +-shivadiscovery 1502/tcp Shiva +-shivadiscovery 1502/udp Shiva +-# Jonathan Wenocur <jhw&Shiva.COM> +-imtc-mcs 1503/tcp Databeam +-imtc-mcs 1503/udp Databeam +-# Jim Johnston <jjohnston&databeam.com> +-evb-elm 1504/tcp EVB Software Engineering License Manager +-evb-elm 1504/udp EVB Software Engineering License Manager +-# B.G. Mahesh < mahesh&sett.com> +-funkproxy 1505/tcp Funk Software, Inc. +-funkproxy 1505/udp Funk Software, Inc. +-# Robert D. Vincent <bert&willowpond.com> +-utcd 1506/tcp Universal Time daemon (utcd) +-utcd 1506/udp Universal Time daemon (utcd) +-# Walter Poxon <wdp&ironwood.cray.com> +-symplex 1507/tcp symplex +-symplex 1507/udp symplex +-# Mike Turley <turley&symplex.com> +-diagmond 1508/tcp diagmond +-diagmond 1508/udp diagmond +-# Pete Moscatelli <moscat&hprdstl0.rose.hp.com> +-robcad-lm 1509/tcp Robcad, Ltd. License Manager +-robcad-lm 1509/udp Robcad, Ltd. License Manager +-# Hindin Joseph <hindin%robcad&uunet.uu.net> +-mvx-lm 1510/tcp Midland Valley Exploration Ltd. Lic. Man. +-mvx-lm 1510/udp Midland Valley Exploration Ltd. Lic. Man. +-# Neil Salter <neil&indigo2.mvel.demon.co.uk>Laszlo +-3l-l1 1511/tcp 3l-l1 +-3l-l1 1511/udp 3l-l1 +-# Ian A. Young <iay&threel.co.uk> +-wins 1512/tcp Microsoft's Windows Internet Name Service +-wins 1512/udp Microsoft's Windows Internet Name Service +-# Pradeep Bahl <pradeepbµsoft.com> +-fujitsu-dtc 1513/tcp Fujitsu Systems Business of America, Inc +-fujitsu-dtc 1513/udp Fujitsu Systems Business of America, Inc +-fujitsu-dtcns 1514/tcp Fujitsu Systems Business of America, Inc +-fujitsu-dtcns 1514/udp Fujitsu Systems Business of America, Inc +-# Charles A. Higgins <75730.2257&compuserve.com> +-ifor-protocol 1515/tcp ifor-protocol +-ifor-protocol 1515/udp ifor-protocol +-# Dr. R.P. Alston <robin&gradient.com> +-vpad 1516/tcp Virtual Places Audio data +-vpad 1516/udp Virtual Places Audio data +-vpac 1517/tcp Virtual Places Audio control +-vpac 1517/udp Virtual Places Audio control +-vpvd 1518/tcp Virtual Places Video data +-vpvd 1518/udp Virtual Places Video data +-vpvc 1519/tcp Virtual Places Video control +-vpvc 1519/udp Virtual Places Video control +-# Avshalom Houri <Avshalom&ubique.com> +-atm-zip-office 1520/tcp atm zip office +-atm-zip-office 1520/udp atm zip office +-# Wilson Kwan <wilsonk%toronto&zip.atm.com> +-ncube-lm 1521/tcp nCube License Manager +-ncube-lm 1521/udp nCube License Manager +-# Maxine Yuen <maxine&hq.ncube.com> +-ricardo-lm 1522/tcp Ricardo North America License Manager +-ricardo-lm 1522/udp Ricardo North America License Manager +-# Mike Flemming <mf&xnet.com> +-cichild-lm 1523/tcp cichild +-cichild-lm 1523/udp cichild +-# Andy Burgess <aab&cichlid.com> +-ingreslock 1524/tcp ingres +-ingreslock 1524/udp ingres +-orasrv 1525/tcp oracle +-orasrv 1525/udp oracle +-prospero-np 1525/tcp Prospero Directory Service non-priv +-prospero-np 1525/udp Prospero Directory Service non-priv +-pdap-np 1526/tcp Prospero Data Access Prot non-priv +-pdap-np 1526/udp Prospero Data Access Prot non-priv +-# B. Clifford Neuman <bcn&isi.edu> +-tlisrv 1527/tcp oracle +-tlisrv 1527/udp oracle +-# Unknown Contact +-# 1528 Unassigned (Returned 2007-10-04) +-coauthor 1529/tcp oracle +-coauthor 1529/udp oracle +-rap-service 1530/tcp rap-service +-rap-service 1530/udp rap-service +-rap-listen 1531/tcp rap-listen +-rap-listen 1531/udp rap-listen +-# Phil Servita <meister&ftp.com> +-miroconnect 1532/tcp miroconnect +-miroconnect 1532/udp miroconnect +-# Michael Fischer +49 531 21 13 0 +-virtual-places 1533/tcp Virtual Places Software +-virtual-places 1533/udp Virtual Places Software +-# Avshalom Houri <Avshalom&ubique.com> +-micromuse-lm 1534/tcp micromuse-lm +-micromuse-lm 1534/udp micromuse-lm +-# Adam Kerrison <adamµmuse.co.uk> +-ampr-info 1535/tcp ampr-info +-ampr-info 1535/udp ampr-info +-ampr-inter 1536/tcp ampr-inter +-ampr-inter 1536/udp ampr-inter +-# Rob Janssen <rob&sys3.pe1chl.ampr.org> +-sdsc-lm 1537/tcp isi-lm +-sdsc-lm 1537/udp isi-lm +-# Len Wanger <lrw&sdsc.edu> +-3ds-lm 1538/tcp 3ds-lm +-3ds-lm 1538/udp 3ds-lm +-# Keith Trummel <ktrummel&autodesk.com> +-intellistor-lm 1539/tcp Intellistor License Manager +-intellistor-lm 1539/udp Intellistor License Manager +-# Ron Vaughn <rv&intellistor.com> +-rds 1540/tcp rds +-rds 1540/udp rds +-rds2 1541/tcp rds2 +-rds2 1541/udp rds2 +-# Sudhakar Rajamannar <mobius1&cerfnet.com> +-gridgen-elmd 1542/tcp gridgen-elmd +-gridgen-elmd 1542/udp gridgen-elmd +-# John R. Chawner +1 817 354-1004 +-simba-cs 1543/tcp simba-cs +-simba-cs 1543/udp simba-cs +-# Betsy Alexander +1 604-681-4549 +-aspeclmd 1544/tcp aspeclmd +-aspeclmd 1544/udp aspeclmd +-# V. Balaji <balaji&aspec.com> +-vistium-share 1545/tcp vistium-share +-vistium-share 1545/udp vistium-share +-# Allison Carleton +-# <acarleto&naper1.napervilleil.ncr.com> +-abbaccuray 1546/tcp abbaccuray +-abbaccuray 1546/udp abbaccuray +-# John Wendt 614-261-2000 +-laplink 1547/tcp laplink +-laplink 1547/udp laplink +-# Michael Crawford <MichaelC&dev.travsoft.com> +-axon-lm 1548/tcp Axon License Manager +-axon-lm 1548/udp Axon License Manager +-# Mark Pearce <<Mark_A.._Pearce/AXON_Networks_Inc..¬es.axon.com> +-shivahose 1549/tcp Shiva Hose +-shivasound 1549/udp Shiva Sound +-# Kin Chan <kchan&shiva.com> +-3m-image-lm 1550/tcp Image Storage license manager 3M Company +-3m-image-lm 1550/udp Image Storage license manager 3M Company +-# J. C. Canessa <jccanessa&mmm.com> +-hecmtl-db 1551/tcp HECMTL-DB +-hecmtl-db 1551/udp HECMTL-DB +-# Maxime Belanger <R173&hec.ca> +-pciarray 1552/tcp pciarray +-pciarray 1552/udp pciarray +-# Ron Folk <rfolkes&avl.com> +-sna-cs 1553/tcp sna-cs +-sna-cs 1553/udp sna-cs +-# Tony Sowter <ts&datcon.co.uk> +-caci-lm 1554/tcp CACI Products Company License Manager +-caci-lm 1554/udp CACI Products Company License Manager +-# Erik Blume <erikb&caciasl.com> +-livelan 1555/tcp livelan +-livelan 1555/udp livelan +-# khedayat&roadrunner.pictel.com <Kaynam Hedayat> +-veritas_pbx 1556/tcp VERITAS Private Branch Exchange +-veritas_pbx 1556/udp VERITAS Private Branch Exchange +-# Stefan Winkel <stefan&veritas.com> April 2004 +-arbortext-lm 1557/tcp ArborText License Manager +-arbortext-lm 1557/udp ArborText License Manager +-# David J. Wilson <djw&arbortext.com> +-xingmpeg 1558/tcp xingmpeg +-xingmpeg 1558/udp xingmpeg +-# Howard Gordon <hgordon&system.xingtech.com> +-web2host 1559/tcp web2host +-web2host 1559/udp web2host +-# Stephen Johnson <sjohnson&mindspring.com> +-asci-val 1560/tcp ASCI-RemoteSHADOW +-asci-val 1560/udp ASCI-RemoteSHADOW +-# Benjamin Rosenberg <brosenberg&advsyscon.com> +-facilityview 1561/tcp facilityview +-facilityview 1561/udp facilityview +-# Ed Green <egreen&pmeasuring.com> +-pconnectmgr 1562/tcp pconnectmgr +-pconnectmgr 1562/udp pconnectmgr +-# Bob Kaiser <BKaiser&palindrome.com> +-cadabra-lm 1563/tcp Cadabra License Manager +-cadabra-lm 1563/udp Cadabra License Manager +-# Arthur Castonguay <arthurc&doe.carleton.ca> +-pay-per-view 1564/tcp Pay-Per-View +-pay-per-view 1564/udp Pay-Per-View +-# Brian Tung <brian&isi.edu> +-winddlb 1565/tcp WinDD +-winddlb 1565/udp WinDD +-# Kelly Sims <kellys&garnet.wv.tek.com> +-corelvideo 1566/tcp CORELVIDEO +-corelvideo 1566/udp CORELVIDEO +-# Ming Poon <mingp&corel.ca> +-jlicelmd 1567/tcp jlicelmd +-jlicelmd 1567/udp jlicelmd +-# Christian Schormann <100410.3063&compuserve.com> +-tsspmap 1568/tcp tsspmap +-tsspmap 1568/udp tsspmap +-# Paul W. Nelson <nelson&thursby.com> +-ets 1569/tcp ets +-ets 1569/udp ets +-# Carstein Seeberg <case&boole.no> +-orbixd 1570/tcp orbixd +-orbixd 1570/udp orbixd +-# Bridget Walsh <bwalsh&iona.ie> +-rdb-dbs-disp 1571/tcp Oracle Remote Data Base +-rdb-dbs-disp 1571/udp Oracle Remote Data Base +-# <mackin&us.oracle.com> +-chip-lm 1572/tcp Chipcom License Manager +-chip-lm 1572/udp Chipcom License Manager +-# Jerry Natowitz <Jerry Natowitz> +-itscomm-ns 1573/tcp itscomm-ns +-itscomm-ns 1573/udp itscomm-ns +-# Rich Thompson <richt&watson.ibm.com> +-mvel-lm 1574/tcp mvel-lm +-mvel-lm 1574/udp mvel-lm +-# David Bisset <dbisset&mvel.demon.co.uk> +-oraclenames 1575/tcp oraclenames +-oraclenames 1575/udp oraclenames +-# P.V.Shivkumar <PSHIVKUM&us.oracle.com> +-moldflow-lm 1576/tcp Moldflow License Manager +-moldflow-lm 1576/udp Moldflow License Manager +-# Lech Laskowski <lech_laskowski&moldflow.com> +-hypercube-lm 1577/tcp hypercube-lm +-hypercube-lm 1577/udp hypercube-lm +-# Christopher McLendon <cem&hyper.com> +-jacobus-lm 1578/tcp Jacobus License Manager +-jacobus-lm 1578/udp Jacobus License Manager +-# Tony Cleveland <tony.cleveland&jacobus.com> +-ioc-sea-lm 1579/tcp ioc-sea-lm +-ioc-sea-lm 1579/udp ioc-sea-lm +-# Paul Nelson <paul&ioc-sea.com> +-tn-tl-r1 1580/tcp tn-tl-r1 +-tn-tl-r2 1580/udp tn-tl-r2 +-# Ed Kress <eskress&thinknet.com> +-mil-2045-47001 1581/tcp MIL-2045-47001 +-mil-2045-47001 1581/udp MIL-2045-47001 +-# Eric Whitehill <Eric.Whitehill&itt.com> +-msims 1582/tcp MSIMS +-msims 1582/udp MSIMS +-# Glenn Olander <gjo&msi.com> +-simbaexpress 1583/tcp simbaexpress +-simbaexpress 1583/udp simbaexpress +-# Betsy Alexander +1 604-681-4549 +-tn-tl-fd2 1584/tcp tn-tl-fd2 +-tn-tl-fd2 1584/udp tn-tl-fd2 +-# Ed Kress <eskress&thinknet.com> +-intv 1585/tcp intv +-intv 1585/udp intv +-# Dermot Tynand <dtynan&claddagh.ie> +-ibm-abtact 1586/tcp ibm-abtact +-ibm-abtact 1586/udp ibm-abtact +-# Sandeep K. Singhal <singhal&CS.Stanford.EDU> +-pra_elmd 1587/tcp pra_elmd +-pra_elmd 1587/udp pra_elmd +-# Dennis Mastin <dennis&tasmania.platte.com> +-triquest-lm 1588/tcp triquest-lm +-triquest-lm 1588/udp triquest-lm +-# Nand Kumar <nkumar&triquest-da.com> +-vqp 1589/tcp VQP +-vqp 1589/udp VQP +-# Keith McCloghrie <kzm&cisco.com> +-gemini-lm 1590/tcp gemini-lm +-gemini-lm 1590/udp gemini-lm +-# Tony Sawyer <tonys&gemtech.com> +-ncpm-pm 1591/tcp ncpm-pm +-ncpm-pm 1591/udp ncpm-pm +-# Ted Power <tedp&hpinpcb.cup.hp.com> +-commonspace 1592/tcp commonspace +-commonspace 1592/udp commonspace +-# Rob Chandhok <chandhok&within.com> +-mainsoft-lm 1593/tcp mainsoft-lm +-mainsoft-lm 1593/udp mainsoft-lm +-# Anand Gangadharan <anand&goa.mainsoft.com> +-sixtrak 1594/tcp sixtrak +-sixtrak 1594/udp sixtrak +-# Bob Rennie <rjrennie&wizvax.net> +-radio 1595/tcp radio +-radio 1595/udp radio +-radio-sm 1596/tcp radio-sm +-radio-bc 1596/udp radio-bc +-# Ken Chapman <kchapman&isis.com> +-orbplus-iiop 1597/tcp orbplus-iiop +-orbplus-iiop 1597/udp orbplus-iiop +-# Robert A. Kukura <kukura&apollo.hp.com> +-picknfs 1598/tcp picknfs +-picknfs 1598/udp picknfs +-# John Lombardo <johnl&picksys.com> +-simbaservices 1599/tcp simbaservices +-simbaservices 1599/udp simbaservices +-# Betsy Alexander +1 604-681-4549 +-issd 1600/tcp issd +-issd 1600/udp issd +-aas 1601/tcp aas +-aas 1601/udp aas +-# Bob Beard <bobb&lachman.com> +-inspect 1602/tcp inspect +-inspect 1602/udp inspect +-# Frank O'Neill <frank&morse.ilo.dec.com> +-picodbc 1603/tcp pickodbc +-picodbc 1603/udp pickodbc +-# John Lombardo <johnl&picksys.com> +-icabrowser 1604/tcp icabrowser +-icabrowser 1604/udp icabrowser +-# Brad Pedersen <bradp&citrix.com> +-slp 1605/tcp Salutation Manager (Salutation Protocol) +-slp 1605/udp Salutation Manager (Salutation Protocol) +-slm-api 1606/tcp Salutation Manager (SLM-API) +-slm-api 1606/udp Salutation Manager (SLM-API) +-# Tohru Mori <tmori&VNET.IBM.COM> +-stt 1607/tcp stt +-stt 1607/udp stt +-# Ryan Bolz <ryanboµsoft.com> +-smart-lm 1608/tcp Smart Corp. License Manager +-smart-lm 1608/udp Smart Corp. License Manager +-# Connie Qiu <connie&scdb.com> +-isysg-lm 1609/tcp isysg-lm +-isysg-lm 1609/udp isysg-lm +-# Adam Curtin <adam.curtin&isysg.com> +-taurus-wh 1610/tcp taurus-wh +-taurus-wh 1610/udp taurus-wh +-# Jeff Moffatt <jeff&taurus.com> +-ill 1611/tcp Inter Library Loan +-ill 1611/udp Inter Library Loan +-# Niall Murphy <niallm&orca.ucd.ie> +-netbill-trans 1612/tcp NetBill Transaction Server +-netbill-trans 1612/udp NetBill Transaction Server +-netbill-keyrep 1613/tcp NetBill Key Repository +-netbill-keyrep 1613/udp NetBill Key Repository +-netbill-cred 1614/tcp NetBill Credential Server +-netbill-cred 1614/udp NetBill Credential Server +-netbill-auth 1615/tcp NetBill Authorization Server +-netbill-auth 1615/udp NetBill Authorization Server +-netbill-prod 1616/tcp NetBill Product Server +-netbill-prod 1616/udp NetBill Product Server +-# Marvin Sirbu <sirbu+&andrew.cmu.edu> +-nimrod-agent 1617/tcp Nimrod Inter-Agent Communication +-nimrod-agent 1617/udp Nimrod Inter-Agent Communication +-# Charles Lynn <clynn&bbn.com> +-skytelnet 1618/tcp skytelnet +-skytelnet 1618/udp skytelnet +-# Byron Jones <byronj&bellsouth.net> +-xs-openstorage 1619/tcp xs-openstorage +-xs-openstorage 1619/udp xs-openstorage +-# XuiS Software Ltd. <100322.2376&compuserve.com> +-faxportwinport 1620/tcp faxportwinport +-faxportwinport 1620/udp faxportwinport +-# Chris Wells <chris_wells&lansource.com> +-softdataphone 1621/tcp softdataphone +-softdataphone 1621/udp softdataphone +-# Dror Gill <drorgi&VNET.IBM.COM> +-ontime 1622/tcp ontime +-ontime 1622/udp ontime +-# Keith Rhodes 810-559-5955 +-jaleosnd 1623/tcp jaleosnd +-jaleosnd 1623/udp jaleosnd +-# Christian Schormann <100410.3063&compuserve.com> +-udp-sr-port 1624/tcp udp-sr-port +-udp-sr-port 1624/udp udp-sr-port +-# Herb Jensen <HWJensen&nfsrv.avionics.itt.com> +-svs-omagent 1625/tcp svs-omagent +-svs-omagent 1625/udp svs-omagent +-# Alberto Berlen <aberlen&VNET.IBM.COM> +-shockwave 1626/tcp Shockwave +-shockwave 1626/udp Shockwave +-# Sarah Allen <sallen¯omedia.com> +-t128-gateway 1627/tcp T.128 Gateway +-t128-gateway 1627/udp T.128 Gateway +-# Phil May <pm&datcon.co.uk> +-lontalk-norm 1628/tcp LonTalk normal +-lontalk-norm 1628/udp LonTalk normal +-lontalk-urgnt 1629/tcp LonTalk urgent +-lontalk-urgnt 1629/udp LonTalk urgent +-# Dan Wing <dwing&cisco.com> +-oraclenet8cman 1630/tcp Oracle Net8 Cman +-oraclenet8cman 1630/udp Oracle Net8 Cman +-# Tong-Ming Lee <tmlee&us.oracle.com> +-visitview 1631/tcp Visit view +-visitview 1631/udp Visit view +-# Tom Whittaker <tomw&ssec.wisc.edu> +-pammratc 1632/tcp PAMMRATC +-pammratc 1632/udp PAMMRATC +-pammrpc 1633/tcp PAMMRPC +-pammrpc 1633/udp PAMMRPC +-# John Britton <johnb&peakaudio.com> +-loaprobe 1634/tcp Log On America Probe +-loaprobe 1634/udp Log On America Probe +-# James Tavares, Log On America <krontor&loa.com> +-edb-server1 1635/tcp EDB Server 1 +-edb-server1 1635/udp EDB Server 1 +-# Carlos Portela <cportela&simple-sw.com> +-isdc 1636/tcp ISP shared public data control +-isdc 1636/udp ISP shared public data control +-islc 1637/tcp ISP shared local data control +-islc 1637/udp ISP shared local data control +-ismc 1638/tcp ISP shared management control +-ismc 1638/udp ISP shared management control +-# Nick Austin <ogmion&ogmium.com> +-cert-initiator 1639/tcp cert-initiator +-cert-initiator 1639/udp cert-initiator +-cert-responder 1640/tcp cert-responder +-cert-responder 1640/udp cert-responder +-# Tom Markson <markson&osmosys.incog.com> +-invision 1641/tcp InVision +-invision 1641/udp InVision +-# Christopher Davey <niallocl&quay.ie> +-isis-am 1642/tcp isis-am +-isis-am 1642/udp isis-am +-isis-ambc 1643/tcp isis-ambc +-isis-ambc 1643/udp isis-ambc +-# Ken Chapman <kchapman&isis.com> +-saiseh 1644/tcp Satellite-data Acquisition System 4 +-# Bill Taylor <sais&ssec.wisc.edu> +-sightline 1645/tcp SightLine +-sightline 1645/udp SightLine +-# admin <iana&sightlinesystems.com> +-sa-msg-port 1646/tcp sa-msg-port +-sa-msg-port 1646/udp sa-msg-port +-# Eric Whitehill <Eric.Whitehill&itt.com> +-rsap 1647/tcp rsap +-rsap 1647/udp rsap +-# Holger Reif +-# <Holger.Reif&prakinf.tu-ilmenau.de> +-concurrent-lm 1648/tcp concurrent-lm +-concurrent-lm 1648/udp concurrent-lm +-# Maggie Brinsford <mjb&concurrent.co.uk> +-kermit 1649/tcp kermit +-kermit 1649/udp kermit +-# Frank da Cruz <fdc&watsun.cc.columbia.edu> +-nkd 1650/tcp nkdn +-nkd 1650/udp nkd +-shiva_confsrvr 1651/tcp shiva_confsrvr +-shiva_confsrvr 1651/udp shiva_confsrvr +-# Mike Horowitz <mah&Shiva.COM> +-xnmp 1652/tcp xnmp +-xnmp 1652/udp xnmp +-# Ali Saleh <scomm&cerf.net> +-alphatech-lm 1653/tcp alphatech-lm +-alphatech-lm 1653/udp alphatech-lm +-# Joseph Hauk <joseph.hauk&alphatech.com> +-stargatealerts 1654/tcp stargatealerts +-stargatealerts 1654/udp stargatealerts +-# Tim Coppernoll +-# <Tim_Coppernoll&ccm.jf.intel.com> +-dec-mbadmin 1655/tcp dec-mbadmin +-dec-mbadmin 1655/udp dec-mbadmin +-dec-mbadmin-h 1656/tcp dec-mbadmin-h +-dec-mbadmin-h 1656/udp dec-mbadmin-h +-# Nick Shipman <Nick.Shipman&mrmog.reo.dec.com> +-fujitsu-mmpdc 1657/tcp fujitsu-mmpdc +-fujitsu-mmpdc 1657/udp fujitsu-mmpdc +-# Katsumi Oomuro <NAE01421&niftyserve.or.jp> +-sixnetudr 1658/tcp sixnetudr +-sixnetudr 1658/udp sixnetudr +-# Bob Rennie <rjrennie&wizvax.net> +-sg-lm 1659/tcp Silicon Grail License Manager +-sg-lm 1659/udp Silicon Grail License Manager +-# William R Bishop <wrb&world.std.com> +-skip-mc-gikreq 1660/tcp skip-mc-gikreq +-skip-mc-gikreq 1660/udp skip-mc-gikreq +-# Tom Markson <markson&osmosys.incog.com> +-netview-aix-1 1661/tcp netview-aix-1 +-netview-aix-1 1661/udp netview-aix-1 +-netview-aix-2 1662/tcp netview-aix-2 +-netview-aix-2 1662/udp netview-aix-2 +-netview-aix-3 1663/tcp netview-aix-3 +-netview-aix-3 1663/udp netview-aix-3 +-netview-aix-4 1664/tcp netview-aix-4 +-netview-aix-4 1664/udp netview-aix-4 +-netview-aix-5 1665/tcp netview-aix-5 +-netview-aix-5 1665/udp netview-aix-5 +-netview-aix-6 1666/tcp netview-aix-6 +-netview-aix-6 1666/udp netview-aix-6 +-netview-aix-7 1667/tcp netview-aix-7 +-netview-aix-7 1667/udp netview-aix-7 +-netview-aix-8 1668/tcp netview-aix-8 +-netview-aix-8 1668/udp netview-aix-8 +-netview-aix-9 1669/tcp netview-aix-9 +-netview-aix-9 1669/udp netview-aix-9 +-netview-aix-10 1670/tcp netview-aix-10 +-netview-aix-10 1670/udp netview-aix-10 +-netview-aix-11 1671/tcp netview-aix-11 +-netview-aix-11 1671/udp netview-aix-11 +-netview-aix-12 1672/tcp netview-aix-12 +-netview-aix-12 1672/udp netview-aix-12 +-# Martha Crisson +-# <CRISSON&ralvm12.vnet.ibm.com> +-proshare-mc-1 1673/tcp Intel Proshare Multicast +-proshare-mc-1 1673/udp Intel Proshare Multicast +-proshare-mc-2 1674/tcp Intel Proshare Multicast +-proshare-mc-2 1674/udp Intel Proshare Multicast +-# Mark Lewis <Mark_Lewis&ccm.jf.intel.com> +-pdp 1675/tcp Pacific Data Products +-pdp 1675/udp Pacific Data Products +-# Gary Morton <mortong&pacdata.com> +-netcomm1 1676/tcp netcomm1 +-netcomm2 1676/udp netcomm2 +-# Bulent Kasman <BKasman&symantec.com> +-groupwise 1677/tcp groupwise +-groupwise 1677/udp groupwise +-# Brent Bradshaw <bbradshaw&novell.com> +-prolink 1678/tcp prolink +-prolink 1678/udp prolink +-# Brian Abramson <brianab&soul.tv.tek.com> +-darcorp-lm 1679/tcp darcorp-lm +-darcorp-lm 1679/udp darcorp-lm +-# <DARcorp&aol.com> +-microcom-sbp 1680/tcp microcom-sbp +-microcom-sbp 1680/udp microcom-sbp +-# Boris B. Maiden <Boris_Maiden&smtp.microcom.com> +-sd-elmd 1681/tcp sd-elmd +-sd-elmd 1681/udp sd-elmd +-# Bryan Otey <bwo&softdesk.com> +-lanyon-lantern 1682/tcp lanyon-lantern +-lanyon-lantern 1682/udp lanyon-lantern +-# Robin Lewis <robin.lewis&lanyon.com> +-ncpm-hip 1683/tcp ncpm-hip +-ncpm-hip 1683/udp ncpm-hip +-# Ken Hearn <hearn&hpindacx.cup.hp.com> +-snaresecure 1684/tcp SnareSecure +-snaresecure 1684/udp SnareSecure +-# Marty Batchelder <marty&capres.com> +-n2nremote 1685/tcp n2nremote +-n2nremote 1685/udp n2nremote +-# Kin Chan <kchan&net2net.com> +-cvmon 1686/tcp cvmon +-cvmon 1686/udp cvmon +-# Carol Ann Krug <carolann&hpmfas3.cup.hp.com> +-nsjtp-ctrl 1687/tcp nsjtp-ctrl +-nsjtp-ctrl 1687/udp nsjtp-ctrl +-nsjtp-data 1688/tcp nsjtp-data +-nsjtp-data 1688/udp nsjtp-data +-# Orazio Granato <og&wsbgrd01.italy.hp.com> +-firefox 1689/tcp firefox +-firefox 1689/udp firefox +-# Mark S. Edwards <marke&firefox.co.uk> +-ng-umds 1690/tcp ng-umds +-ng-umds 1690/udp ng-umds +-# Louis E. Simard <76400.3371&compuserve.com> +-empire-empuma 1691/tcp empire-empuma +-empire-empuma 1691/udp empire-empuma +-# Bobby Krupczak <rdk&empiretech.com> +-sstsys-lm 1692/tcp sstsys-lm +-sstsys-lm 1692/udp sstsys-lm +-# Yih-Wu Wang <sstsys&ix.netcom.com> +-rrirtr 1693/tcp rrirtr +-rrirtr 1693/udp rrirtr +-rrimwm 1694/tcp rrimwm +-rrimwm 1694/udp rrimwm +-rrilwm 1695/tcp rrilwm +-rrilwm 1695/udp rrilwm +-rrifmm 1696/tcp rrifmm +-rrifmm 1696/udp rrifmm +-rrisat 1697/tcp rrisat +-rrisat 1697/udp rrisat +-# Allen Briggs <briggs&access.rrinc.com> +-rsvp-encap-1 1698/tcp RSVP-ENCAPSULATION-1 +-rsvp-encap-1 1698/udp RSVP-ENCAPSULATION-1 +-rsvp-encap-2 1699/tcp RSVP-ENCAPSULATION-2 +-rsvp-encap-2 1699/udp RSVP-ENCAPSULATION-2 +-# Bob Braden <braden&isi.edu> +-mps-raft 1700/tcp mps-raft +-mps-raft 1700/udp mps-raft +-# Jason Leupen <Jleupen&aol.com> +-l2f 1701/tcp l2f +-l2f 1701/udp l2f +-l2tp 1701/tcp l2tp +-l2tp 1701/udp l2tp +-# Andy Valencia <vandys&vandys-lap.cisco.com> +-deskshare 1702/tcp deskshare +-deskshare 1702/udp deskshare +-# Sarah Thompson <sarah&telergy.com +-hb-engine 1703/tcp hb-engine +-hb-engine 1703/udp hb-engine +-# Charles C.L. Chou >cchou&zoom.com> +-bcs-broker 1704/tcp bcs-broker +-bcs-broker 1704/udp bcs-broker +-# Andy Warner <andyw&knoware.nl> +-slingshot 1705/tcp slingshot +-slingshot 1705/udp slingshot +-# Paul Groarke <paulg&quay.ie> +-jetform 1706/tcp jetform +-jetform 1706/udp jetform +-# gdeinsta <gdeinsta&jetform.com> +-vdmplay 1707/tcp vdmplay +-vdmplay 1707/udp vdmplay +-# David Thielen <support&windward.net> +-gat-lmd 1708/tcp gat-lmd +-gat-lmd 1708/udp gat-lmd +-# Igor Zaoutine <igor&global-tech.com> +-centra 1709/tcp centra +-centra 1709/udp centra +-# Drew Wolff <dwolff¢ra.net> +-impera 1710/tcp impera +-impera 1710/udp impera +-# Stepehen Campbell <campbell&uniprise.com> +-pptconference 1711/tcp pptconference +-pptconference 1711/udp pptconference +-# John Tafoya <johntµsoft.com> +-registrar 1712/tcp resource monitoring service +-registrar 1712/udp resource monitoring service +-# Ron Lawson <ronaldl&hpindacx.cup.hp.com> +-conferencetalk 1713/tcp ConferenceTalk +-conferencetalk 1713/udp ConferenceTalk +-# George Kajos <gkajos&mail1.videoserver.com> +-sesi-lm 1714/tcp sesi-lm +-sesi-lm 1714/udp sesi-lm +-houdini-lm 1715/tcp houdini-lm +-houdini-lm 1715/udp houdini-lm +-# Paul Breslin <phb&SIDEFX.COM> +-xmsg 1716/tcp xmsg +-xmsg 1716/udp xmsg +-# Mark E. Fogle <mefogle&xantel.com> +-fj-hdnet 1717/tcp fj-hdnet +-fj-hdnet 1717/udp fj-hdnet +-# Manabu Makino <m-makino&ael.fujitsu.co.jp> +-h323gatedisc 1718/tcp h323gatedisc +-h323gatedisc 1718/udp h323gatedisc +-h323gatestat 1719/tcp h323gatestat +-h323gatestat 1719/udp h323gatestat +-h323hostcall 1720/tcp h323hostcall +-h323hostcall 1720/udp h323hostcall +-# Jim Toga <jtoga&ibeam.jf.intel.com> +-caicci 1721/tcp caicci +-caicci 1721/udp caicci +-# Sylvia Scheuren <schsy02&cai.com> +-hks-lm 1722/tcp HKS License Manager +-hks-lm 1722/udp HKS License Manager +-# Michael Wood <wood&althea.hks.com> +-pptp 1723/tcp pptp +-pptp 1723/udp pptp +-# Ken Crocker <kcrockerµsoft.com> +-csbphonemaster 1724/tcp csbphonemaster +-csbphonemaster 1724/udp csbphonemaster +-# Hans-Peter Heffels <hostmaster&csb-system.com> +-iden-ralp 1725/tcp iden-ralp +-iden-ralp 1725/udp iden-ralp +-# Chris Stanaway <stanaway&comm.mot.com> +-iberiagames 1726/tcp IBERIAGAMES +-iberiagames 1726/udp IBERIAGAMES +-# Jose Luis <73374.313&compuserve.com> +-winddx 1727/tcp winddx +-winddx 1727/udp winddx +-# Bill Andrews <billa&vnd.tek.com> +-telindus 1728/tcp TELINDUS +-telindus 1728/udp TELINDUS +-# Paul Pyck <papy&telindus.be +-citynl 1729/tcp CityNL License Management +-citynl 1729/udp CityNL License Management +-# CityDisc >citydisc&euronet.nl> +-roketz 1730/tcp roketz +-roketz 1730/udp roketz +-# Ahti Heinla <ahti&ahti.bluemoon.ee> +-msiccp 1731/tcp MSICCP +-msiccp 1731/udp MSICCP +-# Max Morris <maxm&MICROSOFT.com> +-proxim 1732/tcp proxim +-proxim 1732/udp proxim +-# Srinivas N. Mogalapalli <srinivas&proxim.com> +-siipat 1733/tcp SIMS - SIIPAT Protocol for Alarm Transmission +-siipat 1733/udp SIMS - SIIPAT Protocol for Alarm Transmission +-# Steve Ryckman <iana&simsware.com> +-cambertx-lm 1734/tcp Camber Corporation License Management +-cambertx-lm 1734/udp Camber Corporation License Management +-# Jeannie Burleson <jeannie&cambertx.com> +-privatechat 1735/tcp PrivateChat +-privatechat 1735/udp PrivateChat +-# Louis E. Simard <76400.3371&CompuServe.COM> +-street-stream 1736/tcp street-stream +-street-stream 1736/udp street-stream +-# Glenn Levitt <streetd1&ix.netcom.com> +-ultimad 1737/tcp ultimad +-ultimad 1737/udp ultimad +-# (Michael Lanzetta <hagbard&ultimatech.com> +-gamegen1 1738/tcp GameGen1 +-gamegen1 1738/udp GameGen1 +-# Glen Pearson <GlenP&multigen.com> +-webaccess 1739/tcp webaccess +-webaccess 1739/udp webaccess +-# Christian Saether <ChristianS&asymetrix.com> +-encore 1740/tcp encore +-encore 1740/udp encore +-# Stuart Button <button&promis.com> +-cisco-net-mgmt 1741/tcp cisco-net-mgmt +-cisco-net-mgmt 1741/udp cisco-net-mgmt +-# John McCormack <jmac&cisco.com> +-3Com-nsd 1742/tcp 3Com-nsd +-3Com-nsd 1742/udp 3Com-nsd +-# Nitza Steinberg <nitza&isd.3com.com> +-cinegrfx-lm 1743/tcp Cinema Graphics License Manager +-cinegrfx-lm 1743/udp Cinema Graphics License Manager +-# Rodney Iwashina <rodney&cyclone.rfx.com> +-ncpm-ft 1744/tcp ncpm-ft +-ncpm-ft 1744/udp ncpm-ft +-# Ken Hearn <hearn&hpindacx.cup.hp.com> +-remote-winsock 1745/tcp remote-winsock +-remote-winsock 1745/udp remote-winsock +-# Avi Nathan <avinµsoft.com> +-ftrapid-1 1746/tcp ftrapid-1 +-ftrapid-1 1746/udp ftrapid-1 +-ftrapid-2 1747/tcp ftrapid-2 +-ftrapid-2 1747/udp ftrapid-2 +-# Richard J. Williams <RJW1&trpo4.tr.unisys.com> +-oracle-em1 1748/tcp oracle-em1 +-oracle-em1 1748/udp oracle-em1 +-# Bob Purvy <bpurvy&us.oracle.com> +-aspen-services 1749/tcp aspen-services +-aspen-services 1749/udp aspen-services +-# Mark B. Hurst <mhurst&aspenres.com> +-sslp 1750/tcp Simple Socket Library's PortMaster +-sslp 1750/udp Simple Socket Library's PortMaster +-# Dr. Charles E. Campbell Jr. +-# <cec&gryphon.gsfc.nasa.gov> +-swiftnet 1751/tcp SwiftNet +-swiftnet 1751/udp SwiftNet +-# Terry Lim <tkl&pentek.com> +-lofr-lm 1752/tcp Leap of Faith Research License Manager +-lofr-lm 1752/udp Leap of Faith Research License Manager +-# +-# 1753 Unassigned (Removed 2004-05-18) +-oracle-em2 1754/tcp oracle-em2 +-oracle-em2 1754/udp oracle-em2 +-# Bob Purvy <bpurvy&us.oracle.com> +-ms-streaming 1755/tcp ms-streaming +-ms-streaming 1755/udp ms-streaming +-# Bret O'Rourke <bretorµsoft.com> +-capfast-lmd 1756/tcp capfast-lmd +-capfast-lmd 1756/udp capfast-lmd +-# Chuck Neal <chuck&phase3.com> +-cnhrp 1757/tcp cnhrp +-cnhrp 1757/udp cnhrp +-# William Stoye <wstoye&atml.co.uk> +-tftp-mcast 1758/tcp tftp-mcast +-tftp-mcast 1758/udp tftp-mcast +-# Tom Emberson <tom&lanworks.com> +-spss-lm 1759/tcp SPSS License Manager +-spss-lm 1759/udp SPSS License Manager +-# Tex Hull <tex&spss.com> +-www-ldap-gw 1760/tcp www-ldap-gw +-www-ldap-gw 1760/udp www-ldap-gw +-# Nick Emery <Nick.Emery&altavista.digital.com> +-cft-0 1761/tcp cft-0 +-cft-0 1761/udp cft-0 +-cft-1 1762/tcp cft-1 +-cft-1 1762/udp cft-1 +-cft-2 1763/tcp cft-2 +-cft-2 1763/udp cft-2 +-cft-3 1764/tcp cft-3 +-cft-3 1764/udp cft-3 +-cft-4 1765/tcp cft-4 +-cft-4 1765/udp cft-4 +-cft-5 1766/tcp cft-5 +-cft-5 1766/udp cft-5 +-cft-6 1767/tcp cft-6 +-cft-6 1767/udp cft-6 +-cft-7 1768/tcp cft-7 +-cft-7 1768/udp cft-7 +-# Martine Marchand 16 1 46 59 24 84 +-bmc-net-adm 1769/tcp bmc-net-adm +-bmc-net-adm 1769/udp bmc-net-adm +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-bmc-net-svc 1770/tcp bmc-net-svc +-bmc-net-svc 1770/udp bmc-net-svc +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-vaultbase 1771/tcp vaultbase +-vaultbase 1771/udp vaultbase +-# Jose A. Sesin <sesin&vaultbase.com> +-essweb-gw 1772/tcp EssWeb Gateway +-essweb-gw 1772/udp EssWeb Gateway +-# Bob Nattenberg <bnattenberg&arborsoft.com> +-kmscontrol 1773/tcp KMSControl +-kmscontrol 1773/udp KMSControl +-# Roy Chastain <roy&kmsys.com> +-global-dtserv 1774/tcp global-dtserv +-global-dtserv 1774/udp global-dtserv +-# Nicholas Davies <N.Davies&globalcomm.co.uk> +-# 1775/tcp +-femis 1776/tcp Federal Emergency Management Information System +-femis 1776/udp Federal Emergency Management Information System +-# Larry Gerhardstein <lh_gerhardstein&pnl.gov> +-powerguardian 1777/tcp powerguardian +-powerguardian 1777/udp powerguardian +-# Charles Bennett <chuck&benatong.com> +-prodigy-intrnet 1778/tcp prodigy-internet +-prodigy-intrnet 1778/udp prodigy-internet +-# Bob Dedrick <bob&staff.prodigy.com> +-pharmasoft 1779/tcp pharmasoft +-pharmasoft 1779/udp pharmasoft +-# Ola Strandberg <Ola.Strandberg&pharmasoft.se> +-dpkeyserv 1780/tcp dpkeyserv +-dpkeyserv 1780/udp dpkeyserv +-# Yasunari Gon Yamasita <yamasita&omronsoft.co.jp> +-answersoft-lm 1781/tcp answersoft-lm +-answersoft-lm 1781/udp answersoft-lm +-# James A. Brewster <jimbrew&answersoft.com> +-hp-hcip 1782/tcp hp-hcip +-hp-hcip 1782/udp hp-hcip +-# Allen Baker <abaker&boi.hp.com> +-# 1783 Decomissioned Port 04/14/00, ms +-# <naonao&kikaku.mmp.fujitsu.co.jp> +-finle-lm 1784/tcp Finle License Manager +-finle-lm 1784/udp Finle License Manager +-# Dongling Wang <dongling&finle.com> +-windlm 1785/tcp Wind River Systems License Manager +-windlm 1785/udp Wind River Systems License Manager +-# Will Dere <will&wrs.com> +-funk-logger 1786/tcp funk-logger +-funk-logger 1786/udp funk-logger +-funk-license 1787/tcp funk-license +-funk-license 1787/udp funk-license +-# Cimarron Boozer <cboozer&funk.com> +-# Eric Wilde <eric&funk.com> +-psmond 1788/tcp psmond +-psmond 1788/udp psmond +-# Will Golson <golson&fc.hp.com> +-hello 1789/tcp hello +-hello 1789/udp hello +-# D. J. Bernstein <djb&koobera.math.uic.edu> +-nmsp 1790/tcp Narrative Media Streaming Protocol +-nmsp 1790/udp Narrative Media Streaming Protocol +-# Paul Santinelli, Jr. <psantinelli&narrative.com> +-ea1 1791/tcp EA1 +-ea1 1791/udp EA1 +-# Kirk MacLean <kmaclean&ea.com> +-ibm-dt-2 1792/tcp ibm-dt-2 +-ibm-dt-2 1792/udp ibm-dt-2 +-# Sam Borman <sam_borman&uk.ibm.com> +-rsc-robot 1793/tcp rsc-robot +-rsc-robot 1793/udp rsc-robot +-# Andrew Jay Schneider <ajs&relsoft.com> +-cera-bcm 1794/tcp cera-bcm +-cera-bcm 1794/udp cera-bcm +-# Leo Moesgaard <leo_moesgaard&dk.ibm.com> +-dpi-proxy 1795/tcp dpi-proxy +-dpi-proxy 1795/udp dpi-proxy +-# Charles Gordon <cgordon&digprod.com> +-vocaltec-admin 1796/tcp Vocaltec Server Administration +-vocaltec-admin 1796/udp Vocaltec Server Administration +-# Scott Petrack <Scott_Petrack&vocaltec.com> +-uma 1797/tcp UMA +-uma 1797/udp UMA +-# Martin Kirk <m.kirk&opengroup.org> +-etp 1798/tcp Event Transfer Protocol +-etp 1798/udp Event Transfer Protocol +-# Mike Wray <mjw&hplb.hpl.hp.com> +-netrisk 1799/tcp NETRISK +-netrisk 1799/udp NETRISK +-# Kevin Green <Kevin_Green&tds.com> +-ansys-lm 1800/tcp ANSYS-License manager +-ansys-lm 1800/udp ANSYS-License manager +-# Suzanne Lorrin <sml&ansyspo.ansys.com> +-msmq 1801/tcp Microsoft Message Que +-msmq 1801/udp Microsoft Message Que +-# Amnon Horowitz <amnonh&MICROSOFT.com> +-concomp1 1802/tcp ConComp1 +-concomp1 1802/udp ConComp1 +-# Ed Vincent <@edv&concomp.com> +-hp-hcip-gwy 1803/tcp HP-HCIP-GWY +-hp-hcip-gwy 1803/udp HP-HCIP-GWY +-# Allen Baker <abaker&boi.hp.com> +-enl 1804/tcp ENL +-enl 1804/udp ENL +-# Brian Olson <briolson&pacbell.net> +-enl-name 1805/tcp ENL-Name +-enl-name 1805/udp ENL-Name +-# Brian Olson <briolson&pacbell.net> +-musiconline 1806/tcp Musiconline +-musiconline 1806/udp Musiconline +-# Craig Weeks <cweeks&syspace.co.uk> +-fhsp 1807/tcp Fujitsu Hot Standby Protocol +-fhsp 1807/udp Fujitsu Hot Standby Protocol +-# Eiki Iwata (eiki&nd.net.fujitsu.co.jp> +-oracle-vp2 1808/tcp Oracle-VP2 +-oracle-vp2 1808/udp Oracle-VP2 +-# Craig Fowler <cfowler&us.oracle.com> +-oracle-vp1 1809/tcp Oracle-VP1 +-oracle-vp1 1809/udp Oracle-VP1 +-# Craig Fowler <cfowler&us.oracle.com> +-jerand-lm 1810/tcp Jerand License Manager +-jerand-lm 1810/udp Jerand License Manager +-# Robert Monat <jerand&jerand.com> +-scientia-sdb 1811/tcp Scientia-SDB +-scientia-sdb 1811/udp Scientia-SDB +-# SYSTEMS MANAGER <systems-manager&scientia.com> +-radius 1812/tcp RADIUS +-radius 1812/udp RADIUS +-# Carl Rigney <cdr&livingston.com> +-radius-acct 1813/tcp RADIUS Accounting +-radius-acct 1813/udp RADIUS Accounting +-# Carl Rigney <cdr&livingston.com> +-tdp-suite 1814/tcp TDP Suite +-tdp-suite 1814/udp TDP Suite +-# Rob Lockhart <rob.lockhart&mot.com> +-mmpft 1815/tcp MMPFT +-mmpft 1815/udp MMPFT +-# Ralf Muckenhirn <FAX: 49-7622-398200> +-# <Phone: 49-7622-3980> +-harp 1816/tcp HARP +-harp 1816/udp HARP +-# Bjorn Chambless <bjorn&cs.pdx.edu> +-rkb-oscs 1817/tcp RKB-OSCS +-rkb-oscs 1817/udp RKB-OSCS +-# Robert Kevin Breton <BOBBRETON&HOTMAIL.COM> +-etftp 1818/tcp Enhanced Trivial File Transfer Protocol +-etftp 1818/udp Enhanced Trivial File Transfer Protocol +-# William Polites <wpolites&mitre.org> +-plato-lm 1819/tcp Plato License Manager +-plato-lm 1819/udp Plato License Manager +-# Mark Morris <mim&ermuk.com> +-mcagent 1820/tcp mcagent +-mcagent 1820/udp mcagent +-# Ryoichi Shinohara <shinohara&VNET.IBM.COM> +-donnyworld 1821/tcp donnyworld +-donnyworld 1821/udp donnyworld +-# Don Oliver <don&donnyworld.com> +-es-elmd 1822/tcp es-elmd +-es-elmd 1822/udp es-elmd +-# David Duncan <dduncan&es.com> +-unisys-lm 1823/tcp Unisys Natural Language License Manager +-unisys-lm 1823/udp Unisys Natural Language License Manager +-# Raymond A. Diedrichs <rayd&slu.tr.unisys.com> +-metrics-pas 1824/tcp metrics-pas +-metrics-pas 1824/udp metrics-pas +-# Tom Haapanen <tomh&metrics.com> +-direcpc-video 1825/tcp DirecPC Video +-direcpc-video 1825/udp DirecPC Video +-# Chris Kerrigan <ckerrigan&hns.com> +-ardt 1826/tcp ARDT +-ardt 1826/udp ARDT +-# Mike Goddard <mike.goddard&ardent.com.au> +-asi 1827/tcp ASI +-asi 1827/udp ASI +-# Bob Tournoux <bob.tournoux&usiny.mail.abb.com> +-itm-mcell-u 1828/tcp itm-mcell-u +-itm-mcell-u 1828/udp itm-mcell-u +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-optika-emedia 1829/tcp Optika eMedia +-optika-emedia 1829/udp Optika eMedia +-# Daryle DeBalski <ddebalski&optika.com> +-net8-cman 1830/tcp Oracle Net8 CMan Admin +-net8-cman 1830/udp Oracle Net8 CMan Admin +-# Shuvayu Kanjilal +-myrtle 1831/tcp Myrtle +-myrtle 1831/udp Myrtle +-# Ron Achin <RAchin&genscan.com> +-tht-treasure 1832/tcp ThoughtTreasure +-tht-treasure 1832/udp ThoughtTreasure +-# Erik Mueller <erik&signiform.com> +-udpradio 1833/tcp udpradio +-udpradio 1833/udp udpradio +-# Guus Sliepen <guus&warande3094.warande.uu.nl> +-ardusuni 1834/tcp ARDUS Unicast +-ardusuni 1834/udp ARDUS Unicast +-ardusmul 1835/tcp ARDUS Multicast +-ardusmul 1835/udp ARDUS Multicast +-# Toshikatsu Ito <ito-t&pfu.co.jp> +-ste-smsc 1836/tcp ste-smsc +-ste-smsc 1836/udp ste-smsc +-# Tom Snauwaert <tom.snauwaert&st-electronics.be> +-csoft1 1837/tcp csoft1 +-csoft1 1837/udp csoft1 +-# John Coll <john&csoft.co.uk> +-talnet 1838/tcp TALNET +-talnet 1838/udp TALNET +-# Aaron Lav <aaron&taltrade.com> +-netopia-vo1 1839/tcp netopia-vo1 +-netopia-vo1 1839/udp netopia-vo1 +-netopia-vo2 1840/tcp netopia-vo2 +-netopia-vo2 1840/udp netopia-vo2 +-netopia-vo3 1841/tcp netopia-vo3 +-netopia-vo3 1841/udp netopia-vo3 +-netopia-vo4 1842/tcp netopia-vo4 +-netopia-vo4 1842/udp netopia-vo4 +-netopia-vo5 1843/tcp netopia-vo5 +-netopia-vo5 1843/udp netopia-vo5 +-# Marc Epard <marc&netopia.com> +-direcpc-dll 1844/tcp DirecPC-DLL +-direcpc-dll 1844/udp DirecPC-DLL +-# Chris Kerrigan <ckerrigan&hns.com> +-altalink 1845/tcp altalink +-altalink 1845/udp altalink +-# Alberto Raydan <alberto&altasol.com> +-tunstall-pnc 1846/tcp Tunstall PNC +-tunstall-pnc 1846/udp Tunstall PNC +-# Robert M. Moore <r_moore&tunstall.co.uk> +-slp-notify 1847/tcp SLP Notification +-slp-notify 1847/udp SLP Notification +-# James Kempf <james.kempf&sun.com> +-fjdocdist 1848/tcp fjdocdist +-fjdocdist 1848/udp fjdocdist +-# Yuichi Ohiwa <y-ohiwa&ael.fujitsu.co.jp> +-alpha-sms 1849/tcp ALPHA-SMS +-alpha-sms 1849/udp ALPHA-SMS +-# Benjamin Grimm <bg&webnetix.de> +-gsi 1850/tcp GSI +-gsi 1850/udp GSI +-# William Mullaney <mullanwi&usa.net> +-ctcd 1851/tcp ctcd +-ctcd 1851/udp ctcd +-# John Ryan <john&cybertrace.com> +-virtual-time 1852/tcp Virtual Time +-virtual-time 1852/udp Virtual Time +-# Angie S. Morner <webmaster&dsbcpas.com> +-vids-avtp 1853/tcp VIDS-AVTP +-vids-avtp 1853/udp VIDS-AVTP +-# Sascha Kuemmel <kuemmel&vidsoft.de> +-buddy-draw 1854/tcp Buddy Draw +-buddy-draw 1854/udp Buddy Draw +-# Marvin Shin <president&medialingo.com> +-fiorano-rtrsvc 1855/tcp Fiorano RtrSvc +-fiorano-rtrsvc 1855/udp Fiorano RtrSvc +-fiorano-msgsvc 1856/tcp Fiorano MsgSvc +-fiorano-msgsvc 1856/udp Fiorano MsgSvc +-# Albert Holt <alberth&fiorano.com> +-datacaptor 1857/tcp DataCaptor +-datacaptor 1857/udp DataCaptor +-# Steven M. Forrester <StevenF&CapsuleTech.com> +-privateark 1858/tcp PrivateArk +-privateark 1858/udp PrivateArk +-# Ronen Zoran <ronenz&cyber-ark.com> +-gammafetchsvr 1859/tcp Gamma Fetcher Server +-gammafetchsvr 1859/udp Gamma Fetcher Server +-# Cnaan Aviv <cnaan&gammasite.com> +-sunscalar-svc 1860/tcp SunSCALAR Services +-sunscalar-svc 1860/udp SunSCALAR Services +-# Sanjay Radia <srradia&kasumbi.Eng.Sun.COM> +-lecroy-vicp 1861/tcp LeCroy VICP +-lecroy-vicp 1861/udp LeCroy VICP +-# Anthony Cake <anthonyrc&lecroy.com> +-techra-server 1862/tcp techra-server +-techra-server 1862/udp techra-server +-# Roy Lyseng <roy.lyseng&maxware.no> +-msnp 1863/tcp MSNP +-msnp 1863/udp MSNP +-# William Lai <wlaiµsoft.com> +-paradym-31port 1864/tcp Paradym 31 Port +-paradym-31port 1864/udp Paradym 31 Port +-# David Wooden <dwooden&wizdom.com> +-entp 1865/tcp ENTP +-entp 1865/udp ENTP +-# Seiko Epson <Ishida.Hitoshi&exc.epson.co.jp> +-swrmi 1866/tcp swrmi +-swrmi 1866/udp swrmi +-# Jun Yoshii <yoshii&ael.fujitsu.co.jp> +-udrive 1867/tcp UDRIVE +-udrive 1867/udp UDRIVE +-# Robby Walker <webmaster&cd-lab.com> +-viziblebrowser 1868/tcp VizibleBrowser +-viziblebrowser 1868/udp VizibleBrowser +-# Jimmy Talbot <jtalbot&vizible.com> +-transact 1869/tcp TransAct +-transact 1869/udp TransAct +-# TransAct Futures Development Team <1869info&transactfutures.com> +-sunscalar-dns 1870/tcp SunSCALAR DNS Service +-sunscalar-dns 1870/udp SunSCALAR DNS Service +-# Sanjay Radia <srradia&kasumbi.Eng.Sun.COM> +-canocentral0 1871/tcp Cano Central 0 +-canocentral0 1871/udp Cano Central 0 +-canocentral1 1872/tcp Cano Central 1 +-canocentral1 1872/udp Cano Central 1 +-# Mark McNamara <markm&research.canon.com.au> +-fjmpjps 1873/tcp Fjmpjps +-fjmpjps 1873/udp Fjmpjps +-fjswapsnp 1874/tcp Fjswapsnp +-fjswapsnp 1874/udp Fjswapsnp +-# Y. Ohiwa <y-ohiwa&ael.fujitsu.co.jp> +-westell-stats 1875/tcp westell stats +-westell-stats 1875/udp westell stats +-# Thomas McCabe <tmcca&westell.com> +-ewcappsrv 1876/tcp ewcappsrv +-ewcappsrv 1876/udp ewcappsrv +-# Howard Yin <howard.yin&ericsson.com> +-hp-webqosdb 1877/tcp hp-webqosdb +-hp-webqosdb 1877/udp hp-webqosdb +-# Kim Scott <kims&cup.hp.com> +-drmsmc 1878/tcp drmsmc +-drmsmc 1878/udp drmsmc +-# Katsuhiko Abe <kabe&hst.fujitsu.co.jp> +-nettgain-nms 1879/tcp NettGain NMS +-nettgain-nms 1879/udp NettGain NMS +-# Dr. Yair Shapira <yair&flashnetworks.com> +-vsat-control 1880/tcp Gilat VSAT Control +-vsat-control 1880/udp Gilat VSAT Control +-# Yariv Kaplan <yarivk&gilat.com> +-ibm-mqseries2 1881/tcp IBM WebSphere MQ Everyplace +-ibm-mqseries2 1881/udp IBM WebSphere MQ Everyplace +-# Jane Porter <janeporter&uk.ibm.com> +-ecsqdmn 1882/tcp CA eTrust Common Services +-ecsqdmn 1882/udp CA eTrust Common Services +-# Paul Wissmiller <Paul.Wissmiller&ca.com> +-ibm-mqisdp 1883/tcp IBM MQSeries SCADA +-ibm-mqisdp 1883/udp IBM MQSeries SCADA +-# Andy Stanford-Clark <andysc&uk.ibm.com> +-idmaps 1884/tcp Internet Distance Map Svc +-idmaps 1884/udp Internet Distance Map Svc +-# Sugih Jamim <jamin&eecs.umich.edu> +-vrtstrapserver 1885/tcp Veritas Trap Server +-vrtstrapserver 1885/udp Veritas Trap Server +-# Russell Thrasher <rthrashe&veritas.com> +-leoip 1886/tcp Leonardo over IP +-leoip 1886/udp Leonardo over IP +-# Dietmar Finkler <d.finkler&hermstedt.de> +-filex-lport 1887/tcp FileX Listening Port +-filex-lport 1887/udp FileX Listening Port +-# Megan Woods <meganwoods&datafast.net.au> +-ncconfig 1888/tcp NC Config Port +-ncconfig 1888/udp NC Config Port +-# Simon Parker <simon.j.parker&philips.com> +-unify-adapter 1889/tcp Unify Web Adapter Service +-unify-adapter 1889/udp Unify Web Adapter Service +-# Duane Gibson <ianaportmaster&unify.com> +-wilkenlistener 1890/tcp wilkenListener +-wilkenlistener 1890/udp wilkenListener +-# Wilken GmbH <fy&wilken.de> +-childkey-notif 1891/tcp ChildKey Notification +-childkey-notif 1891/udp ChildKey Notification +-childkey-ctrl 1892/tcp ChildKey Control +-childkey-ctrl 1892/udp ChildKey Control +-# Ivan Berardinelli <ivan&gestweb.com> +-elad 1893/tcp ELAD Protocol +-elad 1893/udp ELAD Protocol +-# Franco Milan <franco&eladit.com> +-o2server-port 1894/tcp O2Server Port +-o2server-port 1894/udp O2Server Port +-# Tim Howard <timothygh&hotmail.com> +-##### Microsoft (unoffically) using 1895 ##### +-b-novative-ls 1896/tcp b-novative license server +-b-novative-ls 1896/udp b-novative license server +-# Matthias Riese <Matthias.Riese&b-novative.de> +-metaagent 1897/tcp MetaAgent +-metaagent 1897/udp MetaAgent +-# Marie-France Dubreuil <Marie-France.Dubreuil&evidian.com> +-cymtec-port 1898/tcp Cymtec secure management +-cymtec-port 1898/udp Cymtec secure management +-# Michael Mester <mmester&cymtec.com> +-mc2studios 1899/tcp MC2Studios +-mc2studios 1899/udp MC2Studios +-# Michael Coon <michael&thecube.com> +-ssdp 1900/tcp SSDP +-ssdp 1900/udp SSDP +-# UPnP Forum <upnpadmin&forum.upnp.org> +-fjicl-tep-a 1901/tcp Fujitsu ICL Terminal Emulator Program A +-fjicl-tep-a 1901/udp Fujitsu ICL Terminal Emulator Program A +-# Bob Lyon <bl&oasis.icl.co.uk> +-fjicl-tep-b 1902/tcp Fujitsu ICL Terminal Emulator Program B +-fjicl-tep-b 1902/udp Fujitsu ICL Terminal Emulator Program B +-# Bob Lyon <bl&oasis.icl.co.uk> +-linkname 1903/tcp Local Link Name Resolution +-linkname 1903/udp Local Link Name Resolution +-# Dan Harrington <dth&lucent.com> +-fjicl-tep-c 1904/tcp Fujitsu ICL Terminal Emulator Program C +-fjicl-tep-c 1904/udp Fujitsu ICL Terminal Emulator Program C +-# Bob Lyon <bl&oasis.icl.co.uk> +-sugp 1905/tcp Secure UP.Link Gateway Protocol +-sugp 1905/udp Secure UP.Link Gateway Protocol +-# Peter King <king&uplanet.com> +-tpmd 1906/tcp TPortMapperReq +-tpmd 1906/udp TPortMapperReq +-# Sheila Devins <sheila_devins&VNET.IBM.COM> +-intrastar 1907/tcp IntraSTAR +-intrastar 1907/udp IntraSTAR +-# Peter Schoenberger <ps&teles.de> +-dawn 1908/tcp Dawn +-dawn 1908/udp Dawn +-# Michael Crawford <michaelc&travsoft.com> +-global-wlink 1909/tcp Global World Link +-global-wlink 1909/udp Global World Link +-# Nicholas Davies <N.Davies&globalcomm.co.uk> +-ultrabac 1910/tcp UltraBac Software communications port +-ultrabac 1910/udp UltraBac Software communications port +-# Paul Bunn <iana&ultrabac.com> +-mtp 1911/tcp Starlight Networks Multimedia Transport Protocol +-mtp 1911/udp Starlight Networks Multimedia Transport Protocol +-# Bruce Lieberman <brucel&iserver.starlight.com> +-rhp-iibp 1912/tcp rhp-iibp +-rhp-iibp 1912/udp rhp-iibp +-# George Nachman +-# Tom Lake <tlake&m-ware.com> +-armadp 1913/tcp armadp +-armadp 1913/udp armadp +-# Kevin Welton <Kevin.Welton&armltd.co.uk> +-elm-momentum 1914/tcp Elm-Momentum +-elm-momentum 1914/udp Elm-Momentum +-# Willie Wu <willie&mds.com> +-facelink 1915/tcp FACELINK +-facelink 1915/udp FACELINK +-# J.H. Hermans <j.h.hermans&hiscom.nl> +-persona 1916/tcp Persoft Persona +-persona 1916/udp Persoft Persona +-# Tom Spidell <spidell&persoft.com> +-noagent 1917/tcp nOAgent +-noagent 1917/udp nOAgent +-# Martin Bestmann <martin&datawatch.de> +-can-nds 1918/tcp IBM Tivole Directory Service - NDS +-can-nds 1918/udp IBM Tivole Directory Service - NDS +-can-dch 1919/tcp IBM Tivoli Directory Service - DCH +-can-dch 1919/udp IBM Tivoli Directory Service - DCH +-can-ferret 1920/tcp IBM Tivoli Directory Service - FERRET +-can-ferret 1920/udp IBM Tivoli Directory Service - FERRET +-# nic catrambone <ncatramb&us.ibm.com> +-noadmin 1921/tcp NoAdmin +-noadmin 1921/udp NoAdmin +-# Martin Bestmann <martin&datawatch.de> +-tapestry 1922/tcp Tapestry +-tapestry 1922/udp Tapestry +-# Ken Oliver <koliver02&yahoo.com> +-spice 1923/tcp SPICE +-spice 1923/udp SPICE +-# Nicholas Chua <nick&sendit.se> +-xiip 1924/tcp XIIP +-xiip 1924/udp XIIP +-# Alain Robert <Alain.Robert&HMRinc.com> +-discovery-port 1925/tcp Surrogate Discovery Port +-discovery-port 1925/udp Surrogate Discovery Port +-# Keith Thompson <keith.thompson&sun.com> +-egs 1926/tcp Evolution Game Server +-egs 1926/udp Evolution Game Server +-# Simon Butcher <simonb&alien.net.au> +-videte-cipc 1927/tcp Videte CIPC Port +-videte-cipc 1927/udp Videte CIPC Port +-# Videte IT <info&videte.com> +-emsd-port 1928/tcp Expnd Maui Srvr Dscovr +-emsd-port 1928/udp Expnd Maui Srvr Dscovr +-# Edo Yahav <standards&expand.com> +-bandwiz-system 1929/tcp Bandwiz System - Server +-bandwiz-system 1929/udp Bandwiz System - Server +-# Joseph Weihs <yossi&bandwiz.com> +-driveappserver 1930/tcp Drive AppServer +-driveappserver 1930/udp Drive AppServer +-# Andrew Johnson +-# <andrew.johnson&bliss-support.demon.co.uk> +-amdsched 1931/tcp AMD SCHED +-amdsched 1931/udp AMD SCHED +-# Michael Walsh <mww&warwick.net> +-ctt-broker 1932/tcp CTT Broker +-ctt-broker 1932/udp CTT Broker +-# Jens Edlund <edlund&speech.kth.se> +-xmapi 1933/tcp IBM LM MT Agent +-xmapi 1933/udp IBM LM MT Agent +-xaapi 1934/tcp IBM LM Appl Agent +-xaapi 1934/udp IBM LM Appl Agent +-# Helga Wolin <hwolin&us.ibm.com> +-macromedia-fcs 1935/tcp Macromedia Flash Communications Server MX +-macromedia-fcs 1935/udp Macromedia Flash Communications server MX +-# Pritham Shetty <pritham¯omedia.com> +-jetcmeserver 1936/tcp JetCmeServer Server Port +-jetcmeserver 1936/udp JetCmeServer Server Port +-jwserver 1937/tcp JetVWay Server Port +-jwserver 1937/udp JetVWay Server Port +-jwclient 1938/tcp JetVWay Client Port +-jwclient 1938/udp JetVWay Client Port +-jvserver 1939/tcp JetVision Server Port +-jvserver 1939/udp JetVision Server Port +-jvclient 1940/tcp JetVision Client Port +-jvclient 1940/udp JetVision Client Port +-# Stephen Tsun <stsun&jetstream.com> +-dic-aida 1941/tcp DIC-Aida +-dic-aida 1941/udp DIC-Aida +-# Frans S.C. Witte <fscwitte&dicgroep.nl> +-res 1942/tcp Real Enterprise Service +-res 1942/udp Real Enterprise Service +-# Bob Janssen <bob&res.nl> +-beeyond-media 1943/tcp Beeyond Media +-beeyond-media 1943/udp Beeyond Media +-# Bob Deblier <bob&virtualunlimited.com> +-close-combat 1944/tcp close-combat +-close-combat 1944/udp close-combat +-# David Hua <davhuaµsoft.com> +-dialogic-elmd 1945/tcp dialogic-elmd +-dialogic-elmd 1945/udp dialogic-elmd +-# Roger Kay <r.kay&nz.dialogic.com> +-tekpls 1946/tcp tekpls +-tekpls 1946/udp tekpls +-# Brian Abramson <brianab&vnd.tek.com> +-hlserver 1947/tcp hlserver +-hlserver 1947/udp hlserver +-# Michael Zzunke <mzunke&fast-ag.de> +-eye2eye 1948/tcp eye2eye +-eye2eye 1948/udp eye2eye +-# Trevor Bell <Trevor&iguana.iosoftware.com> +-ismaeasdaqlive 1949/tcp ISMA Easdaq Live +-ismaeasdaqlive 1949/udp ISMA Easdaq Live +-ismaeasdaqtest 1950/tcp ISMA Easdaq Test +-ismaeasdaqtest 1950/udp ISMA Easdaq Test +-# Stephen Dunne <sdun&isma.co.uk> +-bcs-lmserver 1951/tcp bcs-lmserver +-bcs-lmserver 1951/udp bcs-lmserver +-# Andy Warner <andyw&knoware.nl> +-mpnjsc 1952/tcp mpnjsc +-mpnjsc 1952/udp mpnjsc +-# Takenori Miyahara <miyahara&pfu.co.jp> +-rapidbase 1953/tcp Rapid Base +-rapidbase 1953/udp Rapid Base +-# Antoni Wolski <antoni.wolski&vtt.fi> +-abr-api 1954/tcp ABR-API (diskbridge) +-abr-api 1954/udp ABR-API (diskbridge) +-abr-secure 1955/tcp ABR-Secure Data (diskbridge) +-abr-secure 1955/udp ABR-Secure Data (diskbridge) +-# Graham Wooden <graham&g-rock.net> +-vrtl-vmf-ds 1956/tcp Vertel VMF DS +-vrtl-vmf-ds 1956/udp Vertel VMF DS +-# Alan Akahoshi <alan-akahoshi&vertel.com> +-unix-status 1957/tcp unix-status +-unix-status 1957/udp unix-status +-# Thomas Erskine <erskine&sourceworks.com> +-dxadmind 1958/tcp CA Administration Daemon +-dxadmind 1958/udp CA Administration Daemon +-# John Birrell <birjo99&cai.com> +-simp-all 1959/tcp SIMP Channel +-simp-all 1959/udp SIMP Channel +-# Tim Hunnewell <thunnewell&pinna.com> +-nasmanager 1960/tcp Merit DAC NASmanager +-nasmanager 1960/udp Merit DAC NASmanager +-# Richard S. Conto <rsc&merit.edu> +-bts-appserver 1961/tcp BTS APPSERVER +-bts-appserver 1961/udp BTS APPSERVER +-# Carl Obsorn <carl_osborn&sabre.com> +-biap-mp 1962/tcp BIAP-MP +-biap-mp 1962/udp BIAP-MP +-# Louis Slothouber <lpslot&biap.com> +-webmachine 1963/tcp WebMachine +-webmachine 1963/udp WebMachine +-# Tim Jowers <Tim.Jowers&ColumbiaSC.NCR.com> +-solid-e-engine 1964/tcp SOLID E ENGINE +-solid-e-engine 1964/udp SOLID E ENGINE +-# Ari Valtanen <ari.valtanen&solidtech.com> +-tivoli-npm 1965/tcp Tivoli NPM +-tivoli-npm 1965/udp Tivoli NPM +-# Ivana Cuozzo <Ivana.Cuozzo&tivoli.com> +-slush 1966/tcp Slush +-slush 1966/udp Slush +-# Damien Miller <damien&ibs.com.au> +-sns-quote 1967/tcp SNS Quote +-sns-quote 1967/udp SNS Quote +-# Robert Ellman <rellman&calicotech.com> +-lipsinc 1968/tcp LIPSinc +-lipsinc 1968/udp LIPSinc +-lipsinc1 1969/tcp LIPSinc 1 +-lipsinc1 1969/udp LIPSinc 1 +-# Robert Armington <rarmington&lipsinc.com> +-netop-rc 1970/tcp NetOp Remote Control +-netop-rc 1970/udp NetOp Remote Control +-netop-school 1971/tcp NetOp School +-netop-school 1971/udp NetOp School +-# NetOp Technical Support <support&danware.dk> +-intersys-cache 1972/tcp Cache +-intersys-cache 1972/udp Cache +-# Mark Hanson <markh&intersys.com> +-dlsrap 1973/tcp Data Link Switching Remote Access Protocol +-dlsrap 1973/udp Data Link Switching Remote Access Protocol +-# Steve T. Chiang <schiang&cisco.com> +-drp 1974/tcp DRP +-drp 1974/udp DRP +-# Richard Alan Johnson <raj&cisco.com> +-tcoflashagent 1975/tcp TCO Flash Agent +-tcoflashagent 1975/udp TCO Flash Agent +-tcoregagent 1976/tcp TCO Reg Agent +-tcoregagent 1976/udp TCO Reg Agent +-tcoaddressbook 1977/tcp TCO Address Book +-tcoaddressbook 1977/udp TCO Address Book +-# Allan Panitch <allanp&tcosoft.com> +-unisql 1978/tcp UniSQL +-unisql 1978/udp UniSQL +-unisql-java 1979/tcp UniSQL Java +-unisql-java 1979/udp UniSQL Java +-# Keith Yarbrough <kyarbro&windtraveller.com> +-pearldoc-xact 1980/tcp PearlDoc XACT +-pearldoc-xact 1980/udp PearlDoc XACT +-# Chris Vertonghen <chrisv&pearldoc.com> +-p2pq 1981/tcp p2pQ +-p2pq 1981/udp p2pQ +-# Warren Alexander <warren&chameleon-creative.co.uk> +-estamp 1982/tcp Evidentiary Timestamp +-estamp 1982/udp Evidentiary Timestamp +-# Todd Glassey <todd.glassey&att.net> +-lhtp 1983/tcp Loophole Test Protocol +-lhtp 1983/udp Loophole Test Protocol +-# Kade Hansson <kade_fh&postoffice.utas.edu.au> +-bb 1984/tcp BB +-bb 1984/udp BB +-# Sean MacGuire <sean&maclawran.ca> +-hsrp 1985/tcp Hot Standby Router Protocol +-hsrp 1985/udp Hot Standby Router Protocol +-# Phil Morton <pmorton&cisco.com> +-licensedaemon 1986/tcp cisco license management +-licensedaemon 1986/udp cisco license management +-tr-rsrb-p1 1987/tcp cisco RSRB Priority 1 port +-tr-rsrb-p1 1987/udp cisco RSRB Priority 1 port +-tr-rsrb-p2 1988/tcp cisco RSRB Priority 2 port +-tr-rsrb-p2 1988/udp cisco RSRB Priority 2 port +-tr-rsrb-p3 1989/tcp cisco RSRB Priority 3 port +-tr-rsrb-p3 1989/udp cisco RSRB Priority 3 port +-# The following entry records an unassigned but widespread use +-mshnet 1989/tcp MHSnet system +-mshnet 1989/udp MHSnet system +-# Bob Kummerfeld <bob&sarad.cs.su.oz.au> +-stun-p1 1990/tcp cisco STUN Priority 1 port +-stun-p1 1990/udp cisco STUN Priority 1 port +-stun-p2 1991/tcp cisco STUN Priority 2 port +-stun-p2 1991/udp cisco STUN Priority 2 port +-stun-p3 1992/tcp cisco STUN Priority 3 port +-stun-p3 1992/udp cisco STUN Priority 3 port +-# The following entry records an unassigned but widespread use +-ipsendmsg 1992/tcp IPsendmsg +-ipsendmsg 1992/udp IPsendmsg +-# Bob Kummerfeld <bob&sarad.cs.su.oz.au> +-snmp-tcp-port 1993/tcp cisco SNMP TCP port +-snmp-tcp-port 1993/udp cisco SNMP TCP port +-stun-port 1994/tcp cisco serial tunnel port +-stun-port 1994/udp cisco serial tunnel port +-perf-port 1995/tcp cisco perf port +-perf-port 1995/udp cisco perf port +-tr-rsrb-port 1996/tcp cisco Remote SRB port +-tr-rsrb-port 1996/udp cisco Remote SRB port +-gdp-port 1997/tcp cisco Gateway Discovery Protocol +-gdp-port 1997/udp cisco Gateway Discovery Protocol +-x25-svc-port 1998/tcp cisco X.25 service (XOT) +-x25-svc-port 1998/udp cisco X.25 service (XOT) +-tcp-id-port 1999/tcp cisco identification port +-tcp-id-port 1999/udp cisco identification port +-# +-cisco-sccp 2000/tcp Cisco SCCP +-cisco-sccp 2000/udp Cisco SCCp +-# Dan Wing <dwing&cisco.com> November 2003 +-dc 2001/tcp +-wizard 2001/udp curry +-globe 2002/tcp +-globe 2002/udp +-# +-brutus 2003/tcp Brutus Server +-brutus 2003/udp Brutus Server +-# Johannes Skov Frandsen <joe&42tools.com> 28 February 2008 +-mailbox 2004/tcp +-emce 2004/udp CCWS mm conf +-berknet 2005/tcp +-oracle 2005/udp +-invokator 2006/tcp +-raid-cd 2006/udp raid +-dectalk 2007/tcp +-raid-am 2007/udp +-conf 2008/tcp +-terminaldb 2008/udp +-news 2009/tcp +-whosockami 2009/udp +-search 2010/tcp +-pipe_server 2010/udp +-raid-cc 2011/tcp raid +-servserv 2011/udp +-ttyinfo 2012/tcp +-raid-ac 2012/udp +-raid-am 2013/tcp +-raid-cd 2013/udp +-troff 2014/tcp +-raid-sf 2014/udp +-cypress 2015/tcp +-raid-cs 2015/udp +-bootserver 2016/tcp +-bootserver 2016/udp +-cypress-stat 2017/tcp +-bootclient 2017/udp +-terminaldb 2018/tcp +-rellpack 2018/udp +-whosockami 2019/tcp +-about 2019/udp +-xinupageserver 2020/tcp +-xinupageserver 2020/udp +-servexec 2021/tcp +-xinuexpansion1 2021/udp +-down 2022/tcp +-xinuexpansion2 2022/udp +-xinuexpansion3 2023/tcp +-xinuexpansion3 2023/udp +-xinuexpansion4 2024/tcp +-xinuexpansion4 2024/udp +-ellpack 2025/tcp +-xribs 2025/udp +-scrabble 2026/tcp +-scrabble 2026/udp +-shadowserver 2027/tcp +-shadowserver 2027/udp +-submitserver 2028/tcp +-submitserver 2028/udp +-hsrpv6 2029/tcp Hot Standby Router Protocol IPv6 +-hsrpv6 2029/udp Hot Standby Router Protocol IPv6 +-# Ian Wilson <hsrp-info&cisco.com> November 2004 +-device2 2030/tcp +-device2 2030/udp +-mobrien-chat 2031/tcp mobrien-chat +-mobrien-chat 2031/udp mobrien-chat +-# Mike O'Brien <mike&mobrien.com> November 2004 +-blackboard 2032/tcp +-blackboard 2032/udp +-glogger 2033/tcp +-glogger 2033/udp +-scoremgr 2034/tcp +-scoremgr 2034/udp +-imsldoc 2035/tcp +-imsldoc 2035/udp +-# +-e-dpnet 2036/tcp Ethernet WS DP network +-e-dpnet 2036/udp Ethernet WS DP network +-# Peter Kaever <kaever.peter&westfalia.com> August 2005 +-p2plus 2037/tcp P2plus Application Server +-p2plus 2037/udp P2plus Application Server +-# Thomas Boerkel <tb&ap-ag.com> +-objectmanager 2038/tcp +-objectmanager 2038/udp +-# +-prizma 2039/tcp Prizma Monitoring Service +-prizma 2039/udp Prizma Monitoring Service +-# Dotan Ofek <dotan.ofek&prizmasoft.com> December 2005 +-lam 2040/tcp +-lam 2040/udp +-interbase 2041/tcp +-interbase 2041/udp +-isis 2042/tcp isis +-isis 2042/udp isis +-isis-bcast 2043/tcp isis-bcast +-isis-bcast 2043/udp isis-bcast +-# Ken Chapman <kchapman&isis.com> +-rimsl 2044/tcp +-rimsl 2044/udp +-cdfunc 2045/tcp +-cdfunc 2045/udp +-sdfunc 2046/tcp +-sdfunc 2046/udp +-dls 2047/tcp +-dls 2047/udp +-dls-monitor 2048/tcp +-dls-monitor 2048/udp +-# <== NOTE Conflict on 2049 ! +-shilp 2049/tcp +-shilp 2049/udp +-nfs 2049/tcp Network File System - Sun Microsystems +-nfs 2049/udp Network File System - Sun Microsystems +-# Brent Callaghan <brent&terra.eng.sun.com> +-av-emb-config 2050/tcp Avaya EMB Config Port +-av-emb-config 2050/udp Avaya EMB Config Port +-# John Yeager <johnyeager&avaya.com> +-epnsdp 2051/tcp EPNSDP +-epnsdp 2051/udp EPNSDP +-# Hiroyasu Ogata <Ogata.Hiroyasu&exc.epson.co.jp> +-clearvisn 2052/tcp clearVisn Services Port +-clearvisn 2052/udp clearVisn Services Port +-# Dave Lyons <dlyons&dnpg.com> +-lot105-ds-upd 2053/tcp Lot105 DSuper Updates +-lot105-ds-upd 2053/udp Lot105 DSuper Updates +-# Piers Scannell <iana-form&lot105.com> +-weblogin 2054/tcp Weblogin Port +-weblogin 2054/udp Weblogin Port +-# Diego Saravia <dsa&unsa.edu.ar> +-iop 2055/tcp Iliad-Odyssey Protocol +-iop 2055/udp Iliad-Odyssey Protocol +-# Bruce Lueckenhoff <brucelu&cisco.com> +-omnisky 2056/tcp OmniSky Port +-omnisky 2056/udp OmniSky Port +-# Oren Hurvitz <oren&omnisky.com> +-rich-cp 2057/tcp Rich Content Protocol +-rich-cp 2057/udp Rich Content Protocol +-# Ronen Vainish <ronen&digitalfountain.com> +-newwavesearch 2058/tcp NewWaveSearchables RMI +-newwavesearch 2058/udp NewWaveSearchables RMI +-# Thomas Kerkau <Thomas.Kerkau&io-software.com> +-bmc-messaging 2059/tcp BMC Messaging Service +-bmc-messaging 2059/udp BMC Messaging Service +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-teleniumdaemon 2060/tcp Telenium Daemon IF +-teleniumdaemon 2060/udp Telenium Daemon IF +-# Nick Woronuk <nick.woronuk&megasys.com> +-netmount 2061/tcp NetMount +-netmount 2061/udp NetMount +-# Alex Oberlander <alexo&netmount.com> +-icg-swp 2062/tcp ICG SWP Port +-icg-swp 2062/udp ICG SWP Port +-icg-bridge 2063/tcp ICG Bridge Port +-icg-bridge 2063/udp ICG Bridge Port +-icg-iprelay 2064/tcp ICG IP Relay Port +-icg-iprelay 2064/udp ICG IP Relay Port +-# Steve Quintana <steve&icgresearch.com> +-dlsrpn 2065/tcp Data Link Switch Read Port Number +-dlsrpn 2065/udp Data Link Switch Read Port Number +-# Amir Peless <amirp&radware.co.il> +-aura 2066/tcp AVM USB Remote Architecture +-aura 2066/udp AVM USB Remote Architecture +-# Diego Friedel <d.friedel&avm.de> March 2006 +-dlswpn 2067/tcp Data Link Switch Write Port Number +-dlswpn 2067/udp Data Link Switch Write Port Number +-# Amir Peless <amirp&radware.co.il> +-avauthsrvprtcl 2068/tcp Avocent AuthSrv Protocol +-avauthsrvprtcl 2068/udp Avocent AuthSrv Protocol +-# Steven W. Clark <sclark&equinox.com> +-event-port 2069/tcp HTTP Event Port +-event-port 2069/udp HTTP Event Port +-# Larry Emlich <larry.emlich&compaq.com> +-ah-esp-encap 2070/tcp AH and ESP Encapsulated in UDP packet +-ah-esp-encap 2070/udp AH and ESP Encapsulated in UDP packet +-# Amy Weaver <aweaver&vpnet.com> +-acp-port 2071/tcp Axon Control Protocol +-acp-port 2071/udp Axon Control Protocol +-# Christiaan Simons <christiaan.simons&axon.nl> +-msync 2072/tcp GlobeCast mSync +-msync 2072/udp GlobeCast mSync +-# Piers Scannell <piers&globecastne.com> +-gxs-data-port 2073/tcp DataReel Database Socket +-gxs-data-port 2073/udp DataReel Database Socket +-# Douglas M. Gaer <doug&datareel.com> +-vrtl-vmf-sa 2074/tcp Vertel VMF SA +-vrtl-vmf-sa 2074/udp Vertel VMF SA +-# Alan Akahoshi <alan-akahoshi&vertel.com> +-newlixengine 2075/tcp Newlix ServerWare Engine +-newlixengine 2075/udp Newlix ServerWare Engine +-newlixconfig 2076/tcp Newlix JSPConfig +-newlixconfig 2076/udp Newlix JSPConfig +-# Jean-Serge Gagnon <jean-serge.gagnon&newlix.com> +-tsrmagt 2077/tcp Old Tivoli Storage Manager +-tsrmagt 2077/udp Old Tivoli Storage Manager +-tpcsrvr 2078/tcp IBM Total Productivity Center Server +-tpcsrvr 2078/udp IBM Total Productivity Center Server +-# Justin R. Bendich <jbendich&us.ibm.com> +-idware-router 2079/tcp IDWARE Router Port +-idware-router 2079/udp IDWARE Router Port +-# Zdenek Kolba <zdenek.kolba&id-karta.cz> +-autodesk-nlm 2080/tcp Autodesk NLM (FLEXlm) +-autodesk-nlm 2080/udp Autodesk NLM (FLEXlm) +-# Greg Suppes <greg.suppes&autodesk.com> +-kme-trap-port 2081/tcp KME PRINTER TRAP PORT +-kme-trap-port 2081/udp KME PRINTER TRAP PORT +-# Masakatsu Matsuo <masa&sdsft.kme.mei.co.jp> +-infowave 2082/tcp Infowave Mobility Server +-infowave 2082/udp Infowave Mobiltiy Server +-# Kaz Kylheku <kkylheku&infowave.com> +-radsec 2083/tcp Secure Radius Service +-radsec 2083/udp Secure Radius Service +-# Mike McCauley <mikem&open.com.au> May 2005 +-sunclustergeo 2084/tcp SunCluster Geographic +-sunclustergeo 2084/udp SunCluster Geographic +-# Steve McKinty <steve.mckinty&sun.com> November 2005 +-ada-cip 2085/tcp ADA Control +-ada-cip 2085/udp ADA Control +-# Eugene Frenkel <eugene&ada-usa.com> November 2005 +-gnunet 2086/tcp GNUnet +-gnunet 2086/udp GNUnet +-# Christian Grothoff <grothoff&cs.purdue.edu> October 2002 +-eli 2087/tcp ELI - Event Logging Integration +-eli 2087/udp ELI - Event Logging Integration +-# Maya Zimerman <mayaz&radware.co.il> +-ip-blf 2088/tcp IP Busy Lamp Field +-ip-blf 2088/udp IP Busy Lamp Field +-# Jeffrey Szczepanski <jrs&inscitek.com> February 2005 +-sep 2089/tcp Security Encapsulation Protocol - SEP +-sep 2089/udp Security Encapsulation Protocol - SEP +-# Maya Zimerman <mayaz&radware.co.il> +-lrp 2090/tcp Load Report Protocol +-lrp 2090/udp Load Report Protocol +-# Amir Peless <amirp&radware.co.il> +-prp 2091/tcp PRP +-prp 2091/udp PRP +-# Amir Peless <amirp&radware.co.il> +-descent3 2092/tcp Descent 3 +-descent3 2092/udp Descent 3 +-# Kevin Bentley <Kevin&outrage.com> +-nbx-cc 2093/tcp NBX CC +-nbx-cc 2093/udp NBX CC +-nbx-au 2094/tcp NBX AU +-nbx-au 2094/udp NBX AU +-nbx-ser 2095/tcp NBX SER +-nbx-ser 2095/udp NBX SER +-nbx-dir 2096/tcp NBX DIR +-nbx-dir 2096/udp NBX DIR +-# Henry Houh <hhouh&nbxcorp.com> +-jetformpreview 2097/tcp Jet Form Preview +-jetformpreview 2097/udp Jet Form Preview +-# Zygmunt Wiercioch <zyg&jetform.com> +-dialog-port 2098/tcp Dialog Port +-dialog-port 2098/udp Dialog Port +-# Joseph Mathew <mjoseph&dosa.cisco.com> +-h2250-annex-g 2099/tcp H.225.0 Annex G +-h2250-annex-g 2099/udp H.225.0 Annex G +-# Gur Kimchi <gur.kimchi&vocaltec.com> +-amiganetfs 2100/tcp Amiga Network Filesystem +-amiganetfs 2100/udp Amiga Network Filesystem +-# Rudi Chiarito <nutello&sweetness.com> +-rtcm-sc104 2101/tcp rtcm-sc104 +-rtcm-sc104 2101/udp rtcm-sc104 +-# Wolfgang Rupprecht <wolfgang&wsrcc.com> +-zephyr-srv 2102/tcp Zephyr server +-zephyr-srv 2102/udp Zephyr server +-zephyr-clt 2103/tcp Zephyr serv-hm connection +-zephyr-clt 2103/udp Zephyr serv-hm connection +-zephyr-hm 2104/tcp Zephyr hostmanager +-zephyr-hm 2104/udp Zephyr hostmanager +-# Greg Hudson <zephyr-bugs&mit.edu> +-minipay 2105/tcp MiniPay +-minipay 2105/udp MiniPay +-# Amir Herzberg <amirh&vnet.ibm.com> +-mzap 2106/tcp MZAP +-mzap 2106/udp MZAP +-# Dave Thaler <dthalerµsoft.com> +-bintec-admin 2107/tcp BinTec Admin +-bintec-admin 2107/udp BinTec Admin +-# Thomas Schmidt <ts&bintec.de> +-comcam 2108/tcp Comcam +-comcam 2108/udp Comcam +-# Don Gilbreath <don&comcam.net> +-ergolight 2109/tcp Ergolight +-ergolight 2109/udp Ergolight +-# Jindra Ryvola <jryvola&ledalite.com> +-umsp 2110/tcp UMSP +-umsp 2110/udp UMSP +-# Alexander Bogdanov <alexander_bgd&softhome.net> +-dsatp 2111/tcp DSATP +-dsatp 2111/udp DSATP +-# Ralph Beck <beck&altaworks.com> +-idonix-metanet 2112/tcp Idonix MetaNet +-idonix-metanet 2112/udp Idonix MetaNet +-# Paul Harrison <paulh&idonix.co.uk> +-hsl-storm 2113/tcp HSL StoRM +-hsl-storm 2113/udp HSL StoRM +-# Jost Faganel <jost.faganel&hermes.si> +-newheights 2114/tcp NEWHEIGHTS +-newheights 2114/udp NEWHEIGHTS +-# Michael Levy <ml&nh.ca> +-kdm 2115/tcp Key Distribution Manager +-kdm 2115/udp Key Distribution Manager +-# Mike Little <mike.little&GDC4S.com> +-ccowcmr 2116/tcp CCOWCMR +-ccowcmr 2116/udp CCOWCMR +-# Mark Morwood <markm&sentillion.com> +-mentaclient 2117/tcp MENTACLIENT +-mentaclient 2117/udp MENTACLIENT +-mentaserver 2118/tcp MENTASERVER +-mentaserver 2118/udp MENTASERVER +-# Ilan Shlosberg <ilan&mentasoftware.com> +-gsigatekeeper 2119/tcp GSIGATEKEEPER +-gsigatekeeper 2119/udp GSIGATEKEEPER +-# Steve Tuecke <tuecke&mcs.anl.gov> +-qencp 2120/tcp Quick Eagle Networks CP +-qencp 2120/udp Quick Eagle Networks CP +-# Santa Dasu <Santa_Dasu&quickeagle.com> +-scientia-ssdb 2121/tcp SCIENTIA-SSDB +-scientia-ssdb 2121/udp SCIENTIA-SSDB +-# SYSTEMS MANAGER <systems-manager&scientia.com> +-caupc-remote 2122/tcp CauPC Remote Control +-caupc-remote 2122/udp CauPC Remote Control +-# Environics Oy <pasi.nuutinmaki&environics.fi> +-gtp-control 2123/tcp GTP-Control Plane (3GPP) +-gtp-control 2123/udp GTP-Control Plane (3GPP) +-# Alessio Casati <a.casati&computer.org> +-elatelink 2124/tcp ELATELINK +-elatelink 2124/udp ELATELINK +-# Tim Lawrence <lawrence&tao-group.com> +-lockstep 2125/tcp LOCKSTEP +-lockstep 2125/udp LOCKSTEP +-# Karl Forster <kforster&lockstep.com> +-pktcable-cops 2126/tcp PktCable-COPS +-pktcable-cops 2126/udp PktCable-COPS +-# Glenn Russell <grussell&cablelabs.com> +-index-pc-wb 2127/tcp INDEX-PC-WB +-index-pc-wb 2127/udp INDEX-PC-WB +-# James David Fisher <jfisher1&avaya.com> +-net-steward 2128/tcp Net Steward Control +-net-steward 2128/udp Net Steward Control +-# Martin Norman <martin&ndl.co.uk> +-cs-live 2129/tcp cs-live.com +-cs-live 2129/udp cs-live.com +-# Matt Lachance <matt&cs-live.com> +-xds 2130/tcp XDS +-xds 2130/udp XDS +-# Peter Zurich <pbz&Lowpft.com> +-avantageb2b 2131/tcp Avantageb2b +-avantageb2b 2131/udp Avantageb2b +-# Avi Software <srobert&logava.com> +-solera-epmap 2132/tcp SoleraTec End Point Map +-solera-epmap 2132/udp SoleraTec End Point Map +-# Mark Armstrong <Mark.Armstrong&SoleraTec.com> +-zymed-zpp 2133/tcp ZYMED-ZPP +-zymed-zpp 2133/udp ZYMED-ZPP +-# Gregg Welker <greggw&zmi.com> +-avenue 2134/tcp AVENUE +-avenue 2134/udp AVENUE +-# Jason Cater <jason&ncsmags.com> +-gris 2135/tcp Grid Resource Information Server +-gris 2135/udp Grid Resource Information Server +-# Steve Tuecke <tuecke&mcs.anl.gov> +-appworxsrv 2136/tcp APPWORXSRV +-appworxsrv 2136/udp APPWORXSRV +-# Fred McLain <fmclain&appworx.com> +-connect 2137/tcp CONNECT +-connect 2137/udp CONNECT +-# Reid Ligon <reid&connectrf.com> +-unbind-cluster 2138/tcp UNBIND-CLUSTER +-unbind-cluster 2138/udp UNBIND-CLUSTER +-# Francois Harvey <securiweb&pandore.qc.ca> +-ias-auth 2139/tcp IAS-AUTH +-ias-auth 2139/udp IAS-AUTH +-ias-reg 2140/tcp IAS-REG +-ias-reg 2140/udp IAS-REG +-ias-admind 2141/tcp IAS-ADMIND +-ias-admind 2141/udp IAS-ADMIND +-# Baiju V. Patel <Baiju.v.patel&intel.com> +-tdmoip 2142/tcp TDM OVER IP +-tdmoip 2142/udp TDM OVER IP +-# [RFC5087] +-lv-jc 2143/tcp Live Vault Job Control +-lv-jc 2143/udp Live Vault Job Control +-lv-ffx 2144/tcp Live Vault Fast Object Transfer +-lv-ffx 2144/udp Live Vault Fast Object Transfer +-lv-pici 2145/tcp Live Vault Remote Diagnostic Console Support +-lv-pici 2145/udp Live Vault Remote Diagnostic Console Support +-lv-not 2146/tcp Live Vault Admin Event Notification +-lv-not 2146/udp Live Vault Admin Event Notification +-lv-auth 2147/tcp Live Vault Authentication +-lv-auth 2147/udp Live Vault Authentication +-# Ted Hess <thess&livevault.com> +-veritas-ucl 2148/tcp VERITAS UNIVERSAL COMMUNICATION LAYER +-veritas-ucl 2148/udp VERITAS UNIVERSAL COMMUNICATION LAYER +-# Songlin Ren <ren&veritas.com> +-acptsys 2149/tcp ACPTSYS +-acptsys 2149/udp ACPTSYS +-# Michael Lekias <admin&psdesign.com.au> +-dynamic3d 2150/tcp DYNAMIC3D +-dynamic3d 2150/udp DYNAMIC3D +-# Tobias Wegner <wegner&novagate.de> +-docent 2151/tcp DOCENT +-docent 2151/udp DOCENT +-# Hali Lindbloom <halil&docent.com> +-gtp-user 2152/tcp GTP-User Plane (3GPP) +-gtp-user 2152/udp GTP-User Plane (3GPP) +-# Alessio Casati <a.casati&computer.org> +-ctlptc 2153/tcp Control Protocol +-ctlptc 2153/udp Control Protocol +-stdptc 2154/tcp Standard Protocol +-stdptc 2154/udp Standard Protocol +-brdptc 2155/tcp Bridge Protocol +-brdptc 2155/udp Bridge Protocol +-# Mr.Hideki Hatta <ponum&canon-ist.co.jp> 27 September 2007 +-trp 2156/tcp Talari Reliable Protocol +-trp 2156/udp Talari Reliable Protocol +-# John E. Dickey <jdickey&talarinetworks.com> 27 September 2007 +-# 2157-2158 Unassigned +-gdbremote 2159/tcp GDB Remote Debug Port +-gdbremote 2159/udp GDB Remote Debug Port +-# Nigel Stephens <nigel&algor.co.uk> +-apc-2160 2160/tcp APC 2160 +-apc-2160 2160/udp APC 2160 +-# American Power Conversion <ports&apcc.com> +-apc-2161 2161/tcp APC 2161 +-apc-2161 2161/udp APC 2161 +-# American Power Conversion <ports&apcc.com> +-navisphere 2162/tcp Navisphere +-navisphere 2162/udp Navisphere +-navisphere-sec 2163/tcp Navisphere Secure +-navisphere-sec 2163/udp Navisphere Secure +-# Andreas Bauer <bauer_andreas&emc.com> +-ddns-v3 2164/tcp Dynamic DNS Version 3 +-ddns-v3 2164/udp Dynamic DNS Version 3 +-# Alan Yates <alany&ay.com.au> +-x-bone-api 2165/tcp X-Bone API +-x-bone-api 2165/udp X-Bone API +-# Joe Touch <touch&isi.edu> +-iwserver 2166/tcp iwserver +-iwserver 2166/udp iwserver +-# Fred Surr <quest_iana&oz.quest.com> +-raw-serial 2167/tcp Raw Async Serial Link +-raw-serial 2167/udp Raw Async Serial Link +-# Benjamin Green <ben&lh.co.nz> +-easy-soft-mux 2168/tcp easy-soft Multiplexer +-easy-soft-mux 2168/udp easy-soft Multiplexer +-# Norbert Kintzler <NKintzler&easy-soft-dresden.de> November 2004 +-brain 2169/tcp Backbone for Academic Information Notification (BRAIN) +-brain 2169/udp Backbone for Academic Information Notification (BRAIN) +-# Archishmat Gore <archisgore&yahoo.com> November 2004 +-eyetv 2170/tcp EyeTV Server Port +-eyetv 2170/udp EyeTV Server Port +-# Elgato Systems <portinfo&elgato.com> November 2004 +-msfw-storage 2171/tcp MS Firewall Storage +-msfw-storage 2171/udp MS Firewall Storage +-msfw-s-storage 2172/tcp MS Firewall SecureStorage +-msfw-s-storage 2172/udp MS Firewall SecureStorage +-msfw-replica 2173/tcp MS Firewall Replication +-msfw-replica 2173/udp MS Firewall Replication +-msfw-array 2174/tcp MS Firewall Intra Array +-msfw-array 2174/udp MS Firewall Intra Array +-# Itai Greenberg <itaigµsoft.com> November 2004 +-airsync 2175/tcp Microsoft Desktop AirSync Protocol +-airsync 2175/udp Microsoft Desktop AirSync Protocol +-rapi 2176/tcp Microsoft ActiveSync Remote API +-rapi 2176/udp Microsoft ActiveSync Remote API +-# Jon Xu <jonxuµsoft.com> August 2005 +-qwave 2177/tcp qWAVE Bandwidth Estimate +-qwave 2177/udp qWAVE Bandwidth Estimate +-# Gabe Frost <gfrostµsoft.com> August 2005 +-bitspeer 2178/tcp Peer Services for BITS +-bitspeer 2178/udp Peer Services for BITS +-# Jeff Roberts <jrobertsµsoft.com> November 2005 +-vmrdp 2179/tcp Microsoft RDP for virtual machines +-vmrdp 2179/udp Microsoft RDP for virtual machines +-# Brian Henry <brian.henryµsoft.com> March 2007 +-mc-gt-srv 2180/tcp Millicent Vendor Gateway Server +-mc-gt-srv 2180/udp Millicent Vendor Gateway Server +-# Steve Glassman <steveg&pa.dec.com> +-eforward 2181/tcp eforward +-eforward 2181/udp eforward +-# Greg Pringle <admin&corvedia.com> +-cgn-stat 2182/tcp CGN status +-cgn-stat 2182/udp CGN status +-cgn-config 2183/tcp Code Green configuration +-cgn-config 2183/udp Code Green configuration +-# Chris Michaelson <chris&codegreennetworks.com> August 2005 +-nvd 2184/tcp NVD User +-nvd 2184/udp NVD User +-# Yves Gattegno <iana&qualystem.org> December 2004 +-onbase-dds 2185/tcp OnBase Distributed Disk Services +-onbase-dds 2185/udp OnBase Distributed Disk Services +-# Paul Tam <ianaportmaster&onbase.com> December 2004 +-gtaua 2186/tcp Guy-Tek Automated Update Applications +-gtaua 2186/udp Guy-Tek Automated Update Applications +-# Daniel Story <dan&guy-tek.com> 25 January 2008 +-# 2187-2189 Unassigned +-tivoconnect 2190/tcp TiVoConnect Beacon +-tivoconnect 2190/udp TiVoConnect Beacon +-# Jeffrey J. Peters <jpeters&tivo.com> August 2002 +-tvbus 2191/tcp TvBus Messaging +-tvbus 2191/udp TvBus Messaging +-# Brian W. Beach <brian&tivo.com> January 2003 +-asdis 2192/tcp ASDIS software management +-asdis 2192/udp ASDIS software management +-# ASDIS Support <support&asdis.de> August 2005 +-drwcs 2193/tcp Dr.Web Enterprise Management Service +-drwcs 2193/udp Dr.Web Enterprise Management Service +-# Eugeny Gladkih <john&drweb.com> 31 January 2008 +-# 2194-2196 Unassigned +-mnp-exchange 2197/tcp MNP data exchange +-mnp-exchange 2197/udp MNP data exchange +-# Peter Pramberger <peter.pramberger&telering.co.at> November 2004 +-onehome-remote 2198/tcp OneHome Remote Access +-onehome-remote 2198/udp OneHome Remote Access +-onehome-help 2199/tcp OneHome Service Port +-onehome-help 2199/udp OneHome Service Port +-# Jim Herman <jherman&homelogic.com> August 2005 +-ici 2200/tcp ICI +-ici 2200/udp ICI +-# Brent Hines <brent.hines&unisys.com> +-ats 2201/tcp Advanced Training System Program +-ats 2201/udp Advanced Training System Program +-# (Need contact info) +-imtc-map 2202/tcp Int. Multimedia Teleconferencing Cosortium +-imtc-map 2202/udp Int. Multimedia Teleconferencing Cosortium +-# Pat Galvin <pgalvin&databeam.com> +-b2-runtime 2203/tcp b2 Runtime Protocol +-b2-runtime 2203/udp b2 Runtime Protocol +-b2-license 2204/tcp b2 License Server +-b2-license 2204/udp b2 License Server +-# Helge-Frank Zimpel <helge.zimpel&baeurer.de> January 2006 +-jps 2205/tcp Java Presentation Server +-jps 2205/udp Java Presentation Server +-# Leif Jakob <leif+iana&cube.ch> January 2006 +-hpocbus 2206/tcp HP OpenCall bus +-hpocbus 2206/udp HP OpenCall bus +-# Jerome Forissier <Jerome.Forissier&hp.com> December 2005 +-hpssd 2207/tcp HP Status and Services +-hpssd 2207/udp HP Status and Services +-# Donald Welch <donald.welch&hp.com> May 2006 +-hpiod 2208/tcp HP I/O Backend +-hpiod 2208/udp HP I/O Backend +-# David Suffield <david.suffield&hp.com> May 2006 +-rimf-ps 2209/tcp HP RIM for Files Portal Service +-rimf-ps 2209/udp HP RIM for Files Portal Service +-# Patty Ho <rimf&core.rose.hp.com> May 2007 +-# 2210-2212 Unassigned +-kali 2213/tcp Kali +-kali 2213/udp Kali +-# Jay Cotton <JAY&calc.vet.uga.edu> +-rpi 2214/tcp RDQ Protocol Interface +-rpi 2214/udp RDQ Protocol Interface +-# Les Mather <lm&remsdaq.com> December 2005 +-ipcore 2215/tcp IPCore.co.za GPRS +-ipcore 2215/udp IPCore.co.za GPRS +-# Administrator <admin&ipcore.co.za> December 2005 +-vtu-comms 2216/tcp VTU data service +-vtu-comms 2216/udp VTU data service +-# David Barrass <dbarrass&bartecautoid.com> January 2006 +-gotodevice 2217/tcp GoToDevice Device Management +-gotodevice 2217/udp GoToDevice Device Management +-# John Lisek <jl&gotodevice.com> January 2006 +-bounzza 2218/tcp Bounzza IRC Proxy +-bounzza 2218/udp Bounzza IRC Proxy +-# Danko Alexeyev <virtuall&virtuall.info> February 2006 +-netiq-ncap 2219/tcp NetIQ NCAP Protocol +-netiq-ncap 2219/udp NetIQ NCAP Protocol +-# Roger Huebner <Roger.Huebner&netiq.com> January 2006 +-netiq 2220/tcp NetIQ End2End +-netiq 2220/udp NetIQ End2End +-# Gary Weichinger <gary.weichinger&netiq.com> +-rockwell-csp1 2221/tcp Rockwell CSP1 +-rockwell-csp1 2221/udp Rockwell CSP1 +-# Brian Batke <csp.protocol&gmail.com> +-EtherNet/IP-1 2222/tcp EtherNet/IP I/O +-EtherNet/IP-1 2222/udp EtherNet/IP I/O +-# Brian Batke <eip.jsig&gmail.com> +-# New contact added for port 2222 on 2008-02-01 +-rockwell-csp2 2223/tcp Rockwell CSP2 +-rockwell-csp2 2223/udp Rockwell CSP2 +-# Brian Batke <csp.protocol&gmail.com> +-efi-mg 2224/tcp Easy Flexible Internet/Multiplayer Games +-efi-mg 2224/udp Easy Flexible Internet/Multiplayer Games +-# Thomas Efer <mail&thomasefer.de> March 2006 +-rcip-itu 2225/tcp Resource Connection Initiation Protocol +-rcip-itu 2225/sctp Resource Connection Initiation Protocol +-# ITU TSB, Place des Nations, CH-1211 Geneva 20 <tsbmail&itu.int> June 2006 +-di-drm 2226/tcp Digital Instinct DRM +-di-drm 2226/udp Digital Instinct DRM +-di-msg 2227/tcp DI Messaging Service +-di-msg 2227/udp DI Messaging Service +-# Sean Ni <seanni&digitalinstinct.com.tw> February 2006 +-ehome-ms 2228/tcp eHome Message Server +-ehome-ms 2228/udp eHome Message Server +-# Peter Gabriel <peter.gabriel&ims.fraunhofer.de> January 2006 +-datalens 2229/tcp DataLens Service +-datalens 2229/udp DataLens Service +-# Christopher Bidwell <cbidwell&silvercreeksystems.com> February 2006 +-queueadm 2230/tcp MetaSoft Job Queue Administration Service +-queueadm 2230/udp MetaSoft Job Queue Administration Service +-# Ilya Melamed <ilya77&gmail.com> June 2006 +-wimaxasncp 2231/tcp WiMAX ASN Control Plane Protocol +-wimaxasncp 2231/udp WiMAX ASN Control Plane Protocol +-# Prakash Iyer <prakash.iyer&intel.com> June 2006 +-ivs-video 2232/tcp IVS Video default +-ivs-video 2232/udp IVS Video default +-# Thierry Turletti <Thierry.Turletti&sophia.inria.fr> +-infocrypt 2233/tcp INFOCRYPT +-infocrypt 2233/udp INFOCRYPT +-# Erica Liu <liue&isolation.com> +-directplay 2234/tcp DirectPlay +-directplay 2234/udp DirectPlay +-# Ajay Jindal <ajayjµsoft.com> +-sercomm-wlink 2235/tcp Sercomm-WLink +-sercomm-wlink 2235/udp Sercomm-WLink +-# Melinda Tsao <melinda&tpe1.sercomm.com.tw> +-nani 2236/tcp Nani +-nani 2236/udp Nani +-# Steve Benoit <sbenoi01&eng.eds.com> +-optech-port1-lm 2237/tcp Optech Port1 License Manager +-optech-port1-lm 2237/udp Optech Port1 License Manager +-# Gerard Cannie <jcannie&opticaltech.com> +-aviva-sna 2238/tcp AVIVA SNA SERVER +-aviva-sna 2238/udp AVIVA SNA SERVER +-# Vick Keshishian <vickenK&192.219.82.71> +-imagequery 2239/tcp Image Query +-imagequery 2239/udp Image Query +-# Charles Jacobs <cjacobs&numinous.com> +-recipe 2240/tcp RECIPe +-recipe 2240/udp RECIPe +-# Charlie Limoges <Charlie.Limoges&GDC4S.com> +-ivsd 2241/tcp IVS Daemon +-ivsd 2241/udp IVS Daemon +-# Thierry Turletti +-# <Thierry.Turletti&sophia.inria.fr> +-foliocorp 2242/tcp Folio Remote Server +-foliocorp 2242/udp Folio Remote Server +-# Pat Mcgowan <pmcgowan&folio.com> +-magicom 2243/tcp Magicom Protocol +-magicom 2243/udp Magicom Protocol +-# Yossi Appleboum <yossia&magicom.co.il> +-nmsserver 2244/tcp NMS Server +-nmsserver 2244/udp NMS Server +-# Dmitry Krasnonosenkikh +-# <Dmitry_Krasnonosenkih&nmss.com> +-hao 2245/tcp HaO +-hao 2245/udp HaO +-# Panic Ride <panicride&hao.org> +-pc-mta-addrmap 2246/tcp PacketCable MTA Addr Map +-pc-mta-addrmap 2246/udp PacketCable MTA Addr Map +-# Dave Maxwell <d.maxwell&cablelabs.com> +-antidotemgrsvr 2247/tcp Antidote Deployment Manager Service +-antidotemgrsvr 2247/udp Antidote Deployment Manager Service +-# Rod Waltermann <walterma&us.lenovo.com> February 2006 +-ums 2248/tcp User Management Service +-ums 2248/udp User Management Service +-# Andrew Crockford +-# <andrew.crockford&modus-interactive.co.uk> +-rfmp 2249/tcp RISO File Manager Protocol +-rfmp 2249/udp RISO File Manager Protocol +-# Shinji Yamanaka <syamanaka&jci.co.jp> +-remote-collab 2250/tcp remote-collab +-remote-collab 2250/udp remote-collab +-# Richard Walters <walters&cs.ucdavis.edu> +-dif-port 2251/tcp Distributed Framework Port +-dif-port 2251/udp Distributed Framework Port +-# Sebastien Lambla <lambla&bouygtel.com> +-njenet-ssl 2252/tcp NJENET using SSL +-njenet-ssl 2252/udp NJENET using SSL +-# Hans U Schmidt <schmidth&de.ibm.com> +-dtv-chan-req 2253/tcp DTV Channel Request +-dtv-chan-req 2253/udp DTV Channel Request +-# Richard Hodges <rh&matriplex.com> +-seispoc 2254/tcp Seismic P.O.C. Port +-seispoc 2254/udp Seismic P.O.C. Port +-# Robert Reimiller <bob&certsoft.com> +-vrtp 2255/tcp VRTP - ViRtue Transfer Protocol +-vrtp 2255/udp VRTP - ViRtue Transfer Protocol +-# Max Fudim <fudim&virtue3d.com> +-pcc-mfp 2256/tcp PCC MFP +-pcc-mfp 2256/udp PCC MFP +-# Kunihiko Morota <morota.kunihiko&jp.panasonic.com> August 2005 +-simple-tx-rx 2257/tcp simple text/file transfer +-simple-tx-rx 2257/udp simple text/file transfer +-# Daniel Kilsdonk <dan&prospeed.net> August 2006 +-rcts 2258/tcp Rotorcraft Communications Test System +-rcts 2258/udp Rotorcraft Communications Test System +-# Terry Eldridge <Terry.Eldridge&6pointn.com> August 2006 +-acd-pm 2259/tcp Accedian Performance Measurement +-acd-pm 2259/udp Accedian Performance Measurement +-# Claude Robitaille <clauder&accedian.com> August 2006 +-apc-2260 2260/tcp APC 2260 +-apc-2260 2260/udp APC 2260 +-# American Power Conversion <ports&apcc.com> February 2002 +-comotionmaster 2261/tcp CoMotion Master Server +-comotionmaster 2261/udp CoMotion Master Server +-comotionback 2262/tcp CoMotion Backup Server +-comotionback 2262/udp CoMotion Backup Server +-# Friedman Wagner-Dobler <Friedman.Wagner-Dobler&gdc4s.com> September 2005 +-ecwcfg 2263/tcp ECweb Configuration Service +-ecwcfg 2263/udp ECweb Configuration Service +-# Anders Hjelm <anders.hjelm&ec.se> March 2006 +-apx500api-1 2264/tcp Audio Precision Apx500 API Port 1 +-apx500api-1 2264/udp Audio Precision Apx500 API Port 1 +-apx500api-2 2265/tcp Audio Precision Apx500 API Port 2 +-apx500api-2 2265/udp Audio Precision Apx500 API Port 2 +-# Robert Wright, Founder and Principal Engineer, Audio Precision Inc. +-# <ianaports&ap.com> May 2006 +-mfserver 2266/tcp M-Files Server +-mfserver 2266/udp M-files Server +-# Samppa Lahtinen <samppa.lahtinen&motivesys.com>, June 2004 +-ontobroker 2267/tcp OntoBroker +-ontobroker 2267/udp OntoBroker +-# Dr. Michael Erdmann <erdmann&ontoprise.de> December 2004 +-amt 2268/tcp AMT +-amt 2268/udp AMT +-# Tom Pusateri <pusateri&juniper.net> December 2004 +-mikey 2269/tcp MIKEY +-mikey 2269/udp MIKEY +-# Karl Norrman <karl.norrman&ericsson.com> December 2004 +-starschool 2270/tcp starSchool +-starschool 2270/udp starSchool +-# Adam Ernst <cosmicsoft&cosmicsoft.net> December 2004 +-mmcals 2271/tcp Secure Meeting Maker Scheduling +-mmcals 2271/udp Secure Meeting Maker Scheduling +-mmcal 2272/tcp Meeting Maker Scheduling +-mmcal 2272/udp Meeting Maker Scheduling +-# Andrew H Derbyshire <ahd&meetingmaker.plus.kew.com> December 2004 +-mysql-im 2273/tcp MySQL Instance Manager +-mysql-im 2273/udp MySQL Instance Manager +-# Petr Chardin <petr&mysql.com> December 2004 +-pcttunnell 2274/tcp PCTTunneller +-pcttunnell 2274/udp PCTTunneller +-# ProControl Technology AB <info&pctworld.com> December 2004 +-ibridge-data 2275/tcp iBridge Conferencing +-ibridge-data 2275/udp iBridge Conferencing +-ibridge-mgmt 2276/tcp iBridge Management +-ibridge-mgmt 2276/udp iBridge Management +-# Patrick Fisher <pfisher&hns.com> December 2004 +-bluectrlproxy 2277/tcp Bt device control proxy +-bluectrlproxy 2277/udp Bt device control proxy +-# Mark de Rooi <derooi&xs4all.nl> December 2004 +-s3db 2278/tcp Simple Stacked Sequences Database +-s3db 2278/udp Simple Stacked Sequences Database +-# David Brandon <dade&smoolabs.net> August 2006 +-xmquery 2279/tcp xmquery +-xmquery 2279/udp xmquery +-# Niels Christiansen <nchris&austin.ibm.com> +-lnvpoller 2280/tcp LNVPOLLER +-lnvpoller 2280/udp LNVPOLLER +-lnvconsole 2281/tcp LNVCONSOLE +-lnvconsole 2281/udp LNVCONSOLE +-lnvalarm 2282/tcp LNVALARM +-lnvalarm 2282/udp LNVALARM +-lnvstatus 2283/tcp LNVSTATUS +-lnvstatus 2283/udp LNVSTATUS +-lnvmaps 2284/tcp LNVMAPS +-lnvmaps 2284/udp LNVMAPS +-lnvmailmon 2285/tcp LNVMAILMON +-lnvmailmon 2285/udp LNVMAILMON +-# John Payne <jpayne&lotus.com> +-nas-metering 2286/tcp NAS-Metering +-nas-metering 2286/udp NAS-Metering +-# Steven Sawkins <ssawkins&symantec.com> +-dna 2287/tcp DNA +-dna 2287/udp DNA +-# Tung Nguyen <dash&ricochet.net> +-netml 2288/tcp NETML +-netml 2288/udp NETML +-# Jochen Hansmeyer <cjh&krypton.de> +-dict-lookup 2289/tcp Lookup dict server +-dict-lookup 2289/udp Lookup dict server +-# William Fernando Maton Sotomayor <wfms&acm.org> January 2005 +-sonus-logging 2290/tcp Sonus Logging Services +-sonus-logging 2290/udp Sonus Logging Services +-# Adwait Sathe <asathe&sonusnet.com> August 2005 +-eapsp 2291/tcp EPSON Advanced Printer Share Protocol +-eapsp 2291/udp EPSON Advanced Printer Share Protocol +-# SEIKO EPSON <APD.admin&exc.epson.co.jp> June 2006 +-mib-streaming 2292/tcp Sonus Element Management Services +-mib-streaming 2292/udp Sonus Element Management Services +-# Linda Lin <llin&sonusnet.com> August 2006 +-npdbgmngr 2293/tcp Network Platform Debug Manager +-npdbgmngr 2293/udp Network Platform Debug Manager +-# Robert Byrne <robert.byrne&ie.abb.com> September 2006 +-konshus-lm 2294/tcp Konshus License Manager (FLEX) +-konshus-lm 2294/udp Konshus License Manager (FLEX) +-# Francois Painchaud <fpainchaud&konshus.com> +-advant-lm 2295/tcp Advant License Manager +-advant-lm 2295/udp Advant License Manager +-# Lars-Goran Magnusson +-# <lars-goran.magnusson&seisy.mail.abb.com> +-theta-lm 2296/tcp Theta License Manager (Rainbow) +-theta-lm 2296/udp Theta License Manager (Rainbow) +-# David Thompson <theta&theta-ent.com> +-d2k-datamover1 2297/tcp D2K DataMover 1 +-d2k-datamover1 2297/udp D2K DataMover 1 +-d2k-datamover2 2298/tcp D2K DataMover 2 +-d2k-datamover2 2298/udp D2K DataMover 2 +-# Eric Lan <elan&d2k.com> +-pc-telecommute 2299/tcp PC Telecommute +-pc-telecommute 2299/udp PC Telecommute +-# John Daniel Bonamico <jbonamico&symantec.com> +-cvmmon 2300/tcp CVMMON +-cvmmon 2300/udp CVMMON +-# Roger Kumpf <kumpf&cup.hp.com> +-cpq-wbem 2301/tcp Compaq HTTP +-cpq-wbem 2301/udp Compaq HTTP +-# Scott Shaffer <scott.shaffer&hp.com> +-binderysupport 2302/tcp Bindery Support +-binderysupport 2302/udp Bindery Support +-# Narasimha Rao N. <nnarasimharao&novell.com> +-proxy-gateway 2303/tcp Proxy Gateway +-proxy-gateway 2303/udp Proxy Gateway +-# Paul Funk <paul&funk.com> +-attachmate-uts 2304/tcp Attachmate UTS +-attachmate-uts 2304/udp Attachmate UTS +-# George Gianelos <Georgegi&Attachmate.com> +-mt-scaleserver 2305/tcp MT ScaleServer +-mt-scaleserver 2305/udp MT ScaleServer +-# Paul Glaubitz <Paul.Glaubitz&mt.com> +-tappi-boxnet 2306/tcp TAPPI BoxNet +-tappi-boxnet 2306/udp TAPPI BoxNet +-# Richard Spartz <rspartz&alliancetechnical.com> +-pehelp 2307/tcp pehelp +-pehelp 2307/udp pehelp +-# Jens Kilian <jensk&hpbeo82.bbn.hp.com> +-sdhelp 2308/tcp sdhelp +-sdhelp 2308/udp sdhelp +-# Annette Klecha <annette_klecha&bbn.hp.com> +-sdserver 2309/tcp SD Server +-sdserver 2309/udp SD Server +-sdclient 2310/tcp SD Client +-sdclient 2310/udp SD Client +-# Jeurgen Broesamle <juergb&bbn.hp.com> +-messageservice 2311/tcp Message Service +-messageservice 2311/udp Message Service +-# No contact Listed +-wanscaler 2312/tcp WANScaler Communication Service +-wanscaler 2312/udp WANScaler Communication Service +-# Allen Samuels <allen.samuels&citrix.com> November 2006 +-iapp 2313/tcp IAPP (Inter Access Point Protocol) +-iapp 2313/udp IAPP (Inter Access Point Protocol) +-# Henri Moelard <moelard&lucent.com> +-cr-websystems 2314/tcp CR WebSystems +-cr-websystems 2314/udp CR WebSystems +-# Robin Giese <rgiese&peddie.org> +-precise-sft 2315/tcp Precise Sft. +-precise-sft 2315/udp Precise Sft. +-# Michael Landwehr <mikel&precisesoft.co.il> +-sent-lm 2316/tcp SENT License Manager +-sent-lm 2316/udp SENT License Manager +-# Pisharath Krishnan <krishnan&axis-inc.com> +-attachmate-g32 2317/tcp Attachmate G32 +-attachmate-g32 2317/udp Attachmate G32 +-# Bryce Bhatnagar <BRYCEBH&Attachmate.com> +-cadencecontrol 2318/tcp Cadence Control +-cadencecontrol 2318/udp Cadence Control +-# Buck Caldwell <buck_c&polygon.com> +-infolibria 2319/tcp InfoLibria +-infolibria 2319/udp InfoLibria +-# Chris Chiotasso <cchiotasso&infolibria.com> +-siebel-ns 2320/tcp Siebel NS +-siebel-ns 2320/udp Siebel NS +-# Gilberto Arnaiz <garnaiz&siebel.com> +-rdlap 2321/tcp RDLAP +-rdlap 2321/udp RDLAP +-# Robert Wiebe <crw010&email.mot.com> +-ofsd 2322/tcp ofsd +-ofsd 2322/udp ofsd +-3d-nfsd 2323/tcp 3d-nfsd +-3d-nfsd 2323/udp 3d-nfsd +-# Mike Sherrill <sherrill&commvault.com> +-cosmocall 2324/tcp Cosmocall +-cosmocall 2324/udp Cosmocall +-# Steve Dellutri +-designspace-lm 2325/tcp Design Space License Management +-designspace-lm 2325/udp Design Space License Management +-# Suzanne Lorrin <suzanne.lorrin&ansys.com> +-idcp 2326/tcp IDCP +-idcp 2326/udp IDCP +-# Keisokugiken Corp. <adda&kgc.co.jp> +-xingcsm 2327/tcp xingcsm +-xingcsm 2327/udp xingcsm +-# Dave Spencer <dspencer&xingtech.com> +-netrix-sftm 2328/tcp Netrix SFTM +-netrix-sftm 2328/udp Netrix SFTM +-# Garrett Herschleb <garrett&netrix.com> +-nvd 2329/tcp NVD +-nvd 2329/udp NVD +-# Peter Weyman <pjweyman&noblenet.com> +-tscchat 2330/tcp TSCCHAT +-tscchat 2330/udp TSCCHAT +-# Mike Jackson <mhjack&tscnet.com> +-agentview 2331/tcp AGENTVIEW +-agentview 2331/udp AGENTVIEW +-# Ram Iyer <ram&aaccorp.com> +-rcc-host 2332/tcp RCC Host +-rcc-host 2332/udp RCC Host +-# Martin Shoemaker <shoemakerml&rapistan.com> +-snapp 2333/tcp SNAPP +-snapp 2333/udp SNAPP +-# Kevin Osborn <kosborn&snapappliance.com> +-ace-client 2334/tcp ACE Client Auth +-ace-client 2334/udp ACE Client Auth +-ace-proxy 2335/tcp ACE Proxy +-ace-proxy 2335/udp ACE Proxy +-# Riaz Zolfonoon <rzolfonoon&securitydynamics.com> +-appleugcontrol 2336/tcp Apple UG Control +-appleugcontrol 2336/udp Apple UG Control +-# Gene Tyacke <gene&apple.com> +-ideesrv 2337/tcp ideesrv +-ideesrv 2337/udp ideesrv +-# Marazzi <fmarazzi&ideetique.com> +-norton-lambert 2338/tcp Norton Lambert +-norton-lambert 2338/udp Norton Lambert +-# Richard de Mornay <rdemornay&norton-lambert.com> +-3com-webview 2339/tcp 3Com WebView +-3com-webview 2339/udp 3Com WebView +-# Jennifer Grace <Jennifer_Grace&3com.com> +-wrs_registry 2340/tcp WRS Registry +-wrs_registry 2340/udp WRS Registry +-# Christophe Cleraux <chrisc&wrs.com> +-xiostatus 2341/tcp XIO Status +-xiostatus 2341/udp XIO Status +-# Randy Maas <randym&xiotech.com> +-manage-exec 2342/tcp Seagate Manage Exec +-manage-exec 2342/udp Seagate Manage Exec +-# Jim Flaherty <jim.flaherty&seagatesoftware.com> +-nati-logos 2343/tcp nati logos +-nati-logos 2343/udp nati logos +-# James Juhasz <james.juhasz&ni.com> +-fcmsys 2344/tcp fcmsys +-fcmsys 2344/udp fcmsys +-dbm 2345/tcp dbm +-dbm 2345/udp dbm +-# Dean Robson <dean.robson&fujitsu.com.au> +-redstorm_join 2346/tcp Game Connection Port +-redstorm_join 2346/udp Game Connection Port +-redstorm_find 2347/tcp Game Announcement and Location +-redstorm_find 2347/udp Game Announcement and Location +-redstorm_info 2348/tcp Information to query for game status +-redstorm_info 2348/udp Information to query for game status +-redstorm_diag 2349/tcp Diagnostics Port +-redstorm_diag 2349/udp Diagnostics Port +-# David Weinstein <david.weinstein&redstorm.com> +-psbserver 2350/tcp psbserver +-psbserver 2350/udp psbserver +-psrserver 2351/tcp psrserver +-psrserver 2351/udp psrserver +-pslserver 2352/tcp pslserver +-pslserver 2352/udp pslserver +-pspserver 2353/tcp pspserver +-pspserver 2353/udp pspserver +-psprserver 2354/tcp psprserver +-psprserver 2354/udp psprserver +-psdbserver 2355/tcp psdbserver +-psdbserver 2355/udp psdbserver +-# Paul Reddy <Paul&pharos.co.nz> +-gxtelmd 2356/tcp GXT License Managemant +-gxtelmd 2356/udp GXT License Managemant +-# Robert Hodgson <rrh&gxt.com> +-unihub-server 2357/tcp UniHub Server +-unihub-server 2357/udp UniHub Server +-# Tim Kenyon <Tim_Kenyon&csicontrols.com> +-futrix 2358/tcp Futrix +-futrix 2358/udp Futrix +-# Peter Frankenberg <pcfberg&ibm.net> +-flukeserver 2359/tcp FlukeServer +-flukeserver 2359/udp FlukeServer +-# Bill Marbaker <wrm&fortenet.com> +-nexstorindltd 2360/tcp NexstorIndLtd +-nexstorindltd 2360/udp NexstorIndLtd +-# NexStor India Limited <next&nda.vsnl.net.in> +-tl1 2361/tcp TL1 +-tl1 2361/udp TL1 +-# Charles Scott Roberson <chip&cerent.com> +-digiman 2362/tcp digiman +-digiman 2362/udp digiman +-# Aaron S. Kurland <akurland&netsilicon.com> +-mediacntrlnfsd 2363/tcp Media Central NFSD +-mediacntrlnfsd 2363/udp Media Central NFSD +-# shivakumar s. govindarajapuram <shivak&eng.sun.com> +-oi-2000 2364/tcp OI-2000 +-oi-2000 2364/udp OI-2000 +-# Software Horizons Inc. <oi2000&shorizons.com> +-dbref 2365/tcp dbref +-dbref 2365/udp dbref +-# Yoshihiro Yamazaki <yamazaki&ael.fujitsu.co.jp> +-qip-login 2366/tcp qip-login +-qip-login 2366/udp qip-login +-# Mike Morgan <mmorgan&lucent.com> +-service-ctrl 2367/tcp Service Control +-service-ctrl 2367/udp Service Control +-# Humberto Sanchez <Humberto_Sanchez&hp.com> +-opentable 2368/tcp OpenTable +-opentable 2368/udp OpenTable +-# Brett Goldstein <bgoldstein&opentable.com> +-# 2369 De-registered (28 March 2006) +-l3-hbmon 2370/tcp L3-HBMon +-l3-hbmon 2370/udp L3-HBMon +-# Dolores Scott <Dolores.Scott&L-3security.com> +-#### Port 2370 Unofficially used by Compaq #### +-worldwire 2371/tcp Compaq WorldWire Port +-worldwire 2371/udp Compaq WorldWire Port +-# Michael Spratte <michael.spratte&compaq.com> +-lanmessenger 2372/tcp LanMessenger +-lanmessenger 2372/udp LanMessenger +-# Garrett Padera <garrett&garrettsites.net> 01 February 2008 +-# 2373-2380 Unassigned +-compaq-https 2381/tcp Compaq HTTPS +-compaq-https 2381/udp Compaq HTTPS +-# Scott Shaffer <scott.shaffer&hp.com> +-ms-olap3 2382/tcp Microsoft OLAP +-ms-olap3 2382/udp Microsoft OLAP +-ms-olap4 2383/tcp Microsoft OLAP +-ms-olap4 2383/udp Microsoft OLAP +-# Mosha Pasumansky <moshapµsoft.com> +-sd-request 2384/tcp SD-REQUEST +-sd-capacity 2384/udp SD-CAPACITY +-# Jason McManus <jasonm&sleepdep.net> +-sd-data 2385/tcp SD-DATA +-sd-data 2385/udp SD-DATA +-# Jason McManus <jasonm&sleepdep.net> +-virtualtape 2386/tcp Virtual Tape +-virtualtape 2386/udp Virtual Tape +-vsamredirector 2387/tcp VSAM Redirector +-vsamredirector 2387/udp VSAM Redirector +-# Ingo Franzki <ifranzki&de.ibm.com> +-mynahautostart 2388/tcp MYNAH AutoStart +-mynahautostart 2388/udp MYNAH AutoStart +-# Thomas J. Klehr <tklehr&telcordia.com> +-ovsessionmgr 2389/tcp OpenView Session Mgr +-ovsessionmgr 2389/udp OpenView Session Mgr +-# Eric Pulsipher <eric_pulsipher&hp.com> +-rsmtp 2390/tcp RSMTP +-rsmtp 2390/udp RSMTP +-# Geoff Collyer <geoff&research.bell-labs.com> +-3com-net-mgmt 2391/tcp 3COM Net Management +-3com-net-mgmt 2391/udp 3COM Net Management +-# Prathibha Nagvar +-tacticalauth 2392/tcp Tactical Auth +-tacticalauth 2392/udp Tactical Auth +-# David Yon <yon&tactical-sw.com> +-ms-olap1 2393/tcp MS OLAP 1 +-ms-olap1 2393/udp MS OLAP 1 +-ms-olap2 2394/tcp MS OLAP 2 +-ms-olap2 2394/udp MS OLAP 2 +-# Mosha Pasumansky <moshapµsoft.com> +-lan900_remote 2395/tcp LAN900 Remote +-lan900_remote 2395/udp LAN900 Remote +-# Tom Quinlan <tquinlan&digitechinc.com> +-wusage 2396/tcp Wusage +-wusage 2396/udp Wusage +-# Thomas Boutell <boutell&boutell.com> +-ncl 2397/tcp NCL +-ncl 2397/udp NCL +-# Robert Wiebe <crw010&email.mot.com> +-orbiter 2398/tcp Orbiter +-orbiter 2398/udp Orbiter +-# David Goldberg <dgoldberg&callisto.com> +-fmpro-fdal 2399/tcp FileMaker, Inc. - Data Access Layer +-fmpro-fdal 2399/udp FileMaker, Inc. - Data Access Layer +-# Clay Maeckal <clay_maeckel&filemaker.com> +-opequus-server 2400/tcp OpEquus Server +-opequus-server 2400/udp OpEquus Server +-# Gavin Hutchinson <gavinh&tesl.com> +-cvspserver 2401/tcp cvspserver +-cvspserver 2401/udp cvspserver +-# Jim Kingdon <kingdon&harvey.cyclic.com> +-taskmaster2000 2402/tcp TaskMaster 2000 Server +-taskmaster2000 2402/udp TaskMaster 2000 Server +-taskmaster2000 2403/tcp TaskMaster 2000 Web +-taskmaster2000 2403/udp TaskMaster 2000 Web +-# Ed Odjaghian <edo&datacap.com> +-iec-104 2404/tcp IEC 60870-5-104 process control over IP +-iec-104 2404/udp IEC 60870-5-104 process control over IP +-# Walter K. Eichelburg <walter.eichelburg&sat-automation.com> +-trc-netpoll 2405/tcp TRC Netpoll +-trc-netpoll 2405/udp TRC Netpoll +-# Bizhan Ghavami <ghavami&telcores.com> +-jediserver 2406/tcp JediServer +-jediserver 2406/udp JediServer +-# Paul McEntire <paul.mcentire&columbiasc.ncr.com> +-orion 2407/tcp Orion +-orion 2407/udp Orion +-# Matthew Horoschun <mhoroschun&canprint.com.au> +-optimanet 2408/tcp OptimaNet +-optimanet 2408/udp OptimaNet +-# John Graham-Cumming <jgc&optimal.com> +-sns-protocol 2409/tcp SNS Protocol +-sns-protocol 2409/udp SNS Protocol +-# Amir Blich <amir&netmanage.co.il> +-vrts-registry 2410/tcp VRTS Registry +-vrts-registry 2410/udp VRTS Registry +-# Pranay Varma <pran&veritas.com> +-netwave-ap-mgmt 2411/tcp Netwave AP Management +-netwave-ap-mgmt 2411/udp Netwave AP Management +-# Johnny Zweig <zweig&netwave-wireless.com> +-cdn 2412/tcp CDN +-cdn 2412/udp CDN +-# Alan Noble <noble&netmind.com> +-orion-rmi-reg 2413/tcp orion-rmi-reg +-orion-rmi-reg 2413/udp orion-rmi-reg +-# J.S. Greenfield <greeny&us.ibm.com> +-beeyond 2414/tcp Beeyond +-beeyond 2414/udp Beeyond +-# Bob Deblier <bob&virtualunlimited.com> +-codima-rtp 2415/tcp Codima Remote Transaction Protocol +-codima-rtp 2415/udp Codima Remote Transaction Protocol +-# Sylvia Ross <sross&codimatech.com> +-rmtserver 2416/tcp RMT Server +-rmtserver 2416/udp RMT Server +-# Yvon Marineau <yvon&simware.com> +-composit-server 2417/tcp Composit Server +-composit-server 2417/udp Composit Server +-# Katsuaki Naoi <naoi&pfu.co.jp> +-cas 2418/tcp cas +-cas 2418/udp cas +-# Akiyoshi Ochi <akiyoshi&net.paso.fujitsu.co.jp> +-attachmate-s2s 2419/tcp Attachmate S2S +-attachmate-s2s 2419/udp Attachmate S2S +-# Chris Rominski <ChrisRom&attachmate.com> +-dslremote-mgmt 2420/tcp DSL Remote Management +-dslremote-mgmt 2420/udp DSL Remote Management +-# Westell, Inc. <jronk&westell.com> +-g-talk 2421/tcp G-Talk +-g-talk 2421/udp G-Talk +-# Matt Hammond <matt_hammond&four-sight.co.uk> +-crmsbits 2422/tcp CRMSBITS +-crmsbits 2422/udp CRMSBITS +-# Rod Ward <RWard&vaccmel1.telstra.com.au> +-rnrp 2423/tcp RNRP +-rnrp 2423/udp RNRP +-# Per Sahlqvist <psahlqvi&sw.seisy.abb.se> +-kofax-svr 2424/tcp KOFAX-SVR +-kofax-svr 2424/udp KOFAX-SVR +-# Terry Reagan <treagan&kofax.com> +-fjitsuappmgr 2425/tcp Fujitsu App Manager +-fjitsuappmgr 2425/udp Fujitsu App Manager +-# Hiroyuki Kawabuchi <buchi&ael.fujitsu.co.jp> +-# 2426 Unassigned (Removed 2002-04-29) +-mgcp-gateway 2427/tcp Media Gateway Control Protocol Gateway +-mgcp-gateway 2427/udp Media Gateway Control Protocol Gateway +-# Christian Huitema <huitema&research.telcordia.com> +-ott 2428/tcp One Way Trip Time +-ott 2428/udp One Way Trip Time +-# Greg Troxel <gdt&ir.bbn.com> +-ft-role 2429/tcp FT-ROLE +-ft-role 2429/udp FT-ROLE +-# Doug Boone <dboone&atg.CLR.com> +-venus 2430/tcp venus +-venus 2430/udp venus +-venus-se 2431/tcp venus-se +-venus-se 2431/udp venus-se +-codasrv 2432/tcp codasrv +-codasrv 2432/udp codasrv +-codasrv-se 2433/tcp codasrv-se +-codasrv-se 2433/udp codasrv-se +-# Robert Watson <robert&cyrus.watson.org> +-pxc-epmap 2434/tcp pxc-epmap +-pxc-epmap 2434/udp pxc-epmap +-# Jun Nakamura <jnakamur&cp10.es.xerox.com> +-optilogic 2435/tcp OptiLogic +-optilogic 2435/udp OptiLogic +-# Clark Williams <clark&wirespeed.com> +-topx 2436/tcp TOP/X +-topx 2436/udp TOP/X +-# Dragos Pop <dragos&cs.ubbcluj.ro> +-unicontrol 2437/tcp UniControl +-unicontrol 2437/udp UniControl +-# Ing. Markus Huemer <markus.huemer&hsd.at> +-msp 2438/tcp MSP +-msp 2438/udp MSP +-# Evan Caves <evan&acc.com> +-sybasedbsynch 2439/tcp SybaseDBSynch +-sybasedbsynch 2439/udp SybaseDBSynch +-# Dave Neudoerffer <Dave.Neudoerffer&ianywhere.com> +-spearway 2440/tcp Spearway Lockers +-spearway 2440/udp Spearway Lockers +-# Pierre Frisch <Pierre.Frisch&spearway.com> +-pvsw-inet 2441/tcp Pervasive I*net Data Server +-pvsw-inet 2441/udp Pervasive I*net Data Server +-# Chuck Talk <ctalk&pervasive.com> +-netangel 2442/tcp Netangel +-netangel 2442/udp Netangel +-# Ladislav Baranyay <identcod&identcode.sk> +-powerclientcsf 2443/tcp PowerClient Central Storage Facility +-powerclientcsf 2443/udp PowerClient Central Storage Facility +-# Brian Klassen <Brian.Klassen&Unisys.com> +-btpp2sectrans 2444/tcp BT PP2 Sectrans +-btpp2sectrans 2444/udp BT PP2 Sectrans +-# Ian Daniels <btexact.ports&bt.com> +-dtn1 2445/tcp DTN1 +-dtn1 2445/udp DTN1 +-# Bob Gaddie <bobg&dtn.com> +-bues_service 2446/tcp bues_service +-bues_service 2446/udp bues_service +-# Leonhard Diekmann +-# <diekmann&04.mstr02.telekom400.dbp.de> +-ovwdb 2447/tcp OpenView NNM daemon +-ovwdb 2447/udp OpenView NNM daemon +-# Eric Pulsipher <eric_pulsipher&fc.hp.com> +-hpppssvr 2448/tcp hpppsvr +-hpppssvr 2448/udp hpppsvr +-# Bridgette Landers <blanders&boi.hp.com> +-ratl 2449/tcp RATL +-ratl 2449/udp RATL +-# Paul Greenfield <paul.greenfield&unisys.com> +-netadmin 2450/tcp netadmin +-netadmin 2450/udp netadmin +-netchat 2451/tcp netchat +-netchat 2451/udp netchat +-# Julian Mehnle <julian&mehnle.net> +-snifferclient 2452/tcp SnifferClient +-snifferclient 2452/udp SnifferClient +-# Amy Weaver <amy_weaver&nai.com> +-madge-ltd 2453/tcp madge ltd +-madge-ltd 2453/udp madge ltd +-# Mark Lyall <mark.lyall&madge.com> +-indx-dds 2454/tcp IndX-DDS +-indx-dds 2454/udp IndX-DDS +-# Paul Carmichael <paulcarmichael&indx.net> +-wago-io-system 2455/tcp WAGO-IO-SYSTEM +-wago-io-system 2455/udp WAGO-IO-SYSTEM +-# JËrg Hoffmann <electronicc_rd&wago.com> +-altav-remmgt 2456/tcp altav-remmgt +-altav-remmgt 2456/udp altav-remmgt +-# Gary M. Allen <gallen&symantec.com> +-rapido-ip 2457/tcp Rapido_IP +-rapido-ip 2457/udp Rapido_IP +-# Man Shuen Cheung <man_shuen_cheung&wamnet.co.uk> +-griffin 2458/tcp griffin +-griffin 2458/udp griffin +-# Tom Taylor <Tom.Taylor&unisys.com> +-community 2459/tcp Community +-community 2459/udp Community +-# David Schwartz <davids&webmaster.com> +-ms-theater 2460/tcp ms-theater +-ms-theater 2460/udp ms-theater +-# Anton Kucer <akucerµsoft.com> +-qadmifoper 2461/tcp qadmifoper +-qadmifoper 2461/udp qadmifoper +-qadmifevent 2462/tcp qadmifevent +-qadmifevent 2462/udp qadmifevent +-# Pekka Takaranta <pekka.takaranta&tellabs.fi> +-lsi-raid-mgmt 2463/tcp LSI RAID Management +-lsi-raid-mgmt 2463/udp LSI RAID Management +-# Previous Contact Bill Delaney <bill.delaney&symbios.com> +-# Current Contact Kevin Copas <Kevin.Copas&lsi.com> 07 February 2008 +-direcpc-si 2464/tcp DirecPC SI +-direcpc-si 2464/udp DirecPC SI +-# Doug Dillon <dillon&hns.com> +-lbm 2465/tcp Load Balance Management +-lbm 2465/udp Load Balance Management +-lbf 2466/tcp Load Balance Forwarding +-lbf 2466/udp Load Balance Forwarding +-# Kazuhiro Koide <kaz&pfu.co.jp> +-high-criteria 2467/tcp High Criteria +-high-criteria 2467/udp High Criteria +-# Konstantin Iavid <kiavid&highcriteria.com> +-qip-msgd 2468/tcp qip_msgd +-qip-msgd 2468/udp qip_msgd +-# Mike Morgan <mmorgan&lucent.com> +-mti-tcs-comm 2469/tcp MTI-TCS-COMM +-mti-tcs-comm 2469/udp MTI-TCS-COMM +-# Mario Bonin <boninmµtempus.com> +-taskman-port 2470/tcp taskman port +-taskman-port 2470/udp taskman port +-# Boris Panteleev <bpanteleev&himel.com> +-seaodbc 2471/tcp SeaODBC +-seaodbc 2471/udp SeaODBC +-# Adrian Hornby <Adrian.Hornby&aran.co.uk> +-c3 2472/tcp C3 +-c3 2472/udp C3 +-# Eckhard Grieger <e.grieger&com-on.de> +-aker-cdp 2473/tcp Aker-cdp +-aker-cdp 2473/udp Aker-cdp +-# Rodrigo Ormonde <ormonde&aker.com.br> +-vitalanalysis 2474/tcp Vital Analysis +-vitalanalysis 2474/udp Vital Analysis +-# Srinivas Reddy <sreddy&vitalsigns.com> +-ace-server 2475/tcp ACE Server +-ace-server 2475/udp ACE Server +-ace-svr-prop 2476/tcp ACE Server Propagation +-ace-svr-prop 2476/udp ACE Server Propagation +-ssm-cvs 2477/tcp SecurSight Certificate Valifation Service +-ssm-cvs 2477/udp SecurSight Certificate Valifation Service +-ssm-cssps 2478/tcp SecurSight Authentication Server (SSL) +-ssm-cssps 2478/udp SecurSight Authentication Server (SSL) +-ssm-els 2479/tcp SecurSight Event Logging Server (SSL) +-ssm-els 2479/udp SecurSight Event Logging Server (SSL) +-# John Linn <jlinn&securitydynamics.com> +-powerexchange 2480/tcp Informatica PowerExchange Listener +-powerexchange 2480/udp Informatica PowerExchange Listener +-# Dale Norman <dnorman&informatica.com> +-giop 2481/tcp Oracle GIOP +-giop 2481/udp Oracle GIOP +-giop-ssl 2482/tcp Oracle GIOP SSL +-giop-ssl 2482/udp Oracle GIOP SSL +-ttc 2483/tcp Oracle TTC +-ttc 2483/udp Oracle TTC +-ttc-ssl 2484/tcp Oracle TTC SSL +-ttc-ssl 2484/udp Oracle TTC SSL +-# Chandar Venkataraman <CVENKATA&us.oracle.com> +-netobjects1 2485/tcp Net Objects1 +-netobjects1 2485/udp Net Objects1 +-netobjects2 2486/tcp Net Objects2 +-netobjects2 2486/udp Net Objects2 +-# Francois Granade <francois&netobjects.com> +-pns 2487/tcp Policy Notice Service +-pns 2487/udp Policy Notice Service +-# Akiyoshi Ochi <akiyoshi&net.paso.fujitsu.co.jp> +-moy-corp 2488/tcp Moy Corporation +-moy-corp 2488/udp Moy Corporation +-# Gang Gong Moy +-tsilb 2489/tcp TSILB +-tsilb 2489/udp TSILB +-# James Irwin <jimi&travsoft.com> +-qip-qdhcp 2490/tcp qip_qdhcp +-qip-qdhcp 2490/udp qip_qdhcp +-# Mike Morgan <mmorgan&lucent.com> +-conclave-cpp 2491/tcp Conclave CPP +-conclave-cpp 2491/udp Conclave CPP +-# Larry Lipstone <lrl&interdyn.com> +-groove 2492/tcp GROOVE +-groove 2492/udp GROOVE +-# Ray Ozzie <ray&rocks.net> +-talarian-mqs 2493/tcp Talarian MQS +-talarian-mqs 2493/udp Talarian MQS +-# Jim Stabile <jstabile&talarian.com> +-bmc-ar 2494/tcp BMC AR +-bmc-ar 2494/udp BMC AR +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-fast-rem-serv 2495/tcp Fast Remote Services +-fast-rem-serv 2495/udp Fast Remote Services +-# Scott St. Clair <stclair&NTC.ADAPTEC.com> +-dirgis 2496/tcp DIRGIS +-dirgis 2496/udp DIRGIS +-# Deutschland Informations- und +-# Reservierungsgesellschaft mbH <beratung&dirg.de> +-quaddb 2497/tcp Quad DB +-quaddb 2497/udp Quad DB +-# Jeff Rosenthal <jrosenthal&quad-sys.com> +-odn-castraq 2498/tcp ODN-CasTraq +-odn-castraq 2498/udp ODN-CasTraq +-# Richard Hodges <rh&source.net> +-unicontrol 2499/tcp UniControl +-unicontrol 2499/udp UniControl +-# Ing. Markus Huemer +-rtsserv 2500/tcp Resource Tracking system server +-rtsserv 2500/udp Resource Tracking system server +-rtsclient 2501/tcp Resource Tracking system client +-rtsclient 2501/udp Resource Tracking system client +-# Aubrey Turner +-# <S95525ta%etsuacad.bitnet&ETSUADMN.ETSU.EDU> +-kentrox-prot 2502/tcp Kentrox Protocol +-kentrox-prot 2502/udp Kentrox Protocol +-# Anil Lakhwara <anil_lakhwara&kentrox.com> +-nms-dpnss 2503/tcp NMS-DPNSS +-nms-dpnss 2503/udp NMS-DPNSS +-# Jean-Christophe Desire +-# <Jean-Christophe_Desire&NMS-Europe.com> +-wlbs 2504/tcp WLBS +-wlbs 2504/udp WLBS +-# William Bain <bbainµsoft.com> +-ppcontrol 2505/tcp PowerPlay Control +-ppcontrol 2505/udp PowerPlay Control +-# Max Magliaro <mmagliaro&bnisolutions.com> November 2004 +-jbroker 2506/tcp jbroker +-jbroker 2506/udp jbroker +-# Rohit Garg <rohit&objectScape.com> +-spock 2507/tcp spock +-spock 2507/udp spock +-# Jon A. Christopher <jac8792&tamu.edu> +-jdatastore 2508/tcp JDataStore +-jdatastore 2508/udp JDataStore +-# Tod Landis <tlandis&inprise.com> +-fjmpss 2509/tcp fjmpss +-fjmpss 2509/udp fjmpss +-# Makoto Watanabe <makoto&saint.nm.fujitsu.co.jp> +-fjappmgrbulk 2510/tcp fjappmgrbulk +-fjappmgrbulk 2510/udp fjappmgrbulk +-# Hiroyuki Kawabuchi <buchi&ael.fujitsu.co.jp> +-metastorm 2511/tcp Metastorm +-metastorm 2511/udp Metastorm +-# Eric Isom <eisom&metastorm.com> +-citrixima 2512/tcp Citrix IMA +-citrixima 2512/udp Citrix IMA +-citrixadmin 2513/tcp Citrix ADMIN +-citrixadmin 2513/udp Citrix ADMIN +-# Myk Willis <myk.willis&citrix.com> +-facsys-ntp 2514/tcp Facsys NTP +-facsys-ntp 2514/udp Facsys NTP +-facsys-router 2515/tcp Facsys Router +-facsys-router 2515/udp Facsys Router +-# Jeff Hoffman <jeffh&facsys.com> +-maincontrol 2516/tcp Main Control +-maincontrol 2516/udp Main Control +-# Nathan Sadia <sadia&maincontrol.com> +-call-sig-trans 2517/tcp H.323 Annex E call signaling transport +-call-sig-trans 2517/udp H.323 Annex E call signaling transport +-# Gur Kimchi <gur.kimchi&vocaltec.com> +-willy 2518/tcp Willy +-willy 2518/udp Willy +-# Carl-Johan Wik <cjw&hudsmoar.com> +-globmsgsvc 2519/tcp globmsgsvc +-globmsgsvc 2519/udp globmsgsvc +-# David Wiltz <dwiltz&hf.intel.com> +-pvsw 2520/tcp Pervasive Listener +-pvsw 2520/udp Pervasive Listener +-# Chuck Talk <ctalk&pervasive.com> +-adaptecmgr 2521/tcp Adaptec Manager +-adaptecmgr 2521/udp Adaptec Manager +-# Mark Parenti <map&ntc.adaptec.com> +-windb 2522/tcp WinDb +-windb 2522/udp WinDb +-# Larry Traylor <larry&arium.com> +-qke-llc-v3 2523/tcp Qke LLC V.3 +-qke-llc-v3 2523/udp Qke LLC V.3 +-# Joerg Niehoff <joerg.niehoff&alcatel-ke.de> +-optiwave-lm 2524/tcp Optiwave License Management +-optiwave-lm 2524/udp Optiwave License Management +-# Slawomir Krzesinski <slavek&optiwave.com> +-ms-v-worlds 2525/tcp MS V-Worlds +-ms-v-worlds 2525/udp MS V-Worlds +-# Pete Wong <petewongµsoft.com> +-ema-sent-lm 2526/tcp EMA License Manager +-ema-sent-lm 2526/udp EMA License Manager +-# Thaddeus Perala <trperala&emaden.com> +-iqserver 2527/tcp IQ Server +-iqserver 2527/udp IQ Server +-# Nick Straguzzi <Nick_Straguzzi&akbs.com> +-ncr_ccl 2528/tcp NCR CCL +-ncr_ccl 2528/udp NCR CCL +-# Amitava Dutta <Amitava.Dutta&WoodbridgeNJ.ncr.com> +-utsftp 2529/tcp UTS FTP +-utsftp 2529/udp UTS FTP +-# David Moore <dmoore&uttc-uts.com> +-vrcommerce 2530/tcp VR Commerce +-vrcommerce 2530/udp VR Commerce +-# Yosi Mass <yosimass&haifa.vnet.ibm.com> +-ito-e-gui 2531/tcp ITO-E GUI +-ito-e-gui 2531/udp ITO-E GUI +-# Michael Haeuptle <Michael_Haeuptle&hp.com> +-ovtopmd 2532/tcp OVTOPMD +-ovtopmd 2532/udp OVTOPMD +-# Eric Pulsipher <eric_pulsipher&hp.com> +-snifferserver 2533/tcp SnifferServer +-snifferserver 2533/udp SnifferServer +-# Amy Weaver <Amy_Weaver&NAI.com> +-combox-web-acc 2534/tcp Combox Web Access +-combox-web-acc 2534/udp Combox Web Access +-# Yochai Cohen <yochai&combox.co.il> +-madcap 2535/tcp MADCAP +-madcap 2535/udp MADCAP +-# Stephen Hanna <steve.hanna&sun.com> +-btpp2audctr1 2536/tcp btpp2audctr1 +-btpp2audctr1 2536/udp btpp2audctr1 +-# Ian Daniels <btexact.ports&bt.com> +-upgrade 2537/tcp Upgrade Protocol +-upgrade 2537/udp Upgrade Protocol +-# Breck Auten <bauten&dst-inc.com> +-vnwk-prapi 2538/tcp vnwk-prapi +-vnwk-prapi 2538/udp vnwk-prapi +-# John Hasselkus <Jhasselkus&VisualNetworks.com> +-vsiadmin 2539/tcp VSI Admin +-vsiadmin 2539/udp VSI Admin +-# Rob Juergens <robj&vsi.com> +-lonworks 2540/tcp LonWorks +-lonworks 2540/udp LonWorks +-lonworks2 2541/tcp LonWorks2 +-lonworks2 2541/udp LonWorks2 +-# Gary Bartlett <garyb&echelon.com> +-udrawgraph 2542/tcp uDraw(Graph) +-udrawgraph 2542/udp uDraw(Graph) +-# University of Bremen, FB3 <udrawgraph&informatik.uni-bremen.de> +-reftek 2543/tcp REFTEK +-reftek 2543/udp REFTEK +-# Phil Davidson <p.davidson&reftek.com> +-novell-zen 2544/tcp Management Daemon Refresh +-novell-zen 2544/udp Management Daemon Refresh +-# Ty Ellis <tellis&novell.com> +-sis-emt 2545/tcp sis-emt +-sis-emt 2545/udp sis-emt +-# Bill Crawford <Bill.Crawford&securicor.co.uk> +-vytalvaultbrtp 2546/tcp vytalvaultbrtp +-vytalvaultbrtp 2546/udp vytalvaultbrtp +-vytalvaultvsmp 2547/tcp vytalvaultvsmp +-vytalvaultvsmp 2547/udp vytalvaultvsmp +-vytalvaultpipe 2548/tcp vytalvaultpipe +-vytalvaultpipe 2548/udp vytalvaultpipe +-# Tim Boldt <timb&vytalnet.com> +-ipass 2549/tcp IPASS +-ipass 2549/udp IPASS +-# Michael Fischer <otterley&Pass.COM> +-ads 2550/tcp ADS +-ads 2550/udp ADS +-# Michael O'Connor <moconnor&adobe.com> +-isg-uda-server 2551/tcp ISG UDA Server +-isg-uda-server 2551/udp ISG UDA Server +-# Dror Harari <Dror.Harari&isgsoft.com> +-call-logging 2552/tcp Call Logging +-call-logging 2552/udp Call Logging +-# Dean Webb <dean.webb&ascend.com> +-efidiningport 2553/tcp efidiningport +-efidiningport 2553/udp efidiningport +-# Lynn Carter <carterl&execpc.com> +-vcnet-link-v10 2554/tcp VCnet-Link v10 +-vcnet-link-v10 2554/udp VCnet-Link v10 +-# Csaba Mate <mc36&freemail.c3.hu> +-compaq-wcp 2555/tcp Compaq WCP +-compaq-wcp 2555/udp Compaq WCP +-# Ferruccio Barletta <ferruccio.barletta&compaq.com> +-nicetec-nmsvc 2556/tcp nicetec-nmsvc +-nicetec-nmsvc 2556/udp nicetec-nmsvc +-nicetec-mgmt 2557/tcp nicetec-mgmt +-nicetec-mgmt 2557/udp nicetec-mgmt +-# Joerg Paulus <tech&nicetec.de> +-pclemultimedia 2558/tcp PCLE Multi Media +-pclemultimedia 2558/udp PCLE Multi Media +-# Jacob Gsoedl <jgsoedl&pinnaclesys.com> +-lstp 2559/tcp LSTP +-lstp 2559/udp LSTP +-# Waiki Wright <waiki&us.ibm.com> +-labrat 2560/tcp labrat +-labrat 2560/udp labrat +-# John Harvey <johnbob&austin.ibm.com> +-mosaixcc 2561/tcp MosaixCC +-mosaixcc 2561/udp MosaixCC +-# Steven Frare <stevefr&mosaix.com> +-delibo 2562/tcp Delibo +-delibo 2562/udp Delibo +-# NovaWiz LTD <Moshe&Novawiz.com> +-cti-redwood 2563/tcp CTI Redwood +-cti-redwood 2563/udp CTI Redwood +-# Songwon Chi <swchi&daou.co.kr> +-hp-3000-telnet 2564/tcp HP 3000 NS/VT block mode telnet +-# +-coord-svr 2565/tcp Coordinator Server +-coord-svr 2565/udp Coordinator Server +-# Richard Steiger <steiger&ensemblesoft.com> +-pcs-pcw 2566/tcp pcs-pcw +-pcs-pcw 2566/udp pcs-pcw +-# W. Jordan Fitzhugh <jfitz&pcare.com> +-clp 2567/tcp Cisco Line Protocol +-clp 2567/udp Cisco Line Protocol +-# Susan Hinrichs <shinrich&cisco.com> +-spamtrap 2568/tcp SPAM TRAP +-spamtrap 2568/udp SPAM TRAP +-# Chuck Bennett <chuck&benatong.com> +-sonuscallsig 2569/tcp Sonus Call Signal +-sonuscallsig 2569/udp Sonus Call Signal +-# Mark Garti <mgarti&sonusnet.com> +-hs-port 2570/tcp HS Port +-hs-port 2570/udp HS Port +-# Uri Doron <uri&il.netect.com> +-cecsvc 2571/tcp CECSVC +-cecsvc 2571/udp CECSVC +-# Roger Pao <rpao&corder-eng.com> +-ibp 2572/tcp IBP +-ibp 2572/udp IBP +-# Jonathan Downes <jonno&activ.net.au> +-trustestablish 2573/tcp Trust Establish +-trustestablish 2573/udp Trust Establish +-# Yosi Mass <yosimass&haifa.vnet.ibm.com> +-blockade-bpsp 2574/tcp Blockade BPSP +-blockade-bpsp 2574/udp Blockade BPSP +-# VP - Research & Development <development&blockade.com> +-hl7 2575/tcp HL7 +-hl7 2575/udp HL7 +-# Tim Jacobs +-tclprodebugger 2576/tcp TCL Pro Debugger +-tclprodebugger 2576/udp TCL Pro Debugger +-scipticslsrvr 2577/tcp Scriptics Lsrvr +-scipticslsrvr 2577/udp Scriptics Lsrvr +-# Brent Welch <welch&scriptics.com> +-rvs-isdn-dcp 2578/tcp RVS ISDN DCP +-rvs-isdn-dcp 2578/udp RVS ISDN DCP +-# Michael Zirpel <mbz&rvscom.com> +-mpfoncl 2579/tcp mpfoncl +-mpfoncl 2579/udp mpfoncl +-# Itaru Kimura <kimura&kel.fujitsu.co.jp> +-tributary 2580/tcp Tributary +-tributary 2580/udp Tributary +-# Louis Lu <LouisL&bristol.com> +-argis-te 2581/tcp ARGIS TE +-argis-te 2581/udp ARGIS TE +-argis-ds 2582/tcp ARGIS DS +-argis-ds 2582/udp ARGIS DS +-# John Legh-Page <john.legh-page&argis.com> +-mon 2583/tcp MON +-mon 2583/udp MON +-# Jim Trocki <trockij&transmeta.com> +-cyaserv 2584/tcp cyaserv +-cyaserv 2584/udp cyaserv +-# Morgan Jones <mwj&cyasolutions.com> +-netx-server 2585/tcp NETX Server +-netx-server 2585/udp NETX Server +-netx-agent 2586/tcp NETX Agent +-netx-agent 2586/udp NETX Agent +-# Brett Dolecheck <Dolecheck&IPMetrics.com> +-masc 2587/tcp MASC +-masc 2587/udp MASC +-# Pavlin Ivanov Radoslavov +-# <pavlin&catarina.usc.edu> +-privilege 2588/tcp Privilege +-privilege 2588/udp Privilege +-# Gil Hecht <GilH&aks.com> +-quartus-tcl 2589/tcp quartus tcl +-quartus-tcl 2589/udp quartus tcl +-# Subroto Datta <subrotod&altera.com> +-idotdist 2590/tcp idotdist +-idotdist 2590/udp idotdist +-# Jason Hunter <jthunter&invino.com> +-maytagshuffle 2591/tcp Maytag Shuffle +-maytagshuffle 2591/udp Maytag Shuffle +-# Ken Ksiazek <kksiazek&maytag.com +-netrek 2592/tcp netrek +-netrek 2592/udp netrek +-# Al Guetzlaff aeg&teamquest.com> +-mns-mail 2593/tcp MNS Mail Notice Service +-mns-mail 2593/udp MNS Mail Notice Service +-# Rumiko Kikuta <kiku&nd.net.fujitsu.co.jp> +-dts 2594/tcp Data Base Server +-dts 2594/udp Data Base Server +-# Andreas Roene <support&home-online.de> +-worldfusion1 2595/tcp World Fusion 1 +-worldfusion1 2595/udp World Fusion 1 +-worldfusion2 2596/tcp World Fusion 2 +-worldfusion2 2596/udp World Fusion 2 +-# World Fusion <net&worldfusion.com> +-homesteadglory 2597/tcp Homestead Glory +-homesteadglory 2597/udp Homestead Glory +-# John Tokash <jtokash&homestead.com> +-citriximaclient 2598/tcp Citrix MA Client +-citriximaclient 2598/udp Citrix MA Client +-# Myk Willis <myk.willis&citrix.com> +-snapd 2599/tcp Snap Discovery +-snapd 2599/udp Snap Discovery +-# Kevin Osborn <kosborn&snapappliance.com> +-hpstgmgr 2600/tcp HPSTGMGR +-hpstgmgr 2600/udp HPSTGMGR +-# Kevin Collins <kevinc@.cnd.hp.com> +-discp-client 2601/tcp discp client +-discp-client 2601/udp discp client +-discp-server 2602/tcp discp server +-discp-server 2602/udp discp server +-# Peter White <peter_white&3com.com> +-servicemeter 2603/tcp Service Meter +-servicemeter 2603/udp Service Meter +-# Duncan Hare <Duncan.Hare&synoia.com> +-nsc-ccs 2604/tcp NSC CCS +-nsc-ccs 2604/udp NSC CCS +-nsc-posa 2605/tcp NSC POSA +-nsc-posa 2605/udp NSC POSA +-# Tom Findley <tom.findley&networksciences.net> +-netmon 2606/tcp Dell Netmon +-netmon 2606/udp Dell Netmon +-connection 2607/tcp Dell Connection +-connection 2607/udp Dell Connection +-# Sudhir Shetty <Sudhir_Shetty&Dell.com> +-wag-service 2608/tcp Wag Service +-wag-service 2608/udp Wag Service +-# Gilles Bourquard <gbo&wag.ch> +-system-monitor 2609/tcp System Monitor +-system-monitor 2609/udp System Monitor +-# Greg Robson-Garth <gregr&alphalink.com.au> +-versa-tek 2610/tcp VersaTek +-versa-tek 2610/udp VersaTek +-# James Kou <Jamesk&versatek.com> +-lionhead 2611/tcp LIONHEAD +-lionhead 2611/udp LIONHEAD +-# Tim Rance <trance&lionhead.co.uk> +-qpasa-agent 2612/tcp Qpasa Agent +-qpasa-agent 2612/udp Qpasa Agent +-# Craig Ching <cching&mqsoftware.com> +-smntubootstrap 2613/tcp SMNTUBootstrap +-smntubootstrap 2613/udp SMNTUBootstrap +-# Matt Cecile <mattc&metrics.com> +-neveroffline 2614/tcp Never Offline +-neveroffline 2614/udp Never Offline +-# Dustin Brand <amo&amo.net> +-firepower 2615/tcp firepower +-firepower 2615/udp firepower +-# Jason Volk <jason&teknidude.com> +-appswitch-emp 2616/tcp appswitch-emp +-appswitch-emp 2616/udp appswitch-emp +-# Ted Ross <ross&TopLayer.com> +-cmadmin 2617/tcp Clinical Context Managers +-cmadmin 2617/udp Clinical Context Managers +-# Mark Morwood <markm&sentillion.com> +-priority-e-com 2618/tcp Priority E-Com +-priority-e-com 2618/udp Priority E-Com +-# Marcelo Einhorn <marcelo&eshbel.com> +-bruce 2619/tcp bruce +-bruce 2619/udp bruce +-# Alec Muffett <alecm&sun.com> +-lpsrecommender 2620/tcp LPSRecommender +-lpsrecommender 2620/udp LPSRecommender +-# Pritham Shetty <pritham&andromedia.com> +-miles-apart 2621/tcp Miles Apart Jukebox Server +-miles-apart 2621/udp Miles Apart Jukebox Server +-# Michael Rathmann <rathmann_ia&milesinfo.com> +-metricadbc 2622/tcp MetricaDBC +-metricadbc 2622/udp MetricaDBC +-# Russ Olivant <russ.olivant&metrica.co.uk> +-lmdp 2623/tcp LMDP +-lmdp 2623/udp LMDP +-# Ken Bailey <kbailey&rockettalk.com> +-aria 2624/tcp Aria +-aria 2624/udp Aria +-# Logan Bruns <logan&andromedia.com> +-blwnkl-port 2625/tcp Blwnkl Port +-blwnkl-port 2625/udp Blwnkl Port +-# Weng Chin (Winson) Yung <Winson_Yung&3com.com> +-gbjd816 2626/tcp gbjd816 +-gbjd816 2626/udp gbjd816 +-# George Balesta <George.Baletsa&tfn.com> +-moshebeeri 2627/tcp Moshe Beeri +-moshebeeri 2627/udp Moshe Beeri +-# Moshe Beeri <moshe&whale-com.com> +-dict 2628/tcp DICT +-dict 2628/udp DICT +-# Rik Faith <faith&cs.unc.edu> +-sitaraserver 2629/tcp Sitara Server +-sitaraserver 2629/udp Sitara Server +-sitaramgmt 2630/tcp Sitara Management +-sitaramgmt 2630/udp Sitara Management +-sitaradir 2631/tcp Sitara Dir +-sitaradir 2631/udp Sitara Dir +-# Manickam R.Sridhar <msridhar&sitaranetworks.com> +-irdg-post 2632/tcp IRdg Post +-irdg-post 2632/udp IRdg Post +-# IRdg, Inc. <jtaylor&irdg.com> +-interintelli 2633/tcp InterIntelli +-interintelli 2633/udp InterIntelli +-# Mike Gagle <MikeG&inter-intelli.com> +-pk-electronics 2634/tcp PK Electronics +-pk-electronics 2634/udp PK Electronics +-# Seb Ibis <seb_ibis&pkworld.com> +-backburner 2635/tcp Back Burner +-backburner 2635/udp Back Burner +-# Kevin Teiskoetter <kevint&metacreations.com> +-solve 2636/tcp Solve +-solve 2636/udp Solve +-# Peter Morrison <peter_morrison&sydney.sterling.com> +-imdocsvc 2637/tcp Import Document Service +-imdocsvc 2637/udp Import Document Service +-# Zia Bhatti <zia&netright.com> +-sybaseanywhere 2638/tcp Sybase Anywhere +-sybaseanywhere 2638/udp Sybase Anywhere +-# Dave Neudoerffer <Dave.Neudoerffer&ianywhere.com> +-aminet 2639/tcp AMInet +-aminet 2639/udp AMInet +-# Alcorn McBride Inc. <jeff&alcorn.com> +-sai_sentlm 2640/tcp Sabbagh Associates Licence Manager +-sai_sentlm 2640/udp Sabbagh Associates Licence Manager +-# Elias Sabbagh <ehs&sabbagh.com> +-hdl-srv 2641/tcp HDL Server +-hdl-srv 2641/udp HDL Server +-# David Ely <dely&cnri.reston.va.us> +-tragic 2642/tcp Tragic +-tragic 2642/udp Tragic +-# Stu Mark <fordii&j51.com> +-gte-samp 2643/tcp GTE-SAMP +-gte-samp 2643/udp GTE-SAMP +-# Asher Altman <Asher.Altman&GSC.GTE.Com> +-travsoft-ipx-t 2644/tcp Travsoft IPX Tunnel +-travsoft-ipx-t 2644/udp Travsoft IPX Tunnel +-# Jack Wilson <JackW&travsoft.com> +-novell-ipx-cmd 2645/tcp Novell IPX CMD +-novell-ipx-cmd 2645/udp Novell IPX CMD +-# Juan Carlos Luciani <jluciani&novell.com> +-and-lm 2646/tcp AND License Manager +-and-lm 2646/udp AND License Manager +-# Dick van der Sijs <dick&and.nl> +-syncserver 2647/tcp SyncServer +-syncserver 2647/udp SyncServer +-# Shawn Casey <Shawn.Casey&matrixone.com> +-upsnotifyprot 2648/tcp Upsnotifyprot +-upsnotifyprot 2648/udp Upsnotifyprot +-# Mario Leboute <leboute&pro.via-rs.com.br> +-vpsipport 2649/tcp VPSIPPORT +-vpsipport 2649/udp VPSIPPORT +-# Joon Radley <jradley&csir.co.za> +-eristwoguns 2650/tcp eristwoguns +-eristwoguns 2650/udp eristwoguns +-# NetPro Computing Inc. <ports&netpro.com> +-ebinsite 2651/tcp EBInSite +-ebinsite 2651/udp EBInSite +-# Lefteris Kalamaras <lefteris&ebi.com> +-interpathpanel 2652/tcp InterPathPanel +-interpathpanel 2652/udp InterPathPanel +-# Stephen Misel <steve.misel&interpath.net> +-sonus 2653/tcp Sonus +-sonus 2653/udp Sonus +-# Mark Garti <mgarti&sonusnet.com> +-corel_vncadmin 2654/tcp Corel VNC Admin +-corel_vncadmin 2654/udp Corel VNC Admin +-# Oleg Noskov <olegn&corelcomputer.com> +-unglue 2655/tcp UNIX Nt Glue +-unglue 2655/udp UNIX Nt Glue +-# Peter Santoro <peter&pscomp.com> +-kana 2656/tcp Kana +-kana 2656/udp Kana +-# Colin Goldstein <Colin&kana.com> +-sns-dispatcher 2657/tcp SNS Dispatcher +-sns-dispatcher 2657/udp SNS Dispatcher +-sns-admin 2658/tcp SNS Admin +-sns-admin 2658/udp SNS Admin +-sns-query 2659/tcp SNS Query +-sns-query 2659/udp SNS Query +-# Mary Holstege <holstege&firstfloor.com> +-gcmonitor 2660/tcp GC Monitor +-gcmonitor 2660/udp GC Monitor +-# Gustavo Rodriguez-Rivera <grr&geodesic.com> +-olhost 2661/tcp OLHOST +-olhost 2661/udp OLHOST +-# Robert Ripberger <rip&lan-aces.com> +-bintec-capi 2662/tcp BinTec-CAPI +-bintec-capi 2662/udp BinTec-CAPI +-bintec-tapi 2663/tcp BinTec-TAPI +-bintec-tapi 2663/udp BinTec-TAPI +-# +-patrol-mq-gm 2664/tcp Patrol for MQ GM +-patrol-mq-gm 2664/udp Patrol for MQ GM +-patrol-mq-nm 2665/tcp Patrol for MQ NM +-patrol-mq-nm 2665/udp Patrol for MQ NM +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-extensis 2666/tcp extensis +-extensis 2666/udp extensis +-# Milton Sagen <msagen&extensis.com> +-alarm-clock-s 2667/tcp Alarm Clock Server +-alarm-clock-s 2667/udp Alarm Clock Server +-alarm-clock-c 2668/tcp Alarm Clock Client +-alarm-clock-c 2668/udp Alarm Clock Client +-toad 2669/tcp TOAD +-toad 2669/udp TOAD +-# Michael Marking <marking&tatanka.com> +-tve-announce 2670/tcp TVE Announce +-tve-announce 2670/udp TVE Announce +-# Dean Blackketter <dean&corp.webtv.net> +-newlixreg 2671/tcp newlixreg +-newlixreg 2671/udp newlixreg +-# Jean-Serge Gagnon <jsg&newlix.com> +-nhserver 2672/tcp nhserver +-nhserver 2672/udp nhserver +-# Adrian Hornby <Adrian.Hornby&aran.co.uk> +-firstcall42 2673/tcp First Call 42 +-firstcall42 2673/udp First Call 42 +-# Luke Bowen <leb&tfn.com> +-ewnn 2674/tcp ewnn +-ewnn 2674/udp ewnn +-# Yasunari Yamashita <yamasita&omronsoft.co.jp> +-ttc-etap 2675/tcp TTC ETAP +-ttc-etap 2675/udp TTC ETAP +-# Daniel Becker <becker2d&ttc.com> +-simslink 2676/tcp SIMSLink +-simslink 2676/udp SIMSLink +-# Steve Ryckman <iana&simsware.com> +-gadgetgate1way 2677/tcp Gadget Gate 1 Way +-gadgetgate1way 2677/udp Gadget Gate 1 Way +-gadgetgate2way 2678/tcp Gadget Gate 2 Way +-gadgetgate2way 2678/udp Gadget Gate 2 Way +-# Matt Rollins <matt&anybusiness.com> +-syncserverssl 2679/tcp Sync Server SSL +-syncserverssl 2679/udp Sync Server SSL +-# Shawn Casey <Shawn.Casey&matrixone.com> +-pxc-sapxom 2680/tcp pxc-sapxom +-pxc-sapxom 2680/udp pxc-sapxom +-# Hideki Kiriyama <kiriyama&cp10.es.xerox.com> +-mpnjsomb 2681/tcp mpnjsomb +-mpnjsomb 2681/udp mpnjsomb +-# Takenori Miyahara <miyahara&pfu.co.jp> +-# 2682 Removed (2002-04-30) +-ncdloadbalance 2683/tcp NCDLoadBalance +-ncdloadbalance 2683/udp NCDLoadBalance +-# Tim Stevenson <tes&ncd.com> +-mpnjsosv 2684/tcp mpnjsosv +-mpnjsosv 2684/udp mpnjsosv +-mpnjsocl 2685/tcp mpnjsocl +-mpnjsocl 2685/udp mpnjsocl +-mpnjsomg 2686/tcp mpnjsomg +-mpnjsomg 2686/udp mpnjsomg +-# Takenori Miyahara <miyahara&pfu.co.jp> +-pq-lic-mgmt 2687/tcp pq-lic-mgmt +-pq-lic-mgmt 2687/udp pq-lic-mgmt +-# Bob Sledge <bob&pqsystems.com> +-md-cg-http 2688/tcp md-cf-http +-md-cg-http 2688/udp md-cf-http +-# Lyndon Nerenberg <lyndon&execmail.ca> +-fastlynx 2689/tcp FastLynx +-fastlynx 2689/udp FastLynx +-# Dave Sewell <dave&sewelldev.com> +-hp-nnm-data 2690/tcp HP NNM Embedded Database +-hp-nnm-data 2690/udp HP NNM Embedded Database +-# Chris Das <cdas&cnd.hp.com> +-itinternet 2691/tcp ITInternet ISM Server +-itinternet 2691/udp ITInternet ISM Server +-# Ron Ehli <ron&itinternet.net> +-admins-lms 2692/tcp Admins LMS +-admins-lms 2692/udp Admins LMS +-# Dagfinn Saether <Dagfinn&admins.com> +-# 2693/tcp Unassigned (Removed 2004-2-6) +-# 2693/udp +-# +-pwrsevent 2694/tcp pwrsevent +-pwrsevent 2694/udp pwrsevent +-# Yoshinobu Nakamura +-# <nakamura&np.lps.cs.fujitsu.co.jp> +-vspread 2695/tcp VSPREAD +-vspread 2695/udp VSPREAD +-# Sumitake kobayashi +-# <kobayashi&np.lps.cs.fujitsu.co.jp> +-unifyadmin 2696/tcp Unify Admin +-unifyadmin 2696/udp Unify Admin +-# Duane Gibson <ianaportmaster&unify.com> +-oce-snmp-trap 2697/tcp Oce SNMP Trap Port +-oce-snmp-trap 2697/udp Oce SNMP Trap Port +-# Peter Teeuwen <ptee&oce.nl> +-mck-ivpip 2698/tcp MCK-IVPIP +-mck-ivpip 2698/udp MCK-IVPIP +-# Robert Vincent <bert&mck.com> +-csoft-plusclnt 2699/tcp Csoft Plus Client +-csoft-plusclnt 2699/udp Csoft Plus Client +-# Nedelcho Stanev <nstanev&csoft.bg> +-tqdata 2700/tcp tqdata +-tqdata 2700/udp tqdata +-# Al Guetzlaff <aeg&teamquest.com> +-sms-rcinfo 2701/tcp SMS RCINFO +-sms-rcinfo 2701/udp SMS RCINFO +-sms-xfer 2702/tcp SMS XFER +-sms-xfer 2702/udp SMS XFER +-sms-chat 2703/tcp SMS CHAT +-sms-chat 2703/udp SMS CHAT +-sms-remctrl 2704/tcp SMS REMCTRL +-sms-remctrl 2704/udp SMS REMCTRL +-# Tom Friend <tomfrµsoft.com> +-sds-admin 2705/tcp SDS Admin +-sds-admin 2705/udp SDS Admin +-# Don Traub <don.traub&sun.com> +-ncdmirroring 2706/tcp NCD Mirroring +-ncdmirroring 2706/udp NCD Mirroring +-# Tim Stevenson <tes&ncd.com> +-emcsymapiport 2707/tcp EMCSYMAPIPORT +-emcsymapiport 2707/udp EMCSYMAPIPORT +-# Bruce Ferjulian <ferjulian_bruce&emc.com> +-banyan-net 2708/tcp Banyan-Net +-banyan-net 2708/udp Banyan-Net +-# R. Thirumurthy <rtm&banyannetworks.com> +-supermon 2709/tcp Supermon +-supermon 2709/udp Supermon +-# Ron Minnich <rminnich&acl.lanl.gov> +-sso-service 2710/tcp SSO Service +-sso-service 2710/udp SSO Service +-sso-control 2711/tcp SSO Control +-sso-control 2711/udp SSO Control +-# Axel Kern <axel.kern&betasystems.com> +-aocp 2712/tcp Axapta Object Communication Protocol +-aocp 2712/udp Axapta Object Communication Protocol +-# Jakob Steen Hansen <jsh&dk.damgaard.com> +-raventbs 2713/tcp Raven Trinity Broker Service +-raventbs 2713/udp Raven Trinity Broker Service +-raventdm 2714/tcp Raven Trinity Data Mover +-raventdm 2714/udp Raven Trinity Data Mover +-# Daniel Sorlov <Daniel&sorlov.com> +-hpstgmgr2 2715/tcp HPSTGMGR2 +-hpstgmgr2 2715/udp HPSTGMGR2 +-# Kevin Collins <kevinc&cnd.hp.com> +-inova-ip-disco 2716/tcp Inova IP Disco +-inova-ip-disco 2716/udp Inova IP Disco +-# Chris Koeritz <ckoeritz&inovacorp.com> +-pn-requester 2717/tcp PN REQUESTER +-pn-requester 2717/udp PN REQUESTER +-pn-requester2 2718/tcp PN REQUESTER 2 +-pn-requester2 2718/udp PN REQUESTER 2 +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-scan-change 2719/tcp Scan & Change +-scan-change 2719/udp Scan & Change +-# Alexander Raji <araji&lucent.com> +-wkars 2720/tcp wkars +-wkars 2720/udp wkars +-# Barry Shelton <bshelton&wirelessknowledge.com> +-smart-diagnose 2721/tcp Smart Diagnose +-smart-diagnose 2721/udp Smart Diagnose +-# Geoffry Meek <geoff&meek.com> +-proactivesrvr 2722/tcp Proactive Server +-proactivesrvr 2722/udp Proactive Server +-# Dalit Naor <dalit&il.ibm.com> +-watchdog-nt 2723/tcp WatchDog NT Protocol +-watchdog-nt 2723/udp WatchDog NT Protocol +-# Glen Sansoucie <gsansoucie&loftware.com> +-qotps 2724/tcp qotps +-qotps 2724/udp qotps +-# Piotr Parlewicz <pparlewicz&queryobject.com> +-msolap-ptp2 2725/tcp MSOLAP PTP2 +-msolap-ptp2 2725/udp MSOLAP PTP2 +-# Cristian Petculescu <cristpµsoft.com> +-tams 2726/tcp TAMS +-tams 2726/udp TAMS +-# David Leinbach <dleinbach&jti.bc.ca> +-mgcp-callagent 2727/tcp Media Gateway Control Protocol Call Agent +-mgcp-callagent 2727/udp Media Gateway Control Protocol Call Agent +-# Christian Huitema <huitema&research.telcordia.com> +-sqdr 2728/tcp SQDR +-sqdr 2728/udp SQDR +-# Matthew Orzen <standards&starquest.com> +-tcim-control 2729/tcp TCIM Control +-tcim-control 2729/udp TCIM Control +-# Dean Skelton <mdskel&ftw.rsc.raytheon.com> +-nec-raidplus 2730/tcp NEC RaidPlus +-nec-raidplus 2730/udp NEC RaidPlus +-# Yusuke Asai <yasai&nw1.file.fc.nec.co.jp> +-fyre-messanger 2731/tcp Fyre Messanger +-fyre-messanger 2731/udp Fyre Messagner +-# Robert Waters <bobtek&hotmail.com> +-g5m 2732/tcp G5M +-g5m 2732/udp G5M +-# Graham Klyne <GK&ACM.ORG> +-signet-ctf 2733/tcp Signet CTF +-signet-ctf 2733/udp Signet CTF +-# Greg Broiles <greg&sac.net> +-ccs-software 2734/tcp CCS Software +-ccs-software 2734/udp CCS Software +-# Bertus Jacobs <bertus&ccs-software.co.za> +-netiq-mc 2735/tcp NetIQ Monitor Console +-netiq-mc 2735/udp NetIQ Monitor Console +-# Scott Southard <scott.southard&netiq.com> +-radwiz-nms-srv 2736/tcp RADWIZ NMS SRV +-radwiz-nms-srv 2736/udp RADWIZ NMS SRV +-# Israel Shainert <israels&209.88.177.2> +-srp-feedback 2737/tcp SRP Feedback +-srp-feedback 2737/udp SRP Feedback +-# Werner Almesberger <Werner.Almesberger&epfl.ch> +-ndl-tcp-ois-gw 2738/tcp NDL TCP-OSI Gateway +-ndl-tcp-ois-gw 2738/udp NDL TCP-OSI Gateway +-# Martin Norman <martin&ndl.co.uk> +-tn-timing 2739/tcp TN Timing +-tn-timing 2739/udp TN Timing +-# Paul Roberts <PaulRoberts&engineer.com> +-alarm 2740/tcp Alarm +-alarm 2740/udp Alarm +-# Uriy Makasjuk <racer&bfpg.ru> +-tsb 2741/tcp TSB +-tsb 2741/udp TSB +-tsb2 2742/tcp TSB2 +-tsb2 2742/udp TSB2 +-# Ashish Chatterjee +-# <achatterjee&freeway.proxy.lucent.com> +-murx 2743/tcp murx +-murx 2743/udp murx +-# Thomas Kuiper <tkuiper&inxsoft.net> +-honyaku 2744/tcp honyaku +-honyaku 2744/udp honyaku +-# Yasunari Yamashita <yamasita&omronsoft.co.jp> +-urbisnet 2745/tcp URBISNET +-urbisnet 2745/udp URBISNET +-# Urbis.Net Ltd <postmaster&urbis.net> +-cpudpencap 2746/tcp CPUDPENCAP +-cpudpencap 2746/udp CPUDPENCAP +-# Tamir Zegman <zegman&checkpoint.com> +-fjippol-swrly 2747/tcp +-fjippol-swrly 2747/udp +-fjippol-polsvr 2748/tcp +-fjippol-polsvr 2748/udp +-fjippol-cnsl 2749/tcp +-fjippol-cnsl 2749/udp +-fjippol-port1 2750/tcp +-fjippol-port1 2750/udp +-fjippol-port2 2751/tcp +-fjippol-port2 2751/udp +-# Shoichi Tachibana <tatibana&yk.fujitsu.co.jp> +-rsisysaccess 2752/tcp RSISYS ACCESS +-rsisysaccess 2752/udp RSISYS ACCESS +-# Christophe Besant +-de-spot 2753/tcp de-spot +-de-spot 2753/udp de-spot +-# Sanjay Parekh <spot&digitalenvoy.net> +-apollo-cc 2754/tcp APOLLO CC +-apollo-cc 2754/udp APOLLO CC +-# Brand Communications <donovan&brandcomms.com> +-expresspay 2755/tcp Express Pay +-expresspay 2755/udp Express Pay +-# Ben Higgins <bhiggins&netcom.ca> +-simplement-tie 2756/tcp simplement-tie +-simplement-tie 2756/udp simplement-tie +-# Tzvika Chumash <tzvikac&netvision.net.il> +-cnrp 2757/tcp CNRP +-cnrp 2757/udp CNRP +-# Jacob Ulmert <Jacob.Ulmert&se.abb.com> +-apollo-status 2758/tcp APOLLO Status +-apollo-status 2758/udp APOLLO Status +-apollo-gms 2759/tcp APOLLO GMS +-apollo-gms 2759/udp APOLLO GMS +-# Simon Hovell <simonh&brandcomms.com> +-sabams 2760/tcp Saba MS +-sabams 2760/udp Saba MS +-# Davoud Maha <dmaha&saba.com> +-dicom-iscl 2761/tcp DICOM ISCL +-dicom-iscl 2761/udp DICOM ISCL +-dicom-tls 2762/tcp DICOM TLS +-dicom-tls 2762/udp DICOM TLS +-# Lawrence Tarbox <ltarbox&scr.siemens.com> +-desktop-dna 2763/tcp Desktop DNA +-desktop-dna 2763/udp Desktop DNA +-# Jon Walker <jwalker&miramarsys.com> +-data-insurance 2764/tcp Data Insurance +-data-insurance 2764/udp Data Insurance +-# Brent Irwin <birwin&standard.com> +-qip-audup 2765/tcp qip-audup +-qip-audup 2765/udp qip-audup +-# Mike Morgan <mmorgan&lucent.com> +-compaq-scp 2766/tcp Compaq SCP +-compaq-scp 2766/udp Compaq SCP +-# Ferruccio Barletta <ferruccio.barletta&compaq.com> +-uadtc 2767/tcp UADTC +-uadtc 2767/udp UADTC +-uacs 2768/tcp UACS +-uacs 2768/udp UACS +-# Vishwas Lele <Vishwas_Lele&appliedis.com> +-exce 2769/tcp eXcE +-exce 2769/udp eXcE +-# Norm Freedman <normfree&san.rr.com> +-veronica 2770/tcp Veronica +-veronica 2770/udp Veronica +-# Jonas Oberg <jonas&coyote.org> +-vergencecm 2771/tcp Vergence CM +-vergencecm 2771/udp Vergence CM +-# Mark Morwood <markm&sentillion.com> +-auris 2772/tcp auris +-auris 2772/udp auris +-# Francisco Saez Arance <fsaez&tid.es> +-rbakcup1 2773/tcp RBackup Remote Backup +-rbakcup1 2773/udp RBackup Remote Backup +-rbakcup2 2774/tcp RBackup Remote Backup +-rbakcup2 2774/udp RBackup Remote Backup +-# Rob Cosgrove <rob&alice.net> +-smpp 2775/tcp SMPP +-smpp 2775/udp SMPP +-# Owen Sullivan <owen.sullivan&aldiscon.ie> +-ridgeway1 2776/tcp Ridgeway Systems & Software +-ridgeway1 2776/udp Ridgeway Systems & Software +-ridgeway2 2777/tcp Ridgeway Systems & Software +-ridgeway2 2777/udp Ridgeway Systems & Software +-# Steve Read <sread&ridgeway-sys.com> +-gwen-sonya 2778/tcp Gwen-Sonya +-gwen-sonya 2778/udp Gwen-Sonya +-# Mark Hurst <mhurst&inconnect.com> +-lbc-sync 2779/tcp LBC Sync +-lbc-sync 2779/udp LBC Sync +-lbc-control 2780/tcp LBC Control +-lbc-control 2780/udp LBC Control +-# Keiji Michine <michine&net.paso.fujitsu.co.jp> +-whosells 2781/tcp whosells +-whosells 2781/udp whosells +-# William Randolph Royere III +-# <william&royere.net> +-everydayrc 2782/tcp everydayrc +-everydayrc 2782/udp everydayrc +-# Ahti Heinla <ahti&ahti.bluemoon.ee> +-aises 2783/tcp AISES +-aises 2783/udp AISES +-# Daniel Grazioli <dgrazioli&pgaero.co.uk> +-www-dev 2784/tcp world wide web - development +-www-dev 2784/udp world wide web - development +-aic-np 2785/tcp aic-np +-aic-np 2785/udp aic-np +-# Brad Parker <brad&american.com> +-aic-oncrpc 2786/tcp aic-oncrpc - Destiny MCD database +-aic-oncrpc 2786/udp aic-oncrpc - Destiny MCD database +-# Brad Parker <brad&american.com> +-piccolo 2787/tcp piccolo - Cornerstone Software +-piccolo 2787/udp piccolo - Cornerstone Software +-# Dave Bellivea <DaveBelliveau&corsof.com> +-fryeserv 2788/tcp NetWare Loadable Module - Seagate Software +-fryeserv 2788/udp NetWare Loadable Module - Seagate Software +-# Joseph LoPilato +-# <Joseph_M_LoPilato¬es.seagate.com> +-media-agent 2789/tcp Media Agent +-media-agent 2789/udp Media Agent +-# Nitzan Daube <nitzan&brm.com> +-plgproxy 2790/tcp PLG Proxy +-plgproxy 2790/udp PLG Proxy +-# Charlie Hava <charlieh&aks.com> +-mtport-regist 2791/tcp MT Port Registrator +-mtport-regist 2791/udp MT Port Registrator +-# Maxim Tseitlin <mtseitlin&iname.com> +-f5-globalsite 2792/tcp f5-globalsite +-f5-globalsite 2792/udp f5-globalsite +-# Christian Saether <c.saether&f5.com> +-initlsmsad 2793/tcp initlsmsad +-initlsmsad 2793/udp initlsmsad +-# Kelly Green <green&compaq.com> +-# 2794 Unassigned (Removed 2006-12-04) +-livestats 2795/tcp LiveStats +-livestats 2795/udp LiveStats +-# Chris Greene <cgreeneOA&avidsports.com> +-ac-tech 2796/tcp ac-tech +-ac-tech 2796/udp ac-tech +-# Chiming Huang <chuang&ac-tech.com> +-esp-encap 2797/tcp esp-encap +-esp-encap 2797/udp esp-encap +-# Jorn Sierwald <joern.sierwald&datafellows.com> +-tmesis-upshot 2798/tcp TMESIS-UPShot +-tmesis-upshot 2798/udp TMESIS-UPShot +-# Brian Schenkenberger <VAXman&TMESIS.COM> +-icon-discover 2799/tcp ICON Discover +-icon-discover 2799/udp ICON Discover +-# Alexander Falk <falk&icon.at> +-acc-raid 2800/tcp ACC RAID +-acc-raid 2800/udp ACC RAID +-# Scott St. Clair <stclair&ntc.adaptec.com> +-igcp 2801/tcp IGCP +-igcp 2801/udp IGCP +-# David Hampson <davidha&codemasters.com> +-veritas-tcp1 2802/tcp Veritas TCP1 +-veritas-udp1 2802/udp Veritas UDP1 +-# Russ Thrasher <Russell.Thrasher&veritas.com> +-btprjctrl 2803/tcp btprjctrl +-btprjctrl 2803/udp btprjctrl +-# Huw Thomas <huw.thomas&bt.com> +-dvr-esm 2804/tcp March Networks Digital Video Recorders and Enterprise Service Manager products +-dvr-esm 2804/udp March Networks Digital Video Recorders and Enterprise Service Manager products +-# Paul Streatch <pstreatch&marchnetworks.com> June 2004 +-wta-wsp-s 2805/tcp WTA WSP-S +-wta-wsp-s 2805/udp WTA WSP-S +-# Sebastien Bury (WAP Forum) +-# <sebastien.bury&art.alcatel.fr> +-cspuni 2806/tcp cspuni +-cspuni 2806/udp cspuni +-cspmulti 2807/tcp cspmulti +-cspmulti 2807/udp cspmulti +-# Terumasa Yoneda <yonedat&pfu.co.jp> +-j-lan-p 2808/tcp J-LAN-P +-j-lan-p 2808/udp J-LAN-P +-# Takeshi Sahara <sahara&jdl.co.jp> +-corbaloc 2809/tcp CORBA LOC +-corbaloc 2809/udp CORBA LOC +-# Ted McFadden <mcfadden&dstc.edu.au> +-netsteward 2810/tcp Active Net Steward +-netsteward 2810/udp Active Net Steward +-# Keith Morley <keith&ndl.co.uk> +-gsiftp 2811/tcp GSI FTP +-gsiftp 2811/udp GSI FTP +-# Von Welch <vwelch&ncsa.uiuc.edu> +-atmtcp 2812/tcp atmtcp +-atmtcp 2812/udp atmtcp +-# Werner Almesberger <Werner.Almesberger&epfl.ch> +-llm-pass 2813/tcp llm-pass +-llm-pass 2813/udp llm-pass +-llm-csv 2814/tcp llm-csv +-llm-csv 2814/udp llm-csv +-# Glen Sansoucie <glen&llmwin.com> +-lbc-measure 2815/tcp LBC Measurement +-lbc-measure 2815/udp LBC Measurement +-lbc-watchdog 2816/tcp LBC Watchdog +-lbc-watchdog 2816/udp LBC Watchdog +-# Akiyoshi Ochi <akiyoshi&net.paso.fujitsu.co.jp> +-nmsigport 2817/tcp NMSig Port +-nmsigport 2817/udp NMSig Port +-# Peter Egli <peter.egli&mail.inalp.com> +-rmlnk 2818/tcp rmlnk +-rmlnk 2818/udp rmlnk +-fc-faultnotify 2819/tcp FC Fault Notification +-fc-faultnotify 2819/udp FC Fault Notification +-# Dave Watkins <davew&boi.hp.com> +-univision 2820/tcp UniVision +-univision 2820/udp UniVision +-# Keith Ansell <KeithA&fastfreenet.com> +-vrts-at-port 2821/tcp VERITAS Authentication Service +-vrts-at-port 2821/udp VERITAS Authentication Service +-# Stefan Winkel <stefan&veritas.com> +-ka0wuc 2822/tcp ka0wuc +-ka0wuc 2822/udp ka0wuc +-# Kit Haskins <kit&ka0wuc.org> +-cqg-netlan 2823/tcp CQG Net/LAN +-cqg-netlan 2823/udp CQG Net/LAN +-cqg-netlan-1 2824/tcp CQG Net/LAN 1 +-cqg-netlan-1 2824/udp CQG Net/Lan 1 +-# Jeff Wood <jw&cqg.com> +-# 2825 (unassigned) Possibly assigned +-slc-systemlog 2826/tcp slc systemlog +-slc-systemlog 2826/udp slc systemlog +-slc-ctrlrloops 2827/tcp slc ctrlrloops +-slc-ctrlrloops 2827/udp slc ctrlrloops +-# Erwin Hogeweg <erwin&airtech.demon.nl> +-itm-lm 2828/tcp ITM License Manager +-itm-lm 2828/udp ITM License Manager +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-silkp1 2829/tcp silkp1 +-silkp1 2829/udp silkp1 +-silkp2 2830/tcp silkp2 +-silkp2 2830/udp silkp2 +-silkp3 2831/tcp silkp3 +-silkp3 2831/udp silkp3 +-silkp4 2832/tcp silkp4 +-silkp4 2832/udp silkp4 +-# Erik Skyten <eki&silknet.com> +-glishd 2833/tcp glishd +-glishd 2833/udp glishd +-# Darrell Schiebel <dschieb&cv.nrao.edu> +-evtp 2834/tcp EVTP +-evtp 2834/udp EVTP +-evtp-data 2835/tcp EVTP-DATA +-evtp-data 2835/udp EVTP-DATA +-# Eric Bruno <ebruno&solution-soft.com> +-catalyst 2836/tcp catalyst +-catalyst 2836/udp catalyst +-# Garret Tollkuhn <garret&multiviewgroup.com> +-repliweb 2837/tcp Repliweb +-repliweb 2837/udp Repliweb +-# William Orme <bill&repliweb.com> +-starbot 2838/tcp Starbot +-starbot 2838/udp Starbot +-# Markus Sabadello <sabadello&starbot.org> +-nmsigport 2839/tcp NMSigPort +-nmsigport 2839/udp NMSigPort +-# Peter Egli <peter.egli&mail.inalp.com> +-l3-exprt 2840/tcp l3-exprt +-l3-exprt 2840/udp l3-exprt +-l3-ranger 2841/tcp l3-ranger +-l3-ranger 2841/udp l3-ranger +-l3-hawk 2842/tcp l3-hawk +-l3-hawk 2842/udp l3-hawk +-# Dolores Scott <dolores.scott&l-3security.com> +-pdnet 2843/tcp PDnet +-pdnet 2843/udp PDnet +-# Torsten Scheffler <pdnetadmin&pdnet.info> +-bpcp-poll 2844/tcp BPCP POLL +-bpcp-poll 2844/udp BPCP POLL +-bpcp-trap 2845/tcp BPCP TRAP +-bpcp-trap 2845/udp BPCP TRAP +-# Steve Van Duser <steve.vanduser&bestpower.gensig.com> +-aimpp-hello 2846/tcp AIMPP Hello +-aimpp-hello 2846/udp AIMPP Hello +-aimpp-port-req 2847/tcp AIMPP Port Req +-aimpp-port-req 2847/udp AIMPP Port Req +-# Brian Martinicky +-# <Brian_Martinicky&automationintelligence.com> +-amt-blc-port 2848/tcp AMT-BLC-PORT +-amt-blc-port 2848/udp AMT-BLC-PORT +-# Sandra Frulloni <frulloni.amtec&interbusiness.it> +-fxp 2849/tcp FXP +-fxp 2849/udp FXP +-# Martin Lichtin <lichtin&oanda.com> +-metaconsole 2850/tcp MetaConsole +-metaconsole 2850/udp MetaConsole +-# Rakesh Mahajan <rmahajan&netaphor-software.com> +-webemshttp 2851/tcp webemshttp +-webemshttp 2851/udp webemshttp +-# Stephen Tsun <stsun&jetstream.com> +-bears-01 2852/tcp bears-01 +-bears-01 2852/udp bears-01 +-# Bruce McKinnon <brucemck&bears.aust.com> +-ispipes 2853/tcp ISPipes +-ispipes 2853/udp ISPipes +-# Rajesh Nandyalam <rnandyal&emc.com> +-infomover 2854/tcp InfoMover +-infomover 2854/udp InfoMover +-# Carla Caputo <caputo&emc.com> +-msrp 2855/tcp MSRP over TCP +-msrp 2855/udp MSRP +-# [RFC4975] +-cesdinv 2856/tcp cesdinv +-cesdinv 2856/udp cesdinv +-# Yoshiaki Tokumoto <toku&pfu.co.jp> +-simctlp 2857/tcp SimCtIP +-simctlp 2857/udp SimCtIP +-# Christian Zietz <czietz&gmx.net> +-ecnp 2858/tcp ECNP +-ecnp 2858/udp ECNP +-# Robert Reimiller <bob&certsoft.com> +-activememory 2859/tcp Active Memory +-activememory 2859/udp Active Memory +-# Joe Graham <joe&edaconsulting.com> +-dialpad-voice1 2860/tcp Dialpad Voice 1 +-dialpad-voice1 2860/udp Dialpad Voice 1 +-dialpad-voice2 2861/tcp Dialpad Voice 2 +-dialpad-voice2 2861/udp Dialpad Voice 2 +-# Wongyu Cho <wgcho&dialpad.com> +-ttg-protocol 2862/tcp TTG Protocol +-ttg-protocol 2862/udp TTG Protocol +-# Mark Boler <markb&ttgsoftware.com> +-sonardata 2863/tcp Sonar Data +-sonardata 2863/udp Sonar Data +-# Ian Higginbottom <sonardata&sonardata.com> +-astromed-main 2864/tcp main 5001 cmd +-astromed-main 2864/udp main 5001 cmd +-# Chris Tate <ctate&astromed.com> +-pit-vpn 2865/tcp pit-vpn +-pit-vpn 2865/udp pit-vpn +-# Norbert Sendetzky <norbert&linuxnetworks.de> +-iwlistener 2866/tcp iwlistener +-iwlistener 2866/udp iwlistener +-# Fred Surr <quest_iana&oz.quest.com> +-esps-portal 2867/tcp esps-portal +-esps-portal 2867/udp esps-portal +-# Nicholas Stowfis <nstowfis&esps.com> +-npep-messaging 2868/tcp NPEP Messaging +-npep-messaging 2868/udp NPEP Messaging +-# Kristian A. Bognaes <kbo&norman.no> +-icslap 2869/tcp ICSLAP +-icslap 2869/udp ICSLAP +-# Richard Lamb <rlambµsoft.com> +-daishi 2870/tcp daishi +-daishi 2870/udp daishi +-# Patrick Chipman <pchipman&memphis.edu> +-msi-selectplay 2871/tcp MSI Select Play +-msi-selectplay 2871/udp MSI Select Play +-# Paul Fonte <paul_fonte&mediastation.com> +-radix 2872/tcp RADIX +-radix 2872/udp RADIX +-# Stein Roger Skaflotten +-# <sskaflot&online.no> +-# 2873 Unassigned (Removed 2003-07-23) +-dxmessagebase1 2874/tcp dxmessagebase1 +-dxmessagebase1 2874/udp dxmessagebase1 +-dxmessagebase2 2875/tcp dxmessagebase2 +-dxmessagebase2 2875/udp dxmessagebase2 +-# Ozz Nixon <root&delphix.com> +-sps-tunnel 2876/tcp SPS Tunnel +-sps-tunnel 2876/udp SPS Tunnel +-# Bill McIntosh <bmcintosh&fortresstech.com> +-bluelance 2877/tcp BLUELANCE +-bluelance 2877/udp BLUELANCE +-# Michael Padrezas <mpaderzas&bluelance.com> +-aap 2878/tcp AAP +-aap 2878/udp AAP +-# Stephen Hanna <steve.hanna&sun.com> +-ucentric-ds 2879/tcp ucentric-ds +-ucentric-ds 2879/udp ucentric-ds +-# Alex Vasilevsky <alexv&204.165.216.115> +-synapse 2880/tcp Synapse Transport +-synapse 2880/udp Synapse Transport +-# Ali Fracyon <sxdev&modulardreams.com> +-ndsp 2881/tcp NDSP +-ndsp 2881/udp NDSP +-ndtp 2882/tcp NDTP +-ndtp 2882/udp NDTP +-ndnp 2883/tcp NDNP +-ndnp 2883/udp NDNP +-# Khelben Blackstaff <khelben&gmx.at> +-flashmsg 2884/tcp Flash Msg +-flashmsg 2884/udp Flash Msg +-# Jeffrey Zinkerman <jeff&zinknet.com> +-topflow 2885/tcp TopFlow +-topflow 2885/udp TopFlow +-# Ted Ross <ross&toplayer.com> +-responselogic 2886/tcp RESPONSELOGIC +-responselogic 2886/udp RESPONSELOGIC +-# Bruce Casey <bcasey&responselogic.com> +-aironetddp 2887/tcp aironet +-aironetddp 2887/udp aironet +-# Victor Griswold <vgris&aironet.com> +-spcsdlobby 2888/tcp SPCSDLOBBY +-spcsdlobby 2888/udp SPCSDLOBBY +-# Matthew Williams <SPCsd_MWDD&hotmail.com> +-rsom 2889/tcp RSOM +-rsom 2889/udp RSOM +-# Justine Higgins <iana&corsof.com> +-cspclmulti 2890/tcp CSPCLMULTI +-cspclmulti 2890/udp CSPCLMULTI +-# Yoneda Terumasa <yonedat&pfu.co.jp> +-cinegrfx-elmd 2891/tcp CINEGRFX-ELMD License Manager +-cinegrfx-elmd 2891/udp CINEGRFX-ELMD License Manager +-# Greg Ercolano <erco&cinegrfx.com> +-snifferdata 2892/tcp SNIFFERDATA +-snifferdata 2892/udp SNIFFERDATA +-# Jeff Mangasarian <jeffrey_mangasarian&nai.com> +-vseconnector 2893/tcp VSECONNECTOR +-vseconnector 2893/udp VSECONNECTOR +-# Ingo Franzki <ifranzki&de.ibm.com> +-abacus-remote 2894/tcp ABACUS-REMOTE +-abacus-remote 2894/udp ABACUS-REMOTE +-# Mike Bello <mbello&zarak.com> +-natuslink 2895/tcp NATUS LINK +-natuslink 2895/udp NATUS LINK +-# Jonathan Mergy <mergy&natus.com> +-ecovisiong6-1 2896/tcp ECOVISIONG6-1 +-ecovisiong6-1 2896/udp ECOVISIONG6-1 +-# Henrik Holst <henrik.holst&ecovision.se> +-citrix-rtmp 2897/tcp Citrix RTMP +-citrix-rtmp 2897/udp Citrix RTMP +-# Myk Willis <myk.willis&citrix.com> +-appliance-cfg 2898/tcp APPLIANCE-CFG +-appliance-cfg 2898/udp APPLIANCE-CFG +-# Gary A. James <gary.james&criticallink.com> +-powergemplus 2899/tcp POWERGEMPLUS +-powergemplus 2899/udp POWERGEMPLUS +-# Koich Nakamura <naka&case.nm.fujitsu.co.jp> +-quicksuite 2900/tcp QUICKSUITE +-quicksuite 2900/udp QUICKSUITE +-# William Egge <begge&emagisoft.com> +-allstorcns 2901/tcp ALLSTORCNS +-allstorcns 2901/udp ALLSTORCNS +-# Steve Dobson <sdobson&allstor.com> +-netaspi 2902/tcp NET ASPI +-netaspi 2902/udp NET ASPI +-# Johnson Luo <johnson_luo&mail.sercomm.com.tw> +-suitcase 2903/tcp SUITCASE +-suitcase 2903/udp SUITCASE +-# Milton E. Sagen <msagen&extensis.com> +-m2ua 2904/tcp M2UA +-m2ua 2904/udp M2UA +-m2ua 2904/sctp M2UA +-# Lyndon Ong <LyOng&ciena.com> +-m3ua 2905/tcp M3UA +-# 2905/udp De-registered (2001 June 07) +-m3ua 2905/sctp M3UA +-# Lyndon Ong <LyOng&ciena.com> +-caller9 2906/tcp CALLER9 +-caller9 2906/udp CALLER9 +-# Shams Naqi <SSNAQVI&aol.com> +-webmethods-b2b 2907/tcp WEBMETHODS B2B +-webmethods-b2b 2907/udp WEBMETHODS B2B +-# Joseph Hines <jhines&webmethods.com> +-mao 2908/tcp mao +-mao 2908/udp mao +-# Marc Baudoin <babafou&babafou.eu.org> +-funk-dialout 2909/tcp Funk Dialout +-funk-dialout 2909/udp Funk Dialout +-# Cimarron Boozer <cboozer&funk.com> +-tdaccess 2910/tcp TDAccess +-tdaccess 2910/udp TDAccess +-# Tom Haapanen <tomh&metrics.com> +-blockade 2911/tcp Blockade +-blockade 2911/udp Blockade +-# VP - Research & Development <development&blockade.com> +-epicon 2912/tcp Epicon +-epicon 2912/udp Epicon +-# Michael Khalandovsky <mlk&epicon.com> +-boosterware 2913/tcp Booster Ware +-boosterware 2913/udp Booster Ware +-# Ido Ben-David <dgntcom&netvision.net.il> +-gamelobby 2914/tcp Game Lobby +-gamelobby 2914/udp Game Lobby +-# Paul Ford-Hutchinson <paulfordh&uk.ibm.com> +-tksocket 2915/tcp TK Socket +-tksocket 2915/udp TK Socket +-# Alan Fahrner <alan&protix.com> +-elvin_server 2916/tcp Elvin Server +-elvin_server 2916/udp Elvin Server +-elvin_client 2917/tcp Elvin Client +-elvin_client 2917/udp Elvin Client +-# David Arnold <davida&pobox.com> +-kastenchasepad 2918/tcp Kasten Chase Pad +-kastenchasepad 2918/udp Kasten Chase Pad +-# Marc Gauthier <mgau&kastenchase.com> +-roboer 2919/tcp roboER +-roboer 2919/udp roboER +-# Paul Snook <paul.snook&itheon.com> +-roboeda 2920/tcp roboEDA +-roboeda 2920/udp roboEDA +-# Paul Snook <paul.snook&itheon.com> +-cesdcdman 2921/tcp CESD Contents Delivery Management +-cesdcdman 2921/udp CESD Contents Delivery Management +-# Shinya Abe <abeabe&pfu.co.jp> +-cesdcdtrn 2922/tcp CESD Contents Delivery Data Transfer +-cesdcdtrn 2922/udp CESD Contents Delivery Data Transfer +-# Shinya Abe <abeabe&pfu.co.jp> +-wta-wsp-wtp-s 2923/tcp WTA-WSP-WTP-S +-wta-wsp-wtp-s 2923/udp WTA-WSP-WTP-S +-# Sebastien Bury (WAP Forum) +-# <sebastien.bury&art.alcatel.fr> +-precise-vip 2924/tcp PRECISE-VIP +-precise-vip 2924/udp PRECISE-VIP +-# Michael Landwehr <mikel&precisesoft.co.il> +-# 2925 Unassigned (FRP-Released 12/7/00) +-mobile-file-dl 2926/tcp MOBILE-FILE-DL +-mobile-file-dl 2926/udp MOBILE-FILE-DL +-# Mitsuji Toda <toda&mmedia.mci.mei.co.jp> +-unimobilectrl 2927/tcp UNIMOBILECTRL +-unimobilectrl 2927/udp UNIMOBILECTRL +-# Vikas <vikas&graycell.com> +-redstone-cpss 2928/tcp REDSTONE-CPSS +-redstone-cpss 2928/udp REDSTONE-CPSS +-# Jeff Looman <jeff&looman.org> +-amx-webadmin 2929/tcp AMX-WEBADMIN +-amx-webadmin 2929/udp AMX-WEBADMIN +-# Mike Morris <mike.morris&amx.com> +-amx-weblinx 2930/tcp AMX-WEBLINX +-amx-weblinx 2930/udp AMX-WEBLINX +-# Mike Morris <mike.morris&amx.com> +-circle-x 2931/tcp Circle-X +-circle-x 2931/udp Circle-X +-# Norm Freedman <normfree&worldnet.att.net> +-incp 2932/tcp INCP +-incp 2932/udp INCP +-# Keith Paulsen <kpaulsen&phobos.com> +-4-tieropmgw 2933/tcp 4-TIER OPM GW +-4-tieropmgw 2933/udp 4-TIER OPM GW +-# Francois Peloffy <fpeloffy&4tier.com> +-4-tieropmcli 2934/tcp 4-TIER OPM CLI +-4-tieropmcli 2934/udp 4-TIER OPM CLI +-# Francois Peloffy <fpeloffy&4tier.com> +-qtp 2935/tcp QTP +-qtp 2935/udp QTP +-# Cameron Young <Cameron_Young&inetco.com> +-otpatch 2936/tcp OTPatch +-otpatch 2936/udp OTPatch +-# Brett Goldstein <bgoldstein&opentable.com> +-pnaconsult-lm 2937/tcp PNACONSULT-LM +-pnaconsult-lm 2937/udp PNACONSULT-LM +-# Theo Nijssen <theon&nijssen.nl> +-sm-pas-1 2938/tcp SM-PAS-1 +-sm-pas-1 2938/udp SM-PAS-1 +-sm-pas-2 2939/tcp SM-PAS-2 +-sm-pas-2 2939/udp SM-PAS-2 +-sm-pas-3 2940/tcp SM-PAS-3 +-sm-pas-3 2940/udp SM-PAS-3 +-sm-pas-4 2941/tcp SM-PAS-4 +-sm-pas-4 2941/udp SM-PAS-4 +-sm-pas-5 2942/tcp SM-PAS-5 +-sm-pas-5 2942/udp SM-PAS-5 +-# Tom Haapanen <tomh&metrics.com> +-ttnrepository 2943/tcp TTNRepository +-ttnrepository 2943/udp TTNRepository +-# Robert Orr <rorr&teltone.com> +-megaco-h248 2944/tcp Megaco H-248 +-megaco-h248 2944/udp Megaco H-248 +-# Tom Taylor <taylor&nortelnetworks.com> +-megaco-h248 2944/sctp Megaco-H.248 text +-# Tom Taylor <taylor&nortel.com> September 2006 +-h248-binary 2945/tcp H248 Binary +-h248-binary 2945/udp H248 Binary +-# Tom Taylor <taylor&nortelnetworks.com> +-h248-binary 2945/sctp Megaco/H.248 binary +-# Tom Taylor <taylor&nortel.com> September 2006 +-fjsvmpor 2946/tcp FJSVmpor +-fjsvmpor 2946/udp FJSVmpor +-# Naoki Hayashi <ha&fjh.se.fujitsu.co.jp> +-gpsd 2947/tcp GPSD +-gpsd 2947/udp GPSD +-# Derrick J. Brashear <shadow&dementia.org> +-wap-push 2948/tcp WAP PUSH +-wap-push 2948/udp WAP PUSH +-wap-pushsecure 2949/tcp WAP PUSH SECURE +-wap-pushsecure 2949/udp WAP PUSH SECURE +-# WAP FORUM <wap-feedback&mail.wapforum.org> +-esip 2950/tcp ESIP +-esip 2950/udp ESIP +-# David Stephenson <david_stephenson&hp.com> +-ottp 2951/tcp OTTP +-ottp 2951/udp OTTP +-# Brent Foster <brent.foster&onstreamsystems.com> +-mpfwsas 2952/tcp MPFWSAS +-mpfwsas 2952/udp MPFWSAS +-# Toru Murai <murai&saint.nm.fujitsu.co.jp> +-ovalarmsrv 2953/tcp OVALARMSRV +-ovalarmsrv 2953/udp OVALARMSRV +-ovalarmsrv-cmd 2954/tcp OVALARMSRV-CMD +-ovalarmsrv-cmd 2954/udp OVALARMSRV-CMD +-# Eric Pulsipher <eric_pulsipher&hp.com> +-csnotify 2955/tcp CSNOTIFY +-csnotify 2955/udp CSNOTIFY +-# Israel Beniaminy <israel.beniaminy&clickservice.com> +-ovrimosdbman 2956/tcp OVRIMOSDBMAN +-ovrimosdbman 2956/udp OVRIMOSDBMAN +-# Dimitrios Souflis <dsouflis&altera.gr> +-jmact5 2957/tcp JAMCT5 +-jmact5 2957/udp JAMCT5 +-jmact6 2958/tcp JAMCT6 +-jmact6 2958/udp JAMCT6 +-rmopagt 2959/tcp RMOPAGT +-rmopagt 2959/udp RMOPAGT +-# Shuji Okubo <okubo&yk.fujitsu.co.jp> +-dfoxserver 2960/tcp DFOXSERVER +-dfoxserver 2960/udp DFOXSERVER +-# David Holden <mdh&rentek.net> +-boldsoft-lm 2961/tcp BOLDSOFT-LM +-boldsoft-lm 2961/udp BOLDSOFT-LM +-# Fredrik Haglund <fredik.haglund&boldsoft.com> +-iph-policy-cli 2962/tcp IPH-POLICY-CLI +-iph-policy-cli 2962/udp IPH-POLICY-CLI +-iph-policy-adm 2963/tcp IPH-POLICY-ADM +-iph-policy-adm 2963/udp IPH-POLICY-ADM +-# Shai Herzog <herzog&iphighway.com> +-bullant-srap 2964/tcp BULLANT SRAP +-bullant-srap 2964/udp BULLANT SRAP +-bullant-rap 2965/tcp BULLANT RAP +-bullant-rap 2965/udp BULLANT RAP +-# Michael Cahill <Michael.Cahill&bullant.net> +-idp-infotrieve 2966/tcp IDP-INFOTRIEVE +-idp-infotrieve 2966/udp IDP-INFOTRIEVE +-# Kevin Bruckert <kbruckert&idpco.com> +-ssc-agent 2967/tcp SSC-AGENT +-ssc-agent 2967/udp SSC-AGENT +-# George Dzieciol <gdzieciol&symantec.com> +-enpp 2968/tcp ENPP +-enpp 2968/udp ENPP +-# Kazuhito Gassho <Gassho.Kasuhito&exc.epson.co.jp> +-essp 2969/tcp ESSP +-essp 2969/udp ESSP +-# Hitoshi Ishida <ishida.hitoshi&exc.epson.co.jp> +-index-net 2970/tcp INDEX-NET +-index-net 2970/udp INDEX-NET +-# Chris J. Wren <C.Wren&lucent.com> +-netclip 2971/tcp NetClip clipboard daemon +-netclip 2971/udp NetClip clipboard daemon +-# Rudi Chiarito <nutello&sweetness.com> +-pmsm-webrctl 2972/tcp PMSM Webrctl +-pmsm-webrctl 2972/udp PMSM Webrctl +-# Markus Michels <mmi&pmsmicado.com> +-svnetworks 2973/tcp SV Networks +-svnetworks 2973/udp SV Networks +-# Sylvia Siu <ssiu&svnetworks.com> +-signal 2974/tcp Signal +-signal 2974/udp Signal +-# Wyatt Williams <wyattw&icall.com> +-fjmpcm 2975/tcp Fujitsu Configuration Management Service +-fjmpcm 2975/udp Fujitsu Configuration Management Service +-# Hiroki Kawano <kawano&saint.nm.fujitsu.co.jp> +-cns-srv-port 2976/tcp CNS Server Port +-cns-srv-port 2976/udp CNS Server Port +-# Ram Golla <rgolla&cisco.com> +-ttc-etap-ns 2977/tcp TTCs Enterprise Test Access Protocol - NS +-ttc-etap-ns 2977/udp TTCs Enterprise Test Access Protocol - NS +-ttc-etap-ds 2978/tcp TTCs Enterprise Test Access Protocol - DS +-ttc-etap-ds 2978/udp TTCs Enterprise Test Access Protocol - DS +-# Daniel Becker <beckerd&ttc.com> +-h263-video 2979/tcp H.263 Video Streaming +-h263-video 2979/udp H.263 Video Streaming +-# Jauvane C. de Oliveira <jauvane&acm.org> +-wimd 2980/tcp Instant Messaging Service +-wimd 2980/udp Instant Messaging Service +-# Kevin Birch <kbirch&pobox.com> +-mylxamport 2981/tcp MYLXAMPORT +-mylxamport 2981/udp MYLXAMPORT +-# Wei Gao <wei&mylex.com> +-iwb-whiteboard 2982/tcp IWB-WHITEBOARD +-iwb-whiteboard 2982/udp IWB-WHITEBOARD +-# David W. Radcliffe <info&radsolution.co.uk> +-netplan 2983/tcp NETPLAN +-netplan 2983/udp NETPLAN +-# Thomas Driemeyer <thomas&bitrot.de> +-hpidsadmin 2984/tcp HPIDSADMIN +-hpidsadmin 2984/udp HPIDSADMIN +-hpidsagent 2985/tcp HPIDSAGENT +-hpidsagent 2985/udp HPIDSAGENT +-# John Trudeau <jtrudeau&cup.hp.com> +-stonefalls 2986/tcp STONEFALLS +-stonefalls 2986/udp STONEFALLS +-# Scott Grau <sgrau&stonefalls.com> +-identify 2987/tcp identify +-identify 2987/udp identify +-hippad 2988/tcp HIPPA Reporting Protocol +-hippad 2988/udp HIPPA Reporting Protocol +-# William Randolph Royere III +-# <william&royere.net> +-zarkov 2989/tcp ZARKOV Intelligent Agent Communication +-zarkov 2989/udp ZARKOV Intelligent Agent Communication +-# Robin Felix <zarkov_port&zarkov.com> +-boscap 2990/tcp BOSCAP +-boscap 2990/udp BOSCAP +-# Dirk Hillbrecht <dirk&hillbrecht.de> +-wkstn-mon 2991/tcp WKSTN-MON +-wkstn-mon 2991/udp WKSTN-MON +-# William David <william.david&lmco.com> +-itb301 2992/tcp ITB301 +-itb301 2992/udp ITB301 +-# Bodo Rueskamp <br&itchigo.com> +-veritas-vis1 2993/tcp VERITAS VIS1 +-veritas-vis1 2993/udp VERITAS VIS1 +-veritas-vis2 2994/tcp VERITAS VIS2 +-veritas-vis2 2994/udp VERITAS VIS2 +-# Dinkar Chivaluri <dinkar&veritas.com> +-idrs 2995/tcp IDRS +-idrs 2995/udp IDRS +-# Jeff Eaton <jeaton&intermec.com> +-vsixml 2996/tcp vsixml +-vsixml 2996/udp vsixml +-# Rob Juergens <robj&vsi.com> +-rebol 2997/tcp REBOL +-rebol 2997/udp REBOL +-# Holger Kruse <holger&rebol.net> +-realsecure 2998/tcp Real Secure +-realsecure 2998/udp Real Secure +-# Wes Wilson <wwilson&iss.net> +-remoteware-un 2999/tcp RemoteWare Unassigned +-remoteware-un 2999/udp RemoteWare Unassigned +-# Tim Farley <Tim.Farley&xcellenet.com> +-hbci 3000/tcp HBCI +-hbci 3000/udp HBCI +-# Kurt Haubner <haubner&ibm.net> +-# The following entry records an unassigned but widespread use +-remoteware-cl 3000/tcp RemoteWare Client +-remoteware-cl 3000/udp RemoteWare Client +-# Tim Farley <Tim.Farley&xcellenet.com> +-# 3001 Unassigned (Removed 2006-05-25) +-exlm-agent 3002/tcp EXLM Agent +-exlm-agent 3002/udp EXLM Agent +-# Randy Martin <exlmoc&clemson.edu> +-# The following entry records an unassigned but widespread use +-remoteware-srv 3002/tcp RemoteWare Server +-remoteware-srv 3002/udp RemoteWare Server +-# Tim Farley <Tim.Farley&xcellenet.com> +-cgms 3003/tcp CGMS +-cgms 3003/udp CGMS +-# Jim Mazzonna <jmazzonna&tiscom.uscg.mil> +-csoftragent 3004/tcp Csoft Agent +-csoftragent 3004/udp Csoft Agent +-# Nedelcho Stanev <decho&csoft.bg> +-geniuslm 3005/tcp Genius License Manager +-geniuslm 3005/udp Genius License Manager +-# Jakob Spies <Jakob.Spies&genius.de> +-ii-admin 3006/tcp Instant Internet Admin +-ii-admin 3006/udp Instant Internet Admin +-# Lewis Donzis <ldonzis&nortelnetworks.com> +-lotusmtap 3007/tcp Lotus Mail Tracking Agent Protocol +-lotusmtap 3007/udp Lotus Mail Tracking Agent Protocol +-# Ken Lin <klin&us.ibm.com> +-midnight-tech 3008/tcp Midnight Technologies +-midnight-tech 3008/udp Midnight Technologies +-# Kyle Unice <kyle&midnighttech.com> +-pxc-ntfy 3009/tcp PXC-NTFY +-pxc-ntfy 3009/udp PXC-NTFY +-# Takeshi Nishizawa <takeshi&cp10.es.xerox.com> +-gw 3010/tcp Telerate Workstation +-ping-pong 3010/udp Telerate Workstation +-# Timo Sivonen <timo.sivonen&ccmail.dowjones.com> +-trusted-web 3011/tcp Trusted Web +-trusted-web 3011/udp Trusted Web +-twsdss 3012/tcp Trusted Web Client +-twsdss 3012/udp Trusted Web Client +-# Alex Duncan <alex.duncan&sse.ie> +-gilatskysurfer 3013/tcp Gilat Sky Surfer +-gilatskysurfer 3013/udp Gilat Sky Surfer +-# Yossi Gal <yossi&gilat.com> +-broker_service 3014/tcp Broker Service +-broker_service 3014/udp Broker Service +-# Dale Bethers <dbethers&novell.com> +-nati-dstp 3015/tcp NATI DSTP +-nati-dstp 3015/udp NATI DSTP +-# Paul Austin <paul.austin&natinst.com> +-notify_srvr 3016/tcp Notify Server +-notify_srvr 3016/udp Notify Server +-# Hugo Parra <hparra&novell.com> +-event_listener 3017/tcp Event Listener +-event_listener 3017/udp Event Listener +-# Ted Tronson <ttronson&novell.com> +-srvc_registry 3018/tcp Service Registry +-srvc_registry 3018/udp Service Registry +-# Mark Killgore <MKillgore&novell.com> +-resource_mgr 3019/tcp Resource Manager +-resource_mgr 3019/udp Resource Manager +-# Gary Glover <gglover&novell.com> +-cifs 3020/tcp CIFS +-cifs 3020/udp CIFS +-# Paul Leach <paulleµsoft.com> +-agriserver 3021/tcp AGRI Server +-agriserver 3021/udp AGRI Server +-# Frank Neulichedl <frank&websmile.com> +-csregagent 3022/tcp CSREGAGENT +-csregagent 3022/udp CSREGAGENT +-# Nedelcho Stanev <nstanev&csoft.bg> +-magicnotes 3023/tcp magicnotes +-magicnotes 3023/udp magicnotes +-# Karl Edwall <karl&magicnotes.com> +-nds_sso 3024/tcp NDS_SSO +-nds_sso 3024/udp NDS_SSO +-# Mel Oyler <mel&novell.com> +-arepa-raft 3025/tcp Arepa Raft +-arepa-raft 3025/udp Arepa Raft +-# Stuart Schaefer <sschaefer&softricity.com> +-agri-gateway 3026/tcp AGRI Gateway +-agri-gateway 3026/udp AGRI Gateway +-# Agri Datalog <contact&agri-datalog.com> +-LiebDevMgmt_C 3027/tcp LiebDevMgmt_C +-LiebDevMgmt_C 3027/udp LiebDevMgmt_C +-LiebDevMgmt_DM 3028/tcp LiebDevMgmt_DM +-LiebDevMgmt_DM 3028/udp LiebDevMgmt_DM +-LiebDevMgmt_A 3029/tcp LiebDevMgmt_A +-LiebDevMgmt_A 3029/udp LiebDevMgmt_A +-# Mike Velten <Mike_Velten&Liebert.com> +-arepa-cas 3030/tcp Arepa Cas +-arepa-cas 3030/udp Arepa Cas +-# Stuart Schaefer <sschaefer&softricity.com> +-eppc 3031/tcp Remote AppleEvents/PPC Toolbox +-eppc 3031/udp Remote AppleEvents/PPC Toolbox +-# Steve Zellers <zellers&apple.com> +-redwood-chat 3032/tcp Redwood Chat +-redwood-chat 3032/udp Redwood Chat +-# Songwon Chi <swchi&daou.co.kr> +-pdb 3033/tcp PDB +-pdb 3033/udp PDB +-# Don Bowman <don&pixstream.com> +-osmosis-aeea 3034/tcp Osmosis / Helix (R) AEEA Port +-osmosis-aeea 3034/udp Osmosis / Helix (R) AEEA Port +-# Larry Atkin <latkin&commongrnd.com> +-fjsv-gssagt 3035/tcp FJSV gssagt +-fjsv-gssagt 3035/udp FJSV gssagt +-# Tomoji Koike <koike&ael.fujitsu.co.jp> +-hagel-dump 3036/tcp Hagel DUMP +-hagel-dump 3036/udp Hagel DUMP +-# Haim Gelfenbeyn <haim&hageltech.com> +-hp-san-mgmt 3037/tcp HP SAN Mgmt +-hp-san-mgmt 3037/udp HP SAN Mgmt +-# Steve Britt <steve_britt&hp.com> +-santak-ups 3038/tcp Santak UPS +-santak-ups 3038/udp Santak UPS +-# Tom Liu <ssc&sc.stk.com.cn> +-cogitate 3039/tcp Cogitate, Inc. +-cogitate 3039/udp Cogitate, Inc. +-# Jim Harlan <jimh&infowest.com> +-tomato-springs 3040/tcp Tomato Springs +-tomato-springs 3040/udp Tomato Springs +-# Jack Waller III <jack&tomatosprings.com> +-di-traceware 3041/tcp di-traceware +-di-traceware 3041/udp di-traceware +-# Carlos Hung <chung&digisle.net> +-journee 3042/tcp journee +-journee 3042/udp journee +-# Kevin Calman <postmaster&journee.com> +-brp 3043/tcp Broadcast Routing Protocol +-brp 3043/udp Broadcast Routing Protocol +-# John Border <border&hns.com> +-epp 3044/tcp EndPoint Protocol +-epp 3044/udp EndPoint Protocol +-# Stephen Cipolli <scipolli&radvision.com> +-responsenet 3045/tcp ResponseNet +-responsenet 3045/udp ResponseNet +-# Chul Yoon <cyoon&responsenetworks.com> +-di-ase 3046/tcp di-ase +-di-ase 3046/udp di-ase +-# Carlos Hung <chung&digisle.net> +-hlserver 3047/tcp Fast Security HL Server +-hlserver 3047/udp Fast Security HL Server +-# Michael Zunke <mzunke&fast-ag.de> +-pctrader 3048/tcp Sierra Net PC Trader +-pctrader 3048/udp Sierra Net PC Trader +-# Chris Hahn <chrish&sierra.net> +-nsws 3049/tcp NSWS +-nsws 3049/udp NSWS +-# Ray Gwinn <p00321&psilink.com> +-gds_db 3050/tcp gds_db +-gds_db 3050/udp gds_db +-# Madhukar N. Thakur <mthakur&interbase.com> +-galaxy-server 3051/tcp Galaxy Server +-galaxy-server 3051/udp Galaxy Server +-# Michael Andre <mandre>s-tkts.com> +-apc-3052 3052/tcp APC 3052 +-apc-3052 3052/udp APC 3052 +-# American Power Conversion <ports&apcc.com> +-dsom-server 3053/tcp dsom-server +-dsom-server 3053/udp dsom-server +-# Daniel Sisk <daniel.sisk&pnl.gov> +-amt-cnf-prot 3054/tcp AMT CNF PROT +-amt-cnf-prot 3054/udp AMT CNF PROT +-# Marco Marcucci <mmarcucci.amtec&interbusiness.it> +-policyserver 3055/tcp Policy Server +-policyserver 3055/udp Policy Server +-# Mark Garti <mgarti&sonusnet.com> +-cdl-server 3056/tcp CDL Server +-cdl-server 3056/udp CDL Server +-# Paul Roberts <PaulRoberts&engineer.com> +-goahead-fldup 3057/tcp GoAhead FldUp +-goahead-fldup 3057/udp GoAhead FldUp +-# Alan Pickrell <alanp&goahead.com> +-videobeans 3058/tcp videobeans +-videobeans 3058/udp videobeans +-# Hiroyuki Takahashi <hiro.takahashi&eng.Sun.COM> +-qsoft 3059/tcp qsoft +-qsoft 3059/udp qsoft +-# James Kunz <jkunz&earlhaig.com> +-interserver 3060/tcp interserver +-interserver 3060/udp interserver +-# Madhukar N. Thakur <mthakur&interbase.com> +-cautcpd 3061/tcp cautcpd +-cautcpd 3061/udp cautcpd +-ncacn-ip-tcp 3062/tcp ncacn-ip-tcp +-ncacn-ip-tcp 3062/udp ncacn-ip-tcp +-ncadg-ip-udp 3063/tcp ncadg-ip-udp +-ncadg-ip-udp 3063/udp ncadg-ip-udp +-# Gabi Kalmar <kalga01&cai.com> +-rprt 3064/tcp Remote Port Redirector +-rprt 3064/udp Remote Port Redirector +-# Robin Johnston <robinj&learningtree.com> +-slinterbase 3065/tcp slinterbase +-slinterbase 3065/udp slinterbase +-# Bie Tie <stie&interbase.com> +-netattachsdmp 3066/tcp NETATTACHSDMP +-netattachsdmp 3066/udp NETATTACHSDMP +-# Mike Young <myong&netattach.com> +-fjhpjp 3067/tcp FJHPJP +-fjhpjp 3067/udp FJHPJP +-# Ryozo Furutani <furutani&np.lps.cs.fujitsu.co.jp> +-ls3bcast 3068/tcp ls3 Broadcast +-ls3bcast 3068/udp ls3 Broadcast +-ls3 3069/tcp ls3 +-ls3 3069/udp ls3 +-# Jim Thompson <jim.thompson&powerware.com> +-mgxswitch 3070/tcp MGXSWITCH +-mgxswitch 3070/udp MGXSWITCH +-# George Walter <george.walter&ascentialsoftware.com> +-csd-mgmt-port 3071/tcp ContinuStor Manager Port +-csd-mgmt-port 3071/udp ContinuStor Manager Port +-csd-monitor 3072/tcp ContinuStor Monitor Port +-csd-monitor 3072/udp ContinuStor Monitor Port +-# Ray Jantz <ray.jantz&lsil.com> +-vcrp 3073/tcp Very simple chatroom prot +-vcrp 3073/udp Very simple chatroom prot +-# Andreas Wurf <a.wurf&mediaTools.de> +-xbox 3074/tcp Xbox game port +-xbox 3074/udp Xbox game port +-# Damon Danieli <damondµsoft.com> +-orbix-locator 3075/tcp Orbix 2000 Locator +-orbix-locator 3075/udp Orbix 2000 Locator +-orbix-config 3076/tcp Orbix 2000 Config +-orbix-config 3076/udp Orbix 2000 Config +-orbix-loc-ssl 3077/tcp Orbix 2000 Locator SSL +-orbix-loc-ssl 3077/udp Orbix 2000 Locator SSL +-orbix-cfg-ssl 3078/tcp Orbix 2000 Locator SSL +-orbix-cfg-ssl 3078/udp Orbix 2000 Locator SSL +-# Eric Newcomer <eric.newcomer&iona.com> +-lv-frontpanel 3079/tcp LV Front Panel +-lv-frontpanel 3079/udp LV Front Panel +-# Darshan Shah <darshan.shah&ni.com> +-stm_pproc 3080/tcp stm_pproc +-stm_pproc 3080/udp stm_pproc +-# Paul McGinnis <pmcginnis&server.stmi.com> +-tl1-lv 3081/tcp TL1-LV +-tl1-lv 3081/udp TL1-LV +-tl1-raw 3082/tcp TL1-RAW +-tl1-raw 3082/udp TL1-RAW +-tl1-telnet 3083/tcp TL1-TELNET +-tl1-telnet 3083/udp TL1-TELNET +-# SONET Internetworking Forum (SIF) +-# <bwarijsman&lucent.com> - SONET Contact +-itm-mccs 3084/tcp ITM-MCCS +-itm-mccs 3084/udp ITM-MCCS +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-pcihreq 3085/tcp PCIHReq +-pcihreq 3085/udp PCIHReq +-# Paul Sanders <p.sanders&dial.pipex.com> +-jdl-dbkitchen 3086/tcp JDL-DBKitchen +-jdl-dbkitchen 3086/udp JDL-DBKitchen +-# Hideo Wakabayashi <hiwaka&alles.or.jp> +-asoki-sma 3087/tcp Asoki SMA +-asoki-sma 3087/udp Asoki SMA +-# Andrew Mossberg <amossberg&asoki.net> +-xdtp 3088/tcp eXtensible Data Transfer Protocol +-xdtp 3088/udp eXtensible Data Transfer Protocol +-# Michael Shearson <mshearson&peerglobal.com> +-ptk-alink 3089/tcp ParaTek Agent Linking +-ptk-alink 3089/udp ParaTek Agent Linking +-# Robert Hodgson <robert¶tek.co.uk> +-stss 3090/tcp Senforce Session Services +-stss 3090/udp Senforce Session Services +-# Peter Boucher <pboucher&senforce.com> +-1ci-smcs 3091/tcp 1Ci Server Management +-1ci-smcs 3091/udp 1Ci Server Management +-# Ralf Bensmann <iana&1ci.de> +-njfss 3092/tcp Netware sync services +-njfss 3092/udp Netware sync services +-# Gordon Ross <G.Ross&ccw.gov.uk> +-rapidmq-center 3093/tcp Jiiva RapidMQ Center +-rapidmq-center 3093/udp Jiiva RapidMQ Center +-rapidmq-reg 3094/tcp Jiiva RapidMQ Registry +-rapidmq-reg 3094/udp Jiiva RapidMQ Registry +-# Mark Ericksen <mark&jiiva.com> +-panasas 3095/tcp Panasas rendevous port +-panasas 3095/udp Panasas rendevous port +-# Peter Berger <peterb&panasas.com> +-ndl-aps 3096/tcp Active Print Server Port +-ndl-aps 3096/udp Active Print Server Port +-# Martin Norman <martin&ndl.co.uk> +-# 3097/tcp Reserved +-# 3097/udp Reserved +-itu-bicc-stc 3097/sctp ITU-T Q.1902.1/Q.2150.3 +-# Greg Sidebottom <gregside&home.com> +-umm-port 3098/tcp Universal Message Manager +-umm-port 3098/udp Universal Message Manager +-# Phil Braham <phil&braham.net> +-chmd 3099/tcp CHIPSY Machine Daemon +-chmd 3099/udp CHIPSY Machine Daemon +-# Trond B¯rsting <Trond.Borsting&snota.no> +-opcon-xps 3100/tcp OpCon/xps +-opcon-xps 3100/udp OpCon/xps +-# David Bourland <DBourland&smausa.com> +-hp-pxpib 3101/tcp HP PolicyXpert PIB Server +-hp-pxpib 3101/udp HP PolicyXpert PIB Server +-# Brian O'Keefe <bokeefe&cnd.hp.com> +-slslavemon 3102/tcp SoftlinK Slave Mon Port +-slslavemon 3102/udp SoftlinK Slave Mon Port +-# Moshe Livne <moshe&softlinkusa.com> +-autocuesmi 3103/tcp Autocue SMI Protocol +-autocuesmi 3103/udp Autocue SMI Protocol +-autocuelog 3104/tcp Autocue Logger Protocol +-autocuetime 3104/udp Autocue Time Service +-# Geoff Back <geoff&autocue.co.uk> +-cardbox 3105/tcp Cardbox +-cardbox 3105/udp Cardbox +-cardbox-http 3106/tcp Cardbox HTTP +-cardbox-http 3106/udp Cardbox HTTP +-# Martin Kochanski <martin&cardbox.co.uk> +-business 3107/tcp Business protocol +-business 3107/udp Business protocol +-geolocate 3108/tcp Geolocate protocol +-geolocate 3108/udp Geolocate protocol +-personnel 3109/tcp Personnel protocol +-personnel 3109/udp Personnel protocol +-# William Randolph Royere III +-# <william&royere.net> +-sim-control 3110/tcp simulator control port +-sim-control 3110/udp simulator control port +-# Ian Bell <ianb&arca-technologies.com> +-wsynch 3111/tcp Web Synchronous Services +-wsynch 3111/udp Web Synchronous Services +-# Valery Fremaux <vf&eisti.fr> +-ksysguard 3112/tcp KDE System Guard +-ksysguard 3112/udp KDE System Guard +-# Chris Schlaeger <cs&kde.org> +-cs-auth-svr 3113/tcp CS-Authenticate Svr Port +-cs-auth-svr 3113/udp CS-Authenticate Svr Port +-# Cliff Diamond <cdiamond&crypto-solutions.co.uk> +-# Andy Georgiou <ageorgiou&crypto-solutions.co.uk> +-ccmad 3114/tcp CCM AutoDiscover +-ccmad 3114/udp CCM AutoDiscover +-# Ram Sudama <rsudama&on.com> +-mctet-master 3115/tcp MCTET Master +-mctet-master 3115/udp MCTET Master +-mctet-gateway 3116/tcp MCTET Gateway +-mctet-gateway 3116/udp MCTET Gateway +-mctet-jserv 3117/tcp MCTET Jserv +-mctet-jserv 3117/udp MCTET Jserv +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-pkagent 3118/tcp PKAgent +-pkagent 3118/udp PKAgent +-# Michael Douglass <mikedoug&datafoundry.net> +-d2000kernel 3119/tcp D2000 Kernel Port +-d2000kernel 3119/udp D2000 Kernel Port +-d2000webserver 3120/tcp D2000 Webserver Port +-d2000webserver 3120/udp D2000 Webserver Port +-# Tomas Rajcan <trajcan&ipesoft.sk> +-# 3121 Unassigned (Removed 2003-09-17) +-vtr-emulator 3122/tcp MTI VTR Emulator port +-vtr-emulator 3122/udp MTI VTR Emulator port +-# John Mertus <mertus&mathtech.com> +-edix 3123/tcp EDI Translation Protocol +-edix 3123/udp EDI Translation Protocol +-# William Randolph Royere III <william&royere.net> +-beacon-port 3124/tcp Beacon Port +-beacon-port 3124/udp Beacon Port +-# James Paul Duncan <pduncan&beaconcrm.com> +-a13-an 3125/tcp A13-AN Interface +-a13-an 3125/udp A13-AN Interface +-# Douglas Knisely <dnk&lucent.com> +-# 3126 Unassigned (Removed 2007-10-04) +-ctx-bridge 3127/tcp CTX Bridge Port +-ctx-bridge 3127/udp CTX Bridge Port +-# Alexander Dubrovsky <dubrovsky_alex&emc.com> +-ndl-aas 3128/tcp Active API Server Port +-ndl-aas 3128/udp Active API Server Port +-# Martin Norman <martin&ndl.co.uk> +-netport-id 3129/tcp NetPort Discovery Port +-netport-id 3129/udp NetPort Discovery Port +-# P.T.K. Farrar <farrarp&teccon.co.uk> +-icpv2 3130/tcp ICPv2 +-icpv2 3130/udp ICPv2 +-# Duane Wessels <wessels&nlanr.net> +-netbookmark 3131/tcp Net Book Mark +-netbookmark 3131/udp Net Book Mark +-# Yiftach Ravid <yiftach&haifa.vnet.ibm.com> +-ms-rule-engine 3132/tcp Microsoft Business Rule Engine Update Service +-ms-rule-engine 3132/udp Microsoft Business Rule Engine Update Service +-# Anush Kumar <anushkµsoft.com> +-prism-deploy 3133/tcp Prism Deploy User Port +-prism-deploy 3133/udp Prism Deploy User Port +-# Joan Linck <jlinck&lanovation.com> +-ecp 3134/tcp Extensible Code Protocol +-ecp 3134/udp Extensible Code Protocol +-# Jim Trek <jtrek&rochester.rr.com> +-# Mark Bocko <bocko&ece.rochester.edu> +-peerbook-port 3135/tcp PeerBook Port +-peerbook-port 3135/udp PeerBook Port +-# John Flowers <jf&gigamediaaccess.com> +-grubd 3136/tcp Grub Server Port +-grubd 3136/udp Grub Server Port +-# Kord Campbell <kord&grub.org> +-rtnt-1 3137/tcp rtnt-1 data packets +-rtnt-1 3137/udp rtnt-1 data packets +-rtnt-2 3138/tcp rtnt-2 data packets +-rtnt-2 3138/udp rtnt-2 data packets +-# Ron Muellerschoen <rjm&cobra.jpl.nasa.gov> +-incognitorv 3139/tcp Incognito Rendez-Vous +-incognitorv 3139/udp Incognito Rendez-Vous +-# Stephane Bourque <stephb&incognito.com> +-ariliamulti 3140/tcp Arilia Multiplexor +-ariliamulti 3140/udp Arilia Multiplexor +-# Stephane Bourque <sbourque&arilia.com> +-vmodem 3141/tcp VMODEM +-vmodem 3141/udp VMODEM +-# Ray Gwinn <p00321&psilink.com> +-rdc-wh-eos 3142/tcp RDC WH EOS +-rdc-wh-eos 3142/udp RDC WH EOS +-# Udi Nir <udi_nir&ncc.co.il> +-seaview 3143/tcp Sea View +-seaview 3143/udp Sea View +-# Jim Flaherty <jim_e_flaherty¬es.seagate.com> +-tarantella 3144/tcp Tarantella +-tarantella 3144/udp Tarantella +-# Roger Binns <rogerb&sco.com> +-csi-lfap 3145/tcp CSI-LFAP +-csi-lfap 3145/udp CSI-LFAP +-# Paul Amsden <amsden@.ctron.com> +-bears-02 3146/tcp bears-02 +-bears-02 3146/udp bears-02 +-# Bruce McKinnon <brucemck&bearsolutions.com.au> +-rfio 3147/tcp RFIO +-rfio 3147/udp RFIO +-# Frederic Hemmer <Frederic.Hemmer&cern.ch> +-nm-game-admin 3148/tcp NetMike Game Administrator +-nm-game-admin 3148/udp NetMike Game Administrator +-nm-game-server 3149/tcp NetMike Game Server +-nm-game-server 3149/udp NetMike Game Server +-nm-asses-admin 3150/tcp NetMike Assessor Administrator +-nm-asses-admin 3150/udp NetMike Assessor Administrator +-nm-assessor 3151/tcp NetMike Assessor +-nm-assessor 3151/udp NetMike Assessor +-# Andrew Sharpe <help&smartsims.com> +-feitianrockey 3152/tcp FeiTian Port +-feitianrockey 3152/udp FeiTian Port +-# Huang Yu <llw&ftsafe.com> +-s8-client-port 3153/tcp S8Cargo Client Port +-s8-client-port 3153/udp S8Cargo Client Port +-# Jon S. Kyle <JKyle&SpeedwaySoftware.com> +-ccmrmi 3154/tcp ON RMI Registry +-ccmrmi 3154/udp ON RMI Registry +-# Ram Sudama <rsudama&on.com> +-jpegmpeg 3155/tcp JpegMpeg Port +-jpegmpeg 3155/udp JpegMpeg Port +-# Richard Bassous <rbassous&yahoo.com> +-indura 3156/tcp Indura Collector +-indura 3156/udp Indura Collector +-# Bruce Kosbab <bruce.kosbab&indurasoft.com> +-e3consultants 3157/tcp CCC Listener Port +-e3consultants 3157/udp CCC Listener Port +-# Brian Carnell <brian&e3consultants.com> +-stvp 3158/tcp SmashTV Protocol +-stvp 3158/udp SmashTV Protocol +-# Christian Wolff <stvp&smash.tv> +-navegaweb-port 3159/tcp NavegaWeb Tarification +-navegaweb-port 3159/udp NavegaWeb Tarification +-# Miguel Angel Fernandez <mafg&tid.es> +-tip-app-server 3160/tcp TIP Application Server +-tip-app-server 3160/udp TIP Application Server +-# Olivier Mascia <om&tipgroup.com> +-doc1lm 3161/tcp DOC1 License Manager +-doc1lm 3161/udp DOC1 License Manager +-# Greg Goodson <ggoodson&group1software.co.uk> +-sflm 3162/tcp SFLM +-sflm 3162/udp SFLM +-# System Administrator <sysadmin&silvaco.com> +-res-sap 3163/tcp RES-SAP +-res-sap 3163/udp RES-SAP +-# Bob Janssen <bob&res.nl> +-imprs 3164/tcp IMPRS +-imprs 3164/udp IMPRS +-# Lars Bohn <Lars.Bohn&nokia.com> +-newgenpay 3165/tcp Newgenpay Engine Service +-newgenpay 3165/udp Newgenpay Engine Service +-# Ilan Zisser <ilan&newgenpay.com> +-qrepos 3166/tcp Quest Repository +-qrepos 3166/udp Quest Repository +-# Fred Surr <quest_iana&oz.quest.com> +-nowcontact 3167/tcp Now Contact Public Server +-nowcontact 3167/udp Now Contact Public Server +-poweronnud 3168/tcp Now Up-to-Date Public Server +-poweronnud 3168/udp Now Up-to-Date Public Server +-# John Wallace <john&nowsoftware.com> +-serverview-as 3169/tcp SERVERVIEW-AS +-serverview-as 3169/udp SERVERVIEW-AS +-serverview-asn 3170/tcp SERVERVIEW-ASN +-serverview-asn 3170/udp SERVERVIEW-ASN +-serverview-gf 3171/tcp SERVERVIEW-GF +-serverview-gf 3171/udp SERVERVIEW-GF +-serverview-rm 3172/tcp SERVERVIEW-RM +-serverview-rm 3172/udp SERVERVIEW-RM +-serverview-icc 3173/tcp SERVERVIEW-ICC +-serverview-icc 3173/udp SERVERVIEW-ICC +-# Guenther Kroenert +-# <Guenther.Kroenert&fujitsu-siemens.com> +-armi-server 3174/tcp ARMI Server +-armi-server 3174/udp ARMI Server +-# Bobby Martin <bobbymartin&hotmail.com> +-t1-e1-over-ip 3175/tcp T1_E1_Over_IP +-t1-e1-over-ip 3175/udp T1_E1_Over_IP +-# Mark Doyle <mark&engagecom.com> +-ars-master 3176/tcp ARS Master +-ars-master 3176/udp ARS Master +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-phonex-port 3177/tcp Phonex Protocol +-phonex-port 3177/udp Phonex Protocol +-# Doug Grover <dgrover&phonex.com> +-radclientport 3178/tcp Radiance UltraEdge Port +-radclientport 3178/udp Radiance UltraEdge Port +-# Sri Subramaniam <sri&radiance.com> +-h2gf-w-2m 3179/tcp H2GF W.2m Handover prot. +-h2gf-w-2m 3179/udp H2GF W.2m Handover prot. +-# Arne Norefors <Arne.Norefors&ericsson.com> +-mc-brk-srv 3180/tcp Millicent Broker Server +-mc-brk-srv 3180/udp Millicent Broker Server +-# Steve Glassman <steveg&pa.dec.com> +-bmcpatrolagent 3181/tcp BMC Patrol Agent +-bmcpatrolagent 3181/udp BMC Patrol Agent +-bmcpatrolrnvu 3182/tcp BMC Patrol Rendezvous +-bmcpatrolrnvu 3182/udp BMC Patrol Rendezvous +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-cops-tls 3183/tcp COPS/TLS +-cops-tls 3183/udp COPS/TLS +-# Mark Stevens <mstevens&ellacoya.com> +-apogeex-port 3184/tcp ApogeeX Port +-apogeex-port 3184/udp ApogeeX Port +-# Tom Nys <tom.nys.tn&belgium.agfa.com> +-smpppd 3185/tcp SuSE Meta PPPD +-smpppd 3185/udp SuSE Meta PPPD +-# Arvin Schnell <arvin&suse.de> +-iiw-port 3186/tcp IIW Monitor User Port +-iiw-port 3186/udp IIW Monitor User Port +-# Corey Burnett <corey.burnett&biopop.com> +-odi-port 3187/tcp Open Design Listen Port +-odi-port 3187/udp Open Design Listen Port +-# Phivos Aristides <phivos&opendesign.com> +-brcm-comm-port 3188/tcp Broadcom Port +-brcm-comm-port 3188/udp Broadcom Port +-# Thomas L. Johnson <tjohnson&broadcom.com> +-pcle-infex 3189/tcp Pinnacle Sys InfEx Port +-pcle-infex 3189/udp Pinnacle Sys InfEx Port +-# Anthon van der Neut <anthon&mnt.org> +-csvr-proxy 3190/tcp ConServR Proxy +-csvr-proxy 3190/udp ConServR Proxy +-csvr-sslproxy 3191/tcp ConServR SSL Proxy +-csvr-sslproxy 3191/udp ConServR SSL Proxy +-# Mikhail Kruk <mkruk&biscom.com> +-firemonrcc 3192/tcp FireMon Revision Control +-firemonrcc 3192/udp FireMon Revision Control +-# Michael Bishop <mbishop&fishnetsecurity.com> +-spandataport 3193/tcp SpanDataPort +-spandataport 3193/udp SpanDataPort +-# Jesse McKay <jesse&spandata.com> +-magbind 3194/tcp Rockstorm MAG protocol +-magbind 3194/udp Rockstorm MAG protocol +-# Jens Nilsson <jens&rockstorm.se> +-ncu-1 3195/tcp Network Control Unit +-ncu-1 3195/udp Network Control Unit +-ncu-2 3196/tcp Network Control Unit +-ncu-2 3196/udp Network Control Unit +-# Charlie Hundre <charlie&rdsrv.reco.com.tw> +-embrace-dp-s 3197/tcp Embrace Device Protocol Server +-embrace-dp-s 3197/udp Embrace Device Protocol Server +-embrace-dp-c 3198/tcp Embrace Device Protocol Client +-embrace-dp-c 3198/udp Embrace Device Protocol Client +-# Elliot Schwartz <elliot&mit.edu> +-dmod-workspace 3199/tcp DMOD WorkSpace +-dmod-workspace 3199/udp DMOD WorkSpace +-# Nick Plante <nplante&dmod.com> +-tick-port 3200/tcp Press-sense Tick Port +-tick-port 3200/udp Press-sense Tick Port +-# Boris Svetlitsky <boris&press-sense.com> +-cpq-tasksmart 3201/tcp CPQ-TaskSmart +-cpq-tasksmart 3201/udp CPQ-TaskSmart +-# Jackie Lau <jackie.lau&compaq.com> +-intraintra 3202/tcp IntraIntra +-intraintra 3202/udp IntraIntra +-# Matthew Asham <matthewa&bcwireless.net> +-netwatcher-mon 3203/tcp Network Watcher Monitor +-netwatcher-mon 3203/udp Network Watcher Monitor +-netwatcher-db 3204/tcp Network Watcher DB Access +-netwatcher-db 3204/udp Network Watcher DB Access +-# Hirokazu Fujisawa <fujisawa&pfu.fujitsu.com> +-isns 3205/tcp iSNS Server Port +-isns 3205/udp iSNS Server Port +-# [RFC4171] +-ironmail 3206/tcp IronMail POP Proxy +-ironmail 3206/udp IronMail POP Proxy +-# Mike Hudack <mike&mhudack.com> +-vx-auth-port 3207/tcp Veritas Authentication Port +-vx-auth-port 3207/udp Veritas Authentication Port +-# Senthil Ponnuswamy <senthil&veritas.com> +-pfu-prcallback 3208/tcp PFU PR Callback +-pfu-prcallback 3208/udp PFU PR Callback +-# Tetsuharu Hanada <hanada&pfu.fujitsu.com> +-netwkpathengine 3209/tcp HP OpenView Network Path Engine Server +-netwkpathengine 3209/udp HP OpenView Network Path Engine Server +-# Anthony Walker <anthony_walker&hp.com> +-flamenco-proxy 3210/tcp Flamenco Networks Proxy +-flamenco-proxy 3210/udp Flamenco Networks Proxy +-# Corey Corrick <corey.corrick&flamenconetworks.com> +-avsecuremgmt 3211/tcp Avocent Secure Management +-avsecuremgmt 3211/udp Avocent Secure Management +-# Brian S. Stewart <Brian.Stewart&Avocent.com> +-surveyinst 3212/tcp Survey Instrument +-surveyinst 3212/udp Survey Instrument +-# Al Amet <aamet&point-inc.com> +-neon24x7 3213/tcp NEON 24X7 Mission Control +-neon24x7 3213/udp NEON 24X7 Mission Control +-# Tony Lubrano <tlubrano&neonsys.com> +-jmq-daemon-1 3214/tcp JMQ Daemon Port 1 +-jmq-daemon-1 3214/udp JMQ Daemon Port 1 +-jmq-daemon-2 3215/tcp JMQ Daemon Port 2 +-jmq-daemon-2 3215/udp JMQ Daemon Port 2 +-# Martin West <Martin.West&spirit-soft.com> +-ferrari-foam 3216/tcp Ferrari electronic FOAM +-ferrari-foam 3216/udp Ferrari electronic FOAM +-# Johann Deutinger <deutinger&ferrari-electronic.de> +-unite 3217/tcp Unified IP & Telecomm Env +-unite 3217/udp Unified IP & Telecomm Env +-# Christer Gunnarsson +-# <christer.gunnarsson&ascomtateco.se> +-smartpackets 3218/tcp EMC SmartPackets +-smartpackets 3218/udp EMC SmartPackets +-# Steve Spataro <spataro_steve&emc.com> +-wms-messenger 3219/tcp WMS Messenger +-wms-messenger 3219/udp WMS Messenger +-# Michael Monasterio <michael&wmsoftware.com> +-xnm-ssl 3220/tcp XML NM over SSL +-xnm-ssl 3220/udp XML NM over SSL +-xnm-clear-text 3221/tcp XML NM over TCP +-xnm-clear-text 3221/udp XML NM over TCP +-# Mark Trostler <trostler&juniper.net> +-glbp 3222/tcp Gateway Load Balancing Pr +-glbp 3222/udp Gateway Load Balancing Pr +-# Douglas McLaggan <glbp-info&cisco.com> +-digivote 3223/tcp DIGIVOTE (R) Vote-Server +-digivote 3223/udp DIGIVOTE (R) Vote-Server +-# Christian Treczoks <ct&braehler.com> +-aes-discovery 3224/tcp AES Discovery Port +-aes-discovery 3224/udp AES Discovery Port +-# Ken Richard <kenr&aeseducation.com> +-fcip-port 3225/tcp FCIP +-fcip-port 3225/udp FCIP +-# RFC 3821 +-isi-irp 3226/tcp ISI Industry Software IRP +-isi-irp 3226/udp ISI Industry Software IRP +-# Peter Sandstrom <peter.sandstrom&tassen.fi> +-dwnmshttp 3227/tcp DiamondWave NMS Server +-dwnmshttp 3227/udp DiamondWave NMS Server +-dwmsgserver 3228/tcp DiamondWave MSG Server +-dwmsgserver 3228/udp DiamondWave MSG Server +-# Varma Bhupatiraju <varma&calient.net> +-global-cd-port 3229/tcp Global CD Port +-global-cd-port 3229/udp Global CD Port +-# Vitaly Revsin <vitaly&netapp.com> +-sftdst-port 3230/tcp Software Distributor Port +-sftdst-port 3230/udp Software Distributor Port +-# Andrea Lanza <andrea.lanza&frameweb.it> +-dsnl 3231/tcp Delta Solutions Direct +-dsnl 3231/udp Delta Solutions Direct +-# Peter Ijkhout <peter&deltasolutions.nl> +-mdtp 3232/tcp MDT port +-mdtp 3232/udp MDT port +-# IJsbrand Wijnands <ice&cisco.com> +-whisker 3233/tcp WhiskerControl main port +-whisker 3233/udp WhiskerControl main port +-# Rudolf Cardinal <rudolf&pobox.com> February 2002 +-alchemy 3234/tcp Alchemy Server +-alchemy 3234/udp Alchemy Server +-# Mikhail Belov <mikhail&imrgold.com> February 2002 +-mdap-port 3235/tcp MDAP port +-mdap-port 3235/udp MDAP Port +-# Johan Deleu <johan.deleu&alcatel.be> February 2002 +-apparenet-ts 3236/tcp appareNet Test Server +-apparenet-ts 3236/udp appareNet Test Server +-apparenet-tps 3237/tcp appareNet Test Packet Sequencer +-apparenet-tps 3237/udp appareNet Test Packet Sequencer +-apparenet-as 3238/tcp appareNet Analysis Server +-apparenet-as 3238/udp appareNet Analysis Server +-apparenet-ui 3239/tcp appareNet User Interface +-apparenet-ui 3239/udp appareNet User Interface +-# Fred Klassen <fklassen&jaalam.com> February 2002 +-triomotion 3240/tcp Trio Motion Control Port +-triomotion 3240/udp Trio Motion Control Port +-# Tony Matthews <tmatthews&triomotion.com> February 2002 +-sysorb 3241/tcp SysOrb Monitoring Server +-sysorb 3241/udp SysOrb Monitoring Server +-# Jakob Oestergaard <joe&sysorb.com> February 2002 +-sdp-id-port 3242/tcp Session Description ID +-sdp-id-port 3242/udp Session Description ID +-# Greg Rose <ggr&qualcomm.com> February 2002 +-timelot 3243/tcp Timelot Port +-timelot 3243/udp Timelot Port +-# David Ferguson <dferguson&xtralot.com> February 2002 +-onesaf 3244/tcp OneSAF +-onesaf 3244/udp OneSAF +-# Gene McCulley <mcculley&cuspy.com> February 2002 +-vieo-fe 3245/tcp VIEO Fabric Executive +-vieo-fe 3245/udp VIEO Fabric Executive +-# James Cox <jocox&view.com> February 2002 +-dvt-system 3246/tcp DVT SYSTEM PORT +-dvt-system 3246/udp DVT SYSTEM PORT +-dvt-data 3247/tcp DVT DATA LINK +-dvt-data 3247/udp DVT DATA LINK +-# Phillip Heil <phil.heil&dvtsensors.com> February 2002 +-procos-lm 3248/tcp PROCOS LM +-procos-lm 3248/udp PROCOS LM +-# Torsten Rendelmann +-# <torsten.rendelmann&procos.com> February 2002 +-ssp 3249/tcp State Sync Protocol +-ssp 3249/udp State Sync Protocol +-# Stephane Beaulieu <stephane&cisco.com> February 2002 +-hicp 3250/tcp HMS hicp port +-hicp 3250/udp HMS hicp port +-# Joel Palsson, HMS Industrial Networks AB +-# <ianacontact&hms.se> February 2002 +-sysscanner 3251/tcp Sys Scanner +-sysscanner 3251/udp Sys Scanner +-# Dick Georges <georges&monaco.net> February 2002 +-dhe 3252/tcp DHE port +-dhe 3252/udp DHE port +-# Fabrizio Massimo Ferrara <fmf&gesi.it> February 2002 +-pda-data 3253/tcp PDA Data +-pda-data 3253/udp PDA Data +-pda-sys 3254/tcp PDA System +-pda-sys 3254/udp PDA System +-# Jian Fan <fjian&dmfsys.com> February 2002 +-semaphore 3255/tcp Semaphore Connection Port +-semaphore 3255/udp Semaphore Connection Port +-# Jay Eckles <ecklesweb&yahoo.com> February 2002 +-cpqrpm-agent 3256/tcp Compaq RPM Agent Port +-cpqrpm-agent 3256/udp Compaq RPM Agent Port +-cpqrpm-server 3257/tcp Compaq RPM Server Port +-cpqrpm-server 3257/udp Compaq RPM Server Port +-# Royal King <royal.king&compaq.com> February 2002 +-ivecon-port 3258/tcp Ivecon Server Port +-ivecon-port 3258/udp Ivecon Server Port +-# Serguei Tevs <STevs&ivecon.com> February 2002 +-epncdp2 3259/tcp Epson Network Common Devi +-epncdp2 3259/udp Epson Network Common Devi +-# SEIKO EPSON Corporation - Oishi Toshiaki +-# <Oishi.Toshiaki&exc.epson.co.jp> February 2002 +-iscsi-target 3260/tcp iSCSI port +-iscsi-target 3260/udp iSCSI port +-# Julian Satran <Julian_Satran&il.ibm.com> +-winshadow 3261/tcp winShadow +-winshadow 3261/udp winShadow +-# Colin Barry <cbarry&gbahn.com> +-necp 3262/tcp NECP +-necp 3262/udp NECP +-# Alberto Cerpa <cerpa&isi.edu> +-ecolor-imager 3263/tcp E-Color Enterprise Imager +-ecolor-imager 3263/udp E-Color Enterprise Imager +-# Tamara Baker <tbaker&ecolor.com> +-ccmail 3264/tcp cc:mail/lotus +-ccmail 3264/udp cc:mail/lotus +-# <brockman&ccmail.com> +-altav-tunnel 3265/tcp Altav Tunnel +-altav-tunnel 3265/udp Altav Tunnel +-# Gary M. Allen <gallen&symantec.com> +-ns-cfg-server 3266/tcp NS CFG Server +-ns-cfg-server 3266/udp NS CFG Server +-# Aivi Lie <LIEA&netsoft.com> +-ibm-dial-out 3267/tcp IBM Dial Out +-ibm-dial-out 3267/udp IBM Dial Out +-# Skip Booth <sbooth&VNET.IBM.COM> +-msft-gc 3268/tcp Microsoft Global Catalog +-msft-gc 3268/udp Microsoft Global Catalog +-msft-gc-ssl 3269/tcp Microsoft Global Catalog with LDAP/SSL +-msft-gc-ssl 3269/udp Microsoft Global Catalog with LDAP/SSL +-# Asaf Kashi <asafkµsoft.com> +-verismart 3270/tcp Verismart +-verismart 3270/udp Verismart +-# Jay Weber <weber&vfi.com> +-csoft-prev 3271/tcp CSoft Prev Port +-csoft-prev 3271/udp CSoft Prev Port +-# Nedelcho Stanev <decho&iname.com> +-user-manager 3272/tcp Fujitsu User Manager +-user-manager 3272/udp Fujitsu User Manager +-# Yukihiko Sakurai <y-sakurai&ael.fujitsu.co.jp> +-sxmp 3273/tcp Simple Extensible Multiplexed Protocol +-sxmp 3273/udp Simple Extensible Multiplexed Protocol +-# admin <iana&sightlinesystems.com> +-ordinox-server 3274/tcp Ordinox Server +-ordinox-server 3274/udp Ordinox Server +-# Denis Ducharme <dducharme&softek.com> +-samd 3275/tcp SAMD +-samd 3275/udp SAMD +-# Edgar Circenis <ec&fc.hp.com> +-maxim-asics 3276/tcp Maxim ASICs +-maxim-asics 3276/udp Maxim ASICs +-# Dave Inman <davei&mxim.com> +-awg-proxy 3277/tcp AWG Proxy +-awg-proxy 3277/udp AWG Proxy +-# Alex McDonald <alexm&an.hp.com> +-lkcmserver 3278/tcp LKCM Server +-lkcmserver 3278/udp LKCM Server +-# Javier Jimenez +-admind 3279/tcp admind +-admind 3279/udp admind +-# Jeff Haynes <haynes&chistech.com> +-vs-server 3280/tcp VS Server +-vs-server 3280/udp VS Server +-# Scott Godlew <Scott&godlew.com> +-sysopt 3281/tcp SYSOPT +-sysopt 3281/udp SYSOPT +-# Tony Hoffman <ajh&unx.dec.com> +-datusorb 3282/tcp Datusorb +-datusorb 3282/udp Datusorb +-# Thomas Martin <thomas&datus-usa.com> +-net-assistant 3283/tcp Net Assistant +-net-assistant 3283/udp Net Assistant +-# Michael Stein <mvs&apple.com> +-4talk 3284/tcp 4Talk +-4talk 3284/udp 4Talk +-# Tony Bushnell <tony_bushnell&four-sight.co.uk> +-plato 3285/tcp Plato +-plato 3285/udp Plato +-# Jim Battin <battin&tro.com> +-e-net 3286/tcp E-Net +-e-net 3286/udp E-Net +-# Steven Grigsby <sgrigsby&austin.eent.com> +-directvdata 3287/tcp DIRECTVDATA +-directvdata 3287/udp DIRECTVDATA +-# Michael Friedman <mfr1&worldnet.att.net> +-cops 3288/tcp COPS +-cops 3288/udp COPS +-# Shai Herzog <herzog&iphighway.com> +-enpc 3289/tcp ENPC +-enpc 3289/udp ENPC +-# SEIKO EPSON <Ishida.Hitoshi&exc.epson.co.jp> +-caps-lm 3290/tcp CAPS LOGISTICS TOOLKIT - LM +-caps-lm 3290/udp CAPS LOGISTICS TOOLKIT - LM +-# Joseph Krebs <joek&caps.com> +-sah-lm 3291/tcp S A Holditch & Associates - LM +-sah-lm 3291/udp S A Holditch & Associates - LM +-# Randy Hudgens <rhh&nmail.holditch.com> +-cart-o-rama 3292/tcp Cart O Rama +-cart-o-rama 3292/udp Cart O Rama +-# Phillip Dillinger <Phillip.Dillinger&sealabs.com> +-fg-fps 3293/tcp fg-fps +-fg-fps 3293/udp fg-fps +-fg-gip 3294/tcp fg-gip +-fg-gip 3294/udp fg-gip +-# Jean-Marc Frailong <jmf&freegate.net> +-dyniplookup 3295/tcp Dynamic IP Lookup +-dyniplookup 3295/udp Dynamic IP Lookup +-# Eugene Osovetsky <eugeneo&geocities.com> +-rib-slm 3296/tcp Rib License Manager +-rib-slm 3296/udp Rib License Manager +-# Kristean Heisler <kh&rib.de> +-cytel-lm 3297/tcp Cytel License Manager +-cytel-lm 3297/udp Cytel License Manager +-# Yogesh P. Gajjar <yogesh&cytel.com> +-deskview 3298/tcp DeskView +-deskview 3298/udp DeskView +-# Manfred Randelzofer +-# <manfred.randelzofer&fujitsu-siemens.com> +-pdrncs 3299/tcp pdrncs +-pdrncs 3299/udp pdrncs +-# Paul Wissenbach <paulwi&vnd.tek.com> +-########### 3300-3301 Unauthorized Use by SAP R/3 ###### +-mcs-fastmail 3302/tcp MCS Fastmail +-mcs-fastmail 3302/udp MCS Fastmail +-# Patti Jo Newsom <pjn&mcsdallas.com> +-opsession-clnt 3303/tcp OP Session Client +-opsession-clnt 3303/udp OP Session Client +-opsession-srvr 3304/tcp OP Session Server +-opsession-srvr 3304/udp OP Session Server +-# Amir Blich <amir&netmanage.co.il> +-odette-ftp 3305/tcp ODETTE-FTP +-odette-ftp 3305/udp ODETTE-FTP +-# David Nash <dnash&ford.com> +-mysql 3306/tcp MySQL +-mysql 3306/udp MySQL +-# Monty <monty&analytikerna.se> +-opsession-prxy 3307/tcp OP Session Proxy +-opsession-prxy 3307/udp OP Session Proxy +-# Amir Blich <amir&netmanage.co.il> +-tns-server 3308/tcp TNS Server +-tns-server 3308/udp TNS Server +-tns-adv 3309/tcp TNS ADV +-tns-adv 3309/udp TNS ADV +-# Jerome Albin <albin&taec.enet.dec.com> +-dyna-access 3310/tcp Dyna Access +-dyna-access 3310/udp Dyna Access +-# Dave Belliveau +-# <DaveBelliveau&cornerstonesoftware.com> +-mcns-tel-ret 3311/tcp MCNS Tel Ret +-mcns-tel-ret 3311/udp MCNS Tel Ret +-# Randall Atkinson <rja&home.net> +-appman-server 3312/tcp Application Management Server +-appman-server 3312/udp Application Management Server +-uorb 3313/tcp Unify Object Broker +-uorb 3313/udp Unify Object Broker +-uohost 3314/tcp Unify Object Host +-uohost 3314/udp Unify Object Host +-# Duane Gibson <ianaportmaster&unify.com> +-cdid 3315/tcp CDID +-cdid 3315/udp CDID +-# Andrew Borisov <hdr&chat.ru> +-aicc-cmi 3316/tcp AICC/CMI +-aicc-cmi 3316/udp AICC/CMI +-# William McDonald <billmc&atc.boeing.com> +-vsaiport 3317/tcp VSAI PORT +-vsaiport 3317/udp VSAI PORT +-# Rieko Asai <asai&isl.mei.co.jp> +-ssrip 3318/tcp Swith to Swith Routing Information Protocol +-ssrip 3318/udp Swith to Swith Routing Information Protocol +-# Baba Hidekazu <baba&flare.nd.net.fujitsu.co.jp> +-sdt-lmd 3319/tcp SDT License Manager +-sdt-lmd 3319/udp SDT License Manager +-# Salvo Nassisi <sdtech&tin.it> +-officelink2000 3320/tcp Office Link 2000 +-officelink2000 3320/udp Office Link 2000 +-# Mike Balch <mbalch&teltone.com> +-vnsstr 3321/tcp VNSSTR +-vnsstr 3321/udp VNSSTR +-# Takeshi Ohmura <ohmura&isl.mei.co.jp> +-active-net 3322-3325 Active Networks +-# Bob Braden <braden&isi.edu> +-sftu 3326/tcp SFTU +-sftu 3326/udp SFTU +-# Eduardo Rosenberg de Moura <eduardor&spacenet.com.br> +-bbars 3327/tcp BBARS +-bbars 3327/udp BBARS +-# Lou Harris <lharris&outlx.bandl.com> +-egptlm 3328/tcp Eaglepoint License Manager +-egptlm 3328/udp Eaglepoint License Manager +-# Dave Benton <dave.benton&eaglepoint.com> +-hp-device-disc 3329/tcp HP Device Disc +-hp-device-disc 3329/udp HP Device Disc +-# Shivaun Albright <shivaun_albright&hp.com> +-mcs-calypsoicf 3330/tcp MCS Calypso ICF +-mcs-calypsoicf 3330/udp MCS Calypso ICF +-mcs-messaging 3331/tcp MCS Messaging +-mcs-messaging 3331/udp MCS Messaging +-mcs-mailsvr 3332/tcp MCS Mail Server +-mcs-mailsvr 3332/udp MCS Mail Server +-# Patti Jo Newsom <pjn&mcsdallas.com> +-dec-notes 3333/tcp DEC Notes +-dec-notes 3333/udp DEC Notes +-# Kim Moraros <moraros&via.enet.dec.com> +-directv-web 3334/tcp Direct TV Webcasting +-directv-web 3334/udp Direct TV Webcasting +-directv-soft 3335/tcp Direct TV Software Updates +-directv-soft 3335/udp Direct TV Software Updates +-directv-tick 3336/tcp Direct TV Tickers +-directv-tick 3336/udp Direct TV Tickers +-directv-catlg 3337/tcp Direct TV Data Catalog +-directv-catlg 3337/udp Direct TV Data Catalog +-# Michael Friedman <mfr1&worldnet.att.net> +-anet-b 3338/tcp OMF data b +-anet-b 3338/udp OMF data b +-anet-l 3339/tcp OMF data l +-anet-l 3339/udp OMF data l +-anet-m 3340/tcp OMF data m +-anet-m 3340/udp OMF data m +-anet-h 3341/tcp OMF data h +-anet-h 3341/udp OMF data h +-# Per Sahlqvist <psahlqvi&sw.seisy.abb.se> +-webtie 3342/tcp WebTIE +-webtie 3342/udp WebTIE +-# Kevin Frender <kbf&ngdc.noaa.gov> +-ms-cluster-net 3343/tcp MS Cluster Net +-ms-cluster-net 3343/udp MS Cluster Net +-# Mike Massa <mikemasµsoft.com> +-bnt-manager 3344/tcp BNT Manager +-bnt-manager 3344/udp BNT Manager +-# Engineering Dept. <domains&badgernt.com> +-influence 3345/tcp Influence +-influence 3345/udp Influence +-# Russ Ferriday <russf&topia.com> +-trnsprntproxy 3346/tcp Trnsprnt Proxy +-trnsprntproxy 3346/udp Trnsprnt Proxy +-# Grant Kirby <grant_kirby&ccm.al.intel.com> +-phoenix-rpc 3347/tcp Phoenix RPC +-phoenix-rpc 3347/udp Phoenix RPC +-# Ian Anderson <ian_anderson&phoenix.com> +-pangolin-laser 3348/tcp Pangolin Laser +-pangolin-laser 3348/udp Pangolin Laser +-# William Benner <William_Benner&msn.com> +-chevinservices 3349/tcp Chevin Services +-chevinservices 3349/udp Chevin Services +-# Gus McNaughton <gus&chevin.com> +-findviatv 3350/tcp FINDVIATV +-findviatv 3350/udp FINDVIATV +-# Oran Davis <oran&8x8.com> +-btrieve 3351/tcp Btrieve port +-btrieve 3351/udp Btrieve port +-ssql 3352/tcp Scalable SQL +-ssql 3352/udp Scalable SQL +-# Chuck Talk <ctalk&pervasive.com> +-fatpipe 3353/tcp FATPIPE +-fatpipe 3353/udp FATPIPE +-# Sanchaita Datta <sdatta&ragula.com> +-suitjd 3354/tcp SUITJD +-suitjd 3354/udp SUITJD +-# Todd Moyer <tsm&unx.dec.com> +-ordinox-dbase 3355/tcp Ordinox Dbase +-ordinox-dbase 3355/udp Ordinox Dbase +-# Denis Ducharme <dducharme&softek.com> +-upnotifyps 3356/tcp UPNOTIFYPS +-upnotifyps 3356/udp UPNOTIFYPS +-# Mark Fox <markf&uplanet.com> +-adtech-test 3357/tcp Adtech Test IP +-adtech-test 3357/udp Adtech Test IP +-# Robin Uyeshiro <robin_u&adtech-inc.com> +-mpsysrmsvr 3358/tcp Mp Sys Rmsvr +-mpsysrmsvr 3358/udp Mp Sys Rmsvr +-# Hiroyuki Kawabuchi <buchi&ael.fujitsu.co.jp> +-wg-netforce 3359/tcp WG NetForce +-wg-netforce 3359/udp WG NetForce +-# Lee Wheat <wheat&wg.com> +-kv-server 3360/tcp KV Server +-kv-server 3360/udp KV Server +-kv-agent 3361/tcp KV Agent +-kv-agent 3361/udp KV Agent +-# Thomas Soranno <tom_soranno&cipartners.com> +-dj-ilm 3362/tcp DJ ILM +-dj-ilm 3362/udp DJ ILM +-# Don Tyson +-nati-vi-server 3363/tcp NATI Vi Server +-nati-vi-server 3363/udp NATI Vi Server +-# Robert Dye <rob&natinst.com> +-creativeserver 3364/tcp Creative Server +-creativeserver 3364/udp Creative Server +-contentserver 3365/tcp Content Server +-contentserver 3365/udp Content Server +-creativepartnr 3366/tcp Creative Partner +-creativepartnr 3366/udp Creative Partner +-# Jesus Ortiz <Jesus_A._Ortiz¬es.emotion.com> +-satvid-datalnk 3367-3371 Satellite Video Data Link +-# Scott Engel <ScottX_Engel&ccm.jf.intel.com> +-tip2 3372/tcp TIP 2 +-tip2 3372/udp TIP 2 +-# Keith Evans <keith&loc252.tandem.com> +-lavenir-lm 3373/tcp Lavenir License Manager +-lavenir-lm 3373/udp Lavenir License Manager +-# Marius Matioc <marius&lavenir.com> +-cluster-disc 3374/tcp Cluster Disc +-cluster-disc 3374/udp Cluster Disc +-# Jeff Hughes <Jeff.Hughes&columbiasc.ncr.com> +-vsnm-agent 3375/tcp VSNM Agent +-vsnm-agent 3375/udp VSNM Agent +-# Venkat Rangan <venkatr&vitalsigns.com> +-cdbroker 3376/tcp CD Broker +-cdbroker 3376/udp CD Broker +-# Moon Ho Chung <mchung&esps.com> +-cogsys-lm 3377/tcp Cogsys Network License Manager +-cogsys-lm 3377/udp Cogsys Network License Manager +-# Simon Chinnick <support&cogsys.co.uk> +-wsicopy 3378/tcp WSICOPY +-wsicopy 3378/udp WSICOPY +-# James Overby +-socorfs 3379/tcp SOCORFS +-socorfs 3379/udp SOCORFS +-# Hugo Charbonneau +-sns-channels 3380/tcp SNS Channels +-sns-channels 3380/udp SNS Channels +-# Shekar Pasumarthi <shekarp&firstfloor.com> +-geneous 3381/tcp Geneous +-geneous 3381/udp Geneous +-# Nick de Smith <nick&desmith.net> +-fujitsu-neat 3382/tcp Fujitsu Network Enhanced Antitheft function +-fujitsu-neat 3382/udp Fujitsu Network Enhanced Antitheft function +-# Markku Viima <markku.viima&team.icl.se> +-esp-lm 3383/tcp Enterprise Software Products License Manager +-esp-lm 3383/udp Enterprise Software Products License Manager +-# George Rudy <george&entsoft.com> +-hp-clic 3384/tcp Cluster Management Services +-hp-clic 3384/udp Hardware Management +-# Rajesh Srinivasaraghavan <srajesh&cup.hp.com> +-qnxnetman 3385/tcp qnxnetman +-qnxnetman 3385/udp qnxnetman +-# Michael Hunter <mphunter&qnx.com> +-gprs-data 3386/tcp GPRS Data +-gprs-sig 3386/udp GPRS SIG +-# Ansgar Bergmann <Ansgar.Bergmann&etsi.fr> +-backroomnet 3387/tcp Back Room Net +-backroomnet 3387/udp Back Room Net +-# Clayton Wilkinson <cwilkinson&carreker.com> +-cbserver 3388/tcp CB Server +-cbserver 3388/udp CB Server +-# Allen Wei <Allen_Wei&arborsoft.com> +-ms-wbt-server 3389/tcp MS WBT Server +-ms-wbt-server 3389/udp MS WBT Server +-# Ritu Bahl <ritubµsoft.com> +-dsc 3390/tcp Distributed Service Coordinator +-dsc 3390/udp Distributed Service Coordinator +-# Charles Honton <chas&honton.org> +-savant 3391/tcp SAVANT +-savant 3391/udp SAVANT +-# Andy Bruce <franklin_yah&yahoo.com> +-efi-lm 3392/tcp EFI License Management +-efi-lm 3392/udp EFI License Management +-# Ross E. Greinke <greinker&execpc.com> +-d2k-tapestry1 3393/tcp D2K Tapestry Client to Server +-d2k-tapestry1 3393/udp D2K Tapestry Client to Server +-d2k-tapestry2 3394/tcp D2K Tapestry Server to Server +-d2k-tapestry2 3394/udp D2K Tapestry Server to Server +-# Eric Lan <elan&d2k.com> +-dyna-lm 3395/tcp Dyna License Manager (Elam) +-dyna-lm 3395/udp Dyna License Manager (Elam) +-# Anjana Iyer <anjana&dyna.com> +-printer_agent 3396/tcp Printer Agent +-printer_agent 3396/udp Printer Agent +-# Devon Taylor <dtaylor&novell.com> +-cloanto-lm 3397/tcp Cloanto License Manager +-cloanto-lm 3397/udp Cloanto License Manager +-# Takeo Sato <takeo_sato-iana&cloanto.com> +-mercantile 3398/tcp Mercantile +-mercantile 3398/udp Mercantile +-# Erik Kragh Jensen <kragh&inet.uni2.dk> +-csms 3399/tcp CSMS +-csms 3399/udp CSMS +-csms2 3400/tcp CSMS2 +-csms2 3400/udp CSMS2 +-# Markus Michels <mmi&cedros.com> +-filecast 3401/tcp filecast +-filecast 3401/udp filecast +-# Eden Sherry <eden&pair.com> +-fxaengine-net 3402/tcp FXa Engine Network Port +-fxaengine-net 3402/udp FXa Engine Network Port +-# Lucas Alonso <luke&demiurgestudios.com> February 2002 +-# 3403 De-registered on 2006-10-27 +-# 3404 Removed (2002-05-01) +-nokia-ann-ch1 3405/tcp Nokia Announcement ch 1 +-nokia-ann-ch1 3405/udp Nokia Announcement ch 1 +-nokia-ann-ch2 3406/tcp Nokia Announcement ch 2 +-nokia-ann-ch2 3406/udp Nokia Announcement ch 2 +-# Morteza Kalhour <Morteza.Kalhour&Nokia.com> February 2002 +-ldap-admin 3407/tcp LDAP admin server port +-ldap-admin 3407/udp LDAP admin server port +-# Stephen Tsun <stsun&calient.net> February 2002 +-BESApi 3408/tcp BES Api Port +-BESApi 3408/udp BES Api Port +-# Colin Griffiths <colin.griffiths&interlinksoftware.com> February 2002 +-networklens 3409/tcp NetworkLens Event Port +-networklens 3409/udp NetworkLens Event Port +-networklenss 3410/tcp NetworkLens SSL Event +-networklenss 3410/udp NetworkLens SSL Event +-# Greg Bailey <gbailey&lxpro.com> February 2002 +-biolink-auth 3411/tcp BioLink Authenteon server +-biolink-auth 3411/udp BioLink Authenteon server +-# BioLink Support <reginfo&biolinkusa.com> February 2002 +-xmlblaster 3412/tcp xmlBlaster +-xmlblaster 3412/udp xmlBlaster +-# Marcel Ruff <mr&marcelruff.info> February 2002 +-svnet 3413/tcp SpecView Networking +-svnet 3413/udp SpecView Networking +-# Richard Dickins <rad&specview.com> February 2002 +-wip-port 3414/tcp BroadCloud WIP Port +-wip-port 3414/udp BroadCloud WIP Port +-bcinameservice 3415/tcp BCI Name Service +-bcinameservice 3415/udp BCI Name Service +-# Dennis Parker <dparker&broadcloud.com> February 2002 +-commandport 3416/tcp AirMobile IS Command Port +-commandport 3416/udp AirMobile IS Command Port +-# Mike Klein <m.klein&motorla.com> February 2002 +-csvr 3417/tcp ConServR file translation +-csvr 3417/udp ConServR file translation +-# Albert Leung <aleung&biscom.com> February 2002 +-rnmap 3418/tcp Remote nmap +-rnmap 3418/udp Remote nmap +-# Tuomo Makinen <tmakinen&pp.htv.fi> February 2002 +-softaudit 3419/tcp Isogon SoftAudit +-softaudit 3419/udp ISogon SoftAudit +-# Per Hellberg <phellberg&isogon.com> February 2002 +-ifcp-port 3420/tcp iFCP User Port +-ifcp-port 3420/udp iFCP User Port +-# RFC 4172 - September 2005 +-bmap 3421/tcp Bull Apprise portmapper +-bmap 3421/udp Bull Apprise portmapper +-# Jeremy Gilbert <J.Gilbert&ma30.bull.com> +-rusb-sys-port 3422/tcp Remote USB System Port +-rusb-sys-port 3422/udp Remote USB System Port +-# Steven Klein <stevek&ionetworks.com> February 2002 +-xtrm 3423/tcp xTrade Reliable Messaging +-xtrm 3423/udp xTrade Reliable Messaging +-xtrms 3424/tcp xTrade over TLS/SSL +-xtrms 3424/udp xTrade over TLS/SSL +-# Mats Nilsson <mats.nilsson&xware.se> February 2002 +-agps-port 3425/tcp AGPS Access Port +-agps-port 3425/udp AGPS Access Port +-# Kristoffer Nilsson +-# <kristoffer.nilsson&hutchison3g.com> February 2002 +-arkivio 3426/tcp Arkivio Storage Protocol +-arkivio 3426/udp Arkivio Storage Protocol +-# Bruce Greenblatt <bruce&arkivio.com> February 2002 +-websphere-snmp 3427/tcp WebSphere SNMP +-websphere-snmp 3427/udp WebSphere SNMP +-# Richard Mills <ramills&us.ibm.com> February 2002 +-twcss 3428/tcp 2Wire CSS +-twcss 3428/udp 2Wire CSS +-# 2Wire IANA Contact <iana&2wire.com> February 2002 +-gcsp 3429/tcp GCSP user port +-gcsp 3429/udp GCSP user port +-# Anirban Majumder <majumderanirban&lycos.com> March 2002 +-ssdispatch 3430/tcp Scott Studios Dispatch +-ssdispatch 3430/udp Scott Studios Dispatch +-# Michael Settles <michael.settles&verizon.net> March 2002 +-ndl-als 3431/tcp Active License Server Port +-ndl-als 3431/udp Active License Server Port +-# Quentin Brown <ndldev&ndl.co.uk> March 2002 +-osdcp 3432/tcp Secure Device Protocol +-osdcp 3432/udp Secure Device Protocol +-# Peter Fernandez <fernandez&omnisec.ch> March 2002 +-alta-smp 3433/tcp Altaworks Service Management Platform +-alta-smp 3433/udp Altaworks Service Management Platform +-# Ted Macomber <TedM&Altaworks.com> March 2002 +-opencm 3434/tcp OpenCM Server +-opencm 3434/udp OpenCM Server +-# Jonathan S. Shapiro <registrar&eros-os.org> March 2002 +-pacom 3435/tcp Pacom Security User Port +-pacom 3435/udp Pacom Security User Port +-# Steve Barton <steveb&pacom.com> March 2002 +-gc-config 3436/tcp GuardControl Exchange Protocol +-gc-config 3436/udp GuardControl Exchange Protocol +-# Andreas Schwarz <andi&trancefield.de> March 2002 +-autocueds 3437/tcp Autocue Directory Service +-autocueds 3437/udp Autocue Directory Service +-# Geoff Back <geoff&autocue.co.uk> March 2002 +-spiral-admin 3438/tcp Spiralcraft Admin +-spiral-admin 3438/udp Spiralcraft Admin +-# Michael Toth <iana&spiralcraft.com> March 2002 +-hri-port 3439/tcp HRI Interface Port +-hri-port 3439/udp HRI Interface Port +-# John Fayos <john.fayos&criticallink.com> March 2002 +-ans-console 3440/tcp Net Steward Mgmt Console +-ans-console 3440/udp Net Steward Mgmt Console +-# John Richmond <developers&securitydesigners.com> March 2002 +-connect-client 3441/tcp OC Connect Client +-connect-client 3441/udp OC Connect Client +-connect-server 3442/tcp OC Connect Server +-connect-server 3442/udp OC Connect Server +-# Mike Velten <mike.Velten&liebert.com> March 2002 +-ov-nnm-websrv 3443/tcp OpenView Network Node Manager WEB Server +-ov-nnm-websrv 3443/udp OpenView Network Node Manager WEB Server +-# Anthony Walker <anthony_walker&hp.com> March 2002 +-denali-server 3444/tcp Denali Server +-denali-server 3444/udp Denali Server +-# Joe Devlin <Joe.Devlin&rocketsoftware.com> March 2002 +-monp 3445/tcp Media Object Network +-monp 3445/udp Media Object Network +-# Ron Herardian <rherardi&gssnet.com> March 2002 +-3comfaxrpc 3446/tcp 3Com FAX RPC port +-3comfaxrpc 3446/udp 3Com FAX RPC port +-# Christopher Wells <christopher_wells&3com.com> April 2002 +-directnet 3447/tcp DirectNet IM System +-directnet 3447/udp DirectNet IM System +-# Gregory Richards <Richards&codu.org> April 2002 +-dnc-port 3448/tcp Discovery and Net Config +-dnc-port 3448/udp Discovery and Net Config +-# Chi Chen <chichen&us.ibm.com> April 2002 +-hotu-chat 3449/tcp HotU Chat +-hotu-chat 3449/udp HotU Chat +-# Tim Burgess <tim&hotu.com> April 2002 +-castorproxy 3450/tcp CAStorProxy +-castorproxy 3450/udp CAStorProxy +-# Raymond J. Young <Raymond.Young&ca.com> April 2002 +-asam 3451/tcp ASAM Services +-asam 3451/udp ASAM Services +-# Mike Gossett <mike&omnibond.com> April 2002 +-sabp-signal 3452/tcp SABP-Signalling Protocol +-sabp-signal 3452/udp SABP-Signalling Protocol +-# Brendan McWilliams <brendan.mcwilliams&vf.vodafone.co.uk> April 2002 +-pscupd 3453/tcp PSC Update Port +-pscupd 3453/udp PSC Update Port +-# Reid B. Ligon <reid.ligon&pscnet.com> +-mira 3454/tcp Apple Remote Access Protocol +-# Mike Alexander <mta&um.cc.umich.edu> +-prsvp 3455/tcp RSVP Port +-prsvp 3455/udp RSVP Port +-# Bob Braden <Braden&isi.edu> +-vat 3456/tcp VAT default data +-vat 3456/udp VAT default data +-# Van Jacobson <van&ee.lbl.gov> +-vat-control 3457/tcp VAT default control +-vat-control 3457/udp VAT default control +-# Van Jacobson <van&ee.lbl.gov> +-d3winosfi 3458/tcp D3WinOSFI +-d3winosfi 3458/udp D3WinOSFI +-# Brad Hamilton <bh&picksys.com> +-integral 3459/tcp TIP Integral +-integral 3459/udp TIP Integral +-# Olivier Mascia <om&tipgroup.com> +-edm-manager 3460/tcp EDM Manger +-edm-manager 3460/udp EDM Manger +-edm-stager 3461/tcp EDM Stager +-edm-stager 3461/udp EDM Stager +-edm-std-notify 3462/tcp EDM STD Notify +-edm-std-notify 3462/udp EDM STD Notify +-edm-adm-notify 3463/tcp EDM ADM Notify +-edm-adm-notify 3463/udp EDM ADM Notify +-edm-mgr-sync 3464/tcp EDM MGR Sync +-edm-mgr-sync 3464/udp EDM MGR Sync +-edm-mgr-cntrl 3465/tcp EDM MGR Cntrl +-edm-mgr-cntrl 3465/udp EDM MGR Cntrl +-# Tom Hennessy <thenn&novadigm.com> +-workflow 3466/tcp WORKFLOW +-workflow 3466/udp WORKFLOW +-# Robert Hufsky <rhufsky&csesys.co.at> +-rcst 3467/tcp RCST +-rcst 3467/udp RCST +-# Kit Sturgeon <Kit&remotecontrolsextoys.com> +-ttcmremotectrl 3468/tcp TTCM Remote Controll +-ttcmremotectrl 3468/udp TTCM Remote Controll +-# Yossi Cohen-Shahar <yossi&proxy.co.il> +-pluribus 3469/tcp Pluribus +-pluribus 3469/udp Pluribus +-# Mark Miller <markm&caplet.com> +-jt400 3470/tcp jt400 +-jt400 3470/udp jt400 +-jt400-ssl 3471/tcp jt400-ssl +-jt400-ssl 3471/udp jt400-ssl +-# Clifton Nock <cnock&us.ibm.com> +-jaugsremotec-1 3472/tcp JAUGS N-G Remotec 1 +-jaugsremotec-1 3472/udp JAUGS N-G Remotec 1 +-jaugsremotec-2 3473/tcp JAUGS N-G Remotec 2 +-jaugsremotec-2 3473/udp JAUGS N-G Remotec 2 +-# Steven B. Cliff <scliff&remotec-andros.com> April 2002 +-ttntspauto 3474/tcp TSP Automation +-ttntspauto 3474/udp TSP Automation +-# Arnie Koster <akoster&teltone.com> April 2002 +-genisar-port 3475/tcp Genisar Comm Port +-genisar-port 3475/udp Genisar Comm Port +-# Candace Niccolson <cniccolson&genisar.com> April 2002 +-nppmp 3476/tcp NVIDIA Mgmt Protocol +-nppmp 3476/udp NVIDIA Mgmt Protocol +-# Gilbert Yeung <gyeung&nvidia.com> April 2002 +-ecomm 3477/tcp eComm link port +-ecomm 3477/udp eComm link port +-# Thomas Soerensen <thomassoerensen&stofanet.dk> April 2002 +-nat-stun-port 3478/tcp Simple Traversal of UDP Through NAT (STUN) port +-nat-stun-port 3478/udp Simple Traversal of UDP Through NAT (STUN) port +-# Jonathan Rosenberg <jdrosen&dynamicsoft.com> April 2002 +-twrpc 3479/tcp 2Wire RPC +-twrpc 3479/udp 2Wire RPC +-# 2Wire IANA Contact <iana&2wire.com> April 2002 +-plethora 3480/tcp Secure Virtual Workspace +-plethora 3480/udp Secure Virtual Workspace +-# Tim Simms <tsimms&plethoratech.com> April 2002 +-cleanerliverc 3481/tcp CleanerLive remote ctrl +-cleanerliverc 3481/udp CleanerLive remote ctrl +-# David Mojdehi <david.mojdehi&autodesk.com> April 2002 +-vulture 3482/tcp Vulture Monitoring System +-vulture 3482/udp Vulture Monitoring System +-# Jason Santos <jason.santos&megaslow.net> April 2002 +-slim-devices 3483/tcp Slim Devices Protocol +-slim-devices 3483/udp Slim Devices Protocol +-# Sean Adams <sean&slimdevices.com> May 2002 +-gbs-stp 3484/tcp GBS SnapTalk Protocol +-gbs-stp 3484/udp GBS SnapTalk Protocol +-# Eric Harris-Braun <eric&glassbead.com> May 2002 +-celatalk 3485/tcp CelaTalk +-celatalk 3485/udp CelaTalk +-# Carl Blundell <cblundell&celador.co.uk> May 2002 +-ifsf-hb-port 3486/tcp IFSF Heartbeat Port +-ifsf-hb-port 3486/udp IFSF Heartbeat Port +-# IFSF Secretary <secretary&ifsf.org> May 2002 +-ltctcp 3487/tcp LISA TCP Transfer Channel +-ltcudp 3487/udp LISA UDP Transfer Channel +-# Pit Vetterick <pit&3dgo.com> May 2002 +-fs-rh-srv 3488/tcp FS Remote Host Server +-fs-rh-srv 3488/udp FS Remote Host Server +-# Brian Nickles <RogueSpear91&hotmail.com> May 2002 +-dtp-dia 3489/tcp DTP/DIA +-dtp-dia 3489/udp DTP/DIA +-# Alexei V. Soloviev <avsolov&lab127.karelia.ru> May 2002 +-colubris 3490/tcp Colubris Management Port +-colubris 3490/udp Colubris Management Port +-# Gilbert Moineau <gilbert.moineau&colubris.com> May 2002 +-swr-port 3491/tcp SWR Port +-swr-port 3491/udp SWR Port +-# Ian Manning <imanning&dtsuk.com> May 2002 +-tvdumtray-port 3492/tcp TVDUM Tray Port +-tvdumtray-port 3492/udp TVDUM Tray Port +-# Peter Boers <boers&isisglobal.nl> May 2002 +-nut 3493/tcp Network UPS Tools +-nut 3493/udp Network UPS Tools +-# Russell Kroll <nut-iana&exploits.org> May 2002 +-ibm3494 3494/tcp IBM 3494 +-ibm3494 3494/udp IBM 3494 +-# Jeffrey Pilch <jpilch&us.ibm.com> +-seclayer-tcp 3495/tcp securitylayer over tcp +-seclayer-tcp 3495/udp securitylayer over tcp +-seclayer-tls 3496/tcp securitylayer over tls +-seclayer-tls 3496/udp securitylayer over tls +-# Arno Hollosi <arno.hollosi&cio.gv.at> March 2002 +-ipether232port 3497/tcp ipEther232Port +-ipether232port 3497/udp ipEther232Port +-# Marcus Leufgen <leufgen&ipcas.de> May 2002 +-dashpas-port 3498/tcp DASHPAS user port +-dashpas-port 3498/udp DASHPAS user port +-# Albrecht Mayer <albrecht.mayer&infineon.com> May 2002 +-sccip-media 3499/tcp SccIP Media +-sccip-media 3499/udp SccIP Media +-# David Yon <dyon&dialout.net> May 2002 +-rtmp-port 3500/tcp RTMP Port +-rtmp-port 3500/udp RTMP Port +-# Miriam Wohlgelernter <miriamw&adirtech.com> +-isoft-p2p 3501/tcp iSoft-P2P +-isoft-p2p 3501/udp iSoft-P2P +-# David Walling <dwalling&isoft.com> +-avinstalldisc 3502/tcp Avocent Install Discovery +-avinstalldisc 3502/udp Avocent Install Discovery +-# Brian S. Stewart <Brian.Stewart&Avovent.com> +-lsp-ping 3503/tcp MPLS LSP-echo Port +-lsp-ping 3503/udp MPLS LSP-echo Port +-# Ping Pan <pingpan&juniper.net> +-ironstorm 3504/tcp IronStorm game server +-ironstorm 3504/udp IronStorm game server +-# Arnaud Clermonte <clermonte&4xtechnologies.com> +-ccmcomm 3505/tcp CCM communications port +-ccmcomm 3505/udp CCM communications port +-# Tom Bougan <tomb&apptechsys.com> +-apc-3506 3506/tcp APC 3506 +-apc-3506 3506/udp APC 3506 +-# American Power Conversion <ports&apcc.com> +-nesh-broker 3507/tcp Nesh Broker Port +-nesh-broker 3507/udp Nesh Broker Port +-# Jeremy Maiden <jeremy&komarr.demon.co.uk> +-interactionweb 3508/tcp Interaction Web +-interactionweb 3508/udp Interaction Web +-# Mike Gagle <mikeg&inin.com> +-vt-ssl 3509/tcp Virtual Token SSL Port +-vt-ssl 3509/udp Virtual Token SSL Port +-# Libor Sykora <libor.sykora&st.com> May 2002 +-xss-port 3510/tcp XSS Port +-xss-port 3510/udp XSS Port +-# Joe Purcell <jpurcell&ensuretech.com> May 2002 +-webmail-2 3511/tcp WebMail/2 +-webmail-2 3511/udp WebMail/2 +-# Dimitris Michelinakis <dimitris&michelinakis.gr> May 2002 +-aztec 3512/tcp Aztec Distribution Port +-aztec 3512/udp Aztec Distribution Port +-# Alan Francis <AlanF&zonal.co.uk> May 2002 +-arcpd 3513/tcp Adaptec Remote Protocol +-arcpd 3513/udp Adaptec Remote Protocol +-# Hardy Doelfel <hardy_doelfel&adaptec.com> May 2002 +-must-p2p 3514/tcp MUST Peer to Peer +-must-p2p 3514/udp MUST Peer to Peer +-must-backplane 3515/tcp MUST Backplane +-must-backplane 3515/udp MUST Backplane +-# Rick Stefanik <r.stefanik&gatelinx.com> May 2002 +-smartcard-port 3516/tcp Smartcard Port +-smartcard-port 3516/udp Smartcard Port +-# Scott Guthery <sguthery&mobile-mind.com> May 2002 +-802-11-iapp 3517/tcp IEEE 802.11 WLANs WG IAPP +-802-11-iapp 3517/udp IEEE 802.11 WLANs WG IAPP +-# Stuart J. Kerry (Chair IEEE 802.11 WG) +-# <stuart&ok-brit.com> May 2002 +-artifact-msg 3518/tcp Artifact Message Server +-artifact-msg 3518/udp Artifact Message Server +-# Ron Capwell <ron&artifactsoftware.com> June 2002 +-nvmsgd 3519/tcp Netvion Messenger Port +-galileo 3519/udp Netvion Galileo Port +-galileolog 3520/tcp Netvion Galileo Log Port +-galileolog 3520/udp Netvion Galileo Log Port +-# Ray Caruso <ray.caruso&netvion.com> June 2002 +-mc3ss 3521/tcp Telequip Labs MC3SS +-mc3ss 3521/udp Telequip Labs MC3SS +-# Michael Sparks <msparks&telequiplabs.com> June 2002 +-nssocketport 3522/tcp DO over NSSocketPort +-nssocketport 3522/udp DO over NSSocketPort +-# Douglas Davidson <drd&apple.com> June 2002 +-odeumservlink 3523/tcp Odeum Serverlink +-odeumservlink 3523/udp Odeum Serverlink +-# Mads Peter Back <iana-contact&webhouse.dk> June 2002 +-ecmport 3524/tcp ECM Server port +-ecmport 3524/udp ECM Server port +-eisport 3525/tcp EIS Server port +-eisport 3525/udp EIS Server port +-# Paul Kraus <paul.kraus&veritas.com> June 2002 +-starquiz-port 3526/tcp starQuiz Port +-starquiz-port 3526/udp starQuiz Port +-# Adam Ernst <contact&cosmicsoft.net> June 2002 +-beserver-msg-q 3527/tcp VERITAS Backup Exec Server +-beserver-msg-q 3527/udp VERITAS Backup Exec Server +-# Katherine Wattwood <katherine.wattwood&veritas.com> June 2002 +-jboss-iiop 3528/tcp JBoss IIOP +-jboss-iiop 3528/udp JBoss IIOP +-jboss-iiop-ssl 3529/tcp JBoss IIOP/SSL +-jboss-iiop-ssl 3529/udp JBoss IIOP/SSL +-# Francisco Reverbel <reverbel&ime.usp.br> June 2002 +-gf 3530/tcp Grid Friendly +-gf 3530/udp Grid Friendly +-# Daivd P. Chassin <david.chassin&pnl.gov> June 2002 +-joltid 3531/tcp Joltid +-joltid 3531/udp Joltid +-# Ahti Heinla <ahti&ahti.bluemoon.ee> June 2002 +-raven-rmp 3532/tcp Raven Remote Management Control +-raven-rmp 3532/udp Raven Remote Management Control +-raven-rdp 3533/tcp Raven Remote Management Data +-raven-rdp 3533/udp Raven Remote Management Data +-# Daniel Sorlov <daniel&sorlov.com> June 2002 +-urld-port 3534/tcp URL Daemon Port +-urld-port 3534/udp URL Daemon Port +-# Jim Binkley <jrb&cs.pdx.edu> June 2002 +-ms-la 3535/tcp MS-LA +-ms-la 3535/udp MS-LA +-# Eric Ledoux <ericleµsoft.com> +-snac 3536/tcp SNAC +-snac 3536/udp SNAC +-# Tatsuya Igarashi <Tatsuya.Igarashi&jp.sony.com> July 2002 +-ni-visa-remote 3537/tcp Remote NI-VISA port +-ni-visa-remote 3537/udp Remote NI-VISA port +-# Sinnadurai Dharshan <sinnadurai.dharshan&ni.com> July 2002 +-ibm-diradm 3538/tcp IBM Directory Server +-ibm-diradm 3538/udp IBM Directory Server +-ibm-diradm-ssl 3539/tcp IBM Directory Server SSL +-ibm-diradm-ssl 3539/udp IBM Directory Server SSL +-# Mark Cavage <mcavage&us.ibm.com> July 2002 +-pnrp-port 3540/tcp PNRP User Port +-pnrp-port 3540/udp PNRP User Port +-# Igor Kostic <igorkoµsoft.com> July 2002 +-voispeed-port 3541/tcp VoiSpeed Port +-voispeed-port 3541/udp VoiSpeed Port +-# Virgilio Lattanzi <virgilio&harpax.com> July 2002 +-hacl-monitor 3542/tcp HA cluster monitor +-hacl-monitor 3542/udp HA cluster monitor +-# Jason Ko <jason_ko&hp.com> July 2002 +-qftest-lookup 3543/tcp qftest Lookup Port +-qftest-lookup 3543/udp qftest Lookup Port +-# Gregor Schmid <gs&qfs.de> July 2002 +-teredo 3544/tcp Teredo Port +-teredo 3544/udp Teredo Port +-# Dave Thaler <dthalerµsoft.com> July 2002 +-camac 3545/tcp CAMAC equipment +-camac 3545/udp CAMAC equipment +-# Eugene Zhiganov <zed&dfe3300.karelia.ru> July 2002 +-# 3546 Unassigned (removed September 2002) +-symantec-sim 3547/tcp Symantec SIM +-symantec-sim 3547/udp Symantec SIM +-# George Dzieciol <gdzieciol&symantec.com> July 2002 +-interworld 3548/tcp Interworld +-interworld 3548/udp Interworld +-# John Stephen <iana&mundocani.com> July 2002 +-tellumat-nms 3549/tcp Tellumat MDR NMS +-tellumat-nms 3549/udp Tellumat MDR NMS +-# Hennie van der Merwe <hvandermerwe&tellumat.com> July 2002 +-ssmpp 3550/tcp Secure SMPP +-ssmpp 3550/udp Secure SMPP +-# Cormac Long <webmaster&smsforum.net> July 2002 +-apcupsd 3551/tcp Apcupsd Information Port +-apcupsd 3551/udp Apcupsd Information Port +-# Riccardo Facchetti <riccardo&inetcosmos.org> July 2002 +-taserver 3552/tcp TeamAgenda Server Port +-taserver 3552/udp TeamAgenda Server Port +-# Dany Ayotte <ayotte&teamsoft.com> July 2002 +-rbr-discovery 3553/tcp Red Box Recorder ADP +-rbr-discovery 3553/udp Red Box Recorder ADP +-# Simon Jolly <simon.jolly&origin-data.co.uk> July 2002 +-questnotify 3554/tcp Quest Notification Server +-questnotify 3554/udp Quest Notification Server +-# Rob Griffin <quest_iana&oz.quest.com> July 2002 +-razor 3555/tcp Vipul's Razor +-razor 3555/udp Vipul's Razor +-# Vipul Ved Prakash <mail&vipul.net> July 2002 +-sky-transport 3556/tcp Sky Transport Protocol +-sky-transport 3556/udp Sky Transport Protocol +-# Michael Paddon <michael.paddon&activesky.com> July 2002 +-personalos-001 3557/tcp PersonalOS Comm Port +-personalos-001 3557/udp PersonalOS Comm Port +-# Shane Roberts <shane&shaneroberts.com> July 2002 +-mcp-port 3558/tcp MCP user port +-mcp-port 3558/udp MCP user port +-# Professor Paul S. Wang <pwang&cs.kent.edu> July 2002 +-cctv-port 3559/tcp CCTV control port +-cctv-port 3559/udp CCTV control port +-# John Skidmore <JSkidmore&vicon-cctv.com> July 2002 +-iniserve-port 3560/tcp INIServe port +-iniserve-port 3560/udp INIServe port +-# Peter Moylan <peter&ee.newcastle.edu.au> August 2002 +-bmc-onekey 3561/tcp BMC-OneKey +-bmc-onekey 3561/udp BMC-OneKey +-# Portnoy Boxman <portnoy_boxman&bmc.com> August 2002 +-sdbproxy 3562/tcp SDBProxy +-sdbproxy 3562/udp SDBProxy +-# Eric Grange <egrange&creative-it.net> August 2002 +-watcomdebug 3563/tcp Watcom Debug +-watcomdebug 3563/udp Watcom Debug +-# Dave Neudoerffer <Dave.Neudoerffer&ianywhere.com> +-esimport 3564/tcp Electromed SIM port +-esimport 3564/udp Electromed SIM port +-# Francois Marchand <francois.marchand&electromed.com> August 2002 +-m2pa 3565/tcp M2PA +-m2pa 3565/sctp M2PA +-# [RFC4165] +-quest-launcher 3566/tcp Quest Agent Manager +-quest-launcher 3566/udp Quest Agent Manager +-# Eyal Kalderon <eyal.kalderon&quest.com> April 2002 +-oap 3567/tcp Object Access Protocol +-oap 3567/udp Object Access Protocol +-# Bryant Eastham <protocols&pewla.us.pewg.panasonic.com> August 2002 +-oap-s 3568/tcp Object Access Protocol over SSL +-oap-s 3568/udp Object Access Protocol over SSL +-# Bryant Eastham <protocols&pewla.us.pewg.panasonic.com> January 2003 +-mbg-ctrl 3569/tcp Meinberg Control Service +-mbg-ctrl 3569/udp Meinberg Control Service +-# Martin Burnicki <martin.burnicki&meinberg.de> August 2002 +-mccwebsvr-port 3570/tcp MCC Web Server Port +-mccwebsvr-port 3570/udp MCC Web Server Port +-megardsvr-port 3571/tcp MegaRAID Server Port +-megardsvr-port 3571/udp MegaRAID Server Port +-megaregsvrport 3572/tcp Registration Server Port +-megaregsvrport 3572/udp Registration Server Port +-# Sreenivas Bagalkote <sreenib&lsil.com> August 2002 +-tag-ups-1 3573/tcp Advantage Group UPS Suite +-tag-ups-1 3573/udp Advantage Group UPS Suite +-# James Goddard <jamesg&taglim.com> August 2002 +-dmaf-server 3574/tcp DMAF Server +-dmaf-caster 3574/udp DMAF Caster +-# Ramakrishna Nadendla <rama_nadendla&agilent.com> August 2002 +-ccm-port 3575/tcp Coalsere CCM Port +-ccm-port 3575/udp Coalsere CCM Port +-cmc-port 3576/tcp Coalsere CMC Port +-cmc-port 3576/udp Coalsere CMC Port +-# Chris Hawkinson <chawkinson&coalsere.com> August 2002 +-config-port 3577/tcp Configuration Port +-config-port 3577/udp Configuration Port +-data-port 3578/tcp Data Port +-data-port 3578/udp Data Port +-# Anupam Bharali <ianaports&juniper.net> August 2002 +-ttat3lb 3579/tcp Tarantella Load Balancing +-ttat3lb 3579/udp Tarantella Load Balancing +-# Jim Musgrave <jimm&tarantella.com> August 2002 +-nati-svrloc 3580/tcp NATI-ServiceLocator +-nati-svrloc 3580/udp NATI-ServiceLocator +-# Jason Case <jason.case&ni.com> August 2002 +-kfxaclicensing 3581/tcp Ascent Capture Licensing +-kfxaclicensing 3581/udp Ascent Capture Licensing +-# Brad Hamilton <brad_hamilton&kofax.com> August 2002 +-press 3582/tcp PEG PRESS Server +-press 3582/udp PEG PRESS Server +-# Jim DeLisle <jdelisle&swellsoftware.com> August 2002 +-canex-watch 3583/tcp CANEX Watch System +-canex-watch 3583/udp CANEX Watch System +-# Peter Kollath <peter.kollath&canex.sk> August 2002 +-u-dbap 3584/tcp U-DBase Access Protocol +-u-dbap 3584/udp U-DBase Access Protocol +-# Bodo Rueskamp <br&itchigo.com> August 2002 +-emprise-lls 3585/tcp Emprise License Server +-emprise-lls 3585/udp Emprise License Server +-emprise-lsc 3586/tcp License Server Console +-emprise-lsc 3586/udp License Server Console +-# James J. Diaz <JDiaz&EmpriseCorporation.com> August 2002 +-p2pgroup 3587/tcp Peer to Peer Grouping +-p2pgroup 3587/udp Peer to Peer Grouping +-# Igor Kostic <igorkoµsoft.com> August 2002 +-sentinel 3588/tcp Sentinel Server +-sentinel 3588/udp Sentinel Server +-# Ian Gordon <ian.s.gordon&btopenworld.com> August 2002 +-isomair 3589/tcp isomair +-isomair 3589/udp isomair +-# Richard Fleming <richard&apoapsis.com> August 2002 +-wv-csp-sms 3590/tcp WV CSP SMS Binding +-wv-csp-sms 3590/udp WV CSP SMS Binding +-# Matti Salmi <matti.salmi&nokia.com> August 2002 +-gtrack-server 3591/tcp LOCANIS G-TRACK Server +-gtrack-server 3591/udp LOCANIS G-TRACK Server +-gtrack-ne 3592/tcp LOCANIS G-TRACK NE Port +-gtrack-ne 3592/udp LOCANIS G-TRACK NE Port +-# Juergen.Edelhaeuser <Juergen.Edelhaeuser&locanis.com> August 2002 +-bpmd 3593/tcp BP Model Debugger +-bpmd 3593/udp BP Model Debugger +-# Keith Fligg <keith&projtech.com> September 2002 +-mediaspace 3594/tcp MediaSpace +-mediaspace 3594/udp MediaSpace +-shareapp 3595/tcp ShareApp +-shareapp 3595/udp ShareApp +-# Jeff King <jking&wave3software.com> September 2002 +-iw-mmogame 3596/tcp Illusion Wireless MMOG +-iw-mmogame 3596/udp Illusion Wireless MMOG +-# Jan Vrsinsky <jan.vrsinsky&illusionsoftworks.com> September 2002 +-a14 3597/tcp A14 (AN-to-SC/MM) +-a14 3597/udp A14 (AN-to-SC/MM) +-a15 3598/tcp A15 (AN-to-AN) +-a15 3598/udp A15 (AN-to-AN) +-# David Ott <dott&qualcomm.com> September 2002 +-quasar-server 3599/tcp Quasar Accounting Server +-quasar-server 3599/udp Quasar Accounting Server +-# Brad Pepers <brad&linuxcanada.com> September 2002 +-trap-daemon 3600/tcp text relay-answer +-trap-daemon 3600/udp text relay-answer +-# John Willis <jwillis&arielusa.com> September 2002 +-visinet-gui 3601/tcp Visinet Gui +-visinet-gui 3601/udp Visinet Gui +-# Jeff Douglass <ist&att.net> September 2002 +-infiniswitchcl 3602/tcp InfiniSwitch Mgr Client +-infiniswitchcl 3602/udp InfiniSwitch Mgr Client +-# Lee VanTine <lvantine&infiniswitc.com> September 2002 +-int-rcv-cntrl 3603/tcp Integrated Rcvr Control +-int-rcv-cntrl 3603/udp Integrated Rcvr Control +-# Dave Stone <dstone01&harris.com> September 2002 +-bmc-jmx-port 3604/tcp BMC JMX Port +-bmc-jmx-port 3604/udp BMC JMX Port +-# Portnoy Boxman <portnoy_boxman&bmc.com> September 2002 +-comcam-io 3605/tcp ComCam IO Port +-comcam-io 3605/udp ComCam IO Port +-# Don Gilbreath <don&comcam.net> September 2002 +-splitlock 3606/tcp Splitlock Server +-splitlock 3606/udp Splitlock Server +-# Andrew Tune <Andrew.Tune&splitlock.com> September 2002 +-precise-i3 3607/tcp Precise I3 +-precise-i3 3607/udp Precise I3 +-# Tomer Shain <tshain&precise.com> September 2002 +-trendchip-dcp 3608/tcp Trendchip control protocol +-trendchip-dcp 3608/udp Trendchip control protocol +-# Ming-Jen Chen <mjchen&trendchip.com.tw> September 2002 +-cpdi-pidas-cm 3609/tcp CPDI PIDAS Connection Mon +-cpdi-pidas-cm 3609/udp CPDI PIDAS Connection Mon +-# Tony Splaver <tony&cpdi.com> September 2002 +-echonet 3610/tcp ECHONET +-echonet 3610/udp ECHONET +-# Takeshi Saito <takeshi.saito&toshiba.co.jp> September 2002 +-six-degrees 3611/tcp Six Degrees Port +-six-degrees 3611/udp Six Degrees Port +-# Zach Nies <znies&creo.com> September 2002 +-hp-dataprotect 3612/tcp HP Data Protector +-hp-dataprotect 3612/udp HP Data Protector +-# Stephen Gold <stephen_gold&hp.com> September 2002 +-alaris-disc 3613/tcp Alaris Device Discovery +-alaris-disc 3613/udp Alaris Device Discovery +-# Chris Dern <cdern&nospam.alarismed.com> October 2002, June 2004 +-sigma-port 3614/tcp Invensys Sigma Port +-sigma-port 3614/udp Invensys Sigma Port +-# Dr. Sajed Husein <sajed.husein&invensys.com> October 2002 +-start-network 3615/tcp Start Messaging Network +-start-network 3615/udp Start Messaging Network +-# Peter Rocca <rocca&multiboard.com> October 2002 +-cd3o-protocol 3616/tcp cd3o Control Protocol +-cd3o-protocol 3616/udp cd3o Control Protocol +-# Chris Wilcox <cwilcox&cd3o.com> October 2002 +-sharp-server 3617/tcp ATI SHARP Logic Engine +-sharp-server 3617/udp ATI SHARP Logic Engine +-# Bill Reveile <breveile&allentek.com> +-aairnet-1 3618/tcp AAIR-Network 1 +-aairnet-1 3618/udp AAIR-Network 1 +-aairnet-2 3619/tcp AAIR-Network 2 +-aairnet-2 3619/udp AAIR-Network 2 +-# James Mealey <jymealey&yahoo.com> October 2002 +-ep-pcp 3620/tcp EPSON Projector Control Port +-ep-pcp 3620/udp EPSON Projector Control Port +-ep-nsp 3621/tcp EPSON Network Screen Port +-ep-nsp 3621/udp EPSON Network Screen Port +-# SEIKO EPSON <Sato.Minoru3&exc.epson.co.jp> October 2002 +-ff-lr-port 3622/tcp FF LAN Redundancy Port +-ff-lr-port 3622/udp FF LAN Redundancy Port +-# Fieldbus Foundation <dave.glanzer&fieldbus.org> October 2002 +-haipe-discover 3623/tcp HAIPIS Dynamic Discovery +-haipe-discover 3623/udp HAIPIS Dynamic Discovery +-# Mike Irani <irani_mike&bah.com> October 2002 +-dist-upgrade 3624/tcp Distributed Upgrade Port +-dist-upgrade 3624/udp Distributed Upgrade Port +-# Jason Schoon <jason.schoon&intermec.com> October 2002 +-volley 3625/tcp Volley +-volley 3625/udp Volley +-# David Catmull <uncommon&uncommonplace.com> October 2002 +-bvcdaemon-port 3626/tcp bvControl Daemon +-bvcdaemon-port 3626/udp bvControl Daemon +-# Ravi Gokhale <rgokhale&bindview.com> October 2002 +-jamserverport 3627/tcp Jam Server Port +-jamserverport 3627/udp Jam Server Port +-# Art Pope <apope&sarnoff.com> October 2002 +-ept-machine 3628/tcp EPT Machine Interface +-ept-machine 3628/udp EPT Machine Interface +-# Victor H. Farrace <vfarrace&eaglept.com> October 2002 +-escvpnet 3629/tcp ESC/VP.net +-escvpnet 3629/udp ESC/VP.net +-# Hiroyuki Hashimoto <easymp&exc.epson.co.jp> October 2002 +-cs-remote-db 3630/tcp C&S Remote Database Port +-cs-remote-db 3630/udp C&S Remote Database Port +-cs-services 3631/tcp C&S Web Services Port +-cs-services 3631/udp C&S Web Services Port +-# Computer Software GmbH <BrunoRistok&cs-ag.de> October 2002 +-distcc 3632/tcp distributed compiler +-distcc 3632/udp distributed compiler +-# Martin Pool <mbp&samba.org> November 2002 +-wacp 3633/tcp Wyrnix AIS port +-wacp 3633/udp Wyrnix AIS port +-# Harry T. Vennik <htvennik&zonnet.nl> November 2002 +-hlibmgr 3634/tcp hNTSP Library Manager +-hlibmgr 3634/udp hNTSP Library Manager +-# Kenji Tetsuyama <kenji&onkyo.co.jp> November 2002 +-sdo 3635/tcp Simple Distributed Objects +-sdo 3635/udp Simple Distributed Objects +-# Alexander Philippou <alex&noemax.com> November 2002 +-servistaitsm 3636/tcp SerVistaITSM +-servistaitsm 3636/udp SerVistaITSM +-# Ralph Campbell <ralph.campbell&xasystems.com> November 2002 +-scservp 3637/tcp Customer Service Port +-scservp 3637/udp Customer Service Port +-# Jonathan A. Zdziarski <johathan&networkdweebs.com> November 2002 +-ehp-backup 3638/tcp EHP Backup Protocol +-ehp-backup 3638/udp EHP Backup Protocol +-# Ed Fair <ed_fair&yahoo.com> November 2002 +-xap-ha 3639/tcp Extensible Automation +-xap-ha 3639/udp Extensible Automation +-# Mark Harrison <Mark&xapautomation.org> November 2002 +-netplay-port1 3640/tcp Netplay Port 1 +-netplay-port1 3640/udp Netplay Port 1 +-netplay-port2 3641/tcp Netplay Port 2 +-netplay-port2 3641/udp Netplay Port 2 +-# Predrag Filipovic <pfilipovic&digital5.com> November 2002 +-juxml-port 3642/tcp Juxml Replication port +-juxml-port 3642/udp Juxml Replication port +-# Colin Reid <creid&projux.com> November 2002 +-audiojuggler 3643/tcp AudioJuggler +-audiojuggler 3643/udp AudioJuggler +-# Morten Mertner <mm&audiojuggler.com> November 2002 +-ssowatch 3644/tcp ssowatch +-ssowatch 3644/udp ssowatch +-# Marie-France Dubreuil <Marie-France.Dubreuil&evidian.com> November 2002 +-cyc 3645/tcp Cyc +-cyc 3645/udp Cyc +-# Stephen Reed <reed&cyc.com> January 2003 +-xss-srv-port 3646/tcp XSS Server Port +-xss-srv-port 3646/udp XSS Server Port +-# Joe Purcell <jpurcell&ensuretech.com> January 2003 +-splitlock-gw 3647/tcp Splitlock Gateway +-splitlock-gw 3647/udp Splitlock Gateway +-# Andrew Tune <Andrew.Tune&splitlock.com> January 2003 +-fjcp 3648/tcp Fujitsu Cooperation Port +-fjcp 3648/udp Fujitsu Cooperation Port +-# Kouji Sugisawa <sugisawa.kouji&soft.fujitsu.com> January 2003 +-nmmp 3649/tcp Nishioka Miyuki Msg Protocol +-nmmp 3649/udp Nishioka Miyuki Msg Protocol +-# TAKEDA Hiroyuki <takeda&atashi.net> January 2003 +-prismiq-plugin 3650/tcp PRISMIQ VOD plug-in +-prismiq-plugin 3650/udp PRISMIQ VOD plug-in +-# Richard Hodges <rhodges&prismiq.com> January 2003 +-xrpc-registry 3651/tcp XRPC Registry +-xrpc-registry 3651/udp XRPC Registry +-# Slava Monich <Slava.Monich&nokia.com> January 2003 +-vxcrnbuport 3652/tcp VxCR NBU Default Port +-vxcrnbuport 3652/udp VxCR NBU Default Port +-# Boris Star <boris.star&veritas.com> January 2003 +-tsp 3653/tcp Tunnel Setup Protocol +-tsp 3653/udp Tunnel Setup Protocol +-# Marc Blanchet <Marc.Blanchet&viagenie.qc.ca> January 2003 +-vaprtm 3654/tcp VAP RealTime Messenger +-vaprtm 3654/udp VAP RealTime Messenger +-# Boris Polevoy <vapcom&mail.ru> January 2003 +-abatemgr 3655/tcp ActiveBatch Exec Agent +-abatemgr 3655/udp ActiveBatch Exec Agent +-abatjss 3656/tcp ActiveBatch Job Scheduler +-abatjss 3656/udp ActiveBatch Job Scheduler +-# Ben Rosenberg <brosenberg&advsyscon.com> January 2003 +-immedianet-bcn 3657/tcp ImmediaNet Beacon +-immedianet-bcn 3657/udp ImmediaNet Beacon +-# Bill Homan <bhoman&spanworks.com> January 2003 +-ps-ams 3658/tcp PlayStation AMS (Secure) +-ps-ams 3658/udp PlayStation AMS (Secure) +-# Edgar Alan Tu <Edgar_Tu&playstation.sony.com> January 2003 +-apple-sasl 3659/tcp Apple SASL +-apple-sasl 3659/udp Apple SASL +-# David M. O'Rourke <daveo&apple.com> January 2003 +-can-nds-ssl 3660/tcp IBM Tivoli Directory Service using SSL +-can-nds-ssl 3660/udp IBM Tivoli Directory Service using SSL +-can-ferret-ssl 3661/tcp IBM Tivoli Directory Service using SSL +-can-ferret-ssl 3661/udp IBM Tivoli Directory Service using SSL +-# Nic Catrambone <ncatramb&us.ibm.com> January 2003 +-pserver 3662/tcp pserver +-pserver 3662/udp pserver +-# Patrick Furlong <pfurlong&darkknight.ca> January 2003 +-dtp 3663/tcp DIRECWAY Tunnel Protocol +-dtp 3663/udp DIRECWAY Tunnel Protocol +-# John Border <border&hns.com> January 2003 +-ups-engine 3664/tcp UPS Engine Port +-ups-engine 3664/udp UPS Engine Port +-ent-engine 3665/tcp Enterprise Engine Port +-ent-engine 3665/udp Enterprise Engine Port +-# Mike Delgrosso <mdelgros&tripplite.com> January 2003 +-eserver-pap 3666/tcp IBM eServer PAP +-eserver-pap 3666/udp IBM EServer PAP +-# Dave Gimpl <gimpl&us.ibm.com> January 2003 +-infoexch 3667/tcp IBM Information Exchange +-infoexch 3667/udp IBM Information Exchange +-# Paul Ford-Hutchinson <paulfordh&uk.ibm.com> January 2003 +-dell-rm-port 3668/tcp Dell Remote Management +-dell-rm-port 3668/udp Dell Remote Management +-# Bradley Bransom <bradley_bransom&dell.com> January 2003 +-casanswmgmt 3669/tcp CA SAN Switch Management +-casanswmgmt 3669/udp CA SAN Switch Management +-# Emre Tunar <emre.tunar&ca.com> January 2003 +-smile 3670/tcp SMILE TCP/UDP Interface +-smile 3670/udp SMILE TCP/UDP Interface +-# Andre Petras <#remove#a.petras&arcor.de#remove_too#> January 2003 +-efcp 3671/tcp e Field Control (EIBnet) +-efcp 3671/udp e Field Control (EIBnet) +-# Marc Goossens <mgoossens&eiba.com> January 2003 +-lispworks-orb 3672/tcp LispWorks ORB +-lispworks-orb 3672/udp LispWorks ORB +-# Lisp Support <lisp-support&xanalys.com> +-mediavault-gui 3673/tcp Openview Media Vault GUI +-mediavault-gui 3673/udp Openview Media Vault GUI +-# Stephen Gold <stephen_gold&hp.com> January 2003 +-wininstall-ipc 3674/tcp WinINSTALL IPC Port +-wininstall-ipc 3674/udp WinINSTALL IPC Port +-# Bill Somerville <Bill.Somerville&attachmate.com> January 2003 +-calltrax 3675/tcp CallTrax Data Port +-calltrax 3675/udp CallTrax Data Port +-# Oliver Bailey <zzf66jjlm&time-lines.com> January 2003 +-va-pacbase 3676/tcp VisualAge Pacbase server +-va-pacbase 3676/udp VisualAge Pacbase server +-# Dominique Lelievre <dominique.lelievre&fr.ibm.com> January 2003 +-roverlog 3677/tcp RoverLog IPC +-roverlog 3677/udp RoverLog IPC +-# Tom Mayo <tmayo1&rochester.rr.com> January 2003 +-ipr-dglt 3678/tcp DataGuardianLT +-ipr-dglt 3678/udp DataGuardianLT +-# Bruce Carlson <bruce.carlson&iprintl.com> January 2003 +-newton-dock 3679/tcp Newton Dock +-newton-dock 3679/udp Newton Dock +-npds-tracker 3680/tcp NPDS Tracker +-npds-tracker 3680/udp NPDS Tracker +-# Paul Guyot <pguyot&kallisys.net> January 2003 +-bts-x73 3681/tcp BTS X73 Port +-bts-x73 3681/udp BTS X73 Port +-# Todd Cooper <todd&DO11073.com> January 2003 +-cas-mapi 3682/tcp EMC SmartPackets-MAPI +-cas-mapi 3682/udp EMC SmartPackets-MAPI +-# Koen Schoofs <schoofs_koen&emc.com> January 2003 +-bmc-ea 3683/tcp BMC EDV/EA +-bmc-ea 3683/udp BMC EDV/EA +-# Portnoy Boxman <portnoy_boxman&bmc.com> January 2003 +-faxstfx-port 3684/tcp FAXstfX +-faxstfx-port 3684/udp FAXstfX +-# Alec Carlson <acarlson&smithmicro.com> January 2003 +-dsx-agent 3685/tcp DS Expert Agent +-dsx-agent 3685/udp DS Expert Agent +-# NetPro Computing <ports&netpro.com> January 2003 +-tnmpv2 3686/tcp Trivial Network Management +-tnmpv2 3686/udp Trivial Network Management +-# Andrea Premoli <Andrea_maria.Premoli&icn.siemens.it> January 2003 +-simple-push 3687/tcp simple-push +-simple-push 3687/udp simple-push +-simple-push-s 3688/tcp simple-push Secure +-simple-push-s 3688/udp simple-push Secure +-# C. Enrique Ortiz <eortiz&j2medeveloper.com> January 2003 +-daap 3689/tcp Digital Audio Access Protocol +-daap 3689/udp Digital Audio Access Protocol +-# Amandeep Jawa <daap&apple.com> January 2003 +-svn 3690/tcp Subversion +-svn 3690/udp Subversion +-# Greg Hudson <ghudson&mit.edu> January 2003 +-magaya-network 3691/tcp Magaya Network Port +-magaya-network 3691/udp Magaya Network Port +-# Jesus David Rodriguez <jesusdavid&magaya.com> February 2003 +-intelsync 3692/tcp Brimstone IntelSync +-intelsync 3692/udp Brimstone IntelSync +-# Davey Taylor <davey.taylor&brimstone.net> February 2003 +-# 3693-3694 Unassigned (Removed 2007-04-05) +-bmc-data-coll 3695/tcp BMC Data Collection +-bmc-data-coll 3695/udp BMC Data Collection +-# Portnoy Boxman <portnoy_boxman&bmc.com> February 2003 +-telnetcpcd 3696/tcp Telnet Com Port Control +-telnetcpcd 3696/udp Telnet Com Port Control +-# Thomas J. Pinkl <tom&pinkl.com> February 2003 +-nw-license 3697/tcp NavisWorks License System +-nw-license 3697/udp NavisWorks Licnese System +-# Tim Wiegand <tim.wiegand&navisworks.com> February 2003 +-sagectlpanel 3698/tcp SAGECTLPANEL +-sagectlpanel 3698/udp SAGECTLPANEL +-# Mark Gamble <mark.gamble&sage.com> February 2003 +-kpn-icw 3699/tcp Internet Call Waiting +-kpn-icw 3699/udp Internet Call Waiting +-# B.J. Kortekaas <b.j.kortekaas&kpn.com> February 2003 +-lrs-paging 3700/tcp LRS NetPage +-lrs-paging 3700/udp LRS NetPage +-# Geoffrey Wossum <geoffrey&pager.net> February 2003 +-netcelera 3701/tcp NetCelera +-netcelera 3701/udp NetCelera +-# Tarek Nabhan <standards&itworx.com> February 2003 +-ws-discovery 3702/tcp Web Service Discovery +-ws-discovery 3702/udp Web Service Discovery +-# Christian Huitema <huitemaµsoft.com> February 2003 +-adobeserver-3 3703/tcp Adobe Server 3 +-adobeserver-3 3703/udp Adobe Server 3 +-adobeserver-4 3704/tcp Adobe Server 4 +-adobeserver-4 3704/udp Adobe Server 4 +-# Frank Soetebeer <frsoeteb&adobe.com> January 2003 +-adobeserver-5 3705/tcp Adobe Server 5 +-adobeserver-5 3705/udp Adobe Server 5 +-# Previous Contact: Frank Soetebeer <frsoeteb&adobe.com> January 2003 +-# Current Contact: Bernd Paradies <bparadie&adobe.com> 14 January 2008 +-rt-event 3706/tcp Real-Time Event Port +-rt-event 3706/udp Real-Time Event Port +-rt-event-s 3707/tcp Real-Time Event Secure Port +-rt-event-s 3707/udp Real-Time Event Secure Port +-# Terry Gin <terry_gin&inter-tel.com> February 2003 +-sun-as-iiops 3708/tcp Sun App Svr - Naming +-sun-as-iiops 3708/udp Sun App Svr - Naming +-# Abhijit Kumar <as-iana-ports&sun.com> November 2005 +-ca-idms 3709/tcp CA-IDMS Server +-ca-idms 3709/udp CA-IDMS Server +-# Dave Ross <david.ross&ca.com> +-portgate-auth 3710/tcp PortGate Authentication +-portgate-auth 3710/udp PortGate Authentication +-# Scott Harris <Scott&XRamp.com> February 2003 +-edb-server2 3711/tcp EBD Server 2 +-edb-server2 3711/udp EBD Server 2 +-# Carlos Portela <cportela&simple-sw.com> February 2003 +-sentinel-ent 3712/tcp Sentinel Enterprise +-sentinel-ent 3712/udp Sentinel Enterprise +-# Ian Gordon <ian&n-genltd.co.uk> March 2003 +-tftps 3713/tcp TFTP over TLS +-tftps 3713/udp TFTP over TLS +-# Mark mayernick <Mark.Mayernick&thomson.net> March 2003 +-delos-dms 3714/tcp DELOS Direct Messaging +-delos-dms 3714/udp DELOS Direct Messaging +-# Ekkehard Morgenstern <flnca&gmx.de> March 2003 +-anoto-rendezv 3715/tcp Anoto Rendezvous Port +-anoto-rendezv 3715/udp Anoto Rendezvous Port +-# Ola Sandstrom <ola.sandstrom&anoto.com> March 2003 +-wv-csp-sms-cir 3716/tcp WV CSP SMS CIR Channel +-wv-csp-sms-cir 3716/udp WV CSP SMS CIR Channel +-wv-csp-udp-cir 3717/tcp WV CSP UDP/IP CIR Channel +-wv-csp-udp-cir 3717/udp WV CSP UDP/IP CIR Channel +-# Jon Ingi Ingimundarson <jii&oz.com> March 2003 +-opus-services 3718/tcp OPUS Server Port +-opus-services 3718/udp OPUS Server Port +-# Detlef Stoever <mail&ivotec.com> March 2003 +-itelserverport 3719/tcp iTel Server Port +-itelserverport 3719/udp iTel Server Port +-# Mark Hendricks <markah&copper.net> March 2003 +-ufastro-instr 3720/tcp UF Astro. Instr. Services +-ufastro-instr 3720/udp UF Astro. Instr. Services +-# David B. Hon <hon&astro.ufl.edu> March 2003 +-xsync 3721/tcp Xsync +-xsync 3721/udp Xsync +-xserveraid 3722/tcp Xserve RAID +-xserveraid 3722/udp Xserve RAID +-# Bob Bradley <bradley&apple.com> March 2003 +-sychrond 3723/tcp Sychron Service Daemon +-sychrond 3723/udp Sychron Service Daemon +-# Robert Marinelli <bob&sychron.com> March 2003 +-blizwow 3724/tcp World of Warcraft +-blizwow 3724/udp World of Warcraft +-# Domain Tech <Domainnametech&blizzard.com> April 2005 +-na-er-tip 3725/tcp Netia NA-ER Port +-na-er-tip 3725/udp Netia NA-ER Port +-# Jean-Pierre Garcia <jp.garcia&netia.net> April 2003 +-array-manager 3726/tcp Xyratex Array Manager +-array-manager 3726/udp Xyartex Array Manager +-# David A. Lethe <david_lethe&us.xyratex.com> April 2003 +-e-mdu 3727/tcp Ericsson Mobile Data Unit +-e-mdu 3727/udp Ericsson Mobile Data Unit +-e-woa 3728/tcp Ericsson Web on Air +-e-woa 3728/udp Ericsson Web on Air +-# Marco Casole <marco.casole&ericsson.com> April 2003 +-fksp-audit 3729/tcp Fireking Audit Port +-fksp-audit 3729/udp Fireking Audit Port +-# Richard Thurman <richt&fireking.com> April 2003 +-client-ctrl 3730/tcp Client Control +-client-ctrl 3730/udp Client Control +-# Lawrence W. Dunn <larrydunn&aptcomp.com> April 2003 +-smap 3731/tcp Service Manager +-smap 3731/udp Service Manager +-m-wnn 3732/tcp Mobile Wnn +-m-wnn 3732/udp Mobile Wnn +-# Yasunari Yamashita <yamasita&omronsoft.co.jp> April 2003 +-multip-msg 3733/tcp Multipuesto Msg Port +-multip-msg 3733/udp Multipuesto Msg Port +-# Felisa Ares <faa06&tid.es> April 2003 +-synel-data 3734/tcp Synel Data Collection Port +-synel-data 3734/udp Synel Data Collection Port +-# David Ashkenazi <david&synel.co.il> April 2003 +-pwdis 3735/tcp Password Distribution +-pwdis 3735/udp Password Distribution +-# Robert Erl <roerl&web.de> April 2003 +-rs-rmi 3736/tcp RealSpace RMI +-rs-rmi 3736/udp RealSpace RMI +-# Barry McDarby <realspace&starwolf.biz> April 2003 +-# 3737 Unassigned (Removed 2003-02-26) +-versatalk 3738/tcp versaTalk Server Port +-versatalk 3738/udp versaTalk Server Port +-# Dr. Kingsley C. Nwosu <knwosu&aglowmail.com> April 2003 +-launchbird-lm 3739/tcp Launchbird LicenseManager +-launchbird-lm 3739/udp Launchbird LicenseManager +-# Tom Hawkins <tom1&launchbird.com> April 2003 +-heartbeat 3740/tcp Heartbeat Protocol +-heartbeat 3740/udp Heartbeat Protocol +-# Jeroen Massar <jeroen&unfix.org> April 2003 +-wysdma 3741/tcp WysDM Agent +-wysdma 3741/udp WysDM Agent +-# Jim McDonald <Jim.McDonald&sysdm.com> April 2003 +-cst-port 3742/tcp CST - Configuration & Service Tracker +-cst-port 3742/udp CST - Configuration & Service Tracker +-# Hai Ou-Yang <hai.ou-yang&sun.com> April 2003 +-ipcs-command 3743/tcp IP Control Systems Ltd. +-ipcs-command 3743/udp IP Control Systems Ltd. +-# Paul Anderson <paul.anderson&ip-cs.com> April 2003 +-sasg 3744/tcp SASG +-sasg 3744/udp SASG +-# Cristian Petculescu <cristp&hotmail.com> April 2003 +-gw-call-port 3745/tcp GWRTC Call Port +-gw-call-port 3745/udp GWRTC Call Port +-# Felisa Ares <faa06&tid.es> April 2003 +-linktest 3746/tcp LXPRO.COM LinkTest +-linktest 3746/udp LXPRO.COM LinkTest +-linktest-s 3747/tcp LXPRO.COM LinkTest SSL +-linktest-s 3747/udp LXPRO.COM LinkTest SSL +-# Greg Bailey <gbailey&lxpro.com> April 2003 +-webdata 3748/tcp webData +-webdata 3748/udp webData +-# Michael Whiteley <michael&whiteley.com> April 2003 +-cimtrak 3749/tcp CimTrak +-cimtrak 3749/udp CimTrak +-# Robert E. Johnson, III <johnson.robert&cimcor.com> April 2003 +-cbos-ip-port 3750/tcp CBOS/IP ncapsalation port +-cbos-ip-port 3750/udp CBOS/IP ncapsalatoin port +-# Thomas Dannemiller <tom.dannemiller&rolls-royce.com> April 2003 +-gprs-cube 3751/tcp CommLinx GPRS Cube +-gprs-cube 3751/udp CommLinx GPRS Cube +-# Peter Johnson <peter&commlinx.com.au> April 2003 +-vipremoteagent 3752/tcp Vigil-IP RemoteAgent +-vipremoteagent 3752/udp Vigil-IP RemoteAgent +-# Bryan Alvord <bryan&vaticor.com> April 2003 +-nattyserver 3753/tcp NattyServer Port +-nattyserver 3753/udp NattyServer Port +-# Akira Saito <admin&kobu.com> April 2003 +-timestenbroker 3754/tcp TimesTen Broker Port +-timestenbroker 3754/udp TimesTen Broker Port +-# David Aspinwall <aspinwall&TimesTen.com> April 2003 +-sas-remote-hlp 3755/tcp SAS Remote Help Server +-sas-remote-hlp 3755/udp SAS Remote Help Server +-# Gary T. Ciampa <Gary.Ciampa&sas.com> April 2003 +-canon-capt 3756/tcp Canon CAPT Port +-canon-capt 3756/udp Canon CAPT Port +-# Takashi Okazawa <okazawa.takashi&canon.co.jp> April 2003 +-grf-port 3757/tcp GRF Server Port +-grf-port 3757/udp GRF Server Port +-# Robert Banfill <robert&banfill.net> April 2003 +-apw-registry 3758/tcp apw RMI registry +-apw-registry 3758/udp apw RMI registry +-# Dan Davis <Dan.A.Davis&hp.com> April 2003 +-exapt-lmgr 3759/tcp Exapt License Manager +-exapt-lmgr 3759/udp Exapt License Manager +-# Christoph Kukulies <info&exapt.de> April 2003 +-adtempusclient 3760/tcp adTempus Client +-adtempusclient 3760/udp adTEmpus Client +-# Bill Wingate <bill.wingate&arcanadev.com> May 2003 +-gsakmp 3761/tcp gsakmp port +-gsakmp 3761/udp gsakmp port +-# [RFC4535] +-gbs-smp 3762/tcp GBS SnapMail Protocol +-gbs-smp 3762/udp GBS SnapMail Protocol +-# Eric Harris-Braun <eric&glassbead.com> June 2003 +-xo-wave 3763/tcp XO Wave Control Port +-xo-wave 3763/udp XO Wave Control Port +-# Bjorn Dittmer-Roche <bjorn&xowave.com> June 2003 +-mni-prot-rout 3764/tcp MNI Protected Routing +-mni-prot-rout 3764/udp MNI Protected Routing +-# Tim Behne <timothybµwavenetworks.com> June 2003 +-rtraceroute 3765/tcp Remote Traceroute +-rtraceroute 3765/udp Remote Traceroute +-# A. Blake Cooper <blake&cluebie.net> June 2003 +-zieto-comms 3766/tcp Zieto Communication +-zieto-comms 3766/udp Zieto Communication +-# Malcolm McLean <malcolmm&zieto.co.za> May 2007 +-listmgr-port 3767/tcp ListMGR Port +-listmgr-port 3767/udp ListMGR Port +-# Takashi Kubota <kubota.takashi&pfu.fugitsu.com> June 2003 +-rblcheckd 3768/tcp rblcheckd server daemon +-rblcheckd 3768/udp rblcheckd server daemon +-# Sabri Berisha <sabri&cluecentral.net> June 2003 +-haipe-otnk 3769/tcp HAIPE Network Keying +-haipe-otnk 3769/udp HAIPE Network Keying +-# Mike Irani <irani&spawar.navy.mil> June 2003 +-cindycollab 3770/tcp Cinderella Collaboration +-cindycollab 3770/udp Cinderella Collaboration +-# Ulrich Kortenkamp <kortenkamp&cinderella.de> June 2003 +-paging-port 3771/tcp RTP Paging Port +-paging-port 3771/udp RTP Paging Port +-# Patrick Ferriter <Patrick.Ferriter&zultys.com> June 2003 +-ctp 3772/tcp Chantry Tunnel Protocol +-ctp 3772/udp Chantry Tunnel Protocol +-# Inderpreet Singh <isingh&chantrynetworks.com> June 2003 +-ctdhercules 3773/tcp ctdhercules +-ctdhercules 3773/udp ctdhercules +-# Carl Banzhof <cbanzhof&citadel.com> June 2003 +-zicom 3774/tcp ZICOM +-zicom 3774/udp ZICOM +-# Sabu Das <sabud&zicomsecure.com> June 2003 +-ispmmgr 3775/tcp ISPM Manager Port +-ispmmgr 3775/udp ISPM Manager Port +-# Eric Anderson <eanderson&netvision.com> June 2003 +-dvcprov-port 3776/tcp Device Provisioning Port +-dvcprov-port 3776/udp Device Provisioning Port +-# Rob Lehew <rlehewµsoft.com> June 2003 +-jibe-eb 3777/tcp Jibe EdgeBurst +-jibe-eb 3777/udp Jibe EdgeBurst +-# Chap Tippin <chad.tippin&jibeinc.com> June 2003 +-c-h-it-port 3778/tcp Cutler-Hammer IT Port +-c-h-it-port 3778/udp Cutler-Hammer IT Port +-# Thomas Ruchti <thomasmruchti&eaton.com> June 2003 +-cognima 3779/tcp Cognima Replication +-cognima 3779/udp Cognima Replication +-# Raplh Greenwell <iana&cognima.com> June 2003 +-nnp 3780/tcp Nuzzler Network Protocol +-nnp 3780/udp Nuzzler Network Protocol +-# Andreas Schwarz <andreas.schwarz&securepoint.de> June 2003 +-abcvoice-port 3781/tcp ABCvoice server port +-abcvoice-port 3781/udp ABCvoice server port +-# Carlos Gonzalez-Roman Ferrer <iana&abcdatos.com> June 2003 +-iso-tp0s 3782/tcp Secure ISO TP0 port +-iso-tp0s 3782/udp Secure ISO TP0 port +-# Herbert Falk <herb&sisconet.com> June 2003 +-bim-pem 3783/tcp Impact Mgr./PEM Gateway +-bim-pem 3783/udp Impact Mgr./PEM Gateway +-# Walter G. Giroir <walt_giroir&bmc.com> July 2003 +-bfd-control 3784/tcp BFD Control Protocol +-bfd-control 3784/udp BFD Control Protocol +-bfd-echo 3785/tcp BFD Echo Protocol +-bfd-echo 3785/udp BFD Echo Protocol +-# Dave Katz <dkatz&juniper.net> Dave Ward <dward&cisco.com> July 2003 +-upstriggervsw 3786/tcp VSW Upstrigger port +-upstriggervsw 3786/udp VSW Upstrigger port +-# Mark-Tim Junghanns <mjunghanns&vangerow.de> July 2003 +-fintrx 3787/tcp Fintrx +-fintrx 3787/udp Fintrx +-# Peter G.L. Potgieser <p.g.l.potgieser&interpay.nl> July 2003 +-isrp-port 3788/tcp SPACEWAY Routing port +-isrp-port 3788/udp SPACEWAY Routing port +-# Vaibhav Kumar <vakumar&hns.com> July 2003 +-remotedeploy 3789/tcp RemoteDeploy Administration Port +-remotedeploy 3789/udp RemoteDeploy Administration Port +-# Guenther Kroenert <guenther.kroenert&fujitsu-siemens.com> July 2003 +-quickbooksrds 3790/tcp QuickBooks RDS +-quickbooksrds 3790/udp QuickBooks RDS +-# Almira <almira_niciu&intuit.com> July 2003 +-tvnetworkvideo 3791/tcp TV NetworkVideo Data port +-tvnetworkvideo 3791/udp TV NetworkVideo Data port +-# Kevin Brunner <brunner&tivo.com> July 2003 +-sitewatch 3792/tcp e-Watch Corporation SiteWatch +-sitewatch 3792/udp e-Watch Corporation SiteWatch +-# John M. Baird <jbaird&e-watch.com> July 2003 +-dcsoftware 3793/tcp DataCore Software +-dcsoftware 3793/udp DataCore Software +-# Andre Cato <andre.cato&datacore.com> July 2003 +-jaus 3794/tcp JAUS Robots +-jaus 3794/udp JAUS Robots +-# Steven B. Cliff <scliff&remotec-andros.com> July 2003 +-myblast 3795/tcp myBLAST Mekentosj port +-myblast 3795/udp myBLAST Mekentosj port +-# Alexander Griekspoor <a.griekspoor&nki.nl> July 2003 +-spw-dialer 3796/tcp Spaceway Dialer +-spw-dialer 3796/udp Spaceway Dialer +-# Patrick Fisher <pfisher&hns.com> July 2003 +-idps 3797/tcp idps +-idps 3797/udp idps +-# Jean-Francois Rabasse <jfr&idps.org> July 2003 +-minilock 3798/tcp Minilock +-minilock 3798/udp Minilock +-# Daniel Julio Reyes <danieljreyes&yahoo.com> August 2003 +-radius-dynauth 3799/tcp RADIUS Dynamic Authorization +-radius-dynauth 3799/udp RADIUS Dynamic Authorization +-# RFC 3576 - July 2003 +-pwgpsi 3800/tcp Print Services Interface +-pwgpsi 3800/udp Print Services Interface +-# Harry Lewis <harryl&us.ibm.com> May 2003 +-ibm-mgr 3801/tcp ibm manager service +-ibm-mgr 3801/udp ibm manager service +-# Tim Hahn <hahnt&us.ibm.com> March 2006 +-vhd 3802/tcp VHD +-vhd 3802/udp VHD +-# Chris Duncombe <cdunc&atpeng.com> +-soniqsync 3803/tcp SoniqSync +-soniqsync 3803/udp SoniqSync +-# Ryan Melville <ryan_melville&soniqcast.com> January 2004 +-iqnet-port 3804/tcp Harman IQNet Port +-iqnet-port 3804/udp Harman IQNet Port +-# Bruce Vander Werf <bvanderwerf&crownintl.com> February 2004 +-tcpdataserver 3805/tcp ThorGuard Server Port +-tcpdataserver 3805/udp ThorGuard Server Port +-# Joel E. Steiger <jsteiger&eic-us.com> February 2004 +-wsmlb 3806/tcp Remote System Manager +-wsmlb 3806/udp Remote System Manager +-# Thomas Fiege <tfiege&us.ibm.com> February 2004 +-spugna 3807/tcp SpuGNA Communication Port +-spugna 3807/udp SpuGNA Communication Port +-# Samuele Sequi <samuelesequi&defcom.it> February 2004 +-sun-as-iiops-ca 3808/tcp Sun App Svr-IIOPClntAuth +-sun-as-iiops-ca 3808/udp Sun App Svr-IIOPClntAuth +-# Abhijit Kumar <as-iana-ports&sun.com> November 2005 +-apocd 3809/tcp Java Desktop System Configuration Agent +-apocd 3809/udp Java Desktop System Configuration Agent +-# Geoff Higgins <geoff.higgins&sun.com> March 2006 +-wlanauth 3810/tcp WLAN AS server +-wlanauth 3810/udp WLAN AS server +-# Bianling Zhang <blzhang&iwncomm.com> February 2004 +-amp 3811/tcp AMP +-amp 3811/udp AMP +-# Northon Rodrigues <northon.rodrigues&thomson.net> February 2004 +-neto-wol-server 3812/tcp netO WOL Server +-neto-wol-server 3812/udp netO WOL Server +-# Martin Bestmann <martin&no.netopia.com> March 2004 +-rap-ip 3813/tcp Rhapsody Interface Protocol +-rap-ip 3813/udp Rhapsody Interface Protocol +-# Paul Zander (Philips CFT) <p.j.zander&philips.com> March 2004 +-neto-dcs 3814/tcp netO DCS +-neto-dcs 3814/udp netO DCS +-# Martin Bestmann <martin&no.netopia.com> March 2004 +-lansurveyorxml 3815/tcp LANsurveyor XML +-lansurveyorxml 3815/udp LANsurveyor XML +-# Michael Swan <swan&neon.com> April 2004 +-sunlps-http 3816/tcp Sun Local Patch Server +-sunlps-http 3816/udp Sun Local Patch Server +-# Barry Greenberg <barry.greenberg&sun.com> April 2004 +-tapeware 3817/tcp Yosemite Tech Tapeware +-tapeware 3817/udp Yosemite Tech Tapeware +-# Luke Dion <ldion&tapeware.com> April 2004 +-crinis-hb 3818/tcp Crinis Heartbeat +-crinis-hb 3818/udp Crinis Heartbeat +-# Eric McMurry <emcmurry&crinisnetworks.com> April 2004 +-epl-slp 3819/tcp EPL Sequ Layer Protocol +-epl-slp 3819/udp EPL Sequ Layer Protocol +-# Hans Weibel <hans.weibel&zhwin.ch> October 2004 +-scp 3820/tcp Siemens AuD SCP +-scp 3820/udp Siemens AuD SCP +-# Johann Arnold <johann.arnold&siemens.com> October 2004 +-pmcp 3821/tcp ATSC PMCP Standard +-pmcp 3821/udp ATSC PMCP Standard +-# Graham Jones <gjones&nab.org> November 2004 +-acp-discovery 3822/tcp Compute Pool Discovery +-acp-discovery 3822/udp Compute Pool Discovery +-acp-conduit 3823/tcp Compute Pool Conduit +-acp-conduit 3823/udp Compute Pool Conduit +-acp-policy 3824/tcp Compute Pool Policy +-acp-policy 3824/udp Compute Pool Policy +-# Andy Belk <register1&azulsystems.com> February 2005 +-ffserver 3825/tcp Antera FlowFusion Process Simulation +-ffserver 3825/udp Antera FlowFusion Process Simulation +-# Armin Liebchen <armin&anteradesign.com> June 2007 +-wormux 3826/tcp Wormux server +-wormux 3826/udp Wormux server +-# DEFERT-SIMONNEAU <laurent_defert&yahoo.fr> June 2007 +-netmpi 3827/tcp Netadmin Systems MPI service +-netmpi 3827/udp Netadmin Systems MPI service +-# Göran Runfeldt <goran&netadmin.se> 10 July 2007 +-neteh 3828/tcp Netadmin Systems Event Handler +-neteh 3828/udp Netadmin Systems Event Handler +-neteh-ext 3829/tcp Netadmin Systems Event Handler External +-neteh-ext 3829/udp Netadmin Systems Event Handler External +-# Jonas Krogell <jonas.krogell&netadmin.se> 10 July 2007 +-cernsysmgmtagt 3830/tcp Cerner System Management Agent +-cernsysmgmtagt 3830/udp Cerner System Management Agent +-# Mike Craft <mcraft&cerner.com> 29 January 2008 +-dvapps 3831/tcp Docsvault Application Service +-dvapps 3831/udp Docsvault Application Service +-# Ketul Patel <ketulp76&yahoo.com> October 2006 +-xxnetserver 3832/tcp xxNETserver +-xxnetserver 3832/udp xxNETserver +-# Lawrence R. Bulduc <LBulduc&ATTGlobal.net> October 2006 +-aipn-auth 3833/tcp AIPN LS Authentication +-aipn-auth 3833/udp AIPN LS Authentication +-# Qiang Zhang <qzhang&iwncomm.com> October 2006 +-spectardata 3834/tcp Spectar Data Stream Service +-spectardata 3834/udp Spectar Data Stream Service +-spectardb 3835/tcp Spectar Database Rights Service +-spectardb 3835/udp Spectar Database Rights Service +-# Jan Rutger Voorhorst <janrutger&roadware.nl> October 2006 +-markem-dcp 3836/tcp MARKEM NEXTGEN DCP +-markem-dcp 3836/udp MARKEM NEXTGEN DCP +-mkm-discovery 3837/tcp MARKEM Auto-Discovery +-mkm-discovery 3837/udp MARKEM Auto-Discovery +-# Vadym Kargin <vkargin&markem.com> August 2005 +-sos 3838/tcp Scito Object Server +-sos 3838/udp Scito Object Server +-# Arno Klaassen <arno&ccr.jussieu.fr> November 2003 +-amx-rms 3839/tcp AMX Resource Management Suite +-amx-rms 3839/udp AMX Resource Management Suite +-# Ron Barber <ron.barber&amx.com> November 2003 +-flirtmitmir 3840/tcp www.FlirtMitMir.de +-flirtmitmir 3840/udp www.FlirtMitMir.de +-# Carsten Falticska <falticska&freenet.de> November 2003 +-zfirm-shiprush3 3841/tcp Z-Firm ShipRush v3 +-zfirm-shiprush3 3841/udp Z-Firm ShipRush v3 +-# Rafael Zimberoff <rafael&zfirmllc.com> November 2003 +-nhci 3842/tcp NHCI status port +-nhci 3842/udp NHCI status port +-# Eric Welch <eric&innosys.com> November 2003 +-quest-agent 3843/tcp Quest Common Agent +-quest-agent 3843/udp Quest Common Agent +-# Peter Maher <quest_iana&oz.quest.com> November 2003 +-rnm 3844/tcp RNM +-rnm 3844/udp RNM +-# sn0w of renegade labs <sn0w&devious.tsongkie.com> November 2003 +-v-one-spp 3845/tcp V-ONE Single Port Proxy +-v-one-spp 3845/udp V-ONE Single Port Proxy +-# Daniel Becker <dbecker&v-one.com> +-an-pcp 3846/tcp Astare Network PCP +-an-pcp 3846/udp Astare Network PCP +-# Tony Gulino <astaregod&hotmail.com> August 2003 +-msfw-control 3847/tcp MS Firewall Control +-msfw-control 3847/udp MS Firewall Control +-# Oren Trutner <orentrutµsoft.com> August 2003 +-item 3848/tcp IT Environmental Monitor +-item 3848/udp IT Environmental Monitor +-# Keith Wright <kwright&sensatronics.com> August 2003 +-spw-dnspreload 3849/tcp SPACEWAY DNS Preload +-spw-dnspreload 3849/udp SPACEWAY DNS Prelaod +-# Daniel Friedman <dfriedman&hns.com> August 2003 +-qtms-bootstrap 3850/tcp QTMS Bootstrap Protocol +-qtms-bootstrap 3850/udp QTMS Bootstrap Protocol +-# Phil Willis <phil.willis&prism-uk.com> August 2003 +-spectraport 3851/tcp SpectraTalk Port +-spectraport 3851/udp SpectraTalk Port +-# Madhav Karhade <madhav.karhade&wibhu.com> August 2003 +-sse-app-config 3852/tcp SSE App Configuration +-sse-app-config 3852/udp SSE App Configuration +-# Tim Wilson <tim.wilson&motorola.com> August 2003 +-sscan 3853/tcp SONY scanning protocol +-sscan 3853/udp SONY scanning protocol +-# Takashi Aihara <aiharat&sm.sony.co.jp> August 2003 +-stryker-com 3854/tcp Stryker Comm Port +-stryker-com 3854/udp Stryker Comm Port +-# Andrew Schultz <aschultz&strykercom.com> August 2003 +-opentrac 3855/tcp OpenTRAC +-opentrac 3855/udp OpenTRAC +-# Scott Miller <scott&opentrac.org> August 2003 +-informer 3856/tcp INFORMER +-informer 3856/udp INFORMER +-# Filippo Fadda <fadda&osway.com> August 2003 +-trap-port 3857/tcp Trap Port +-trap-port 3857/udp Trap Port +-# Norm Freedman <normfree&san.rr.com> August 2003 +-trap-port-mom 3858/tcp Trap Port MOM +-trap-port-mom 3858/udp Trap Port MOM +-# Norm Freedman <normfree&san.rr.com> August 2003 +-nav-port 3859/tcp Navini Port +-nav-port 3859/udp Navini Port +-# Chris Sanders <csanders&navini.com> August 2003 +-sasp 3860/tcp Server/Application State Protocol (SASP) +-sasp 3860/udp Server/Application State Protocol (SASP) +-# Alan Bivens <jbivens&us.ibm.com> August 2003 +-winshadow-hd 3861/tcp winShadow Host Discovery +-winshadow-hd 3861/udp winShadow Host Discovery +-# Shu-Wei Tan <stan&omnicomtech.com> March 2003 +-giga-pocket 3862/tcp GIGA-POCKET +-giga-pocket 3862/udp GIGA-POCKET +-# Yoshikazu Watanabe <nabe&sm.sony.co.jp> +-asap-tcp 3863/tcp asap tcp port +-asap-udp 3863/udp asap udp port +-# Lyndon Ong <lyong&ciena.com> August 2003 +-asap-sctp 3863/sctp asap sctp +-# Lyndon Ong <lyong&ciena.com> November 2005 +-asap-tcp-tls 3864/tcp asap/tls tcp port +-# Lyndon Ong <lyong&ciena.com> August 2003 +-asap-sctp-tls 3864/sctp asap-sctp/tls +-# Lyndon Ong <lyong&ciena.com> June 2006 +-xpl 3865/tcp xpl automation protocol +-xpl 3865/udp xpl automation protocol +-# Ian Lowe <ian&xplproject.org.uk> August 2003 +-dzdaemon 3866/tcp Sun SDViz DZDAEMON Port +-dzdaemon 3866/udp Sun SDViz DZDAEMON Port +-# Kevin Rushforth <kevin.rushforth&sun.com> August 2003 +-dzoglserver 3867/tcp Sun SDViz DZOGLSERVER Port +-dzoglserver 3867/udp Sun SDViz DZOGLSERVER Port +-# Kevin Rushforth <kevin.rushforth&sun.com> August 2003 +-diameter 3868/tcp DIAMETER +-# 3868/udp Reserved +-diameter 3868/sctp DIAMETER +-# RFC3588 +-ovsam-mgmt 3869/tcp hp OVSAM MgmtServer Disco +-ovsam-mgmt 3869/udp hp OVSAM MgmtServer Disco +-# Mike Pontillo <pontillo&hp.com> August 2003 +-ovsam-d-agent 3870/tcp hp OVSAM HostAgent Disco +-ovsam-d-agent 3870/udp hp OVSAM HostAgent Disco +-# Mike Pontillo <pontillo&hp.com> August 2003 +-avocent-adsap 3871/tcp Avocent DS Authorization +-avocent-adsap 3871/udp Avocent DS Authorization +-# Eduardo Fernandez <eduardo.fernandez&avocent.com> August 2003 +-oem-agent 3872/tcp OEM Agent +-oem-agent 3872/udp OEM Agent +-# Narain Jagathesan <narain.jagathesan&oracle.com> November 2003 +-fagordnc 3873/tcp fagordnc +-fagordnc 3873/udp fagordnc +-# Luis Zugasti <lzugasti&fagorautomation.es> November 2003 +-sixxsconfig 3874/tcp SixXS Configuration +-sixxsconfig 3874/udp SixXS Configuration +-# Jeroen Massar <jeroen&unfix.org> November 2003 +-pnbscada 3875/tcp PNBSCADA +-pnbscada 3875/udp PNBSCADA +-# Philip N. Bergstresser <phil&bergstresser.org> +-dl_agent 3876/tcp DirectoryLockdown Agent +-dl_agent 3876/udp DirectoryLockdown Agent +-# NetPro Computing <ports&netpro.com> October 2003 +-xmpcr-interface 3877/tcp XMPCR Interface Port +-xmpcr-interface 3877/udp XMPCR Interface Port +-# Christopher Carlson <cjc&dobbz.com> October 2003 +-fotogcad 3878/tcp FotoG CAD interface +-fotogcad 3878/udp FotoG CAD interface +-# Jason Szabo <jason.szabo&vexcel.com> October 2003 +-appss-lm 3879/tcp appss license manager +-appss-lm 3879/udp appss license manager +-# Peter Krueger <krueger&appss.de> October 2003 +-igrs 3880/tcp IGRS +-igrs 3880/udp IGRS +-# Huang Jingnan <huangjnb&lenovo.com> October 2003 +-idac 3881/tcp Data Acquisition and Control +-idac 3881/udp Data Acquisition and Control +-# Chatziandreoglou Christos <chatzi&xan.forthnet.gr> October 2003 +-msdts1 3882/tcp DTS Service Port +-msdts1 3882/udp DTS Service Port +-# Sergei Ivanov <sergeiµsoft.com> October 2003 +-vrpn 3883/tcp VR Peripheral Network +-vrpn 3883/udp VR Peripheral Network +-# Russell M. Taylor II <taylor&cs.unc.edu> October 2003 +-softrack-meter 3884/tcp SofTrack Metering +-softrack-meter 3884/udp SofTrack Metering +-# John T. McCann <jmccann&softwaremetering.com> October 2003 +-topflow-ssl 3885/tcp TopFlow SSL +-topflow-ssl 3885/udp TopFlow SSL +-# Ken Nelson <nelson&TopLayer.com> +-nei-management 3886/tcp NEI management port +-nei-management 3886/udp NEI management port +-# Kevin Murphy <kevin.murphy&networkengines.com> October 2003 +-ciphire-data 3887/tcp Ciphire Data Transport +-ciphire-data 3887/udp Ciphire Data Transport +-# Lars Eilebrecht <le+iana&leogic.com> October 2003 +-ciphire-serv 3888/tcp Ciphire Services +-ciphire-serv 3888/udp Ciphire Services +-# Lars Eilebrecht <le+iana&leogic.com> October 2003 +-dandv-tester 3889/tcp D and V Tester Control Port +-dandv-tester 3889/udp D and V Tester Control Port +-# Voiko Loukanov <v.loukanov&dvelectronics.com> October 2003 +-ndsconnect 3890/tcp Niche Data Server Connect +-ndsconnect 3890/udp Niche Data Server Connect +-# Roland Schneider <rsch&nicherms.com> October 2003 +-rtc-pm-port 3891/tcp Oracle RTC-PM port +-rtc-pm-port 3891/udp Oracle RTC-PM port +-# PV Shivkumar <p.shivkumar&oracle.com> October 2003 +-pcc-image-port 3892/tcp PCC-image-port +-pcc-image-port 3892/udp PCC-image-port +-# Shiro Tamoto <tamoto.shiro&jp.panasonic.com> October 2003 +-cgi-starapi 3893/tcp CGI StarAPI Server +-cgi-starapi 3893/udp CGI StarAPI Server +-# Garry Moore <garry.moore&cgi.com> October 2003 +-syam-agent 3894/tcp SyAM Agent Port +-syam-agent 3894/udp SyAM Agent Port +-# Michael Daniele <michael.daniele&syamsoftware.com> October 2003 +-syam-smc 3895/tcp SyAm SMC Service Port +-syam-smc 3895/udp SyAm SMC Service Port +-# Michael Daniele <michael.daniele&syamsoftware.com> October 2003 +-sdo-tls 3896/tcp Simple Distributed Objects over TLS +-sdo-tls 3896/udp Simple Distributed Objects over TLS +-# Alexander Philippou <alex&noemax.com> October 2003 +-sdo-ssh 3897/tcp Simple Distributed Objects over SSH +-sdo-ssh 3897/udp Simple Distributed Objects over SSH +-# Alexander Philippou <alex&noemax.com> October 2003 +-senip 3898/tcp IAS, Inc. SmartEye NET Internet Protocol +-senip 3898/udp IAS, Inc. SmartEye NET Internet Protocol +-# Matt Nowicki <nowickim&iasdirect.com> October 2003 +-itv-control 3899/tcp ITV Port +-itv-control 3899/udp ITV Port +-# Alex Nicu <alex.nicu&philips.com> October 2003 +-udt_os 3900/tcp Unidata UDT OS +-udt_os 3900/udp Unidata UDT OS +-# James Powell <james&mailhost.unidata.com> +-nimsh 3901/tcp NIM Service Handler +-nimsh 3901/udp NIM Service Handler +-# Paul B. Finley <pfinley&us.ibm.com> October 2003 +-nimaux 3902/tcp NIMsh Auxiliary Port +-nimaux 3902/udp NIMsh Auxiliary Port +-# Paul B. Finley <pfinley&us.ibm.com> October 2003 +-charsetmgr 3903/tcp CharsetMGR +-charsetmgr 3903/udp CharsetMGR +-# Tatsuya Ueda <tatsu&ist.fujitsu.com> October 2003 +-omnilink-port 3904/tcp Arnet Omnilink Port +-omnilink-port 3904/udp Arnet Omnilink Port +-# Ronen Shaul <ronen&arnetsystems.com> October 2003 +-mupdate 3905/tcp Mailbox Update (MUPDATE) protocol +-mupdate 3905/udp Mailbox Update (MUPDATE) protocol +-# [RFC3656] +-topovista-data 3906/tcp TopoVista elevation data +-topovista-data 3906/udp TopoVista elevation data +-# Gregg Townsend <gmt&cs.arizona.edu> November 2003 +-imoguia-port 3907/tcp Imoguia Port +-imoguia-port 3907/udp Imoguia Port +-# Emidio Cunha <emidio&janeladigital.com> November 2003 +-hppronetman 3908/tcp HP Procurve NetManagement +-hppronetman 3908/udp HP Procurve NetManagement +-# Devon Dawson <devon.dawson&hp.com> November 2003 +-surfcontrolcpa 3909/tcp SurfControl CPA +-surfcontrolcpa 3909/udp SurfControl CPA +-# Hywel Morgan <hywelm&surfcontrol.com> November 2003 +-prnrequest 3910/tcp Printer Request Port +-prnrequest 3910/udp Printer Request Port +-# Brett Green <brett_green&hp.com> November 2003 +-prnstatus 3911/tcp Printer Status Port +-prnstatus 3911/udp Printer Status Port +-# Brett Green <brett_green&hp.com> November 2003 +-gbmt-stars 3912/tcp Global Maintech Stars +-gbmt-stars 3912/udp Global Maintech Stars +-# Harry Goldschmitt <hgoldschmitt&hgac.com> November 2003 +-listcrt-port 3913/tcp ListCREATOR Port +-listcrt-port 3913/udp ListCREATOR Port +-# Tomokazu Asai <asai.tomokazu&pfu.fujitsu.com> November 2003 +-listcrt-port-2 3914/tcp ListCREATOR Port 2 +-listcrt-port-2 3914/udp ListCREATOR Port 2 +-# Tomokazu Asai <asai.tomokazu&pfu.fujitsu.com> November 2003 +-agcat 3915/tcp Auto-Graphics Cataloging +-agcat 3915/udp Auto-Graphics Cataloging +-# Paul Cope <prc&auto-graphics.com> November 2003 +-wysdmc 3916/tcp WysDM Controller +-wysdmc 3916/udp WysDM Controller +-# Jim McDonald <jim.mcdonald&sysdm.com> November 2003 +-aftmux 3917/tcp AFT multiplex port +-aftmux 3917/udp AFT multiples port +-# Alfred Schmidt <a.schmidt&aft-werdohl.de> November 2003 +-pktcablemmcops 3918/tcp PacketCableMultimediaCOPS +-pktcablemmcops 3918/udp PacketCableMultimediaCOPS +-# Eric Rosenfeld <e.rosenfeld&cablelabs.com> November 2003 +-hyperip 3919/tcp HyperIP +-hyperip 3919/udp HyperIP +-# Dave Reiland <dave.reiland&netex.com> November 2003 +-exasoftport1 3920/tcp Exasoft IP Port +-exasoftport1 3920/udp Exasoft IP Port +-# Alan Malik <alan&exasoft.co.uk> November 2003 +-herodotus-net 3921/tcp Herodotus Net +-herodotus-net 3921/udp Herodotus Net +-# Adam Gawne-Cain <adam&gawncainresearch.co.uk> November 2003 +-sor-update 3922/tcp Soronti Update Port +-sor-update 3922/udp Soronti Update Port +-# Carleton Watkins <carleton&soronti.com> November 2003 +-symb-sb-port 3923/tcp Symbian Service Broker +-symb-sb-port 3923/udp Symbian Service Broker +-# Ian McDowall <ian.mcdowall&symbian.com> November 2003 +-mpl-gprs-port 3924/tcp MPL_GPRS_PORT +-mpl-gprs-port 3924/udp MPL_GPRS_Port +-# David Barrass <david.barrass&minorplante.com> November 2003 +-zmp 3925/tcp Zoran Media Port +-zmp 3925/udp Zoran Media Port +-# Gerard Cerchio gjpc&circlesoft.com November 2003 +-winport 3926/tcp WINPort +-winport 3926/udp WINPort +-# Alwin Egger <alwin.egger&tegonal.com> November 2003 +-natdataservice 3927/tcp ScsTsr +-natdataservice 3927/udp ScsTsr +-# Ghanshyam Patel <gpatel&natinc.com> November 2003 +-netboot-pxe 3928/tcp PXE NetBoot Manager +-netboot-pxe 3928/udp PXE NetBoot Manager +-# Markus Treinen <markus.treinen&siemens.com> November 2003 +-smauth-port 3929/tcp AMS Port +-smauth-port 3929/udp AMS Port +-# Angelique Dokos <angelique.dokos&hp.com> November 2003 +-syam-webserver 3930/tcp Syam Web Server Port +-syam-webserver 3930/udp Syam Web Server Port +-# Michael Daniele <michael.daniele&syamsoftware.com> November 2003 +-msr-plugin-port 3931/tcp MSR Plugin Port +-msr-plugin-port 3931/udp MSR Plugin Port +-# Ron Steed <rsteed&cemaphore.com> November 2003 +-dyn-site 3932/tcp Dynamic Site System +-dyn-site 3932/udp Dynamic Site System +-# Steve Qi <steve.qi&dyn-site.com> November 2003 +-plbserve-port 3933/tcp PL/B App Server User Port +-plbserve-port 3933/udp PL/B App Server User Port +-# Edward R. Boedecker <boedeck1&flash.net> November 2003 +-sunfm-port 3934/tcp PL/B File Manager Port +-sunfm-port 3934/udp PL/B File Manager Port +-# Edward R. Boedecker <boedeck1&flash.net> November 2003 +-sdp-portmapper 3935/tcp SDP Port Mapper Protocol +-sdp-portmapper 3935/udp SDP Port Mapper Protocol +-# James Pinkerton <jpinkµsoft.com> November 2003 +-mailprox 3936/tcp Mailprox +-mailprox 3936/udp Mailprox +-# Christof Drescher <drescher&mailprox.net> November 2003 +-dvbservdscport 3937/tcp DVB Service Disc Port +-dvbservdscport 3937/udp DVB Service Disc Port +-# Bert van Willigen <bert.vanwilligen&philips.com> Novebmer 2003 +-dbcontrol_agent 3938/tcp Oracle dbControl Agent po +-dbcontrol_agent 3938/udp Oracel dbControl Agent po +-# Todd Guay <todd.guay&oracle.com> November 2003 +-aamp 3939/tcp Anti-virus Application Management Port +-aamp 3939/udp Anti-virus Application Management Port +-# In-sik Choi <iscard&virusdesk.com> February 2002 +-xecp-node 3940/tcp XeCP Node Service +-xecp-node 3940/udp XeCP Node Service +-# Brent McCullough <bmccullough&timemgmt.com> November 2003 +-homeportal-web 3941/tcp Home Portal Web Server +-homeportal-web 3941/udp Home Portal Web Server +-# Christian Beaumont <chrisb&lantronix.com> November 2003 +-srdp 3942/tcp satellite distribution +-srdp 3942/udp satellite distribution +-# Simone Molendini <simone.molendini&unile.it> November 2003 +-tig 3943/tcp TetraNode Ip Gateway +-tig 3943/udp TetraNode Ip Gateway +-# B. van Klinken <b.vklinken&rohill.nl> December 2003 +-sops 3944/tcp S-Ops Management +-sops 3944/udp S-Ops Management +-# Stefan Hochuli <iana.org&dunes.ch> December 2003 +-emcads 3945/tcp EMCADS Server Port +-emcads 3945/udp EMCADS Server Port +-# Lars Struwe Christensen <lsc&giritech.com> January 2004 +-backupedge 3946/tcp BackupEDGE Server +-backupedge 3946/udp BackupEDGE Server +-# Frank Liberato <frankµlite.com> June 2004 +-ccp 3947/tcp Connect and Control Protocol for Consumer, Commercial, and Industrial Electronic Devices +-ccp 3947/udp Connect and Control Protocol for Consumer, Commercial, and Industrial Electronic Devices +-# Aaron Myer <aaron.myer&in2nets.com> June 2004 +-apdap 3948/tcp Anton Paar Device Administration Protocol +-apdap 3948/udp Anton Paar Device Administration Protocol +-# Martin Leitner <info&anton-paar.com> June 2004 +-drip 3949/tcp Dynamic Routing Information Protocol +-drip 3949/udp Dynamic Routing Information Protocol +-# Dana Blair <dblair&cisco.com> June 2004 +-namemunge 3950/tcp Name Munging +-namemunge 3950/udp Name Munging +-# John C. Klensin <klensin&jck.com> July 2004 +-pwgippfax 3951/tcp PWG IPP Facsimile +-pwgippfax 3951/udp PWG IPP Facsimile +-# Ira McDonald <imcdonald&sharplabs.com> August 2004 +-i3-sessionmgr 3952/tcp I3 Session Manager +-i3-sessionmgr 3952/udp I3 Session Manager +-# Mike Gagle <mikeg&inin.com> August 2004 +-xmlink-connect 3953/tcp Eydeas XMLink Connect +-xmlink-connect 3953/udp Eydeas XMLink Connect +-# David Crewson <davidc&eydeas.net> September 2004 +-adrep 3954/tcp AD Replication RPC +-adrep 3954/udp AD Replication RPC +-# Robert Ball <robert.ball&smiths-aerospace.com> August 2005 +-p2pcommunity 3955/tcp p2pCommunity +-p2pcommunity 3955/udp p2pCommunity +-# Tiago Bittencourt Silva <tiagobs&ufpr.br> August 2005 +-gvcp 3956/tcp GigE Vision Control +-gvcp 3956/udp GigE Vision Control +-# Eric Carey <ecarey&corecoimaging.com> August 2005 +-mqe-broker 3957/tcp MQEnterprise Broker +-mqe-broker 3957/udp MQEnterprise Broker +-mqe-agent 3958/tcp MQEnterprise Agent +-mqe-agent 3958/udp MQEnterprise Agent +-# Bob Lauria <bob.lauria&asg.com> August 2005 +-treehopper 3959/tcp Tree Hopper Networking +-treehopper 3959/udp Tree Hopper Networking +-# Gary Whelan <gwhelan&sybonic.com> August 2005 +-bess 3960/tcp Bess Peer Assessment +-bess 3960/udp Bess Peer Assessment +-# Peter Verdon <bess&dcs.warwick.ac.uk> August 2005 +-proaxess 3961/tcp ProAxess Server +-proaxess 3961/udp ProAxess Server +-# Jonas Ahlqvist <jonas.a&informationssystem.se> August 2005 +-sbi-agent 3962/tcp SBI Agent Protocol +-sbi-agent 3962/udp SBI Agent Protocol +-# Yossi Appleboum <yossia&web-silicon.com> August 2005 +-thrp 3963/tcp Teran Hybrid Routing Protocol +-thrp 3963/udp Teran Hybrid Routing Protocol +-# Spencer Teran <steran&dotalot.com> August 2005 +-sasggprs 3964/tcp SASG GPRS +-sasggprs 3964/udp SASG GPRS +-# Cristian Petculescu <petcu40&gmail.com> August 2005 +-ati-ip-to-ncpe 3965/tcp Avanti IP to NCPE API +-ati-ip-to-ncpe 3965/udp Avanti IP to NCPE API +-# Steve Meyer, Sr. <stevem&avanti-tech.com> August 2005 +-bflckmgr 3966/tcp BuildForge Lock Manager +-bflckmgr 3966/udp BuildForge Lock Manager +-# Joe Senner <jsenner&buildforge.com> August 2005 +-ppsms 3967/tcp PPS Message Service +-ppsms 3967/udp PPS Message Service +-# Bart Schaefer <bart&suburbansoftware.com> August 2005 +-ianywhere-dbns 3968/tcp iAnywhere DBNS +-ianywhere-dbns 3968/udp iAnywhere DBNS +-# Graeme Perrow <gperrow&ianywhere.com> August 2005 +-landmarks 3969/tcp Landmark Messages +-landmarks 3969/udp Landmark Messages +-# Petri Rauhala <petri.rauhala&nokia.com> August 2005 +-lanrevagent 3970/tcp LANrev Agent +-lanrevagent 3970/udp LANrev Agent +-lanrevserver 3971/tcp LANrev Server +-lanrevserver 3971/udp LANrev Server +-# Martin Bestmann <martin&poleposition-sw.com> August 2005 +-iconp 3972/tcp ict-control Protocol +-iconp 3972/udp ict-control Protocol +-# Roel Harbers <r.harbers&ict-control.com> August 2005 +-progistics 3973/tcp ConnectShip Progistics +-progistics 3973/udp ConnectShip Progistics +-# Jeff Skaistis <jskaistis&connectship.com> August 2005 +-citysearch 3974/tcp Remote Applicant Tracking Service +-citysearch 3974/udp Remote Applicant Tracking Service +-# Marc Castelluccio <mcastell&areanetworks.net> August 2005 +-airshot 3975/tcp Air Shot +-airshot 3975/udp Air Shot +-# Shingo Kimura <Shingo.Kimura&jp.sony.com> August 2005 +-opswagent 3976/tcp Opsware Agent +-opswagent 3976/udp Opsware Agent +-opswmanager 3977/tcp Opsware Manager +-opswmanager 3977/udp Opsware Manager +-# Dave Jagoda <dj&opsware.com> June 2006 +-secure-cfg-svr 3978/tcp Secured Configuration Server +-secure-cfg-svr 3978/udp Secured Configuration Server +-# Dr. Anupam Bharali <paniana&gmail.com> June 2006 +-smwan 3979/tcp Smith Micro Wide Area Network Service +-smwan 3979/udp Smith Micro Wide Area Network Service +-# David Sperling <dsperling&smithmicro.com> June 2006 +-acms 3980/tcp Aircraft Cabin Management System +-acms 3980/udp Aircraft Cabin Management System +-# Dustin Zack <dustin.e.zack&gmail.com> June 2006 +-starfish 3981/tcp Starfish System Admin +-starfish 3981/udp Starfish System Admin +-# Dan Razzell <dan&starfishsystems.ca> June 2006 +-eis 3982/tcp ESRI Image Server +-eis 3982/udp ESRI Image Server +-eisp 3983/tcp ESRI Image Service +-eisp 3983/udp ESRI Image Service +-# Keith Ryden <kryden&esri.com> July 2006 +-mapper-nodemgr 3984/tcp MAPPER network node manager +-mapper-nodemgr 3984/udp MAPPER network node manager +-mapper-mapethd 3985/tcp MAPPER TCP/IP server +-mapper-mapethd 3985/udp MAPPER TCP/IP server +-mapper-ws_ethd 3986/tcp MAPPER workstation server +-mapper-ws_ethd 3986/udp MAPPER workstation server +-# John C. Horton <jch&unirsvl.rsvl.unisys.com> +-centerline 3987/tcp Centerline +-centerline 3987/udp Centerline +-# Mark Simpson <simpson¢erline.com> +-dcs-config 3988/tcp DCS Configuration Port +-dcs-config 3988/udp DCS Configuration Port +-# Ian Cargill <ian.cargill&e-dendrite.com> August 2005 +-bv-queryengine 3989/tcp BindView-Query Engine +-bv-queryengine 3989/udp BindView-Query Engine +-bv-is 3990/tcp BindView-IS +-bv-is 3990/udp BindView-IS +-bv-smcsrv 3991/tcp BindView-SMCServer +-bv-smcsrv 3991/udp BindView-SMCServer +-bv-ds 3992/tcp BindView-DirectoryServer +-bv-ds 3992/udp BindView-DirectoryServer +-bv-agent 3993/tcp BindView-Agent +-bv-agent 3993/udp BindView-Agent +-# David A. Gayler <David.Gayler&bindview.com> August 2005 +-objserver 3994/tcp Objectika Administrator Server +-objserver 3994/udp Objectika Administrator Server +-# Objectika Ltd <objectika&gmail.com> July 2006 +-iss-mgmt-ssl 3995/tcp ISS Management Svcs SSL +-iss-mgmt-ssl 3995/udp ISS Management Svcs SSL +-# Wes Wilson <wwilson&iss.net> October 2003 +-abcsoftware 3996/tcp abcsoftware-01 +-abscoftware 3996/udp abcsoftware-01 +-# Andrew Zimmerman <andrew&zimmerman.net> June 2004 +-agentsease-db 3997/tcp aes_db +-agentsease-db 3997/udp aes_db +-# Colin Hughes <chughes&agentsease.net> February 2006 +-dnx 3998/tcp Distributed Nagios Executor Service +-dnx 3998/udp Distributed Nagios Executor Service +-# John Calcote <jcalcote&users.sourceforge.net> 06 November 2007 +-nvcnet 3999/tcp Norman distributes scanning service +-nvcnet 3999/udp Norman distributes scanning service +-# Kristian A. Bognaes, Norman ASA <kbo&norman.no> 06 November 2007 +-terabase 4000/tcp Terabase +-terabase 4000/udp Terabase +-# Thor Olson <Thor&terabase.com> +-####### Potential Conflict of ports ################################ +-####### PORT 4000 also used by ICQ <www.icq.com> ################### +-newoak 4001/tcp NewOak +-newoak 4001/udp NewOak +-# Jim Philippou <jphilippou&newoak.com> +-pxc-spvr-ft 4002/tcp pxc-spvr-ft +-pxc-spvr-ft 4002/udp pxc-spvr-ft +-pxc-splr-ft 4003/tcp pxc-splr-ft +-pxc-splr-ft 4003/udp pxc-splr-ft +-pxc-roid 4004/tcp pxc-roid +-pxc-roid 4004/udp pxc-roid +-pxc-pin 4005/tcp pxc-pin +-pxc-pin 4005/udp pxc-pin +-pxc-spvr 4006/tcp pxc-spvr +-pxc-spvr 4006/udp pxc-spvr +-pxc-splr 4007/tcp pxc-splr +-pxc-splr 4007/udp pxc-splr +-# Dave Nesbitt <nesbitt&cp10.es.xerox.com> +-netcheque 4008/tcp NetCheque accounting +-netcheque 4008/udp NetCheque accounting +-# B. Clifford Neuman <bcn&isi.edu> +-chimera-hwm 4009/tcp Chimera HWM +-chimera-hwm 4009/udp Chimera HWM +-# Ken Anderson <kanderso&kleber.ICS.UCI.EDU> +-samsung-unidex 4010/tcp Samsung Unidex +-samsung-unidex 4010/udp Samsung Unidex +-# Konstantin V. Vyaznikov <kv&ssm6000.samsung.ru> +-altserviceboot 4011/tcp Alternate Service Boot +-altserviceboot 4011/udp Alternate Service Boot +-# Eric Dittert <Eric_Dittert&ccm.jf.intel.com> +-pda-gate 4012/tcp PDA Gate +-pda-gate 4012/udp PDA Gate +-# Masakuni Okada <masakuni&jp.ibm.com> +-acl-manager 4013/tcp ACL Manager +-acl-manager 4013/udp ACL Manager +-# Toru Murai <murai&saint.nm.fujitsu.co.jp> +-taiclock 4014/tcp TAICLOCK +-taiclock 4014/udp TAICLOCK +-# Dan Bernstein <djb&koobera.math.uic.edu> +-talarian-mcast1 4015/tcp Talarian Mcast +-talarian-mcast1 4015/udp Talarian Mcast +-talarian-mcast2 4016/tcp Talarian Mcast +-talarian-mcast2 4016/udp Talarian Mcast +-talarian-mcast3 4017/tcp Talarian Mcast +-talarian-mcast3 4017/udp Talarian Mcast +-talarian-mcast4 4018/tcp Talarian Mcast +-talarian-mcast4 4018/udp Talarian Mcast +-talarian-mcast5 4019/tcp Talarian Mcast +-talarian-mcast5 4019/udp Talarian Mcast +-# Geoff Mendal <mendal&talarian.com> +-trap 4020/tcp TRAP Port +-trap 4020/udp TRAP Port +-# Jeffrey C. Byrd <admin&vspacegroup.com> +-nexus-portal 4021/tcp Nexus Portal +-nexus-portal 4021/udp Nexus Portal +-# Damian Tarnawsky <support&nexusconcepts.com> +-dnox 4022/tcp DNOX +-dnox 4022/udp DNOX +-# Leo Rathnayake <leo&perlnet.com> +-esnm-zoning 4023/tcp ESNM Zoning Port +-esnm-zoning 4023/udp ESNM Zoning Port +-# Yong Cai <ycai&emc.com> +-tnp1-port 4024/tcp TNP1 User Port +-tnp1-port 4024/udp TNP1 User Port +-# Tony Gibbs <tony.gibbs&europe.simoco.com> +-partimage 4025/tcp Partition Image Port +-partimage 4025/udp Partition Image Port +-# Franck Ladurelle <ladurelf&partimage.org> +-as-debug 4026/tcp Graphical Debug Server +-as-debug 4026/udp Graphical Debug Server +-# Steve Halverson <shalver&us.ibm.com> +-bxp 4027/tcp bitxpress +-bxp 4027/udp bitxpress +-# Morgan Doyle <morgan&mpt.ie> +-dtserver-port 4028/tcp DTServer Port +-dtserver-port 4028/udp DTServer Port +-# Stephen Aikins <stephen.aikins&embarcadero.com> +-ip-qsig 4029/tcp IP Q signaling protocol +-ip-qsig 4029/udp IP Q signaling protocol +-# Toru Tachibana <tatibana&exs.ts.fujitsu.co.jp> +-jdmn-port 4030/tcp Accell/JSP Daemon Port +-jdmn-port 4030/udp Accell/JSP Daemon Port +-# Art Grand <aig&unify.com> +-suucp 4031/tcp UUCP over SSL +-suucp 4031/udp UUCP over SSL +-# Harald Welte <laforge&gnumonks.org> +-vrts-auth-port 4032/tcp VERITAS Authorization Service +-vrts-auth-port 4032/udp VERITAS Authorization Service +-# Stefan Winkel <stefan&veritas.com> +-sanavigator 4033/tcp SANavigator Peer Port +-sanavigator 4033/udp SANavigator Peer Port +-# Robert J. Chansler <robert.chansler&mcdata.com> +-ubxd 4034/tcp Ubiquinox Daemon +-ubxd 4034/udp Ubiquinox Daemon +-# Kit Smithers <ksmithers&argogroup.com> +-wap-push-http 4035/tcp WAP Push OTA-HTTP port +-wap-push-http 4035/udp WAP Push OTA-HTTP port +-wap-push-https 4036/tcp WAP Push OTA-HTTP secure +-wap-push-https 4036/udp WAP Push OTA-HTTP secure +-# Matthieu Lachance +-# <matthieu.lachance&openwave.com> +-ravehd 4037/tcp RaveHD network control +-ravehd 4037/udp RaveHD network control +-# Jason Howard <jason&spectsoft.com> January 2006 +-fazzt-ptp 4038/tcp Fazzt Point-To-Point +-fazzt-ptp 4038/udp Fazzt Point-To-Point +-fazzt-admin 4039/tcp Fazzt Administration +-fazzt-admin 4039/udp Fazzt Administration +-# Lewis Wolfgang <wolfgang&kencast.com> May 2006 +-yo-main 4040/tcp Yo.net main service +-yo-main 4040/udp Yo.net main service +-# John Tintor <jt&yo.net> +-houston 4041/tcp Rocketeer-Houston +-houston 4041/udp Rocketeer-Houston +-# Johnny C. Norris II <jnorris&uiuc.edu> +-ldxp 4042/tcp LDXP +-ldxp 4042/udp LDXP +-# Craig Calef <craig&katmango.com> +-nirp 4043/tcp Neighbour Identity Resolution +-nirp 4043/udp Neighbour Identity Resolution +-ltp 4044/tcp Location Tracking Protocol +-ltp 4044/udp Location Tracking Protocol +-npp 4045/tcp Network Paging Protocol +-npp 4045/udp Network Paging Protocol +-acp-proto 4046/tcp Accounting Protocol +-acp-proto 4046/udp Accounting Protocol +-ctp-state 4047/tcp Context Transfer Protocol +-ctp-state 4047/udp Context Transfer Protocol +-# Hesham Soliman <H.Soliman&flarion.com> November 2005 +-objadmin 4048/tcp Objectika Administrator Agent +-objadmin 4048/udp Objectika Administrator Agent +-# Objectika Ltd <objectika&gmail.com> June 2006 +-wafs 4049/tcp Wide Area File Services +-wafs 4049/udp Wide Area File Services +-# Yuval Hager <yuval&avramzon.net> January 2006 +-cisco-wafs 4050/tcp Wide Area File Services +-cisco-wafs 4050/udp Wide Area File Services +-# Etai Lev-Ran <elevran&cisco.com> February 2005 +-cppdp 4051/tcp Cisco Peer to Peer Distribution Protocol +-cppdp 4051/udp Cisco Peer to Peer Distribution Protocol +-# Susan Sauter <ssauter&cisco.com> July 2006 +-interact 4052/tcp VoiceConnect Interact +-interact 4052/udp VoiceConnect Interact +-# Jonathan Custance <jevc&camrivox.com> July 2006 +-ccu-comm-1 4053/tcp CosmoCall Universe Communications Port 1 +-ccu-comm-1 4053/udp CosmoCall Universe Communications Port 1 +-ccu-comm-2 4054/tcp CosmoCall Universe Communications Port 2 +-ccu-comm-2 4054/udp CosmoCall Universe Communications Port 2 +-ccu-comm-3 4055/tcp CosmoCall Universe Communications Port 3 +-ccu-comm-3 4055/udp CosmoCall Universe Communications Port 3 +-# Steve Dellutri <sdellutri&cosmocom.com> July 2006 +-lms 4056/tcp Location Message Service +-lms 4056/udp Location Message Service +-# Sergey Burnevsky <sergey.burnevsky&nokia.com> August 2006 +-wfm 4057/tcp Servigistics WFM server +-wfm 4057/udp Servigistics WFM server +-# Yuri Machkasov <ymachkasov&servigistics.com> August 2006 +-kingfisher 4058/tcp Kingfisher protocol +-kingfisher 4058/udp Kingfisher protocol +-# Vaughan Wesson <vaughanw&rtunet.com> October 2006 +-dlms-cosem 4059/tcp DLMS/COSEM +-dlms-cosem 4059/udp DLMS/COSEM +-# Gyozo Kmethy <gyozo.kmethy&gnarus.hu> November 2006 +-dsmeter_iatc 4060/tcp DSMETER Inter-Agent Transfer Channel +-dsmeter_iatc 4060/udp DSMETER Inter-Agent Transfer Channel +-# john mccann <jmccann&visualclick.com> December 2006 +-ice-location 4061/tcp Ice Location Service (TCP) +-ice-location 4061/udp Ice Location Service (TCP) +-ice-slocation 4062/tcp Ice Location Service (SSL) +-ice-slocation 4062/udp Ice Location Service (SSL) +-ice-router 4063/tcp Ice Firewall Traversal Service (TCP) +-ice-router 4063/udp Ice Firewall Traversal Service (TCP) +-ice-srouter 4064/tcp Ice Firewall Traversal Service (SSL) +-ice-srouter 4064/udp Ice Firewall Traversal Service (SSL) +-# Bernard Normier <bernard&zeroc.com> December 2006 +-avanti_cdp 4065/tcp Avanti Common Data +-avanti_cdp 4065/udp Avanti Common Data +-# Steve Meyer, Sr. <stevem&avanti-tech.com> February 2007 +-pmas 4066/tcp Performance Measurement and Analysis +-pmas 4066/udp Performance Measurement and Analysis +-# Zenon Fortuna <zenon&mips.com> February 2007 +-idp 4067/tcp Information Distribution Protocol +-idp 4067/udp Information Distribution Protocol +-# Michaela Vanderveen <mvandervn&yahoo.com> February 2007 +-ipfltbcst 4068/tcp IP Fleet Broadcast +-ipfltbcst 4068/udp IP Fleet Broadcast +-# Trung Huu Tran <trung.tran&navy.mil> March 2007 +-minger 4069/tcp Minger Email Address Validation Service +-minger 4069/udp Minger Email Address Validation Service +-# Arvel Hathcock <arvel&altn.com> March 2007 +-tripe 4070/tcp Trivial IP Encryption (TrIPE) +-tripe 4070/udp Trivial IP Encryption (TrIPE) +-# Mark Wooding <mdw&distorted.org.uk> 10 July 2007 +-aibkup 4071/tcp Automatically Incremental Backup +-aibkup 4071/udp Automatically Incremental Backup +-# Volker Wiegand <volker.wiegand&t-online.de> 10 July 2007 +-zieto-sock 4072/tcp Zieto Socket Communications +-zieto-sock 4072/udp Zieto Socket Communications +-# Malcolm McLean <malcolmm&zieto.co.za> 19 July 2007 +-iRAPP 4073/tcp iRAPP Server Protocol +-iRAPP 4073/udp iRAPP Server Protocol +-# Vladimir Bickov <vbickov&coderebel.com> 20 August 2007 +-cequint-cityid 4074/tcp Cequint City ID UI trigger +-cequint-cityid 4074/udp Cequint City ID UI trigger +-# Phill Goeckler <pgoeckler&Cequint.com> 20 August 2007 +-perimlan 4075/tcp ISC Alarm Message Service +-perimlan 4075/udp ISC Alarm Message Service +-# Bernie Malkowski <bmalkowski&integratedsecuritycorp.com> 20 August 2007 +-seraph 4076/tcp Seraph DCS +-seraph 4076/udp Seraph DCS +-# Jason Spence <jspence&lightconsulting.com> 22 January 2008 +-# 4077-4079 Unassigned +-lorica-in 4080/tcp Lorica inside facing +-lorica-in 4080/udp Lorica inside facing +-lorica-in-sec 4081/tcp Lorica inside facing (SSL) +-lorica-in-sec 4081/udp Lorica inside facing (SSL) +-lorica-out 4082/tcp Lorica outside facing +-lorica-out 4082/udp Lorica outside facing +-lorica-out-sec 4083/tcp Lorica outside facing (SSL) +-lorica-out-sec 4083/udp Lorica outside facing (SSL) +-# Johannes Skov Frandsen <joe&42tools.com> 28 February 2008 +-# 4084-4088 Unassigned +-opencore 4089/tcp OpenCORE Remote Control Service +-opencore 4089/udp OpenCORE Remote Control Service +-# Pim van Riezen <registries&panelsix.com> July 2006 +-omasgport 4090/tcp OMA BCAST Service Guide +-omasgport 4090/udp OMA BCAST Service Guide +-# Mark Lipford <mark.a.lipford&sprint.com> July 2006 +-ewinstaller 4091/tcp EminentWare Installer +-ewinstaller 4091/udp EminentWare Installer +-ewdgs 4092/tcp EminentWare DGS +-ewdgs 4092/udp EminentWare DGS +-# David A. Gayler <dgayler&eminentware.com> July 2006 +-pvxpluscs 4093/tcp Pvx Plus CS Host +-pvxpluscs 4093/udp Pvx Plus CS Host +-# Michael King <mike.king&pvxplus.com> July 2006 +-sysrqd 4094/tcp sysrq daemon +-sysrqd 4094/udp sysrq daemon +-# Julien Danjou <acid&debian.org> July 2006 +-xtgui 4095/tcp xtgui information service +-xtgui 4095/udp xtgui information service +-# Jim Robanske <jimr&cray.com> May 2006 +-bre 4096/tcp BRE (Bridge Relay Element) +-bre 4096/udp BRE (Bridge Relay Element) +-# Stephen Egbert <egbert&ra.timeplex.com> +-patrolview 4097/tcp Patrol View +-patrolview 4097/udp Patrol View +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-drmsfsd 4098/tcp drmsfsd +-drmsfsd 4098/udp drmsfsd +-# Masao Iwai <iwai&kel.fujitsu.co.jp> +-dpcp 4099/tcp DPCP +-dpcp 4099/udp DPCP +-# John Croft <john.croft&calista.demon.co.uk> +-igo-incognito 4100/tcp IGo Incognito Data Port +-igo-incognito 4100/udp IGo Incognito Data Port +-# Paul Reddy <support&igo-incognito.com> February 2002 +-brlp-0 4101/tcp Braille protocol +-brlp-0 4101/udp Braille protocol +-brlp-1 4102/tcp Braille protocol +-brlp-1 4102/udp Braille protocol +-brlp-2 4103/tcp Braille protocol +-brlp-2 4103/udp Braille protocol +-brlp-3 4104/tcp Braille protocol +-brlp-3 4104/udp Braille protocol +-# SÃbastien Hinderer <Sebastien.Hinderer&ens-lyon.org> March 2006 +-shofarplayer 4105/tcp ShofarPlayer +-shofarplayer 4105/udp ShofarPlayer +-# John Kozlowski <John.Kozlowski&HeritageSystems.com> July 2006 +-synchronite 4106/tcp Synchronite +-synchronite 4106/udp Synchronite +-# James Figgins <james.figgins&durodata.co.uk> July 2006 +-j-ac 4107/tcp JDL Accounting LAN Service +-j-ac 4107/udp JDL Accounting LAN Service +-# Takashi Sahara <sahara&jdl.co.jp> September 2006 +-accel 4108/tcp ACCEL +-accel 4108/udp ACCEL +-# Masahiro Koiwai <Koiwai.Masahiro&exc.epson.co.jp> October 2006 +-izm 4109/tcp Instantiated Zero-control Messaging +-izm 4109/udp Instantiated Zero-control Messaging +-# David Miller <dave.dsm&gmail.com> February 2007 +-g2tag 4110/tcp G2 RFID Tag Telemetry Data +-g2tag 4110/udp G2 RFID Tag Telemetry Data +-# David Goodall <david.goodall&g2microsystems.com> February 2007 +-xgrid 4111/tcp Xgrid +-xgrid 4111/udp Xgrid +-# David Kramer <dkramer&apple.com> November 2004 +-apple-vpns-rp 4112/tcp Apple VPN Server Reporting Protocol +-apple-vpns-rp 4112/udp Apple VPN Server Reporting Protocol +-# Christophe Allie <callie&apple.com> August 2006 +-aipn-reg 4113/tcp AIPN LS Registration +-aipn-reg 4113/udp AIPN LS Registration +-# Qiang Zhang <iad&iwncomm.com> October 2006 +-jomamqmonitor 4114/tcp JomaMQMonitor +-jomamqmonitor 4114/udp JomaMQMonitor +-# Marcel Hofstetter <marcel.hofstetter&jomasoft.ch> January 2003 +-cds 4115/tcp CDS Transfer Agent +-cds 4115/udp CDS Transfer Agent +-# Neil Coggins <neil.coggins&6thsight.com> July 2006 +-smartcard-tls 4116/tcp smartcard-TLS +-smartcard-tls 4116/udp smartcard-TLS +-# Ilan Mahalal <imahalal&axalto.com> April 2006 +-xmlivestream 4117/tcp xmLive Streaming Service +-xmlivestream 4117/udp xmLive Streaming Service +-# Freddy A. Ayuso-Henson <frecom32&hotmail.com> November 2006 +-netscript 4118/tcp Netadmin Systems NETscript service +-netscript 4118/udp Netadmin Systems NETscript service +-# GËran Runfeldt <goran&netadmin.se> December 2006 +-assuria-slm 4119/tcp Assuria Log Manager +-assuria-slm 4119/udp Assuria Log Manager +-# Nick Connor <nickc&assuria.com> December 2006 +-# 4120 Unassigned (Returned on 2007-02-01) +-e-builder 4121/tcp e-Builder Application Communication +-e-builder 4121/udp e-Builder Application Communication +-# James Caza <jcaza&e-builder.net> December 2006 +-fprams 4122/tcp Fiber Patrol Alarm Service +-fprams 4122/udp Fiber Patrol Alarm Service +-# Zhizhong Zhuang <ZZhuang&Optellios.com> December 2006 +-z-wave 4123/tcp Zensys Z-Wave Control Protocol +-z-wave 4123/udp Zensys Z-Wave Control Protocol +-# Anders Brandt, Zensys Inc. <abr&zen-sys.com> February 2007 +-tigv2 4124/tcp Rohill TetraNode Ip Gateway v2 +-tigv2 4124/udp Rohill TetraNode Ip Gateway v2 +-# Bert Bouwers <e.bouwers&rohill.nl> May 2007 +-opsview-envoy 4125/tcp Opsview Envoy +-opsview-envoy 4125/udp Opsview Envoy +-# Ton Voon <ton.voon&altinity.com> May 2007 +-ddrepl 4126/tcp Data Domain Replication Service +-ddrepl 4126/udp Data Domain Replication Service +-# Pratik Wadher <pratik&datadomain.com> May 2007 +-unikeypro 4127/tcp NetUniKeyServer +-unikeypro 4127/udp NetUniKeyServer +-# Raymond Chaw <Raymond&eSecuTech.com> May 2007 +-nufw 4128/tcp NuFW decision delegation protocol +-nufw 4128/udp NuFW decision delegation protocol +-nuauth 4129/tcp NuFW authentication protocol +-nuauth 4129/udp NuFW authentication protocol +-# Eric Leblond <eric&inl.fr> June 2007 +-fronet 4130/tcp FRONET message protocol +-fronet 4130/udp FRONET message protocol +-# Christer Nygren <christer.nygren&fro.se> 07 August 2007 +-stars 4131/tcp Global Maintech Stars +-stars 4131/udp Global Maintech Stars +-# Harry Goldschmitt <harry&hgac.com> June 2007 +-nuts_dem 4132/tcp NUTS Daemon +-nuts_dem 4132/udp NUTS Daemon +-nuts_bootp 4133/tcp NUTS Bootp Server +-nuts_bootp 4133/udp NUTS Bootp Server +-# Martin Freiss <freiss.pad@sni.> +-nifty-hmi 4134/tcp NIFTY-Serve HMI protocol +-nifty-hmi 4134/udp NIFTY-Serve HMI protocol +-# Ryuichi Suzuki <SCI00376&niftyserve.or.jp> +-cl-db-attach 4135/tcp Classic Line Database Server Attach +-cl-db-attach 4135/udp Classic Line Database Server Attach +-cl-db-request 4136/tcp Classic Line Database Server Request +-cl-db-request 4136/udp Classic Line Database Server Request +-cl-db-remote 4137/tcp Classic Line Database Server Remote +-cl-db-remote 4137/udp Classic Line Database Server Remote +-# Arno Kirmeir <Arno.kirmeir&sage.de> January 2007 +-nettest 4138/tcp nettest +-nettest 4138/udp nettest +-# David Borman <dab&windriver.com> March 2003 +-thrtx 4139/tcp Imperfect Networks Server +-thrtx 4139/udp Imperfect Networks Server +-# Dinkar Chivaluri <dchivaluri&imperfectnetworks.com> February 2006 +-cedros_fds 4140/tcp Cedros Fraud Detection System +-cedros_fds 4140/udp Cedros Fraud Detection System +-# Markus Michels <markus.michels&cedros.com> October 2006 +-oirtgsvc 4141/tcp Workflow Server +-oirtgsvc 4141/udp Workflow Server +-oidocsvc 4142/tcp Document Server +-oidocsvc 4142/udp Document Server +-oidsr 4143/tcp Document Replication +-oidsr 4143/udp Document Replication +-# Norman Brie <norm_brie&sns.ca> +-########## Compuserve (unoffically) is using port 4144 ######### +-# 4144 Unassigned +-vvr-control 4145/tcp VVR Control +-vvr-control 4145/udp VVR Control +-# Ming Xu <ming&veritas.com> +-tgcconnect 4146/tcp TGCConnect Beacon +-tgcconnect 4146/udp TGCConnect Beacon +-# Brian Becker <bbecker&tgc-usa.com> October 2006 +-vrxpservman 4147/tcp Multum Service Manager +-vrxpservman 4147/udp Multum Service Manager +-# Scott Mager <Scott.Mager&cerner.com> October 2006 +-hhb-handheld 4148/tcp HHB Handheld Client +-hhb-handheld 4148/udp HHB Handheld Client +-# Steven G. Loughner <stevengloughner&eaton.com> March 2007 +-agslb 4149/tcp A10 GSLB Service +-agslb 4149/udp A10 GSLB Service +-# John Chiong <jchiong&a10networks.com> 02 July 2007 +-PowerAlert-nsa 4150/tcp PowerAlert Network Shutdown Agent +-PowerAlert-nsa 4150/udp PowerAlert Network Shutdown Agent +-# Mike Delgrosso <Mike_Delgrosso&tripplite.com> 02 July 2007 +-menandmice_noh 4151/tcp Men & Mice Remote Control +-menandmice_noh 4151/tcp Men & Mice Remote Control +-# Eggert Thorlacius <eggert&menandmice.com> 30 August 2007 +-idig_mux 4152/tcp iDigTech Multiplex +-idig_mux 4152/udp iDigTech Multiplex +-# Robin Findley <rfindley&usa.net> May 2007 +-mbl-battd 4153/tcp MBL Remote Battery Monitoring +-mbl-battd 4153/udp MBL Remote Battery Monitoring +-# Claudio Procida <claudio&emeraldion.it> May 2007 +-atlinks 4154/tcp atlinks device discovery +-atlinks 4154/udp atlinks device discovery +-# Scott Griepentrog <griepentrogs&atlinks.com> October 2002 +-bzr 4155/tcp Bazaar version control system +-bzr 4155/udp Bazaar version control system +-# Martin Pool <mbp&canonical.com> February 2007 +-stat-results 4156/tcp STAT Results +-stat-results 4156/udp STAT Results +-stat-scanner 4157/tcp STAT Scanner Control +-stat-scanner 4157/udp STAT Scanner Control +-stat-cc 4158/tcp STAT Command Center +-stat-cc 4158/udp STAT Command Center +-# Darwin Ammala <dammala&harris.com> March 2007 +-nss 4159/tcp Network Security Service +-nss 4159/udp Network Security Service +-# Dave Wierbowski <wierbows&us.ibm.com> August 2006 +-jini-discovery 4160/tcp Jini Discovery +-jini-discovery 4160/udp Jini Discovery +-# Mark Hodapp <mark.hodapp&sun.com> +-omscontact 4161/tcp OMS Contact +-omscontact 4161/udp OMS Contact +-omstopology 4162/tcp OMS Topology +-omstopology 4162/udp OMS Topology +-# David Page <david.page&sun.com> August 2005 +-silverpeakpeer 4163/tcp Silver Peak Peer Protocol +-silverpeakpeer 4163/udp Silver Peak Peer Protocol +-# Damon Ennis <damon&silver-peak.com> March 2007 +-silverpeakcomm 4164/tcp Silver Peak Communication Protocol +-silverpeakcomm 4164/udp Silver Peak Communication Protocol +-# Damon Ennis <damon&silver-peak.com> March 2007 +-altcp 4165/tcp ArcLink over Ethernet +-altcp 4165/udp ArcLink over Ethernet +-# Dmitry Brant <dmitry_brant&lincolnelectric.com> March 2007 +-joost 4166/tcp Joost Peer to Peer Protocol +-joost 4166/udp Joost Peer to Peer Protocol +-# Colm MacCarthaigh <colm.maccarthaigh&joost.com> April 2007 +-ddgn 4167/tcp DeskDirect Global Network +-ddgn 4167/udp DeskDirect Global Network +-# Laurie Charlwood <laurie.charlwood&printsoft.com> 22 August 2007 +-pslicser 4168/tcp PrintSoft License Server +-pslicser 4168/udp PrintSoft License Server +-# David Weisgerber <david.weisgerber&printsoft.de> 27 September 2007 +-iadt 4169/tcp Automation Drive Interface Transport +-iadt 4169/udp Automation Drive Interface Transport +-# Paul Suhler <paul.suhler&quantum.com> 15 February 2008 +-# 4170-4176 Unassigned +-wello 4177/tcp Wello P2P pubsub service +-wello 4177/udp Wello P2P pubsub service +-# Christian Westbrook <cw&wellohorld.com> 15 November 2007 +-storman 4178/tcp StorMan +-storman 4178/udp StorMan +-# Werner Guertler <Werner.Guertler&fujitsu-siemens.com> February 2007 +-MaxumSP 4179/tcp Maxum Services +-MaxumSP 4179/udp Maxum Services +-# Greg Stine <greg.stine&siemens.com> 05 July 2007 +-httpx 4180/tcp HTTPX +-httpx 4180/udp HTTPX +-# Paul McGough <pmcgough&2factor.com> February 2007 +-macbak 4181/tcp MacBak +-macbak 4181/udp MacBak +-# Wes Peters <wes&softweyr.com> April 2007 +-pcptcpservice 4182/tcp Production Company Pro TCP Service +-pcptcpservice 4182/udp Production Company Pro TCP Service +-# Ben McNeill <ben.mcneill&cinexec.com> May 2007 +-gmmp 4183/tcp General Metaverse Messaging Protocol +-gmmp 4183/udp General Metaverse Messaging Protocol +-# Gareth Nelson <gareth&garethnelson.com> June 2007 +-universe_suite 4184/tcp UNIVERSE SUITE MESSAGE SERVICE +-universe_suite 4184/udp UNIVERSE SUITE MESSAGE SERVICE +-# Gary ANDREWS <gan&orsyp.com> 07 January 2008 +-# 4185-4198 Unassigned +-eims-admin 4199/tcp EIMS ADMIN +-eims-admin 4199/udp EIMS ADMIN +-# Glenn Anderson <glenn&qualcomm.co.nz> +-vrml-multi-use 4200-4299 VRML Multi User Systems +-# Mitra <mitra&earth.path.net> +-corelccam 4300/tcp Corel CCam +-corelccam 4300/udp Corel CCam +-# Jason Aiken <jasona&corelcomputer.com> +-d-data 4301/tcp Diagnostic Data +-d-data 4301/udp Diagnostic Data +-d-data-control 4302/tcp Diagnostic Data Control +-d-data-control 4302/udp Diagnostic Data Control +-# Jon March <jon.march&paget-analyst-services.co.uk> September 2006 +-srcp 4303/tcp Simple Railroad Command Protocol +-srcp 4303/udp Simple Railroad Command Protocol +-# Matthias Trute <mtrute&web.de> January 2007 +-owserver 4304/tcp One-Wire Filesystem Server +-owserver 4304/udp One-Wire Filesystem Server +-# Paul Alfille <paul.alfille&gmail.com> January 2007 +-batman 4305/tcp better approach to mobile ad-hoc networking +-batman 4305/udp better approach to mobile ad-hoc networking +-# Simon Wunderlich <siwu&hrz.tu-chemnitz.de> 30 August 2007 +-pinghgl 4306/tcp Hellgate London +-pinghgl 4306/udp Hellgate London +-# David Berk <dberk&ping-0.com> 30 August 2007 +-visicron-vs 4307/tcp Visicron Videoconference Service +-visicron-vs 4307/udp Visicron Videoconference Service +-# Alexey Vlaskin <avlaskin&visicron.com> 22 October 2007 +-compx-lockview 4308/tcp CompX-LockView +-compx-lockview 4308/udp CompX-LockView +-# John Payson <john&circad.com> 22 October 2007 +-dserver 4309/tcp Exsequi Appliance Discovery +-dserver 4309/udp Exsequi Appliance Discovery +-# Angelo Masci <angelomasci&yahoo.co.uk> January 2007 +-mirrtex 4310/tcp Mir-RT exchange service +-mirrtex 4310/udp Mir-RT exchange service +-# Sylvain Robert <sylvain.robert&datadis.com> 14 February 2008 +-# 4311-4319 Unassigned +-fdt-rcatp 4320/tcp FDT Remote Categorization Protocol +-fdt-rcatp 4320/udp FDT Remote Categorization Protocol +-# Russell P. Holsclaw, Fast Data Technology, Inc. <rholsclaw&fastdatatech.com> March 2006 +-rwhois 4321/tcp Remote Who Is +-rwhois 4321/udp Remote Who Is +-# Mark Kosters <markk&internic.net> +-trim-event 4322/tcp TRIM Event Service +-trim-event 4322/udp TRIM Event Service +-trim-ice 4323/tcp TRIM ICE Service +-trim-ice 4323/udp TRIM ICE Service +-# Siva Poobalasingam <Siva.Poobalasingam&towersoft.com.au> February 2007 +-balour 4324/tcp Balour Game Server +-balour 4324/udp Balour Game Server +-# Konstantin Schauwecker <hi&konstantin-schauwecker.de> February 2007 +-geognosisman 4325/tcp Cadcorp GeognoSIS Manager Service +-geognosisman 4325/udp Cadcorp GeognoSIS Manager Service +-geognosis 4326/tcp Cadcorp GeognoSIS Service +-geognosis 4326/udp Cadcorp GeognoSIS Service +-# Martin Daly <martin.daly&cadcorp.com> November 2006 +-jaxer-web 4327/tcp Jaxer Web Protocol +-jaxer-web 4327/udp Jaxer Web Protocol +-# Uri Sarid <uri&aptana.com> 07 January 2008 +-jaxer-manager 4328/tcp Jaxer Manager Command Protocol +-jaxer-manager 4328/udp Jaxer Manager Command Protocol +-# Uri Sarid <uri&aptana.com> 22 January 2008 +-# 4329-4339 Unassigned +-gaia 4340/tcp Gaia Connector Protocol +-gaia 4340/udp Gaia Connector Protocol +-# Philippe Detournay <philippe.detournay&acrosoft.be> 12 November 2007 +-lisp-data 4341/tcp LISP Data Packets +-lisp-data 4341/udp LISP Data Packets +-# Dino Farinacci <dino&cisco.com> 12 November 2007 +-lisp-cons 4342/tcp LISP-CONS Control +-lisp-control 4342/udp LISP Data-Triggered Control +-# Dino Farinacci <dino&cisco.com> May 2007 +-unicall 4343/tcp UNICALL +-unicall 4343/udp UNICALL +-# James Powell <james&enghp.unidata.comp> +-vinainstall 4344/tcp VinaInstall +-vinainstall 4344/udp VinaInstall +-# Jay Slupesky <js&vina-tech.com> +-m4-network-as 4345/tcp Macro 4 Network AS +-m4-network-as 4345/udp Macro 4 Network AS +-# Paul Wren <Paul.Wren¯o4.com> +-elanlm 4346/tcp ELAN LM +-elanlm 4346/udp ELAN LM +-# Paul Ballew <ballew&projtech.com> +-lansurveyor 4347/tcp LAN Surveyor +-lansurveyor 4347/udp LAN Surveyor +-# Michael Swan <swan&neon.com> +-itose 4348/tcp ITOSE +-itose 4348/udp ITOSE +-# Michael Haeuptle <Michael_Haeuptle&hp.com> +-fsportmap 4349/tcp File System Port Map +-fsportmap 4349/udp File System Port Map +-# Ron Minnich <rminnich&sarnoff.com> +-net-device 4350/tcp Net Device +-net-device 4350/udp Net Device +-# Glenn Peterson <glennpµsoft.com> +-plcy-net-svcs 4351/tcp PLCY Net Services +-plcy-net-svcs 4351/udp PLCY Net Services +-# J.J. Ekstrom +-pjlink 4352/tcp Projector Link +-pjlink 4352/udp Projector Link +-# Mitsuo Kodama <kodama&jbmia.or.jp> June 2005 +-f5-iquery 4353/tcp F5 iQuery +-f5-iquery 4353/udp F5 iQuery +-# Tom Kee <t.kee&f5.com> +-qsnet-trans 4354/tcp QSNet Transmitter +-qsnet-trans 4354/udp QSNet Transmitter +-qsnet-workst 4355/tcp QSNet Workstation +-qsnet-workst 4355/udp QSNet Workstation +-qsnet-assist 4356/tcp QSNet Assistant +-qsnet-assist 4356/udp QSNet Assistant +-qsnet-cond 4357/tcp QSNet Conductor +-qsnet-cond 4357/udp QSNet Conductor +-qsnet-nucl 4358/tcp QSNet Nucleus +-qsnet-nucl 4358/udp QSNet Nucleus +-# Neer Kleinman <neer&qsr.co.il> +-omabcastltkm 4359/tcp OMA BCAST Long-Term Key Messages +-omabcastltkm 4359/udp OMA BCAST Long-Term Key Messages +-# Frank Hartung <Frank.Hartung&ericsson.com> 07 September 2007 +-# 4360-4367 Unassigned +-wxbrief 4368/tcp WeatherBrief Direct +-wxbrief 4368/udp WeatherBrief Direct +-# Kim Alan Waggoner <kimw&weatherbank.com> November 2006 +-epmd 4369/tcp Erlang Port Mapper Daemon +-epmd 4369/udp Erlang Port Mapper Daemon +-# Erlang/OTP support <epmd&erix.ericsson.se> December 2004 +-# 4370-4372 Unassigned +-remctl 4373/tcp Remote Authenticated Command Service +-remctl 4373/udp Remote Authenticated Command Service +-# Russ Allbery <rra&stanford.edu> 30 August 2007 +-# 4374-4375 Unassigned +-bip 4376/tcp BioAPI Interworking +-bip 4376/udp BioAPI Interworking +-# Jean-Paul Lemaire <jean-paul.lemaire&univ-paris-diderot.fr> 05 July 2007 +-cp-spxsvr 4377/tcp Cambridge Pixel SPx Server +-cp-spxsvr 4377/udp Cambridge Pixel SPx Server +-cp-spxdpy 4378/tcp Cambridge Pixel SPx Display +-cp-spxdpy 4378/udp Cambridge Pixel SPx Display +-# Richard Warren <richard&cambridgepixel.com> 05 July 2007 +-ctdb 4379/tcp CTDB +-ctdb 4379/udp CTDB +-# Ronnie Sahlberg <ronniesahlberg&gmail.com> 05 July 2007 +-# 4380-4388 Unassigned +-xandros-cms 4389/tcp Xandros Community Management Service +-xandros-cms 4389/udp Xandros Community Management Service +-# Stephen M. Webb <stephenw&xandros.com> May 2007 +-# 4390-4399 Unassigned +-ds-srv 4400/tcp ASIGRA Services +-ds-srv 4400/udp ASIGRA Services +-# David Farajun <dfarajun&asigra.com> November 2004 +-ds-srvr 4401/tcp ASIGRA Televaulting DS-System Service +-ds-srvr 4401/udp ASIGRA Televaulting DS-System Service +-ds-clnt 4402/tcp ASIGRA Televaulting DS-Client Service +-ds-clnt 4402/udp ASIGRA Televaulting DS-Client Service +-ds-user 4403/tcp ASIGRA Televaulting DS-Client Monitoring/Management +-ds-user 4403/udp ASIGRA Televaulting DS-Client Monitoring/Management +-ds-admin 4404/tcp ASIGRA Televaulting DS-System Monitoring/Management +-ds-admin 4404/udp ASIGRA Televaulting DS-System Monitoring/Management +-ds-mail 4405/tcp ASIGRA Televaulting Message Level Restore service +-ds-mail 4405/udp ASIGRA Televaulting Message Level Restore service +-ds-slp 4406/tcp ASIGRA Televaulting DS-Sleeper Service +-ds-slp 4406/udp ASIGRA Televaulting DS-Sleeper Service +-# Andrei Litvinn <support&asigra.com> January 2005 +-# 4407-4425 Unassigned +-beacon-port-2 4426/tcp SMARTS Beacon Port +-beacon-port-2 4426/udp SMARTS Beacon Port +-# Eyal Yardeni <eyal.yardeni&smarts.com> November 2003 +-# 4427-4441 Unassigned +-saris 4442/tcp Saris +-saris 4442/udp Saris +-pharos 4443/tcp Pharos +-pharos 4443/udp Pharos +-# TeleConsult GmbH, 76275 Ettlingen, Germany +-# <teleconsult&t-online.de> +-krb524 4444/tcp KRB524 +-krb524 4444/udp KRB524 +-# B. Clifford Neuman <bcn&isi.edu> +-# PROBLEM krb524 assigned the port, +-# PROBLEM nv used it without an assignment +-nv-video 4444/tcp NV Video default +-nv-video 4444/udp NV Video default +-# Ron Frederick <frederick&parc.xerox.com> +-upnotifyp 4445/tcp UPNOTIFYP +-upnotifyp 4445/udp UPNOTIFYP +-# Mark Fox <markf&uplanet.com> +-n1-fwp 4446/tcp N1-FWP +-n1-fwp 4446/udp N1-FWP +-n1-rmgmt 4447/tcp N1-RMGMT +-n1-rmgmt 4447/udp N1-RMGMT +-# Lori Tassin <Ramsey&network-1.com> +-asc-slmd 4448/tcp ASC Licence Manager +-asc-slmd 4448/udp ASC Licence Manager +-# Casper Stoel <cbs&ascinc.com> +-privatewire 4449/tcp PrivateWire +-privatewire 4449/udp PrivateWire +-# Uri Resnitzky <info&arx.com> +-camp 4450/tcp Camp +-camp 4450/udp Camp +-ctisystemmsg 4451/tcp CTI System Msg +-ctisystemmsg 4451/udp CTI System Msg +-ctiprogramload 4452/tcp CTI Program Load +-ctiprogramload 4452/udp CTI Program Load +-# Steven Cliff <sbcliff&controltechnology.com> +-nssalertmgr 4453/tcp NSS Alert Manager +-nssalertmgr 4453/udp NSS Alert Manager +-nssagentmgr 4454/tcp NSS Agent Manager +-nssagentmgr 4454/udp NSS Agent Manager +-# Jim Hill<jhill&symantec.com> +-prchat-user 4455/tcp PR Chat User +-prchat-user 4455/udp PR Chat User +-prchat-server 4456/tcp PR Chat Server +-prchat-server 4456/udp PR Chat Server +-prRegister 4457/tcp PR Register +-prRegister 4457/udp PR Register +-# Donny Gilor <dgilor&pop01.ny.us.ibm.net> +-mcp 4458/tcp Matrix Configuration Protocol +-mcp 4458/udp Matrix Configuration Protocol +-# Tim DeBaillie <debaillie&ciholas.com> December 2006 +-# 4459-4483 Unassigned +-hpssmgmt 4484/tcp hpssmgmt service +-hpssmgmt 4484/udp hpssmgmt service +-# David Straw <david.straw _at_ hp.com> November 2005 +-# 4485-4499 Unassigned +-ipsec-nat-t 4500/tcp IPsec NAT-Traversal +-ipsec-nat-t 4500/udp IPsec NAT-Traversal +-# [RFC3947] +-# 4501 De-registered (08 June 2001) +-# IANA <iana&iana.org> +-# 4502-4534 Unassigned +-ehs 4535/tcp Event Heap Server +-ehs 4535/udp Event Heap Server +-ehs-ssl 4536/tcp Event Heap Server SSL +-ehs-ssl 4536/udp Event Heap Server SSL +-# Brad Johanson <bradj&tidebreak.com> August 2005 +-wssauthsvc 4537/tcp WSS Security Service +-wssauthsvc 4537/udp WSS Security Service +-# Mark Tirschwell <mark.tirschwell&wallstreetsystems.com> January 2006 +-isigate 4538/tcp isigate +-isigate 4538/udp isigate +-# Julien VALIENTE <j.valiente&objectif-software.com> May 2006 +-# 4539-4544 Unassigned +-worldscores 4545/tcp WorldScores +-worldscores 4545/udp WorldScores +-# Steve Davis <sdavis&optum-inc.com> +-sf-lm 4546/tcp SF License Manager (Sentinel) +-sf-lm 4546/udp SF License Manager (Sentinel) +-# Thomas Koell <info&sf.com> +-lanner-lm 4547/tcp Lanner License Manager +-lanner-lm 4547/udp Lanner License Manager +-# Les Enstone <lenstone&lanner.co.uk> +-synchromesh 4548/tcp Synchromesh +-synchromesh 4548/udp Synchromesh +-# Tom Hawkins <tomahawkins&gmail.com> February 2006 +-aegate 4549/tcp Aegate PMR Service +-aegate 4549/udp Aegate PMR Service +-# Nick Warrington <nick.warrington&paconsulting.com> March 2006 +-gds-adppiw-db 4550/tcp Perman I Interbase Server +-gds-adppiw-db 4550/udp Perman I Interbase Server +-# Leo Lesage <leo.lesage&adp.nl> April 2006 +-# 4551-4553 Unassigned +-msfrs 4554/tcp MS FRS Replication +-msfrs 4554/udp MS FRS Replication +-# Kev George <Kev.George&smiths-aerospace.com> September 2006 +-rsip 4555/tcp RSIP Port +-rsip 4555/udp RSIP Port +-# RFC 3103 +-dtn-bundle-tcp 4556/tcp DTN Bundle TCP CL Protocol +-dtn-bundle-udp 4556/udp DTN Bundle UDP CL Protocol +-# Michael Demmer <demmer&cs.berkeley.edu> November 2006 +-# 4557-4558 Unassigned +-hylafax 4559/tcp HylaFAX +-hylafax 4559/udp HylaFAX +-# Lee Howard <iana&hylafax.org> March 2002 +-# 4560-4565 Unassigned +-kwtc 4566/tcp Kids Watch Time Control Service +-kwtc 4566/udp Kids Watch Time Control Service +-# Larry Zarou <zarla01&cbsits.com> October 2006 +-tram 4567/tcp TRAM +-tram 4567/udp TRAM +-# Joe Wesley <joe.wesley&east.sun.com> +-bmc-reporting 4568/tcp BMC Reporting +-bmc-reporting 4568/udp BMC Reporting +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-iax 4569/tcp Inter-Asterisk eXchange +-iax 4569/udp Inter-Asterisk eXchange +-# Mark Spencer <markster&digium.com> November 2004 +-# 4570-4592 Unassigned +-ipt-anri-anri 4593/tcp IPT (ANRI-ANRI) +-ipt-anri-anri 4593/udp IPT (ANRI-ANRI) +-ias-session 4594/tcp IAS-Session (ANRI-ANRI) +-ias-session 4594/udp IAS-Session (ANRI-ANRI) +-ias-paging 4595/tcp IAS-Paging (ANRI-ANRI) +-ias-paging 4595/udp IAS-Paging (ANRI-ANRI) +-ias-neighbor 4596/tcp IAS-Neighbor (ANRI-ANRI) +-ias-neighbor 4596/udp IAS-Neighbor (ANRI-ANRI) +-# David Ott <dott&qualcomm.com> 31 July 2007 +-a21-an-1xbs 4597/tcp A21 (AN-1xBS) +-a21-an-1xbs 4597/udp A21 (AN-1xBS) +-# David Ott <dott&qualcomm.com> February 2006 +-a16-an-an 4598/tcp A16 (AN-AN) +-a16-an-an 4598/udp A16 (AN-AN) +-# David Ott <dott&qualcomm.com> December 2005 +-a17-an-an 4599/tcp A17 (AN-AN) +-a17-an-an 4599/udp A17 (AN-AN) +-# David Ott <dott&qualcomm.com> February 2006 +-piranha1 4600/tcp Piranha1 +-piranha1 4600/udp Piranha1 +-piranha2 4601/tcp Piranha2 +-piranha2 4601/udp Piranha2 +-# Primark Corporation <joe.boone&primark.com> +-# 4602-4657 Unassigned +-playsta2-app 4658/tcp PlayStation2 App Port +-playsta2-app 4658/udp PlayStation2 App Port +-playsta2-lob 4659/tcp PlayStation2 Lobby Port +-playsta2-lob 4659/udp PlayStation2 Lobby Port +-# Noam Rimon <noam.rimon&playstation.sony.com> December 2004 +-smaclmgr 4660/tcp smaclmgr +-smaclmgr 4660/udp smaclmgr +-# Hiromi Taki <stg-togo&saint.nm.fujitsu.co.jp> +-kar2ouche 4661/tcp Kar2ouche Peer location service +-kar2ouche 4661/udp Kar2ouche Peer location service +-# Andy Krouwel <andy&kar2ouche.com> +-oms 4662/tcp OrbitNet Message Service +-oms 4662/udp OrbitNet Message Service +-# Roy Davies <rdavies&daq.net> August 2005 +-noteit 4663/tcp Note It! Message Service +-noteit 4663/udp Note It! Message Service +-# Pedro Alpedrinha <pedro.alpedrinha&redevirtual.com> February 2006 +-ems 4664/tcp Rimage Messaging Server +-ems 4664/udp Rimage Messaging Server +-# David V. Raskin <draskin&rimage.com> February 2006 +-contclientms 4665/tcp Container Client Message Service +-contclientms 4665/udp Container Client Message Service +-# Bruce Thompson <brucet&actioninformationsystems.com> February 2006 +-eportcomm 4666/tcp E-Port Message Service +-eportcomm 4666/udp E-Port Message Service +-mmacomm 4667/tcp MMA Comm Services +-mmacomm 4667/udp MMA Comm Services +-mmaeds 4668/tcp MMA EDS Service +-mmaeds 4668/udp MMA EDS Service +-# Robert Shaffer <bob.shaffer&micmod.com> February 2006 +-eportcommdata 4669/tcp E-Port Data Service +-eportcommdata 4669/udp E-Port Data Service +-# Robert Shaffer <bob.shaffer&micmod.com> February 2006 +-light 4670/tcp Light packets transfer protocol +-light 4670/udp Light packets transfer protocol +-# Adam Golovenko <golovenko&gmail.com> October 2006 +-acter 4671/tcp Bull RSF action server +-acter 4671/udp Bull RSF action server +-# Christian Caudrelier <Christian.Caudrelier@%bull.net> February 2006 +-rfa 4672/tcp remote file access server +-rfa 4672/udp remote file access server +-# No contact Listed +-cxws 4673/tcp CXWS Operations +-cxws 4673/udp CXWS Operations +-# Phil Abercrombie <phil.abercrombie&appiq.com> August 2005 +-appiq-mgmt 4674/tcp AppIQ Agent Management +-appiq-mgmt 4674/udp AppIQ Agent Management +-# Phil Abercrombie <phil.abercrombie&appiq.com> August 2005 +-dhct-status 4675/tcp BIAP Device Status +-dhct-status 4675/udp BIAP Device Status +-dhct-alerts 4676/tcp BIAP Generic Alert +-dhct-alerts 4676/udp BIAP Generic Alert +-# Louis Slothouber <lpslot&biap.com> August 2005 +-bcs 4677/tcp Business Continuity Servi +-bcs 4677/udp Business Continuity Servi +-# Siew Sim <ssim&asempra.com> August 2005 +-traversal 4678/tcp boundary traversal +-traversal 4678/udp boundary traversal +-# Kevin Lu <kevinluµmethod.com> August 2005 +-mgesupervision 4679/tcp MGE UPS Supervision +-mgesupervision 4679/udp MGE UPS Supervision +-mgemanagement 4680/tcp MGE UPS Management +-mgemanagement 4680/udp MGE UPS Management +-# Lecuivre J <software.team&mgeups.com> August 2005 +-parliant 4681/tcp Parliant Telephony System +-parliant 4681/udp Parliant Telephony System +-# Colin Henein <iana&cmh.parliant.com> August 2005 +-finisar 4682/tcp finisar +-finisar 4682/udp finisar +-# Christina Mercier <christina.mercier&finisar.com> August 2005 +-spike 4683/tcp Spike Clipboard Service +-spike 4683/udp Spike Clipboard Service +-# Scott Herscher <scott&porchdogsoft.com> August 2005 +-rfid-rp1 4684/tcp RFID Reader Protocol 1.0 +-rfid-rp1 4684/udp RFID Reader Protocol 1.0 +-# Michael Mealling <michael&refactored-networks.com> August 2005 +-autopac 4685/tcp Autopac Protocol +-autopac 4685/udp Autopac Protocol +-# Peter Hallenbeck <pete&consumertechnologiesgroup.com> August 2005 +-msp-os 4686/tcp Manina Service Protocol +-msp-os 4686/udp Manina Service Protocol +-# Markus Nix <mnix&docuverse.de> August 2005 +-nst 4687/tcp Network Scanner Tool FTP +-nst 4687/udp Network Scanner Tool FTP +-# Mala Bhat <bmala&ssdi.sharp.co.in> August 2005 +-mobile-p2p 4688/tcp Mobile P2P Service +-mobile-p2p 4688/udp Mobile P2P Service +-# Hanz Hager <Hanz.Hager&ericsson.com> August 2005 +-altovacentral 4689/tcp Altova DatabaseCentral +-altovacentral 4689/udp Altova DatabaseCentral +-# Altova <has&altova.com> August 2005 +-prelude 4690/tcp Prelude IDS message proto +-prelude 4690/udp Prelude IDS message proto +-# Yoann Vandoorselaere <yoann&prelude-ids.org> August 2005 +-monotone 4691/tcp Monotone Network Protocol +-monotone 4691/udp Monotone Network Protocol +-# Tomas Fasth <tomfa&debian.org> August 2005 +-conspiracy 4692/tcp Conspiracy messaging +-conspiracy 4692/udp Conspiracy messaging +-# Jens Edlund <edlund&speech.kth.se> August 2005 +-# 4693-4699 Unassigned +-netxms-agent 4700/tcp NetXMS Agent +-netxms-agent 4700/udp NetXMS Agent +-netxms-mgmt 4701/tcp NetXMS Management +-netxms-mgmt 4701/udp NetXMS Management +-netxms-sync 4702/tcp NetXMS Server Synchronization +-netxms-sync 4702/udp NetXMS Server Synchronization +-# Victor Kirhenshtein <victor&opticom.lv> July 2006 +-# 4703-4727 Unassigned +-capmux 4728/tcp CA Port Multiplexer +-capmux 4728/udp CA Port Multiplexer +-# Nigel Groves <nigel.groves&ca.com> June 2006 +-# 4729-4736 Unassigned +-ipdr-sp 4737/tcp IPDR/SP +-ipdr-sp 4737/udp IPDR/SP +-# Ken Sarno <kensarno&insightbb.com> August 2005 +-solera-lpn 4738/tcp SoleraTec Locator +-solera-lpn 4738/udp SoleraTec Locator +-# Mark Armstrong <Mark.Armstrong&SoleraTec.com> December 2005 +-ipfix 4739/tcp IP Flow Info Export +-ipfix 4739/udp IP Flow Info Export +-# Nevil Brownlee <n.brownlee&auckland.ac.nz> August 2005 +-ipfix 4739/sctp IP Flow Info Export +-# Nevil Brownlee <n.brownlee&auckland.ac.nz> January 2006 +-ipfixs 4740/tcp ipfix protocol over TLS +-ipfixs 4740/sctp ipfix protocol over DTLS +-ipfixs 4740/udp ipfix protocol over DTLS +-# Nevil Brownlee <n.brownlee&auckland.ac.nz> October 2006 +-lumimgrd 4741/tcp Luminizer Manager +-lumimgrd 4741/udp Luminizer Manager +-# George Hwa <ghwa&luminescent.com> March 2007 +-sicct 4742/tcp SICCT +-sicct-sdp 4742/udp SICCT Service Discovery Protocol +-# TeleTrusT Deutschland e.V. <info&teletrust.de> April 2006 +-openhpid 4743/tcp openhpi HPI service +-openhpid 4743/udp openhpi HPI service +-# Thomas Kanngieser <thomas.kanngieser&arcor.de> January 2006 +-ifsp 4744/tcp Internet File Synchronization Protocol +-ifsp 4744/udp Internet File Synchronization Protocol +-# Alex White <alex&intralan.co.uk> 12 September 2007 +-fmp 4745/tcp Funambol Mobile Push +-fmp 4745/udp Funambol Mobile Push +-# Andrea Gazzaniga <gazzaniga&funambol.com> January 2007 +-# 4746-4748 Unassigned +-profilemac 4749/tcp Profile for Mac +-profilemac 4749/udp Profile for Mac +-# David Sinclair <dev&profilemac.com> May 2006 +-ssad 4750/tcp Simple Service Auto Discovery +-ssad 4750/udp Simple Service Auto Discovery +-# Dr Horst Herb <horst&dorrigomedical.com> December 2005 +-spocp 4751/tcp Simple Policy Control Protocol +-spocp 4751/udp Simple Policy Control Protocol +-# Roland Hedberg <roland&catalogix.se> August 2005 +-snap 4752/tcp Simple Network Audio Protocol +-snap 4752/udp Simple Network Audio Protocol +-# Dameon Wagner <d.wagner&freemail.absa.co.za> February 2002 +-# 4753-4783 Unassigned +-bfd-multi-ctl 4784/tcp BFD Multihop Control +-bfd-multi-ctl 4784/udp BFD Multihop Control +-# Dave Katz <dkatz&juniper.net>; Dave Ward <dward&cisco.com> February 2006 +-# 4785-4799 Unassigned +-iims 4800/tcp Icona Instant Messenging System +-iims 4800/udp Icona Instant Messenging System +-iwec 4801/tcp Icona Web Embedded Chat +-iwec 4801/udp Icona Web Embedded Chat +-ilss 4802/tcp Icona License System Server +-ilss 4802/udp Icona License System Server +-# Paul Stephen Borlie <paul&icona.it> +-# 4803-4826 Unassigned +-htcp 4827/tcp HTCP +-htcp 4827/udp HTCP +-# Paul Vixie <paul&vix.com> +-# 4828-4836 Unassigned +-varadero-0 4837/tcp Varadero-0 +-varadero-0 4837/udp Varadero-0 +-varadero-1 4838/tcp Varadero-1 +-varadero-1 4838/udp Varadero-1 +-varadero-2 4839/tcp Varadero-2 +-varadero-2 4839/udp Varadero-2 +-# Carlos Arteaga <carteaga&abacoinc.com> +-opcua-tcp 4840/tcp OPC UA TCP Protocol +-opcua-udp 4840/udp OPC UA TCP Protocol +-# Randy Armstrong <randy.armstrong&opcfoundation.org> September 2006 +-quosa 4841/tcp QUOSA Virtual Library Service +-quosa 4841/udp QUOSA Virtual Library Service +-# Uri Blank <uri&quosa.com> September 2006 +-gw-asv 4842/tcp nCode ICE-flow Library AppServer +-gw-asv 4842/udp nCode ICE-flow Library AppServer +-# Ross Swithenbank <iana&ncode.co.uk> September 2006 +-opcua-tls 4843/tcp OPC UA TCP Protocol over TLS/SSL +-opcua-tls 4843/udp OPC UA TCP Protocol over TLS/SSL +-# Randy Armstrong <randy.armstrong&opcfoundation.org> September 2006 +-gw-log 4844/tcp nCode ICE-flow Library LogServer +-gw-log 4844/udp nCode ICE-flow Library LogServer +-# Ross Swithenbank <iana&ncode.co.uk> September 2006 +-# 4845-4846 Unassigned +-wfc 4847/tcp Web Fresh Communication +-wfc 4847/udp Web Fresh Communication +-# Jonathan Bastnagel <jonthebagel&gmail.com> 17 September 2007 +-appserv-http 4848/tcp App Server - Admin HTTP +-appserv-http 4848/udp App Server - Admin HTTP +-appserv-https 4849/tcp App Server - Admin HTTPS +-appserv-https 4849/udp App Server - Admin HTTPS +-# Sreeram Duvvuru <sduv&sfbay.sun.com> April 2002 +-sun-as-nodeagt 4850/tcp Sun App Server - NA +-sun-as-nodeagt 4850/udp Sun App Server - NA +-# Kedar Mhaswade <kedar.Mhaswade&sun.com> November 2004 +-derby-repli 4851/tcp Apache Derby Replication +-derby-repli 4851/udp Apache Derby Replication +-# Jorgen Loland <jorgen.loland&sun.com> 27 February 2008 +-# 4852-4866 Unassigned +-unify-debug 4867/tcp Unify Debugger +-unify-debug 4867/udp Unify Debugger +-# Ron Kuris <rk&unify.com> May 2006 +-phrelay 4868/tcp Photon Relay +-phrelay 4868/udp Photon Relay +-phrelaydbg 4869/tcp Photon Relay Debug +-phrelaydbg 4869/udp Photon Relay Debug +-# Michael Hunter <mphunter&qnx.com> +-cc-tracking 4870/tcp Citcom Tracking Service +-cc-tracking 4870/udp Citcom Tracking Service +-# Wolfgang Weidner <ww&citcom.de> December 2005 +-wired 4871/tcp Wired +-wired 4871/udp Wired +-# Axel Andersson <axel&zankasoftware.com> February 2006 +-# 4872-4884 Unassigned +-abbs 4885/tcp ABBS +-abbs 4885/udp ABBS +-# Ryan Rubley <root&ark.dyn.ml.org> +-# 4886-4893 Unassigned +-lyskom 4894/tcp LysKOM Protocol A +-lyskom 4894/udp LysKOM Protocol A +-# Per Cederqvist <ceder&lysator.liu.se> +-# 4895-4898 Unassigned +-radmin-port 4899/tcp RAdmin Port +-radmin-port 4899/udp RAdmin Port +-# Dmitri Znosko <support&radmin.com> March 2003 +-hfcs 4900/tcp Hyper File Client/Server Database Engine +-hfcs 4900/udp Hyper File Client/Server Database Engine +-# Jerome AERTS <jae&pcsoft.fr> March 2006 +-# 4901-4912 Unassigned +-lutcp 4913/tcp LUTher Control Protocol +-# Markus Loeffler <markus.loeffler&thomson.net> 03 July 2007 +-# 4914-4939 Unassigned +-eq-office-4940 4940/tcp Equitrac Office +-eq-office-4940 4940/udp Equitrac Office +-eq-office-4941 4941/tcp Equitrac Office +-eq-office-4941 4941/udp Equitrac Office +-eq-office-4942 4942/tcp Equitrac Office +-eq-office-4942 4942/udp Equitrac Office +-# Tom Haapanen <tomh&equitrac.com> 11 July 2007 +-# 4943-4948 Unassigned +-munin 4949/tcp Munin Graphing Framework +-munin 4949/udp Munin Graphing Framework +-# Jimmy Olsen <jo&linpro.no> August 2005 +-# 4950 Unassigned +-pwgwims 4951/tcp PWG WIMS +-pwgwims 4951/udp PWG WIMS +-# Ira McDonald <imcdonald&sharplabs.com> December 2005 +-sagxtsds 4952/tcp SAG Directory Server +-sagxtsds 4952/udp SAG Directory Server +-# Michael Chirila <Michael.Chirila&softwareag.com> January 2006 +-# 4953-4968 Unassigned +-ccss-qmm 4969/tcp CCSS QMessageMonitor +-ccss-qmm 4969/udp CCSS QMessageMonitor +-ccss-qsm 4970/tcp CCSS QSystemMonitor +-ccss-qsm 4970/udp CCSS QSystemMonitor +-# David Young <david.young&ccsseurope.co.uk> January 2006 +-# 4971-4982 Unassigned +-# 4983 Unassigned (Removed on 2005-12-22) +-# 4984-4985 Unassigned +-mrip 4986/tcp Model Railway Interface Program +-mrip 4986/udp Model Railway Interface Program +-# Howard Amos <amos&ccww.co.uk> April 2006 +-smar-se-port1 4987/tcp SMAR Ethernet Port 1 +-smar-se-port1 4987/udp SMAR Ethernet Port 1 +-smar-se-port2 4988/tcp SMAR Ethernet Port 2 +-smar-se-port2 4988/udp SMAR Ethernet Port 2 +-# Delcio Prizon <dprizon&smar.com.br> +-parallel 4989/tcp Parallel for GAUSS (tm) +-parallel 4989/udp Parallel for GAUSS (tm) +-# Matthew Ford <Matthew.Ford&forward.com.au> March 2003 +-busycal 4990/tcp BusySync Calendar Synch. Protocol +-busycal 4990/udp BusySync Calendar Synch. Protocol +-# David Riggle <dave&busymac.com> 07 January 2008 +-# 4991-4998 Unassigned +-hfcs-manager 4999/tcp Hyper File Client/Server Database Engine Manager +-hfcs-manager 4999/udp Hyper File Client/Server Database Engine Manager +-# Jerome AERTS <jae&pcsoft.fr> March 2006 +-commplex-main 5000/tcp +-commplex-main 5000/udp +-commplex-link 5001/tcp +-commplex-link 5001/udp +-rfe 5002/tcp radio free ethernet +-rfe 5002/udp radio free ethernet +-fmpro-internal 5003/tcp FileMaker, Inc. - Proprietary transport +-fmpro-internal 5003/udp FileMaker, Inc. - Proprietary name binding +-# Clay Maeckel <clay_maeckel&filemaker.com> +-avt-profile-1 5004/tcp RTP media data [RFC 3551, RFC 4571] +-avt-profile-1 5004/udp RTP media data [RFC 3551] +-avt-profile-1 5004/dccp RTP media data [RFC 3551, RFC-ietf-dccp-rtp-07.txt] +-avt-profile-2 5005/tcp RTP control protocol [RFC 3551, RFC 4571] +-avt-profile-2 5005/udp RTP control protocol [RFC 3551] +-avt-profile-2 5005/dccp RTP control protocol [RFC 3551, RFC-ietf-dccp-rtp-07.txt] +-wsm-server 5006/tcp wsm server +-wsm-server 5006/udp wsm server +-wsm-server-ssl 5007/tcp wsm server ssl +-wsm-server-ssl 5007/udp wsm server ssl +-# Adam Berk <aberk&empirix.com> +-synapsis-edge 5008/tcp Synapsis EDGE +-synapsis-edge 5008/udp Synapsis EDGE +-# Paul Schilling <PaulS&Synapsis.com> +-winfs 5009/tcp Microsoft Windows Filesystem +-winfs 5009/udp Microsoft Windows Filesystem +-# Simon Skaria <simonskµsoft.com> January 2006 +-telelpathstart 5010/tcp TelepathStart +-telelpathstart 5010/udp TelepathStart +-telelpathattack 5011/tcp TelepathAttack +-telelpathattack 5011/udp TelepathAttack +-# Helmuth Breitenfellner <hbreitenf&vnet.imb.com> +-nsp 5012/tcp NetOnTap Service +-nsp 5012/udp NetOnTap Service +-# Kim Hancock <dev&dragondex.com> 24 October 2007 +-fmpro-v6 5013/tcp FileMaker, Inc. - Proprietary transport +-fmpro-v6 5013/udp FileMaker, Inc. - Proprietary transport +-# Alex Chen <alex_chen&filemaker.com> 01 August 2007 +-# 5014-5019 Unassigned +-zenginkyo-1 5020/tcp zenginkyo-1 +-zenginkyo-1 5020/udp zenginkyo-1 +-zenginkyo-2 5021/tcp zenginkyo-2 +-zenginkyo-2 5021/udp zenginkyo-2 +-# Masashi Suzaki <susakim&noa.nttdata.jp> +-mice 5022/tcp mice server +-mice 5022/udp mice server +-# Alan Clifford <alan&clifford.ac> +-htuilsrv 5023/tcp Htuil Server for PLD2 +-htuilsrv 5023/udp Htuil Server for PLD2 +-# Dennis Reinhardt <DennisR&dair.com> +-scpi-telnet 5024/tcp SCPI-TELNET +-scpi-telnet 5024/udp SCPI-TELNET +-scpi-raw 5025/tcp SCPI-RAW +-scpi-raw 5025/udp SCPI-RAW +-# Ryan Columbus <IANA_Contact&Agilent.com> October 2002 +-strexec-d 5026/tcp Storix I/O daemon (data) +-strexec-d 5026/udp Storix I/O daemon (data) +-strexec-s 5027/tcp Storix I/O daemon (stat) +-strexec-s 5027/udp Storix I/O daemon (stat) +-# Anthony Johnson <stxadmin&storix.com> August 2005 +-# 5028-5029 Unassigned +-surfpass 5030/tcp SurfPass +-surfpass 5030/udp SurfPass +-# Olivier Guezenec <olivier.guezenec&cogilab.com> December 2006 +-# 5031-5041 Unassigned +-asnaacceler8db 5042/tcp asnaacceler8db +-asnaacceler8db 5042/udp asnaacceler8db +-# Walter Goodwin <wpgoodwin&asna.com> +-swxadmin 5043/tcp ShopWorX Administration +-swxadmin 5043/udp ShopWorX Administration +-# Don W. Fitzpatrick <dwf&InterNetworXsystems.com> August 2005 +-lxi-evntsvc 5044/tcp LXI Event Service +-lxi-evntsvc 5044/udp LXI Event Service +-# Nick Barendt <nbarendt&vxitech.com> August 2005 +-# 5045-5048 Unassigned +-ivocalize 5049/tcp iVocalize Web Conference +-ivocalize 5049/udp iVocalize Web Conference +-# Bryan Vergato <iana&ivocalize.com> May 2006 +-mmcc 5050/tcp multimedia conference control tool +-mmcc 5050/udp multimedia conference control tool +-# Steve Casner <Casner&isi.edu> +-ita-agent 5051/tcp ITA Agent +-ita-agent 5051/udp ITA Agent +-ita-manager 5052/tcp ITA Manager +-ita-manager 5052/udp ITA Manager +-# Don Merrell <donmer&axent.com> +-# 5053-5054 Unassigned +-unot 5055/tcp UNOT +-unot 5055/udp UNOT +-# Gordon Mohr <gmohr&cmgisolutions.com> +-intecom-ps1 5056/tcp Intecom Pointspan 1 +-intecom-ps1 5056/udp Intecom Pointspan 1 +-intecom-ps2 5057/tcp Intecom Pointspan 2 +-intecom-ps2 5057/udp Intecom Pointspan 2 +-# David Meermans <david.meermans&aastra.com> +-# 5058 Unassigned +-sds 5059/tcp SIP Directory Services +-sds 5059/udp SIP Directory Services +-# Arthur Wilton <art&awilton.com> March 2006 +-sip 5060/tcp SIP +-sip 5060/udp SIP +-sip-tls 5061/tcp SIP-TLS +-sip-tls 5061/udp SIP-TLS +-# Henning Schulzrinne <hgs&cs.columbia.edu> +-# 5062-5063 Unassigned +-ca-1 5064/tcp Channel Access 1 +-ca-1 5064/udp Channel Access 1 +-ca-2 5065/tcp Channel Access 2 +-ca-2 5065/udp Channel Access 2 +-# Jeffrey Hill <johill&lanl.gov> August 2002 +-stanag-5066 5066/tcp STANAG-5066-SUBNET-INTF +-stanag-5066 5066/udp STANAG-5066-SUBNET-INTF +-# Donald G. Kallgren +-# <Donald.Kallgren&nc3a.nato.int> +-authentx 5067/tcp Authentx Service +-authentx 5067/udp Authentx Service +-# Alberto Fernandez <afernandez&xtec.com> January 2006 +-# 5068 Unassigned +-i-net-2000-npr 5069/tcp I/Net 2000-NPR +-i-net-2000-npr 5069/udp I/Net 2000-NPR +-# Chris Megede <chris.megede&tac.com> +-vtsas 5070/tcp VersaTrans Server Agent Service +-vtsas 5070/udp VersaTrans Server Agent Service +-# Christopher Miller <Chris.Miller&versatrans.com> February 2006 +-powerschool 5071/tcp PowerSchool +-powerschool 5071/udp PowerSchool +-# Greg Porter <gporter&powerschool.com> +-ayiya 5072/tcp Anything In Anything +-ayiya 5072/udp Anything In Anything +-# Jeroen Massar <jeroen&unfix.org> August 2005 +-tag-pm 5073/tcp Advantage Group Port Mgr +-tag-pm 5073/udp Advantage Group Port Mgr +-# James Goddard <jamesg&taglim.com> August 2005 +-alesquery 5074/tcp ALES Query +-alesquery 5074/udp ALES Query +-# Tim Maloney <tim.maloney&allianceconsultingllc.com> August 2005 +-# 5075-5079 Unassigned +-onscreen 5080/tcp OnScreen Data Collection Service +-onscreen 5080/udp OnScreen Data Collection Service +-# Christopher Miller <chris.miller&versatrans.com> 14 January 2008 +-sdl-ets 5081/tcp SDL - Ent Trans Server +-sdl-ets 5081/udp SDL - Ent Trans Server +-# Marc Morin <mmorin&sdlintl.com> April 2002 +-# 5082-5083 Unassigned +-llrp 5084/tcp EPCglobal Low-Level Reader Protocol +-llrp 5084/udp EPCglobal Low-Level Reader Protocol +-encrypted-llrp 5085/tcp EPCglobal Encrypted LLRP +-encrypted-llrp 5085/udp EPCglobal Encrypted LLRP +-# Margaret Wasserman <margaret&thingmagic.com> November 2006 +-# 5086-5089 Unassigned +-car 5090/sctp Candidate AR +-cxtp 5091/sctp Context Transfer Protocol +-# RFC 4065 - July 2005 +-# 5092 Unassigned +-sentinel-lm 5093/tcp Sentinel LM +-sentinel-lm 5093/udp Sentinel LM +-# Derick Snyder <dsnyder&rainbow.com> +-# 5094-5098 Unassigned +-sentlm-srv2srv 5099/tcp SentLM Srv2Srv +-sentlm-srv2srv 5099/udp SentLM Srv2Srv +-# Derick Snyder <dsnyder&rainbow.com> +-socalia 5100/tcp Socalia service mux +-socalia 5100/udp Socalia service mux +-# Alberto Raydan <raydan_a&socalia.com> August 2005 +-talarian-tcp 5101/tcp Talarian_TCP +-talarian-udp 5101/udp Talarian_UDP +-# Leo Martins <leo&talarian.com> +-oms-nonsecure 5102/tcp Oracle OMS non-secure +-oms-nonsecure 5102/udp Oracle OMS non-secure +-# Todd Guay <todd.guay&oracle.com> August 2005 +-# 5103-5111 Unassigned +-pm-cmdsvr 5112/tcp PeerMe Msg Cmd Service +-pm-cmdsvr 5112/udp PeerMe Msg Cmd Service +-# Marcos Della <mdella&peerme.com> August 2005 +-# 5113-5132 Unassigned +-nbt-pc 5133/tcp Policy Commander +-nbt-pc 5133/udp Policy Commander +-# Emily Harris <eharris&newboundary.com> November 2004 +-# 5134-5136 Unassigned +-ctsd 5137/tcp MyCTS server port +-ctsd 5137/udp MyCTS server port +-# Jilles Oldenbeuving <ojilles&hotmail.com> June 2002 +-# 5138-5144 Unassigned +-rmonitor_secure 5145/tcp RMONITOR SECURE +-rmonitor_secure 5145/udp RMONITOR SECURE +-# Kory Hamzeh <kory&ascend.com> +-# 5146-5149 Unassigned +-atmp 5150/tcp Ascend Tunnel Management Protocol +-atmp 5150/udp Ascend Tunnel Management Protocol +-# Kory Hamzeh <kory&ascend.com> +-esri_sde 5151/tcp ESRI SDE Instance +-esri_sde 5151/udp ESRI SDE Remote Start +-sde-discovery 5152/tcp ESRI SDE Instance Discovery +-sde-discovery 5152/udp ESRI SDE Instance Discovery +-# Peter Aronson <paronson&esri.com> +-# 5153 Unassigned +-bzflag 5154/tcp BZFlag game server +-bzflag 5154/udp BZFlag game server +-# Tim Riker <tim&rikers.org> July 2003 +-asctrl-agent 5155/tcp Oracle asControl Agent +-asctrl-agent 5155/udp Oracle asControl Agent +-# Todd Guay <todd.guay&oracle.com> August 2005 +-# 5156-5164 Unassigned +-ife_icorp 5165/tcp ife_1corp +-ife_icorp 5165/udp ife_1corp +-# Paul Annala <paa&bull.se> +-winpcs 5166/tcp WinPCS Service Connection +-winpcs 5166/udp WinPCS Service Connection +-# Complan Network AS <knut&winpcs.com> February 2006 +-scte104 5167/tcp SCTE104 Connection +-scte104 5167/udp SCTE104 Connection +-scte30 5168/tcp SCTE30 Connection +-scte30 5168/udp SCTE30 Connection +-# Thomas Russell <trussell&scte.org> May 2005 +-# 5169-5189 Unassigned +-aol 5190/tcp America-Online +-aol 5190/udp America-Online +-# Marty Lyons <marty&aol.com> +-aol-1 5191/tcp AmericaOnline1 +-aol-1 5191/udp AmericaOnline1 +-aol-2 5192/tcp AmericaOnline2 +-aol-2 5192/udp AmericaOnline2 +-aol-3 5193/tcp AmericaOnline3 +-aol-3 5193/udp AmericaOnline3 +-# Bruce Mackey <BAMackey&aol.com> +-# 5194-5199 Unassigned +-targus-getdata 5200/tcp TARGUS GetData +-targus-getdata 5200/udp TARGUS GetData +-targus-getdata1 5201/tcp TARGUS GetData 1 +-targus-getdata1 5201/udp TARGUS GetData 1 +-targus-getdata2 5202/tcp TARGUS GetData 2 +-targus-getdata2 5202/udp TARGUS GetData 2 +-targus-getdata3 5203/tcp TARGUS GetData 3 +-targus-getdata3 5203/udp TARGUS GetData 3 +-# John Keaveney <johnkeaveney&targusinfo.com> +-# 5204-5221 Unassigned +-xmpp-client 5222/tcp XMPP Client Connection +-xmpp-client 5222/udp XMPP Client Connection +-# [RFC3920] +-hpvirtgrp 5223/tcp HP Virtual Machine Group Management +-hpvirtgrp 5223/udp HP Virtual Machine Group Management +-hpvirtctrl 5224/tcp HP Virtual Machine Console Operations +-hpvirtctrl 5224/udp HP Virtual Machine Console Operations +-# John Williams <John.H.Williams&hp.com> June 2007 +-hp-server 5225/tcp HP Server +-hp-server 5225/udp HP Server +-hp-status 5226/tcp HP Status +-hp-status 5226/udp HP Status +-# Brett Green <Brett_Green&HP.Com> +-perfd 5227/tcp HP System Performance Metric Service +-perfd 5227/udp HP System Performance Metric Service +-# Phyllis Gallgher <phyllis.gallagher&hp.com> April 2007 +-# 5228-5233 Unassigned +-eenet 5234/tcp EEnet communications +-eenet 5234/udp EEnet communications +-# Helmut Giritzer <helmut.giritzer&epluse.at> November 2005 +-galaxy-network 5235/tcp Galaxy Network Service +-galaxy-network 5235/udp Galaxy Network Service +-# Michael Andre <mandre&gatewayticketing.com> 04 October 2007 +-padl2sim 5236/tcp +-padl2sim 5236/udp +-# +-mnet-discovery 5237/tcp m-net discovery +-mnet-discovery 5237/udp m-net discovery +-# Andy Crick <acrick&haascnc.com> 13 November 2007 +-# 5238-5248 Unassigned +-caaclang2 5249/tcp CA AC Lang Service +-caaclang2 5249/udp CA AC Lang Service +-# Gabriel Kalmar <kalga01&ca.com> 19 February 2008 +-soagateway 5250/tcp soaGateway +-soagateway 5250/udp soaGateway +-# Greg Bodine <gregory.bodine&ca.com> February 2002 +-caevms 5251/tcp CA eTrust VM Service +-caevms 5251/udp CA eTrust VM Service +-# Kevin Bond <kevin.bond&ca.com> November 2004 +-movaz-ssc 5252/tcp Movaz SSC +-movaz-ssc 5252/udp Movaz SSC +-# Lou Berger <lberger&movaz.com> November 2004 +-# 5253-5263 Unassigned +-3com-njack-1 5264/tcp 3Com Network Jack Port 1 +-3com-njack-1 5264/udp 3Com Network Jack Port 1 +-3com-njack-2 5265/tcp 3Com Network Jack Port 2 +-3com-njack-2 5265/udp 3Com Network Jack Port 2 +-# Abhay Rajaram <Abhay_Rajaram&3Com.com> March 2003 +-# 5266-5268 Unassigned +-xmpp-server 5269/tcp XMPP Server Connection +-xmpp-server 5269/udp XMPP Server Connection +-# [RFC3920] +-# 5270-5271 Unassigned +-pk 5272/tcp PK +-pk 5272/udp PK +-# Patrick Kara <Patrick&EBA.NET> +-# 5273-5281 Unassigned +-transmit-port 5282/tcp Marimba Transmitter Port +-transmit-port 5282/udp Marimba Transmitter Port +-# Johan Eriksson <johan&marimba.com> April 2002 +-# 5283-5297 Unassigned +-presence 5298/tcp XMPP Link-Local Messaging +-presence 5298/udp XMPP Link-Local Messaging +-# Eric St. Onge <stonge&apple.com> 14 January 2008 +-nlg-data 5299/tcp NLG Data Service +-nlg-data 5299/udp NLG Data Service +-# Andy Shellam <andy.shellam&mailnetwork.co.uk> 19 February 2008 +-hacl-hb 5300/tcp HA cluster heartbeat +-hacl-hb 5300/udp HA cluster heartbeat +-hacl-gs 5301/tcp HA cluster general services +-hacl-gs 5301/udp HA cluster general services +-hacl-cfg 5302/tcp HA cluster configuration +-hacl-cfg 5302/udp HA cluster configuration +-hacl-probe 5303/tcp HA cluster probing +-hacl-probe 5303/udp HA cluster probing +-hacl-local 5304/tcp HA Cluster Commands +-hacl-local 5304/udp HA Cluster Commands +-hacl-test 5305/tcp HA Cluster Test +-hacl-test 5305/udp HA Cluster Test +-# Eric Soderberg <seric&hposl102.cup.hp> +-# Edward Yim <eyim&hpmfas4.cup.hp.com> +-sun-mc-grp 5306/tcp Sun MC Group +-sun-mc-grp 5306/udp Sun MC Group +-# Michael DeMoney <demoney&eng.sun.com> +-sco-aip 5307/tcp SCO AIP +-sco-aip 5307/udp SCO AIP +-# Barrie Cooper <barrie&sco.com> +-cfengine 5308/tcp CFengine +-cfengine 5308/udp CFengine +-# Mark Burgess <mark.burgess&iu.hioslo.no> +-jprinter 5309/tcp J Printer +-jprinter 5309/udp J Printer +-# Ken Blackwell <kenb&bristol.com> +-outlaws 5310/tcp Outlaws +-outlaws 5310/udp Outlaws +-# Richard Fife <richardf&lucasarts.com> +-# 5311 Unassigned (removed 7 May 2004) +-permabit-cs 5312/tcp Permabit Client-Server +-permabit-cs 5312/udp Permabit Client-Server +-# Jered Floyd <jered&permabit.com>, June 2004 +-rrdp 5313/tcp Real-time & Reliable Data +-rrdp 5313/udp Real-time & Reliable Data +-# Ted Hoshi <tetsuo.hoshi&jp.yokogawa.com>, June 2004 +-opalis-rbt-ipc 5314/tcp opalis-rbt-ipc +-opalis-rbt-ipc 5314/udp opalis-rbt-ipc +-# Laurent Domenech <ldomenech&opalis.com> +-hacl-poll 5315/tcp HA Cluster UDP Polling +-hacl-poll 5315/udp HA Cluster UDP Polling +-# Hoa Nguyen <hoan&cup.hp.com> +-hpdevms 5316/tcp HP Device Monitor Service +-hpdevms 5316/udp HP Device Monitor Service +-# Masato Maeda <Masato.Maeda&hp.com> 04 October 2007 +-# 5317-5342 Unassigned +-kfserver 5343/tcp Sculptor Database Server +-kfserver 5343/udp Sculptor Database Server +-# Keith Ashman <sciana&sculptor.co.uk> December 2005 +-xkotodrcp 5344/tcp xkoto DRCP +-xkotodrcp 5344/udp xkoto DRCP +-# Jeff Heisz <jeff.heisz&xkoto.com> February 2006 +-# 5345-5350 Unassigned +-nat-pmp-status 5350/tcp NAT-PMP Status Announcements +-nat-pmp-status 5350/udp NAT-PMP Status Announcements +-# Stuart Cheshire <cheshire&apple.com> 03 December 2007 +-nat-pmp 5351/tcp NAT Port Mapping Protocol +-nat-pmp 5351/udp NAT Port Mapping Protocol +-# Joshua Graessley <jgraessley&apple.com> December 2004 +-dns-llq 5352/tcp DNS Long-Lived Queries +-dns-llq 5352/udp DNS Long-Lived Queries +-# Kiren Sekar <kiren&apple.com> August 2005 +-mdns 5353/tcp Multicast DNS +-mdns 5353/udp Multicast DNS +-# Stuart Cheshire <cheshire&multicastdns.org> +-mdnsresponder 5354/tcp Multicast DNS Responder IPC +-mdnsresponder 5354/udp Multicast DNS Responder IPC +-# Stuart Cheshire <mdnsresponder-ipc&multicastdns.org> June 2004 +-llmnr 5355/tcp LLMNR +-llmnr 5355/udp LLMNR +-# Bernard Aboba <bernardaµsoft.com> June 2004 +-ms-smlbiz 5356/tcp Microsoft Small Business +-ms-smlbiz 5356/udp Microsoft Small Business +-# Gopikrishna Sandra <v-gosandµsoft.com> February 2005 +-wsdapi 5357/tcp Web Services for Devices +-wsdapi 5357/udp Web Services for Devices +-wsdapi-s 5358/tcp WS for Devices Secured +-wsdapi-s 5358/udp WS for Devices Secured +-# Henry Rawas <henryrµsoft.com> August 2005 +-ms-alerter 5359/tcp Microsoft Alerter +-ms-alerter 5359/udp Microsoft Alerter +-# Marc McClure <marcmccµsoft.com> 07 August 2007 +-# 5360-5396 Unassigned +-stresstester 5397/tcp StressTester(tm) Injector +-stresstester 5397/udp StressTester(tm) Injector +-# Graham Parsons <graham.parsons&reflective.com> August 2005 +-elektron-admin 5398/tcp Elektron Administration +-elektron-admin 5398/udp Elektron Administration +-# Chris Hawk <chris&corriente.net> August 2005 +-securitychase 5399/tcp SecurityChase +-securitychase 5399/udp SecurityChase +-# Daisuke Shinomiya <shinomiya.daisu&jp.fujitsu.com> August 2005 +-excerpt 5400/tcp Excerpt Search +-excerpt 5400/udp Excerpt Search +-excerpts 5401/tcp Excerpt Search Secure +-excerpts 5401/udp Excerpt Search Secure +-# John Hinsdale <hin&alma.com> +-mftp 5402/tcp OmniCast MFTP +-mftp 5402/udp OmniCast MFTP +-# Steve Bannister <sbannister&stratacache.com> +-hpoms-ci-lstn 5403/tcp HPOMS-CI-LSTN +-hpoms-ci-lstn 5403/udp HPOMS-CI-LSTN +-hpoms-dps-lstn 5404/tcp HPOMS-DPS-LSTN +-hpoms-dps-lstn 5404/udp HPOMS-DPS-LSTN +-# Harold Froehling <hrf&cup.hp.com> +-netsupport 5405/tcp NetSupport +-netsupport 5405/udp NetSupport +-# Paul Sanders <pe77&dial.pipex.com> +-systemics-sox 5406/tcp Systemics Sox +-systemics-sox 5406/udp Systemics Sox +-# Gary Howland <gary&systemics.com> +-foresyte-clear 5407/tcp Foresyte-Clear +-foresyte-clear 5407/udp Foresyte-Clear +-foresyte-sec 5408/tcp Foresyte-Sec +-foresyte-sec 5408/udp Foresyte-Sec +-# Jorge Aldana <operator&foresyte.com> +-salient-dtasrv 5409/tcp Salient Data Server +-salient-dtasrv 5409/udp Salient Data Server +-salient-usrmgr 5410/tcp Salient User Manager +-salient-usrmgr 5410/udp Salient User Manager +-# Richard Farnham <rfarnham&salient.com> +-actnet 5411/tcp ActNet +-actnet 5411/udp ActNet +-# Simon Robillard <RobillardS&actresearch.com> +-continuus 5412/tcp Continuus +-continuus 5412/udp Continuus +-# Steven Holtsberg <steveh&continuus.com> +-wwiotalk 5413/tcp WWIOTALK +-wwiotalk 5413/udp WWIOTALK +-# Roger Knobbe <RogerK&Wonderware.COM> +-statusd 5414/tcp StatusD +-statusd 5414/udp StatusD +-# Stephen Misel <steve&satelnet.org> +-ns-server 5415/tcp NS Server +-ns-server 5415/udp NS Server +-# Jeffrey Chiao <chiaoj&netsoft.com> +-sns-gateway 5416/tcp SNS Gateway +-sns-gateway 5416/udp SNS Gateway +-sns-agent 5417/tcp SNS Agent +-sns-agent 5417/udp SNS Agent +-# Mary Holstage <holstege&firstfloor.com> +-mcntp 5418/tcp MCNTP +-mcntp 5418/udp MCNTP +-# Heiko Rupp <hwr&pilhuhn.de> +-dj-ice 5419/tcp DJ-ICE +-dj-ice 5419/udp DJ-ICE +-# Don Tyson <don.tyson&cor.dowjones.com> +-cylink-c 5420/tcp Cylink-C +-cylink-c 5420/udp Cylink-C +-# John Jobe <jjobe&cylink.com> +-netsupport2 5421/tcp Net Support 2 +-netsupport2 5421/udp Net Support 2 +-# Paul Sanders <p.sanders&dial.pipex.com> +-salient-mux 5422/tcp Salient MUX +-salient-mux 5422/udp Salient MUX +-# Richard Farnham <rfarnham&salient.com> +-virtualuser 5423/tcp VIRTUALUSER +-virtualuser 5423/udp VIRTUALUSER +-# Chad Williams <chad&apple.com> +-beyond-remote 5424/tcp Beyond Remote +-beyond-remote 5424/udp Beyond Remote +-# Michael Berg <mike&dataapples.com> November 2004 +-br-channel 5425/tcp Beyond Remote Command Channel +-br-channel 5425/udp Beyond Remote Command Channel +-# Michael Berg <mike&dataapples.com> August 2005 +-devbasic 5426/tcp DEVBASIC +-devbasic 5426/udp DEVBASIC +-# Curtis Smith <curtis.smith&vsin.com> +-sco-peer-tta 5427/tcp SCO-PEER-TTA +-sco-peer-tta 5427/udp SCO-PEER-TTA +-# Andrew Shire <sndrewsh&sco.com> +-telaconsole 5428/tcp TELACONSOLE +-telaconsole 5428/udp TELACONSOLE +-# Joseph M. Newcomer <newcomer&flounder.com> +-base 5429/tcp Billing and Accounting System Exchange +-base 5429/udp Billing and Accounting System Exchange +-# Odo Maletzki <Odo.Maletzki&ioag.de> +-radec-corp 5430/tcp RADEC CORP +-radec-corp 5430/udp RADEC CORP +-# David Chell <david&softlife.co.nz> +-park-agent 5431/tcp PARK AGENT +-park-agent 5431/udp PARK AGENT +-# John Clifford <John.Clifford&veritas.com> +-postgresql 5432/tcp PostgreSQL Database +-postgresql 5432/udp PostgreSQL Database +-# Tom Lane <tgl&sss.pgh.pa.us> +-pyrrho 5433/tcp Pyrrho DBMS +-pyrrho 5433/udp Pyrrho DBMS +-# Malcolm Crowe <malcolm.crowe&paisley.ac.uk> November 2005 +-sgi-arrayd 5434/tcp SGI Array Services Daemon +-sgi-arrayd 5434/udp SGI Array Services Daemon +-# Karl Feind <kaf&sgi.com> October 2005 +-sceanics 5435/tcp SCEANICS situation and action notification +-sceanics 5435/udp SCEANICS situation and action notification +-# Richard Olsen <olsen.richard&yahoo.com> +-# 5436-5442 Unassigned +-spss 5443/tcp Pearson HTTPS +-spss 5443/udp Pearson HTTPS +-# Pearson <chad.smith&pearson.com> 17 January 2008 +-# 5444-5452 Unassigned +-surebox 5453/tcp SureBox +-surebox 5453/udp SureBox +-# Emin BORU <emin&danismanlik.net> November 2004 +-apc-5454 5454/tcp APC 5454 +-apc-5454 5454/udp APC 5454 +-apc-5455 5455/tcp APC 5455 +-apc-5455 5455/udp APC 5455 +-apc-5456 5456/tcp APC 5456 +-apc-5456 5456/udp APC 5456 +-# American Power Conversion <ports&apcc.com> +-# 5457-5460 Unassigned +-silkmeter 5461/tcp SILKMETER +-silkmeter 5461/udp SILKMETER +-# Klaus Fellner <webmaster&segue.com> <kfellner&segue.com> +-ttl-publisher 5462/tcp TTL Publisher +-ttl-publisher 5462/udp TTL Publisher +-# Peter Jacobs <pjacobs&tullib.com> +-ttlpriceproxy 5463/tcp TTL Price Proxy +-ttlpriceproxy 5463/udp TTL Price Proxy +-# Peter Jacobs <pjacobs&tullib.com> +-quailnet 5464/tcp Quail Networks Object Broker +-quailnet 5464/udp Quail Networks Object Broker +-# Craig N. Bissell <craig&quailnetworks.com> April 2006 +-netops-broker 5465/tcp NETOPS-BROKER +-netops-broker 5465/udp NETOPS-BROKER +-# John R. Deuel <kink&netops.com> +-# 5466-5499 Unassigned +-fcp-addr-srvr1 5500/tcp fcp-addr-srvr1 +-fcp-addr-srvr1 5500/udp fcp-addr-srvr1 +-fcp-addr-srvr2 5501/tcp fcp-addr-srvr2 +-fcp-addr-srvr2 5501/udp fcp-addr-srvr2 +-fcp-srvr-inst1 5502/tcp fcp-srvr-inst1 +-fcp-srvr-inst1 5502/udp fcp-srvr-inst1 +-fcp-srvr-inst2 5503/tcp fcp-srvr-inst2 +-fcp-srvr-inst2 5503/udp fcp-srvr-inst2 +-fcp-cics-gw1 5504/tcp fcp-cics-gw1 +-fcp-cics-gw1 5504/udp fcp-cics-gw1 +-# Ken Wittmer <kenneth.m.wittmer&accenture.com> +-checkoutdb 5505/tcp Checkout Database +-checkoutdb 5505/udp Checkout Database +-# Dirk Stoop <dirk&madebysofa.com> April 2007 +-# 5506-5552 Unassigned +-sgi-eventmond 5553/tcp SGI Eventmond Port +-sgi-eventmond 5553/udp SGI Eventmond Port +-# Andrei Vilkotski <andreiv&sgi.com> June 2003 +-sgi-esphttp 5554/tcp SGI ESP HTTP +-sgi-esphttp 5554/udp SGI ESP HTTP +-# Vladimir Legalov <legalov&sgi.com> +-############Port 5555 also used by HP Omniback##################### +-personal-agent 5555/tcp Personal Agent +-personal-agent 5555/udp Personal Agent +-# Jackie Wu <jackiew&infoseek.com> +-################################################################### +-freeciv 5556/tcp Freeciv gameplay +-freeciv 5556/udp Freeciv gameplay +-# Reinier Post, Paul Zastoupil <freeciv&freeciv.org> January 2006 +-# 5557-5565 Unassigned +-udpplus 5566/tcp UDPPlus +-udpplus 5566/udp UDPPlus +-# Cody Gibson <cody.gibson&intermec.com> +-m-oap 5567/tcp Multicast Object Access Protocol +-m-oap 5567/udp Multicast Object Access Protocol +-# Bryant Eastham <protocols&pewla.us.pewg.panasonic.com> November 2004 +-sdt 5568/tcp Session Data Transport Multicast +-sdt 5568/udp Session Data Transport Multicast +-# Daniel W. Antonuk <dantonuk&etcconnect.com> May 2006 +-# 5569-5572 Unassigned +-sdmmp 5573/tcp SAS Domain Management Messaging Protocol +-sdmmp 5573/udp SAS Domain Management Messaging Protocol +-# Ron Zuckerman <ron.zuckerman&lsi.com> 30 August 2007 +-# 5574-5579 Unassigned +-tmosms0 5580/tcp T-Mobile SMS Protocol Message 0 +-tmosms0 5580/udp T-Mobile SMS Protocol Message 0 +-tmosms1 5581/tcp T-Mobile SMS Protocol Message 1 +-tmosms1 5581/udp T-Mobile SMS Protocol Message 1 +-# Ezinne Oji <ezinne.oji&t-mobile.com> June 2006 +-fac-restore 5582/tcp T-Mobile SMS Protocol Message 3 +-fac-restore 5582/udp T-Mobile SMS Protocol Message 3 +-# Jessica Yan <jessica.yan2&t-mobile.com> 19 February 2008 +-tmo-icon-sync 5583/tcp T-Mobile SMS Protocol Message 2 +-tmo-icon-sync 5583/udp T-Mobile SMS Protocol Message 2 +-# Donghwan Lim <donghwan.lim&t-mobile.com> 22 January 2008 +-bis-web 5584/tcp BeInSync-Web +-bis-web 5584/udp BeInSync-Web +-bis-sync 5585/tcp BeInSync-sync +-bis-sync 5585/udp BeInSync-sync +-# Adi Ruppin <adi.ruppin&data-pod.com> August 2005 +-# 5586-5596 Unassigned +-ininmessaging 5597/tcp inin secure messaging +-ininmessaging 5597/udp inin secure messaging +-# Mike Gagle <mikeg&inin.com> May 2006 +-mctfeed 5598/tcp MCT Market Data Feed +-mctfeed 5598/udp MCT Market Data Feed +-# Stephane Touizer <touizerµcaptrade.com> May 2006 +-esinstall 5599/tcp Enterprise Security Remote Install +-esinstall 5599/udp Enterprise Security Remote Install +-esmmanager 5600/tcp Enterprise Security Manager +-esmmanager 5600/udp Enterprise Security Manager +-esmagent 5601/tcp Enterprise Security Agent +-esmagent 5601/udp Enterprise Security Agent +-# Kimberly Gibbs <kimgib&CCGATE-UT.AXENT.COM> +-a1-msc 5602/tcp A1-MSC +-a1-msc 5602/udp A1-MSC +-a1-bs 5603/tcp A1-BS +-a1-bs 5603/udp A1-BS +-a3-sdunode 5604/tcp A3-SDUNode +-a3-sdunode 5604/udp A3-SDUNode +-a4-sdunode 5605/tcp A4-SDUNode +-a4-sdunode 5605/udp A4-SDUNode +-# Mike Dolan <MDolan&ihcmail.ih.lucent.com> +-# 5606-5626 Unassigned +-ninaf 5627/tcp Node Initiated Network Association Forma +-ninaf 5627/udp Node Initiated Network Association Forma +-# Thomas Scholl <tscholl&spf.is-is.ca> March 2006 +-# 5628 Unassigned +-symantec-sfdb 5629/tcp Symantec Storage Foundation for Database +-symantec-sfdb 5629/udp Symantec Storage Foundation for Database +-# Quang Thoi <quang_thoi&symantec.com> November 2006 +-precise-comm 5630/tcp PreciseCommunication +-precise-comm 5630/udp PreciseCommunication +-# Alon Tamir <alon_tamir&symantec.com> April 2006 +-pcanywheredata 5631/tcp pcANYWHEREdata +-pcanywheredata 5631/udp pcANYWHEREdata +-pcanywherestat 5632/tcp pcANYWHEREstat +-pcanywherestat 5632/udp pcANYWHEREstat +-# Jon Rosarky <JRosarky&symantec.com> +-beorl 5633/tcp BE Operations Request Listener +-beorl 5633/udp BE Operations Request Listener +-# chirag desai <Chirag_Desai&symantec.com> February 2006 +-xprtld 5634/tcp SF Message Service +-xprtld 5634/udp SF Message Service +-# VR Satish <vr_satish&symantec.com> 16 August 2007 +-# 5635-5671 Unassigned +-amqp 5672/tcp AMQP +-amqp 5672/udp AMQP +-# Pieter Hintjens <ph&imatix.com> January 2006 +-amqp 5672/sctp AMQP +-# Martin Sustrik <sustrik&imatix.com> March 2007 +-jms 5673/tcp JACL Message Server +-jms 5673/udp JACL Message Server +-# Stuart Allen <stuart&jacl.animats.net> February 2002 +-hyperscsi-port 5674/tcp HyperSCSI Port +-hyperscsi-port 5674/udp HyperSCSI Port +-# Data Storage Institute, Singapore +-# <Patrick&dsi.nus.edu.sg> February 2002 +-v5ua 5675/tcp V5UA application port +-v5ua 5675/udp V5UA application port +-v5ua 5675/sctp V5UA application port +-# RFC3807 June 2004 +-raadmin 5676/tcp RA Administration +-raadmin 5676/udp RA Administration +-# Sergei Zjaikin <serge&previo.ee> February 2002 +-questdb2-lnchr 5677/tcp Quest Central DB2 Launchr +-questdb2-lnchr 5677/udp Quest Central DB2 Launchr +-# Robert M. Mackowiak <rmackowiak&quest.com> February 2002 +-rrac 5678/tcp Remote Replication Agent Connection +-rrac 5678/udp Remote Replication Agent Connection +-dccm 5679/tcp Direct Cable Connect Manager +-dccm 5679/udp Direct Cable Connect Manager +-# Mark Miller <mmiller&MICROSOFT.com> +-auriga-router 5680/tcp Auriga Router Service +-auriga-router 5680/udp Auriga Router Service +-# Vincent Gaudeul <technique&auriga.fr> February 2006 +-ncxcp 5681/tcp Net-coneX Control Protocol +-ncxcp 5681/udp Net-coneX Control Protocol +-# Ryan Werber <ryan&ncxti.com> June 2006 +-# 5682-5687 Unassigned +-ggz 5688/tcp GGZ Gaming Zone +-ggz 5688/udp GGZ Gaming Zone +-# Josef Spillner <admin&ggzgamingzone.org> January 2003 +-qmvideo 5689/tcp QM video network management protocol +-qmvideo 5689/udp QM video network management protocol +-# Jamie Lokier <jamie&jlokier.co.uk> May 2006 +-# 5690-5712 Unassigned +-proshareaudio 5713/tcp proshare conf audio +-proshareaudio 5713/udp proshare conf audio +-prosharevideo 5714/tcp proshare conf video +-prosharevideo 5714/udp proshare conf video +-prosharedata 5715/tcp proshare conf data +-prosharedata 5715/udp proshare conf data +-prosharerequest 5716/tcp proshare conf request +-prosharerequest 5716/udp proshare conf request +-prosharenotify 5717/tcp proshare conf notify +-prosharenotify 5717/udp proshare conf notify +-# <gunner&ibeam.intel.com> +-dpm 5718/tcp DPM Communication Server +-dpm 5718/udp DPM Communication Server +-dpm-agent 5719/tcp DPM Agent Coordinator +-dpm-agent 5719/udp DPM Agent Coordinator +-# Sundar Srinivasan <sundarsµsoft.com> Vinay Badami <VinayBµsoft.com> May 2006 +-ms-licensing 5720/tcp MS-Licensing +-ms-licensing 5720/udp MS-Licensing +-# Thomas Lindeman <tlindeµsoft.com> November 2002 +-dtpt 5721/tcp Desktop Passthru Service +-dtpt 5721/udp Desktop Passthru Service +-# Dan Leising <dleisingµsoft.com> January 2005 +-msdfsr 5722/tcp Microsoft DFS Replication Service +-msdfsr 5722/udp Microsoft DFS Replication Service +-# Guhan Suriyanarayanan <guhansµsoft.com> March 2006 +-omhs 5723/tcp Operations Manager - Health Service +-omhs 5723/udp Operations Manager - Health Service +-omsdk 5724/tcp Operations Manager - SDK Service +-omsdk 5724/udp Operations Manager - SDK Service +-# Gerardo Dilillo <MOMIANAµsoft.com> August 2006 +-# 5725-5728 Unassigned +-openmail 5729/tcp Openmail User Agent Layer +-openmail 5729/udp Openmail User Agent Layer +-# OpenMail Encyclopedia <opencyc&hpopd.pwd.hp.com> +-# Don Loughry <DON_LOUGHRY&hp-cupertino-om4.om.hp.com> +-unieng 5730/tcp Steltor's calendar access +-unieng 5730/udp Steltor's calendar access +-# Bernard Desruisseaux <bernard&steltor.com> +-# 5731-5740 Unassigned +-ida-discover1 5741/tcp IDA Discover Port 1 +-ida-discover1 5741/udp IDA Discover Port 1 +-ida-discover2 5742/tcp IDA Discover Port 2 +-ida-discover2 5742/udp IDA Discover Port 2 +-# MPITech Support <morten.christensen&I-DATA.COM> +-watchdoc-pod 5743/tcp Watchdoc NetPOD Protocol +-watchdoc-pod 5743/udp Watchdoc NetPOD Protocol +-# Christophe Chevalier <chevalier&archimed.fr> August 2005 +-watchdoc 5744/tcp Watchdoc Server +-watchdoc 5744/udp Watchdoc Server +-# Christophe Chevalier <chevalier&archimed.fr> November 2004 +-fcopy-server 5745/tcp fcopy-server +-fcopy-server 5745/udp fcopy-server +-fcopys-server 5746/tcp fcopys-server +-fcopys-server 5746/udp fcopys-server +-# Moshe Leibovitch <moshe&softlinkusa.com> +-tunatic 5747/tcp Wildbits Tunatic +-tunatic 5747/udp Wildbits Tunatic +-tunalyzer 5748/tcp Wildbits Tunalyzer +-tunalyzer 5748/udp Wildbits Tunalyzer +-# Sylvain Demongeot <sylvain.demongeot&wildbits.com> August 2005 +-# 5749 Unassigned +-rscd 5750/tcp Bladelogic Agent Service +-rscd 5750/udp Bladelogic Agent Service +-# Brian Trevor <btrevor&bladelogic.com> 07 January 2008 +-# 5751-5754 Unassigned +-openmailg 5755/tcp OpenMail Desk Gateway server +-openmailg 5755/udp OpenMail Desk Gateway server +-x500ms 5757/tcp OpenMail X.500 Directory Server +-x500ms 5757/udp OpenMail X.500 Directory Server +-openmailns 5766/tcp OpenMail NewMail Server +-openmailns 5766/udp OpenMail NewMail Server +-s-openmail 5767/tcp OpenMail Suer Agent Layer (Secure) +-s-openmail 5767/udp OpenMail Suer Agent Layer (Secure) +-openmailpxy 5768/tcp OpenMail CMTS Server +-openmailpxy 5768/udp OpenMail CMTS Server +-# OpenMail Encyclopedia <opencyc&hpopd.pwd.hp.com> +-# Don Loughry <DON_LOUGHRY&hp-cupertino-om4.om.hp.com> +-spramsca 5769/tcp x509solutions Internal CA +-spramsca 5769/udp x509solutions Internal CA +-spramsd 5770/tcp x509solutions Secure Data +-spramsd 5770/udp x509solutions Secure Data +-# Brendan Fay <brendan.fay&x509solutions.com> February 2006 +-netagent 5771/tcp NetAgent +-netagent 5771/udp NetAgent +-# Bradley Birnbaum <bradley.birnbaum&eshare.com> +-# 5772-5776 Unassigned +-dali-port 5777/tcp DALI Port +-dali-port 5777/udp DALI Port +-# Wayne Morrow / Michael Melio <wmorrow&starfieldcorp.com> / <meliomd&comcast.net> October 2003 +-# 5778-5792 Unassigned +-xtreamx 5793/tcp XtreamX Supervised Peer message +-xtreamx 5793/udp XtreamX Supervised Peer message +-# Ahmad Tajuddin Samsudin <tajuddin&tmrnd.com.my> February 2007 +-# 5794-5812 Unassigned +-icmpd 5813/tcp ICMPD +-icmpd 5813/udp ICMPD +-# Shane O'Donnell <shane&opennms.org> +-spt-automation 5814/tcp Support Automation +-spt-automation 5814/udp Support Automation +-# Joshua Hawkins <joshua.hawkins&hp.com> November 2003 +-# 5815-5858 Unassigned +-wherehoo 5859/tcp WHEREHOO +-wherehoo 5859/udp WHEREHOO +-# Jim Youll <jim&media.mit.edu> +-# 5860-5862 Unassigned +-ppsuitemsg 5863/tcp PlanetPress Suite Messeng +-ppsuitemsg 5863/udp PlanetPress Suite Messeng +-# Yannick Fortin <fortiny&ca.objectiflune.com> February 2006 +-# 5864-5899 Unassigned +-vnc-server 5900/tcp VNC Server +-vnc-server 5900/udp VNC Server +-# Tristan Richardson <iana&realvnc.com> March 2006 +-# 5901-5962 Unassigned +-indy 5963/tcp Indy Application Server +-indy 5963/udp Indy Application Server +-# Bjorn Lantz <bjorn.lantz&encode.se> November 2004 +-# 5964-5967 Unassigned +-mppolicy-v5 5968/tcp mppolicy-v5 +-mppolicy-v5 5968/udp mppolicy-v5 +-mppolicy-mgr 5969/tcp mppolicy-mgr +-mppolicy-mgr 5969/udp mppolicy-mgr +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 5970-5983 Unassigned +-couchdb 5984/tcp CouchDB +-couchdb 5984/udp CouchDB +-# Noah Slater <nslater&bytesexual.org> 27 November 2007 +-wsman 5985/tcp WBEM WS-Management HTTP +-wsman 5985/udp WBEM WS-Management HTTP +-wsmans 5986/tcp WBEM WS-Management HTTP over TLS/SSL +-wsmans 5986/udp WBEM WS-Management HTTP over TLS/SSL +-# Jim Davis <jim.davis&wbemsolutions.com> November 2006 +-wbem-rmi 5987/tcp WBEM RMI +-wbem-rmi 5987/udp WBEM RMI +-wbem-http 5988/tcp WBEM CIM-XML (HTTP) +-wbem-http 5988/udp WBEM CIM-XML (HTTP) +-# Jim Davis <jim.davis&wbemsolutions.com> +-wbem-https 5989/tcp WBEM CIM-XML (HTTPS) +-wbem-https 5989/udp WBEM CIM-XML (HTTPS) +-# Jim Davis <jim.davis&wbemsolutions.com> +-wbem-exp-https 5990/tcp WBEM Export HTTPS +-wbem-exp-https 5990/udp WBEM Export HTTPS +-# Denise Eckstein <denise.eckstein&hp.com> November 2004 +-nuxsl 5991/tcp NUXSL +-nuxsl 5991/udp NUXSL +-# Kai Kretschmann <K.Kretschmann&security-gui.de> March 2002 +-consul-insight 5992/tcp Consul InSight Security +-consul-insight 5992/udp Consul InSight Security +-# Arthur Hillenaar <arthur.hillenaar&consul.com> January 2006 +-# 5993-5998 Unassigned +-cvsup 5999/tcp CVSup +-cvsup 5999/udp CVSup +-# Randall Atkinson <rja&inet.org> +-x11 6000-6063/tcp X Window System +-x11 6000-6063/udp X Window System +-# Stephen Gildea <gildea&lcs.mit.edu> +-ndl-ahp-svc 6064/tcp NDL-AHP-SVC +-ndl-ahp-svc 6064/udp NDL-AHP-SVC +-# John Richmond <john&ndl.co.uk> +-winpharaoh 6065/tcp WinPharaoh +-winpharaoh 6065/udp WinPharaoh +-# Basil Lee <basil.lee&gnnettest.com> +-ewctsp 6066/tcp EWCTSP +-ewctsp 6066/udp EWCTSP +-# Mark Bailon <mark.bailon&ericsson.com> +-# 6067 Unassigned (Removed on 2007-07-17) +-gsmp 6068/tcp GSMP +-gsmp 6068/udp GSMP +-# Avri Doria <avri.doria&nokia.com> +-trip 6069/tcp TRIP +-trip 6069/udp TRIP +-# Hussein F. Salama <hsalama&cisco.com> +-messageasap 6070/tcp Messageasap +-messageasap 6070/udp Messageasap +-# Murray Freeman <murray&officedomain.com> +-ssdtp 6071/tcp SSDTP +-ssdtp 6071/udp SSDTP +-# Michael Shearson <mikes&softsys-inc.com> +-diagnose-proc 6072/tcp DIAGNOSE-PROC +-diagnose-proc 6072/udp DIAGNOSE-PROC +-# Allan Miller <amiller&handsfreenetworks.com> +-directplay8 6073/tcp DirectPlay8 +-directplay8 6073/udp DirectPlay8 +-# John Kane <johnkanµsoft.com> +-max 6074/tcp Microsoft Max +-max 6074/udp Microsoft Max +-# Jay Beavers <Jay.Beavers&Microsoft.Com> February 2006 +-# 6075-6084 Unassigned +-konspire2b 6085/tcp konspire2b p2p network +-konspire2b 6085/udp konspire2b p2p network +-# Jason Rohrer <rohrer&cse.ucsc.edu> October 2002 +-pdtp 6086/tcp PDTP P2P +-pdtp 6086/udp PDTP P2P +-# Tony Arcieri <bascule&gmail.com> March 2006 +-ldss 6087/tcp Local Download Sharing Service +-ldss 6087/udp Local Download Sharing Service +-# Clifford Heath <cjh&managesoft.com> May 2006 +-# 6088-6099 Unassigned +-synchronet-db 6100/tcp SynchroNet-db +-synchronet-db 6100/udp SynchroNet-db +-synchronet-rtc 6101/tcp SynchroNet-rtc +-synchronet-rtc 6101/udp SynchroNet-rtc +-synchronet-upd 6102/tcp SynchroNet-upd +-synchronet-upd 6102/udp SynchroNet-upd +-# Arne Haugland <Arne.Haugland¶soldev.com> +-rets 6103/tcp RETS +-rets 6103/udp RETS +-# Bruce Toback <btoback&optc.com> +-dbdb 6104/tcp DBDB +-dbdb 6104/udp DBDB +-# Aaron Brick <aa&lithic.org> +-primaserver 6105/tcp Prima Server +-primaserver 6105/udp Prima Server +-mpsserver 6106/tcp MPS Server +-mpsserver 6106/udp MPS Server +-# Prima Designs Systems Ltd. <info&prima.com.hk> +-etc-control 6107/tcp ETC Control +-etc-control 6107/udp ETC Control +-# Steve Polishinski <spolishinski&etcconnect.com> +-sercomm-scadmin 6108/tcp Sercomm-SCAdmin +-sercomm-scadmin 6108/udp Sercomm-SCAdmin +-# Melinda Tsao <melinda_tsao&mail.sercomm.com.tw> +-globecast-id 6109/tcp GLOBECAST-ID +-globecast-id 6109/udp GLOBECAST-ID +-# Piers Scannell <piers&globecastne.com> +-softcm 6110/tcp HP SoftBench CM +-softcm 6110/udp HP SoftBench CM +-spc 6111/tcp HP SoftBench Sub-Process Control +-spc 6111/udp HP SoftBench Sub-Process Control +-# Scott A. Kramer <sk&tleilaxu.sde.hp.com> +-dtspcd 6112/tcp dtspcd +-dtspcd 6112/udp dtspcd +-# Doug Royer <Doug&Royer.com> +-# 6113-6121 Unassigned +-bex-webadmin 6122/tcp Backup Express Web Server +-bex-webadmin 6122/udp Backup Express Web Server +-# Chi Shih Chang <cchang&syncsort.com> November 2005 +-backup-express 6123/tcp Backup Express +-backup-express 6123/udp Backup Express +-# Chi Shih Chang <cchang&syncsort.com> +-# 6124-6132 Unassigned +-nbt-wol 6133/tcp New Boundary Tech WOL +-nbt-wol 6133/udp New Boundary Tech WOL +-# Elizabeth Zilen <ezilen&newboundary.com> November 2004 +-# 6134-6139 Unassigned +-pulsonixnls 6140/tcp Pulsonix Network License Service +-pulsonixnls 6140/udp Pulsonix Network License Service +-# David Manns <davidm&pulsonix.com> 28 February 2008 +-meta-corp 6141/tcp Meta Corporation License Manager +-meta-corp 6141/udp Meta Corporation License Manager +-# Osamu Masuda <--none---> +-aspentec-lm 6142/tcp Aspen Technology License Manager +-aspentec-lm 6142/udp Aspen Technology License Manager +-# Kevin Massey <massey&aspentec.com> +-watershed-lm 6143/tcp Watershed License Manager +-watershed-lm 6143/udp Watershed License Manager +-# David Ferrero <david&zion.com> +-statsci1-lm 6144/tcp StatSci License Manager - 1 +-statsci1-lm 6144/udp StatSci License Manager - 1 +-statsci2-lm 6145/tcp StatSci License Manager - 2 +-statsci2-lm 6145/udp StatSci License Manager - 2 +-# Scott Blachowicz <scott&statsci.com> +-lonewolf-lm 6146/tcp Lone Wolf Systems License Manager +-lonewolf-lm 6146/udp Lone Wolf Systems License Manager +-# Dan Klein <dvk&lonewolf.com> +-montage-lm 6147/tcp Montage License Manager +-montage-lm 6147/udp Montage License Manager +-# Michael Ubell <michael&montage.com> +-ricardo-lm 6148/tcp Ricardo North America License Manager +-ricardo-lm 6148/udp Ricardo North America License Manager +-# M Flemming <mflemming&aol.com> +-tal-pod 6149/tcp tal-pod +-tal-pod 6149/udp tal-pod +-# Steven Loomis <srl&taligent.com> +-# 6150-6160 Unassigned +-patrol-ism 6161/tcp PATROL Internet Srv Mgr +-patrol-ism 6161/udp PATROL Internet Srv Mgr +-patrol-coll 6162/tcp PATROL Collector +-patrol-coll 6162/udp PATROL Collector +-# Portnoy Boxman <portnoy_boxman&bmc.com> January 2005 +-pscribe 6163/tcp Precision Scribe Cnx Port +-pscribe 6163/udp Precision Scribe Cnx Port +-# Robert W Hodges <iana&precdata.com> January 2005 +-# 6164-6199 Unassigned +-lm-x 6200/tcp LM-X License Manager by X-Formation +-lm-x 6200/udp LM-X License Manager by X-Formation +-# Henrik Goldman <hg&x-formation.com> October 2006 +-# 6201-6221 Unassigned +-radmind 6222/tcp Radmind Access Protocol +-radmind 6222/udp Radmind Access Protocol +-# Patrick M McNeal <mcneal&umich.edu> March 2006 +-# 6223-6250 Unassigned +-tl1-raw-ssl 6251/tcp TL1 Raw Over SSL/TLS +-tl1-raw-ssl 6251/udp TL1 Raw Over SSL/TLS +-# Jim Humphreys <jhumphre&ciena.com> 29 January 2008 +-tl1-ssh 6252/tcp TL1 over SSH +-tl1-ssh 6252/udp TL1 over SSH +-# Jim Humphreys <jhumphre&ciena.com> 25 January 2008 +-crip 6253/tcp CRIP +-crip 6253/udp CRIP +-# Mike Rodbell <mrodbell&ciena.com> +-# 6254-6267 Unassigned +-grid 6268/tcp Grid Authentication +-grid 6268/udp Grid Authentication +-grid-alt 6269/tcp Grid Authentication Alt +-grid-alt 6269/udp Grid Authentication Alt +-# Jason Hamilton <JHamilton&griddatasecurity.com> June 2006 +-# 6270-6299 Unassigned +-bmc-grx 6300/tcp BMC GRX +-bmc-grx 6300/udp BMC GRX +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-bmc_ctd_ldap 6301/tcp BMC CONTROL-D LDAP SERVER +-bmc_ctd_ldap 6301/udp BMC CONTROL-D LDAP SERVER +-# Portnoy Boxman <Portnoy_Boxman&bmc.com> September 2006 +-# 6302-6319 Unassigned +-repsvc 6320/tcp Double-Take Replication Service +-repsvc 6320/udp Double-Take Replication Service +-# James Wilkinson <jwilkinson&doubletake.com> April 2006 +-emp-server1 6321/tcp Empress Software Connectivity Server 1 +-emp-server1 6321/udp Empress Software Connectivity Server 1 +-emp-server2 6322/tcp Empress Software Connectivity Server 2 +-emp-server2 6322/udp Empress Software Connectivity Server 2 +-# Srdjan Holovac <srdjan&empress.com> +-# 6323-6342 Unassigned +-sflow 6343/tcp sFlow traffic monitoring +-sflow 6343/udp sFlow traffic monitoring +-# Peter Phaal <peter.phaal&inmon.com> June 2003 +-# 6344-6345 Unassigned +-gnutella-svc 6346/tcp gnutella-svc +-gnutella-svc 6346/udp gnutella-svc +-gnutella-rtr 6347/tcp gnutella-rtr +-gnutella-rtr 6347/udp gnutella-rtr +-# Serguei Osokine <osokin¶graph.com> +-# 6348-6354 Unassigned +-pmcs 6355/tcp PMCS applications +-pmcs 6355/udp PMCS applications +-# Pavel Mendl <pavel_mendl¢rum.cz> March 2007 +-# 6356-6359 Unassigned +-metaedit-mu 6360/tcp MetaEdit+ Multi-User +-metaedit-mu 6360/udp MetaEdit+ Multi-User +-# Steven Kelly <stevek&metacase.com> 12 November 2007 +-# 6361-6369 Unassigned +-metaedit-se 6370/tcp MetaEdit+ Server Administration +-metaedit-se 6370/udp MetaEdit+ Server Administration +-# Steven Kelly <stevek&metacase.com> 12 November 2007 +-# 6371-6381 Unassigned +-metatude-mds 6382/tcp Metatude Dialogue Server +-metatude-mds 6382/udp Metatude Dialogue Server +-# Menno Zweistra <m.zweistra&metatude.com> +-# 6383-6388 Unassigned +-clariion-evr01 6389/tcp clariion-evr01 +-clariion-evr01 6389/udp clariion-evr01 +-# Dave DesRoches <ddesroches&clariion.com> +-metaedit-ws 6390/tcp MetaEdit+ WebService API +-metaedit-ws 6390/udp MetaEdit+ WebService API +-# Steven Kelly <stevek&metacase.com> 12 November 2007 +-# 6391-6399 Unassigned +-# The following blocks are in use by Seagate Software 6400-6410 # +-info-aps 6400 +-info-was 6401 +-info-eventsvr 6402 +-info-cachesvr 6403 +-info-filesvr 6404 +-info-pagesvr 6405 +-info-processvr 6406 +-reserved1 6407 +-reserved2 6408 +-reserved3 6409 +-reserved4 6410 +-# The previous ports are in use by Seagate Software 6400-6410 # +-# Contact for these ports is Wade Richards <Wade.Richards&Seagatesoftware.com> +-# 6411-6416 Unassigned +-faxcomservice 6417/tcp Faxcom Message Service +-faxcomservice 6417/udp Faxcom Message Service +-# Albert Leung <aleung&biscom.com> April 2006 +-# 6418-6419 Unassigned +-nim-vdrshell 6420/tcp NIM_VDRShell +-nim-vdrshell 6420/udp NIM_VDRShell +-nim-wan 6421/tcp NIM_WAN +-nim-wan 6421/udp NIM_WAN +-# Rik Ditter <managers&generationtechnologies.com> February 2006 +-# 6422-6442 Unassigned +-sun-sr-https 6443/tcp Service Registry Default HTTPS Domain +-sun-sr-https 6443/udp Service Registry Default HTTPS Domain +-# Paul Sterk <paul.sterk&sun.com> March 2006 +-sge_qmaster 6444/tcp Grid Engine Qmaster Service +-sge_qmaster 6444/udp Grid Engine Qmaster Service +-sge_execd 6445/tcp Grid Engine Execution Service +-sge_execd 6445/udp Grid Engine Execution Service +-# Andreas Haas <andreas.haas&sun.com> August 2006 +-# 6446-6454 Unassigned +-skip-cert-recv 6455/tcp SKIP Certificate Receive +-skip-cert-send 6456/udp SKIP Certificate Send +-# Tom Markson <markson&osmosys.incog.com> +-# 6457-6470 Unassigned +-lvision-lm 6471/tcp LVision License Manager +-lvision-lm 6471/udp LVision License Manager +-# Brian McKinnon <bmk&lvision.com> +-# 6472-6479 Unassigned +-sun-sr-http 6480/tcp Service Registry Default HTTP Domain +-sun-sr-http 6480/udp Service Registry Default HTTP Domain +-# Paul Sterk <paul.sterk&sun.com> March 2006 +-servicetags 6481/tcp Service Tags +-servicetags 6481/udp Service Tags +-# Peter Schow <Peter.Schow&Sun.COM> January 2007 +-ldoms-mgmt 6482/tcp Logical Domains Management Interface +-ldoms-mgmt 6482/udp Logical Domains Management Interface +-# Eric Sharakan <ldoms-iana-ports&sun.com> 14 February 2008 +-SunVTS-RMI 6483/tcp SunVTS RMI +-SunVTS-RMI 6483/udp SunVTS RMI +-# Sumit Arora <sumit.arora&sun.com> June 2007 +-sun-sr-jms 6484/tcp Service Registry Default JMS Domain +-sun-sr-jms 6484/udp Service Registry Default JMS Domain +-sun-sr-iiop 6485/tcp Service Registry Default IIOP Domain +-sun-sr-iiop 6485/udp Service Registry Default IIOP Domain +-sun-sr-iiops 6486/tcp Service Registry Default IIOPS Domain +-sun-sr-iiops 6486/udp Service Registry Default IIOPS Domain +-sun-sr-iiop-aut 6487/tcp Service Registry Default IIOPAuth Domain +-sun-sr-iiop-aut 6487/udp Service Registry Default IIOPAuth Domain +-sun-sr-jmx 6488/tcp Service Registry Default JMX Domain +-sun-sr-jmx 6488/udp Service Registry Default JMX Domain +-sun-sr-admin 6489/tcp Service Registry Default Admin Domain +-sun-sr-admin 6489/udp Service Registry Default Admin Domain +-# Paul Sterk <paul.sterk&sun.com> March 2006 +-# 6490-6499 Unassigned +-boks 6500/tcp BoKS Master +-boks 6500/udp BoKS Master +-boks_servc 6501/tcp BoKS Servc +-boks_servc 6501/udp BoKS Servc +-boks_servm 6502/tcp BoKS Servm +-boks_servm 6502/udp BoKS Servm +-boks_clntd 6503/tcp BoKS Clntd +-boks_clntd 6503/udp BoKS Clntd +-# Magnus Nystrom <magnus&dynas.se> +-# 6504 Unassigned +-badm_priv 6505/tcp BoKS Admin Private Port +-badm_priv 6505/udp BoKS Admin Private Port +-badm_pub 6506/tcp BoKS Admin Public Port +-badm_pub 6506/udp BoKS Admin Public Port +-bdir_priv 6507/tcp BoKS Dir Server, Private Port +-bdir_priv 6507/udp BoKS Dir Server, Private Port +-bdir_pub 6508/tcp BoKS Dir Server, Public Port +-bdir_pub 6508/udp BoKS Dir Server, Public Port +-# Magnus Nystrom <magnus&dynas.se> +-mgcs-mfp-port 6509/tcp MGCS-MFP Port +-mgcs-mfp-port 6509/udp MGCS-MFP Port +-# Minoru Ozaki <Minoru.Ozaki&rdmg.mgcs.mei.co.jp> +-mcer-port 6510/tcp MCER Port +-mcer-port 6510/udp MCER Port +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-# 6511-6514 Unassigned +-elipse-rec 6515/tcp Elipse RPC Protocol +-elipse-rec 6515/udp Elipse RPC Protocol +-# Flávio Englert <flavio&elipse.com.br> 17 September 2007 +-# 6516-6542 Unassigned +-lds-distrib 6543/tcp lds_distrib +-lds-distrib 6543/udp lds_distrib +-# Jack Baker <Jack.Baker&L-3Com.com> June 2003 +-lds-dump 6544/tcp LDS Dump Service +-lds-dump 6544/udp LDS Dump Service +-# Jack Baker <Jack.Baker&L-3Com.com> February 2006 +-# 6545-6546 Unassigned +-apc-6547 6547/tcp APC 6547 +-apc-6547 6547/udp APC 6547 +-apc-6548 6548/tcp APC 6548 +-apc-6548 6548/udp APC 6548 +-apc-6549 6549/tcp APC 6549 +-apc-6549 6549/udp APC 6549 +-# American Power Conversion <ports&apcc.com> +-fg-sysupdate 6550/tcp fg-sysupdate +-fg-sysupdate 6550/udp fg-sysupdate +-# Mark Beyer <mbeyer&freegate.com> +-sum 6551/tcp Software Update Manager +-sum 6551/udp Software Update Manager +-# Jan Dirven <jan.dirven&agfa.com> 13 December 2007 +-# 6552-6557 Unassigned +-xdsxdm 6558/tcp +-xdsxdm 6558/udp +-# Brian Tackett <cym&acrux.net> possible contact +-# 6559-6565 Unassigned +-sane-port 6566/tcp SANE Control Port +-sane-port 6566/udp SANE Control Port +-# Henning Meier-Geinitz <henning&meier-geinitz.de> October 2002 +-esp 6567/tcp eSilo Storage Protocol +-esp 6567/udp eSilo Storage Protocol +-# Andrew Chernow <andrew&esilo.com> January 2007 +-# 6568-6578 Unassigned +-affiliate 6579/tcp Affiliate +-affiliate 6579/udp Affiliate +-# David Catmull <uncommon&uncommonplace.com> January 2006 +-parsec-master 6580/tcp Parsec Masterserver +-parsec-master 6580/udp Parsec Masterserver +-parsec-peer 6581/tcp Parsec Peer-to-Peer +-parsec-peer 6581/udp Parsec Peer-to-Peer +-parsec-game 6582/tcp Parsec Gameserver +-parsec-game 6582/udp Parsec Gameserver +-# Andreas Varga <sid&parsec.org> +-joaJewelSuite 6583/tcp JOA Jewel Suite +-joaJewelSuite 6583/udp JOA Jewel Suite +-# Bob Rundle <rundle&rundle.com> November 2005 +-# 6584-6587 Unassigned +-# 6588 Unassigned +-####Unofficial use of port 6588 by AnalogX and Microsoft#### +-# 6589-6618 Unassigned +-odette-ftps 6619/tcp ODETTE-FTP over TLS/SSL +-odette-ftps 6619/udp ODETTE-FTP over TLS/SSL +-# Ieuan Friend <ieuan.friend&dip.co.uk> March 2006 +-kftp-data 6620/tcp Kerberos V5 FTP Data +-kftp-data 6620/udp Kerberos V5 FTP Data +-kftp 6621/tcp Kerberos V5 FTP Control +-kftp 6621/udp Kerberos V5 FTP Control +-# Robert J. Scott <rob&hpcmo.hpc.mil> August 2005 +-mcftp 6622/tcp Multicast FTP +-mcftp 6622/udp Multicast FTP +-# Bruce Lueckenhoff <bruce&scalabledesign.com> February 2006 +-ktelnet 6623/tcp Kerberos V5 Telnet +-ktelnet 6623/udp Kerberos V5 Telnet +-# Robert J. Scott <rob&hpcmo.hpc.mil> August 2005 +-# 6624-6625 Unassigned +-wago-service 6626/tcp WAGO Service and Update +-wago-service 6626/udp WAGO Service and Update +-# Wolfgang Adler <electronicc_rd&wago.com> April 2006 +-nexgen 6627/tcp Allied Electronics NeXGen +-nexgen 6627/udp Allied Electronics NeXGen +-# Lou Seitchik <lou&alliedelectronics.com> August 2005 +-afesc-mc 6628/tcp AFE Stock Channel M/C +-afesc-mc 6628/udp AFE Stock Channel M/C +-# K.K Ho <kk.ho&afe-solutions.com> April 2004 +-# 6629-6630 Unassigned +-# 6631 Unassigned (Returned 28 May 2004) +-# 6632-6664 Unassigned +-ircu 6665-6669/tcp IRCU +-ircu 6665-6669/udp IRCU +-# Brian Tackett <cym&acrux.net> +-vocaltec-gold 6670/tcp Vocaltec Global Online Directory +-vocaltec-gold 6670/udp Vocaltec Global Online Directory +-# Scott Petrack <Scott_Petrack&vocaltec.com> +-# 6671 Unassigned +-vision_server 6672/tcp vision_server +-vision_server 6672/udp vision_server +-vision_elmd 6673/tcp vision_elmd +-vision_elmd 6673/udp vision_elmd +-# Chris Kramer <CKramer&gis.shl.com> +-# 6674-6700 Unassigned +-kti-icad-srvr 6701/tcp KTI/ICAD Nameserver +-kti-icad-srvr 6701/udp KTI/ICAD Nameserver +-# Stanley Knutson <Stanley.Knutson&KTIworld.com> +-e-design-net 6702/tcp e-Design network +-e-design-net 6702/udp e-Design network +-e-design-web 6703/tcp e-Design web +-e-design-web 6703/udp e-Design web +-# Janos Lerch <lerch&softic.hu> February 2006 +-# 6704-6713 Unassigned +-ibprotocol 6714/tcp Internet Backplane Protocol +-ibprotocol 6714/udp Internet Backplane Protocol +-# Alessandro Bassi <abassi&cs.utk.edu> +-fibotrader-com 6715/tcp Fibotrader Communications +-fibotrader-com 6715/udp Fibotrader Communications +-# Robert Wetzold <robert.wetzold&fibotrader.com> January 2006 +-# 6716-6766 Unassigned +-bmc-perf-agent 6767/tcp BMC PERFORM AGENT +-bmc-perf-agent 6767/udp BMC PERFORM AGENT +-bmc-perf-mgrd 6768/tcp BMC PERFORM MGRD +-bmc-perf-mgrd 6768/udp BMC PERFORM MGRD +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-adi-gxp-srvprt 6769/tcp ADInstruments GxP Server +-adi-gxp-srvprt 6769/udp ADInstruments GxP Server +-# Mathew Pitchforth <mathew&adinstruments.co.nz> August 2005 +-plysrv-http 6770/tcp PolyServe http +-plysrv-http 6770/udp PolyServe http +-plysrv-https 6771/tcp PolyServe https +-plysrv-https 6771/udp PolyServe https +-# Mike Spitzer <mjs&polyserve.com> August 2005 +-# 6772-6784 Unassigned +-dgpf-exchg 6785/tcp DGPF Individual Exchange +-dgpf-exchg 6785/udp DGPF Individual Exchange +-# Thomas Weise <weise&vs.uni-kassel.de> April 2006 +-smc-jmx 6786/tcp Sun Java Web Console JMX +-smc-jmx 6786/udp Sun Java Web Console JMX +-smc-admin 6787/tcp Sun Web Console Admin +-smc-admin 6787/udp Sun Web Console Admin +-# Bill Edwards <bill.edwards&sun.com> August 2005 +-smc-http 6788/tcp SMC-HTTP +-smc-http 6788/udp SMC-HTTP +-# Ratnadeep Bhattacharjee <ratnadeep.bhattacharjee&sun.com> November 2002 +-smc-https 6789/tcp SMC-HTTPS +-smc-https 6789/udp SMC-HTTPS +-# Ratnadeep Bhattacharjee <ratnadeep.bhattacharjee&sun.com> August 2002 +-hnmp 6790/tcp HNMP +-hnmp 6790/udp HNMP +-# Jude George <jude&nas.nasa.gov> +-hnm 6791/tcp Halcyon Network Manager +-hnm 6791/udp Halcyon Network Manager +-# Richard Harriss <richard.harriss&halcyonsoftware.com> May 2005 +-# 6792-6800 Unassigned +-acnet 6801/tcp ACNET Control System Protocol +-acnet 6801/udp ACNET Control System Protocol +-# Rich Neswold <neswold&fnal.gov> February 2007 +-# 6802-6830 Unassigned +-ambit-lm 6831/tcp ambit-lm +-ambit-lm 6831/udp ambit-lm +-# Don Hejna <djhejna&ambit.com> +-# 6832-6840 Unassigned +-netmo-default 6841/tcp Netmo Default +-netmo-default 6841/udp Netmo Default +-netmo-http 6842/tcp Netmo HTTP +-netmo-http 6842/udp Netmo HTTP +-# Urs Bertschinger <urs&netmosphere.com> +-# 6843-6849 Unassigned +-iccrushmore 6850/tcp ICCRUSHMORE +-iccrushmore 6850/udp ICCRUSHMORE +-# Dave Hubbard <dave&icc.net> +-# 6851-6887 Unassigned +-muse 6888/tcp MUSE +-muse 6888/udp MUSE +-# Muse Communications Corporation +-# <howard&muse3d.com> +-# 6889-6935 Unassigned +-xsmsvc 6936/tcp XenSource Management Service +-xsmsvc 6936/udp XenSource Management Service +-# Roger Klorese <roger&xensource.com> June 2006 +-# 6937-6945 Unassigned +-bioserver 6946/tcp Biometrics Server +-bioserver 6946/udp Biometrics Server +-# ISHII AKIO <ishii.akio&jp.fujitsu.com> January 2006 +-# 6947-6950 Unassigned +-otlp 6951/tcp OTLP +-otlp 6951/udp OTLP +-# Brent Foster <brent.foster&onstreamsystems.com> April 2006 +-# 6952-6960 Unassigned +-jmact3 6961/tcp JMACT3 +-jmact3 6961/udp JMACT3 +-jmevt2 6962/tcp jmevt2 +-jmevt2 6962/udp jmevt2 +-swismgr1 6963/tcp swismgr1 +-swismgr1 6963/udp swismgr1 +-swismgr2 6964/tcp swismgr2 +-swismgr2 6964/udp swismgr2 +-swistrap 6965/tcp swistrap +-swistrap 6965/udp swistrap +-swispol 6966/tcp swispol +-swispol 6966/udp swispol +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 6967-6968 Unassigned +-acmsoda 6969/tcp acmsoda +-acmsoda 6969/udp acmsoda +-# Daniel Simms <dsimms&acm.uiuc.edu> +-# 6970-6996 Unassigned +-MobilitySrv 6997/tcp Mobility XE Protocol +-MobilitySrv 6997/udp Mobility XE Protocol +-# Joseph T Savarese <joesa&nmwco.com> June 2007 +-iatp-highpri 6998/tcp IATP-highPri +-iatp-highpri 6998/udp IATP-highPri +-iatp-normalpri 6999/tcp IATP-normalPri +-iatp-normalpri 6999/udp IATP-normalPri +-# John Murphy <john.m.murphy&mci.com> +-afs3-fileserver 7000/tcp file server itself +-afs3-fileserver 7000/udp file server itself +-afs3-callback 7001/tcp callbacks to cache managers +-afs3-callback 7001/udp callbacks to cache managers +-afs3-prserver 7002/tcp users & groups database +-afs3-prserver 7002/udp users & groups database +-afs3-vlserver 7003/tcp volume location database +-afs3-vlserver 7003/udp volume location database +-afs3-kaserver 7004/tcp AFS/Kerberos authentication service +-afs3-kaserver 7004/udp AFS/Kerberos authentication service +-afs3-volser 7005/tcp volume managment server +-afs3-volser 7005/udp volume managment server +-afs3-errors 7006/tcp error interpretation service +-afs3-errors 7006/udp error interpretation service +-afs3-bos 7007/tcp basic overseer process +-afs3-bos 7007/udp basic overseer process +-afs3-update 7008/tcp server-to-server updater +-afs3-update 7008/udp server-to-server updater +-afs3-rmtsys 7009/tcp remote cache manager service +-afs3-rmtsys 7009/udp remote cache manager service +-# +-ups-onlinet 7010/tcp onlinet uninterruptable power supplies +-ups-onlinet 7010/udp onlinet uninterruptable power supplies +-# Jim Thompson <jim.thompson&powerware.com> +-talon-disc 7011/tcp Talon Discovery Port +-talon-disc 7011/udp Talon Discovery Port +-talon-engine 7012/tcp Talon Engine +-talon-engine 7012/udp Talon Engine +-microtalon-dis 7013/tcp Microtalon Discovery +-microtalon-dis 7013/udp Microtalon Discovery +-microtalon-com 7014/tcp Microtalon Communications +-microtalon-com 7014/udp Microtalon Communications +-talon-webserver 7015/tcp Talon Webserver +-talon-webserver 7015/udp Talon Webserver +-# Jim Thompson <jim.thompson&powerware.com> +-# 7016-7019 Unassigned +-dpserve 7020/tcp DP Serve +-dpserve 7020/udp DP Serve +-dpserveadmin 7021/tcp DP Serve Admin +-dpserveadmin 7021/udp DP Serve Admin +-# Allan Stanley <allan&hummingbird.com> +-ctdp 7022/tcp CT Discovery Protocol +-ctdp 7022/udp CT Discovery Protocol +-# James Kirkwood <james.kirkwood&controltechniques.com> June 2005 +-ct2nmcs 7023/tcp Comtech T2 NMCS +-ct2nmcs 7023/udp Comtech T2 NMCS +-# Bryan Wilcutt <bwilcutt&comtechefdata.com> June 2005 +-vmsvc 7024/tcp Vormetric service +-vmsvc 7024/udp Vormetric service +-# Tom Boyle <tboyle&vormetric.com> June 2005 +-vmsvc-2 7025/tcp Vormetric Service II +-vmsvc-2 7025/udp Vormetric Service II +-# Tom Boyle <tboyle&vormetric.com> June 2005 +-# 7026-7029 Unassigned +-op-probe 7030/tcp ObjectPlanet probe +-op-probe 7030/udp ObjectPlanet probe +-# Bjorn Jarle Kvande <bjorn&objectplanet.com> April 2002 +-# 7031-7069 Unassigned +-arcp 7070/tcp ARCP +-arcp 7070/udp ARCP +-# Jude George <jude&nas.nasa.gov> +-# 7071-7079 Unassigned +-empowerid 7080/tcp EmpowerID Communication +-empowerid 7080/udp EmpowerID Communication +-# Matthew Whited <matt&thedotnetfactory.com> 16 January 2008 +-# 7081-7098 Unassigned +-lazy-ptop 7099/tcp lazy-ptop +-lazy-ptop 7099/udp lazy-ptop +-# Guy Keren <Guy_Keren&mail.stil.scitex.com> +-font-service 7100/tcp X Font Service +-font-service 7100/udp X Font Service +-# Stephen Gildea <gildea&lcs.mit.edu> +-elcn 7101/tcp Embedded Light Control Network +-elcn 7101/udp Embedded Light Control Network +-# Michael Scarito <ms&mit.edu> February 2007 +-# 7102-7120 Unassigned +-virprot-lm 7121/tcp Virtual Prototypes License Manager +-virprot-lm 7121/udp Virtual Prototypes License Manager +-# Victor Galis <galis&satchmo.virtualprototypes.ca> +-# 7122-7127 Unassigned +-scenidm 7128/tcp intelligent data manager +-scenidm 7128/udp intelligent data manager +-# Paul Ignatius <paul.ignatius&scentric.com> March 2006 +-scenccs 7129/tcp Catalog Content Search +-scenccs 7129/udp Catalog Content Search +-# Anil Sharma <anil.sharma&scentric.com> April 2006 +-# 7130-7160 Unassigned +-cabsm-comm 7161/tcp CA BSM Comm +-cabsm-comm 7161/udp CA BSM Comm +-# Chun-Ho Chang <chun-ho.chang&ca.com> November 2004 +-caistoragemgr 7162/tcp CA Storage Manager +-caistoragemgr 7162/udp CA Storage Manager +-# Emre Tunar <emre.tunar&ca.com> November 2004 +-cacsambroker 7163/tcp CA Connection Broker +-cacsambroker 7163/udp CA Connection Broker +-# David Roberts <David.Roberts&ca.com> May 2005 +-fsr 7164/tcp File System Repository Agent +-fsr 7164/udp File System Repository Agent +-# Micha Ben-Efraim <benmi07&ca.com> 19 July 2007 +-doc-server 7165/tcp Document WCF Server +-doc-server 7165/udp Document WCF Server +-aruba-server 7166/tcp Aruba eDiscovery Server +-aruba-server 7166/udp Aruba eDiscovery Server +-# Micha Ben-Efraim <benmi07&ca.com> 07 January 2008 +-# 7167-7173 Unassigned +-clutild 7174/tcp Clutild +-clutild 7174/udp Clutild +-# Cheryl Stoutenburg <cstoutenburg&vnet.ibm.com> +-# 7175-7199 Unassigned +-fodms 7200/tcp FODMS FLIP +-fodms 7200/udp FODMS FLIP +-# David Anthony <anthony&power.amasd.anatcp.rockwell.com> +-dlip 7201/tcp DLIP +-dlip 7201/udp DLIP +-# Albert Manfredi <manfredi&engr05.comsys.rockwell.com> +-# 7202-7226 Unassigned +-ramp 7227/tcp Registry A & M Protocol +-ramp 7227/udp Registry A $ M Protocol +-# John Havard <jh&hxe.us> November 2003 +-# 7228-7271 Unassigned +-watchme-7272 7272/tcp WatchMe Monitoring 7272 +-watchme-7272 7272/udp WatchMe Monitoring 7272 +-# Oliver Heinz <heinz&arago.de> August 2005 +-oma-rlp 7273/tcp OMA Roaming Location +-oma-rlp 7273/udp OMA Roaming Location +-oma-rlp-s 7274/tcp OMA Roaming Location SEC +-oma-rlp-s 7274/udp OMA Roaming Location SEC +-# Larry A. Young <Larry.A.Young&mail.Sprint.com> August 2005 +-oma-ulp 7275/tcp OMA UserPlane Location +-oma-ulp 7275/udp OMA UserPlane Location +-# Larry A. Young <Larry.A.Young&Sprint.com> February 2006 +-oma-ilp 7276/tcp OMA Internal Location Protocol +-oma-ilp 7276/udp OMA Internal Location Protocol +-oma-ilp-s 7277/tcp OMA Internal Location Secure Protocol +-oma-ilp-s 7277/udp OMA Internal Location Secure Protocol +-# Khiem Tran <Khiem.Tran&Andrew.com> 06 November 2007 +-oma-dcdocbs 7278/tcp OMA Dynamic Content Delivery over CBS +-oma-dcdocbs 7278/udp OMA Dynamic Content Delivery over CBS +-# Avi Primo <aprimo&celltick.com> 29 January 2008 +-ctxlic 7279/tcp Citrix Licensing +-ctxlic 7279/udp Citrix Licensing +-# Marc Binstock <marc.binstock&citrix.com> 29 January 2008 +-itactionserver1 7280/tcp ITACTIONSERVER 1 +-itactionserver1 7280/udp ITACTIONSERVER 1 +-itactionserver2 7281/tcp ITACTIONSERVER 2 +-itactionserver2 7281/udp ITACTIONSERVER 2 +-# Brian Taylor <btaylor&imagetag.com> +-# 7282-7299 Unassigned +-swx 7300-7359 The Swiss Exchange +-# Edgar Blum <edgar.blum&swx.ch> +-# 7360-7364 Unassigned (Removed on 2006-2-06) +-lcm-server 7365/tcp LifeKeeper Communications +-lcm-server 7365/udp LifeKeeper Communications +-# James Bottomley <James.Bottomley&SteelEye.com> February 2006 +-# 7366-7390 Unassigned (Removed on 2006-2-06) +-mindfilesys 7391/tcp mind-file system server +-mindfilesys 7391/udp mind-file system server +-mrssrendezvous 7392/tcp mrss-rendezvous server +-mrssrendezvous 7392/udp mrss-rendezvous server +-# Dave Porter <porter&mango.com> +-nfoldman 7393/tcp nFoldMan Remote Publish +-nfoldman 7393/udp nFoldMan Remote Publish +-# Richard McDonald <ve3nvm&spamcop.net> January 2006 +-fse 7394/tcp File system export of backup images +-fse 7394/udp File system export of backup images +-# Weibao Wu <weibao_wu&symantec.com> April 2006 +-winqedit 7395/tcp winqedit +-winqedit 7395/udp winqedit +-# David Greer <david_greer&robelle.com> +-# 7396 Unassigned +-hexarc 7397/tcp Hexarc Command Language +-hexarc 7397/udp Hexarc Command Language +-# George Moromisato <gpm&neurohack.com> November 2004 +-# 7398-7399 Unassigned +-rtps-discovery 7400/tcp RTPS Discovery +-rtps-discovery 7400/udp RTPS Discovery +-rtps-dd-ut 7401/tcp RTPS Data-Distribution User-Traffic +-rtps-dd-ut 7401/udp RTPS Data-Distribution User-Traffic +-rtps-dd-mt 7402/tcp RTPS Data-Distribution Meta-Traffic +-rtps-dd-mt 7402/udp RTPS Data-Distribution Meta-Traffic +-# Gerardo Pardo-Castellote <gerardo.pardo&rti.com> October 2005 +-# 7403-7409 Unassigned +-ionixnetmon 7410/tcp Ionix Network Monitor +-ionixnetmon 7410/udp Ionix Network Monitor +-# Maxime Deputter <m.deputter&ionixhosting.com> April 2006 +-# 7411-7420 Unassigned +-mtportmon 7421/tcp Matisse Port Monitor +-mtportmon 7421/udp Matisse Port Monitor +-# Didier Cabannes <Didier&matisse.com> November 2004 +-# 7422-7425 Unassigned +-pmdmgr 7426/tcp OpenView DM Postmaster Manager +-pmdmgr 7426/udp OpenView DM Postmaster Manager +-oveadmgr 7427/tcp OpenView DM Event Agent Manager +-oveadmgr 7427/udp OpenView DM Event Agent Manager +-ovladmgr 7428/tcp OpenView DM Log Agent Manager +-ovladmgr 7428/udp OpenView DM Log Agent Manager +-opi-sock 7429/tcp OpenView DM rqt communication +-opi-sock 7429/udp OpenView DM rqt communication +-xmpv7 7430/tcp OpenView DM xmpv7 api pipe +-xmpv7 7430/udp OpenView DM xmpv7 api pipe +-pmd 7431/tcp OpenView DM ovc/xmpv3 api pipe +-pmd 7431/udp OpenView DM ovc/xmpv3 api pipe +-# Dave Lamb <rdl&rdl.cnd.hp.com> +-faximum 7437/tcp Faximum +-faximum 7437/udp Faximum +-# George Pajari <George.Pajari&faximum.com> +-# 7438-7442 Unassigned +-oracleas-https 7443/tcp Oracle Application Server HTTPS +-oracleas-https 7443/udp Oracle Application Server HTTPS +-# David McMarlin <david.mcmarlin&oracle.com> August 2006 +-# 7444-7472 Unassigned +-rise 7473/tcp Rise: The Vieneo Province +-rise 7473/udp Rise: The Vieneo Province +-# Jason Reskin <iana&unistellar.com> March 2007 +-# 7474-7490 Unassigned +-telops-lmd 7491/tcp telops-lmd +-telops-lmd 7491/udp telops-lmd +-# David Spencer <dspencer&telops.com> +-# 7492-7499 Unassigned +-silhouette 7500/tcp Silhouette User +-silhouette 7500/udp Silhouette User +-# Anthony Payne <opayne&pacbell.net> February 2004 +-ovbus 7501/tcp HP OpenView Bus Daemon +-ovbus 7501/udp HP OpenView Bus Daemon +-# David M. Rhodes <davidrho&cnd.hp.com> +-# 7502-7509 Unassigned +-ovhpas 7510/tcp HP OpenView Application Server +-ovhpas 7510/udp HP OpenView Application Server +-# Jeff Conrad <jeff_conrad&hp.com> +-pafec-lm 7511/tcp pafec-lm +-pafec-lm 7511/udp pafec-lm +-# Billy Dhillon <bdsos&pafec.co.uk> +-# 7512-7541 Unassigned +-saratoga 7542/tcp Saratoga Transfer Protocol +-saratoga 7542/udp Saratoga Transfer Protocol +-# Lloyd Wood <lwood&cisco.com> May 2007 +-atul 7543/tcp atul server +-atul 7543/udp atul server +-# Mark Stapp <mjs&cisco.com> January 2006 +-nta-ds 7544/tcp FlowAnalyzer DisplayServer +-nta-ds 7544/udp FlowAnalyzer DisplayServer +-nta-us 7545/tcp FlowAnalyzer UtilityServer +-nta-us 7545/udp FlowAnalyzer UtilityServer +-# Fred Messinger <fredm&cisco.com> +-cfs 7546/tcp Cisco Fabric service +-cfs 7546/udp Cisco Fabric service +-# Rituparna Agrawal <riagrawa&cisco.com> September 2005 +-cwmp 7547/tcp DSL Forum CWMP +-cwmp 7547/udp DSL Forum CWMP +-# Anton Okmianski <aokmians&cisco.com> January 2006 +-tidp 7548/tcp Threat Information Distribution Protocol +-tidp 7548/udp Threat Information Distribution Protocol +-# Chui-Tin Yen <tin&cisco.com> February 2006 +-nls-tl 7549/tcp Network Layer Signaling Transport Layer +-nls-tl 7549/udp Network Layer Signaling Transport Layer +-# Melinda Shore <mshore&cisco.com> May 2006 +-# 7550-7559 Unassigned +-sncp 7560/tcp Sniffer Command Protocol +-sncp 7560/udp Sniffer Command Protocol +-# Dominick Cafarelli <dominick.cafarelli&networkgeneral.com> August 2005 +-# 7561-7565 Unassigned +-vsi-omega 7566/tcp VSI Omega +-vsi-omega 7566/udp VSI Omega +-# Curtis Smith <curtis.smith&vsin.com> +-# 7567-7569 Unassigned +-aries-kfinder 7570/tcp Aries Kfinder +-aries-kfinder 7570/udp Aries Kfinder +-# James King, III <jking&ariessys.com> +-# 7571-7587 Unassigned +-sun-lm 7588/tcp Sun License Manager +-sun-lm 7588/udp Sun License Manager +-# Sophie Deng <Sophie.Deng&Eng.Sun.COM> +-# 7589-7623 Unassigned +-indi 7624/tcp Instrument Neutral Distributed Interface +-indi 7624/udp Instrument Neutral Distributed Interface +-# Elwood Downey <ecdowney&clearskyinstitute.com> April 2002 +-# 7625 Unassigned +-simco 7626/tcp SImple Middlebox COnfiguration (SIMCO) Server +-# RFC4540 +-# 7626/udp De-registered (30 January 2006) +-simco 7626/sctp SImple Middlebox COnfiguration (SIMCO) +-# Sebastian Kiesel <kiesel&ikr.uni-stuttgart.de> January 2006 +-soap-http 7627/tcp SOAP Service Port +-soap-http 7627/udp SOAP Service Port +-# Donald Dylla <donald.dylla&hp.com> December 2004 +-zen-pawn 7628/tcp Primary Agent Work Notification +-zen-pawn 7628/udp Primary Agent Work Notification +-# Ty Ellis <tellis&novell.com> May 2006 +-xdas 7629/tcp OpenXDAS Wire Protocol +-xdas 7629/udp OpenXDAS Wire Protocol +-# John Calcote <jcalcote&novell.com> October 2006 +-# 7630-7632 Unassigned +-pmdfmgt 7633/tcp PMDF Management +-pmdfmgt 7633/udp PMDF Management +-# Hunter Goatley <goathunter&goatley.com> +-# 7634-7647 Unassigned +-cuseeme 7648/tcp bonjour-cuseeme +-cuseeme 7648/udp bonjour-cuseeme +-# Marc Manthey <codewarrior&cuseeme.de> July 2006 +-# 7649-7673 Unassigned +-imqtunnels 7674/tcp iMQ SSL tunnel +-imqtunnels 7674/udp iMQ SSL tunnel +-imqtunnel 7675/tcp iMQ Tunnel +-imqtunnel 7675/udp iMQ Tunnel +-# Shailesh S. Bavadekar <shailesh.bavadekar&sun.com> April 2002 +-imqbrokerd 7676/tcp iMQ Broker Rendezvous +-imqbrokerd 7676/udp iMQ Broker Rendezvous +-# Joseph Di Pol <joe.dipol&sun.com> April 2002 +-sun-user-https 7677/tcp Sun App Server - HTTPS +-sun-user-https 7677/udp Sun App Server - HTTPS +-# Abhijit Kumar <as-iana-ports&sun.com> November 2005 +-# 7678-7679 Unassigned +-pando-pub 7680/tcp Pando Media Public Distribution +-pando-pub 7680/udp Pando Media Public Distribution +-# Laird Popkin <laird&pando.com> 27 February 2008 +-# 7681-7688 Unassigned +-collaber 7689/tcp Collaber Network Service +-collaber 7689/udp Collaber Network Service +-# Rajesh Akkineni <rajesh&vimukti.com> January 2007 +-# 7690-7696 Unassigned +-klio 7697/tcp KLIO communications +-klio 7697/udp KLIO communications +-# Helmut Giritzer <helmut.giritzer&o.roteskreuz.at> August 2005 +-# 7698-7706 Unassigned +-sync-em7 7707/tcp EM7 Dynamic Updates +-sync-em7 7707/udp EM7 Dynamic Updates +-# Christopher Cordray <ccordray&sciencelogic.com> November 2004 +-scinet 7708/tcp scientia.net +-scinet 7708/udp scientia.net +-# Christoph Anton Mitterer <calestyo&scientia.net> January 2006 +-# 7709-7719 Unassigned +-medimageportal 7720/tcp MedImage Portal +-medimageportal 7720/udp MedImage Portal +-# Ken Hornak <ken_hornak&medimage.com> October 2003 +-# 7721-7723 Unassigned +-nsdeepfreezectl 7724/tcp Novell Snap-in Deep Freeze Control +-nsdeepfreezectl 7724/udp Novell Snap-in Deep Freeze Control +-# David Crowe <dcrowe&faronics.com> 07 January 2008 +-nitrogen 7725/tcp Nitrogen Service +-nitrogen 7725/udp Nitrogen Service +-# Randy Lomnes <rlomnes&faronics.com> November 2004 +-freezexservice 7726/tcp FreezeX Console Service +-freezexservice 7726/udp FreezeX Console Service +-# David Crowe <dcrowe&faronics.com> June 2005 +-trident-data 7727/tcp Trident Systems Data +-trident-data 7727/udp Trident Systems Data +-# Jeremy McClintock <jeremy&tridsys.com> August 2005 +-# 7728-7733 Unassigned +-smip 7734/tcp Smith Protocol over IP +-smip 7734/udp Smith Protocol over IP +-# Jim Pettinato <jim_pettinato&fmcti.com> April 2007 +-# 7735-7737 Unassigned +-aiagent 7738/tcp HP Enterprise Discovery Agent +-aiagent 7738/udp HP Enterprise Discovery Agent +-# Matthew Darwin <matthew.darwin&hp.com> August 2005 +-# 7739-7742 Unassigned +-sstp-1 7743/tcp Sakura Script Transfer Protocol +-sstp-1 7743/udp Sakura Script Transfer Protocol +-# Kouichi Takeda <KHBO5271&nifty.com> +-raqmon-pdu 7744/tcp RAQMON PDU +-raqmon-pdu 7744/udp RAQMON PDU +-# RFC4712 +-# 7745-7746 Unassigned +-prgp 7747/tcp Put/Run/Get Protocol +-prgp 7747/udp Put/Run/Get Protocol +-# Jayasooriah <jayasooriah&cast.com.au> 22 February 2008 +-# 7748-7776 Unassigned +-cbt 7777/tcp cbt +-cbt 7777/udp cbt +-# Tony Ballardie <A.Ballardie&cs.ucl.ac.uk> +-interwise 7778/tcp Interwise +-interwise 7778/udp Interwise +-# Joseph Gray <gray&interwise.co.il> +-vstat 7779/tcp VSTAT +-vstat 7779/udp VSTAT +-# Vinh Nguyn <vinh&sportvision.com> +-# 7780 Unassigned +-accu-lmgr 7781/tcp accu-lmgr +-accu-lmgr 7781/udp accu-lmgr +-# Moises E. Hernandez <moises&accugraph.com> +-# 7782-7785 Unassigned +-minivend 7786/tcp MINIVEND +-minivend 7786/udp MINIVEND +-# Mike Heins <mike&minivend.com> +-popup-reminders 7787/tcp Popup Reminders Receive +-popup-reminders 7787/udp Popup Reminders Receive +-# Robert Harvey <robert&officetoolspro.com> January 2006 +-# 7788 Unassigned +-office-tools 7789/tcp Office Tools Pro Receive +-office-tools 7789/udp Office Tools Pro Receive +-# Robert Harvey <robert&officetoolspro.com> January 2006 +-# 7790-7793 Unassigned +-q3ade 7794/tcp Q3ADE Cluster Service +-q3ade 7794/udp Q3ADE Cluster Service +-# Uffe Harksen <uh&uhcommunications.com> August 2005 +-# 7795-7796 Unassigned +-pnet-conn 7797/tcp Propel Connector port +-pnet-conn 7797/udp Propel Connector port +-pnet-enc 7798/tcp Propel Encoder port +-pnet-enc 7798/udp Propel Encoder port +-# Leif Hedstrom <leif&propel.com> April 2002 +-altbsdp 7799/tcp Alternate BSDP Service +-altbsdp 7799/udp Alternate BSDP Service +-# Dieter Siegmund <dieter&apple.com> 22 October 2007 +-asr 7800/tcp Apple Software Restore +-asr 7800/udp Apple Software Restore +-# Jim Kateley <asr-dev&group.apple.com> January 2006 +-ssp-client 7801/tcp Secure Server Protocol - client +-ssp-client 7801/udp Secure Server Protocol - client +-# Rick Macchio <rmacchio&juniper.net> November 2006 +-# 7802-7809 Unassigned +-rbt-wanopt 7810/tcp Riverbed WAN Optimization Protocol +-rbt-wanopt 7810/udp Riverbed WAN Optimization Protocol +-# Vladimir Legalov <vlegalov&riverbed.com> 04 September 2007 +-# 7811-7844 Unassigned +-apc-7845 7845/tcp APC 7845 +-apc-7845 7845/udp APC 7845 +-apc-7846 7846/tcp APC 7846 +-apc-7846 7846/udp APC 7846 +-# American Power Conversion <ports&apcc.com> +-# 7847-7879 Unassigned +-pss 7880/tcp Pearson +-pss 7880/udp Pearson +-# Pearson <chad.smith&pearson.com> 17 January 2008 +-# 7881-7886 Unassigned +-ubroker 7887/tcp Universal Broker +-ubroker 7887/udp Universal Broker +-# Nathan Hammond <nathan.hammond&stonebranch.com> October 2005 +-# 7888-7899 Unassigned +-mevent 7900/tcp Multicast Event +-mevent 7900/udp Multicast Event +-# YoonSoo Kim <ys71.kim&samsung.com> May 2006 +-tnos-sp 7901/tcp TNOS Service Protocol +-tnos-sp 7901/udp TNOS Service Protocol +-tnos-dp 7902/tcp TNOS shell Protocol +-tnos-dp 7902/udp TNOS shell Protocol +-tnos-dps 7903/tcp TNOS Secure DiaguardProtocol +-tnos-dps 7903/udp TNOS Secure DiaguardProtocol +-# Rene Kurt <rene.kurt&adasoft.ch> August 2005 +-# 7904-7912 Unassigned +-qo-secure 7913/tcp QuickObjects secure port +-qo-secure 7913/udp QuickObjects secure port +-# Jonas Bovin <jonas.bovin&quickobjects.com> +-# 7914-7931 Unassigned +-t2-drm 7932/tcp Tier 2 Data Resource Manager +-t2-drm 7932/udp Tier 2 Data Resource Manager +-t2-brm 7933/tcp Tier 2 Business Rules Manager +-t2-brm 7933/udp Tier 2 Business Rules Manager +-# Peter Carlson <pcarlson&tier2.com> +-# 7934-7966 Unassigned +-supercell 7967/tcp Supercell +-supercell 7967/udp Supercell +-# Kevin Nakagawa <nakagawa&sigsci.com> +-# 7968-7978 Unassigned +-micromuse-ncps 7979/tcp Micromuse-ncps +-micromuse-ncps 7979/udp Micromuse-ncps +-# Hing Wing To <wing.to&mircromuse.com> +-quest-vista 7980/tcp Quest Vista +-quest-vista 7980/udp Quest Vista +-# Preston Bannister <pbannister&quests.com> +-# 7981-7998 Unassigned +-irdmi2 7999/tcp iRDMI2 +-irdmi2 7999/udp iRDMI2 +-irdmi 8000/tcp iRDMI +-irdmi 8000/udp iRDMI +-# Gil Shafriri <shafriri&ilccm1.iil.intel.com> +-vcom-tunnel 8001/tcp VCOM Tunnel +-vcom-tunnel 8001/udp VCOM Tunnel +-# Mark Lewandowski <mlewan0&us.ibm.com> +-teradataordbms 8002/tcp Teradata ORDBMS +-teradataordbms 8002/udp Teradata ORDBMS +-# Curt Ellmann <curt.ellmann&ncr.com> +-# 8003-8004 Unassigned +-mxi 8005/tcp MXI Generation II for z/OS +-mxi 8005/udp MXI Generation II for z/OS +-# Rob Scott <rscott&rs.com> May 2007 +-# 8006-8007 Unassigned +-http-alt 8008/tcp HTTP Alternate +-http-alt 8008/udp HTTP Alternate +-# James Gettys <jg&w3.org> +-# 8009-8018 Unassigned +-qbdb 8019/tcp QB DB Dynamic Port +-qbdb 8019/udp QB DB Dynamic Port +-# Sridhar Krishnamurthy <Sridhar_Krishnamurthy&intuit.com> 15 February 2008 +-intu-ec-svcdisc 8020/tcp Intuit Entitlement Service and Discovery +-intu-ec-svcdisc 8020/udp Intuit Entitlement Service and Discovery +-intu-ec-client 8021/tcp Intuit Entitlement Client +-intu-ec-client 8021/udp Intuit Entitlement Client +-# Daniel C. McGloin <daniel_mcgloin&intuit.com> May 2005 +-oa-system 8022/tcp oa-system +-oa-system 8022/udp oa-system +-# Marie-France Dubreuil <Marie-France.Dubreuil&evidian.com> +-# 8023-8024 Unassigned +-ca-audit-da 8025/tcp CA Audit Distribution Agent +-ca-audit-da 8025/udp CA Audit Distribution Agent +-ca-audit-ds 8026/tcp CA Audit Distribution Server +-ca-audit-ds 8026/udp CA Audit Distribution Server +-# Henning Smith <henning.smith&ca.com> July 2006 +-# 8027-8031 Unassigned +-pro-ed 8032/tcp ProEd +-pro-ed 8032/udp ProEd +-mindprint 8033/tcp MindPrint +-mindprint 8033/udp MindPrint +-# Larry Tusoni <larry&goldrush.com> +-vantronix-mgmt 8034/tcp .vantronix Management +-vantronix-mgmt 8034/udp .vantronix Management +-# Reyk Floeter <reyk&vantronix.net> 27 February 2008 +-# 8035-8051 Unassigned +-senomix01 8052/tcp Senomix Timesheets Server +-senomix01 8052/udp Senomix Timesheets Server +-senomix02 8053/tcp Senomix Timesheets Client [1 year assignment] +-senomix02 8053/udp Senomix Timesheets Client [1 year assignment] +-senomix03 8054/tcp Senomix Timesheets Server [1 year assignment] +-senomix03 8054/udp Senomix Timesheets Server [1 year assignment] +-senomix04 8055/tcp Senomix Timesheets Server [1 year assignment] +-senomix04 8055/udp Senomix Timesheets Server [1 year assignment] +-senomix05 8056/tcp Senomix Timesheets Server [1 year assignment] +-senomix05 8056/udp Senomix Timesheets Server [1 year assignment] +-senomix06 8057/tcp Senomix Timesheets Client [1 year assignment] +-senomix06 8057/udp Senomix Timesheets Client [1 year assignment] +-senomix07 8058/tcp Senomix Timesheets Client [1 year assignment] +-senomix07 8058/udp Senomix Timesheets Client [1 year assignment] +-senomix08 8059/tcp Senomix Timesheets Client [1 year assignment] +-senomix08 8059/udp Senomix Timesheets Client [1 year assignment] +-# Charles O'Dale <codale&hfx.andara.com> July 2006 +-# 8060-8073 Unassigned +-gadugadu 8074/tcp Gadu-Gadu +-gadugadu 8074/udp Gadu-Gadu +-# Marcin Gozdalik <gozdal&gadu-gadu.pl> May 2006 +-# 8075-8079 Unassigned +-http-alt 8080/tcp HTTP Alternate (see port 80) +-http-alt 8080/udp HTTP Alternate (see port 80) +-# Stephen Casner <casner&precpt.com> +-sunproxyadmin 8081/tcp Sun Proxy Admin Service +-sunproxyadmin 8081/udp Sun Proxy Admin Service +-# Arvind Srinivasan <arvind.srinivasan&sun.com> August 2005 +-us-cli 8082/tcp Utilistor (Client) +-us-cli 8082/udp Utilistor (Client) +-us-srv 8083/tcp Utilistor (Server) +-us-srv 8083/udp Utilistor (Server) +-# Andy Brewerton <andy.brewerton&otium.co.uk> August 2005 +-# 8084-8085 Unassigned +-d-s-n 8086/tcp Distributed SCADA Networking Rendezvous Port +-d-s-n 8086/udp Distributed SCADA Networking Rendezvous Port +-# Gary Hampton <GH&2HTI.com> 27 February 2008 +-# 8087 Unassigned +-radan-http 8088/tcp Radan HTTP +-radan-http 8088/udp Radan HTTP +-# Steve Hay <Steve.Hay&uk.radan.com> April 2002 +-# 8089-8096 Unassigned +-sac 8097/tcp SAC Port Id +-sac 8097/udp SAC Port Id +-# Girish Bhat <gbhat&cranite.com> April 2006 +-# 8098-8099 Unassigned +-xprint-server 8100/tcp Xprint Server +-xprint-server 8100/udp Xprint Server +-# John McKernan <John.McKernan&sun.com> +-# 8101-8114 Unassigned +-mtl8000-matrix 8115/tcp MTL8000 Matrix +-mtl8000-matrix 8115/udp MTL8000 Matrix +-# David Pinch <dpinch&mtl-inst.com> April 2002 +-cp-cluster 8116/tcp Check Point Clustering +-cp-cluster 8116/udp Check Point Clustering +-# Roni Moshitzky <rmosh&checkpoint.com> +-# 8117 Unassigned +-privoxy 8118/tcp Privoxy HTTP proxy +-privoxy 8118/udp Privoxy HTTP proxy +-# Andreas Oesterhelt <oes&privoxy.org> June 2002 +-# 8119-8120 Unassigned +-apollo-data 8121/tcp Apollo Data Port +-apollo-data 8121/udp Apollo Data Port +-# Anthony Carrabino <anthonyc&vistasoftware.com> August 2003 +-apollo-admin 8122/tcp Apollo Admin Port +-apollo-admin 8122/udp Apollo Admin Port +-# Anthony Carrabino <anthonyc&vistasoftware.com> August 2003 +-# 8123-8127 Unassigned +-paycash-online 8128/tcp PayCash Online Protocol +-paycash-online 8128/udp PayCash Online Protocol +-paycash-wbp 8129/tcp PayCash Wallet-Browser +-paycash-wbp 8129/udp PayCash Wallet-Browser +-# MegaZone <megazone&paycash.us> August 2005 +-indigo-vrmi 8130/tcp INDIGO-VRMI +-indigo-vrmi 8130/udp INDIGO-VRMI +-indigo-vbcp 8131/tcp INDIGO-VBCP +-indigo-vbcp 8131/udp INDIGO-VBCP +-# Colin Caughie <cfc&indigo-avs.com> +-dbabble 8132/tcp dbabble +-dbabble 8132/udp dbabble +-# Chris Pugmire <chrisp&netwinsite.com> +-# 8133-8147 Unassigned +-isdd 8148/tcp i-SDD file transfer +-isdd 8148/udp i-SDD file transfer +-# Frank Waarsenburg <frank&eye-display.nl> November 2004 +-# 8149-8159 Unassigned +-patrol 8160/tcp Patrol +-patrol 8160/udp Patrol +-patrol-snmp 8161/tcp Patrol SNMP +-patrol-snmp 8161/udp Patrol SNMP +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-# 8162-8191 Unassigned +-spytechphone 8192/tcp SpyTech Phone Service +-spytechphone 8192/udp SpyTech Phone Service +-# Bill Kay <bkay&spy-tec.com> April 2006 +-# 8193 Unassigned +-blp1 8194/tcp Bloomberg data API +-blp1 8194/udp Bloomberg data API +-blp2 8195/tcp Bloomberg feed +-blp2 8195/udp Bloomberg feed +-# Albert Hou <ahou1&bloomberg.com> May 2006 +-# 8196-8198 Unassigned +-vvr-data 8199/tcp VVR DATA +-vvr-data 8199/udp VVR DATA +-# Ming Xu <ming&veritas.com> +-trivnet1 8200/tcp TRIVNET +-trivnet1 8200/udp TRIVNET +-trivnet2 8201/tcp TRIVNET +-trivnet2 8201/udp TRIVNET +-# Saar Wilf <saar&trivnet.com> +-# 8202-8203 Unassigned +-lm-perfworks 8204/tcp LM Perfworks +-lm-perfworks 8204/udp LM Perfworks +-lm-instmgr 8205/tcp LM Instmgr +-lm-instmgr 8205/udp LM Instmgr +-lm-dta 8206/tcp LM Dta +-lm-dta 8206/udp LM Dta +-lm-sserver 8207/tcp LM SServer +-lm-sserver 8207/udp LM SServer +-lm-webwatcher 8208/tcp LM Webwatcher +-lm-webwatcher 8208/udp LM Webwatcher +-# Chris Flynn <cflynn&landmark.com> +-# 8209-8229 Unassigned +-rexecj 8230/tcp RexecJ Server +-rexecj 8230/udp RexecJ Server +-# Curtiss Howard <cjhoward&unity.ncsu.edu> November 2004 +-# 8231-8275 Unassigned +-pando-sec 8276/tcp Pando Media Controlled Distribution +-pando-sec 8276/udp Pando Media Controlled Distribution +-# Laird Popkin <laird&pando.com> 27 February 2008 +-# 8277-8291 Unassigned +-blp3 8292/tcp Bloomberg professional +-blp3 8292/udp Bloomberg professional +-# 8293 Unassigned +-blp4 8294/tcp Bloomberg intelligent client +-blp4 8294/udp Bloomberg intelligent client +-# Albert Hou <ahou1&bloomberg.com> May 2006 +-# 8295-8299 Unassigned +-tmi 8300/tcp Transport Management Interface +-tmi 8300/udp Transport Management Interface +-# Steve Kneizys <skneizys&erpdata.com> November 2006 +-amberon 8301/tcp Amberon PPC/PPS +-amberon 8301/udp Amberon PPC/PPS +-# Ronald Snyder <pugaroni&sssnet.com> March 2006 +-# 8302-8319 Unassigned +-tnp-discover 8320/tcp Thin(ium) Network Protocol +-tnp-discover 8320/udp Thin(ium) Network Protocol +-tnp 8321/tcp Thin(ium) Network Protocol +-tnp 8321/udp Thin(ium) Network Protocol +-# Aly Orady, Atto Devices, Inc. <aly.orady&attodevices.com> 07 August 2007 +-# 8322-8350 Unassigned +-server-find 8351/tcp Server Find +-server-find 8351/udp Server Find +-# Chris Brown <chrisb&chancery.com> +-# 8352-8375 Unassigned +-cruise-enum 8376/tcp Cruise ENUM +-cruise-enum 8376/udp Cruise ENUM +-cruise-swroute 8377/tcp Cruise SWROUTE +-cruise-swroute 8377/udp Cruise SWROUTE +-cruise-config 8378/tcp Cruise CONFIG +-cruise-config 8378/udp Cruise CONFIG +-cruise-diags 8379/tcp Cruise DIAGS +-cruise-diags 8379/udp Cruise DIAGS +-cruise-update 8380/tcp Cruise UPDATE +-cruise-update 8380/udp Cruise UPDATE +-# Steve Husak <portmaster&cruisetech.com> +-# 8381-8382 Unassigned +-m2mservices 8383/tcp M2m Services +-m2mservices 8383/udp M2m Services +-# Carlos Arteaga <carteaga&adelphia.net> November 2004 +-# 8384-8399 Unassigned +-cvd 8400/tcp cvd +-cvd 8400/udp cvd +-sabarsd 8401/tcp sabarsd +-sabarsd 8401/udp sabarsd +-abarsd 8402/tcp abarsd +-abarsd 8402/udp abarsd +-admind 8403/tcp admind +-admind 8403/udp admind +-# Aaron Bilbrey <abilbrey&commvault.com> +-# 8404-8415 Unassigned +-espeech 8416/tcp eSpeech Session Protocol +-espeech 8416/udp eSpeech Session Protocol +-# Scott Tarone <starone&proactivethought.com> November 2002 +-espeech-rtp 8417/tcp eSpeech RTP Protocol +-espeech-rtp 8417/udp eSpeech RTP Protocol +-# Scott Tarone <starone&proactivethought.com> April 2003 +-# 8418-8441 Unassigned +-cybro-a-bus 8442/tcp CyBro A-bus Protocol +-cybro-a-bus 8442/udp CyBro A-bus Protocol +-# Damir Skrjanec <damir.skrjanec&cybrotech.co.uk> May 2007 +-pcsync-https 8443/tcp PCsync HTTPS +-pcsync-https 8443/udp PCsync HTTPS +-pcsync-http 8444/tcp PCsync HTTP +-pcsync-http 8444/udp PCsync HTTP +-# Katy Lynn McCullough <KatyM&LapLink.com> +-# 8445-8449 Unassigned +-npmp 8450/tcp npmp +-npmp 8450/udp npmp +-# Ian Chard <ian&tanagra.demon.co.uk> +-# 8451-8471 Unassigned +-otv 8472/tcp Overlay Transport Virtualization (OTV) +-otv 8472/udp Overlay Transport Virtualization (OTV) +-# Dino Farinacci <dino&cisco.com> 07 January 2008 +-vp2p 8473/tcp Virtual Point to Point +-vp2p 8473/udp Virtual Point to Point +-# Jerome Grimbert <jerome.grimbert&atosorigin.com> +-noteshare 8474/tcp AquaMinds NoteShare +-noteshare 8474/udp AquaMinds NoteShare +-# Michael McNabb <michael&aquaminds.com> October 2005 +-# 8475-8499 Unassigned +-fmtp 8500/tcp Flight Message Transfer Protocol +-fmtp 8500/udp Flight Message Transfer Protocol +-# Eivan Cerasi <eivan.cerasi&eurocontrol.int> December 2003 +-# 8501-8553 Unassigned +-rtsp-alt 8554/tcp RTSP Alternate (see port 554) +-rtsp-alt 8554/udp RTSP Alternate (see port 554) +-# Stephen Casner <casner&precept.com> +-d-fence 8555/tcp SYMAX D-FENCE +-d-fence 8555/udp SYMAX D-FENCE +-# Thomas Geisel <tgeisel&symax.de> January 2003 +-# 8556-8566 Unassigned +-oap-admin 8567/tcp Object Access Protocol Administration +-oap-admin 8567/udp Object Access Protocol Administration +-# Bryant Eastham <protocols&pewla.us.pewg.panasonic.com> August 2005 +-# 8568-8599 Unassigned +-asterix 8600/tcp Surveillance Data +-asterix 8600/udp Surveillance Data +-# Eivan Cerasi <eivan.cerasi&eurocontrol.int> November 2005 +-# 8601-8610 Unassigned +-canon-bjnp1 8611/tcp Canon BJNP Port 1 +-canon-bjnp1 8611/udp Canon BJNP Port 1 +-# Atsushi Nakamura <nakamura.atsushi318&canon.co.jp> November 2003 +-canon-bjnp2 8612/tcp Canon BJNP Port 2 +-canon-bjnp2 8612/udp Canon BJNP Port 2 +-# Atsushi Nakamura <nakamura.atsushi318&canon.co.jp> November 2003 +-canon-bjnp3 8613/tcp Canon BJNP Port 3 +-canon-bjnp3 8613/udp Canon BJNP Port 3 +-# Atsushi Nakamura <nakamura.atsushi318&canon.co.jp> November 2003 +-canon-bjnp4 8614/tcp Canon BJNP Port 4 +-canon-bjnp4 8614/udp Canon BJNP Port 4 +-# Atsushi Nakamura <nakamura.atsushi318&canon.co.jp> November 2003 +-# 8615-8685 Unassigned +-sun-as-jmxrmi 8686/tcp Sun App Server - JMX/RMI +-sun-as-jmxrmi 8686/udp Sun App Server - JMX/RMI +-# Abhijit Kumar <as-iana-ports&sun.com> November 2005 +-# 8687-8698 Unassigned +-vnyx 8699/tcp VNYX Primary Port +-vnyx 8699/udp VNYX Primary Port +-# Gregg Green <legal&vnyx.net> November 2004 +-# 8700-8732 Unassigned +-ibus 8733/tcp iBus +-ibus 8733/udp iBus +-# Silvano Maffeis <maffeis&softwired.ch> +-# 8734-8762 Unassigned +-mc-appserver 8763/tcp MC-APPSERVER +-mc-appserver 8763/udp MC-APPSERVER +-# Romeo Kasanwidjojo <romeoµcomgroup.com> +-openqueue 8764/tcp OPENQUEUE +-openqueue 8764/udp OPENQUEUE +-# Matt Jensen <mattj&newsblip.com> +-ultraseek-http 8765/tcp Ultraseek HTTP +-ultraseek-http 8765/udp Ultraseek HTTP +-# Walter Underwood <wunder&infoseek.com> +-# 8766-8769 Unassigned +-dpap 8770/tcp Digital Photo Access Protocol +-dpap 8770/udp Digital Photo Access Protocol +-# Amandeep Jawa <dpap&apple.com> November 2004 +-# 8771-8785 Unassigned +-msgclnt 8786/tcp Message Client +-msgclnt 8786/udp Message Client +-msgsrvr 8787/tcp Message Server +-msgsrvr 8787/udp Message Server +-# Michael O'Brien <mobrien02&comcast.net> March 2003 +-# 8788-8799 Unassigned +-sunwebadmin 8800/tcp Sun Web Server Admin Service +-sunwebadmin 8800/udp Sun Web Server Admin Service +-# Jyri J. Virkki <jyri.virkki&sun.com> December 2005 +-# 8801-8803 Unassigned +-truecm 8804/tcp truecm +-truecm 8804/udp truecm +-# Scott Kramer <scottk&truebluesoftware.com> +-# 8805-8872 Unassigned +-dxspider 8873/tcp dxspider linking protocol +-dxspider 8873/udp dxspider linking protocol +-# Dirk Koopman <djk&tobit.co.uk> August 2005 +-# 8874-8879 Unassigned +-cddbp-alt 8880/tcp CDDBP +-cddbp-alt 8880/udp CDDBP +-# Steve Scherf <steve&moonsoft.com> +-# 8881-8882 Unassigned +-secure-mqtt 8883/tcp Secure MQTT +-secure-mqtt 8883/udp Secure MQTT +-# Arthur Barr <arthur.barr&uk.ibm.com> 27 February 2008 +-# 8884-8887 Unassigned +-ddi-tcp-1 8888/tcp NewsEDGE server TCP (TCP 1) +-ddi-udp-1 8888/udp NewsEDGE server UDP (UDP 1) +-ddi-tcp-2 8889/tcp Desktop Data TCP 1 +-ddi-udp-2 8889/udp NewsEDGE server broadcast +-ddi-tcp-3 8890/tcp Desktop Data TCP 2 +-ddi-udp-3 8890/udp NewsEDGE client broadcast +-ddi-tcp-4 8891/tcp Desktop Data TCP 3: NESS application +-ddi-udp-4 8891/udp Desktop Data UDP 3: NESS application +-ddi-tcp-5 8892/tcp Desktop Data TCP 4: FARM product +-ddi-udp-5 8892/udp Desktop Data UDP 4: FARM product +-ddi-tcp-6 8893/tcp Desktop Data TCP 5: NewsEDGE/Web application +-ddi-udp-6 8893/udp Desktop Data UDP 5: NewsEDGE/Web application +-ddi-tcp-7 8894/tcp Desktop Data TCP 6: COAL application +-ddi-udp-7 8894/udp Desktop Data UDP 6: COAL application +-# Fred Yao <Fred_Yao&DDIGATE2.desktopdata.com> +-# 8895-8898 Unassigned +-ospf-lite 8899/tcp ospf-lite +-ospf-lite 8899/udp ospf-lite +-# Matthew Thomas <mrthom&essex.ac.uk> 07 January 2008 +-jmb-cds1 8900/tcp JMB-CDS 1 +-jmb-cds1 8900/udp JMB-CDS 1 +-jmb-cds2 8901/tcp JMB-CDS 2 +-jmb-cds2 8901/udp JMB-CDS 2 +-# Curtis Bray <CurtisB&creativedesign.com> +-# 8902-8909 Unassigned +-manyone-http 8910/tcp manyone-http +-manyone-http 8910/udp manyone-http +-manyone-xml 8911/tcp manyone-xml +-manyone-xml 8911/udp manyone-xml +-# Matt King <m&manyone.net> April 2002 +-wcbackup 8912/tcp Windows Client Backup +-wcbackup 8912/udp Windows Client Backup +-# Jim Lyon <JimLyon&Microsoft.Com> November 2005 +-dragonfly 8913/tcp Dragonfly System Service +-dragonfly 8913/udp Dragonfly System Service +-# Paul Hodara <phodara&netwave.com> November 2005 +-# 8914-8953 Unassigned +-cumulus-admin 8954/tcp Cumulus Admin Port +-cumulus-admin 8954/udp Cumulus Admin Port +-# Thomas Schleu <tschleu&canto.de> +-# 8955-8988 Unassigned +-sunwebadmins 8989/tcp Sun Web Server SSL Admin Service +-sunwebadmins 8989/udp Sun Web Server SSL Admin Service +-# Jyri J. Virkki <jyri.virkki&sun.com> December 2005 +-http-wmap 8990/tcp webmail HTTP service +-http-wmap 8990/udp webmail HTTP service +-https-wmap 8991/tcp webmail HTTPS service +-https-wmap 8991/udp webmail HTTPS service +-# Fred Batty <fredb&sun.com> 03 December 2007 +-# 8992-8998 Unassigned +-bctp 8999/tcp Brodos Crypto Trade Protocol +-bctp 8999/udp Brodos Crypto Trade Protocol +-# Alexander Sahler <alexander.sahler&brodos.de> February 2002 +-cslistener 9000/tcp CSlistener +-cslistener 9000/udp CSlistener +-# David Jones <djones&cincom.com> +-etlservicemgr 9001/tcp ETL Service Manager +-etlservicemgr 9001/udp ETL Service Manager +-# Stephen McCrea <smccrea&etlelectronique.com> March 2002 +-dynamid 9002/tcp DynamID authentication +-dynamid 9002/udp DynamID authentication +-# Jerome Dusautois <jdusautois&scrypto.fr> March 2002 +-# 9003-9005 Unassigned +-# 9006 De-Commissioned Port 02/24/00, ms +-# 9007-9008 Unassigned +-pichat 9009/tcp Pichat Server +-pichat 9009/udp Pichat Server +-# Mark Seuffert <captain2004&pirate.de> November 2004 +-# 9010-9019 Unassigned +-tambora 9020/tcp TAMBORA +-tambora 9020/udp TAMBORA +-# Jason van Zyl <jvanzyl&zenplex.com> March 2002 +-panagolin-ident 9021/tcp Pangolin Identification +-panagolin-ident 9021/udp Pangolin Identification +-# William Benner <bill&pangolin.com> March 2002 +-paragent 9022/tcp PrivateArk Remote Agent +-paragent 9022/udp PrivateArk Remote Agent +-# Gal Cucuy <galc&cyber-ark.com> March 2002 +-swa-1 9023/tcp Secure Web Access - 1 +-swa-1 9023/udp Secure Web Access - 1 +-swa-2 9024/tcp Secure Web Access - 2 +-swa-2 9024/udp Secure Web Access - 2 +-swa-3 9025/tcp Secure Web Access - 3 +-swa-3 9025/udp Secure Web Access - 3 +-swa-4 9026/tcp Secure Web Access - 4 +-swa-4 9026/udp Secure Web Access - 4 +-# Tim McGranaghan <tim_mcgranaghan&mech.disa.mil> +-# 9027-9079 Unassigned +-glrpc 9080/tcp Groove GLRPC +-glrpc 9080/udp Groove GLRPC +-# Adrian Popescu <Adrian_Popescu&groove.net> September 2002 +-# 9081-9085 Unassigned +-net2display 9086/tcp Vesa Net2Display +-net2display 9086/udp Vesa Net2Display +-# Kenneth B. Ocheltree <kennetho&us.ibm.com> 07 January 2008 +-classic 9087/tcp Classic Data Server +-classic 9087/udp Classic Data Server +-# Paul Cadarette <pcadaret&us.ibm.com> January 2007 +-sqlexec 9088/tcp IBM Informix SQL Interface +-sqlexec 9088/udp IBM Informix SQL Interface +-sqlexec-ssl 9089/tcp IBM Informix SQL Interface - Encrypted +-sqlexec-ssl 9089/udp IBM Informix SQL Interface - Encrypted +-# Jonathan Leffler <jleffler&us.ibm.com> December 2005 +-websm 9090/tcp WebSM +-websm 9090/udp WebSM +-# I-Hsing Tsao <itsao&austin.ibm.com> +-xmltec-xmlmail 9091/tcp xmltec-xmlmail +-xmltec-xmlmail 9091/udp xmltec-xmlmail +-# Mitch Kaufman <mk&weconnectyou.com> +-XmlIpcRegSvc 9092/tcp Xml-Ipc Server Reg +-XmlIpcRegSvc 9092/udp Xml-Ipc Server Reg +-# Casey Harrington <charrington&isxinc.com> January 2006 +-# 9093-9099 Unassigned +-hp-pdl-datastr 9100/tcp PDL Data Streaming Port +-hp-pdl-datastr 9100/udp PDL Data Streaming Port +-# Shivaun Albright <shivaun_albright&hp.com> April 2002 +-#### The protocol name "pdl-datastream" is primarily registered for use #### +-#### in DNS SRV records (RFC 2782). DNS SRV records allow a protocol to run on #### +-#### any port number, but the default port for this protocol is 9100 ####. +-pdl-datastream 9100/tcp Printer PDL Data Stream +-pdl-datastream 9100/udp Printer PDL Data Stream +-# Stuart Cheshire <pdl-datastream&apple.com> September 2002 +-bacula-dir 9101/tcp Bacula Director +-bacula-dir 9101/udp Bacula Director +-bacula-fd 9102/tcp Bacula File Daemon +-bacula-fd 9102/udp Bacula File Daemon +-bacula-sd 9103/tcp Bacula Storage Daemon +-bacula-sd 9103/udp Bacula Storage Daemon +-# Kern Sibbald <kern&sibbald.com> January 2002 +-peerwire 9104/tcp PeerWire +-peerwire 9104/udp PeerWire +-# Steven Gerhardt <sgerhardt&ixiononline.com> February 2004 +-# 9105-9118 Unassigned +-mxit 9119/tcp MXit Instant Messaging +-mxit 9119/udp MXit Instant Messaging +-# Marnus Freeman <marnus&swistgroup.com> February 2006 +-# 9120-9130 Unassigned +-dddp 9131/tcp Dynamic Device Discovery +-dddp 9131/udp Dynamic Device Discovery +-# Shane Dick <shane.dick&amx.com> August 2005 +-# 9132-9159 Unassigned +-apani1 9160/tcp apani1 +-apani1 9160/udp apani1 +-apani2 9161/tcp apani2 +-apani2 9161/udp apani2 +-apani3 9162/tcp apani3 +-apani3 9162/udp apani3 +-apani4 9163/tcp apani4 +-apani4 9163/udp apani4 +-apani5 9164/tcp apani5 +-apani5 9164/udp apani5 +-# Neal Taylor <ianareg&apani.com> +-# 9165-9190 Unassigned +-sun-as-jpda 9191/tcp Sun AppSvr JPDA +-sun-as-jpda 9191/udp Sun AppSvr JPDA +-# Abhijit Kumar <as-iana-ports&sun.com> November 2005 +-# 9192-9199 Unassigned +-wap-wsp 9200/tcp WAP connectionless session service +-wap-wsp 9200/udp WAP connectionless session service +-wap-wsp-wtp 9201/tcp WAP session service +-wap-wsp-wtp 9201/udp WAP session service +-wap-wsp-s 9202/tcp WAP secure connectionless session service +-wap-wsp-s 9202/udp WAP secure connectionless session service +-wap-wsp-wtp-s 9203/tcp WAP secure session service +-wap-wsp-wtp-s 9203/udp WAP secure session service +-wap-vcard 9204/tcp WAP vCard +-wap-vcard 9204/udp WAP vCard +-wap-vcal 9205/tcp WAP vCal +-wap-vcal 9205/udp WAP vCal +-wap-vcard-s 9206/tcp WAP vCard Secure +-wap-vcard-s 9206/udp WAP vCard Secure +-wap-vcal-s 9207/tcp WAP vCal Secure +-wap-vcal-s 9207/udp WAP vCal Secure +-# WAP Forum <wap-feedback&mail.wapforum.org> +-# WAP Forum <pg&uplanet.com> +-rjcdb-vcards 9208/tcp rjcdb vCard +-rjcdb-vcards 9208/udp rjcdb vCard +-# Robert John Churchill <rjc&rjcdb.com> January 2006 +-almobile-system 9209/tcp ALMobile System Service +-almobile-system 9209/udp ALMobile System Service +-# Rob Graber <r.graber&austinlane.com> January 2006 +-oma-mlp 9210/tcp OMA Mobile Location Protocol +-oma-mlp 9210/udp OMA Mobile Location Protocol +-oma-mlp-s 9211/tcp OMA Mobile Location Protocol Secure +-oma-mlp-s 9211/udp OMA Mobile Location Protocol Secure +-# Hans Rohnert <hans.rohnert&siemens.com> April 2002 +-serverviewdbms 9212/tcp Server View dbms access +-serverviewdbms 9212/udp Server View dbms access +-# Guenther Kroenert <guenther.kroenert&fujitsu-siemens.com> January 2005 +-serverstart 9213/tcp ServerStart RemoteControl +-serverstart 9213/udp ServerStart RemoteControl +-# Guenther Kroenert <Guenther.Kroenert&fujitsu-siemens.com> August 2005 +-ipdcesgbs 9214/tcp IPDC ESG BootstrapService +-ipdcesgbs 9214/udp IPDC ESG BootstrapService +-# Joerg Heuer <Joerg.Heuer&siemens.com> February 2006 +-insis 9215/tcp Integrated Setup and Install Service +-insis 9215/udp Integrated Setup and Install Service +-# Markus Treinen <markus.treinen&siemens.com> February 2006 +-acme 9216/tcp Aionex Communication Management Engine +-acme 9216/udp Aionex Communication Management Engine +-# Mark Sapp <mark.sapp&aionex.com> April 2006 +-fsc-port 9217/tcp FSC Communication Port +-fsc-port 9217/udp FSC Communication Port +-# Teijo Mustonen <Teijo.Mustonen&F-Secure.com> March 2002 +-# 9218-9221 Unassigned +-teamcoherence 9222/tcp QSC Team Coherence +-teamcoherence 9222/udp QSC Team Coherence +-# Ewan McNab <ewan&qsc.co.uk> November 2004 +-# 9223-9254 Unassigned +-mon 9255/tcp Manager On Network +-mon 9255/udp Manager On Network +-# David Rouchet <david.rouchet&medialon.com> May 2007 +-# 9256-9279 Unassigned +-pgps 9280/tcp Predicted GPS +-pgps 9280/udp Predicted GPS +-# Jeremy Freeman <jeremy&rxnetworks.ca> 14 February 2008 +-swtp-port1 9281/tcp SofaWare transport port 1 +-swtp-port1 9281/udp SofaWare transport port 1 +-swtp-port2 9282/tcp SofaWare transport port 2 +-swtp-port2 9282/udp SofaWare transport port 2 +-# Amir Rapson <rapson&sofaware.com> February 2002 +-callwaveiam 9283/tcp CallWaveIAM +-callwaveiam 9283/udp CallWaveIAM +-# Colin Kelley <cdk&callwave.com> +-visd 9284/tcp VERITAS Information Serve +-visd 9284/udp VERITAS Information Serve +-# Ravi Tavakely <ravi.tavakley&veritas.com> February 2002 +-n2h2server 9285/tcp N2H2 Filter Service Port +-n2h2server 9285/udp N2H2 Filter Service Port +-# Jim Irwin <jirwin&n2h2.com> February 2002 +-# 9286 Unassigned +-cumulus 9287/tcp Cumulus +-cumulus 9287/udp Cumulus +-# Thomas Schleu <tschleu&canto.de> +-# 9288-9291 Unassigned +-armtechdaemon 9292/tcp ArmTech Daemon +-armtechdaemon 9292/udp ArmTech Daemon +-# Rohan Story <rohan&aurema.com> +-storview 9293/tcp StorView Client +-storview 9293/udp StorView Client +-# Ryan Smith <ryans&nstor.com> July 2006 +-armcenterhttp 9294/tcp ARMCenter http Service +-armcenterhttp 9294/udp ARMCenter http Service +-armcenterhttps 9295/tcp ARMCenter https Service +-armcenterhttps 9295/udp ARMCenter https Service +-# Eric Thiebaut-George <erict&aurema.com> April 2006 +-# 9296-9299 Unassigned +-vrace 9300/tcp Virtual Racing Service +-vrace 9300/udp Virtual Racing Service +-# Pete Loeffen, President, Digital Rowing Inc. <peterl&digitalrowing.com> October 2006 +-# 9301-9317 Unassigned +-secure-ts 9318/tcp PKIX TimeStamp over TLS +-secure-ts 9318/udp PKIX TimeStamp over TLS +-# Niklas Weiss <n.weiss&d-trust.net> November 2004 +-# 9319-9320 Unassigned +-guibase 9321/tcp guibase +-guibase 9321/udp guibase +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 9322-9342 Unassigned +-mpidcmgr 9343/tcp MpIdcMgr +-mpidcmgr 9343/udp MpIdcMgr +-mphlpdmc 9344/tcp Mphlpdmc +-mphlpdmc 9344/udp Mphlpdmc +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 9345 Unassigned +-ctechlicensing 9346/tcp C Tech Licensing +-ctechlicensing 9346/udp C Tech Licensing +-# Reed Copsey, Jr. <reedc&ctech.com> +-# 9347-9373 Unassigned +-fjdmimgr 9374/tcp fjdmimgr +-fjdmimgr 9374/udp fjdmimgr +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 9375-9379 Unassigned +-boxp 9380/tcp Brivs! Open Extensible Protocol +-boxp 9380/udp Brivs! Open Extensible Protocol +-# Danko Alexeyev <virtuall&virtuall.info> 08 August 2007 +-# 9381-9395 Unassigned +-fjinvmgr 9396/tcp fjinvmgr +-fjinvmgr 9396/udp fjinvmgr +-mpidcagt 9397/tcp MpIdcAgt +-mpidcagt 9397/udp MpIdcAgt +-# Yutaka Ono <ono&saint.nm.fujitsu.co.jp> +-# 9398-9399 Unassigned +-sec-t4net-srv 9400/tcp Samsung Twain for Network Server +-sec-t4net-srv 9400/udp Samsung Twain for Network Server +-sec-t4net-clt 9401/tcp Samsung Twain for Network Client +-sec-t4net-clt 9401/udp Samsung Twain for Network Client +-# Dongkeun Kim <dongkeun70.kim&samsung.com> February 2007 +-# 9402-9417 Unassigned +-git 9418/tcp git pack transfer service +-git 9418/udp git pack transfer service +-# Linus Torvalds <torvalds&osdl.org> September 2005 +-# 9419-9442 Unassigned +-tungsten-https 9443/tcp WSO2 Tungsten HTTPS +-tungsten-https 9443/udp WSO2 Tungsten HTTPS +-# Afkham Azeez <azeez&wso2.com> June 2006 +-# 9444-9499 Unassigned +-ismserver 9500/tcp ismserver +-ismserver 9500/udp ismserver +-# Ian Gordon <iangµmuse.co.uk> +-# 9501-9534 Unassigned +-mngsuite 9535/tcp Management Suite Remote Control +-mngsuite 9535/udp Management Suite Remote Control +-# Alan Butt <alan.butt&landesk.com> +-laes-bf 9536/tcp Surveillance buffering function +-laes-bf 9536/udp Surveillance buffering function +-# Glen Myers <glen.myers&ipfabrics.com> May 2007 +-# 9537-9554 Unassigned +-trispen-sra 9555/tcp Trispen Secure Remote Access +-trispen-sra 9555/udp Trispen Secure Remote Access +-# Jaco Botha <jaco.botha&trispen.com> November 2004 +-# 9556-9591 Unassigned +-ldgateway 9592/tcp LANDesk Gateway +-ldgateway 9592/udp LANDesk Gateway +-# Alan Butt <alan.butt&landesk.com> March 2006 +-cba8 9593/tcp LANDesk Management Agent +-cba8 9593/udp LANDesk Management Agent +-# Alan Butt <alan.butt&landesk.com> November 2004 +-msgsys 9594/tcp Message System +-msgsys 9594/udp Message System +-pds 9595/tcp Ping Discovery Service +-pds 9595/udp Ping Discovery Service +-# Alan Butt <alan.butt&landesk.com> +-mercury-disc 9596/tcp Mercury Discovery +-mercury-disc 9596/udp Mercury Discovery +-# Paul Mclachlan <pmclachlan&mercury.com> November 2005 +-pd-admin 9597/tcp PD Administration +-pd-admin 9597/udp PD Administration +-# Duk Loi <dloi&peerdirect.com> November 2005 +-vscp 9598/tcp Very Simple Ctrl Protocol +-vscp 9598/udp Very Simple Ctrl Protocol +-# Ake Hedman <akhe&eurosource.se> November 2005 +-robix 9599/tcp Robix +-robix 9599/udp Robix +-# Evan Rosen <evan&robix.com> November 2005 +-micromuse-ncpw 9600/tcp MICROMUSE-NCPW +-micromuse-ncpw 9600/udp MICROMUSE-NCPW +-# Hing Wing To <wing.toµmuse.com> +-# 9601-9611 Unassigned +-streamcomm-ds 9612/tcp StreamComm User Directory +-streamcomm-ds 9612/udp StreamComm User Directory +-# Brian C. Wiles <brian&streamcomm.com> +-# 9613-9627 Unassigned +-odbcpathway 9628/tcp ODBC Pathway Service +-odbcpathway 9628/udp ODBC Pathway Service +-# Adrian Hungate <adrian&haqa.co.uk> May 2007 +-uniport 9629/tcp UniPort SSO Controller +-uniport 9629/udp UniPort SSO Controller +-# Adrian Hungate <adrian&haqa.co.uk> 05 September 2007 +-# 9630-9699 Unassigned +-board-roar 9700/tcp Board M.I.T. Service +-board-roar 9700/udp Board M.I.T. Service +-# Francesco Rosi <frosi&orenburg.com> January 2006 +-# 9701-9746 Unassigned +-l5nas-parchan 9747/tcp L5NAS Parallel Channel +-l5nas-parchan 9747/udp L5NAS Parallel Channel +-# Lawrence J. Dickson - Land-5 Corporation +-# <ldickson&land-5.com> March 2002 +-# 9748-9749 Unassigned +-board-voip 9750/tcp Board M.I.T. Synchronous Collaboration +-board-voip 9750/udp Board M.I.T. Synchronous Collaboration +-# Francesco Rosi <frosi&orenburg.com> January 2006 +-# 9751-9752 Unassigned +-rasadv 9753/tcp rasadv +-rasadv 9753/udp rasadv +-# Dave Thaler <dthalerµsoft.com> +-# 9754-9761 Unassigned +-tungsten-http 9762/tcp WSO2 Tungsten HTTP +-tungsten-http 9762/udp WSO2 Tungsten HTTP +-# Afkham Azeez <azeez&wso2.com> June 2006 +-# 9763-9799 Unassigned +-davsrc 9800/tcp WebDav Source Port +-davsrc 9800/udp WebDav Source Port +-# Ethan Fremen <mindlace&digicool.com> +-sstp-2 9801/tcp Sakura Script Transfer Protocol-2 +-sstp-2 9801/udp Sakura Script Transfer Protocol-2 +-# Kouichi Takeda <KHB05271&nifty.com> +-davsrcs 9802/tcp WebDAV Source TLS/SSL +-davsrcs 9802/udp WebDAV Source TLS/SSL +-# Rob Isaac <rob&automagic.org> July 2003 +-# 9803-9874 Unassigned +-sapv1 9875/tcp Session Announcement v1 +-sapv1 9875/udp Session Announcement v1 +-# RFC 2974 <ftp://ftp.isi.edu/in-notes/rfc2974.txt> +-sd 9876/tcp Session Director +-sd 9876/udp Session Director +-# Van Jacobson <van&ee.lbl.gov> +-# 9877-9887 Unassigned +-cyborg-systems 9888/tcp CYBORG Systems +-cyborg-systems 9888/udp CYBORG Systems +-# Malcolm Graham <Malcolm_Graham&CYBORG.COM> +-# 9889-9897 Unassigned +-monkeycom 9898/tcp MonkeyCom +-monkeycom 9898/udp MonkeyCom +-# Yuji Kuwabara <HHG01200&niftyserve.or.jp> +-sctp-tunneling 9899/tcp SCTP TUNNELING +-sctp-tunneling 9899/udp SCTP TUNNELING +-iua 9900/tcp IUA +-iua 9900/udp IUA +-iua 9900/sctp IUA +-# Lyndon Ong <Lyong&ciena.com> +-enrp 9901/udp enrp server channel +-enrp-sctp 9901/sctp enrp server channel +-# Lyndon Ong <lyong&ciena.com> June 2006 +-enrp-sctp-tls 9902/sctp enrp/tls server channel +-# Lyndon Ong <lyong&ciena.com> June 2006 +-# 9903-9908 Unassigned +-domaintime 9909/tcp domaintime +-domaintime 9909/udp domaintime +-# Jeffry Dwight <jeffryd&greyware.com> +-# 9910 Unassigned +-sype-transport 9911/tcp SYPECom Transport Protocol +-sype-transport 9911/udp SYPECom Transport Protocol +-# Sylvain Pedneault <sylvain&sypecom.qc.ca> March 2003 +-# 9912-9949 Unassigned +-apc-9950 9950/tcp APC 9950 +-apc-9950 9950/udp APC 9950 +-apc-9951 9951/tcp APC 9951 +-apc-9951 9951/udp APC 9951 +-apc-9952 9952/tcp APC 9952 +-apc-9952 9952/udp APC 9952 +-# American Power Conversion <ports&apcc.com> +-acis 9953/tcp 9953 +-acis 9953/udp 9953 +-# Thomas Guth <t.guth&zeiss.de> January 2006 +-# 9954-9965 Unassigned +-odnsp 9966/tcp OKI Data Network Setting Protocol +-odnsp 9966/udp OKI Data Network Setting Protocol +-# Masato Sato <satou203&oki.com> May 2006 +-# 9967-9986 Unassigned +-dsm-scm-target 9987/tcp DSM/SCM Target Interface +-dsm-scm-target 9987/udp DSM/SCM Target Interface +-# Mike Dyslin <mike.dyslin&hp.com> August 2006 +-# 9988-9989 Unassigned +-osm-appsrvr 9990/tcp OSM Applet Server +-osm-appsrvr 9990/udp OSM Applet Server +-# Vinay Gupta <vinay.gupta&hp.com> August 2003 +-osm-oev 9991/tcp OSM Event Server +-osm-oev 9991/udp OSM Event Server +-# Vinay Gupta <vinay.gupta&hp.com> August 2003 +-palace-1 9992/tcp OnLive-1 +-palace-1 9992/udp OnLive-1 +-palace-2 9993/tcp OnLive-2 +-palace-2 9993/udp OnLive-2 +-palace-3 9994/tcp OnLive-3 +-palace-3 9994/udp OnLive-3 +-palace-4 9995/tcp Palace-4 +-palace-4 9995/udp Palace-4 +-palace-5 9996/tcp Palace-5 +-palace-5 9996/udp Palace-5 +-palace-6 9997/tcp Palace-6 +-palace-6 9997/udp Palace-6 +-# Douglas Crockford <douglas&crockford.com> +-distinct32 9998/tcp Distinct32 +-distinct32 9998/udp Distinct32 +-distinct 9999/tcp distinct +-distinct 9999/udp distinct +-# Anoop Tewari <anoop&next.distinct.com> +-ndmp 10000/tcp Network Data Management Protocol +-ndmp 10000/udp Network Data Management Protocol +-# Brian Ehrmantraut <bae&netapp.com> +-scp-config 10001/tcp SCP Configuration Port +-scp-config 10001/udp SCP Configuration Port +-# Brad Strand <brad.strand&3ware.com> +-documentum 10002/tcp EMC-Documentum Content Server Product +-documentum 10002/udp EMC-Documentum Content Server Product +-documentum_s 10003/tcp EMC-Documentum Content Server Product +-documentum_s 10003/udp EMC-Documentum Content Server Product +-# Reza Bagherian <bagherian_reza&emc.com> 19 July 2007 +-# 10004-10006 Unassigned +-mvs-capacity 10007/tcp MVS Capacity +-mvs-capacity 10007/udp MVS Capacity +-# Donna Dillenberger <engd&us.ibm.com> +-octopus 10008/tcp Octopus Multiplexer +-octopus 10008/udp Octopus Multiplexer +-# Chris Koeritz <fred&gruntose.com> October 2002 +-swdtp-sv 10009/tcp Systemwalker Desktop Patrol +-swdtp-sv 10009/udp Systemwalker Desktop Patrol +-# Akira Ide <ide.akira&jp.fujitsu.com> March 2006 +-# 10010-10049 Unassigned +-zabbix-agent 10050/tcp Zabbix Agent +-zabbix-agent 10050/udp Zabbix Agent +-zabbix-trapper 10051/tcp Zabbix Trapper +-zabbix-trapper 10051/udp Zabbix Trapper +-# Alexei Vladishev <alexei.vladishev&zabbix.com> February 2006 +-# 10052-10079 Unassigned +-amanda 10080/tcp Amanda +-amanda 10080/udp Amanda +-# John Jackson <jrj&gandalf.cc.purdue.edu> +-# <amanda-core&amanda.org> +-famdc 10081/tcp FAM Archive Server +-famdc 10081/udp FAM Archive Server +-# Frode Randers <Frode.Randers&tietoenator.com> January 2006 +-# 10082-10099 Unassigned +-itap-ddtp 10100/tcp VERITAS ITAP DDTP +-itap-ddtp 10100/udp VERITAS ITAP DDTP +-# Saugata Guha <sguha&veritas.com> May 2004 +-ezmeeting-2 10101/tcp eZmeeting +-ezmeeting-2 10101/udp eZmeeting +-ezproxy-2 10102/tcp eZproxy +-ezproxy-2 10102/udp eZproxy +-ezrelay 10103/tcp eZrelay +-ezrelay 10103/udp eZrelay +-# Albert C. Yang <albert.yang&eZmeeting.com> March 2002 +-swdtp 10104/tcp Systemwalker Desktop Patrol +-swdtp 10104/udp Systemwalker Desktop Patrol +-# Akira Ide <ide.akira&jp.fujitsu.com> September 2006 +-# 10105-10106 Unassigned +-bctp-server 10107/tcp VERITAS BCTP, server +-bctp-server 10107/udp VERITAS BCTP, server +-# Saugata Guha <sguha&veritas.com> May 2004 +-# 10108-10112 Unassigned +-netiq-endpoint 10113/tcp NetIQ Endpoint +-netiq-endpoint 10113/udp NetIQ Endpoint +-netiq-qcheck 10114/tcp NetIQ Qcheck +-netiq-qcheck 10114/udp NetIQ Qcheck +-# John Wood <John.Wood&netiq.com> +-netiq-endpt 10115/tcp NetIQ Endpoint +-netiq-endpt 10115/udp NetIQ Endpoint +-# Gary Weichinger <gary.weichinger&netiq.com> +-netiq-voipa 10116/tcp NetIQ VoIP Assessor +-netiq-voipa 10116/udp NetIQ VoIP Assessor +-# Gary Weichinger <gary.weichinger&netiq.com> +-# 10117-10127 Unassigned +-bmc-perf-sd 10128/tcp BMC-PERFORM-SERVICE DAEMON +-bmc-perf-sd 10128/udp BMC-PERFORM-SERVICE DAEMON +-# Portnoy Boxman <portnoy_boxman&bmc.com> +-# 10129-10159 Unassigned +-qb-db-server 10160/tcp QB Database Server +-qb-db-server 10160/udp QB Database Server +-# Wei Wang <Wei_Wang&intuit.com> November 2005 +-# 10161-10199 Unassigned +-trisoap 10200/tcp Trigence AE Soap Service +-trisoap 10200/udp Trigence AE Soap Service +-# Brigitte Gagne <bgagne&trigence.com> August 2006 +-# 10201-10251 Unassigned +-apollo-relay 10252/tcp Apollo Relay Port +-apollo-relay 10252/udp Apollo Relay Port +-# Anthony Carrabino <anthonyc&vistasoftware.com> August 2003 +-# 10253-10259 Unassigned +-axis-wimp-port 10260/tcp Axis WIMP Port +-axis-wimp-port 10260/udp Axis WIMP Port +-# Stefan Eriksson <contact-iana&axis.com> +-# 10261-10287 Unassigned +-blocks 10288/tcp Blocks +-blocks 10288/udp Blocks +-# Carl Malamud +-# 10289-10539 Unassigned +-MOS-lower 10540/tcp MOS Media Object Metadata Port +-MOS-lower 10540/udp MOS Media Object Metadata Port +-MOS-upper 10541/tcp MOS Running Order Port +-MOS-upper 10541/udp MOS Running Order Port +-MOS-aux 10542/tcp MOS Low Priority Port +-MOS-aux 10542/udp MOS Low Priority Port +-MOS-soap 10543/tcp MOS SOAP Default Port +-MOS-soap 10543/udp MOS SOAP Default Port +-MOS-soap-opt 10544/tcp MOS SOAP Optional Port +-MOS-soap-opt 10544/udp MOS SOAP Optional Port +-# Eric Thorniley <eric&etcomms.co.uk> 17 September 2007 +-# 10545-10799 Unassigned +-gap 10800/tcp Gestor de Acaparamiento para Pocket PCs +-gap 10800/udp Gestor de Acaparamiento para Pocket PCs +-# Juan Carlos Olivares Rojas <jcolivares04c&cenidet.edu.mx> March 2006 +-# 10801-10804 Unassigned +-lpdg 10805/tcp LUCIA Pareja Data Group +-lpdg 10805/udp LUCIA Pareja Data Group +-# Alvaro P. Dominguez <alpado&gmail.com> February 2006 +-# 10806-10989 Unassigned +-rmiaux 10990/tcp Auxiliary RMI Port +-rmiaux 10990/udp Auxiliary RMI Port +-# Eugen Bacic <eugen&texar.com> +-# 10991-10999 Unassigned +-irisa 11000/tcp IRISA +-irisa 11000/udp IRISA +-# V.A. Brauner <info&datamedia.fr> +-metasys 11001/tcp Metasys +-metasys 11001/udp Metasys +-# Tobin Schuster <tobin.j.schuster&jci.com> +-# 11002-11110 Unassigned +-vce 11111/tcp Viral Computing Environment (VCE) +-vce 11111/udp Viral Computing Environment (VCE) +-# Fred Cohen <fc&all.net> +-dicom 11112/tcp DICOM +-dicom 11112/udp DICOM +-# David Clunie <dclunie&dclunie.com> August 2005 +-# 11113-11160 Unassigned +-suncacao-snmp 11161/tcp sun cacao snmp access point +-suncacao-snmp 11161/udp sun cacao snmp access point +-suncacao-jmxmp 11162/tcp sun cacao JMX-remoting access point +-suncacao-jmxmp 11162/udp sun cacao JMX-remoting access point +-suncacao-rmi 11163/tcp sun cacao rmi registry access point +-suncacao-rmi 11163/udp sun cacao rmi registry access point +-suncacao-csa 11164/tcp sun cacao command-streaming access point +-suncacao-csa 11164/udp sun cacao command-streaming access point +-suncacao-websvc 11165/tcp sun cacao web service access point +-suncacao-websvc 11165/udp sun cacao web service access point +-# Nick Stephen <nick.stephen&sun.com> August 2005 +-# 11166-11200 Unassigned +-smsqp 11201/tcp smsqp +-smsqp 11201/udp smsqp +-# Andres Seco Hernandez <AndresSH&alamin.org> +-# 11202-11207 Unassigned +-wifree 11208/tcp WiFree Service +-wifree 11208/udp WiFree Service +-# Jose Luis Martin Peinado <jooe&wifree-project.net> March 2006 +-# 11209-11318 Unassigned +-imip 11319/tcp IMIP +-imip 11319/udp IMIP +-# IM Unified Coalition, Len Zuvela +-# <imu-comments&egroups.com> +-imip-channels 11320/tcp IMIP Channels Port +-imip-channels 11320/udp IMIP Channels Port +-# Len Zuvela <lenzµsoft.com> +-arena-server 11321/tcp Arena Server Listen +-arena-server 11321/udp Arena Server Listen +-# Earl Brannigan <earl.brannigan&lindenhous.co.uk> +-# 11322-11366 Unassigned +-atm-uhas 11367/tcp ATM UHAS +-atm-uhas 11367/udp ATM UHAS +-# Todd Barker <toddba&attachmate.com> +-# 11368-11370 Unassigned +-hkp 11371/tcp OpenPGP HTTP Keyserver +-hkp 11371/udp OpenPGP HTTP Keyserver +-# David Shaw <dshaw&jabberwocky.com> May 2003 +-# 11372-11599 Unassigned +-tempest-port 11600/tcp Tempest Protocol Port +-tempest-port 11600/udp Tempest Protocol Port +-# Francis Cianfrocca <francis&tempest.com> +-# 11601-11719 Unassigned +-h323callsigalt 11720/tcp h323 Call Signal Alternate +-h323callsigalt 11720/udp h323 Call Signal Alternate +-# Chris White <cjwhite&cisco.com> +-# 11721-11750 Unassigned +-intrepid-ssl 11751/tcp Intrepid SSL +-intrepid-ssl 11751/udp Intrepid SSL +-# Robert Eden <reden&sieglertech.com> March 2003 +-# 11752-11966 Unassigned +-sysinfo-sp 11967/tcp SysInfo Service Protocol +-sysinfo-sp 11967/udp SysInfo Sercice Protocol +-# Mike Cooper <mcooper&magnicomp.com> March 2003 +-# 11968-11996 Unassiged +-wmereceiving 11997/sctp WorldMailExpress +-wmedistribution 11998/sctp WorldMailExpress +-wmereporting 11999/sctp WorldMailExpress +-# Greg Foutz <gregf&adminovation.com> March 2006 +-entextxid 12000/tcp IBM Enterprise Extender SNA XID Exchange +-entextxid 12000/udp IBM Enterprise Extender SNA XID Exchange +-entextnetwk 12001/tcp IBM Enterprise Extender SNA COS Network Priority +-entextnetwk 12001/udp IBM Enterprise Extender SNA COS Network Priority +-entexthigh 12002/tcp IBM Enterprise Extender SNA COS High Priority +-entexthigh 12002/udp IBM Enterprise Extender SNA COS High Priority +-entextmed 12003/tcp IBM Enterprise Extender SNA COS Medium Priority +-entextmed 12003/udp IBM Enterprise Extender SNA COS Medium Priority +-entextlow 12004/tcp IBM Enterprise Extender SNA COS Low Priority +-entextlow 12004/udp IBM Enterprise Extender SNA COS Low Priority +-# Eugene Cox <genecox&raleigh.ibm.com> +-dbisamserver1 12005/tcp DBISAM Database Server - Regular +-dbisamserver1 12005/udp DBISAM Database Server - Regular +-dbisamserver2 12006/tcp DBISAM Database Server - Admin +-dbisamserver2 12006/udp DBISAM Database Server - Admin +-# Tim Young <timyoung&elevatesoft.com> May 2002 +-accuracer 12007/tcp Accuracer Database System ñ Server +-accuracer 12007/udp Accuracer Database System ñ Server +-accuracer-dbms 12008/tcp Accuracer Database System ñ Admin +-accuracer-dbms 12008/udp Accuracer Database System ñ Admin +-# Alexander V. Ivanov <support&aidaim.com> December 2004 +-# 12009-12011 Unassigned +-vipera 12012/tcp Vipera Messaging Service +-vipera 12012/udp Vipera Messaging Service +-# Silvano Maffeis <maffeis&acm.org> August 2005 +-vipera-ssl 12013/tcp Vipera Messaging Service over SSL Communication +-vipera-ssl 12013/udp Vipera Messaging Service over SSL Communication +-# Silvano Maffeis <maffeis&acm.org> 16 January 2008 +-# 12014-12108 Unassigned +-rets-ssl 12109/tcp RETS over SSL +-rets-ssl 12109/udp RETS over SSL +-# Bruce Toback <btoback&optc.com> February 2003 +-# 12110-12120 Unassigned +-nupaper-ss 12121/tcp NuPaper Session Service +-nupaper-ss 12121/udp NuPaper Session Service +-# David Warden <warden&nupaper.com> November 2005 +-# 12122-12167 Unassigned +-cawas 12168/tcp CA Web Access Service +-cawas 12168/udp CA Web Access Service +-# Jon Press <IANA.Registions&ca.com> August 2005 +-# 12169-12171 Unassigned +-hivep 12172/tcp HiveP +-hivep 12172/udp HiveP +-# Dick Augustsson <dick&skenbe.net> +-# 12173-12299 Unassigned +-linogridengine 12300/tcp LinoGrid Engine +-linogridengine 12300/udp LinoGrid Engine +-# Frans Lundberg <frans&linova.com> November 2004 +-# 12301-12320 Unassigned +-warehouse-sss 12321/tcp Warehouse Monitoring Syst SSS +-warehouse-sss 12321/udp Warehouse Monitoring Syst SSS +-warehouse 12322/tcp Warehouse Monitoring Syst +-warehouse 12322/udp Warehouse Monitoring Syst +-# Craig Steffen <csteffen&ncsa.uiuc.edu> August 2005 +-# 12323-12344 Unassigned +-italk 12345/tcp Italk Chat System +-italk 12345/udp Italk Chat System +-# Takayuki Ito <yuki&euc.jp> +-# 12346-12752 Unassigned +-tsaf 12753/tcp tsaf port +-tsaf 12753/udp tsaf port +-# Andreas Fehr <andreas&mrs.ch> +-# 12754-13159 Unassigned +-i-zipqd 13160/tcp I-ZIPQD +-i-zipqd 13160/udp I-ZIPQD +-# Chuck Runquist <crunquist&quarterdeck.com> +-# 13161-13222 Unassigned +-powwow-client 13223/tcp PowWow Client +-powwow-client 13223/udp PowWow Client +-powwow-server 13224/tcp PowWow Server +-powwow-server 13224/udp PowWow Server +-# Paul K. Peterson <paul&tribal.com> +-# 13225-13719 Unassigned +-bprd 13720/tcp BPRD Protocol (VERITAS NetBackup) +-bprd 13720/udp BPRD Protocol (VERITAS NetBackup) +-bpdbm 13721/tcp BPDBM Protocol (VERITAS NetBackup) +-bpdbm 13721/udp BPDBM Protocol (VERITAS NetBackup) +-# Jeff Holmbeck <Jeff.Holmbeck&veritas.com> +-bpjava-msvc 13722/tcp BP Java MSVC Protocol +-bpjava-msvc 13722/udp BP Java MSVC Protocol +-# Tim Schmidt <Tim.Schmidt&veritas.com> +-# 13723 Unassigned +-vnetd 13724/tcp Veritas Network Utility +-vnetd 13724/udp Veritas Network Utility +-# Jeff Holmbeck <Jeff.Holmbeck&veritas.com> +-# 13725-13781 Unassigned +-bpcd 13782/tcp VERITAS NetBackup +-bpcd 13782/udp VERITAS NetBackup +-vopied 13783/tcp VOPIED Protocol +-vopied 13783/udp VOPIED Protocol +-# Jeff Holmbeck <Jeff.Holmbeck&veritas.com> +-# 13784 Unassigned +-nbdb 13785/tcp NetBackup Database +-nbdb 13785/udp NetBackup Database +-# Pat Tovo <pat.tovo&veritas.com> December 2004 +-nomdb 13786/tcp Veritas-nomdb +-nomdb 13786/udp Veritas-nomdb +-# Clayton Haapala <clay.haapala&veritas.com> August 2005 +-# 13787-13817 Unassigned +-dsmcc-config 13818/tcp DSMCC Config +-dsmcc-config 13818/udp DSMCC Config +-dsmcc-session 13819/tcp DSMCC Session Messages +-dsmcc-session 13819/udp DSMCC Session Messages +-dsmcc-passthru 13820/tcp DSMCC Pass-Thru Messages +-dsmcc-passthru 13820/udp DSMCC Pass-Thru Messages +-dsmcc-download 13821/tcp DSMCC Download Protocol +-dsmcc-download 13821/udp DSMCC Download Protocol +-dsmcc-ccp 13822/tcp DSMCC Channel Change Protocol +-dsmcc-ccp 13822/udp DSMCC Channel Change Protocol +-# Tim Addington <Tim.Addington&sciatl.com> +-# ISO/IEC 13818-6 MPEG-2 DSM-CC +-# 13823-13999 Unassigned +-scotty-ft 14000/tcp SCOTTY High-Speed Filetransfer +-scotty-ft 14000/udp SCOTTY High-Speed Filetransfer +-# Patrick Verbeek <p.verbeek&scottygroup.com> May 2007 +-sua 14001/tcp SUA +-sua 14001/udp De-Registered (2001 June 06) +-sua 14001/sctp SUA +-# Miguel Angel Garcia <Miguel.A.Garcia&ericsson.com> +-# 14002-14032 Unassigned +-sage-best-com1 14033/tcp sage Best! Config Server 1 +-sage-best-com1 14033/udp sage Best! Config Server 1 +-sage-best-com2 14034/tcp sage Best! Config Server 2 +-sage-best-com2 14034/udp sage Best! Config Server 2 +-# Christian Rubach <Christian_Rubach&bestsoftware.com> +-# 14035-14140 Unassigned +-vcs-app 14141/tcp VCS Application +-vcs-app 14141/udp VCS Application +-# Ming Xu <ming&veritas.com> +-icpp 14142/tcp IceWall Cert Protocol +-icpp 14142/udp IceWall Cert Protocol +-# Tsutomu Fujinami <tsutomu.fujinami&hp.com> August 2005 +-# 14143-14144 Unassigned +-gcm-app 14145/tcp GCM Application +-gcm-app 14145/udp GCM Application +-# Ming Xu <ming&veritas.com> +-# 14146-14148 Unassigned +-vrts-tdd 14149/tcp Veritas Traffic Director +-vrts-tdd 14149/udp Veritas Traffic Director +-# Sameer Deokule <sameer.deokule&veritas.com> March 2002 +-# 14150-14153 Unassigned +-vad 14154/tcp Veritas Application Director +-vad 14154/udp Veritas Application Director +-# Rajeev Verma <rajeev_verma&symantec.com> February 2006 +-# 14155-14413 Unassigned +-ca-web-update 14414/tcp CA eTrust Web Update Service +-ca-web-update 14414/udp CA eTrust Web Update Service +-# Robert Ciochon <robert.ciochon&ca.com> August 2006 +-# 14415-14935 Unassigned +-hde-lcesrvr-1 14936/tcp hde-lcesrvr-1 +-hde-lcesrvr-1 14936/udp hde-lcesrvr-1 +-hde-lcesrvr-2 14937/tcp hde-lcesrvr-2 +-hde-lcesrvr-2 14937/udp hde-lcesrvr-2 +-# Horizon Digital Enterprise, Inc. <info&hde.co.jp> +-# 14938-14999 Unassigned +-hydap 15000/tcp Hypack Data Aquisition +-hydap 15000/udp Hypack Data Aquisition +-# Mircea Neacsu <mircea&videotron.ca> +-# 15001-15344 Unassigned +-xpilot 15345/tcp XPilot Contact Port +-xpilot 15345/udp XPilot Contact Port +-# Bert Gijsbers <bert&xpilot.org> +-# 15346-15362 Unassigned +-3link 15363/tcp 3Link Negotiation +-3link 15363/udp 3Link Negotiation +-# Brant Thomsen <brant_thomsen&3com.com> January 2003 +-# 15364-15554 Unassigned +-cisco-snat 15555/tcp Cisco Stateful NAT +-cisco-snat 15555/udp Cisco Stateful NAT +-# Kaushik Biswas <kbiswas&cisco.com> March 2006 +-# 15556-15739 Unassigned +-ptp 15740/tcp Picture Transfer Protocol +-ptp 15740/udp Picture Transfer Protocol +-# Petronel Bigioi <petronel&fotonation.com> November 2004 +-# 15741-16160 Unassigned +-sun-sea-port 16161/tcp Solaris SEA Port +-sun-sea-port 16161/udp Solaris SEA Port +-# Dana Porter <dana.porter&sun.com> October 2003 +-# 16162-16308 Unassigned +-etb4j 16309/tcp etb4j +-etb4j 16309/udp etb4j +-# Christopher R. Smith <csmith4&us.ibm.com> November 2004 +-pduncs 16310/tcp Policy Distribute, Update Notification +-pduncs 16310/udp Policy Distribute, Update Notification +-# Diane I. Shannon <shannond&us.ibm.com> August 2006 +-pdefmns 16311/tcp Policy definition and update management +-pdefmns 16311/udp Policy definition and update management +-# Diane I. Shannon <shannond&us.ibm.com> April 2007 +-# 16312-16359 Unassigned +-netserialext1 16360/tcp Network Serial Extension Ports One +-netserialext1 16360/udp Network Serial Extension Ports One +-netserialext2 16361/tcp Network Serial Extension Ports Two +-netserialext2 16361/udp Network Serial Extension Ports Two +-# Michael J Hoy <mhoy&canberra-abq.com> +-# 16362-16366 Unassigned +-netserialext3 16367/tcp Network Serial Extension Ports Three +-netserialext3 16367/udp Network Serial Extension Ports Three +-netserialext4 16368/tcp Network Serial Extension Ports Four +-netserialext4 16368/udp Network Serial Extension Ports Four +-# Michael J Hoy <mhoy&canberra-abq.com> +-# 16369-16383 Unassigned +-connected 16384/tcp Connected Corp +-connected 16384/udp Connected Corp +-# Nicole C. Ouellette <nouellette&connected.com> February 2004 +-# 16385-16949 Unassigned +-sgcip 16950/tcp Simple Generic Client Interface Protocol +-sgcip 16950/udp Simple Generic Client Interface Protocol +-# John Aquilino <john.aquilino&maryville.com> +-# 16951-16990 Unassigned +-intel-rci-mp 16991/tcp INTEL-RCI-MP +-intel-rci-mp 16991/udp INTEL-RCI-MP +-# Jane Dashevsky <jane.dashevsky&intel.com> +-amt-soap-http 16992/tcp Intel(R) AMT SOAP/HTTP +-amt-soap-http 16992/udp Intel(R) AMT SOAP/HTTP +-amt-soap-https 16993/tcp Intel(R) AMT SOAP/HTTPS +-amt-soap-https 16993/udp Intel(R) AMT SOAP/HTTPS +-# David T. Hines <david.hines&intel.com> February 2005 +-amt-redir-tcp 16994/tcp Intel(R) AMT Redirection/TCP +-amt-redir-tcp 16994/udp Intel(R) AMT Redirection/TCP +-amt-redir-tls 16995/tcp Intel(R) AMT Redirection/TLS +-amt-redir-tls 16995/udp Intel(R) AMT Redirection/TLS +-# Nimrod Diamant <nimrod.diamant&intel.com> February 2005 +-# 16996-17006 Unassigned +-isode-dua 17007/tcp +-isode-dua 17007/udp +-# 17008-17184 Unassigned +-soundsvirtual 17185/tcp Sounds Virtual +-soundsvirtual 17185/udp Sounds Virtual +-# Richard Snider <rsnider&sounds.com> +-# 17186-17218 Unassigned +-chipper 17219/tcp Chipper +-chipper 17219/udp Chipper +-# Ronald Jimmink <Ronald.Jimmink&chipper.nl> +-# 17220-17234 Unassigned +-ssh-mgmt 17235/tcp SSH Tectia Manager +-ssh-mgmt 17235/udp SSH Tectia Manager +-# Ville Laurikari <vlaurika&ssh.com> August 2005 +-# 17236-17728 Unassigned +-ea 17729/tcp Eclipse Aviation +-ea 17729/udp Eclipse Aviation +-# William Schmidt <info&eclipseaviation.com> March 2006 +-# 17730-17753 Unassigned +-zep 17754/tcp Encap. ZigBee Packets +-zep 17754/udp Encap. ZigBee Packets +-# Fred Fierling <fff&exegin.com> February 2006 +-zigbee-ip 17755/tcp ZigBee IP Transport Service +-zigbee-ip 17755/udp ZigBee IP Transport Service +-zigbee-ips 17756/tcp ZigBee IP Transport Secure Service +-zigbee-ips 17756/udp ZigBee IP Transport Secure Service +-# Chris Herzog <zog&stg.com> May 2006 +-# 17757-17999 Unassigned +-biimenu 18000/tcp Beckman Instruments, Inc. +-biimenu 18000/udp Beckman Instruments, Inc. +-# R. L. Meyering <RLMEYERING&BIIVAX.DP.BECKMAN.COM> +-# 18001-18180 Unassigned +-opsec-cvp 18181/tcp OPSEC CVP +-opsec-cvp 18181/udp OPSEC CVP +-opsec-ufp 18182/tcp OPSEC UFP +-opsec-ufp 18182/udp OPSEC UFP +-# Alon Kantor <alonk&checkpoint.com> +-opsec-sam 18183/tcp OPSEC SAM +-opsec-sam 18183/udp OPSEC SAM +-opsec-lea 18184/tcp OPSEC LEA +-opsec-lea 18184/udp OPSEC LEA +-opsec-omi 18185/tcp OPSEC OMI +-opsec-omi 18185/udp OPSEC OMI +-# Alon Kantor <alonk&checkpoint.com> +-ohsc 18186/tcp Occupational Health SC +-ohsc 18186/udp Occupational Health Sc +-# David Fudge <david.fudge&tssi.co.uk> August 2003 +-opsec-ela 18187/tcp OPSEC ELA +-opsec-ela 18187/udp OPSEC ELA +-# Alon Kantor <alonk&checkpoint.com> +-# 18188-18240 Unassigned +-checkpoint-rtm 18241/tcp Check Point RTM +-checkpoint-rtm 18241/udp Check Point RTM +-# Dudi Hazan <dudi&checkpoint.com> +-# 18242-18261 Unassigned +-gv-pf 18262/tcp GV NetConfig Service +-gv-pf 18262/udp GV NetConfig Service +-# Scott Libert <scott.libert&thomson.net> 29 January 2008 +-# 18263-18462 Unassigned +-ac-cluster 18463/tcp AC Cluster +-ac-cluster 18463/udp AC Cluster +-# Lisa Zhong <lzhong&cup.hp.com> +-# 18464-18768 Unassigned +-ique 18769/tcp IQue Protocol +-ique 18769/udp IQue Protocol +-# Avi Drissman <ique-protocol&harrisbaseview.com> July 2002 +-# 18770-18880 Unassigned +-infotos 18881/tcp Infotos +-infotos 18881/udp Infotos +-# Marcel Dube <marceldube&videotron.ca> November 2004 +-# 18882-18887 Unassigned +-apc-necmp 18888/tcp APCNECMP +-apc-necmp 18888/udp APCNECMP +-# Michael Yip <Michael.Yip&alcatel.com> +-# 18889-18999 Unassigned +-igrid 19000/tcp iGrid Server +-igrid 19000/udp iGrid Server +-# Massimo Cafaro <massimo.cafaro&unile.it> November 2004 +-# 19001-19190 Unassigned +-opsec-uaa 19191/tcp OPSEC UAA +-opsec-uaa 19191/udp OPSEC UAA +-# Reuven Harrison <rnd_ana&checkpoint.com> +-# 19192-19193 Unassigned +-ua-secureagent 19194/tcp UserAuthority SecureAgent +-ua-secureagent 19194/udp UserAuthority SecureAgent +-# Reuven Harrison <rharrison&checkpoint.com> January 2003 +-# 19195-19282 Unassigned +-keysrvr 19283/tcp Key Server for SASSAFRAS +-keysrvr 19283/udp Key Server for SASSAFRAS +-# Mark Valence <kurash&sassafras.com> +-# 19284-19314 Unassigned +-keyshadow 19315/tcp Key Shadow for SASSAFRAS +-keyshadow 19315/udp Key Shadow for SASSAFRAS +-# Mark Valence <kurash&sassafras.com> +-# 19316-19397 Unassigned +-mtrgtrans 19398/tcp mtrgtrans +-mtrgtrans 19398/udp mtrgtrans +-# Katsuhito Muroi <muroi&pfu.co.jp> +-# 19399-19409 Unassigned +-hp-sco 19410/tcp hp-sco +-hp-sco 19410/udp hp-sco +-hp-sca 19411/tcp hp-sca +-hp-sca 19411/udp hp-sca +-# Larry Schwartz <lrs&cup.hp.com> +-hp-sessmon 19412/tcp HP-SESSMON +-hp-sessmon 19412/udp HP-SESSMON +-# Gita Murthy <gita&cup.hp.com> +-# 19413-19538 Unassigned +-fxuptp 19539/tcp FXUPTP +-fxuptp 19539/udp FXUPTP +-# Keiji Okuma <okuma&silex.jp> August 2005 +-sxuptp 19540/tcp SXUPTP +-sxuptp 19540/udp SXUPTP +-# Keiji Okuma <okuma&silex.jp> August 2002 +-jcp 19541/tcp JCP Client +-jcp 19541/udp JCP Client +-# Yuji Sasaki <sasaki&silex.jp> +-# 19542-19999 Unassigned +-dnp 20000/tcp DNP +-dnp 20000/udp DNP +-# Michael Thesing <michael.thesing&acsatlanta.com> +-microsan 20001/tcp MicroSAN +-microsan 20001/udp MicroSAN +-# Thomas E. Ludwig <tom.ludwig&zetera.com> February 2004 +-commtact-http 20002/tcp Commtact HTTP +-commtact-http 20002/udp Commtact HTTP +-commtact-https 20003/tcp Commtact HTTPS +-commtact-https 20003/udp Commtact HTTPS +-# Tomas Svoboda <svoboda&infima.cz> December 2004 +-# 20004-20013 Unassigned +-opendeploy 20014/tcp OpenDeploy Listener +-opendeploy 20014/udp OpenDeploy Listener +-# Todd Scallan <tscallan&interwoven.com> August 2005 +-# 20015-20033 Unassigned +-nburn_id 20034/tcp NetBurner ID Port +-nburn_id 20034/udp NetBurner ID Port +-# Paul Breed <paul&netburner.com> November 2003 +-# 20035-20166 Unassigned +-tolfab 20167/tcp TOLfab Data Change +-tolfab 20167/udp TOLfab Data Change +-# Pierre Couderc <pcouderc&tol.fr> March 2006 +-# 20168-20201 Unassigned +-ipdtp-port 20202/tcp IPD Tunneling Port +-ipdtp-port 20202/udp IPD Tunneling Port +-# Vikki Yin Wei <vikki&ipdynamics.com> January 2003 +-# 20203-20221 Unassigned +-ipulse-ics 20222/tcp iPulse-ICS +-ipulse-ics 20222/udp iPulse-ICS +-# Meggie Garica-Woodruff <ipulse&ericsson.com> +-# 20223-20479 Unassigned +-emwavemsg 20480/tcp emWave Message Service +-emwavemsg 20480/udp emWave Message Service +-# Harald Striepe <harald&quantumintech.com> 14 February 2008 +-# 20481-20669 Unassigned +-track 20670/tcp Track +-track 20670/udp Track +-# Michael Sweet <msweet&ctr.nawcad.navy.mil> +-# 20671-20998 Unassigned +-athand-mmp 20999/tcp At Hand MMP +-athand-mmp 20999/udp AT Hand MMP +-# Stepan Riha <stepan.riha&hand.com> +-irtrans 21000/tcp IRTrans Control +-irtrans 21000/udp IRTrans Control +-# Marcus Mueller <marcus&irtrans.de> November 2004 +-# 21001-21553 Unassigned +-dfserver 21554/tcp MineScape Design File Server +-dfserver 21554/udp MineScape Design File Server +-# Michael Purser <mrp&mincom.com> June 2006 +-# 21555-21589 Unassigned +-vofr-gateway 21590/tcp VoFR Gateway +-vofr-gateway 21590/udp VoFR Gateway +-# Marty Borden <mborden&tollbridgetech.com> +-# 21591-21799 Unassigned +-tvpm 21800/tcp TVNC Pro Multiplexing +-tvpm 21800/udp TVNC Pro Multiplexing +-# Brian Blevins <brian.blevins&tridia.com> +-# 21801-21844 Unassigned +-webphone 21845/tcp webphone +-webphone 21845/udp webphone +-netspeak-is 21846/tcp NetSpeak Corp. Directory Services +-netspeak-is 21846/udp NetSpeak Corp. Directory Services +-netspeak-cs 21847/tcp NetSpeak Corp. Connection Services +-netspeak-cs 21847/udp NetSpeak Corp. Connection Services +-netspeak-acd 21848/tcp NetSpeak Corp. Automatic Call Distribution +-netspeak-acd 21848/udp NetSpeak Corp. Automatic Call Distribution +-netspeak-cps 21849/tcp NetSpeak Corp. Credit Processing System +-netspeak-cps 21849/udp NetSpeak Corp. Credit Processing System +-# Toby Hosterman <root&netspeak.com> +-# 21850-21999 Unassigned +-snapenetio 22000/tcp SNAPenetIO +-snapenetio 22000/udp SNAPenetIO +-optocontrol 22001/tcp OptoControl +-optocontrol 22001/udp OptoControl +-# Kevin Kuhns <kkuhns&opto22.com> +-optohost002 22002/tcp Opto Host Port 2 +-optohost002 22002/udp Opto Host Port 2 +-optohost003 22003/tcp Opto Host Port 3 +-optohost003 22003/udp Opto Host Port 3 +-optohost004 22004/tcp Opto Host Port 4 +-optohost004 22004/udp Opto Host Port 4 +-optohost004 22005/tcp Opto Host Port 5 +-optohost004 22005/udp Opto Host Port 5 +-# Doug Leany <DLEANY&Opto22.com> September 2006 +-# 22006-22272 Unassigned +-wnn6 22273/tcp wnn6 +-wnn6 22273/udp wnn6 +-# Yasunari Gon Yamasita <yamasita&omronsoft.co.jp> +-# 22274-22304 Unassigned +-cis 22305/tcp CompactIS Tunnel +-cis 22305/udp CompactIS Tunnel +-# Justin Paupore <jpaupore&blueshiftlabs.net> 16 August 2007 +-# 22306-22342 Unassigned +-cis-secure 22343/tcp CompactIS Secure Tunnel +-cis-secure 22343/udp CompactIS Secure Tunnel +-# Justin Paupore <jpaupore&blueshiftlabs.net> 16 August 2007 +-# 22344-22346 Unassigned +-WibuKey 22347/tcp WibuKey Standard WkLan +-WibuKey 22347/udp WibuKey Standard WkLan +-# Wolfgang Voelker <wolfgang.voelker&wibu.com> June 2007 +-# 22348-22349 Unassigned +-CodeMeter 22350/tcp CodeMeter Standard +-CodeMeter 22350/udp CodeMeter Standard +-# Wolfgang Voelker <wolfgang.voelker&wibu.com> June 2007 +-# 22351-22554 Unassigned +-vocaltec-wconf 22555/tcp Vocaltec Web Conference +-vocaltec-phone 22555/udp Vocaltec Internet Phone +-# Scott Petrack <Scott_Petrack&vocaltec.com> +-# 22556-22762 Unassigned +-talikaserver 22763/tcp Talika Main Server +-talikaserver 22763/udp Talika Main Server +-# Laxman C. Marathe <lcmarathe&thomsonpress.com> December 2006 +-# 22764-22799 Unassigned +-aws-brf 22800/tcp Telerate Information Platform LAN +-aws-brf 22800/udp Telerate Information Platform LAN +-# Timo Sivonen <timo.sivonen&ccmail.dowjones.com> +-# 22801-22950 Unassigned +-brf-gw 22951/tcp Telerate Information Platform WAN +-brf-gw 22951/udp Telerate Information Platform WAN +-# Timo Sivonen <timo.sivonen&ccmail.dowjones.com> +-# 22952-22999 Unassigned +-inovaport1 23000/tcp Inova LightLink Server Type 1 +-inovaport1 23000/udp Inova LightLink Server Type 1 +-inovaport2 23001/tcp Inova LightLink Server Type 2 +-inovaport2 23001/udp Inova LightLink Server Type 2 +-inovaport3 23002/tcp Inova LightLink Server Type 3 +-inovaport3 23002/udp Inova LightLink Server Type 3 +-inovaport4 23003/tcp Inova LightLink Server Type 4 +-inovaport4 23003/udp Inova LightLink Server Type 4 +-inovaport5 23004/tcp Inova LightLink Server Type 5 +-inovaport5 23004/udp Inova LightLink Server Type 5 +-inovaport6 23005/tcp Inova LightLink Server Type 6 +-inovaport6 23005/udp Inova LightLink Server Type 6 +-# Chris Koeritz <portmanager&inovasolutions.com> October 2006 +-# 23006-23332 Unassigned +-elxmgmt 23333/tcp Emulex HBAnyware Remote Management +-elxmgmt 23333/udp Emulex HBAnyware Remote Management +-# Maziar Tamadon <maziar.tamadon&emulex.com> 06 November 2007 +-# 23334-23399 Unassigned +-novar-dbase 23400/tcp Novar Data +-novar-dbase 23400/udp Novar Data +-novar-alarm 23401/tcp Novar Alarm +-novar-alarm 23401/udp Novar Alarm +-novar-global 23402/tcp Novar Global +-novar-global 23402/udp Novar Global +-# Keith Kilroy <Keith.Kilroy&novarcontrols.com> February 2006 +-# 23403-23999 Unassigned +-med-ltp 24000/tcp med-ltp +-med-ltp 24000/udp med-ltp +-med-fsp-rx 24001/tcp med-fsp-rx +-med-fsp-rx 24001/udp med-fsp-rx +-med-fsp-tx 24002/tcp med-fsp-tx +-med-fsp-tx 24002/udp med-fsp-tx +-med-supp 24003/tcp med-supp +-med-supp 24003/udp med-supp +-med-ovw 24004/tcp med-ovw +-med-ovw 24004/udp med-ovw +-med-ci 24005/tcp med-ci +-med-ci 24005/udp med-ci +-med-net-svc 24006/tcp med-net-svc +-med-net-svc 24006/udp med-net-svc +-# Juergen Fischbach <juergen.fischbach&philips.com> +-# 24007-24241 Unassigned +-filesphere 24242/tcp fileSphere +-filesphere 24242/udp fileSphere +-# Carl Cedergren <asperon&home.se> +-# 24243-24248 Unassigned +-vista-4gl 24249/tcp Vista 4GL +-vista-4gl 24249/udp Vista 4GL +-# Mark Itzcovitz <mji&vistacomp.com> +-# 24250-24320 Unassigned +-ild 24321/tcp Isolv Local Directory +-ild 24321/udp Isolv Local Directory +-# Mitchell Bass <mitch&integrasolv.com> August 2005 +-# 24322-24385 Unassigned +-intel_rci 24386/tcp Intel RCI +-intel_rci 24386/udp Intel RCI +-# Mark Lewis <mark.h.lewis&intel.com> +-# 24387-24553 Unassigned +-binkp 24554/tcp BINKP +-binkp 24554/udp BINKP +-# Max Masyutin <max&ritlabs.com> +-# 24555-24676 Unassigned +-flashfiler 24677/tcp FlashFiler +-flashfiler 24677/udp FlashFiler +-# Ben Oram <beno&turbopower.com> +-proactivate 24678/tcp Turbopower Proactivate +-proactivate 24678/udp Turbopower Proactivate +-# Ben Oram <beno&turbopower.com> +-# 24679 Unassigned +-tcc-http 24680/tcp TCC User HTTP Service +-tcc-http 24680/udp TCC User HTTP Service +-# Brian Kennedy <BrianK&TargetedConvergence.com> August 2006 +-# 24681-24921 Unassigned +-find 24922/tcp Find Identification of Network Devices +-find 24922/udp Find Identification of Network Devices +-# Jean-Paul Moreaux +-# <jean-paul.moreaux&airbus.com> +-# 24923-24999 Unassigned +-icl-twobase1 25000/tcp icl-twobase1 +-icl-twobase1 25000/udp icl-twobase1 +-icl-twobase2 25001/tcp icl-twobase2 +-icl-twobase2 25001/udp icl-twobase2 +-icl-twobase3 25002/tcp icl-twobase3 +-icl-twobase3 25002/udp icl-twobase3 +-icl-twobase4 25003/tcp icl-twobase4 +-icl-twobase4 25003/udp icl-twobase4 +-icl-twobase5 25004/tcp icl-twobase5 +-icl-twobase5 25004/udp icl-twobase5 +-icl-twobase6 25005/tcp icl-twobase6 +-icl-twobase6 25005/udp icl-twobase6 +-icl-twobase7 25006/tcp icl-twobase7 +-icl-twobase7 25006/udp icl-twobase7 +-icl-twobase8 25007/tcp icl-twobase8 +-icl-twobase8 25007/udp icl-twobase8 +-icl-twobase9 25008/tcp icl-twobase9 +-icl-twobase9 25008/udp icl-twobase9 +-icl-twobase10 25009/tcp icl-twobase10 +-icl-twobase10 25009/udp icl-twobase10 +-# J. A. (Tony) Sever <J.A.Sever&bra0119.wins.icl.co.uk> +-# 25010-25792 Unassigned +-vocaltec-hos 25793/tcp Vocaltec Address Server +-vocaltec-hos 25793/udp Vocaltec Address Server +-# Scott Petrack <Scott_Petrack&vocaltec.com> +-# 25794-25899 Unassigned +-tasp-net 25900/tcp TASP Network Comm +-tasp-net 25900/udp TASP Network Comm +-# Martin Ellis <martin&clanleagues.net> November 2004 +-niobserver 25901/tcp NIObserver +-niobserver 25901/udp NIObserver +-# Roman Oliynyk <romano&netinst.com> +-nilinkanalyst 25902/tcp NILinkAnalyst +-nilinkanalyst 25902/tcp NILinkAnalyst +-# Roman Oliynyk <roman&netinst.com> 30 August 2007 +-niprobe 25903/tcp NIProbe +-niprobe 25903/udp NIProbe +-# Roman Oliynyk <romano&netinst.com> +-# 25904-25999 Unassigned +-quake 26000/tcp quake +-quake 26000/udp quake +-# Yasunari Gon Yamasita <yamasita&omronsoft.co.jp> +-# 26001-26132 Unassigned +-scscp 26133/tcp Symbolic Computation Software Composability Protocol +-scscp 26133/udp Symbolic Computation Software Composability Protocol +-# Alexander Konovalov <konovalov&member.ams.org> 27 November 2007 +-# 26134-26207 Unassigned +-wnn6-ds 26208/tcp wnn6-ds +-wnn6-ds 26208/udp wnn6-ds +-# Yasunari Gon Yamasita <yamasita&omronsoft.co.jp> +-# 26209-26259 Unassigned +-ezproxy 26260/tcp eZproxy +-ezproxy 26260/udp eZproxy +-ezmeeting 26261/tcp eZmeeting +-ezmeeting 26261/udp eZmeeting +-# Albert C. Yang <albert.yang&eZmeeting.com> +-k3software-svr 26262/tcp K3 Software-Server +-k3software-svr 26262/udp K3 Software-Server +-k3software-cli 26263/tcp K3 Software-Client +-k3software-cli 26263/udp K3 Software-Client +-# Jim Baldridge <jimb&rpower.com> +-# 26264 De-registered (6 April 2006) +-# 26265-26485 Unassigned +-exoline-tcp 26486/tcp EXOline-TCP +-exoline-udp 26486/udp EXOline-UDP +-# Lars Mattsson <lars.mattsson®inexomatic.com> May 2006 +-exoconfig 26487/tcp EXOconfig +-exoconfig 26487/udp EXOconfig +-# Urban Fosseus <urban.fosseus®inexomatic.com> May 2006 +-# 26488 Unassigned +-exonet 26489/tcp EXOnet +-exonet 26489/udp EXOnet +-# Urban Fosseus <urban.fosseus®inexomatic.com> May 2006 +-# 26490-26999 Unassigned +-flex-lm 27000-27009 FLEX LM (1-10) +-# Daniel Birns <daniel&globes.com> +-# 27010-27344 Unassigned +-imagepump 27345/tcp ImagePump +-imagepump 27345/udp ImagePump +-# Richard Minner <xippix.com> +-# 27346-27441 Unassigned +-jesmsjc 27442/tcp Job controller service +-jesmsjc 27442/udp Job controller service +-# Peter Coates <peter.coates&sun.com> April 2006 +-# 27443-27503 Unassigned +-kopek-httphead 27504/tcp Kopek HTTP Head Port +-kopek-httphead 27504/udp Kopek HTTP Head Port +-# Sten H. Danielsen <shd&kopek.net> July 2002 +-# 27505-27781 Unassigned +-ars-vista 27782/tcp ARS VISTA Application +-ars-vista 27782/udp ARS VISTA Application +-# Spencer Teran <steran&ars.com> November 2004 +-# 27783-27998 Unassigned +-tw-auth-key 27999/tcp TW Authentication/Key Distribution and +-tw-auth-key 27999/udp Attribute Certificate Services +-# Alex Duncan <Alex.Duncan&sse.ie> +-nxlmd 28000/tcp NX License Manager +-nxlmd 28000/udp NX License Manager +-# Anthony Greatorex <greatore&ugs.com> November 2004 +-# 28001-28239 Unassigned +-siemensgsm 28240/tcp Siemens GSM +-siemensgsm 28240/udp Siemens GSM +-# David Anuszewski <david.anuszewski&siemens.com> November 2004 +-# 28241-29166 Unassigned +-otmp 29167/tcp ObTools Message Protocol +-otmp 29167/udp ObTools Message Protocol +-# Paul Clark <paul&xmill.com> February 2006 +-# 29168-30000 Unassigned +-pago-services1 30001/tcp Pago Services 1 +-pago-services1 30001/udp Pago Services 1 +-pago-services2 30002/tcp Pago Services 2 +-pago-services2 30002/udp Pago Services 2 +-# Balduin Mueller-Platz +-# <balduin.mueller-platz&pago.de> March 2002 +-# 30003-30998 Unassigned +-ovobs 30999/tcp OpenView Service Desk Client +-ovobs 30999/udp OpenView Service Desk Client +-# Service Desk Product Manager <info&hp.com> May 2006 +-# 31000-31415 Unassigned +-xqosd 31416/tcp XQoS network monitor +-xqosd 31416/udp XQoS network monitor +-# Joe Elliott <joe&inetd.com> June 2002 +-# 31417-31456 Unassigned +-tetrinet 31457/tcp TetriNET Protocol +-tetrinet 31457/udp TetriNET Protocol +-# Emmanuel Bourg <smanux&lfjr.net> November 2004 +-# 31458-31619 Unassigned +-lm-mon 31620/tcp lm mon +-lm-mon 31620/udp lm mon +-# System Administrator <sysadmin&silvaco.com> June 2003 +-# 31621-31764 Unassigned +-gamesmith-port 31765/tcp GameSmith Port +-gamesmith-port 31765/udp GameSmith Port +-# Randy Thompson <thompr&earthlink.net> August 2002 +-# 31766-31947 Unassigned +-iceedcp_tx 31948/tcp Embedded Device Configuration Protocol TX +-iceedcp_tx 31948/udp Embedded Device Configuration Protocol TX +-iceedcp_rx 31949/tcp Embedded Device Configuration Protocol RX +-iceedcp_rx 31949/udp Embedded Device Configuration Protocol RX +-# Oliver Lewis <o.lewis&icerobotics.co.uk> August 2006 +-# 31950-32248 Unassigned +-iracinghelper 32034/tcp iRacing helper service +-iracinghelper 32034/udp iRacing helper service +-# Randy Cassidy <randy.cassidy&iracing.com> 30 August 2007 +-# 31950-32248 Unassigned +-t1distproc60 32249/tcp T1 Distributed Processor +-t1distproc60 32249/udp T1 Distributed Processor +-# Peter Beahan <peter_beahan&technologyonecorp.com> November 2004 +-# 32250-32482 Unassigned +-apm-link 32483/tcp Access Point Manager Link +-apm-link 32483/udp Access Point Manager Link +-# Tony Diodato <tdiodato&cyprx.com> August 2005 +-# 32484-32634 Unassigned +-sec-ntb-clnt 32635/tcp SecureNotebook-CLNT +-sec-ntb-clnt 32635/udp SecureNotebook-CLNT +-# Eric Cantineau <eric&securenotebook.com> November 2004 +-DMExpress 32636/tcp DMExpress +-DMExpress 32636/udp DMExpress +-# Arnie Farrelly <afarrelly&syncsort.com> +-# <gspaulding&syncsort.com> 18 July 2007 +-# 32637-32766 Unassigned +-filenet-powsrm 32767/tcp FileNet BPM WS-ReliableMessaging Client +-filenet-powsrm 32767/udp FileNet BPM WS-ReliableMessaging Client +-# Chris Adkins <cadkins&filenet.com> August 2006 +-filenet-tms 32768/tcp Filenet TMS +-filenet-tms 32768/udp Filenet TMS +-filenet-rpc 32769/tcp Filenet RPC +-filenet-rpc 32769/udp Filenet RPC +-filenet-nch 32770/tcp Filenet NCH +-filenet-nch 32770/udp Filenet NCH +-# Daniel Whelan <dwhelan&filenet.com> +-filenet-rmi 32771/tcp FileNET RMI +-filenet-rmi 32771/udp FileNet RMI +-# Chris Adkins <cadkins&filenet.com> +-filenet-pa 32772/tcp FileNET Process Analyzer +-filenet-pa 32772/udp FileNET Process Analyzer +-# Chris Adkins <cadkins&filenet.com> January 2003 +-filenet-cm 32773/tcp FileNET Component Manager +-filenet-cm 32773/udp FileNET Component Manager +-# Chris Adkins <cadkins&filenet.com> August 2003 +-filenet-re 32774/tcp FileNET Rules Engine +-filenet-re 32774/udp FileNET Rules Engine +-# Chris Adkins <cadkins&filenet.com> August 2003 +-filenet-pch 32775/tcp Performance Clearinghouse +-filenet-pch 32775/udp Performance Clearinghouse +-# Tim Morgan <tmorgan&filenet.com> November 2005 +-filenet-peior 32776/tcp FileNET BPM IOR +-filenet-peior 32776/udp FileNET BPM IOR +-# Chris Adkins <cadkins&filenet.com> May 2006 +-filenet-obrok 32777/tcp FileNet BPM CORBA +-filenet-obrok 32777/udp FileNet BPM CORBA +-# Chris Adkins <cadkins&filenet.com> October 2006 +-# 32778-32895 Unassigned +-idmgratm 32896/tcp Attachmate ID Manager +-idmgratm 32896/udp Attachmate ID Manager +-# George Gianelos <GeorgeGi&Attachmate.com> March 2003 +-# 32897-33122 Unassigned +-aurora-balaena 33123/tcp Aurora (Balaena Ltd) +-aurora-balaena 33123/udp Aurora (Balaena Ltd) +-# Andrew Mather <info&balaena.com> 14 February 2008 +-# 33124-33330 Unassigned +-diamondport 33331/tcp DiamondCentral Interface +-diamondport 33331/udp DiamondCentral Interface +-# Edward Browdy <ebrowdy&cryptek.com> July 2002 +-# 33332-33433 Unassigned +-traceroute 33434/tcp traceroute use +-traceroute 33434/udp traceroute use +-# IANA <iana&iana.org> +-# 33435-33655 Unassigned +-snip-slave 33656/tcp SNIP Slave +-snip-slave 33656/udp SNIP Slave +-# Dr. Chris Tucker <chris.tucker&ioltd.co.uk> August 2005 +-# 33657-34248 Unassigned +-turbonote-2 34249/tcp TurboNote Relay Server Default Port +-turbonote-2 34249/udp TurboNote Relay Server Default Port +-# Peter Hyde <peter&spis.co.nz> +-# 34250-34377 Unassigned +-p-net-local 34378/tcp P-Net on IP local +-p-net-local 34378/udp P-Net on IP local +-# Kurt Nissen <kn&proces-data.com> February 2004 +-p-net-remote 34379/tcp P-Net on IP remote +-p-net-remote 34379/udp P-Net on IP remote +-# Kurt Nissen <kn&proces-data.com> February 2004 +-# 34380-34961 Unassigned +-profinet-rt 34962/tcp PROFInet RT Unicast +-profinet-rt 34962/udp PROFInet RT Unicast +-profinet-rtm 34963/tcp PROFInet RT Multicast +-profinet-rtm 34963/udp PROFInet RT Multicast +-profinet-cm 34964/tcp PROFInet Context Manager +-profinet-cm 34964/udp PROFInet Context Manager +-# Peter Wenzel <Peter.Wenzel&profibus.com> November 2004 +-# 34965-34979 Unassigned +-ethercat 34980/tcp EtherCAT Port +-ethercat 34980/udp EhterCAT Port +-# Martin Rostan <m.rostan&beckhoff.com> November 2003 +-# 34981-36000 Unassigned +-allpeers 36001/tcp AllPeers Network +-allpeers 36001/udp AllPeers Network +-# Cedric Maloux <cedric&allpeers.com> April 2007 +-# 36002-36864 Unassigned +-kastenxpipe 36865/tcp KastenX Pipe +-kastenxpipe 36865/udp KastenX Pipe +-# Guy Cheng <GCHE&kastenchase.com> +-# 36866-37474 Unassigned +-neckar 37475/tcp science + computing's Venus Administration Port +-neckar 37475/udp science + computing's Venus Administration Port +-# Ralf Allrutz <R.Allrutz&science-computing.de> February 2002 +-# 37476-37653 Unassigned +-unisys-eportal 37654/tcp Unisys ClearPath ePortal +-unisys-eportal 37654/udp Unisys ClearPath ePortal +-# Sung U. Ro <ePortalSupport&unisys.com> January 2006 +-# 37655-38200 Unassigned +-galaxy7-data 38201/tcp Galaxy7 Data Tunnel +-galaxy7-data 38201/udp Galaxy7 Data Tunnel +-# Tatham Oddie <tatham&e-oddie.com> September 2002 +-fairview 38202/tcp Fairview Message Service +-fairview 38202/udp Fairview Message Service +-# Jim Lyle <jim.lyle&siliconimage.com> November 2005 +-agpolicy 38203/tcp AppGate Policy Server +-agpolicy 38203/udp AppGate Policy Server +-# Martin Forssen <maf&appgate.com> November 2004 +-# 38204-39680 Unassigned +-turbonote-1 39681/tcp TurboNote Default Port +-turbonote-1 39681/udp TurboNote Default Port +-# Peter Hyde <peter&spis.co.nz> +-# 39682-39999 Unassigned +-safetynetp 40000/tcp SafetyNET p +-safetynetp 40000/udp SafetyNET p +-# Roland Rupp <r.rupp&pilz.de> November 2006 +-# 40001-40840 Unassigned +-cscp 40841/tcp CSCP +-cscp 40841/udp CSCP +-# Michael Dodge <sarge¢erspan.com> +-csccredir 40842/tcp CSCCREDIR +-csccredir 40842/udp CSCCREDIR +-csccfirewall 40843/tcp CSCCFIREWALL +-csccfirewall 40843/udp CSCCFIREWALL +-# Sudhir Menon <sudhir¢erspan.com> +-# 40844-41110 Unassigned +-fs-qos 41111/tcp Foursticks QoS Protocol +-fs-qos 41111/udp Foursticks QoS Protocol +-# Chee Kent Lam <cklam&foursticks.com> April 2002 +-# 41112-41793 Unassigned +-crestron-cip 41794/tcp Crestron Control Port +-crestron-cip 41794/udp Crestron Control Port +-crestron-ctp 41795/tcp Crestron Terminal Port +-crestron-ctp 41795/udp Crestron Terminal Port +-# Ed Ranney <eranney&crestron.com> January 2003 +-# 41796-42507 Unassigned +-candp 42508/tcp Computer Associates network discovery protocol +-candp 42508/udp Computer Associates network discovery protocol +-# Jon Press <IANA.Registions&ca.com> September 2005 +-candrp 42509/tcp CA discovery response +-candrp 42509/udp CA discovery response +-caerpc 42510/tcp CA eTrust RPC +-caerpc 42510/udp CA eTrust RPC +-# Jon Press <IANA.Registions&ca.com> August 2005 +-# 42511-43187 Unassigned +-reachout 43188/tcp REACHOUT +-reachout 43188/udp REACHOUT +-ndm-agent-port 43189/tcp NDM-AGENT-PORT +-ndm-agent-port 43189/udp NDM-AGENT-PORT +-ip-provision 43190/tcp IP-PROVISION +-ip-provision 43190/udp IP-PROVISION +-# Roman Kriis <roman&previo.ee> +-# 43191-43440 Unassigned +-ciscocsdb 43441/tcp Cisco NetMgmt DB Ports +-ciscocsdb 43441/udp Cisco NetMgmt DB Ports +-# Cisco Systems <nmtg-port-numbers&cisco.com> November 2005 +-# 43442-44320 Unassigned +-pmcd 44321/tcp PCP server (pmcd) +-pmcd 44321/udp PCP server (pmcd) +-# Ken McDonell <kenmcd&sgi.com> June 2002 +-pmcdproxy 44322/tcp PCP server (pmcd) proxy +-pmcdproxy 44322/udp PCP server (pmcd) proxy +-# Ken McDonnell <kenmcd&sgi.com> July 2003 +-# 44323-44552 Unassigned +-rbr-debug 44553/tcp REALbasic Remote Debug +-rbr-debug 44553/udp REALbasic Remote Debug +-# Aaron Ballman <aaron&realsoftware.com> November 2004 +-# 44554-44817 Unassigned +-EtherNet/IP-2 44818/tcp EtherNet/IP messaging +-EtherNet/IP-2 44818/udp EtherNet/IP messaging +-# Brian Batke <eip.jsig&gmail.com> +-# New contact added for port 44818 on 2008-02-01 +-# 44819-45053 Unassigned +-invision-ag 45054/tcp InVision AG +-invision-ag 45054/udp InVision AG +-# Matthias Schroer <matthias.schroer&invision.de> +-# 45055-45677 Unassigned +-eba 45678/tcp EBA PRISE +-eba 45678/udp EBA PRISE +-# Patrick Kara <Patrick&EBA.NET> +-# 45679-45824 Unassigned +-qdb2service 45825/tcp Qpuncture Data Access Service +-qdb2service 45825/tcp Qpuncture Data Access Service +-# Michael Yun <cinnanda&gmail.com> 24 October 2007 +-# 45826-45965 Unassigned +-ssr-servermgr 45966/tcp SSRServerMgr +-ssr-servermgr 45966/udp SSRServerMgr +-# Jeremy Gilliat <jeremy.gilliat&geac.com> +-# 45967-46998 Unassigned +-mediabox 46999/tcp MediaBox Server +-mediabox 46999/udp MediaBox Server +-# Alexander Graef <alex&graef.cc> November 2004 +-mbus 47000/tcp Message Bus +-mbus 47000/udp Message Bus +-# Dirk Kutscher <dku&informatik.uni-bremen.de> +-# 47001-47556 Unassigned +-dbbrowse 47557/tcp Databeam Corporation +-dbbrowse 47557/udp Databeam Corporation +-# Cindy Martin <cmartin&databeam.com> +-# 47558-47623 Unassigned +-directplaysrvr 47624/tcp Direct Play Server +-directplaysrvr 47624/udp Direct Play Server +-# Ajay Jindal <ajayjµsoft.com> +-# 47625-47805 Unassigned +-ap 47806/tcp ALC Protocol +-ap 47806/udp ALC Protocol +-# Dave Robin <iana_ports&daverobin.com> +-# 47807 Unassigned +-bacnet 47808/tcp Building Automation and Control Networks +-bacnet 47808/udp Building Automation and Control Networks +-# H. Michael Newman <hmn2&cornell.edu> +-# 47809-47999 Unassigned +-nimcontroller 48000/tcp Nimbus Controller +-nimcontroller 48000/udp Nimbus Controller +-nimspooler 48001/tcp Nimbus Spooler +-nimspooler 48001/udp Nimbus Spooler +-nimhub 48002/tcp Nimbus Hub +-nimhub 48002/udp Nimbus Hub +-nimgtw 48003/tcp Nimbus Gateway +-nimgtw 48003/udp Nimbus Gateway +-# Carstein Seeberg <case&nimsoft.no> +-# 48004-48127 Unassigned +-isnetserv 48128/tcp Image Systems Network Services +-isnetserv 48128/udp Image Systems Network Services +-# Bengt Gustafsson <bengt.gustafsson&imagesystems.se> May 2006 +-blp5 48129/tcp Bloomberg locator +-blp5 48129/udp Bloomberg locator +-# Albert Hou <ahou1&bloomberg.com> May 2006 +-# 48130-48555 Unassigned +-com-bardac-dw 48556/tcp com-bardac-dw +-com-bardac-dw 48556/udp com-bardac-dw +-# Nicholas J Howes <nick&ghostwood.org> +-# 48557-48618 Unassigned +-iqobject 48619/tcp iqobject +-iqobject 48619/udp iqobject +-# Bjorn de Bonnenfant <bdeb&iqobject.com> November 2003 +-# 48620-49150 Unassigned +-# 49151 IANA Reserved +- +-DYNAMIC AND/OR PRIVATE PORTS +- +-The Dynamic and/or Private Ports are those from 49152 through 65535 +- +- +-REFERENCES +----------- +- +-[RFC768] Postel, J., "User Datagram Protocol", STD 6, RFC 768, +- USC/Information Sciences Institute, August 1980. +- +-[RFC793] Postel, J., ed., "Transmission Control Protocol - DARPA +- Internet Program Protocol Specification", STD 7, RFC 793, +- USC/Information Sciences Institute, September 1981. +- +-[RFC3077] Duros, E., W. Dabbous, H. Izumiyama, N. Fujii, and Y. Zhang, +- "A Link-Layer Tunneling Mechanism for Unidirectional Links", +- RFC 3077, March 2001. +- +-[RFC3340] M. Rose, G. Klyne, and D. Crocker, "The Application +- Exchange Core", RFC 3340, July 2002. +- +-[RFC3547] M. Baugher, B. Weis, T. Hardjono and H. Harney, "The Group +- Domain of Interpretation", RFC 3547, July 2003. +- +-[RFC3576] M. Chiba, G. Dommety, M. Eklund, D. Mitton, and B. Aboba, +- "Dynamic Authorization Extensions to Remote Authentication +- Dial In User Service (RADIUS)", RFC 3576, July 2003. +- +-[RFC3588] P. Calhoun, J. Loughney, E. Guttman, G. Zorn and J. Arkko, +- "Diameter Base Protocol", RFC 3588, September 2003. +- +-[RFC3656] R. Siemborski, "The MUPDATE Distributed Mailbox Database Protocol", +- RFC 3656, December 2003. +- +-[RFC3620] D. New, "The TUNNEL Profile", RFC 3620, October 2003. +- +-[RFC3720] J. Satran, K. Meth, C. Sapuntzakis, M. Chadalapaka, and +- E. Zeidner, "iSCSI", RFC 3720, April 2004. +- +-[RFC3767] S. Farrell, Ed., "Securely Available Credentials Protocol", +- RFC 3767, June 2004. +- +-[RFC3807] E. Weilandt, N. Khanchandani, and S. Rao, "V5.2-User Adaptation +- Layer (V5UA)", RFC 3807, June 2004. +- +-[RFC3821] M. Rajagopal, E. Rodriguez, and R. Weber, "Fibre Channel Over +- TCP/IP (FCIP)", RFC 3821, July 2004. +- +-[RFC3887] T. Hansen, "Message Tracking Query Protocol", RFC 3887, +- September 2004. +- +-[RFC3920] P. Saint-Andre, Ed., "Extensible Messaging and Presence +- Protocol (XMPP): Core", RFC 3920, October 2004. +- +-[RFC3947] T. Kivinen, A. Huttunen, B. Swander, and V. Volpe, "Negotiation +- of NAT-Traversal in the IKE", RFC 3947, January 2005. +- +-[RFC3983] A. Newton and M. Sanz, "IRIS - Using the Internet Registry +- Information Service (IRIS) over the Blocks Extensible Exchange +- Protocol (BEEP)", RFC 3983, January 2005. +- +-[RFC4065] J. Kempf, "Instructions for Seamoby and Experimental Mobility +- Protocol IANA", RFC 4065, July 2005. +- +-[RFC4165] T. George, B. Bidulock, R. Dantu, H. J. Schwarzbauer, and K. Morneault, +- "Signaling System 7 (SS7) Message Transfer Part 2 (MTP2) - User +- Peer-to-Peer Adaptation Layer (M2PA)", RFC 4165, September 2005. +- +-[RFC4171] J. Tseng, K. Gibbons, F. Travostino, C. Du Laney, and J. Souza, +- "Internet Storage Name Service (iSNS)", RFC 4171, September 2005. +- +-[RFC4204] J. Lang, Ed., "Link Management Protocol (LMP)", RFC 4204, +- October 2005. +- +-[RFC4535] H. Harney, U. Meth, A. Colegrove, G. Gross, "GSAKMP: Group Secure +- Association Group Management Protocol", RFC 4535, June 2006. +- +-[RFC4340] E. Kohler, M. Handley and S. Floyd, "Datagram Congestion +- Control Protocol (DCCP)", RFC 4340, March 2006. +- +-[RFC4409] R. Gellens and J. Klensin, "Message Submission for Mail", RFC 4409, +- April 2006. +- +-[RFC4430] S. Sakane, K. Kamada, M. Thomas and J. Vilhuber, +- "Kerberized Internet Negotiation of Keys (KINK)", +- RFC 4430, March 2006. +- +-[RFC4656] S. Shalunov, A. Karp, J.W. Boote and M.J. Zekauskas, +- "A One-way Active Measurement Protocol (OWAMP)", RFC 4656, September 2006. +- +-[RFC4540] M. Stiemerling, J. Quittek and C. Cadar, "NEC's Simple Middlebox +- Configuration (SIMCO) Protocol Version 3.0", RFC 4540, May 2006. +- +-[RFC4744] E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible +- Exchange Protocol (BEEP)", RFC 4744, December 2006. +- +-[RFC4742] M. Wasserman and T. Goddard, "Using the NETCONF Configuration Protocol over +- Secure Shell (SSH)", RFC 4742, December 2006. +- +-[RFC4743] T. Goddard, "Using the Network Configuration Protocol (NETCONF) Over the +- Simple Object Access Protocol (SOAP)", RFC 4743, December 2006. +- +-[RFC4727] B. Fenner, "Experimental values In IPv4, IPv6, ICMPv4, ICMPv6, +- UDP and TCP Headers", RFC 4727, November 2006. +- +-[RFC4712] A. Siddiqui, D. Romascanu, E. Golovinsky, M. Rahman and Y. Kim, +- "Transport Mappings for Real-time Application Quality of Service +- Monitoring (RAQMON) Protocol Data Unit (PDU)", RFC 4712, October 2006. +- +-[RFC4767] B. Feinstein and G. Matthews, "The Intrusion Detection Exchange Protocol +- (IDXP)", RFC 4767, March 2007. +- +-[RFC4934] S. Hollenbeck, "Extensible Provisioning Protocol (EPP) Transport +- over TCP", RFC 4934, May 2007. +- +-[RFC4960] Randall Stewart, "Stream Control Transmission Protocol", RFC 4960, +- September 2007. +- +-[RFC4975] B. Campbell, R. Mahy and C. Jennings, "The Message Session Relay Protocol", +- RFC 4975, September 2007. +- +-[RFC4992] A. Newton, "XML Pipelining with Chunks for the Information Registry +- Information Service", RFC 4992, August 2007. +- +-[RFC4993] A. Newton, "A Lightweight UDP Transfer Protocol for the Internet +- Registry Information Service", RFC 4993, August 2007. +- +-[RFC5087] Y(J). Stein, R. Shashoua, R. Insler and M. Anavi, "Time Division +- Multiplexing over IP (TDMoIP)", December 2007. +- +-[RFC-ietf-dccp-rtp-07.txt] +- C. Perkins, "RTP and the Datagram Congestion Control Protocol +- (DCCP)", RFC XXXX, Month Year. +- +-[RFC-ietf-pana-pana-18.txt] +- D. Forsberg, Y. Ohba (Ed.), B. Patil, H. Tschofenig and A. Yegin, +- "Protocol for Carrying Authentication for Network Access (PANA)", +- RFC XXXX , Month Year. +- +-[RFC-ietf-manet-iana-07.txt] +- I. Chakeres, "IANA Allocations for MANET Protocols", RFC XXXX, +- Month Year. ++ Service names and port numbers are used to distinguish between different ++ services that run over transport protocols such as TCP, UDP, DCCP, and ++ SCTP. + +-[] ++ Service names are assigned on a first-come, first-served process, as ++ documented in [RFC6335]. ++ ++ Port numbers are assigned in various ways, based on three ranges: System ++ Ports (0-1023), User Ports (1024-49151), and the Dynamic and/or Private ++ Ports (49152-65535); the difference uses of these ranges is described in ++ [RFC6335]. System Ports are assigned by IETF ++ process for standards-track protocols, as per [RFC6335]. User Ports ++ are assigned by IANA using the "Expert Review" process, as per ++ [RFC6335]. Dynamic Ports are not assigned. ++ ++ The registration procedures for service names and port numbers are ++ described in [RFC6335]. ++ ++ Assigned ports both System and User ports SHOULD NOT be used without ++ or prior to IANA registration. ++ ++ ************************************************************************ ++ * PLEASE NOTE THE FOLLOWING: * ++ * * ++ * ASSIGNMENT OF A PORT NUMBER DOES NOT IN ANY WAY IMPLY AN * ++ * ENDORSEMENT OF AN APPLICATION OR PRODUCT, AND THE FACT THAT NETWORK * ++ * TRAFFIC IS FLOWING TO OR FROM A REGISTERED PORT DOES NOT MEAN THAT * ++ * IT IS "GOOD" TRAFFIC, NOR THAT IT NECESSARILY CORRESPONDS TO THE * ++ * ASSIGNED SERVICE. FIREWALL AND SYSTEM ADMINISTRATORS SHOULD * ++ * CHOOSE HOW TO CONFIGURE THEIR SYSTEMS BASED ON THEIR KNOWLEDGE OF * ++ * THE TRAFFIC IN QUESTION, NOT WHETHER THERE IS A PORT NUMBER * ++ * REGISTERED OR NOT. * ++ ************************************************************************ ++ ++ This registry is also available in plain text. ++ ++ Transport Registration Modification Service Known ++ Service Name Port Number Protocol Description Assignee Contact Date Date Reference Code Unauthorized Assignment Notes ++ Uses ++ 0 tcp Reserved [Jon_Postel] [Jon_Postel] ++ 0 udp Reserved [Jon_Postel] [Jon_Postel] ++tcpmux 1 tcp TCP Port Service Multiplexer [Mark_Lottor] [Mark_Lottor] ++tcpmux 1 udp TCP Port Service Multiplexer [Mark_Lottor] [Mark_Lottor] ++compressnet 2 tcp Management Utility ++compressnet 2 udp Management Utility ++compressnet 3 tcp Compression Process [Bernie_Volz] [Bernie_Volz] ++compressnet 3 udp Compression Process [Bernie_Volz] [Bernie_Volz] ++ 4 tcp Unassigned ++ 4 udp Unassigned ++rje 5 tcp Remote Job Entry [Jon_Postel] [Jon_Postel] ++rje 5 udp Remote Job Entry [Jon_Postel] [Jon_Postel] ++ 6 tcp Unassigned ++ 6 udp Unassigned ++echo 7 tcp Echo [Jon_Postel] [Jon_Postel] ++echo 7 udp Echo [Jon_Postel] [Jon_Postel] ++ 8 tcp Unassigned ++ 8 udp Unassigned ++discard 9 tcp Discard [Jon_Postel] [Jon_Postel] ++discard 9 udp Discard [Jon_Postel] [Jon_Postel] ++discard 9 sctp Discard [Randall_Stewart] [Randall_Stewart] [RFC4960] ++discard 9 dccp Discard [Eddie_Kohler] [Eddie_Kohler] [RFC4340] 1145656131 ++ 10 tcp Unassigned ++ 10 udp Unassigned ++systat 11 tcp Active Users [Jon_Postel] [Jon_Postel] ++systat 11 udp Active Users [Jon_Postel] [Jon_Postel] ++ 12 tcp Unassigned ++ 12 udp Unassigned ++daytime 13 tcp Daytime [Jon_Postel] [Jon_Postel] [RFC867] ++daytime 13 udp Daytime [Jon_Postel] [Jon_Postel] [RFC867] ++ 14 tcp Unassigned ++ 14 udp Unassigned ++ 15 tcp Unassigned [was netstat] ++ 15 udp Unassigned ++ 16 tcp Unassigned ++ 16 udp Unassigned ++qotd 17 tcp Quote of the Day [Jon_Postel] [Jon_Postel] ++qotd 17 udp Quote of the Day [Jon_Postel] [Jon_Postel] ++msp 18 tcp Message Send Protocol [Rina_Nethaniel] [Rina_Nethaniel] ++ (historic) ++msp 18 udp Message Send Protocol [Rina_Nethaniel] [Rina_Nethaniel] ++ (historic) ++chargen 19 tcp Character Generator ++chargen 19 udp Character Generator ++ftp-data 20 tcp File Transfer [Default Data] [Jon_Postel] [Jon_Postel] ++ftp-data 20 udp File Transfer [Default Data] [Jon_Postel] [Jon_Postel] ++ftp-data 20 sctp FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] ++ftp 21 tcp File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> ++ftp 21 udp File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path> ++ftp 21 sctp FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path> ++ssh 22 tcp The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> ++ Protocol ++ssh 22 udp The Secure Shell (SSH) [RFC4251] Defined TXT keys: u=<username> p=<password> ++ Protocol ++ssh 22 sctp SSH [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> ++telnet 23 tcp Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> ++telnet 23 udp Telnet [Jon_Postel] [Jon_Postel] [RFC854] Defined TXT keys: u=<username> p=<password> ++ 24 tcp any private mail system [Rick_Adams] [Rick_Adams] ++ 24 udp any private mail system [Rick_Adams] [Rick_Adams] ++smtp 25 tcp Simple Mail Transfer [Jon_Postel] [Jon_Postel] ++smtp 25 udp Simple Mail Transfer [Jon_Postel] [Jon_Postel] ++ 26 tcp Unassigned ++ 26 udp Unassigned ++nsw-fe 27 tcp NSW User System FE [Robert_Thomas] [Robert_Thomas] ++nsw-fe 27 udp NSW User System FE [Robert_Thomas] [Robert_Thomas] ++ 28 tcp Unassigned ++ 28 udp Unassigned ++msg-icp 29 tcp MSG ICP [Robert_Thomas] [Robert_Thomas] ++msg-icp 29 udp MSG ICP [Robert_Thomas] [Robert_Thomas] ++ 30 tcp Unassigned ++ 30 udp Unassigned ++msg-auth 31 tcp MSG Authentication [Robert_Thomas] [Robert_Thomas] ++msg-auth 31 udp MSG Authentication [Robert_Thomas] [Robert_Thomas] ++ 32 tcp Unassigned ++ 32 udp Unassigned ++dsp 33 tcp Display Support Protocol [Ed_Cain] [Ed_Cain] ++dsp 33 udp Display Support Protocol [Ed_Cain] [Ed_Cain] ++ 34 tcp Unassigned ++ 34 udp Unassigned ++ 35 tcp any private printer server [Jon_Postel] [Jon_Postel] ++ 35 udp any private printer server [Jon_Postel] [Jon_Postel] ++ 36 tcp Unassigned ++ 36 udp Unassigned ++time 37 tcp Time [Jon_Postel] [Jon_Postel] ++time 37 udp Time [Jon_Postel] [Jon_Postel] ++rap 38 tcp Route Access Protocol [Robert_Ullmann] [Robert_Ullmann] ++rap 38 udp Route Access Protocol [Robert_Ullmann] [Robert_Ullmann] ++rlp 39 tcp Resource Location Protocol [Mike_Accetta] [Mike_Accetta] ++rlp 39 udp Resource Location Protocol [Mike_Accetta] [Mike_Accetta] ++ 40 tcp Unassigned ++ 40 udp Unassigned ++graphics 41 tcp Graphics ++graphics 41 udp Graphics ++name 42 tcp Host Name Server ++name 42 udp Host Name Server ++nameserver 42 tcp Host Name Server ++nameserver 42 udp Host Name Server ++nicname 43 tcp Who Is ++nicname 43 udp Who Is ++mpm-flags 44 tcp MPM FLAGS Protocol ++mpm-flags 44 udp MPM FLAGS Protocol ++mpm 45 tcp Message Processing Module ++ [recv] ++mpm 45 udp Message Processing Module ++ [recv] ++mpm-snd 46 tcp MPM [default send] [Jon_Postel] [Jon_Postel] ++mpm-snd 46 udp MPM [default send] [Jon_Postel] [Jon_Postel] ++ni-ftp 47 tcp NI FTP [Steve_Kille] [Steve_Kille] ++ni-ftp 47 udp NI FTP [Steve_Kille] [Steve_Kille] ++auditd 48 tcp Digital Audit Daemon [Larry_Scott] [Larry_Scott] ++auditd 48 udp Digital Audit Daemon [Larry_Scott] [Larry_Scott] ++tacacs 49 tcp Login Host Protocol (TACACS) [Pieter_Ditmars] [Pieter_Ditmars] ++tacacs 49 udp Login Host Protocol (TACACS) [Pieter_Ditmars] [Pieter_Ditmars] ++re-mail-ck 50 tcp Remote Mail Checking [Steve_Dorner] [Steve_Dorner] ++ Protocol ++re-mail-ck 50 udp Remote Mail Checking [Steve_Dorner] [Steve_Dorner] ++ Protocol ++la-maint 51 tcp IMP Logical Address [Andy_Malis] [Andy_Malis] ++ Maintenance ++la-maint 51 udp IMP Logical Address [Andy_Malis] [Andy_Malis] ++ Maintenance ++xns-time 52 tcp XNS Time Protocol [Susie_Armstrong] [Susie_Armstrong] ++xns-time 52 udp XNS Time Protocol [Susie_Armstrong] [Susie_Armstrong] ++domain 53 tcp Domain Name Server [Paul_Mockapetris] [Paul_Mockapetris] ++domain 53 udp Domain Name Server [Paul_Mockapetris] [Paul_Mockapetris] ++xns-ch 54 tcp XNS Clearinghouse [Susie_Armstrong] [Susie_Armstrong] ++xns-ch 54 udp XNS Clearinghouse [Susie_Armstrong] [Susie_Armstrong] ++isi-gl 55 tcp ISI Graphics Language ++isi-gl 55 udp ISI Graphics Language ++xns-auth 56 tcp XNS Authentication [Susie_Armstrong] [Susie_Armstrong] ++xns-auth 56 udp XNS Authentication [Susie_Armstrong] [Susie_Armstrong] ++ 57 tcp any private terminal access [Jon_Postel] [Jon_Postel] ++ 57 udp any private terminal access [Jon_Postel] [Jon_Postel] ++xns-mail 58 tcp XNS Mail [Susie_Armstrong] [Susie_Armstrong] ++xns-mail 58 udp XNS Mail [Susie_Armstrong] [Susie_Armstrong] ++ 59 tcp any private file service [Jon_Postel] [Jon_Postel] ++ 59 udp any private file service [Jon_Postel] [Jon_Postel] ++ 60 tcp Unassigned ++ 60 udp Unassigned ++ni-mail 61 tcp NI MAIL [Steve_Kille] [Steve_Kille] ++ni-mail 61 udp NI MAIL [Steve_Kille] [Steve_Kille] ++acas 62 tcp ACA Services [E_Wald] [E_Wald] ++acas 62 udp ACA Services [E_Wald] [E_Wald] ++ whois++ ++ ++whoispp 63 tcp IANA assigned this [Rickard_Schoultz] [Rickard_Schoultz] ++ well-formed service name as ++ a replacement for "whois++". ++ This entry is an alias to "whoispp". This entry is now ++whois++ 63 tcp whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service ++ discovery mechanisms. ++ whois++ ++ ++whoispp 63 udp IANA assigned this [Rickard_Schoultz] [Rickard_Schoultz] ++ well-formed service name as ++ a replacement for "whois++". ++ This entry is an alias to "whoispp". This entry is now ++whois++ 63 udp whois++ [Rickard_Schoultz] [Rickard_Schoultz] historic, not usable for use with many common service ++ discovery mechanisms. ++covia 64 tcp Communications Integrator [Dan_Smith] [Dan_Smith] ++ (CI) ++covia 64 udp Communications Integrator [Dan_Smith] [Dan_Smith] ++ (CI) ++tacacs-ds 65 tcp TACACS-Database Service [Kathy_Huber] [Kathy_Huber] ++tacacs-ds 65 udp TACACS-Database Service [Kathy_Huber] [Kathy_Huber] ++ Oracle SQL*NET ++ ++sql-net 66 tcp IANA assigned this [Jack_Haverty] [Jack_Haverty] ++ well-formed service name as ++ a replacement for "sql*net". ++ This entry is an alias to "sql-net". This entry is now ++sql*net 66 tcp Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service ++ discovery mechanisms. ++ Oracle SQL*NET ++ ++sql-net 66 udp IANA assigned this [Jack_Haverty] [Jack_Haverty] ++ well-formed service name as ++ a replacement for "sql*net". ++ This entry is an alias to "sql-net". This entry is now ++sql*net 66 udp Oracle SQL*NET [Jack_Haverty] [Jack_Haverty] historic, not usable for use with many common service ++ discovery mechanisms. ++bootps 67 tcp Bootstrap Protocol Server [Bill_Croft] [Bill_Croft] [RFC951] Defined TXT keys: None ++bootps 67 udp Bootstrap Protocol Server ++bootpc 68 tcp Bootstrap Protocol Client [Bill_Croft] [Bill_Croft] ++bootpc 68 udp Bootstrap Protocol Client [Bill_Croft] [Bill_Croft] ++tftp 69 tcp Trivial File Transfer [David_Clark] [David_Clark] ++tftp 69 udp Trivial File Transfer [David_Clark] [David_Clark] ++gopher 70 tcp Gopher [Mark_McCahill] [Mark_McCahill] ++gopher 70 udp Gopher [Mark_McCahill] [Mark_McCahill] ++netrjs-1 71 tcp Remote Job Service ++netrjs-1 71 udp Remote Job Service ++netrjs-2 72 tcp Remote Job Service ++netrjs-2 72 udp Remote Job Service ++netrjs-3 73 tcp Remote Job Service ++netrjs-3 73 udp Remote Job Service ++netrjs-4 74 tcp Remote Job Service [Bob_Braden] [Bob_Braden] ++netrjs-4 74 udp Remote Job Service [Bob_Braden] [Bob_Braden] ++ 75 tcp any private dial out service [Jon_Postel] [Jon_Postel] ++ 75 udp any private dial out service [Jon_Postel] [Jon_Postel] ++deos 76 tcp Distributed External Object [Robert_Ullmann] [Robert_Ullmann] ++ Store ++deos 76 udp Distributed External Object [Robert_Ullmann] [Robert_Ullmann] ++ Store ++ 77 tcp any private RJE service [Jon_Postel] [Jon_Postel] ++ 77 udp any private RJE service [Jon_Postel] [Jon_Postel] ++vettcp 78 tcp vettcp [Christopher_Leong] [Christopher_Leong] ++vettcp 78 udp vettcp [Christopher_Leong] [Christopher_Leong] ++ Unauthorized ++ use by some ++finger 79 tcp Finger [David_Zimmerman] [David_Zimmerman] mail users ++ (see ++ [RFC4146] for ++ details) ++ Unauthorized ++ use by some ++finger 79 udp Finger [David_Zimmerman] [David_Zimmerman] mail users ++ (see ++ [RFC4146] for ++ details) ++http 80 tcp World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to ++ document> ++http 80 udp World Wide Web HTTP Defined TXT keys: u=<username> p=<password> path=<path to ++ document> ++www 80 tcp World Wide Web HTTP This is a duplicate of the "http" service and should not be ++ used for discovery purposes. ++www 80 udp World Wide Web HTTP This is a duplicate of the "http" service and should not be ++ used for discovery purposes. ++ This is a duplicate of the "http" service and should not be ++ used for discovery purposes. u=<username> p=<password> ++ path=<path to document> (see txtrecords.html#http) Known ++ Subtypes: _printer NOTE: The meaning of this service type, ++ though called just "http", actually denotes something more ++ precise than just "any data transported using HTTP". The ++ DNS-SD service type "http" should only be used to advertise ++ content that: * is served over HTTP, * can be displayed by ++ "typical" web browser client software, and * is intented ++ primarily to be viewed by a human user. Of course, the ++ definition of "typical web browser" is subjective, and may ++www-http 80 tcp World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD ++ service type "http" can be understood as meaning ++ "human-readable HTML content served over HTTP". In some cases ++ other widely-supported content types may also be appropriate, ++ such as plain text over HTTP, or JPEG image over HTTP. ++ Content types not intented primarily for viewing by a human ++ user, or not widely-supported in web browsing clients, should ++ not be advertised as DNS-SD service type "http", even if they ++ do happen to be transported over HTTP. Such types should be ++ advertised as their own logical service type with their own ++ DNS-SD service type, for example, XUL (XML User Interface ++ Language) transported over HTTP is advertised explicitly as ++ DNS-SD service type "xul-http". ++ This is a duplicate of the "http" service and should not be ++ used for discovery purposes. u=<username> p=<password> ++ path=<path to document> (see txtrecords.html#http) Known ++ Subtypes: _printer NOTE: The meaning of this service type, ++ though called just "http", actually denotes something more ++ precise than just "any data transported using HTTP". The ++ DNS-SD service type "http" should only be used to advertise ++ content that: * is served over HTTP, * can be displayed by ++ "typical" web browser client software, and * is intented ++ primarily to be viewed by a human user. Of course, the ++ definition of "typical web browser" is subjective, and may ++www-http 80 udp World Wide Web HTTP [Tim_Berners_Lee] [Tim_Berners_Lee] change over time, but for practical purposes the DNS-SD ++ service type "http" can be understood as meaning ++ "human-readable HTML content served over HTTP". In some cases ++ other widely-supported content types may also be appropriate, ++ such as plain text over HTTP, or JPEG image over HTTP. ++ Content types not intented primarily for viewing by a human ++ user, or not widely-supported in web browsing clients, should ++ not be advertised as DNS-SD service type "http", even if they ++ do happen to be transported over HTTP. Such types should be ++ advertised as their own logical service type with their own ++ DNS-SD service type, for example, XUL (XML User Interface ++ Language) transported over HTTP is advertised explicitly as ++ DNS-SD service type "xul-http". ++http 80 sctp HTTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path to ++ document> ++ 81 Unassigned 2007-09-06 ++xfer 82 tcp XFER Utility [Thomas_M_Smith] [Thomas_M_Smith] ++xfer 82 udp XFER Utility [Thomas_M_Smith] [Thomas_M_Smith] ++mit-ml-dev 83 tcp MIT ML Device [David_Reed] [David_Reed] ++mit-ml-dev 83 udp MIT ML Device [David_Reed] [David_Reed] ++ctf 84 tcp Common Trace Facility [Hugh_Thomas] [Hugh_Thomas] ++ctf 84 udp Common Trace Facility [Hugh_Thomas] [Hugh_Thomas] ++mit-ml-dev 85 tcp MIT ML Device [David_Reed] [David_Reed] ++mit-ml-dev 85 udp MIT ML Device [David_Reed] [David_Reed] ++mfcobol 86 tcp Micro Focus Cobol [Simon_Edwards] [Simon_Edwards] ++mfcobol 86 udp Micro Focus Cobol [Simon_Edwards] [Simon_Edwards] ++ 87 tcp any private terminal link [Jon_Postel] [Jon_Postel] ++ 87 udp any private terminal link [Jon_Postel] [Jon_Postel] ++kerberos 88 tcp Kerberos [B_Clifford_Neuman] [B_Clifford_Neuman] ++kerberos 88 udp Kerberos [B_Clifford_Neuman] [B_Clifford_Neuman] ++su-mit-tg 89 tcp SU/MIT Telnet Gateway [Mark_Crispin] [Mark_Crispin] ++su-mit-tg 89 udp SU/MIT Telnet Gateway [Mark_Crispin] [Mark_Crispin] ++ PORT 90 also ++dnsix 90 tcp DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used ++ Token Map unofficially ++ by Pointcast ++ PORT 90 also ++dnsix 90 udp DNSIX Securit Attribute [Charles_Watt] [Charles_Watt] being used ++ Token Map unofficially ++ by Pointcast ++mit-dov 91 tcp MIT Dover Spooler [Eliot_Moss] [Eliot_Moss] ++mit-dov 91 udp MIT Dover Spooler [Eliot_Moss] [Eliot_Moss] ++npp 92 tcp Network Printing Protocol [Louis_Mamakos] [Louis_Mamakos] ++npp 92 udp Network Printing Protocol [Louis_Mamakos] [Louis_Mamakos] ++dcp 93 tcp Device Control Protocol [Daniel_Tappan] [Daniel_Tappan] ++dcp 93 udp Device Control Protocol [Daniel_Tappan] [Daniel_Tappan] ++objcall 94 tcp Tivoli Object Dispatcher [Tom_Bereiter] [Tom_Bereiter] ++objcall 94 udp Tivoli Object Dispatcher [Tom_Bereiter] [Tom_Bereiter] ++supdup 95 tcp SUPDUP [Mark_Crispin] [Mark_Crispin] ++supdup 95 udp SUPDUP [Mark_Crispin] [Mark_Crispin] ++dixie 96 tcp DIXIE Protocol Specification [Tim_Howes] [Tim_Howes] ++dixie 96 udp DIXIE Protocol Specification [Tim_Howes] [Tim_Howes] ++swift-rvf 97 tcp Swift Remote Virtural File [Maurice_R_Turcotte] [Maurice_R_Turcotte] ++ Protocol ++swift-rvf 97 udp Swift Remote Virtural File [Maurice_R_Turcotte] [Maurice_R_Turcotte] ++ Protocol ++tacnews 98 tcp TAC News [Jon_Postel] [Jon_Postel] ++tacnews 98 udp TAC News [Jon_Postel] [Jon_Postel] ++metagram 99 tcp Metagram Relay [Geoff_Goodfellow] [Geoff_Goodfellow] ++metagram 99 udp Metagram Relay [Geoff_Goodfellow] [Geoff_Goodfellow] ++ 100 ++ 100 Unassigned 2012-03-21 Unauthorized ++ use by ++ 'newacct' ++hostname 101 tcp NIC Host Name Server [Jon_Postel] [Jon_Postel] ++hostname 101 udp NIC Host Name Server [Jon_Postel] [Jon_Postel] ++iso-tsap 102 tcp ISO-TSAP Class 0 [Marshall_Rose] [Marshall_Rose] ++iso-tsap 102 udp ISO-TSAP Class 0 [Marshall_Rose] [Marshall_Rose] ++gppitnp 103 tcp Genesis Point-to-Point Trans ++ Net ++gppitnp 103 udp Genesis Point-to-Point Trans ++ Net ++acr-nema 104 tcp ACR-NEMA Digital Imag. & [Patrick_McNamee] [Patrick_McNamee] ++ Comm. 300 ++acr-nema 104 udp ACR-NEMA Digital Imag. & [Patrick_McNamee] [Patrick_McNamee] ++ Comm. 300 ++cso 105 tcp CCSO name server protocol [Martin_Hamilton] [Martin_Hamilton] ++cso 105 udp CCSO name server protocol [Martin_Hamilton] [Martin_Hamilton] ++csnet-ns 105 tcp Mailbox Name Nameserver [Marvin_Solomon] [Marvin_Solomon] ++csnet-ns 105 udp Mailbox Name Nameserver [Marvin_Solomon] [Marvin_Solomon] ++ 106 ++ Unauthorized ++3com-tsmux 106 tcp 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by ++ insecure ++ poppassd ++ protocol ++ 106 ++ Unauthorized ++3com-tsmux 106 udp 3COM-TSMUX [Jeremy_Siegel] [Jeremy_Siegel] use by ++ insecure ++ poppassd ++ protocol ++rtelnet 107 tcp Remote Telnet Service [Jon_Postel] [Jon_Postel] ++rtelnet 107 udp Remote Telnet Service [Jon_Postel] [Jon_Postel] ++snagas 108 tcp SNA Gateway Access Server [Kevin_Murphy] [Kevin_Murphy] ++snagas 108 udp SNA Gateway Access Server [Kevin_Murphy] [Kevin_Murphy] ++pop2 109 tcp Post Office Protocol - [Joyce_K_Reynolds] [Joyce_K_Reynolds] ++ Version 2 ++pop2 109 udp Post Office Protocol - [Joyce_K_Reynolds] [Joyce_K_Reynolds] ++ Version 2 ++pop3 110 tcp Post Office Protocol - [Marshall_Rose] [Marshall_Rose] ++ Version 3 ++pop3 110 udp Post Office Protocol - [Marshall_Rose] [Marshall_Rose] ++ Version 3 ++sunrpc 111 tcp SUN Remote Procedure Call [Chuck_McManis] [Chuck_McManis] ++sunrpc 111 udp SUN Remote Procedure Call [Chuck_McManis] [Chuck_McManis] ++mcidas 112 tcp McIDAS Data Transmission [Glenn_Davis] [Glenn_Davis] ++ Protocol ++mcidas 112 udp McIDAS Data Transmission [Glenn_Davis] [Glenn_Davis] ++ Protocol ++ident 113 tcp ++auth 113 tcp Authentication Service [Mike_St_Johns] [Mike_St_Johns] ++auth 113 udp Authentication Service [Mike_St_Johns] [Mike_St_Johns] ++ 114 unassigned Deprecated June 2004 ++sftp 115 tcp Simple File Transfer [Mark_Lottor] [Mark_Lottor] ++ Protocol ++sftp 115 udp Simple File Transfer [Mark_Lottor] [Mark_Lottor] ++ Protocol ++ansanotify 116 tcp ANSA REX Notify [Nicola_J_Howarth] [Nicola_J_Howarth] ++ansanotify 116 udp ANSA REX Notify [Nicola_J_Howarth] [Nicola_J_Howarth] ++uucp-path 117 tcp UUCP Path Service ++uucp-path 117 udp UUCP Path Service ++sqlserv 118 tcp SQL Services [Larry_Barnes] [Larry_Barnes] ++sqlserv 118 udp SQL Services [Larry_Barnes] [Larry_Barnes] ++nntp 119 tcp Network News Transfer [Phil_Lapsley] [Phil_Lapsley] ++ Protocol ++nntp 119 udp Network News Transfer [Phil_Lapsley] [Phil_Lapsley] ++ Protocol ++cfdptkt 120 tcp CFDPTKT [John_Ioannidis] [John_Ioannidis] ++cfdptkt 120 udp CFDPTKT [John_Ioannidis] [John_Ioannidis] ++erpc 121 tcp Encore Expedited Remote [Jack_ONeil] [Jack_ONeil] ++ Pro.Call ++erpc 121 udp Encore Expedited Remote [Jack_ONeil] [Jack_ONeil] ++ Pro.Call ++smakynet 122 tcp SMAKYNET [Pierre_Arnaud] [Pierre_Arnaud] ++smakynet 122 udp SMAKYNET [Pierre_Arnaud] [Pierre_Arnaud] ++ntp 123 tcp Network Time Protocol [Dave_Mills] [Dave_Mills] [RFC5905] ++ntp 123 udp Network Time Protocol [Dave_Mills] [Dave_Mills] [RFC5905] ++ansatrader 124 tcp ANSA REX Trader [Nicola_J_Howarth] [Nicola_J_Howarth] ++ansatrader 124 udp ANSA REX Trader [Nicola_J_Howarth] [Nicola_J_Howarth] ++locus-map 125 tcp Locus PC-Interface Net Map [Eric_Peterson] [Eric_Peterson] ++ Ser ++locus-map 125 udp Locus PC-Interface Net Map [Eric_Peterson] [Eric_Peterson] ++ Ser ++ Port 126 Previously assigned to application below unitary ++nxedit 126 tcp NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary ++ Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously ++ assigned to application above ++ Port 126 Previously assigned to application below unitary ++nxedit 126 udp NXEdit [Don_Payette] [Don_Payette] 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary ++ Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously ++ assigned to application above ++locus-con 127 tcp Locus PC-Interface Conn [Eric_Peterson] [Eric_Peterson] ++ Server ++locus-con 127 udp Locus PC-Interface Conn [Eric_Peterson] [Eric_Peterson] ++ Server ++gss-xlicen 128 tcp GSS X License Verification [John_Light] [John_Light] ++gss-xlicen 128 udp GSS X License Verification [John_Light] [John_Light] ++pwdgen 129 tcp Password Generator Protocol [Frank_J_Wacho] [Frank_J_Wacho] ++pwdgen 129 udp Password Generator Protocol [Frank_J_Wacho] [Frank_J_Wacho] ++cisco-fna 130 tcp cisco FNATIVE ++cisco-fna 130 udp cisco FNATIVE ++cisco-tna 131 tcp cisco TNATIVE ++cisco-tna 131 udp cisco TNATIVE ++cisco-sys 132 tcp cisco SYSMAINT ++cisco-sys 132 udp cisco SYSMAINT ++statsrv 133 tcp Statistics Service [Dave_Mills_2] [Dave_Mills_2] ++statsrv 133 udp Statistics Service [Dave_Mills_2] [Dave_Mills_2] ++ingres-net 134 tcp INGRES-NET Service [Mike_Berrow] [Mike_Berrow] ++ingres-net 134 udp INGRES-NET Service [Mike_Berrow] [Mike_Berrow] ++epmap 135 tcp DCE endpoint resolution [Joe_Pato] [Joe_Pato] ++epmap 135 udp DCE endpoint resolution [Joe_Pato] [Joe_Pato] ++profile 136 tcp PROFILE Naming System [Larry_Peterson] [Larry_Peterson] ++profile 136 udp PROFILE Naming System [Larry_Peterson] [Larry_Peterson] ++netbios-ns 137 tcp NETBIOS Name Service ++netbios-ns 137 udp NETBIOS Name Service ++netbios-dgm 138 tcp NETBIOS Datagram Service ++netbios-dgm 138 udp NETBIOS Datagram Service ++netbios-ssn 139 tcp NETBIOS Session Service [Jon_Postel] [Jon_Postel] ++netbios-ssn 139 udp NETBIOS Session Service [Jon_Postel] [Jon_Postel] ++emfis-data 140 tcp EMFIS Data Service ++emfis-data 140 udp EMFIS Data Service ++emfis-cntl 141 tcp EMFIS Control Service [Gerd_Beling] [Gerd_Beling] ++emfis-cntl 141 udp EMFIS Control Service [Gerd_Beling] [Gerd_Beling] ++bl-idm 142 tcp Britton-Lee IDM [Susie_Snitzer] [Susie_Snitzer] ++bl-idm 142 udp Britton-Lee IDM [Susie_Snitzer] [Susie_Snitzer] ++imap 143 tcp Internet Message Access [Mark_Crispin_2] [Mark_Crispin_2] ++ Protocol ++imap 143 udp Internet Message Access [Mark_Crispin_2] [Mark_Crispin_2] ++ Protocol ++uma 144 tcp Universal Management [Jay_Whitney] [Jay_Whitney] ++ Architecture ++uma 144 udp Universal Management [Jay_Whitney] [Jay_Whitney] ++ Architecture ++uaac 145 tcp UAAC Protocol [David_A_Gomberg] [David_A_Gomberg] ++uaac 145 udp UAAC Protocol [David_A_Gomberg] [David_A_Gomberg] ++iso-tp0 146 tcp ISO-IP0 ++iso-tp0 146 udp ISO-IP0 ++iso-ip 147 tcp ISO-IP [Marshall_Rose] [Marshall_Rose] ++iso-ip 147 udp ISO-IP [Marshall_Rose] [Marshall_Rose] ++jargon 148 tcp Jargon [Bill_Weinman] [Bill_Weinman] ++jargon 148 udp Jargon [Bill_Weinman] [Bill_Weinman] ++aed-512 149 tcp AED 512 Emulation Service [Albert_G_Broscius] [Albert_G_Broscius] ++aed-512 149 udp AED 512 Emulation Service [Albert_G_Broscius] [Albert_G_Broscius] ++sql-net 150 tcp SQL-NET [Martin_Picard] [Martin_Picard] ++sql-net 150 udp SQL-NET [Martin_Picard] [Martin_Picard] ++hems 151 tcp HEMS ++hems 151 udp HEMS ++bftp 152 tcp Background File Transfer [Annette_DeSchon] [Annette_DeSchon] ++ Program ++bftp 152 udp Background File Transfer [Annette_DeSchon] [Annette_DeSchon] ++ Program ++sgmp 153 tcp SGMP [Marty_Schoffstahl] [Marty_Schoffstahl] ++sgmp 153 udp SGMP [Marty_Schoffstahl] [Marty_Schoffstahl] ++netsc-prod 154 tcp NETSC ++netsc-prod 154 udp NETSC ++netsc-dev 155 tcp NETSC [Sergio_Heker] [Sergio_Heker] ++netsc-dev 155 udp NETSC [Sergio_Heker] [Sergio_Heker] ++sqlsrv 156 tcp SQL Service [Craig_Rogers] [Craig_Rogers] ++sqlsrv 156 udp SQL Service [Craig_Rogers] [Craig_Rogers] ++knet-cmp 157 tcp KNET/VM Command/Message [Gary_S_Malkin] [Gary_S_Malkin] ++ Protocol ++knet-cmp 157 udp KNET/VM Command/Message [Gary_S_Malkin] [Gary_S_Malkin] ++ Protocol ++pcmail-srv 158 tcp PCMail Server [Mark_L_Lambert] [Mark_L_Lambert] ++pcmail-srv 158 udp PCMail Server [Mark_L_Lambert] [Mark_L_Lambert] ++nss-routing 159 tcp NSS-Routing [Yakov_Rekhter] [Yakov_Rekhter] ++nss-routing 159 udp NSS-Routing [Yakov_Rekhter] [Yakov_Rekhter] ++sgmp-traps 160 tcp SGMP-TRAPS [Marty_Schoffstahl] [Marty_Schoffstahl] ++sgmp-traps 160 udp SGMP-TRAPS [Marty_Schoffstahl] [Marty_Schoffstahl] ++snmp 161 tcp SNMP ++snmp 161 udp SNMP ++snmptrap 162 tcp SNMPTRAP [Marshall_Rose] [Marshall_Rose] ++snmptrap 162 udp SNMPTRAP [Marshall_Rose] [Marshall_Rose] ++cmip-man 163 tcp CMIP/TCP Manager ++cmip-man 163 udp CMIP/TCP Manager ++cmip-agent 164 tcp CMIP/TCP Agent [Amatzia_Ben_Artzi] [Amatzia_Ben_Artzi] ++cmip-agent 164 udp CMIP/TCP Agent [Amatzia_Ben_Artzi] [Amatzia_Ben_Artzi] ++xns-courier 165 tcp Xerox [Susie_Armstrong_2] [Susie_Armstrong_2] ++xns-courier 165 udp Xerox [Susie_Armstrong_2] [Susie_Armstrong_2] ++s-net 166 tcp Sirius Systems [Brian_Lloyd] [Brian_Lloyd] ++s-net 166 udp Sirius Systems [Brian_Lloyd] [Brian_Lloyd] ++namp 167 tcp NAMP [Marty_Schoffstahl] [Marty_Schoffstahl] ++namp 167 udp NAMP [Marty_Schoffstahl] [Marty_Schoffstahl] ++rsvd 168 tcp RSVD [Alan_Sandell] [Alan_Sandell] 2008-05-01 ++rsvd 168 udp RSVD [Alan_Sandell] [Alan_Sandell] 2008-05-01 ++send 169 tcp SEND [William_D_Wisner] [William_D_Wisner] ++send 169 udp SEND [William_D_Wisner] [William_D_Wisner] ++print-srv 170 tcp Network PostScript [Brian_Reid] [Brian_Reid] ++print-srv 170 udp Network PostScript [Brian_Reid] [Brian_Reid] ++multiplex 171 tcp Network Innovations ++ Multiplex ++multiplex 171 udp Network Innovations ++ Multiplex ++ Network Innovations CL/1 ++ ++cl-1 172 tcp IANA assigned this [Kevin_DeVault] [Kevin_DeVault] ++ well-formed service name as ++ a replacement for "cl/1". ++ This entry is an alias to "cl-1". This entry is now historic, ++cl/1 172 tcp Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery ++ mechanisms. ++ Network Innovations CL/1 ++ ++cl-1 172 udp IANA assigned this [Kevin_DeVault] [Kevin_DeVault] ++ well-formed service name as ++ a replacement for "cl/1". ++ This entry is an alias to "cl-1". This entry is now historic, ++cl/1 172 udp Network Innovations CL/1 [Kevin_DeVault] [Kevin_DeVault] not usable for use with many common service discovery ++ mechanisms. ++xyplex-mux 173 tcp Xyplex [Bob_Stewart] [Bob_Stewart] ++xyplex-mux 173 udp Xyplex [Bob_Stewart] [Bob_Stewart] ++mailq 174 tcp MAILQ [Rayan_Zachariassen] [Rayan_Zachariassen] ++mailq 174 udp MAILQ [Rayan_Zachariassen] [Rayan_Zachariassen] ++vmnet 175 tcp VMNET [Christopher_Tengi] [Christopher_Tengi] ++vmnet 175 udp VMNET [Christopher_Tengi] [Christopher_Tengi] ++genrad-mux 176 tcp GENRAD-MUX [Ron_Thornton] [Ron_Thornton] ++genrad-mux 176 udp GENRAD-MUX [Ron_Thornton] [Ron_Thornton] ++xdmcp 177 tcp X Display Manager Control [Robert_W_Scheifler] [Robert_W_Scheifler] ++ Protocol ++xdmcp 177 udp X Display Manager Control [Robert_W_Scheifler] [Robert_W_Scheifler] ++ Protocol ++nextstep 178 tcp NextStep Window Server [Leo_Hourvitz] [Leo_Hourvitz] ++nextstep 178 udp NextStep Window Server [Leo_Hourvitz] [Leo_Hourvitz] ++bgp 179 tcp Border Gateway Protocol [Kirk_Lougheed] [Kirk_Lougheed] ++bgp 179 udp Border Gateway Protocol [Kirk_Lougheed] [Kirk_Lougheed] ++bgp 179 sctp BGP [Randall_Stewart] [Randall_Stewart] [RFC4960] ++ris 180 tcp Intergraph [Dave_Buehmann] [Dave_Buehmann] ++ris 180 udp Intergraph [Dave_Buehmann] [Dave_Buehmann] ++unify 181 tcp Unify [Mark_Ainsley] [Mark_Ainsley] ++unify 181 udp Unify [Mark_Ainsley] [Mark_Ainsley] ++audit 182 tcp Unisys Audit SITP [Gil_Greenbaum] [Gil_Greenbaum] ++audit 182 udp Unisys Audit SITP [Gil_Greenbaum] [Gil_Greenbaum] ++ocbinder 183 tcp OCBinder ++ocbinder 183 udp OCBinder ++ocserver 184 tcp OCServer [Jerrilynn_Okamura] [Jerrilynn_Okamura] ++ocserver 184 udp OCServer [Jerrilynn_Okamura] [Jerrilynn_Okamura] ++remote-kis 185 tcp Remote-KIS ++remote-kis 185 udp Remote-KIS ++kis 186 tcp KIS Protocol [Ralph_Droms] [Ralph_Droms] ++kis 186 udp KIS Protocol [Ralph_Droms] [Ralph_Droms] ++aci 187 tcp Application Communication [Rick_Carlos] [Rick_Carlos] ++ Interface ++aci 187 udp Application Communication [Rick_Carlos] [Rick_Carlos] ++ Interface ++mumps 188 tcp Plus Five's MUMPS [Hokey_Stenn] [Hokey_Stenn] ++mumps 188 udp Plus Five's MUMPS [Hokey_Stenn] [Hokey_Stenn] ++qft 189 tcp Queued File Transport [Wayne_Schroeder] [Wayne_Schroeder] ++qft 189 udp Queued File Transport [Wayne_Schroeder] [Wayne_Schroeder] ++gacp 190 tcp Gateway Access Control [C_Philip_Wood] [C_Philip_Wood] ++ Protocol ++gacp 190 udp Gateway Access Control [C_Philip_Wood] [C_Philip_Wood] ++ Protocol ++prospero 191 tcp Prospero Directory Service [B_Clifford_Neuman] [B_Clifford_Neuman] ++prospero 191 udp Prospero Directory Service [B_Clifford_Neuman] [B_Clifford_Neuman] ++osu-nms 192 tcp OSU Network Monitoring [Doug_Karl] [Doug_Karl] ++ System ++osu-nms 192 udp OSU Network Monitoring [Doug_Karl] [Doug_Karl] ++ System ++srmp 193 tcp Spider Remote Monitoring [Ted_J_Socolofsky] [Ted_J_Socolofsky] ++ Protocol ++srmp 193 udp Spider Remote Monitoring [Ted_J_Socolofsky] [Ted_J_Socolofsky] ++ Protocol ++irc 194 tcp Internet Relay Chat Protocol [Jarkko_Oikarinen] [Jarkko_Oikarinen] ++irc 194 udp Internet Relay Chat Protocol [Jarkko_Oikarinen] [Jarkko_Oikarinen] ++dn6-nlm-aud 195 tcp DNSIX Network Level Module ++ Audit ++dn6-nlm-aud 195 udp DNSIX Network Level Module ++ Audit ++dn6-smm-red 196 tcp DNSIX Session Mgt Module [Lawrence_Lebahn] [Lawrence_Lebahn] ++ Audit Redir ++dn6-smm-red 196 udp DNSIX Session Mgt Module [Lawrence_Lebahn] [Lawrence_Lebahn] ++ Audit Redir ++dls 197 tcp Directory Location Service ++dls 197 udp Directory Location Service ++dls-mon 198 tcp Directory Location Service [Scott_Bellew] [Scott_Bellew] ++ Monitor ++dls-mon 198 udp Directory Location Service [Scott_Bellew] [Scott_Bellew] ++ Monitor ++smux 199 tcp SMUX [Marshall_Rose] [Marshall_Rose] ++smux 199 udp SMUX [Marshall_Rose] [Marshall_Rose] ++src 200 tcp IBM System Resource [Gerald_McBrearty] [Gerald_McBrearty] ++ Controller ++src 200 udp IBM System Resource [Gerald_McBrearty] [Gerald_McBrearty] ++ Controller ++at-rtmp 201 tcp AppleTalk Routing ++ Maintenance ++at-rtmp 201 udp AppleTalk Routing ++ Maintenance ++at-nbp 202 tcp AppleTalk Name Binding ++at-nbp 202 udp AppleTalk Name Binding ++at-3 203 tcp AppleTalk Unused ++at-3 203 udp AppleTalk Unused ++at-echo 204 tcp AppleTalk Echo ++at-echo 204 udp AppleTalk Echo ++at-5 205 tcp AppleTalk Unused ++at-5 205 udp AppleTalk Unused ++at-zis 206 tcp AppleTalk Zone Information ++at-zis 206 udp AppleTalk Zone Information ++at-7 207 tcp AppleTalk Unused ++at-7 207 udp AppleTalk Unused ++at-8 208 tcp AppleTalk Unused [Rob_Chandhok] [Rob_Chandhok] ++at-8 208 udp AppleTalk Unused [Rob_Chandhok] [Rob_Chandhok] ++qmtp 209 tcp The Quick Mail Transfer [Dan_Bernstein] [Dan_Bernstein] ++ Protocol ++qmtp 209 udp The Quick Mail Transfer [Dan_Bernstein] [Dan_Bernstein] ++ Protocol ++ ANSI Z39.50 ++ ++z39-50 210 tcp IANA assigned this [Mark_H_Needleman] [Mark_H_Needleman] ++ well-formed service name as ++ a replacement for "z39.50". ++ This entry is an alias to "z39-50". This entry is now ++z39.50 210 tcp ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service ++ discovery mechanisms. ++ ANSI Z39.50 ++ ++z39-50 210 udp IANA assigned this [Mark_H_Needleman] [Mark_H_Needleman] ++ well-formed service name as ++ a replacement for "z39.50". ++ This entry is an alias to "z39-50". This entry is now ++z39.50 210 udp ANSI Z39.50 [Mark_H_Needleman] [Mark_H_Needleman] historic, not usable for use with many common service ++ discovery mechanisms. ++ Texas Instruments 914C/G ++ Terminal ++914c-g 211 tcp [Bill_Harrell] [Bill_Harrell] ++ IANA assigned this ++ well-formed service name as ++ a replacement for "914c/g". ++ Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now ++914c/g 211 tcp Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service ++ discovery mechanisms. ++ Texas Instruments 914C/G ++ Terminal ++914c-g 211 udp [Bill_Harrell] [Bill_Harrell] ++ IANA assigned this ++ well-formed service name as ++ a replacement for "914c/g". ++ Texas Instruments 914C/G This entry is an alias to "914c-g". This entry is now ++914c/g 211 udp Terminal [Bill_Harrell] [Bill_Harrell] historic, not usable for use with many common service ++ discovery mechanisms. ++anet 212 tcp ATEXSSTR [Jim_Taylor] [Jim_Taylor] ++anet 212 udp ATEXSSTR [Jim_Taylor] [Jim_Taylor] ++ipx 213 tcp IPX [Don_Provan] [Don_Provan] ++ipx 213 udp IPX [Don_Provan] [Don_Provan] ++vmpwscs 214 tcp VM PWSCS [Dan_Shia] [Dan_Shia] ++vmpwscs 214 udp VM PWSCS [Dan_Shia] [Dan_Shia] ++softpc 215 tcp Insignia Solutions [Martyn_Thomas] [Martyn_Thomas] ++softpc 215 udp Insignia Solutions [Martyn_Thomas] [Martyn_Thomas] ++CAIlic 216 tcp Computer Associates Int'l [Chuck_Spitz] [Chuck_Spitz] ++ License Server ++CAIlic 216 udp Computer Associates Int'l [Chuck_Spitz] [Chuck_Spitz] ++ License Server ++dbase 217 tcp dBASE Unix [Don_Gibson] [Don_Gibson] ++dbase 217 udp dBASE Unix [Don_Gibson] [Don_Gibson] ++mpp 218 tcp Netix Message Posting [Shannon_Yeh] [Shannon_Yeh] ++ Protocol ++mpp 218 udp Netix Message Posting [Shannon_Yeh] [Shannon_Yeh] ++ Protocol ++uarps 219 tcp Unisys ARPs [Ashok_Marwaha] [Ashok_Marwaha] ++uarps 219 udp Unisys ARPs [Ashok_Marwaha] [Ashok_Marwaha] ++imap3 220 tcp Interactive Mail Access [James_Rice] [James_Rice] ++ Protocol v3 ++imap3 220 udp Interactive Mail Access [James_Rice] [James_Rice] ++ Protocol v3 ++fln-spx 221 tcp Berkeley rlogind with SPX ++ auth ++fln-spx 221 udp Berkeley rlogind with SPX ++ auth ++rsh-spx 222 tcp Berkeley rshd with SPX auth ++rsh-spx 222 udp Berkeley rshd with SPX auth ++cdc 223 tcp Certificate Distribution [Kannan_Alagappan] [Kannan_Alagappan] ++ Center ++cdc 223 udp Certificate Distribution [Kannan_Alagappan] [Kannan_Alagappan] ++ Center ++masqdialer 224 tcp masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" ++masqdialer 224 udp masqdialer [Charles_Wright] [Charles_Wright] Possible Conflict of Port 222 with "Masqdialer" ++ 225-241 Reserved [Jon_Postel] [Jon_Postel] ++direct 242 tcp Direct [Herb_Sutter] [Herb_Sutter] ++direct 242 udp Direct [Herb_Sutter] [Herb_Sutter] ++sur-meas 243 tcp Survey Measurement [Dave_Clark] [Dave_Clark] ++sur-meas 243 udp Survey Measurement [Dave_Clark] [Dave_Clark] ++inbusiness 244 tcp inbusiness [Derrick_Hisatake] [Derrick_Hisatake] ++inbusiness 244 udp inbusiness [Derrick_Hisatake] [Derrick_Hisatake] ++link 245 tcp LINK ++link 245 udp LINK ++dsp3270 246 tcp Display Systems Protocol [Weldon_J_Showalter] [Weldon_J_Showalter] ++dsp3270 246 udp Display Systems Protocol [Weldon_J_Showalter] [Weldon_J_Showalter] ++ SUBNTBCST_TFTP ++ ++subntbcst-tftp 247 tcp IANA assigned this [John_Fake] [John_Fake] ++ well-formed service name as ++ a replacement for ++ "subntbcst_tftp". ++ This entry is an alias to "subntbcst-tftp". This entry is now ++subntbcst_tftp 247 tcp SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service ++ discovery mechanisms. ++ SUBNTBCST_TFTP ++ ++subntbcst-tftp 247 udp IANA assigned this [John_Fake] [John_Fake] ++ well-formed service name as ++ a replacement for ++ "subntbcst_tftp". ++ This entry is an alias to "subntbcst-tftp". This entry is now ++subntbcst_tftp 247 udp SUBNTBCST_TFTP [John_Fake] [John_Fake] historic, not usable for use with many common service ++ discovery mechanisms. ++bhfhs 248 tcp bhfhs [John_Kelly] [John_Kelly] ++bhfhs 248 udp bhfhs [John_Kelly] [John_Kelly] ++ 249-255 Reserved [Jon_Postel] [Jon_Postel] ++rap 256 tcp RAP [J_S_Greenfield] [J_S_Greenfield] ++rap 256 udp RAP [J_S_Greenfield] [J_S_Greenfield] ++set 257 tcp Secure Electronic [Donald_Eastlake] [Donald_Eastlake] ++ Transaction ++set 257 udp Secure Electronic [Donald_Eastlake] [Donald_Eastlake] ++ Transaction ++ 258 Unassigned 2006-09-13 ++esro-gen 259 tcp Efficient Short Remote [Mohsen_Banan] [Mohsen_Banan] ++ Operations ++esro-gen 259 udp Efficient Short Remote [Mohsen_Banan] [Mohsen_Banan] ++ Operations ++openport 260 tcp Openport [John_Marland] [John_Marland] ++openport 260 udp Openport [John_Marland] [John_Marland] ++nsiiops 261 tcp IIOP Name Service over [Jeff_Stewart] [Jeff_Stewart] ++ TLS/SSL ++nsiiops 261 udp IIOP Name Service over [Jeff_Stewart] [Jeff_Stewart] ++ TLS/SSL ++arcisdms 262 tcp Arcisdms [Russell_Crook] [Russell_Crook] ++arcisdms 262 udp Arcisdms [Russell_Crook] [Russell_Crook] ++hdap 263 tcp HDAP [Troy_Gau] [Troy_Gau] ++hdap 263 udp HDAP [Troy_Gau] [Troy_Gau] ++bgmp 264 tcp BGMP [Dave_Thaler] [Dave_Thaler] ++bgmp 264 udp BGMP [Dave_Thaler] [Dave_Thaler] ++x-bone-ctl 265 tcp X-Bone CTL [Joe_Touch] [Joe_Touch] ++x-bone-ctl 265 udp X-Bone CTL [Joe_Touch] [Joe_Touch] ++sst 266 tcp SCSI on ST [Donald_D_Woelz] [Donald_D_Woelz] ++sst 266 udp SCSI on ST [Donald_D_Woelz] [Donald_D_Woelz] ++td-service 267 tcp Tobit David Service Layer ++td-service 267 udp Tobit David Service Layer ++td-replica 268 tcp Tobit David Replica [Franz_Josef_Leuders] [Franz_Josef_Leuders] ++td-replica 268 udp Tobit David Replica [Franz_Josef_Leuders] [Franz_Josef_Leuders] ++manet 269 tcp MANET Protocols [RFC5498] ++manet 269 udp MANET Protocols [RFC5498] ++ 270 tcp Reserved ++gist 270 udp Q-mode encapsulation for [RFC5971] ++ GIST messages ++ 271-279 Unassigned ++http-mgmt 280 tcp http-mgmt [Adrian_Pell] [Adrian_Pell] ++http-mgmt 280 udp http-mgmt [Adrian_Pell] [Adrian_Pell] ++personal-link 281 tcp Personal Link [Dan_Cummings] [Dan_Cummings] ++personal-link 281 udp Personal Link [Dan_Cummings] [Dan_Cummings] ++cableport-ax 282 tcp Cable Port A/X [Craig_Langfahl] [Craig_Langfahl] ++cableport-ax 282 udp Cable Port A/X [Craig_Langfahl] [Craig_Langfahl] ++rescap 283 tcp rescap [Paul_Hoffman] [Paul_Hoffman] ++rescap 283 udp rescap [Paul_Hoffman] [Paul_Hoffman] ++corerjd 284 tcp corerjd [Chris_Thornhill] [Chris_Thornhill] ++corerjd 284 udp corerjd [Chris_Thornhill] [Chris_Thornhill] ++ 285 Unassigned ++fxp 286 tcp FXP Communication [James_Darnall] [James_Darnall] ++fxp 286 udp FXP Communication [James_Darnall] [James_Darnall] ++k-block 287 tcp K-BLOCK [Simon_P_Jackson] [Simon_P_Jackson] ++k-block 287 udp K-BLOCK [Simon_P_Jackson] [Simon_P_Jackson] ++ 288-307 Unassigned ++novastorbakcup 308 tcp Novastor Backup [Brian_Dickman] [Brian_Dickman] ++novastorbakcup 308 udp Novastor Backup [Brian_Dickman] [Brian_Dickman] ++entrusttime 309 tcp EntrustTime [Peter_Whittaker] [Peter_Whittaker] ++entrusttime 309 udp EntrustTime [Peter_Whittaker] [Peter_Whittaker] ++bhmds 310 tcp bhmds [John_Kelly] [John_Kelly] ++bhmds 310 udp bhmds [John_Kelly] [John_Kelly] ++asip-webadmin 311 tcp AppleShare IP WebAdmin [Ann_Huang] [Ann_Huang] ++asip-webadmin 311 udp AppleShare IP WebAdmin [Ann_Huang] [Ann_Huang] ++vslmp 312 tcp VSLMP [Gerben_Wierda] [Gerben_Wierda] ++vslmp 312 udp VSLMP [Gerben_Wierda] [Gerben_Wierda] ++magenta-logic 313 tcp Magenta Logic [Karl_Rousseau] [Karl_Rousseau] ++magenta-logic 313 udp Magenta Logic [Karl_Rousseau] [Karl_Rousseau] ++opalis-robot 314 tcp Opalis Robot [Laurent_Domenech] [Laurent_Domenech] ++opalis-robot 314 udp Opalis Robot [Laurent_Domenech] [Laurent_Domenech] ++dpsi 315 tcp DPSI [Tony_Scamurra] [Tony_Scamurra] ++dpsi 315 udp DPSI [Tony_Scamurra] [Tony_Scamurra] ++decauth 316 tcp decAuth [Michael_Agishtein] [Michael_Agishtein] ++decauth 316 udp decAuth [Michael_Agishtein] [Michael_Agishtein] ++zannet 317 tcp Zannet [Zan_Oliphant] [Zan_Oliphant] ++zannet 317 udp Zannet [Zan_Oliphant] [Zan_Oliphant] ++pkix-timestamp 318 tcp PKIX TimeStamp [Robert_Zuccherato] [Robert_Zuccherato] ++pkix-timestamp 318 udp PKIX TimeStamp [Robert_Zuccherato] [Robert_Zuccherato] ++ptp-event 319 tcp PTP Event [Kang_Lee] [Kang_Lee] 2010-07-27 ++ptp-event 319 udp PTP Event [Kang_Lee] [Kang_Lee] 2010-07-27 ++ptp-general 320 tcp PTP General [Kang_Lee] [Kang_Lee] 2010-07-27 ++ptp-general 320 udp PTP General [Kang_Lee] [Kang_Lee] 2010-07-27 ++pip 321 tcp PIP [Gordon_Mohr] [Gordon_Mohr] ++pip 321 udp PIP [Gordon_Mohr] [Gordon_Mohr] ++rtsps 322 tcp RTSPS [Anders_Klemets] [Anders_Klemets] ++rtsps 322 udp RTSPS [Anders_Klemets] [Anders_Klemets] ++rpki-rtr 323 tcp Resource PKI to Router [IESG] [IETF_Chair] [RFC-ietf-sidr-rpki-rtr-26] ++ Protocol ++ 323 udp Reserved ++rpki-rtr-tls 324 tcp Resource PKI to Router [IESG] [IETF_Chair] [RFC-ietf-sidr-rpki-rtr-26] ++ Protocol over TLS ++ 324 udp Reserved ++ 325-332 Unassigned ++texar 333 tcp Texar Security Port [Eugen_Bacic] [Eugen_Bacic] ++texar 333 udp Texar Security Port [Eugen_Bacic] [Eugen_Bacic] ++ 334-343 Unassigned ++pdap 344 tcp Prospero Data Access [B_Clifford_Neuman] [B_Clifford_Neuman] ++ Protocol ++pdap 344 udp Prospero Data Access [B_Clifford_Neuman] [B_Clifford_Neuman] ++ Protocol ++pawserv 345 tcp Perf Analysis Workbench ++pawserv 345 udp Perf Analysis Workbench ++zserv 346 tcp Zebra server ++zserv 346 udp Zebra server ++fatserv 347 tcp Fatmen Server ++fatserv 347 udp Fatmen Server ++csi-sgwp 348 tcp Cabletron Management ++ Protocol ++csi-sgwp 348 udp Cabletron Management ++ Protocol ++mftp 349 tcp mftp [Dave_Feinleib] [Dave_Feinleib] ++mftp 349 udp mftp [Dave_Feinleib] [Dave_Feinleib] ++matip-type-a 350 tcp MATIP Type A [Alain_Robert] [Alain_Robert] [RFC2351] ++matip-type-a 350 udp MATIP Type A [Alain_Robert] [Alain_Robert] [RFC2351] ++matip-type-b 351 tcp MATIP Type B [Alain_Robert] [Alain_Robert] [RFC2351] ++matip-type-b 351 udp MATIP Type B [Alain_Robert] [Alain_Robert] [RFC2351] ++bhoetty 351 tcp bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added ++ 5/21/97) ++bhoetty 351 udp bhoetty [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added ++ 5/21/97) ++dtag-ste-sb 352 tcp DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) ++dtag-ste-sb 352 udp DTAG [Ruediger_Wald] [Ruediger_Wald] (assigned long ago) ++bhoedap4 352 tcp bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added ++ 5/21/97) ++bhoedap4 352 udp bhoedap4 [John_Kelly] [John_Kelly] This entry records an unassigned but widespread use (added ++ 5/21/97) ++ndsauth 353 tcp NDSAUTH [Jayakumar_Ramalingam] [Jayakumar_Ramalingam] ++ndsauth 353 udp NDSAUTH [Jayakumar_Ramalingam] [Jayakumar_Ramalingam] ++bh611 354 tcp bh611 [John_Kelly] [John_Kelly] ++bh611 354 udp bh611 [John_Kelly] [John_Kelly] ++datex-asn 355 tcp DATEX-ASN [Kenneth_Vaughn] [Kenneth_Vaughn] ++datex-asn 355 udp DATEX-ASN [Kenneth_Vaughn] [Kenneth_Vaughn] ++cloanto-net-1 356 tcp Cloanto Net 1 [Michael_Battilana] [Michael_Battilana] 2010-04-30 ++cloanto-net-1 356 udp Cloanto Net 1 [Michael_Battilana] [Michael_Battilana] 2010-04-30 ++bhevent 357 tcp bhevent [John_Kelly] [John_Kelly] ++bhevent 357 udp bhevent [John_Kelly] [John_Kelly] ++shrinkwrap 358 tcp Shrinkwrap [Bill_Simpson] [Bill_Simpson] ++shrinkwrap 358 udp Shrinkwrap [Bill_Simpson] [Bill_Simpson] ++nsrmp 359 tcp Network Security Risk [Eric_Jacksch] [Eric_Jacksch] ++ Management Protocol ++nsrmp 359 udp Network Security Risk [Eric_Jacksch] [Eric_Jacksch] ++ Management Protocol ++scoi2odialog 360 tcp scoi2odialog [Keith_Petley] [Keith_Petley] ++scoi2odialog 360 udp scoi2odialog [Keith_Petley] [Keith_Petley] ++semantix 361 tcp Semantix [Semantix] [Semantix] ++semantix 361 udp Semantix [Semantix] [Semantix] ++srssend 362 tcp SRS Send [Curt_Mayer] [Curt_Mayer] ++srssend 362 udp SRS Send [Curt_Mayer] [Curt_Mayer] ++ RSVP Tunnel ++ ++rsvp-tunnel 363 tcp IANA assigned this [Andreas_Terzis] [Andreas_Terzis] ++ well-formed service name as ++ a replacement for ++ "rsvp_tunnel". ++ This entry is an alias to "rsvp-tunnel". This entry is now ++rsvp_tunnel 363 tcp RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service ++ discovery mechanisms. ++ RSVP Tunnel ++ ++rsvp-tunnel 363 udp IANA assigned this [Andreas_Terzis] [Andreas_Terzis] ++ well-formed service name as ++ a replacement for ++ "rsvp_tunnel". ++ This entry is an alias to "rsvp-tunnel". This entry is now ++rsvp_tunnel 363 udp RSVP Tunnel [Andreas_Terzis] [Andreas_Terzis] historic, not usable for use with many common service ++ discovery mechanisms. ++aurora-cmgr 364 tcp Aurora CMGR [Philip_Budne] [Philip_Budne] ++aurora-cmgr 364 udp Aurora CMGR [Philip_Budne] [Philip_Budne] ++dtk 365 tcp DTK [Fred_Cohen] [Fred_Cohen] ++dtk 365 udp DTK [Fred_Cohen] [Fred_Cohen] ++odmr 366 tcp ODMR [Randall_Gellens] [Randall_Gellens] ++odmr 366 udp ODMR [Randall_Gellens] [Randall_Gellens] ++mortgageware 367 tcp MortgageWare [Ole_Hellevik] [Ole_Hellevik] ++mortgageware 367 udp MortgageWare [Ole_Hellevik] [Ole_Hellevik] ++qbikgdp 368 tcp QbikGDP [Adrien_de_Croy] [Adrien_de_Croy] ++qbikgdp 368 udp QbikGDP [Adrien_de_Croy] [Adrien_de_Croy] ++rpc2portmap 369 tcp rpc2portmap ++rpc2portmap 369 udp rpc2portmap ++codaauth2 370 tcp codaauth2 [Robert_Watson] [Robert_Watson] ++codaauth2 370 udp codaauth2 [Robert_Watson] [Robert_Watson] ++clearcase 371 tcp Clearcase [Dave_LeBlang] [Dave_LeBlang] ++clearcase 371 udp Clearcase [Dave_LeBlang] [Dave_LeBlang] ++ulistproc 372 tcp ListProcessor [Anastasios_Kotsikona] [Anastasios_Kotsikona] ++ulistproc 372 udp ListProcessor [Anastasios_Kotsikona] [Anastasios_Kotsikona] ++legent-1 373 tcp Legent Corporation ++legent-1 373 udp Legent Corporation ++legent-2 374 tcp Legent Corporation [Keith_Boyce] [Keith_Boyce] ++legent-2 374 udp Legent Corporation [Keith_Boyce] [Keith_Boyce] ++hassle 375 tcp Hassle [Reinhard_Doelz] [Reinhard_Doelz] ++hassle 375 udp Hassle [Reinhard_Doelz] [Reinhard_Doelz] ++nip 376 tcp Amiga Envoy Network Inquiry [Heinz_Wrobel] [Heinz_Wrobel] ++ Proto ++nip 376 udp Amiga Envoy Network Inquiry [Heinz_Wrobel] [Heinz_Wrobel] ++ Proto ++tnETOS 377 tcp NEC Corporation ++tnETOS 377 udp NEC Corporation ++dsETOS 378 tcp NEC Corporation [Tomoo_Fujita] [Tomoo_Fujita] ++dsETOS 378 udp NEC Corporation [Tomoo_Fujita] [Tomoo_Fujita] ++is99c 379 tcp TIA/EIA/IS-99 modem client ++is99c 379 udp TIA/EIA/IS-99 modem client ++is99s 380 tcp TIA/EIA/IS-99 modem server [Frank_Quick] [Frank_Quick] ++is99s 380 udp TIA/EIA/IS-99 modem server [Frank_Quick] [Frank_Quick] ++hp-collector 381 tcp hp performance data ++ collector ++hp-collector 381 udp hp performance data ++ collector ++hp-managed-node 382 tcp hp performance data managed ++ node ++hp-managed-node 382 udp hp performance data managed ++ node ++hp-alarm-mgr 383 tcp hp performance data alarm [Frank_Blakely] [Frank_Blakely] ++ manager ++hp-alarm-mgr 383 udp hp performance data alarm [Frank_Blakely] [Frank_Blakely] ++ manager ++arns 384 tcp A Remote Network Server [David_Hornsby] [David_Hornsby] ++ System ++arns 384 udp A Remote Network Server [David_Hornsby] [David_Hornsby] ++ System ++ibm-app 385 tcp IBM Application [Lisa_Tomita] [Lisa_Tomita] ++ibm-app 385 udp IBM Application [Lisa_Tomita] [Lisa_Tomita] ++asa 386 tcp ASA Message Router Object [Steve_Laitinen] [Steve_Laitinen] ++ Def. ++asa 386 udp ASA Message Router Object [Steve_Laitinen] [Steve_Laitinen] ++ Def. ++aurp 387 tcp Appletalk Update-Based [Chris_Ranch] [Chris_Ranch] ++ Routing Pro. ++aurp 387 udp Appletalk Update-Based [Chris_Ranch] [Chris_Ranch] ++ Routing Pro. ++unidata-ldm 388 tcp Unidata LDM [University_Corporation_for_Atmospheric_Research2] [Steven_Emmerson2] 2012-05-18 ++unidata-ldm 388 udp Unidata LDM [University_Corporation_for_Atmospheric_Research2] [Steven_Emmerson2] 2012-05-18 ++ldap 389 tcp Lightweight Directory Access [Tim_Howes] [Tim_Howes] ++ Protocol ++ldap 389 udp Lightweight Directory Access [Tim_Howes] [Tim_Howes] ++ Protocol ++uis 390 tcp UIS [Ed_Barron] [Ed_Barron] ++uis 390 udp UIS [Ed_Barron] [Ed_Barron] ++synotics-relay 391 tcp SynOptics SNMP Relay Port ++synotics-relay 391 udp SynOptics SNMP Relay Port ++synotics-broker 392 tcp SynOptics Port Broker Port [Illan_Raab] [Illan_Raab] ++synotics-broker 392 udp SynOptics Port Broker Port [Illan_Raab] [Illan_Raab] ++meta5 393 tcp Meta5 [Jim_Kanzler] [Jim_Kanzler] ++meta5 393 udp Meta5 [Jim_Kanzler] [Jim_Kanzler] ++embl-ndt 394 tcp EMBL Nucleic Data Transfer [Peter_Gad] [Peter_Gad] ++embl-ndt 394 udp EMBL Nucleic Data Transfer [Peter_Gad] [Peter_Gad] ++netcp 395 tcp NetScout Control Protocol [Ashwani_Singhal] [Ashwani_Singhal] 2010-04-07 ++netcp 395 udp NetScout Control Protocol [Ashwani_Singhal] [Ashwani_Singhal] 2010-04-07 ++netware-ip 396 tcp Novell Netware over IP ++netware-ip 396 udp Novell Netware over IP ++mptn 397 tcp Multi Protocol Trans. Net. [Soumitra_Sarkar] [Soumitra_Sarkar] ++mptn 397 udp Multi Protocol Trans. Net. [Soumitra_Sarkar] [Soumitra_Sarkar] ++kryptolan 398 tcp Kryptolan [Peter_de_Laval] [Peter_de_Laval] ++kryptolan 398 udp Kryptolan [Peter_de_Laval] [Peter_de_Laval] ++iso-tsap-c2 399 tcp ISO Transport Class 2 [Yanick_Pouffary] [Yanick_Pouffary] ++ Non-Control over TCP ++iso-tsap-c2 399 udp ISO Transport Class 2 [Yanick_Pouffary] [Yanick_Pouffary] ++ Non-Control over UDP ++osb-sd 400 tcp Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions ++osb-sd 400 udp Oracle Secure Backup [Joseph_Dziedzic] [Joseph_Dziedzic] 2008-06-06 Formerly was Workstation Solutions ++ups 401 tcp Uninterruptible Power Supply [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++ups 401 udp Uninterruptible Power Supply [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++genie 402 tcp Genie Protocol [Mark_Hankin] [Mark_Hankin] ++genie 402 udp Genie Protocol [Mark_Hankin] [Mark_Hankin] ++decap 403 tcp decap ++decap 403 udp decap ++nced 404 tcp nced ++nced 404 udp nced ++ncld 405 tcp ncld [Richard_Jones] [Richard_Jones] ++ncld 405 udp ncld [Richard_Jones] [Richard_Jones] ++imsp 406 tcp Interactive Mail Support [John_Myers] [John_Myers] ++ Protocol ++imsp 406 udp Interactive Mail Support [John_Myers] [John_Myers] ++ Protocol ++timbuktu 407 tcp Timbuktu [Marc_Epard] [Marc_Epard] ++timbuktu 407 udp Timbuktu [Marc_Epard] [Marc_Epard] ++prm-sm 408 tcp Prospero Resource Manager ++ Sys. Man. ++prm-sm 408 udp Prospero Resource Manager ++ Sys. Man. ++prm-nm 409 tcp Prospero Resource Manager [B_Clifford_Neuman] [B_Clifford_Neuman] ++ Node Man. ++prm-nm 409 udp Prospero Resource Manager [B_Clifford_Neuman] [B_Clifford_Neuman] ++ Node Man. ++decladebug 410 tcp DECLadebug Remote Debug [Hewlett_Packard] [Hewlett_Packard] ++ Protocol ++decladebug 410 udp DECLadebug Remote Debug [Hewlett_Packard] [Hewlett_Packard] ++ Protocol ++rmt 411 tcp Remote MT Protocol [Peter_Eriksson] [Peter_Eriksson] ++rmt 411 udp Remote MT Protocol [Peter_Eriksson] [Peter_Eriksson] ++synoptics-trap 412 tcp Trap Convention Port [Illan_Raab] [Illan_Raab] ++synoptics-trap 412 udp Trap Convention Port [Illan_Raab] [Illan_Raab] ++smsp 413 tcp Storage Management Services [Murthy_Srinivas] [Murthy_Srinivas] ++ Protocol ++smsp 413 udp Storage Management Services [Murthy_Srinivas] [Murthy_Srinivas] ++ Protocol ++infoseek 414 tcp InfoSeek [Steve_Kirsch] [Steve_Kirsch] ++infoseek 414 udp InfoSeek [Steve_Kirsch] [Steve_Kirsch] ++bnet 415 tcp BNet [Jim_Mertz] [Jim_Mertz] ++bnet 415 udp BNet [Jim_Mertz] [Jim_Mertz] ++silverplatter 416 tcp Silverplatter [Peter_Ciuffetti] [Peter_Ciuffetti] ++silverplatter 416 udp Silverplatter [Peter_Ciuffetti] [Peter_Ciuffetti] ++onmux 417 tcp Onmux [Stephen_Hanna] [Stephen_Hanna] ++onmux 417 udp Onmux [Stephen_Hanna] [Stephen_Hanna] ++hyper-g 418 tcp Hyper-G [Frank_Kappe] [Frank_Kappe] ++hyper-g 418 udp Hyper-G [Frank_Kappe] [Frank_Kappe] ++ariel1 419 tcp Ariel 1 [Joel_Karafin] [Joel_Karafin] ++ariel1 419 udp Ariel 1 [Joel_Karafin] [Joel_Karafin] ++smpte 420 tcp SMPTE [Si_Becker] [Si_Becker] ++smpte 420 udp SMPTE [Si_Becker] [Si_Becker] ++ariel2 421 tcp Ariel 2 ++ariel2 421 udp Ariel 2 ++ariel3 422 tcp Ariel 3 [Joel_Karafin] [Joel_Karafin] ++ariel3 422 udp Ariel 3 [Joel_Karafin] [Joel_Karafin] ++opc-job-start 423 tcp IBM Operations Planning and ++ Control Start ++opc-job-start 423 udp IBM Operations Planning and ++ Control Start ++opc-job-track 424 tcp IBM Operations Planning and [Conny_Larsson] [Conny_Larsson] ++ Control Track ++opc-job-track 424 udp IBM Operations Planning and [Conny_Larsson] [Conny_Larsson] ++ Control Track ++icad-el 425 tcp ICAD [Larry_Stone] [Larry_Stone] ++icad-el 425 udp ICAD [Larry_Stone] [Larry_Stone] ++smartsdp 426 tcp smartsdp [Marie_Pierre_Belange] [Marie_Pierre_Belange] ++smartsdp 426 udp smartsdp [Marie_Pierre_Belange] [Marie_Pierre_Belange] ++svrloc 427 tcp Server Location [Veizades] [Veizades] ++svrloc 427 udp Server Location [Veizades] [Veizades] ++ OCS_CMU ++ ++ocs-cmu 428 tcp IANA assigned this ++ well-formed service name as ++ a replacement for "ocs_cmu". ++ This entry is an alias to "ocs-cmu". This entry is now ++ocs_cmu 428 tcp OCS_CMU historic, not usable for use with many common service ++ discovery mechanisms. ++ OCS_CMU ++ ++ocs-cmu 428 udp IANA assigned this ++ well-formed service name as ++ a replacement for "ocs_cmu". ++ This entry is an alias to "ocs-cmu". This entry is now ++ocs_cmu 428 udp OCS_CMU historic, not usable for use with many common service ++ discovery mechanisms. ++ OCS_AMU ++ ++ocs-amu 429 tcp IANA assigned this [Florence_Wyman] [Florence_Wyman] ++ well-formed service name as ++ a replacement for "ocs_amu". ++ This entry is an alias to "ocs-amu". This entry is now ++ocs_amu 429 tcp OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service ++ discovery mechanisms. ++ OCS_AMU ++ ++ocs-amu 429 udp IANA assigned this [Florence_Wyman] [Florence_Wyman] ++ well-formed service name as ++ a replacement for "ocs_amu". ++ This entry is an alias to "ocs-amu". This entry is now ++ocs_amu 429 udp OCS_AMU [Florence_Wyman] [Florence_Wyman] historic, not usable for use with many common service ++ discovery mechanisms. ++utmpsd 430 tcp UTMPSD ++utmpsd 430 udp UTMPSD ++utmpcd 431 tcp UTMPCD ++utmpcd 431 udp UTMPCD ++iasd 432 tcp IASD [Nir_Baroz] [Nir_Baroz] ++iasd 432 udp IASD [Nir_Baroz] [Nir_Baroz] ++nnsp 433 tcp NNSP [Rob_Robertson] [Rob_Robertson] ++nnsp 433 udp NNSP [Rob_Robertson] [Rob_Robertson] ++mobileip-agent 434 tcp MobileIP-Agent ++mobileip-agent 434 udp MobileIP-Agent ++mobilip-mn 435 tcp MobilIP-MN [Kannan_Alagappan_2] [Kannan_Alagappan_2] ++mobilip-mn 435 udp MobilIP-MN [Kannan_Alagappan_2] [Kannan_Alagappan_2] ++dna-cml 436 tcp DNA-CML [Dan_Flowers] [Dan_Flowers] ++dna-cml 436 udp DNA-CML [Dan_Flowers] [Dan_Flowers] ++comscm 437 tcp comscm [Jim_Teague] [Jim_Teague] ++comscm 437 udp comscm [Jim_Teague] [Jim_Teague] ++dsfgw 438 tcp dsfgw [Andy_McKeen] [Andy_McKeen] ++dsfgw 438 udp dsfgw [Andy_McKeen] [Andy_McKeen] ++dasp 439 tcp dasp [Thomas_Obermair] [Thomas_Obermair] ++dasp 439 udp dasp [Thomas_Obermair] [Thomas_Obermair] ++sgcp 440 tcp sgcp [Marshall_Rose] [Marshall_Rose] ++sgcp 440 udp sgcp [Marshall_Rose] [Marshall_Rose] ++decvms-sysmgt 441 tcp decvms-sysmgt [Lee_Barton] [Lee_Barton] ++decvms-sysmgt 441 udp decvms-sysmgt [Lee_Barton] [Lee_Barton] ++ cvc_hostd ++ ++cvc-hostd 442 tcp IANA assigned this [Bill_Davidson] [Bill_Davidson] ++ well-formed service name as ++ a replacement for ++ "cvc_hostd". ++ This entry is an alias to "cvc-hostd". This entry is now ++cvc_hostd 442 tcp cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service ++ discovery mechanisms. ++ cvc_hostd ++ ++cvc-hostd 442 udp IANA assigned this [Bill_Davidson] [Bill_Davidson] ++ well-formed service name as ++ a replacement for ++ "cvc_hostd". ++ This entry is an alias to "cvc-hostd". This entry is now ++cvc_hostd 442 udp cvc_hostd [Bill_Davidson] [Bill_Davidson] historic, not usable for use with many common service ++ discovery mechanisms. ++https 443 tcp http protocol over TLS/SSL [Kipp_E_B_Hickman] [Kipp_E_B_Hickman] ++https 443 udp http protocol over TLS/SSL [Kipp_E_B_Hickman] [Kipp_E_B_Hickman] ++https 443 sctp HTTPS [Randall_Stewart] [Randall_Stewart] [RFC4960] ++snpp 444 tcp Simple Network Paging [RFC1568] ++ Protocol ++snpp 444 udp Simple Network Paging [RFC1568] ++ Protocol ++microsoft-ds 445 tcp Microsoft-DS [Pradeep_Bahl] [Pradeep_Bahl] ++microsoft-ds 445 udp Microsoft-DS [Pradeep_Bahl] [Pradeep_Bahl] ++ddm-rdb 446 tcp DDM-Remote Relational ++ Database Access ++ddm-rdb 446 udp DDM-Remote Relational ++ Database Access ++ddm-dfm 447 tcp DDM-Distributed File [Steven_Ritland] [Steven_Ritland] ++ Management ++ddm-dfm 447 udp DDM-Distributed File [Steven_Ritland] [Steven_Ritland] ++ Management ++ddm-ssl 448 tcp DDM-Remote DB Access Using [Steven_Ritland] [Steven_Ritland] ++ Secure Sockets ++ddm-ssl 448 udp DDM-Remote DB Access Using [Steven_Ritland] [Steven_Ritland] ++ Secure Sockets ++as-servermap 449 tcp AS Server Mapper [Barbara_Foss] [Barbara_Foss] ++as-servermap 449 udp AS Server Mapper [Barbara_Foss] [Barbara_Foss] ++ Computer Supported ++tserver 450 tcp Telecomunication [Harvey_S_Schultz] [Harvey_S_Schultz] ++ Applications ++ Computer Supported ++tserver 450 udp Telecomunication [Harvey_S_Schultz] [Harvey_S_Schultz] ++ Applications ++sfs-smp-net 451 tcp Cray Network Semaphore ++ server ++sfs-smp-net 451 udp Cray Network Semaphore ++ server ++sfs-config 452 tcp Cray SFS config server [Walter_Poxon] [Walter_Poxon] ++sfs-config 452 udp Cray SFS config server [Walter_Poxon] [Walter_Poxon] ++creativeserver 453 tcp CreativeServer ++creativeserver 453 udp CreativeServer ++contentserver 454 tcp ContentServer ++contentserver 454 udp ContentServer ++creativepartnr 455 tcp CreativePartnr [Jesus_Ortiz] [Jesus_Ortiz] ++creativepartnr 455 udp CreativePartnr [Jesus_Ortiz] [Jesus_Ortiz] ++macon-tcp 456 tcp macon-tcp [Yoshinobu_Inoue] [Yoshinobu_Inoue] ++macon-udp 456 udp macon-udp [Yoshinobu_Inoue] [Yoshinobu_Inoue] ++scohelp 457 tcp scohelp [Faith_Zack] [Faith_Zack] ++scohelp 457 udp scohelp [Faith_Zack] [Faith_Zack] ++appleqtc 458 tcp apple quick time [Murali_Ranganathan] [Murali_Ranganathan] ++appleqtc 458 udp apple quick time [Murali_Ranganathan] [Murali_Ranganathan] ++ampr-rcmd 459 tcp ampr-rcmd [Rob_Janssen] [Rob_Janssen] ++ampr-rcmd 459 udp ampr-rcmd [Rob_Janssen] [Rob_Janssen] ++skronk 460 tcp skronk [Henry_Strickland] [Henry_Strickland] ++skronk 460 udp skronk [Henry_Strickland] [Henry_Strickland] ++datasurfsrv 461 tcp DataRampSrv ++datasurfsrv 461 udp DataRampSrv ++datasurfsrvsec 462 tcp DataRampSrvSec [Diane_Downie] [Diane_Downie] ++datasurfsrvsec 462 udp DataRampSrvSec [Diane_Downie] [Diane_Downie] ++alpes 463 tcp alpes [Alain_Durand] [Alain_Durand] ++alpes 463 udp alpes [Alain_Durand] [Alain_Durand] ++kpasswd 464 tcp kpasswd [Theodore_Ts_o] [Theodore_Ts_o] ++kpasswd 464 udp kpasswd [Theodore_Ts_o] [Theodore_Ts_o] ++urd 465 tcp URL Rendesvous Directory for ++ SSM ++igmpv3lite 465 udp IGMP over UDP for SSM [Toerless_Eckert] [Toerless_Eckert] ++digital-vrc 466 tcp digital-vrc [Peter_Higginson] [Peter_Higginson] ++digital-vrc 466 udp digital-vrc [Peter_Higginson] [Peter_Higginson] ++mylex-mapd 467 tcp mylex-mapd [Gary_Lewis] [Gary_Lewis] ++mylex-mapd 467 udp mylex-mapd [Gary_Lewis] [Gary_Lewis] ++photuris 468 tcp proturis [Bill_Simpson_2] [Bill_Simpson_2] ++photuris 468 udp proturis [Bill_Simpson_2] [Bill_Simpson_2] ++rcp 469 tcp Radio Control Protocol [Jim_Jennings] [Jim_Jennings] ++rcp 469 udp Radio Control Protocol [Jim_Jennings] [Jim_Jennings] ++scx-proxy 470 tcp scx-proxy [Scott_Narveson] [Scott_Narveson] ++scx-proxy 470 udp scx-proxy [Scott_Narveson] [Scott_Narveson] ++mondex 471 tcp Mondex [Bill_Reding] [Bill_Reding] ++mondex 471 udp Mondex [Bill_Reding] [Bill_Reding] ++ljk-login 472 tcp ljk-login [LJK] [LJK] ++ljk-login 472 udp ljk-login [LJK] [LJK] ++hybrid-pop 473 tcp hybrid-pop [Rami_Rubin] [Rami_Rubin] ++hybrid-pop 473 udp hybrid-pop [Rami_Rubin] [Rami_Rubin] ++tn-tl-w1 474 tcp tn-tl-w1 ++tn-tl-w2 474 udp tn-tl-w2 [Ed_Kress] [Ed_Kress] ++tcpnethaspsrv 475 tcp tcpnethaspsrv [Michael_Zunke] [Michael_Zunke] 2010-07-23 ++tcpnethaspsrv 475 udp tcpnethaspsrv [Michael_Zunke] [Michael_Zunke] 2010-07-23 ++tn-tl-fd1 476 tcp tn-tl-fd1 [Ed_Kress] [Ed_Kress] ++tn-tl-fd1 476 udp tn-tl-fd1 [Ed_Kress] [Ed_Kress] ++ss7ns 477 tcp ss7ns [Jean_Michel_URSCH] [Jean_Michel_URSCH] ++ss7ns 477 udp ss7ns [Jean_Michel_URSCH] [Jean_Michel_URSCH] ++spsc 478 tcp spsc [Mike_Rieker] [Mike_Rieker] ++spsc 478 udp spsc [Mike_Rieker] [Mike_Rieker] ++iafserver 479 tcp iafserver ++iafserver 479 udp iafserver ++iafdbase 480 tcp iafdbase [Rick_Yazwinski] [Rick_Yazwinski] ++iafdbase 480 udp iafdbase [Rick_Yazwinski] [Rick_Yazwinski] ++ph 481 tcp Ph service [Roland_Hedberg] [Roland_Hedberg] ++ph 481 udp Ph service [Roland_Hedberg] [Roland_Hedberg] ++bgs-nsi 482 tcp bgs-nsi [Jon_Saperia] [Jon_Saperia] ++bgs-nsi 482 udp bgs-nsi [Jon_Saperia] [Jon_Saperia] ++ulpnet 483 tcp ulpnet [Kevin_Mooney] [Kevin_Mooney] ++ulpnet 483 udp ulpnet [Kevin_Mooney] [Kevin_Mooney] ++integra-sme 484 tcp Integra Software Management [Randall_Dow] [Randall_Dow] ++ Environment ++integra-sme 484 udp Integra Software Management [Randall_Dow] [Randall_Dow] ++ Environment ++powerburst 485 tcp Air Soft Power Burst [gary] [gary] ++powerburst 485 udp Air Soft Power Burst [gary] [gary] ++avian 486 tcp avian [Robert_Ullmann_2] [Robert_Ullmann_2] ++avian 486 udp avian [Robert_Ullmann_2] [Robert_Ullmann_2] ++saft 487 tcp saft Simple Asynchronous [Ulli_Horlacher] [Ulli_Horlacher] ++ File Transfer ++saft 487 udp saft Simple Asynchronous [Ulli_Horlacher] [Ulli_Horlacher] ++ File Transfer ++gss-http 488 tcp gss-http [Doug_Rosenthal] [Doug_Rosenthal] ++gss-http 488 udp gss-http [Doug_Rosenthal] [Doug_Rosenthal] ++nest-protocol 489 tcp nest-protocol [Gilles_Gameiro] [Gilles_Gameiro] ++nest-protocol 489 udp nest-protocol [Gilles_Gameiro] [Gilles_Gameiro] ++micom-pfs 490 tcp micom-pfs [David_Misunas] [David_Misunas] ++micom-pfs 490 udp micom-pfs [David_Misunas] [David_Misunas] ++go-login 491 tcp go-login [Troy_Morrison] [Troy_Morrison] ++go-login 491 udp go-login [Troy_Morrison] [Troy_Morrison] ++ticf-1 492 tcp Transport Independent ++ Convergence for FNA ++ticf-1 492 udp Transport Independent ++ Convergence for FNA ++ticf-2 493 tcp Transport Independent [Mamoru_Ito] [Mamoru_Ito] ++ Convergence for FNA ++ticf-2 493 udp Transport Independent [Mamoru_Ito] [Mamoru_Ito] ++ Convergence for FNA ++pov-ray 494 tcp POV-Ray [POV_Team_Co_ordinato] [POV_Team_Co_ordinato] ++pov-ray 494 udp POV-Ray [POV_Team_Co_ordinato] [POV_Team_Co_ordinato] ++intecourier 495 tcp intecourier [Steve_Favor] [Steve_Favor] ++intecourier 495 udp intecourier [Steve_Favor] [Steve_Favor] ++pim-rp-disc 496 tcp PIM-RP-DISC [Dino_Farinacci] [Dino_Farinacci] ++pim-rp-disc 496 udp PIM-RP-DISC [Dino_Farinacci] [Dino_Farinacci] ++retrospect 497 tcp Retrospect backup and [Retrospect_Inc] [JG_Heithcock] 2012-02-02 ++ restore service ++retrospect 497 udp Retrospect backup and [Retrospect_Inc] [JG_Heithcock] 2012-02-02 ++ restore service ++siam 498 tcp siam [Philippe_Gilbert] [Philippe_Gilbert] ++siam 498 udp siam [Philippe_Gilbert] [Philippe_Gilbert] ++iso-ill 499 tcp ISO ILL Protocol [Mark_H_Needleman] [Mark_H_Needleman] ++iso-ill 499 udp ISO ILL Protocol [Mark_H_Needleman] [Mark_H_Needleman] ++isakmp 500 tcp isakmp [Mark_Schertler] [Mark_Schertler] ++isakmp 500 udp isakmp [Mark_Schertler] [Mark_Schertler] ++stmf 501 tcp STMF [Alan_Ungar] [Alan_Ungar] ++stmf 501 udp STMF [Alan_Ungar] [Alan_Ungar] ++asa-appl-proto 502 tcp asa-appl-proto [Dennis_Dube] [Dennis_Dube] ++asa-appl-proto 502 udp asa-appl-proto [Dennis_Dube] [Dennis_Dube] ++intrinsa 503 tcp Intrinsa [Robert_Ford] [Robert_Ford] ++intrinsa 503 udp Intrinsa [Robert_Ford] [Robert_Ford] ++citadel 504 tcp citadel [Art_Cancro] [Art_Cancro] ++citadel 504 udp citadel [Art_Cancro] [Art_Cancro] ++mailbox-lm 505 tcp mailbox-lm [Beverly_Moody] [Beverly_Moody] ++mailbox-lm 505 udp mailbox-lm [Beverly_Moody] [Beverly_Moody] ++ohimsrv 506 tcp ohimsrv [Scott_Powell] [Scott_Powell] ++ohimsrv 506 udp ohimsrv [Scott_Powell] [Scott_Powell] ++crs 507 tcp crs [Brad_Wright] [Brad_Wright] ++crs 507 udp crs [Brad_Wright] [Brad_Wright] ++xvttp 508 tcp xvttp [Keith_J_Alphonso] [Keith_J_Alphonso] ++xvttp 508 udp xvttp [Keith_J_Alphonso] [Keith_J_Alphonso] ++snare 509 tcp snare [Dennis_Batchelder] [Dennis_Batchelder] ++snare 509 udp snare [Dennis_Batchelder] [Dennis_Batchelder] ++fcp 510 tcp FirstClass Protocol [Mike_Marshburn] [Mike_Marshburn] ++fcp 510 udp FirstClass Protocol [Mike_Marshburn] [Mike_Marshburn] ++passgo 511 tcp PassGo [John_Rainford] [John_Rainford] ++passgo 511 udp PassGo [John_Rainford] [John_Rainford] ++ remote process execution; ++exec 512 tcp authentication performed ++ using passwords and UNIX ++ login names ++comsat 512 udp ++ used by mail system to ++ notify users of new mail ++biff 512 udp received; currently receives ++ messages only from processes ++ on the same machine ++ remote login a la telnet; ++ automatic authentication ++ performed based on ++login 513 tcp priviledged port numbers and ++ distributed data bases which ++ identify "authentication ++ domains" ++ maintains data bases showing ++who 513 udp who's logged in to machines ++ on a local net and the load ++ average of the machine ++ cmd like exec, but automatic ++shell 514 tcp authentication is performed ++ as for login server ++syslog 514 udp ++printer 515 tcp spooler ++printer 515 udp spooler ++videotex 516 tcp videotex [Daniel_Mavrakis] [Daniel_Mavrakis] ++videotex 516 udp videotex [Daniel_Mavrakis] [Daniel_Mavrakis] ++ like tenex link, but across ++ machine - unfortunately, ++ doesn't use link protocol ++talk 517 tcp (this is actually just a ++ rendezvous port from which a ++ tcp connection is ++ established) ++ like tenex link, but across ++ machine - unfortunately, ++ doesn't use link protocol ++talk 517 udp (this is actually just a ++ rendezvous port from which a ++ tcp connection is ++ established) ++ntalk 518 tcp ++ntalk 518 udp ++utime 519 tcp unixtime ++utime 519 udp unixtime ++efs 520 tcp extended file name server ++ local routing process (on ++router 520 udp site); uses variant of Xerox ++ NS routing information ++ protocol - RIP ++ripng 521 tcp ripng [Robert_E_Minnear] [Robert_E_Minnear] ++ripng 521 udp ripng [Robert_E_Minnear] [Robert_E_Minnear] ++ulp 522 tcp ULP [Max_Morris] [Max_Morris] ++ulp 522 udp ULP [Max_Morris] [Max_Morris] ++ibm-db2 523 tcp IBM-DB2 [Juliana_Hsu] [Juliana_Hsu] ++ibm-db2 523 udp IBM-DB2 [Juliana_Hsu] [Juliana_Hsu] ++ncp 524 tcp NCP [Don_Provan_2] [Don_Provan_2] ++ncp 524 udp NCP [Don_Provan_2] [Don_Provan_2] ++timed 525 tcp timeserver ++timed 525 udp timeserver ++tempo 526 tcp newdate ++tempo 526 udp newdate ++stx 527 tcp Stock IXChange [Fraxion_Software] [Ferdi_Ladeira] 2012-03-21 ++stx 527 udp Stock IXChange [Fraxion_Software] [Ferdi_Ladeira] 2012-03-21 ++custix 528 tcp Customer IXChange [Fraxion_Software] [Ferdi_Ladeira] 2012-03-21 ++custix 528 udp Customer IXChange [Fraxion_Software] [Ferdi_Ladeira] 2012-03-21 ++irc-serv 529 tcp IRC-SERV [Brian_Tackett] [Brian_Tackett] ++irc-serv 529 udp IRC-SERV [Brian_Tackett] [Brian_Tackett] ++courier 530 tcp rpc ++courier 530 udp rpc ++conference 531 tcp chat ++conference 531 udp chat ++netnews 532 tcp readnews ++netnews 532 udp readnews ++netwall 533 tcp for emergency broadcasts [Andreas_Heidemann] [Andreas_Heidemann] ++netwall 533 udp for emergency broadcasts [Andreas_Heidemann] [Andreas_Heidemann] ++windream 534 tcp windream Admin [Uwe_Honermann] [Uwe_Honermann] ++windream 534 udp windream Admin [Uwe_Honermann] [Uwe_Honermann] ++iiop 535 tcp iiop [Jeff_M_Michaud] [Jeff_M_Michaud] ++iiop 535 udp iiop [Jeff_M_Michaud] [Jeff_M_Michaud] ++opalis-rdv 536 tcp opalis-rdv [Laurent_Domenech] [Laurent_Domenech] ++opalis-rdv 536 udp opalis-rdv [Laurent_Domenech] [Laurent_Domenech] ++nmsp 537 tcp Networked Media Streaming [Paul_Santinelli_Jr] [Paul_Santinelli_Jr] ++ Protocol ++nmsp 537 udp Networked Media Streaming [Paul_Santinelli_Jr] [Paul_Santinelli_Jr] ++ Protocol ++gdomap 538 tcp gdomap [Richard_Frith_Macdon] [Richard_Frith_Macdon] ++gdomap 538 udp gdomap [Richard_Frith_Macdon] [Richard_Frith_Macdon] ++apertus-ldp 539 tcp Apertus Technologies Load ++ Determination ++apertus-ldp 539 udp Apertus Technologies Load ++ Determination ++uucp 540 tcp uucpd ++uucp 540 udp uucpd ++uucp-rlogin 541 tcp uucp-rlogin [Stuart_Lynne] [Stuart_Lynne] ++uucp-rlogin 541 udp uucp-rlogin [Stuart_Lynne] [Stuart_Lynne] ++commerce 542 tcp commerce [Randy_Epstein] [Randy_Epstein] ++commerce 542 udp commerce [Randy_Epstein] [Randy_Epstein] ++klogin 543 tcp ++klogin 543 udp ++kshell 544 tcp krcmd ++kshell 544 udp krcmd ++appleqtcsrvr 545 tcp appleqtcsrvr [Murali_Ranganathan] [Murali_Ranganathan] ++appleqtcsrvr 545 udp appleqtcsrvr [Murali_Ranganathan] [Murali_Ranganathan] ++dhcpv6-client 546 tcp DHCPv6 Client ++dhcpv6-client 546 udp DHCPv6 Client ++dhcpv6-server 547 tcp DHCPv6 Server [Jim_Bound] [Jim_Bound] ++dhcpv6-server 547 udp DHCPv6 Server [Jim_Bound] [Jim_Bound] ++afpovertcp 548 tcp AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> ++afpovertcp 548 udp AFP over TCP [Leland_Wallace] [Leland_Wallace] Defined TXT keys: u=<username> p=<password> path=<path> ++idfp 549 tcp IDFP [Ramana_Kovi] [Ramana_Kovi] ++idfp 549 udp IDFP [Ramana_Kovi] [Ramana_Kovi] ++new-rwho 550 tcp new-who [n/a] ++new-rwho 550 udp new-who [n/a] ++cybercash 551 tcp cybercash [Donald_E_Eastlake] [Donald_E_Eastlake] [RFC1898] ++cybercash 551 udp cybercash [Donald_E_Eastlake] [Donald_E_Eastlake] [RFC1898] ++devshr-nts 552 tcp DeviceShare [Benjamin_Rosenberg] [Benjamin_Rosenberg] ++devshr-nts 552 udp DeviceShare [Benjamin_Rosenberg] [Benjamin_Rosenberg] ++pirp 553 tcp pirp [D_J_Bernstein] [D_J_Bernstein] ++pirp 553 udp pirp [D_J_Bernstein] [D_J_Bernstein] ++rtsp 554 tcp Real Time Streaming Protocol [Rob_Lanphier] [Rob_Lanphier] ++ (RTSP) ++rtsp 554 udp Real Time Streaming Protocol [Rob_Lanphier] [Rob_Lanphier] ++ (RTSP) ++dsf 555 tcp ++dsf 555 udp ++remotefs 556 tcp rfs server ++remotefs 556 udp rfs server ++openvms-sysipc 557 tcp openvms-sysipc [Alan_Potter] [Alan_Potter] ++openvms-sysipc 557 udp openvms-sysipc [Alan_Potter] [Alan_Potter] ++sdnskmp 558 tcp SDNSKMP ++sdnskmp 558 udp SDNSKMP ++teedtap 559 tcp TEEDTAP [Charlie_Limoges] [Charlie_Limoges] ++teedtap 559 udp TEEDTAP [Charlie_Limoges] [Charlie_Limoges] ++rmonitor 560 tcp rmonitord ++rmonitor 560 udp rmonitord ++monitor 561 tcp ++monitor 561 udp ++chshell 562 tcp chcmd ++chshell 562 udp chcmd ++nntps 563 tcp nntp protocol over TLS/SSL [Kipp_E_B_Hickman_2] [Kipp_E_B_Hickman_2] ++ (was snntp) ++nntps 563 udp nntp protocol over TLS/SSL [Kipp_E_B_Hickman_2] [Kipp_E_B_Hickman_2] ++ (was snntp) ++9pfs 564 tcp plan 9 file service ++9pfs 564 udp plan 9 file service ++whoami 565 tcp whoami ++whoami 565 udp whoami ++streettalk 566 tcp streettalk ++streettalk 566 udp streettalk ++banyan-rpc 567 tcp banyan-rpc [Tom_Lemaire] [Tom_Lemaire] ++banyan-rpc 567 udp banyan-rpc [Tom_Lemaire] [Tom_Lemaire] ++ms-shuttle 568 tcp microsoft shuttle [Rudolph_Balaz] [Rudolph_Balaz] ++ms-shuttle 568 udp microsoft shuttle [Rudolph_Balaz] [Rudolph_Balaz] ++ms-rome 569 tcp microsoft rome [Rudolph_Balaz] [Rudolph_Balaz] ++ms-rome 569 udp microsoft rome [Rudolph_Balaz] [Rudolph_Balaz] ++meter 570 tcp demon ++meter 570 udp demon ++meter 571 tcp udemon ++meter 571 udp udemon ++sonar 572 tcp sonar [Keith_Moore] [Keith_Moore] ++sonar 572 udp sonar [Keith_Moore] [Keith_Moore] ++banyan-vip 573 tcp banyan-vip [Denis_Leclerc] [Denis_Leclerc] ++banyan-vip 573 udp banyan-vip [Denis_Leclerc] [Denis_Leclerc] ++ftp-agent 574 tcp FTP Software Agent System [Michael_S_Greenberg] [Michael_S_Greenberg] ++ftp-agent 574 udp FTP Software Agent System [Michael_S_Greenberg] [Michael_S_Greenberg] ++vemmi 575 tcp VEMMI [Daniel_Mavrakis_2] [Daniel_Mavrakis_2] ++vemmi 575 udp VEMMI [Daniel_Mavrakis_2] [Daniel_Mavrakis_2] ++ipcd 576 tcp ipcd ++ipcd 576 udp ipcd ++vnas 577 tcp vnas ++vnas 577 udp vnas ++ipdd 578 tcp ipdd [Jay_Farhat] [Jay_Farhat] ++ipdd 578 udp ipdd [Jay_Farhat] [Jay_Farhat] ++decbsrv 579 tcp decbsrv [Rudi_Martin] [Rudi_Martin] ++decbsrv 579 udp decbsrv [Rudi_Martin] [Rudi_Martin] ++sntp-heartbeat 580 tcp SNTP HEARTBEAT [Louis_Mamakos_2] [Louis_Mamakos_2] ++sntp-heartbeat 580 udp SNTP HEARTBEAT [Louis_Mamakos_2] [Louis_Mamakos_2] ++bdp 581 tcp Bundle Discovery Protocol [Gary_Malkin] [Gary_Malkin] ++bdp 581 udp Bundle Discovery Protocol [Gary_Malkin] [Gary_Malkin] ++scc-security 582 tcp SCC Security [Prashant_Dholakia] [Prashant_Dholakia] ++scc-security 582 udp SCC Security [Prashant_Dholakia] [Prashant_Dholakia] ++philips-vc 583 tcp Philips Video-Conferencing [Janna_Chang] [Janna_Chang] ++philips-vc 583 udp Philips Video-Conferencing [Janna_Chang] [Janna_Chang] ++keyserver 584 tcp Key Server [Gary_Howland] [Gary_Howland] ++keyserver 584 udp Key Server [Gary_Howland] [Gary_Howland] ++ 585 De-registered 2006-04-25 Use of 585 is not recommended, use 993 instead ++password-chg 586 tcp Password Change ++password-chg 586 udp Password Change ++submission 587 tcp Message Submission 2011-11-17 [RFC6409] ++submission 587 udp Message Submission 2011-11-17 [RFC6409] ++cal 588 tcp CAL [Myron_Hattig] [Myron_Hattig] ++cal 588 udp CAL [Myron_Hattig] [Myron_Hattig] ++eyelink 589 tcp EyeLink [Dave_Stampe] [Dave_Stampe] ++eyelink 589 udp EyeLink [Dave_Stampe] [Dave_Stampe] ++tns-cml 590 tcp TNS CML [Jerome_Albin] [Jerome_Albin] ++tns-cml 590 udp TNS CML [Jerome_Albin] [Jerome_Albin] ++http-alt 591 tcp FileMaker, Inc. - HTTP [Clay_Maeckel] [Clay_Maeckel] ++ Alternate (see Port 80) ++http-alt 591 udp FileMaker, Inc. - HTTP [Clay_Maeckel] [Clay_Maeckel] ++ Alternate (see Port 80) ++eudora-set 592 tcp Eudora Set [Randall_Gellens] [Randall_Gellens] ++eudora-set 592 udp Eudora Set [Randall_Gellens] [Randall_Gellens] ++http-rpc-epmap 593 tcp HTTP RPC Ep Map [Edward_Reus] [Edward_Reus] ++http-rpc-epmap 593 udp HTTP RPC Ep Map [Edward_Reus] [Edward_Reus] ++tpip 594 tcp TPIP [Brad_Spear] [Brad_Spear] ++tpip 594 udp TPIP [Brad_Spear] [Brad_Spear] ++cab-protocol 595 tcp CAB Protocol [Winston_Hetherington] [Winston_Hetherington] ++cab-protocol 595 udp CAB Protocol [Winston_Hetherington] [Winston_Hetherington] ++smsd 596 tcp SMSD [Wayne_Barlow] [Wayne_Barlow] ++smsd 596 udp SMSD [Wayne_Barlow] [Wayne_Barlow] ++ptcnameservice 597 tcp PTC Name Service [Yuri_Machkasov] [Yuri_Machkasov] ++ptcnameservice 597 udp PTC Name Service [Yuri_Machkasov] [Yuri_Machkasov] ++sco-websrvrmg3 598 tcp SCO Web Server Manager 3 [Simon_Baldwin] [Simon_Baldwin] ++sco-websrvrmg3 598 udp SCO Web Server Manager 3 [Simon_Baldwin] [Simon_Baldwin] ++acp 599 tcp Aeolon Core Protocol [Michael_Alyn_Miller] [Michael_Alyn_Miller] ++acp 599 udp Aeolon Core Protocol [Michael_Alyn_Miller] [Michael_Alyn_Miller] ++ipcserver 600 tcp Sun IPC server [Bill_Schiefelbein] [Bill_Schiefelbein] ++ipcserver 600 udp Sun IPC server [Bill_Schiefelbein] [Bill_Schiefelbein] ++syslog-conn 601 tcp Reliable Syslog Service [RFC3195] ++syslog-conn 601 udp Reliable Syslog Service [RFC3195] ++xmlrpc-beep 602 tcp XML-RPC over BEEP [RFC3529] ++xmlrpc-beep 602 udp XML-RPC over BEEP [RFC3529] ++idxp 603 tcp IDXP [RFC4767] ++idxp 603 udp IDXP [RFC4767] ++tunnel 604 tcp TUNNEL [RFC3620] ++tunnel 604 udp TUNNEL [RFC3620] ++soap-beep 605 tcp SOAP over BEEP [RFC4227] ++soap-beep 605 udp SOAP over BEEP [RFC4227] ++urm 606 tcp Cray Unified Resource ++ Manager ++urm 606 udp Cray Unified Resource ++ Manager ++nqs 607 tcp nqs [Bill_Schiefelbein] [Bill_Schiefelbein] ++nqs 607 udp nqs [Bill_Schiefelbein] [Bill_Schiefelbein] ++sift-uft 608 tcp Sender-Initiated/Unsolicited [Rick_Troth] [Rick_Troth] ++ File Transfer ++sift-uft 608 udp Sender-Initiated/Unsolicited [Rick_Troth] [Rick_Troth] ++ File Transfer ++npmp-trap 609 tcp npmp-trap ++npmp-trap 609 udp npmp-trap ++npmp-local 610 tcp npmp-local ++npmp-local 610 udp npmp-local ++npmp-gui 611 tcp npmp-gui [John_Barnes] [John_Barnes] ++npmp-gui 611 udp npmp-gui [John_Barnes] [John_Barnes] ++hmmp-ind 612 tcp HMMP Indication ++hmmp-ind 612 udp HMMP Indication ++hmmp-op 613 tcp HMMP Operation [Andrew_Sinclair] [Andrew_Sinclair] ++hmmp-op 613 udp HMMP Operation [Andrew_Sinclair] [Andrew_Sinclair] ++sshell 614 tcp SSLshell [Simon_J_Gerraty] [Simon_J_Gerraty] ++sshell 614 udp SSLshell [Simon_J_Gerraty] [Simon_J_Gerraty] ++sco-inetmgr 615 tcp Internet Configuration ++ Manager ++sco-inetmgr 615 udp Internet Configuration ++ Manager ++sco-sysmgr 616 tcp SCO System Administration ++ Server ++sco-sysmgr 616 udp SCO System Administration ++ Server ++sco-dtmgr 617 tcp SCO Desktop Administration [Christopher_Durham] [Christopher_Durham] ++ Server ++sco-dtmgr 617 udp SCO Desktop Administration [Christopher_Durham] [Christopher_Durham] ++ Server ++dei-icda 618 tcp DEI-ICDA [David_Turner] [David_Turner] ++dei-icda 618 udp DEI-ICDA [David_Turner] [David_Turner] ++compaq-evm 619 tcp Compaq EVM [Jem_Treadwell] [Jem_Treadwell] ++compaq-evm 619 udp Compaq EVM [Jem_Treadwell] [Jem_Treadwell] ++sco-websrvrmgr 620 tcp SCO WebServer Manager [Christopher_Durham] [Christopher_Durham] ++sco-websrvrmgr 620 udp SCO WebServer Manager [Christopher_Durham] [Christopher_Durham] ++escp-ip 621 tcp ESCP [Lai_Zit_Seng] [Lai_Zit_Seng] ++escp-ip 621 udp ESCP [Lai_Zit_Seng] [Lai_Zit_Seng] ++collaborator 622 tcp Collaborator [Johnson_Davis] [Johnson_Davis] ++collaborator 622 udp Collaborator [Johnson_Davis] [Johnson_Davis] ++oob-ws-http 623 tcp DMTF out-of-band web [Jim_Davis] [Jim_Davis] 2007-06 ++ services management protocol ++asf-rmcp 623 udp ASF Remote Management and [Carl_First] [Carl_First] ++ Control Protocol ++cryptoadmin 624 tcp Crypto Admin [Tony_Walker] [Tony_Walker] ++cryptoadmin 624 udp Crypto Admin [Tony_Walker] [Tony_Walker] ++ DEC DLM ++ ++dec-dlm 625 tcp IANA assigned this [Rudi_Martin_2] [Rudi_Martin_2] ++ well-formed service name as ++ a replacement for "dec_dlm". ++ This entry is an alias to "dec-dlm". This entry is now ++dec_dlm 625 tcp DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service ++ discovery mechanisms. ++ DEC DLM ++ ++dec-dlm 625 udp IANA assigned this [Rudi_Martin_2] [Rudi_Martin_2] ++ well-formed service name as ++ a replacement for "dec_dlm". ++ This entry is an alias to "dec-dlm". This entry is now ++dec_dlm 625 udp DEC DLM [Rudi_Martin_2] [Rudi_Martin_2] historic, not usable for use with many common service ++ discovery mechanisms. ++asia 626 tcp ASIA [Michael_Dasenbrock] [Michael_Dasenbrock] ++asia 626 udp ASIA [Michael_Dasenbrock] [Michael_Dasenbrock] ++passgo-tivoli 627 tcp PassGo Tivoli [John_Rainford_2] [John_Rainford_2] ++passgo-tivoli 627 udp PassGo Tivoli [John_Rainford_2] [John_Rainford_2] ++qmqp 628 tcp QMQP [Dan_Bernstein_2] [Dan_Bernstein_2] ++qmqp 628 udp QMQP [Dan_Bernstein_2] [Dan_Bernstein_2] ++3com-amp3 629 tcp 3Com AMP3 [Prakash_Banthia] [Prakash_Banthia] ++3com-amp3 629 udp 3Com AMP3 [Prakash_Banthia] [Prakash_Banthia] ++rda 630 tcp RDA [John_Hadjioannou] [John_Hadjioannou] ++rda 630 udp RDA [John_Hadjioannou] [John_Hadjioannou] ++ipp 631 tcp IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. ++ Protocol) ++ipp 631 udp IPP (Internet Printing [Carl_Uno_Manros] [Carl_Uno_Manros] Defined TXT keys: See BonjourPrinting.pdf. ++ Protocol) ++bmpp 632 tcp bmpp [Troy_Rollo] [Troy_Rollo] ++bmpp 632 udp bmpp [Troy_Rollo] [Troy_Rollo] ++servstat 633 tcp Service Status update [Greg_Rose] [Greg_Rose] ++ (Sterling Software) ++servstat 633 udp Service Status update [Greg_Rose] [Greg_Rose] ++ (Sterling Software) ++ginad 634 tcp ginad [Mark_Crother] [Mark_Crother] ++ginad 634 udp ginad [Mark_Crother] [Mark_Crother] ++rlzdbase 635 tcp RLZ DBase [Michael_Ginn] [Michael_Ginn] ++rlzdbase 635 udp RLZ DBase [Michael_Ginn] [Michael_Ginn] ++ldaps 636 tcp ldap protocol over TLS/SSL [Pat_Richard] [Pat_Richard] ++ (was sldap) ++ldaps 636 udp ldap protocol over TLS/SSL [Pat_Richard] [Pat_Richard] ++ (was sldap) ++lanserver 637 tcp lanserver [Chris_Larsson] [Chris_Larsson] ++lanserver 637 udp lanserver [Chris_Larsson] [Chris_Larsson] ++mcns-sec 638 tcp mcns-sec [Kaz_Ozawa] [Kaz_Ozawa] ++mcns-sec 638 udp mcns-sec [Kaz_Ozawa] [Kaz_Ozawa] ++msdp 639 tcp MSDP [Dino_Farinacci] [Dino_Farinacci] ++msdp 639 udp MSDP [Dino_Farinacci] [Dino_Farinacci] ++entrust-sps 640 tcp entrust-sps [Marek_Buchler] [Marek_Buchler] ++entrust-sps 640 udp entrust-sps [Marek_Buchler] [Marek_Buchler] ++repcmd 641 tcp repcmd [Scott_Dale] [Scott_Dale] ++repcmd 641 udp repcmd [Scott_Dale] [Scott_Dale] ++esro-emsdp 642 tcp ESRO-EMSDP V1.3 [Mohsen_Banan_2] [Mohsen_Banan_2] ++esro-emsdp 642 udp ESRO-EMSDP V1.3 [Mohsen_Banan_2] [Mohsen_Banan_2] ++sanity 643 tcp SANity [Peter_Viscarola] [Peter_Viscarola] ++sanity 643 udp SANity [Peter_Viscarola] [Peter_Viscarola] ++dwr 644 tcp dwr [Bill_Fenner] [Bill_Fenner] ++dwr 644 udp dwr [Bill_Fenner] [Bill_Fenner] ++pssc 645 tcp PSSC [Egon_Meier_Engelen] [Egon_Meier_Engelen] ++pssc 645 udp PSSC [Egon_Meier_Engelen] [Egon_Meier_Engelen] ++ldp 646 tcp LDP [Bob_Thomas] [Bob_Thomas] ++ldp 646 udp LDP [Bob_Thomas] [Bob_Thomas] ++dhcp-failover 647 tcp DHCP Failover [Bernard_Volz] [Bernard_Volz] ++dhcp-failover 647 udp DHCP Failover [Bernard_Volz] [Bernard_Volz] ++rrp 648 tcp Registry Registrar Protocol [Scott_Hollenbeck] [Scott_Hollenbeck] ++ (RRP) ++rrp 648 udp Registry Registrar Protocol [Scott_Hollenbeck] [Scott_Hollenbeck] ++ (RRP) ++cadview-3d 649 tcp Cadview-3d - streaming 3d [David_Cooper] [David_Cooper] ++ models over the internet ++cadview-3d 649 udp Cadview-3d - streaming 3d [David_Cooper] [David_Cooper] ++ models over the internet ++obex 650 tcp OBEX [Jeff_Garbers] [Jeff_Garbers] ++obex 650 udp OBEX [Jeff_Garbers] [Jeff_Garbers] ++ieee-mms 651 tcp IEEE MMS [Curtis_Anderson] [Curtis_Anderson] ++ieee-mms 651 udp IEEE MMS [Curtis_Anderson] [Curtis_Anderson] ++hello-port 652 tcp HELLO_PORT [Patrick_Cipiere] [Patrick_Cipiere] ++hello-port 652 udp HELLO_PORT [Patrick_Cipiere] [Patrick_Cipiere] ++repscmd 653 tcp RepCmd [Scott_Dale_2] [Scott_Dale_2] ++repscmd 653 udp RepCmd [Scott_Dale_2] [Scott_Dale_2] ++aodv 654 tcp AODV [Charles_Perkins] [Charles_Perkins] ++aodv 654 udp AODV [Charles_Perkins] [Charles_Perkins] ++tinc 655 tcp TINC [Ivo_Timmermans] [Ivo_Timmermans] ++tinc 655 udp TINC [Ivo_Timmermans] [Ivo_Timmermans] ++spmp 656 tcp SPMP [Jakob_Kaivo] [Jakob_Kaivo] ++spmp 656 udp SPMP [Jakob_Kaivo] [Jakob_Kaivo] ++rmc 657 tcp RMC [Michael_Schmidt] [Michael_Schmidt] ++rmc 657 udp RMC [Michael_Schmidt] [Michael_Schmidt] ++tenfold 658 tcp TenFold [Louis_Olszyk] [Louis_Olszyk] ++tenfold 658 udp TenFold [Louis_Olszyk] [Louis_Olszyk] ++ 659 Removed 2001-06-06 ++mac-srvr-admin 660 tcp MacOS Server Admin [Forest_Hill] [Forest_Hill] ++mac-srvr-admin 660 udp MacOS Server Admin [Forest_Hill] [Forest_Hill] ++hap 661 tcp HAP [Igor_Plotnikov] [Igor_Plotnikov] ++hap 661 udp HAP [Igor_Plotnikov] [Igor_Plotnikov] ++pftp 662 tcp PFTP [Ben_Schluricke] [Ben_Schluricke] ++pftp 662 udp PFTP [Ben_Schluricke] [Ben_Schluricke] ++purenoise 663 tcp PureNoise [Sam_Osa] [Sam_Osa] ++purenoise 663 udp PureNoise [Sam_Osa] [Sam_Osa] ++oob-ws-https 664 tcp DMTF out-of-band secure web [Jim_Davis] [Jim_Davis] 2007-06 ++ services management protocol ++asf-secure-rmcp 664 udp ASF Secure Remote Management [Carl_First] [Carl_First] ++ and Control Protocol ++sun-dr 665 tcp Sun DR [Harinder_Bhasin] [Harinder_Bhasin] ++sun-dr 665 udp Sun DR [Harinder_Bhasin] [Harinder_Bhasin] ++mdqs 666 tcp ++mdqs 666 udp ++doom 666 tcp doom Id Software [ddt] [ddt] ++doom 666 udp doom Id Software [ddt] [ddt] ++ campaign contribution ++disclose 667 tcp disclosures - SDR [Jim_Dixon] [Jim_Dixon] ++ Technologies ++ campaign contribution ++disclose 667 udp disclosures - SDR [Jim_Dixon] [Jim_Dixon] ++ Technologies ++mecomm 668 tcp MeComm ++mecomm 668 udp MeComm ++meregister 669 tcp MeRegister [Armin_Sawusch] [Armin_Sawusch] ++meregister 669 udp MeRegister [Armin_Sawusch] [Armin_Sawusch] ++vacdsm-sws 670 tcp VACDSM-SWS ++vacdsm-sws 670 udp VACDSM-SWS ++vacdsm-app 671 tcp VACDSM-APP ++vacdsm-app 671 udp VACDSM-APP ++vpps-qua 672 tcp VPPS-QUA ++vpps-qua 672 udp VPPS-QUA ++cimplex 673 tcp CIMPLEX [Ulysses_G_Smith_Jr] [Ulysses_G_Smith_Jr] ++cimplex 673 udp CIMPLEX [Ulysses_G_Smith_Jr] [Ulysses_G_Smith_Jr] ++acap 674 tcp ACAP [Chris_Newman] [Chris_Newman] 2010-10-15 ++acap 674 udp ACAP [Chris_Newman] [Chris_Newman] 2010-10-15 ++dctp 675 tcp DCTP [Andre_Kramer] [Andre_Kramer] ++dctp 675 udp DCTP [Andre_Kramer] [Andre_Kramer] ++vpps-via 676 tcp VPPS Via [Ulysses_G_Smith_Jr] [Ulysses_G_Smith_Jr] ++vpps-via 676 udp VPPS Via [Ulysses_G_Smith_Jr] [Ulysses_G_Smith_Jr] ++vpp 677 tcp Virtual Presence Protocol [Klaus_Wolf] [Klaus_Wolf] ++vpp 677 udp Virtual Presence Protocol [Klaus_Wolf] [Klaus_Wolf] ++ggf-ncp 678 tcp GNU Generation Foundation [Noah_Paul] [Noah_Paul] ++ NCP ++ggf-ncp 678 udp GNU Generation Foundation [Noah_Paul] [Noah_Paul] ++ NCP ++mrm 679 tcp MRM [Liming_Wei] [Liming_Wei] ++mrm 679 udp MRM [Liming_Wei] [Liming_Wei] ++entrust-aaas 680 tcp entrust-aaas ++entrust-aaas 680 udp entrust-aaas ++entrust-aams 681 tcp entrust-aams [Adrian_Mancini] [Adrian_Mancini] ++entrust-aams 681 udp entrust-aams [Adrian_Mancini] [Adrian_Mancini] ++xfr 682 tcp XFR [Noah_Paul_2] [Noah_Paul_2] ++xfr 682 udp XFR [Noah_Paul_2] [Noah_Paul_2] ++corba-iiop 683 tcp CORBA IIOP ++corba-iiop 683 udp CORBA IIOP ++corba-iiop-ssl 684 tcp CORBA IIOP SSL [Andrew_Watson] [Andrew_Watson] ++corba-iiop-ssl 684 udp CORBA IIOP SSL [Andrew_Watson] [Andrew_Watson] ++mdc-portmapper 685 tcp MDC Port Mapper [Noah_Paul] [Noah_Paul] ++mdc-portmapper 685 udp MDC Port Mapper [Noah_Paul] [Noah_Paul] ++hcp-wismar 686 tcp Hardware Control Protocol [David_Merchant] [David_Merchant] ++ Wismar ++hcp-wismar 686 udp Hardware Control Protocol [David_Merchant] [David_Merchant] ++ Wismar ++asipregistry 687 tcp asipregistry [Erik_Sea] [Erik_Sea] ++asipregistry 687 udp asipregistry [Erik_Sea] [Erik_Sea] ++realm-rusd 688 tcp ApplianceWare managment [Stacy_Kenworthy] [Stacy_Kenworthy] ++ protocol ++realm-rusd 688 udp ApplianceWare managment [Stacy_Kenworthy] [Stacy_Kenworthy] ++ protocol ++nmap 689 tcp NMAP [Peter_Dennis_Bartok] [Peter_Dennis_Bartok] ++nmap 689 udp NMAP [Peter_Dennis_Bartok] [Peter_Dennis_Bartok] ++vatp 690 tcp Velazquez Application [Velneo] [Velneo] ++ Transfer Protocol ++vatp 690 udp Velazquez Application [Velneo] [Velneo] ++ Transfer Protocol ++msexch-routing 691 tcp MS Exchange Routing [David_Lemson] [David_Lemson] ++msexch-routing 691 udp MS Exchange Routing [David_Lemson] [David_Lemson] ++hyperwave-isp 692 tcp Hyperwave-ISP [Gerald_Mesaric] [Gerald_Mesaric] ++hyperwave-isp 692 udp Hyperwave-ISP [Gerald_Mesaric] [Gerald_Mesaric] ++connendp 693 tcp almanid Connection Endpoint [Ronny_Bremer] [Ronny_Bremer] ++connendp 693 udp almanid Connection Endpoint [Ronny_Bremer] [Ronny_Bremer] ++ha-cluster 694 tcp ha-cluster [Alan_Robertson] [Alan_Robertson] ++ha-cluster 694 udp ha-cluster [Alan_Robertson] [Alan_Robertson] ++ieee-mms-ssl 695 tcp IEEE-MMS-SSL [Curtis_Anderson_2] [Curtis_Anderson_2] ++ieee-mms-ssl 695 udp IEEE-MMS-SSL [Curtis_Anderson_2] [Curtis_Anderson_2] ++rushd 696 tcp RUSHD [Greg_Ercolano] [Greg_Ercolano] ++rushd 696 udp RUSHD [Greg_Ercolano] [Greg_Ercolano] ++uuidgen 697 tcp UUIDGEN [James_Falkner] [James_Falkner] ++uuidgen 697 udp UUIDGEN [James_Falkner] [James_Falkner] ++olsr 698 tcp OLSR [Thomas_Clausen] [Thomas_Clausen] ++olsr 698 udp OLSR [Thomas_Clausen] [Thomas_Clausen] ++accessnetwork 699 tcp Access Network [Yingchun_Xu] [Yingchun_Xu] ++accessnetwork 699 udp Access Network [Yingchun_Xu] [Yingchun_Xu] ++epp 700 tcp Extensible Provisioning [RFC5734] ++ Protocol ++epp 700 udp Extensible Provisioning [RFC5734] ++ Protocol ++lmp 701 tcp Link Management Protocol [RFC4204] ++ (LMP) ++lmp 701 udp Link Management Protocol [RFC4204] ++ (LMP) ++iris-beep 702 tcp IRIS over BEEP [RFC3983] ++iris-beep 702 udp IRIS over BEEP [RFC3983] ++ 703 Unassigned ++elcsd 704 tcp errlog copy/server daemon ++elcsd 704 udp errlog copy/server daemon ++agentx 705 tcp AgentX [Bob_Natale] [Bob_Natale] ++agentx 705 udp AgentX [Bob_Natale] [Bob_Natale] ++silc 706 tcp SILC [Pekka_Riikonen] [Pekka_Riikonen] ++silc 706 udp SILC [Pekka_Riikonen] [Pekka_Riikonen] ++borland-dsj 707 tcp Borland DSJ [Gerg_Cole] [Gerg_Cole] ++borland-dsj 707 udp Borland DSJ [Gerg_Cole] [Gerg_Cole] ++ 708 Unassigned ++entrust-kmsh 709 tcp Entrust Key Management ++ Service Handler ++entrust-kmsh 709 udp Entrust Key Management ++ Service Handler ++entrust-ash 710 tcp Entrust Administration [Peter_Whittaker] [Peter_Whittaker] ++ Service Handler ++entrust-ash 710 udp Entrust Administration [Peter_Whittaker] [Peter_Whittaker] ++ Service Handler ++cisco-tdp 711 tcp Cisco TDP [Bruce_Davie] [Bruce_Davie] ++cisco-tdp 711 udp Cisco TDP [Bruce_Davie] [Bruce_Davie] ++tbrpf 712 tcp TBRPF [RFC3684] ++tbrpf 712 udp TBRPF [RFC3684] ++iris-xpc 713 tcp IRIS over XPC ++iris-xpc 713 udp IRIS over XPC ++iris-xpcs 714 tcp IRIS over XPCS [RFC4992] ++iris-xpcs 714 udp IRIS over XPCS [RFC4992] ++iris-lwz 715 tcp IRIS-LWZ [RFC4993] ++iris-lwz 715 udp IRIS-LWZ [RFC4993] ++pana 716 udp PANA Messages [RFC5191] ++ 717-728 Unassigned ++netviewdm1 729 tcp IBM NetView DM/6000 ++ Server/Client ++netviewdm1 729 udp IBM NetView DM/6000 ++ Server/Client ++netviewdm2 730 tcp IBM NetView DM/6000 send/tcp ++netviewdm2 730 udp IBM NetView DM/6000 send/tcp ++netviewdm3 731 tcp IBM NetView DM/6000 [Philippe_Binet] [Philippe_Binet] ++ receive/tcp ++netviewdm3 731 udp IBM NetView DM/6000 [Philippe_Binet] [Philippe_Binet] ++ receive/tcp ++ 732-740 Unassigned ++netgw 741 tcp netGW [Oliver_Korfmacher] [Oliver_Korfmacher] ++netgw 741 udp netGW [Oliver_Korfmacher] [Oliver_Korfmacher] ++netrcs 742 tcp Network based Rev. Cont. [Gordon_C_Galligher] [Gordon_C_Galligher] ++ Sys. ++netrcs 742 udp Network based Rev. Cont. [Gordon_C_Galligher] [Gordon_C_Galligher] ++ Sys. ++ 743 Unassigned ++flexlm 744 tcp Flexible License Manager [Matt_Christiano] [Matt_Christiano] ++flexlm 744 udp Flexible License Manager [Matt_Christiano] [Matt_Christiano] ++ 745-746 Unassigned ++fujitsu-dev 747 tcp Fujitsu Device Control ++fujitsu-dev 747 udp Fujitsu Device Control ++ris-cm 748 tcp Russell Info Sci Calendar ++ Manager ++ris-cm 748 udp Russell Info Sci Calendar ++ Manager ++kerberos-adm 749 tcp kerberos administration ++kerberos-adm 749 udp kerberos administration ++rfile 750 tcp ++loadav 750 udp ++kerberos-iv 750 udp kerberos version iv [Martin_Hamilton] [Martin_Hamilton] ++pump 751 tcp ++pump 751 udp ++qrh 752 tcp ++qrh 752 udp ++rrh 753 tcp ++rrh 753 udp ++tell 754 tcp send [Josyula_R_Rao] [Josyula_R_Rao] ++tell 754 udp send [Josyula_R_Rao] [Josyula_R_Rao] ++ 755-756 Unassigned ++nlogin 758 tcp ++nlogin 758 udp ++con 759 tcp ++con 759 udp ++ns 760 tcp ++ns 760 udp ++rxe 761 tcp ++rxe 761 udp ++quotad 762 tcp ++quotad 762 udp ++cycleserv 763 tcp ++cycleserv 763 udp ++omserv 764 tcp ++omserv 764 udp ++webster 765 tcp [Josyula_R_Rao] [Josyula_R_Rao] ++webster 765 udp [Josyula_R_Rao] [Josyula_R_Rao] ++ 766 Unassigned ++phonebook 767 tcp phone [Josyula_R_Rao] [Josyula_R_Rao] ++phonebook 767 udp phone [Josyula_R_Rao] [Josyula_R_Rao] ++ 768 Unassigned ++vid 769 tcp ++vid 769 udp ++cadlock 770 tcp ++cadlock 770 udp ++rtip 771 tcp ++rtip 771 udp ++cycleserv2 772 tcp ++cycleserv2 772 udp ++submit 773 tcp ++notify 773 udp ++rpasswd 774 tcp ++ IANA assigned this ++acmaint-dbd 774 udp well-formed service name as ++ a replacement for ++ "acmaint_dbd". ++ This entry is an alias to "acmaint-dbd". This entry is now ++acmaint_dbd 774 udp historic, not usable for use with many common service ++ discovery mechanisms. ++entomb 775 tcp ++ IANA assigned this ++acmaint-transd 775 udp well-formed service name as ++ a replacement for ++ "acmaint_transd". ++ This entry is an alias to "acmaint-transd". This entry is now ++acmaint_transd 775 udp historic, not usable for use with many common service ++ discovery mechanisms. ++wpages 776 tcp [Josyula_R_Rao] [Josyula_R_Rao] ++wpages 776 udp [Josyula_R_Rao] [Josyula_R_Rao] ++multiling-http 777 tcp Multiling HTTP [Alejandro_Bonet] [Alejandro_Bonet] ++multiling-http 777 udp Multiling HTTP [Alejandro_Bonet] [Alejandro_Bonet] ++ 778-779 Unassigned ++wpgs 780 tcp [Josyula_R_Rao] [Josyula_R_Rao] ++wpgs 780 udp [Josyula_R_Rao] [Josyula_R_Rao] ++ 781-785 Unassigned ++ 786 Unassigned 2002-05-08 ++ 787 Unassigned 2002-10-08 ++ Unauthorized ++ 788-799 Unassigned Use Known on ++ port 796 ++ IANA assigned this ++mdbs-daemon 800 tcp well-formed service name as ++ a replacement for ++ "mdbs_daemon". ++ This entry is an alias to "mdbs-daemon". This entry is now ++mdbs_daemon 800 tcp historic, not usable for use with many common service ++ discovery mechanisms. ++ IANA assigned this ++mdbs-daemon 800 udp well-formed service name as ++ a replacement for ++ "mdbs_daemon". ++ This entry is an alias to "mdbs-daemon". This entry is now ++mdbs_daemon 800 udp historic, not usable for use with many common service ++ discovery mechanisms. ++device 801 tcp ++device 801 udp ++ 802-809 Unassigned ++fcp-udp 810 tcp FCP [Paul_Whittemore] [Paul_Whittemore] ++fcp-udp 810 udp FCP Datagram [Paul_Whittemore] [Paul_Whittemore] ++ 811-827 Unassigned ++itm-mcell-s 828 tcp itm-mcell-s [Portnoy_Boxman] [Portnoy_Boxman] ++itm-mcell-s 828 udp itm-mcell-s [Portnoy_Boxman] [Portnoy_Boxman] ++pkix-3-ca-ra 829 tcp PKIX-3 CA/RA [Carlisle_Adams] [Carlisle_Adams] ++pkix-3-ca-ra 829 udp PKIX-3 CA/RA [Carlisle_Adams] [Carlisle_Adams] ++netconf-ssh 830 tcp NETCONF over SSH [RFC6242] ++netconf-ssh 830 udp NETCONF over SSH [RFC6242] ++netconf-beep 831 tcp NETCONF over BEEP [RFC4744] ++netconf-beep 831 udp NETCONF over BEEP [RFC4744] ++netconfsoaphttp 832 tcp NETCONF for SOAP over HTTPS [RFC4743] ++netconfsoaphttp 832 udp NETCONF for SOAP over HTTPS [RFC4743] ++netconfsoapbeep 833 tcp NETCONF for SOAP over BEEP [RFC4743] ++netconfsoapbeep 833 udp NETCONF for SOAP over BEEP [RFC4743] ++ 834-846 Unassigned ++dhcp-failover2 847 tcp dhcp-failover 2 [Bernard_Volz] [Bernard_Volz] ++dhcp-failover2 847 udp dhcp-failover 2 [Bernard_Volz] [Bernard_Volz] ++gdoi 848 tcp GDOI [RFC3547] ++gdoi 848 udp GDOI [RFC3547] ++ 849-859 Unassigned ++iscsi 860 tcp iSCSI [RFC3720] ++iscsi 860 udp iSCSI [RFC3720] ++owamp-control 861 tcp OWAMP-Control [RFC4656] ++owamp-control 861 udp OWAMP-Control [RFC4656] ++twamp-control 862 tcp Two-way Active Measurement [RFC5357] ++ Protocol (TWAMP) Control ++twamp-control 862 udp Two-way Active Measurement [RFC5357] ++ Protocol (TWAMP) Control ++ 863-872 Unassigned ++rsync 873 tcp rsync [Andrew_Tridgell] [Andrew_Tridgell] ++rsync 873 udp rsync [Andrew_Tridgell] [Andrew_Tridgell] ++ 874-885 Unassigned ++iclcnet-locate 886 tcp ICL coNETion locate server [Bob_Lyon] [Bob_Lyon] ++iclcnet-locate 886 udp ICL coNETion locate server [Bob_Lyon] [Bob_Lyon] ++ ICL coNETion server info ++ ++iclcnet-svinfo 887 tcp IANA assigned this [Bob_Lyon] [Bob_Lyon] ++ well-formed service name as ++ a replacement for ++ "iclcnet_svinfo". ++ This entry is an alias to "iclcnet-svinfo". This entry is now ++iclcnet_svinfo 887 tcp ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service ++ discovery mechanisms. ++ ICL coNETion server info ++ ++iclcnet-svinfo 887 udp IANA assigned this [Bob_Lyon] [Bob_Lyon] ++ well-formed service name as ++ a replacement for ++ "iclcnet_svinfo". ++ This entry is an alias to "iclcnet-svinfo". This entry is now ++iclcnet_svinfo 887 udp ICL coNETion server info [Bob_Lyon] [Bob_Lyon] historic, not usable for use with many common service ++ discovery mechanisms. ++accessbuilder 888 tcp AccessBuilder [Steve_Sweeney] [Steve_Sweeney] ++accessbuilder 888 udp AccessBuilder [Steve_Sweeney] [Steve_Sweeney] ++cddbp 888 tcp CD Database Protocol [Steve_Scherf] [Steve_Scherf] This entry records an unassigned but widespread use ++ 889-899 Unassigned ++omginitialrefs 900 tcp OMG Initial Refs [Christian_Callsen] [Christian_Callsen] ++omginitialrefs 900 udp OMG Initial Refs [Christian_Callsen] [Christian_Callsen] ++smpnameres 901 tcp SMPNAMERES [Leif_Ekblad] [Leif_Ekblad] ++smpnameres 901 udp SMPNAMERES [Leif_Ekblad] [Leif_Ekblad] ++ideafarm-door 902 tcp self documenting Telnet Door ++ideafarm-door 902 udp self documenting Door: send ++ 0x00 for info ++ideafarm-panic 903 tcp self documenting Telnet [Wo_o_Ideafarm] [Wo_o_Ideafarm] ++ Panic Door ++ideafarm-panic 903 udp self documenting Panic Door: [Wo_o_Ideafarm] [Wo_o_Ideafarm] ++ send 0x00 for info ++ 904-909 Unassigned ++kink 910 tcp Kerberized Internet [RFC4430] ++ Negotiation of Keys (KINK) ++kink 910 udp Kerberized Internet [RFC4430] ++ Negotiation of Keys (KINK) ++xact-backup 911 tcp xact-backup [Bill_Carroll] [Bill_Carroll] ++xact-backup 911 udp xact-backup [Bill_Carroll] [Bill_Carroll] ++apex-mesh 912 tcp APEX relay-relay service ++apex-mesh 912 udp APEX relay-relay service ++apex-edge 913 tcp APEX endpoint-relay service [RFC3340] ++apex-edge 913 udp APEX endpoint-relay service [RFC3340] ++ 914-988 Unassigned ++ftps-data 989 tcp ftp protocol, data, over ++ TLS/SSL ++ftps-data 989 udp ftp protocol, data, over ++ TLS/SSL ++ftps 990 tcp ftp protocol, control, over [Christopher_Allen] [Christopher_Allen] ++ TLS/SSL ++ftps 990 udp ftp protocol, control, over [Christopher_Allen] [Christopher_Allen] ++ TLS/SSL ++nas 991 tcp Netnews Administration [Vera_Heinau][Heiko_Schlichting] [Vera_Heinau][Heiko_Schlichting] ++ System ++nas 991 udp Netnews Administration [Vera_Heinau][Heiko_Schlichting] [Vera_Heinau][Heiko_Schlichting] ++ System ++telnets 992 tcp telnet protocol over TLS/SSL ++telnets 992 udp telnet protocol over TLS/SSL ++imaps 993 tcp imap4 protocol over TLS/SSL ++imaps 993 udp imap4 protocol over TLS/SSL ++ 994 tcp Reserved 2011-08-31 (previous contact was[Christopher_Allen]) ++ 994 udp Reserved ++pop3s 995 tcp pop3 protocol over TLS/SSL [Gordon_Mangione] [Gordon_Mangione] ++ (was spop3) ++pop3s 995 udp pop3 protocol over TLS/SSL [Gordon_Mangione] [Gordon_Mangione] ++ (was spop3) ++vsinet 996 tcp vsinet [Rob_Juergens] [Rob_Juergens] ++vsinet 996 udp vsinet [Rob_Juergens] [Rob_Juergens] ++maitrd 997 tcp ++maitrd 997 udp ++busboy 998 tcp ++puparp 998 udp ++garcon 999 tcp ++applix 999 udp Applix ac ++puprouter 999 tcp ++puprouter 999 udp ++cadlock2 1000 tcp ++cadlock2 1000 udp ++ 1001-1009 Unassigned ++ 1008 udp Possibly used by Sun ++ Solaris???? ++surf 1010 tcp surf [Joseph_Geer] [Joseph_Geer] ++surf 1010 udp surf [Joseph_Geer] [Joseph_Geer] ++ 1011-1020 Reserved ++exp1 1021 tcp RFC3692-style Experiment 1 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp1 1021 udp RFC3692-style Experiment 1 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp1 1021 sctp RFC3692-style Experiment 1 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp1 1021 dccp RFC3692-style Experiment 1 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp2 1022 tcp RFC3692-style Experiment 2 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp2 1022 udp RFC3692-style Experiment 2 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp2 1022 sctp RFC3692-style Experiment 2 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++exp2 1022 dccp RFC3692-style Experiment 2 [IESG] [IETF_Chair] [1][RFC4727][RFC6335] ++ 1023 tcp Reserved [IANA] [IANA] ++ 1023 udp Reserved [IANA] [IANA] ++ 1024 tcp Reserved [IANA] [IANA] ++ 1024 udp Reserved [IANA] [IANA] ++blackjack 1025 tcp network blackjack ++blackjack 1025 udp network blackjack ++cap 1026 tcp Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09 ++cap 1026 udp Calendar Access Protocol [Doug_Royer] [Doug_Royer] 2010-12-09 ++ 1027 Unassigned 2005-09-16 ++ 1028 Deprecated 2004-02 ++solid-mux 1029 tcp Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11 ++solid-mux 1029 udp Solid Mux Server [Anders_Borg] [Anders_Borg] 2004-11 ++iad1 1030 tcp BBN IAD ++iad1 1030 udp BBN IAD ++iad2 1031 tcp BBN IAD ++iad2 1031 udp BBN IAD ++iad3 1032 tcp BBN IAD [Andy_Malis] [Andy_Malis] ++iad3 1032 udp BBN IAD [Andy_Malis] [Andy_Malis] ++netinfo-local 1033 tcp local netinfo port [Marc_Majka] [Marc_Majka] 2002-08 ++netinfo-local 1033 udp local netinfo port [Marc_Majka] [Marc_Majka] 2002-08 ++activesync 1034 tcp ActiveSync Notifications [Sandra_Vargas] [Sandra_Vargas] 2003-03 ++activesync 1034 udp ActiveSync Notifications [Sandra_Vargas] [Sandra_Vargas] 2003-03 ++mxxrlogin 1035 tcp MX-XR RPC [Arnold_E_Mauer] [Arnold_E_Mauer] 2003-04 ++mxxrlogin 1035 udp MX-XR RPC [Arnold_E_Mauer] [Arnold_E_Mauer] 2003-04 ++nsstp 1036 tcp Nebula Secure Segment [Steve_Ravida] [Steve_Ravida] ++ Transfer Protocol ++nsstp 1036 udp Nebula Secure Segment [Steve_Ravida] [Steve_Ravida] ++ Transfer Protocol ++ams 1037 tcp AMS [Ronald_R_Ohmer] [Ronald_R_Ohmer] 2004-02 ++ams 1037 udp AMS [Ronald_R_Ohmer] [Ronald_R_Ohmer] 2004-02 ++mtqp 1038 tcp Message Tracking Query [RFC3887] ++ Protocol ++mtqp 1038 udp Message Tracking Query [RFC3887] ++ Protocol ++sbl 1039 tcp Streamlined Blackhole [Jonathan_A_Zdziaras] [Jonathan_A_Zdziaras] 2004-11 ++sbl 1039 udp Streamlined Blackhole [Jonathan_A_Zdziaras] [Jonathan_A_Zdziaras] 2004-11 ++netarx 1040 tcp Netarx Netcare [Sandy_Kronenberg] [Sandy_Kronenberg] 2008-04-03 ++netarx 1040 udp Netarx Netcare [Sandy_Kronenberg] [Sandy_Kronenberg] 2008-04-03 ++danf-ak2 1041 tcp AK2 Product [Karl_Palsson] [Karl_Palsson] 2004-11 ++danf-ak2 1041 udp AK2 Product [Karl_Palsson] [Karl_Palsson] 2004-11 ++afrog 1042 tcp Subnet Roaming [Michael_Chapman] [Michael_Chapman] 2004-11 ++afrog 1042 udp Subnet Roaming [Michael_Chapman] [Michael_Chapman] 2004-11 ++boinc-client 1043 tcp BOINC Client Control [David_Anderson] [David_Anderson] 2004-11 ++boinc-client 1043 udp BOINC Client Control [David_Anderson] [David_Anderson] 2004-11 ++dcutility 1044 tcp Dev Consortium Utility [Chris_Ryland] [Chris_Ryland] 2004-11 ++dcutility 1044 udp Dev Consortium Utility [Chris_Ryland] [Chris_Ryland] 2004-11 ++fpitp 1045 tcp Fingerprint Image Transfer [Steven_Fields] [Steven_Fields] 2002-02 ++ Protocol ++fpitp 1045 udp Fingerprint Image Transfer [Steven_Fields] [Steven_Fields] 2002-02 ++ Protocol ++wfremotertm 1046 tcp WebFilter Remote Monitor [Tim_Morgan] [Tim_Morgan] 2004-11 ++wfremotertm 1046 udp WebFilter Remote Monitor [Tim_Morgan] [Tim_Morgan] 2004-11 ++neod1 1047 tcp Sun's NEO Object Request ++ Broker ++neod1 1047 udp Sun's NEO Object Request ++ Broker ++neod2 1048 tcp Sun's NEO Object Request [Rohit_Garg] [Rohit_Garg] ++ Broker ++neod2 1048 udp Sun's NEO Object Request [Rohit_Garg] [Rohit_Garg] ++ Broker ++td-postman 1049 tcp Tobit David Postman VPMN [Franz_Josef_Leuders] [Franz_Josef_Leuders] ++td-postman 1049 udp Tobit David Postman VPMN [Franz_Josef_Leuders] [Franz_Josef_Leuders] ++cma 1050 tcp CORBA Management Agent [Ramy_Zaarour] [Ramy_Zaarour] ++cma 1050 udp CORBA Management Agent [Ramy_Zaarour] [Ramy_Zaarour] ++optima-vnet 1051 tcp Optima VNET [Ralf_Doewich] [Ralf_Doewich] ++optima-vnet 1051 udp Optima VNET [Ralf_Doewich] [Ralf_Doewich] ++ddt 1052 tcp Dynamic DNS Tools [Remi_Lefebvre] [Remi_Lefebvre] ++ddt 1052 udp Dynamic DNS Tools [Remi_Lefebvre] [Remi_Lefebvre] ++ Unauthorized ++remote-as 1053 tcp Remote Assistant (RA) [Roman_Kriis] [Roman_Kriis] Use Known on ++ port 1053 ++remote-as 1053 udp Remote Assistant (RA) [Roman_Kriis] [Roman_Kriis] ++brvread 1054 tcp BRVREAD [A_Boninn] [A_Boninn] ++brvread 1054 udp BRVREAD [A_Boninn] [A_Boninn] ++ansyslmd 1055 tcp ANSYS - License Manager [Suzanne_Lorrin] [Suzanne_Lorrin] ++ansyslmd 1055 udp ANSYS - License Manager [Suzanne_Lorrin] [Suzanne_Lorrin] ++vfo 1056 tcp VFO [Anthony_Gonzalez] [Anthony_Gonzalez] ++vfo 1056 udp VFO [Anthony_Gonzalez] [Anthony_Gonzalez] ++startron 1057 tcp STARTRON [Markus_Sabadello] [Markus_Sabadello] ++startron 1057 udp STARTRON [Markus_Sabadello] [Markus_Sabadello] ++nim 1058 tcp nim ++nim 1058 udp nim ++nimreg 1059 tcp nimreg [Robert_Gordon] [Robert_Gordon] ++nimreg 1059 udp nimreg [Robert_Gordon] [Robert_Gordon] ++polestar 1060 tcp POLESTAR [Masakuni_Okada] [Masakuni_Okada] ++polestar 1060 udp POLESTAR [Masakuni_Okada] [Masakuni_Okada] ++kiosk 1061 tcp KIOSK [Ken_Ksiazek] [Ken_Ksiazek] ++kiosk 1061 udp KIOSK [Ken_Ksiazek] [Ken_Ksiazek] ++veracity 1062 tcp Veracity [Ross_Williams] [Ross_Williams] ++veracity 1062 udp Veracity [Ross_Williams] [Ross_Williams] ++kyoceranetdev 1063 tcp KyoceraNetDev [Shigenaka_Kanemitsu] [Shigenaka_Kanemitsu] ++kyoceranetdev 1063 udp KyoceraNetDev [Shigenaka_Kanemitsu] [Shigenaka_Kanemitsu] ++jstel 1064 tcp JSTEL [Duane_Kiser] [Duane_Kiser] ++jstel 1064 udp JSTEL [Duane_Kiser] [Duane_Kiser] ++syscomlan 1065 tcp SYSCOMLAN [Alexandre_Lechenne] [Alexandre_Lechenne] 2008-12-10 ++syscomlan 1065 udp SYSCOMLAN [Alexandre_Lechenne] [Alexandre_Lechenne] 2008-12-10 ++fpo-fns 1066 tcp FPO-FNS [Jens_Klose] [Jens_Klose] ++fpo-fns 1066 udp FPO-FNS [Jens_Klose] [Jens_Klose] ++ Installation Bootstrap ++ Proto. Serv. ++ ++instl-boots 1067 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "instl_boots". ++ Installation Bootstrap This entry is an alias to "instl-boots". This entry is now ++instl_boots 1067 tcp Proto. Serv. historic, not usable for use with many common service ++ discovery mechanisms. ++ Installation Bootstrap ++ Proto. Serv. ++ ++instl-boots 1067 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "instl_boots". ++ Installation Bootstrap This entry is an alias to "instl-boots". This entry is now ++instl_boots 1067 udp Proto. Serv. historic, not usable for use with many common service ++ discovery mechanisms. ++ Installation Bootstrap ++ Proto. Cli. ++ ++instl-bootc 1068 tcp IANA assigned this [David_Arko] [David_Arko] ++ well-formed service name as ++ a replacement for ++ "instl_bootc". ++ Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now ++instl_bootc 1068 tcp Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service ++ discovery mechanisms. ++ Installation Bootstrap ++ Proto. Cli. ++ ++instl-bootc 1068 udp IANA assigned this [David_Arko] [David_Arko] ++ well-formed service name as ++ a replacement for ++ "instl_bootc". ++ Installation Bootstrap This entry is an alias to "instl-bootc". This entry is now ++instl_bootc 1068 udp Proto. Cli. [David_Arko] [David_Arko] historic, not usable for use with many common service ++ discovery mechanisms. ++cognex-insight 1069 tcp COGNEX-INSIGHT [Steve_Olson] [Steve_Olson] ++cognex-insight 1069 udp COGNEX-INSIGHT [Steve_Olson] [Steve_Olson] ++gmrupdateserv 1070 tcp GMRUpdateSERV [Steve_Kellogg] [Steve_Kellogg] ++gmrupdateserv 1070 udp GMRUpdateSERV [Steve_Kellogg] [Steve_Kellogg] ++bsquare-voip 1071 tcp BSQUARE-VOIP [Yen_Lee] [Yen_Lee] ++bsquare-voip 1071 udp BSQUARE-VOIP [Yen_Lee] [Yen_Lee] ++cardax 1072 tcp CARDAX [Charles_Oram] [Charles_Oram] ++cardax 1072 udp CARDAX [Charles_Oram] [Charles_Oram] ++bridgecontrol 1073 tcp Bridge Control [Andy_Heron] [Andy_Heron] ++bridgecontrol 1073 udp Bridge Control [Andy_Heron] [Andy_Heron] ++warmspotMgmt 1074 tcp Warmspot Management Protocol [Robert_C_Henningsga] [Robert_C_Henningsga] ++warmspotMgmt 1074 udp Warmspot Management Protocol [Robert_C_Henningsga] [Robert_C_Henningsga] ++rdrmshc 1075 tcp RDRMSHC [Ericko_Shimada] [Ericko_Shimada] ++rdrmshc 1075 udp RDRMSHC [Ericko_Shimada] [Ericko_Shimada] ++dab-sti-c 1076 tcp DAB STI-C [World_DAB] [World_DAB] ++dab-sti-c 1076 udp DAB STI-C [World_DAB] [World_DAB] ++imgames 1077 tcp IMGames [Jean_A_Ames] [Jean_A_Ames] ++imgames 1077 udp IMGames [Jean_A_Ames] [Jean_A_Ames] ++avocent-proxy 1078 tcp Avocent Proxy Protocol [Steven_W_Clark] [Steven_W_Clark] ++avocent-proxy 1078 udp Avocent Proxy Protocol [Steven_W_Clark] [Steven_W_Clark] ++asprovatalk 1079 tcp ASPROVATalk [Chiew_Farn_Chung] [Chiew_Farn_Chung] ++asprovatalk 1079 udp ASPROVATalk [Chiew_Farn_Chung] [Chiew_Farn_Chung] ++socks 1080 tcp Socks [Ying_Da_Lee] [Ying_Da_Lee] ++socks 1080 udp Socks [Ying_Da_Lee] [Ying_Da_Lee] ++pvuniwien 1081 tcp PVUNIWIEN [Peter_Lipp] [Peter_Lipp] ++pvuniwien 1081 udp PVUNIWIEN [Peter_Lipp] [Peter_Lipp] ++amt-esd-prot 1082 tcp AMT-ESD-PROT [AMTEC_S_p_A] [AMTEC_S_p_A] ++amt-esd-prot 1082 udp AMT-ESD-PROT [AMTEC_S_p_A] [AMTEC_S_p_A] ++ansoft-lm-1 1083 tcp Anasoft License Manager ++ansoft-lm-1 1083 udp Anasoft License Manager ++ansoft-lm-2 1084 tcp Anasoft License Manager ++ansoft-lm-2 1084 udp Anasoft License Manager ++webobjects 1085 tcp Web Objects [Andy_Belk] [Andy_Belk] ++webobjects 1085 udp Web Objects [Andy_Belk] [Andy_Belk] ++cplscrambler-lg 1086 tcp CPL Scrambler Logging ++cplscrambler-lg 1086 udp CPL Scrambler Logging ++cplscrambler-in 1087 tcp CPL Scrambler Internal ++cplscrambler-in 1087 udp CPL Scrambler Internal ++cplscrambler-al 1088 tcp CPL Scrambler Alarm Log [Richard_Corn] [Richard_Corn] ++cplscrambler-al 1088 udp CPL Scrambler Alarm Log [Richard_Corn] [Richard_Corn] ++ff-annunc 1089 tcp FF Annunciation ++ff-annunc 1089 udp FF Annunciation ++ff-fms 1090 tcp FF Fieldbus Message ++ Specification ++ff-fms 1090 udp FF Fieldbus Message ++ Specification ++ff-sm 1091 tcp FF System Management [Fieldbus_Foundation] [Fieldbus_Foundation] ++ff-sm 1091 udp FF System Management [Fieldbus_Foundation] [Fieldbus_Foundation] ++obrpd 1092 tcp Open Business Reporting [William_Randolph_Roy] [William_Randolph_Roy] ++ Protocol ++obrpd 1092 udp Open Business Reporting [William_Randolph_Roy] [William_Randolph_Roy] ++ Protocol ++proofd 1093 tcp PROOFD ++proofd 1093 udp PROOFD ++rootd 1094 tcp ROOTD [Fons_Rademakers] [Fons_Rademakers] ++rootd 1094 udp ROOTD [Fons_Rademakers] [Fons_Rademakers] ++nicelink 1095 tcp NICELink [Jordi_Lisbona] [Jordi_Lisbona] ++nicelink 1095 udp NICELink [Jordi_Lisbona] [Jordi_Lisbona] ++cnrprotocol 1096 tcp Common Name Resolution [Michael_Mealling] [Michael_Mealling] ++ Protocol ++cnrprotocol 1096 udp Common Name Resolution [Michael_Mealling] [Michael_Mealling] ++ Protocol ++sunclustermgr 1097 tcp Sun Cluster Manager [Ashit_Patel] [Ashit_Patel] ++sunclustermgr 1097 udp Sun Cluster Manager [Ashit_Patel] [Ashit_Patel] ++rmiactivation 1098 tcp RMI Activation ++rmiactivation 1098 udp RMI Activation ++rmiregistry 1099 tcp RMI Registry [Mark_Hodapp] [Mark_Hodapp] ++rmiregistry 1099 udp RMI Registry [Mark_Hodapp] [Mark_Hodapp] ++mctp 1100 tcp MCTP [Vitaly_Revsin] [Vitaly_Revsin] ++mctp 1100 udp MCTP [Vitaly_Revsin] [Vitaly_Revsin] ++pt2-discover 1101 tcp PT2-DISCOVER [Ralph_Kammerlander] [Ralph_Kammerlander] ++pt2-discover 1101 udp PT2-DISCOVER [Ralph_Kammerlander] [Ralph_Kammerlander] ++adobeserver-1 1102 tcp ADOBE SERVER 1 ++adobeserver-1 1102 udp ADOBE SERVER 1 ++adobeserver-2 1103 tcp ADOBE SERVER 2 [Frank_Soetebeer] [Frank_Soetebeer] ++adobeserver-2 1103 udp ADOBE SERVER 2 [Frank_Soetebeer] [Frank_Soetebeer] ++xrl 1104 tcp XRL [Patrick_Robinson] [Patrick_Robinson] ++xrl 1104 udp XRL [Patrick_Robinson] [Patrick_Robinson] ++ftranhc 1105 tcp FTRANHC [Eriko_Shimada] [Eriko_Shimada] ++ftranhc 1105 udp FTRANHC [Eriko_Shimada] [Eriko_Shimada] ++isoipsigport-1 1106 tcp ISOIPSIGPORT-1 ++isoipsigport-1 1106 udp ISOIPSIGPORT-1 ++isoipsigport-2 1107 tcp ISOIPSIGPORT-2 [Peter_Egli] [Peter_Egli] ++isoipsigport-2 1107 udp ISOIPSIGPORT-2 [Peter_Egli] [Peter_Egli] ++ratio-adp 1108 tcp ratio-adp [Oliver_Thulke] [Oliver_Thulke] ++ratio-adp 1108 udp ratio-adp [Oliver_Thulke] [Oliver_Thulke] ++ 1109 Reserved - IANA ++webadmstart 1110 tcp Start web admin server ++nfsd-keepalive 1110 udp Client status info [Beth_Crespo] [Beth_Crespo] ++lmsocialserver 1111 tcp LM Social Server [Ron_Lussier] [Ron_Lussier] ++lmsocialserver 1111 udp LM Social Server [Ron_Lussier] [Ron_Lussier] ++icp 1112 tcp Intelligent Communication [Mark_H_David] [Mark_H_David] ++ Protocol ++icp 1112 udp Intelligent Communication [Mark_H_David] [Mark_H_David] ++ Protocol ++ltp-deepspace 1113 tcp Licklider Transmission [RFC5326] ++ Protocol ++ltp-deepspace 1113 udp Licklider Transmission [RFC5326] ++ Protocol ++mini-sql 1114 tcp Mini SQL [David_Hughes] [David_Hughes] ++mini-sql 1114 udp Mini SQL [David_Hughes] [David_Hughes] ++ardus-trns 1115 tcp ARDUS Transfer ++ardus-trns 1115 udp ARDUS Transfer ++ardus-cntl 1116 tcp ARDUS Control ++ardus-cntl 1116 udp ARDUS Control ++ardus-mtrns 1117 tcp ARDUS Multicast Transfer [Shinya_Abe] [Shinya_Abe] ++ardus-mtrns 1117 udp ARDUS Multicast Transfer [Shinya_Abe] [Shinya_Abe] ++sacred 1118 tcp SACRED [RFC3767] ++sacred 1118 udp SACRED [RFC3767] ++bnetgame 1119 tcp Battle.net Chat/Game ++ Protocol ++bnetgame 1119 udp Battle.net Chat/Game ++ Protocol ++bnetfile 1120 tcp Battle.net File Transfer [Domain_Tech] [Domain_Tech] 2005-04 ++ Protocol ++bnetfile 1120 udp Battle.net File Transfer [Domain_Tech] [Domain_Tech] 2005-04 ++ Protocol ++rmpp 1121 tcp Datalode RMPP [Dave_Ruedger] [Dave_Ruedger] 2003-11 ++rmpp 1121 udp Datalode RMPP [Dave_Ruedger] [Dave_Ruedger] 2003-11 ++availant-mgr 1122 tcp availant-mgr [Steven_Pelletier] [Steven_Pelletier] ++availant-mgr 1122 udp availant-mgr [Steven_Pelletier] [Steven_Pelletier] ++murray 1123 tcp Murray [Stu_Mark] [Stu_Mark] ++murray 1123 udp Murray [Stu_Mark] [Stu_Mark] ++hpvmmcontrol 1124 tcp HP VMM Control ++hpvmmcontrol 1124 udp HP VMM Control ++hpvmmagent 1125 tcp HP VMM Agent ++hpvmmagent 1125 udp HP VMM Agent ++hpvmmdata 1126 tcp HP VMM Agent [John_Morton] [John_Morton] 2004-11 ++hpvmmdata 1126 udp HP VMM Agent [John_Morton] [John_Morton] 2004-11 ++kwdb-commn 1127 tcp KWDB Remote Communication [Lal_Samuel_Varghese] [Lal_Samuel_Varghese] 2005-08 ++kwdb-commn 1127 udp KWDB Remote Communication [Lal_Samuel_Varghese] [Lal_Samuel_Varghese] 2005-08 ++saphostctrl 1128 tcp SAPHostControl over ++ SOAP/HTTP ++saphostctrl 1128 udp SAPHostControl over ++ SOAP/HTTP ++saphostctrls 1129 tcp SAPHostControl over [Muscarella_Fabrizio] [Muscarella_Fabrizio] 2006-04 ++ SOAP/HTTPS ++saphostctrls 1129 udp SAPHostControl over [Muscarella_Fabrizio] [Muscarella_Fabrizio] 2006-04 ++ SOAP/HTTPS ++casp 1130 tcp CAC App Service Protocol ++casp 1130 udp CAC App Service Protocol ++caspssl 1131 tcp CAC App Service Protocol [Enrique_Corujo] [Enrique_Corujo] 2006-02 ++ Encripted ++caspssl 1131 udp CAC App Service Protocol [Enrique_Corujo] [Enrique_Corujo] 2006-02 ++ Encripted ++kvm-via-ip 1132 tcp KVM-via-IP Management [Ian_Miller] [Ian_Miller] 2006-03 ++ Service ++kvm-via-ip 1132 udp KVM-via-IP Management [Ian_Miller] [Ian_Miller] 2006-03 ++ Service ++dfn 1133 tcp Data Flow Network [Dmitry_Obuvalin] [Dmitry_Obuvalin] 2006-02 ++dfn 1133 udp Data Flow Network [Dmitry_Obuvalin] [Dmitry_Obuvalin] 2006-02 ++aplx 1134 tcp MicroAPL APLX [Richard_Nabavi] [Richard_Nabavi] 2006-02 ++aplx 1134 udp MicroAPL APLX [Richard_Nabavi] [Richard_Nabavi] 2006-02 ++omnivision 1135 tcp OmniVision Communication [Serge_Vacquier] [Serge_Vacquier] 2006-02 ++ Service ++omnivision 1135 udp OmniVision Communication [Serge_Vacquier] [Serge_Vacquier] 2006-02 ++ Service ++hhb-gateway 1136 tcp HHB Gateway Control [Richard_Harwell] [Richard_Harwell] 2006-02 ++hhb-gateway 1136 udp HHB Gateway Control [Richard_Harwell] [Richard_Harwell] 2006-02 ++trim 1137 tcp TRIM Workgroup Service [Siva_Poobalasingam] [Siva_Poobalasingam] 2006-03 ++trim 1137 udp TRIM Workgroup Service [Siva_Poobalasingam] [Siva_Poobalasingam] 2006-03 ++ encrypted admin requests ++ ++encrypted-admin 1138 tcp IANA assigned this [Michael_Elizarov] [Michael_Elizarov] 2007-01 ++ well-formed service name as ++ a replacement for ++ "encrypted_admin". ++ This entry is an alias to "encrypted-admin". This entry is ++encrypted_admin 1138 tcp encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service ++ discovery mechanisms. ++ encrypted admin requests ++ ++encrypted-admin 1138 udp IANA assigned this [Michael_Elizarov] [Michael_Elizarov] 2007-01 ++ well-formed service name as ++ a replacement for ++ "encrypted_admin". ++ This entry is an alias to "encrypted-admin". This entry is ++encrypted_admin 1138 udp encrypted admin requests [Michael_Elizarov] [Michael_Elizarov] 2007-01 now historic, not usable for use with many common service ++ discovery mechanisms. ++evm 1139 tcp Enterprise Virtual Manager [Thomas_Hennessy] [Thomas_Hennessy] 2007-10-04 ++evm 1139 udp Enterprise Virtual Manager [Thomas_Hennessy] [Thomas_Hennessy] 2007-10-04 ++autonoc 1140 tcp AutoNOC Network Operations [Kyle_Lussier] [Kyle_Lussier] 2005-12 ++ Protocol ++autonoc 1140 udp AutoNOC Network Operations [Kyle_Lussier] [Kyle_Lussier] 2005-12 ++ Protocol ++mxomss 1141 tcp User Message Service [Chaoyi_Lang] [Chaoyi_Lang] 2006-01 ++mxomss 1141 udp User Message Service [Chaoyi_Lang] [Chaoyi_Lang] 2006-01 ++edtools 1142 tcp User Discovery Service [Lee_Dolson] [Lee_Dolson] 2006-01 ++edtools 1142 udp User Discovery Service [Lee_Dolson] [Lee_Dolson] 2006-01 ++imyx 1143 tcp Infomatryx Exchange [David_Walling] [David_Walling] 2006-03 ++imyx 1143 udp Infomatryx Exchange [David_Walling] [David_Walling] 2006-03 ++fuscript 1144 tcp Fusion Script [Peter_Loveday] [Peter_Loveday] 2006-01 ++fuscript 1144 udp Fusion Script [Peter_Loveday] [Peter_Loveday] 2006-01 ++x9-icue 1145 tcp X9 iCue Show Control [Brandon_Potter] [Brandon_Potter] 2006-01 ++x9-icue 1145 udp X9 iCue Show Control [Brandon_Potter] [Brandon_Potter] 2006-01 ++audit-transfer 1146 tcp audit transfer [Mark_Wahl] [Mark_Wahl] 2005-11 ++audit-transfer 1146 udp audit transfer [Mark_Wahl] [Mark_Wahl] 2005-11 ++capioverlan 1147 tcp CAPIoverLAN [Diego_Friedel] [Diego_Friedel] 2005-11 ++capioverlan 1147 udp CAPIoverLAN [Diego_Friedel] [Diego_Friedel] 2005-11 ++elfiq-repl 1148 tcp Elfiq Replication Service [Frederick_Parent] [Frederick_Parent] 2005-11 ++elfiq-repl 1148 udp Elfiq Replication Service [Frederick_Parent] [Frederick_Parent] 2005-11 ++bvtsonar 1149 tcp BVT Sonar Service [Justin_Huff] [Justin_Huff] 2005-11 ++bvtsonar 1149 udp BVT Sonar Service [Justin_Huff] [Justin_Huff] 2005-11 ++blaze 1150 tcp Blaze File Server [Curt_Schimmel] [Curt_Schimmel] 2005-11 ++blaze 1150 udp Blaze File Server [Curt_Schimmel] [Curt_Schimmel] 2005-11 ++unizensus 1151 tcp Unizensus Login Server [Dirk_Materlik] [Dirk_Materlik] 2005-11 ++unizensus 1151 udp Unizensus Login Server [Dirk_Materlik] [Dirk_Materlik] 2005-11 ++winpoplanmess 1152 tcp Winpopup LAN Messenger [Vitali_Fomine] [Vitali_Fomine] 2005-11 ++winpoplanmess 1152 udp Winpopup LAN Messenger [Vitali_Fomine] [Vitali_Fomine] 2005-11 ++c1222-acse 1153 tcp ANSI C12.22 Port [RFC6142] ++c1222-acse 1153 udp ANSI C12.22 Port [RFC6142] ++resacommunity 1154 tcp Community Service [Stephane_MONS] [Stephane_MONS] 2005-09 ++resacommunity 1154 udp Community Service [Stephane_MONS] [Stephane_MONS] 2005-09 ++nfa 1155 tcp Network File Access [James_Powell] [James_Powell] ++nfa 1155 udp Network File Access [James_Powell] [James_Powell] ++iascontrol-oms 1156 tcp iasControl OMS [Todd_Guay] [Todd_Guay] 2004-11 ++iascontrol-oms 1156 udp iasControl OMS [Todd_Guay] [Todd_Guay] 2004-11 ++iascontrol 1157 tcp Oracle iASControl [Todd_Guay] [Todd_Guay] 2004-11 ++iascontrol 1157 udp Oracle iASControl [Todd_Guay] [Todd_Guay] 2004-11 ++dbcontrol-oms 1158 tcp dbControl OMS [Todd_Guay] [Todd_Guay] 2004-11 ++dbcontrol-oms 1158 udp dbControl OMS [Todd_Guay] [Todd_Guay] 2004-11 ++oracle-oms 1159 tcp Oracle OMS [Todd_Guay] [Todd_Guay] 2004-11 ++oracle-oms 1159 udp Oracle OMS [Todd_Guay] [Todd_Guay] 2004-11 ++olsv 1160 tcp DB Lite Mult-User Server [Philip_Stephenson] [Philip_Stephenson] 2005-08 ++olsv 1160 udp DB Lite Mult-User Server [Philip_Stephenson] [Philip_Stephenson] 2005-08 ++health-polling 1161 tcp Health Polling ++health-polling 1161 udp Health Polling ++health-trap 1162 tcp Health Trap ++health-trap 1162 udp Health Trap ++sddp 1163 tcp SmartDialer Data Protocol [Lee_Griffiths] [Lee_Griffiths] 2004-11 ++sddp 1163 udp SmartDialer Data Protocol [Lee_Griffiths] [Lee_Griffiths] 2004-11 ++qsm-proxy 1164 tcp QSM Proxy Service [Norm_Lunde] [Norm_Lunde] 2004-11 ++qsm-proxy 1164 udp QSM Proxy Service [Norm_Lunde] [Norm_Lunde] 2004-11 ++qsm-gui 1165 tcp QSM GUI Service [Norm_Lunde] [Norm_Lunde] 2004-11 ++qsm-gui 1165 udp QSM GUI Service [Norm_Lunde] [Norm_Lunde] 2004-11 ++qsm-remote 1166 tcp QSM RemoteExec [Norm_Lunde] [Norm_Lunde] 2004-11 ++qsm-remote 1166 udp QSM RemoteExec [Norm_Lunde] [Norm_Lunde] 2004-11 ++cisco-ipsla 1167 tcp Cisco IP SLAs Control [Emmanuel_Tychon] [Emmanuel_Tychon] 2006-03 ++ Protocol ++cisco-ipsla 1167 udp Cisco IP SLAs Control [Emmanuel_Tychon] [Emmanuel_Tychon] 2006-03 ++ Protocol ++cisco-ipsla 1167 sctp Cisco IP SLAs Control [Emmanuel_Tychon] [Emmanuel_Tychon] 2006-03 ++ Protocol ++vchat 1168 tcp VChat Conference Service [Andreas_Wetzel] [Andreas_Wetzel] 2002-09 ++vchat 1168 udp VChat Conference Service [Andreas_Wetzel] [Andreas_Wetzel] 2002-09 ++tripwire 1169 tcp TRIPWIRE [Ed_Metcalf][Albert_Holt] [Ed_Metcalf][Albert_Holt] ++tripwire 1169 udp TRIPWIRE [Ed_Metcalf][Albert_Holt] [Ed_Metcalf][Albert_Holt] ++atc-lm 1170 tcp AT+C License Manager [Peter_Schafer] [Peter_Schafer] 2004-02 ++atc-lm 1170 udp AT+C License Manager [Peter_Schafer] [Peter_Schafer] 2004-02 ++atc-appserver 1171 tcp AT+C FmiApplicationServer [Peter_Schafer] [Peter_Schafer] 2004-02 ++atc-appserver 1171 udp AT+C FmiApplicationServer [Peter_Schafer] [Peter_Schafer] 2004-02 ++dnap 1172 tcp DNA Protocol [David_McLaughlin] [David_McLaughlin] 2004-11 ++dnap 1172 udp DNA Protocol [David_McLaughlin] [David_McLaughlin] 2004-11 ++d-cinema-rrp 1173 tcp D-Cinema Request-Response [Robert_Baldwin] [Robert_Baldwin] 2004-11 ++d-cinema-rrp 1173 udp D-Cinema Request-Response [Robert_Baldwin] [Robert_Baldwin] 2004-11 ++fnet-remote-ui 1174 tcp FlashNet Remote Admin [Terry_Smyth] [Terry_Smyth] 2004-11 ++fnet-remote-ui 1174 udp FlashNet Remote Admin [Terry_Smyth] [Terry_Smyth] 2004-11 ++dossier 1175 tcp Dossier Server [Rob_Minerick] [Rob_Minerick] 2004-11 ++dossier 1175 udp Dossier Server [Rob_Minerick] [Rob_Minerick] 2004-11 ++indigo-server 1176 tcp Indigo Home Server [Matt_Bendiksen] [Matt_Bendiksen] 2004-11 ++indigo-server 1176 udp Indigo Home Server [Matt_Bendiksen] [Matt_Bendiksen] 2004-11 ++dkmessenger 1177 tcp DKMessenger Protocol [Douglas_Kadlecek] [Douglas_Kadlecek] 2004-11 ++dkmessenger 1177 udp DKMessenger Protocol [Douglas_Kadlecek] [Douglas_Kadlecek] 2004-11 ++sgi-storman 1178 tcp SGI Storage Manager [Greg_Banks] [Greg_Banks] 2004-11 ++sgi-storman 1178 udp SGI Storage Manager [Greg_Banks] [Greg_Banks] 2004-11 ++b2n 1179 tcp Backup To Neighbor [Thomas_Fok] [Thomas_Fok] 2004-11 ++b2n 1179 udp Backup To Neighbor [Thomas_Fok] [Thomas_Fok] 2004-11 ++mc-client 1180 tcp Millicent Client Proxy [Steve_Glassman] [Steve_Glassman] ++mc-client 1180 udp Millicent Client Proxy [Steve_Glassman] [Steve_Glassman] ++3comnetman 1181 tcp 3Com Net Management [Peter_White] [Peter_White] 2004-11 ++3comnetman 1181 udp 3Com Net Management [Peter_White] [Peter_White] 2004-11 ++accelenet 1182 tcp AcceleNet Control ++accelenet-data 1182 udp AcceleNet Data [Peter_Lepeska] [Peter_Lepeska] 2010-09-10 ++llsurfup-http 1183 tcp LL Surfup HTTP ++llsurfup-http 1183 udp LL Surfup HTTP ++llsurfup-https 1184 tcp LL Surfup HTTPS [Katy_Lynn_McCullough] [Katy_Lynn_McCullough] ++llsurfup-https 1184 udp LL Surfup HTTPS [Katy_Lynn_McCullough] [Katy_Lynn_McCullough] ++catchpole 1185 tcp Catchpole port [Christian_Catchpole] [Christian_Catchpole] 2002-03 ++catchpole 1185 udp Catchpole port [Christian_Catchpole] [Christian_Catchpole] 2002-03 ++mysql-cluster 1186 tcp MySQL Cluster Manager [Arjen_Lentz] [Arjen_Lentz] 2004-11 ++mysql-cluster 1186 udp MySQL Cluster Manager [Arjen_Lentz] [Arjen_Lentz] 2004-11 ++alias 1187 tcp Alias Service [Paul_Tokarchuk] [Paul_Tokarchuk] 2004-11 ++alias 1187 udp Alias Service [Paul_Tokarchuk] [Paul_Tokarchuk] 2004-11 ++hp-webadmin 1188 tcp HP Web Admin [Lance_Kind] [Lance_Kind] ++hp-webadmin 1188 udp HP Web Admin [Lance_Kind] [Lance_Kind] ++unet 1189 tcp Unet Connection [Anthony_Stahler] [Anthony_Stahler] 2004-11 ++unet 1189 udp Unet Connection [Anthony_Stahler] [Anthony_Stahler] 2004-11 ++commlinx-avl 1190 tcp CommLinx GPS / AVL System [Peter_Johnson] [Peter_Johnson] 2004-11 ++commlinx-avl 1190 udp CommLinx GPS / AVL System [Peter_Johnson] [Peter_Johnson] 2004-11 ++gpfs 1191 tcp General Parallel File System [Dave_Craft] [Dave_Craft] 2004-11 ++gpfs 1191 udp General Parallel File System [Dave_Craft] [Dave_Craft] 2004-11 ++caids-sensor 1192 tcp caids sensors channel [Gregory_Hostettler] [Gregory_Hostettler] 2004-11 ++caids-sensor 1192 udp caids sensors channel [Gregory_Hostettler] [Gregory_Hostettler] 2004-11 ++fiveacross 1193 tcp Five Across Server [Glenn_Reid] [Glenn_Reid] 2004-11 ++fiveacross 1193 udp Five Across Server [Glenn_Reid] [Glenn_Reid] 2004-11 ++openvpn 1194 tcp OpenVPN [James_Yonan] [James_Yonan] 2004-11 ++openvpn 1194 udp OpenVPN [James_Yonan] [James_Yonan] 2004-11 ++rsf-1 1195 tcp RSF-1 clustering [Dave_Hines] [Dave_Hines] 2004-11 ++rsf-1 1195 udp RSF-1 clustering [Dave_Hines] [Dave_Hines] 2004-11 ++netmagic 1196 tcp Network Magic [Nick_Holt] [Nick_Holt] 2005-08 ++netmagic 1196 udp Network Magic [Nick_Holt] [Nick_Holt] 2005-08 ++carrius-rshell 1197 tcp Carrius Remote Access [Gerry_Dubois] [Gerry_Dubois] 2005-08 ++carrius-rshell 1197 udp Carrius Remote Access [Gerry_Dubois] [Gerry_Dubois] 2005-08 ++cajo-discovery 1198 tcp cajo reference discovery [John_Catherino] [John_Catherino] 2005-08 ++cajo-discovery 1198 udp cajo reference discovery [John_Catherino] [John_Catherino] 2005-08 ++dmidi 1199 tcp DMIDI [Phil_Kerr] [Phil_Kerr] 2002-02 ++dmidi 1199 udp DMIDI [Phil_Kerr] [Phil_Kerr] 2002-02 ++scol 1200 tcp SCOL [Cryo_Networks] [Cryo_Networks] ++scol 1200 udp SCOL [Cryo_Networks] [Cryo_Networks] ++nucleus-sand 1201 tcp Nucleus Sand Database Server [James_Marsh] [James_Marsh] ++nucleus-sand 1201 udp Nucleus Sand Database Server [James_Marsh] [James_Marsh] ++caiccipc 1202 tcp caiccipc [Vince_Re] [Vince_Re] ++caiccipc 1202 udp caiccipc [Vince_Re] [Vince_Re] ++ssslic-mgr 1203 tcp License Validation ++ssslic-mgr 1203 udp License Validation ++ssslog-mgr 1204 tcp Log Request Listener [Eric_Bruno] [Eric_Bruno] ++ssslog-mgr 1204 udp Log Request Listener [Eric_Bruno] [Eric_Bruno] ++accord-mgc 1205 tcp Accord-MGC [Roni_Even] [Roni_Even] ++accord-mgc 1205 udp Accord-MGC [Roni_Even] [Roni_Even] ++anthony-data 1206 tcp Anthony Data [Paul_Dollemore] [Paul_Dollemore] ++anthony-data 1206 udp Anthony Data [Paul_Dollemore] [Paul_Dollemore] ++metasage 1207 tcp MetaSage [Peter_Anvelt] [Peter_Anvelt] ++metasage 1207 udp MetaSage [Peter_Anvelt] [Peter_Anvelt] ++seagull-ais 1208 tcp SEAGULL AIS [Lee_Breisacher] [Lee_Breisacher] ++seagull-ais 1208 udp SEAGULL AIS [Lee_Breisacher] [Lee_Breisacher] ++ipcd3 1209 tcp IPCD3 [Mark_Ciskey] [Mark_Ciskey] ++ipcd3 1209 udp IPCD3 [Mark_Ciskey] [Mark_Ciskey] ++eoss 1210 tcp EOSS [Robert_Armes] [Robert_Armes] ++eoss 1210 udp EOSS [Robert_Armes] [Robert_Armes] ++groove-dpp 1211 tcp Groove DPP [Ken_Moore] [Ken_Moore] ++groove-dpp 1211 udp Groove DPP [Ken_Moore] [Ken_Moore] ++lupa 1212 tcp lupa [Barney_Wolff] [Barney_Wolff] ++lupa 1212 udp lupa [Barney_Wolff] [Barney_Wolff] ++mpc-lifenet 1213 tcp MPC LIFENET [Ward_Silver] [Ward_Silver] ++mpc-lifenet 1213 udp MPC LIFENET [Ward_Silver] [Ward_Silver] ++kazaa 1214 tcp KAZAA [Ahti_Heinla] [Ahti_Heinla] ++kazaa 1214 udp KAZAA [Ahti_Heinla] [Ahti_Heinla] ++scanstat-1 1215 tcp scanSTAT 1.0 [William_Scheding] [William_Scheding] ++scanstat-1 1215 udp scanSTAT 1.0 [William_Scheding] [William_Scheding] ++etebac5 1216 tcp ETEBAC 5 [Jean_Louis_Barbut] [Jean_Louis_Barbut] ++etebac5 1216 udp ETEBAC 5 [Jean_Louis_Barbut] [Jean_Louis_Barbut] ++hpss-ndapi 1217 tcp HPSS NonDCE Gateway [Michael_Gleicher] [Michael_Gleicher] ++hpss-ndapi 1217 udp HPSS NonDCE Gateway [Michael_Gleicher] [Michael_Gleicher] ++aeroflight-ads 1218 tcp AeroFlight-ADs ++aeroflight-ads 1218 udp AeroFlight-ADs ++aeroflight-ret 1219 tcp AeroFlight-Ret [Eric_Johnson] [Eric_Johnson] ++aeroflight-ret 1219 udp AeroFlight-Ret [Eric_Johnson] [Eric_Johnson] ++qt-serveradmin 1220 tcp QT SERVER ADMIN [Chris_LeCroy] [Chris_LeCroy] ++qt-serveradmin 1220 udp QT SERVER ADMIN [Chris_LeCroy] [Chris_LeCroy] ++sweetware-apps 1221 tcp SweetWARE Apps [David_Dunetz] [David_Dunetz] ++sweetware-apps 1221 udp SweetWARE Apps [David_Dunetz] [David_Dunetz] ++nerv 1222 tcp SNI R&D network [Martin_Freiss] [Martin_Freiss] ++nerv 1222 udp SNI R&D network [Martin_Freiss] [Martin_Freiss] ++tgp 1223 tcp TrulyGlobal Protocol [Gur_Kimchi] [Gur_Kimchi] 2008-05-20 ++tgp 1223 udp TrulyGlobal Protocol [Gur_Kimchi] [Gur_Kimchi] 2008-05-20 ++vpnz 1224 tcp VPNz [Tom_Strack] [Tom_Strack] ++vpnz 1224 udp VPNz [Tom_Strack] [Tom_Strack] ++slinkysearch 1225 tcp SLINKYSEARCH [Desmond_Chan] [Desmond_Chan] ++slinkysearch 1225 udp SLINKYSEARCH [Desmond_Chan] [Desmond_Chan] ++stgxfws 1226 tcp STGXFWS [Tetsuya_Shioda] [Tetsuya_Shioda] ++stgxfws 1226 udp STGXFWS [Tetsuya_Shioda] [Tetsuya_Shioda] ++dns2go 1227 tcp DNS2Go [Mike_Courterier] [Mike_Courterier] ++dns2go 1227 udp DNS2Go [Mike_Courterier] [Mike_Courterier] ++florence 1228 tcp FLORENCE [Brian_Trammell] [Brian_Trammell] ++florence 1228 udp FLORENCE [Brian_Trammell] [Brian_Trammell] ++zented 1229 tcp ZENworks Tiered Electronic [Ty_Ellis] [Ty_Ellis] ++ Distribution ++zented 1229 udp ZENworks Tiered Electronic [Ty_Ellis] [Ty_Ellis] ++ Distribution ++periscope 1230 tcp Periscope [Kevin_Madden] [Kevin_Madden] ++periscope 1230 udp Periscope [Kevin_Madden] [Kevin_Madden] ++menandmice-lpm 1231 tcp menandmice-lpm [Sigfus_Magnusson] [Sigfus_Magnusson] ++menandmice-lpm 1231 udp menandmice-lpm [Sigfus_Magnusson] [Sigfus_Magnusson] ++ 1232 tcp unassigned Microsoft (unoffically) using 1232 ++ 1232 udp unassigned Microsoft (unoffically) using 1232 ++univ-appserver 1233 tcp Universal App Server [Tim_Sent] [Tim_Sent] ++univ-appserver 1233 udp Universal App Server [Tim_Sent] [Tim_Sent] ++search-agent 1234 tcp Infoseek Search Agent [Jackie_Wu] [Jackie_Wu] ++search-agent 1234 udp Infoseek Search Agent [Jackie_Wu] [Jackie_Wu] ++mosaicsyssvc1 1235 tcp mosaicsyssvc1 [Brian_Matthews] [Brian_Matthews] ++mosaicsyssvc1 1235 udp mosaicsyssvc1 [Brian_Matthews] [Brian_Matthews] ++bvcontrol 1236 tcp bvcontrol [Daniel_J_Walsh] [Daniel_J_Walsh] ++bvcontrol 1236 udp bvcontrol [Daniel_J_Walsh] [Daniel_J_Walsh] ++tsdos390 1237 tcp tsdos390 [Ben_Pracht] [Ben_Pracht] ++tsdos390 1237 udp tsdos390 [Ben_Pracht] [Ben_Pracht] ++hacl-qs 1238 tcp hacl-qs [Farid_Faez] [Farid_Faez] ++hacl-qs 1238 udp hacl-qs [Farid_Faez] [Farid_Faez] ++nmsd 1239 tcp NMSD [Yuri_Machkasov] [Yuri_Machkasov] ++nmsd 1239 udp NMSD [Yuri_Machkasov] [Yuri_Machkasov] ++instantia 1240 tcp Instantia [Ruth_Slater] [Ruth_Slater] ++instantia 1240 udp Instantia [Ruth_Slater] [Ruth_Slater] ++nessus 1241 tcp nessus [Jordan_Hrycaj] [Jordan_Hrycaj] ++nessus 1241 udp nessus [Jordan_Hrycaj] [Jordan_Hrycaj] ++nmasoverip 1242 tcp NMAS over IP [Hal_Henderson] [Hal_Henderson] ++nmasoverip 1242 udp NMAS over IP [Hal_Henderson] [Hal_Henderson] ++serialgateway 1243 tcp SerialGateway [Stephen_LaValley] [Stephen_LaValley] ++serialgateway 1243 udp SerialGateway [Stephen_LaValley] [Stephen_LaValley] ++isbconference1 1244 tcp isbconference1 ++isbconference1 1244 udp isbconference1 ++isbconference2 1245 tcp isbconference2 [Arnold_Dittmann] [Arnold_Dittmann] ++isbconference2 1245 udp isbconference2 [Arnold_Dittmann] [Arnold_Dittmann] ++payrouter 1246 tcp payrouter [David_Wilson] [David_Wilson] ++payrouter 1246 udp payrouter [David_Wilson] [David_Wilson] ++visionpyramid 1247 tcp VisionPyramid [Gavin_Hutchinson] [Gavin_Hutchinson] ++visionpyramid 1247 udp VisionPyramid [Gavin_Hutchinson] [Gavin_Hutchinson] ++hermes 1248 tcp hermes ++hermes 1248 udp hermes ++mesavistaco 1249 tcp Mesa Vista Co [Rick_LaBanca] [Rick_LaBanca] ++mesavistaco 1249 udp Mesa Vista Co [Rick_LaBanca] [Rick_LaBanca] ++swldy-sias 1250 tcp swldy-sias [Peter_E_Williams] [Peter_E_Williams] ++swldy-sias 1250 udp swldy-sias [Peter_E_Williams] [Peter_E_Williams] ++servergraph 1251 tcp servergraph [Lindsay_Morris] [Lindsay_Morris] ++servergraph 1251 udp servergraph [Lindsay_Morris] [Lindsay_Morris] ++bspne-pcc 1252 tcp bspne-pcc ++bspne-pcc 1252 udp bspne-pcc ++q55-pcc 1253 tcp q55-pcc [Prem_Tirilok] [Prem_Tirilok] ++q55-pcc 1253 udp q55-pcc [Prem_Tirilok] [Prem_Tirilok] ++de-noc 1254 tcp de-noc ++de-noc 1254 udp de-noc ++de-cache-query 1255 tcp de-cache-query ++de-cache-query 1255 udp de-cache-query ++de-server 1256 tcp de-server [Jeff_Burdette] [Jeff_Burdette] ++de-server 1256 udp de-server [Jeff_Burdette] [Jeff_Burdette] ++shockwave2 1257 tcp Shockwave 2 [Dave_Simmons] [Dave_Simmons] ++shockwave2 1257 udp Shockwave 2 [Dave_Simmons] [Dave_Simmons] ++opennl 1258 tcp Open Network Library ++opennl 1258 udp Open Network Library ++opennl-voice 1259 tcp Open Network Library Voice [Phil_Frisbie] [Phil_Frisbie] ++opennl-voice 1259 udp Open Network Library Voice [Phil_Frisbie] [Phil_Frisbie] ++ibm-ssd 1260 tcp ibm-ssd [Barry_Whyte] [Barry_Whyte] ++ibm-ssd 1260 udp ibm-ssd [Barry_Whyte] [Barry_Whyte] ++mpshrsv 1261 tcp mpshrsv [Makoto_Ikeyama] [Makoto_Ikeyama] ++mpshrsv 1261 udp mpshrsv [Makoto_Ikeyama] [Makoto_Ikeyama] ++qnts-orb 1262 tcp QNTS-ORB [Raghurama_Bhat] [Raghurama_Bhat] ++qnts-orb 1262 udp QNTS-ORB [Raghurama_Bhat] [Raghurama_Bhat] ++dka 1263 tcp dka [Chris_Griffin] [Chris_Griffin] ++dka 1263 udp dka [Chris_Griffin] [Chris_Griffin] ++prat 1264 tcp PRAT [Keith_Wood] [Keith_Wood] ++prat 1264 udp PRAT [Keith_Wood] [Keith_Wood] ++dssiapi 1265 tcp DSSIAPI [Jim_Turner] [Jim_Turner] ++dssiapi 1265 udp DSSIAPI [Jim_Turner] [Jim_Turner] ++dellpwrappks 1266 tcp DELLPWRAPPKS [David_Troeger] [David_Troeger] ++dellpwrappks 1266 udp DELLPWRAPPKS [David_Troeger] [David_Troeger] ++epc 1267 tcp eTrust Policy Compliance [Aaron_Stein] [Aaron_Stein] ++epc 1267 udp eTrust Policy Compliance [Aaron_Stein] [Aaron_Stein] ++propel-msgsys 1268 tcp PROPEL-MSGSYS [Bert_Van_der_Linden] [Bert_Van_der_Linden] ++propel-msgsys 1268 udp PROPEL-MSGSYS [Bert_Van_der_Linden] [Bert_Van_der_Linden] ++watilapp 1269 tcp WATiLaPP [Frederic_Weymann] [Frederic_Weymann] ++watilapp 1269 udp WATiLaPP [Frederic_Weymann] [Frederic_Weymann] ++opsmgr 1270 tcp Microsoft Operations Manager [Ashvin_Sanghvi] [Ashvin_Sanghvi] ++opsmgr 1270 udp Microsoft Operations Manager [Ashvin_Sanghvi] [Ashvin_Sanghvi] ++excw 1271 tcp eXcW [Norm_Freedman] [Norm_Freedman] ++excw 1271 udp eXcW [Norm_Freedman] [Norm_Freedman] ++cspmlockmgr 1272 tcp CSPMLockMgr [Ibtsam_Mahfouz] [Ibtsam_Mahfouz] ++cspmlockmgr 1272 udp CSPMLockMgr [Ibtsam_Mahfouz] [Ibtsam_Mahfouz] ++emc-gateway 1273 tcp EMC-Gateway [Rene_Fontaine] [Rene_Fontaine] ++emc-gateway 1273 udp EMC-Gateway [Rene_Fontaine] [Rene_Fontaine] ++t1distproc 1274 tcp t1distproc [Julian_Biddle] [Julian_Biddle] ++t1distproc 1274 udp t1distproc [Julian_Biddle] [Julian_Biddle] ++ivcollector 1275 tcp ivcollector ++ivcollector 1275 udp ivcollector ++ivmanager 1276 tcp ivmanager [Xavier_Roques] [Xavier_Roques] ++ivmanager 1276 udp ivmanager [Xavier_Roques] [Xavier_Roques] ++miva-mqs 1277 tcp mqs [Miva_Corporation] [Miva_Corporation] ++miva-mqs 1277 udp mqs [Miva_Corporation] [Miva_Corporation] ++dellwebadmin-1 1278 tcp Dell Web Admin 1 ++dellwebadmin-1 1278 udp Dell Web Admin 1 ++dellwebadmin-2 1279 tcp Dell Web Admin 2 [Bridget_Navoda] [Bridget_Navoda] ++dellwebadmin-2 1279 udp Dell Web Admin 2 [Bridget_Navoda] [Bridget_Navoda] ++pictrography 1280 tcp Pictrography [Takashi_Hoshino] [Takashi_Hoshino] ++pictrography 1280 udp Pictrography [Takashi_Hoshino] [Takashi_Hoshino] ++healthd 1281 tcp healthd [James_E_Housley] [James_E_Housley] ++healthd 1281 udp healthd [James_E_Housley] [James_E_Housley] ++emperion 1282 tcp Emperion [Claus_Thor_Barth] [Claus_Thor_Barth] ++emperion 1282 udp Emperion [Claus_Thor_Barth] [Claus_Thor_Barth] ++productinfo 1283 tcp Product Information ++productinfo 1283 udp Product Information ++iee-qfx 1284 tcp IEE-QFX [Mehrdad_Ashtiani] [Mehrdad_Ashtiani] 2009-10-19 ++iee-qfx 1284 udp IEE-QFX [Mehrdad_Ashtiani] [Mehrdad_Ashtiani] 2009-10-19 ++neoiface 1285 tcp neoiface [Jason_McManus] [Jason_McManus] ++neoiface 1285 udp neoiface [Jason_McManus] [Jason_McManus] ++netuitive 1286 tcp netuitive [JF_Huard] [JF_Huard] ++netuitive 1286 udp netuitive [JF_Huard] [JF_Huard] ++routematch 1287 tcp RouteMatch Com [Jeff_Jones] [Jeff_Jones] 2005-11 ++routematch 1287 udp RouteMatch Com [Jeff_Jones] [Jeff_Jones] 2005-11 ++navbuddy 1288 tcp NavBuddy [Eric_Hackman] [Eric_Hackman] ++navbuddy 1288 udp NavBuddy [Eric_Hackman] [Eric_Hackman] ++jwalkserver 1289 tcp JWalkServer ++jwalkserver 1289 udp JWalkServer ++winjaserver 1290 tcp WinJaServer ++winjaserver 1290 udp WinJaServer ++seagulllms 1291 tcp SEAGULLLMS [Lee_Breisacher] [Lee_Breisacher] ++seagulllms 1291 udp SEAGULLLMS [Lee_Breisacher] [Lee_Breisacher] ++dsdn 1292 tcp dsdn [Stanislaw_Skowronek] [Stanislaw_Skowronek] ++dsdn 1292 udp dsdn [Stanislaw_Skowronek] [Stanislaw_Skowronek] ++pkt-krb-ipsec 1293 tcp PKT-KRB-IPSec [Nancy_Davoust] [Nancy_Davoust] ++pkt-krb-ipsec 1293 udp PKT-KRB-IPSec [Nancy_Davoust] [Nancy_Davoust] ++cmmdriver 1294 tcp CMMdriver [Lutz_Karras] [Lutz_Karras] ++cmmdriver 1294 udp CMMdriver [Lutz_Karras] [Lutz_Karras] ++ehtp 1295 tcp End-by-Hop Transmission [Alexander_Bogdanov] [Alexander_Bogdanov] ++ Protocol ++ehtp 1295 udp End-by-Hop Transmission [Alexander_Bogdanov] [Alexander_Bogdanov] ++ Protocol ++dproxy 1296 tcp dproxy ++dproxy 1296 udp dproxy ++sdproxy 1297 tcp sdproxy [Raimond_Diederik] [Raimond_Diederik] ++sdproxy 1297 udp sdproxy [Raimond_Diederik] [Raimond_Diederik] ++lpcp 1298 tcp lpcp [Christian_Stredicke] [Christian_Stredicke] ++lpcp 1298 udp lpcp [Christian_Stredicke] [Christian_Stredicke] ++hp-sci 1299 tcp hp-sci [Kim_Scott] [Kim_Scott] ++hp-sci 1299 udp hp-sci [Kim_Scott] [Kim_Scott] ++h323hostcallsc 1300 tcp H323 Host Call Secure [Jim_Toga] [Jim_Toga] ++h323hostcallsc 1300 udp H323 Host Call Secure [Jim_Toga] [Jim_Toga] ++ci3-software-1 1301 tcp CI3-Software-1 ++ci3-software-1 1301 udp CI3-Software-1 ++ci3-software-2 1302 tcp CI3-Software-2 [Kelli_Watson] [Kelli_Watson] ++ci3-software-2 1302 udp CI3-Software-2 [Kelli_Watson] [Kelli_Watson] ++sftsrv 1303 tcp sftsrv [Robert_Frazier] [Robert_Frazier] ++sftsrv 1303 udp sftsrv [Robert_Frazier] [Robert_Frazier] ++boomerang 1304 tcp Boomerang [Bruce_Lueckenhoff] [Bruce_Lueckenhoff] ++boomerang 1304 udp Boomerang [Bruce_Lueckenhoff] [Bruce_Lueckenhoff] ++pe-mike 1305 tcp pe-mike [Stephen_Hemminger] [Stephen_Hemminger] ++pe-mike 1305 udp pe-mike [Stephen_Hemminger] [Stephen_Hemminger] ++re-conn-proto 1306 tcp RE-Conn-Proto [Sandeep_Singhal] [Sandeep_Singhal] ++re-conn-proto 1306 udp RE-Conn-Proto [Sandeep_Singhal] [Sandeep_Singhal] ++pacmand 1307 tcp Pacmand [Edward_T_O_Shea] [Edward_T_O_Shea] ++pacmand 1307 udp Pacmand [Edward_T_O_Shea] [Edward_T_O_Shea] ++odsi 1308 tcp Optical Domain Service [K_Arvind] [K_Arvind] ++ Interconnect (ODSI) ++odsi 1308 udp Optical Domain Service [K_Arvind] [K_Arvind] ++ Interconnect (ODSI) ++jtag-server 1309 tcp JTAG server [Andrew_Draper] [Andrew_Draper] ++jtag-server 1309 udp JTAG server [Andrew_Draper] [Andrew_Draper] ++husky 1310 tcp Husky [Mark_Zang] [Mark_Zang] ++husky 1310 udp Husky [Mark_Zang] [Mark_Zang] ++rxmon 1311 tcp RxMon [Javier_Jiminez] [Javier_Jiminez] ++rxmon 1311 udp RxMon [Javier_Jiminez] [Javier_Jiminez] ++sti-envision 1312 tcp STI Envision [Don_Stedman] [Don_Stedman] ++sti-envision 1312 udp STI Envision [Don_Stedman] [Don_Stedman] ++ BMC_PATROLDB ++ ++bmc-patroldb 1313 tcp IANA assigned this [Portnoy_Boxman] [Portnoy_Boxman] ++ well-formed service name as ++ a replacement for ++ "bmc_patroldb". ++ This entry is an alias to "bmc-patroldb". This entry is now ++bmc_patroldb 1313 tcp BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service ++ discovery mechanisms. ++ BMC_PATROLDB ++ ++bmc-patroldb 1313 udp IANA assigned this [Portnoy_Boxman] [Portnoy_Boxman] ++ well-formed service name as ++ a replacement for ++ "bmc_patroldb". ++ This entry is an alias to "bmc-patroldb". This entry is now ++bmc_patroldb 1313 udp BMC_PATROLDB [Portnoy_Boxman] [Portnoy_Boxman] historic, not usable for use with many common service ++ discovery mechanisms. ++pdps 1314 tcp Photoscript Distributed [Les_Klein] [Les_Klein] ++ Printing System ++pdps 1314 udp Photoscript Distributed [Les_Klein] [Les_Klein] ++ Printing System ++els 1315 tcp E.L.S., Event Listener [Jim_Cleppe] [Jim_Cleppe] ++ Service ++els 1315 udp E.L.S., Event Listener [Jim_Cleppe] [Jim_Cleppe] ++ Service ++exbit-escp 1316 tcp Exbit-ESCP [Morten_Christensen] [Morten_Christensen] ++exbit-escp 1316 udp Exbit-ESCP [Morten_Christensen] [Morten_Christensen] ++vrts-ipcserver 1317 tcp vrts-ipcserver [Bruce_Hestand] [Bruce_Hestand] ++vrts-ipcserver 1317 udp vrts-ipcserver [Bruce_Hestand] [Bruce_Hestand] ++krb5gatekeeper 1318 tcp krb5gatekeeper [Patrick_Moore] [Patrick_Moore] ++krb5gatekeeper 1318 udp krb5gatekeeper [Patrick_Moore] [Patrick_Moore] ++amx-icsp 1319 tcp AMX-ICSP [Jeff_Burch] [Jeff_Burch] ++amx-icsp 1319 udp AMX-ICSP [Jeff_Burch] [Jeff_Burch] ++amx-axbnet 1320 tcp AMX-AXBNET [Jeff_Burch] [Jeff_Burch] ++amx-axbnet 1320 udp AMX-AXBNET [Jeff_Burch] [Jeff_Burch] ++pip 1321 tcp PIP [Gordon_Mohr] [Gordon_Mohr] ++pip 1321 udp PIP [Gordon_Mohr] [Gordon_Mohr] ++novation 1322 tcp Novation [Alan_Dano] [Alan_Dano] ++novation 1322 udp Novation [Alan_Dano] [Alan_Dano] ++brcd 1323 tcp brcd [Todd_Picquelle] [Todd_Picquelle] ++brcd 1323 udp brcd [Todd_Picquelle] [Todd_Picquelle] ++delta-mcp 1324 tcp delta-mcp [Quinton_Tormanen] [Quinton_Tormanen] ++delta-mcp 1324 udp delta-mcp [Quinton_Tormanen] [Quinton_Tormanen] ++dx-instrument 1325 tcp DX-Instrument [Walt_Modic] [Walt_Modic] ++dx-instrument 1325 udp DX-Instrument [Walt_Modic] [Walt_Modic] ++wimsic 1326 tcp WIMSIC [James_Brown] [James_Brown] ++wimsic 1326 udp WIMSIC [James_Brown] [James_Brown] ++ultrex 1327 tcp Ultrex [Tim_Walsh] [Tim_Walsh] ++ultrex 1327 udp Ultrex [Tim_Walsh] [Tim_Walsh] ++ewall 1328 tcp EWALL [Jeff_Busma] [Jeff_Busma] ++ewall 1328 udp EWALL [Jeff_Busma] [Jeff_Busma] ++netdb-export 1329 tcp netdb-export [Konstantinos_Kostis] [Konstantinos_Kostis] ++netdb-export 1329 udp netdb-export [Konstantinos_Kostis] [Konstantinos_Kostis] ++streetperfect 1330 tcp StreetPerfect [Michael_R_Young] [Michael_R_Young] ++streetperfect 1330 udp StreetPerfect [Michael_R_Young] [Michael_R_Young] ++intersan 1331 tcp intersan [Barry_H_Feild] [Barry_H_Feild] ++intersan 1331 udp intersan [Barry_H_Feild] [Barry_H_Feild] ++pcia-rxp-b 1332 tcp PCIA RXP-B [James_Dabbs] [James_Dabbs] ++pcia-rxp-b 1332 udp PCIA RXP-B [James_Dabbs] [James_Dabbs] ++passwrd-policy 1333 tcp Password Policy [Tonio_Pirotta] [Tonio_Pirotta] ++passwrd-policy 1333 udp Password Policy [Tonio_Pirotta] [Tonio_Pirotta] ++writesrv 1334 tcp writesrv [Marvin_Toungate] [Marvin_Toungate] ++writesrv 1334 udp writesrv [Marvin_Toungate] [Marvin_Toungate] ++digital-notary 1335 tcp Digital Notary Protocol [Wes_Doonan] [Wes_Doonan] ++digital-notary 1335 udp Digital Notary Protocol [Wes_Doonan] [Wes_Doonan] ++ischat 1336 tcp Instant Service Chat [Mike_Clise] [Mike_Clise] ++ischat 1336 udp Instant Service Chat [Mike_Clise] [Mike_Clise] ++menandmice-dns 1337 tcp menandmice DNS [Sigfus_Magnusson] [Sigfus_Magnusson] ++menandmice-dns 1337 udp menandmice DNS [Sigfus_Magnusson] [Sigfus_Magnusson] ++wmc-log-svc 1338 tcp WMC-log-svr [Scott_Anderson] [Scott_Anderson] ++wmc-log-svc 1338 udp WMC-log-svr [Scott_Anderson] [Scott_Anderson] ++kjtsiteserver 1339 tcp kjtsiteserver [Jason_Aubain] [Jason_Aubain] ++kjtsiteserver 1339 udp kjtsiteserver [Jason_Aubain] [Jason_Aubain] ++naap 1340 tcp NAAP [Henry_Haverinen] [Henry_Haverinen] ++naap 1340 udp NAAP [Henry_Haverinen] [Henry_Haverinen] ++qubes 1341 tcp QuBES [Eric_Grange] [Eric_Grange] ++qubes 1341 udp QuBES [Eric_Grange] [Eric_Grange] ++esbroker 1342 tcp ESBroker [Alexander_Medvinsky] [Alexander_Medvinsky] ++esbroker 1342 udp ESBroker [Alexander_Medvinsky] [Alexander_Medvinsky] ++re101 1343 tcp re101 [Doriano_Blengino] [Doriano_Blengino] ++re101 1343 udp re101 [Doriano_Blengino] [Doriano_Blengino] ++icap 1344 tcp ICAP [Jeremy_Elson] [Jeremy_Elson] ++icap 1344 udp ICAP [Jeremy_Elson] [Jeremy_Elson] ++vpjp 1345 tcp VPJP [Michael_Collins] [Michael_Collins] ++vpjp 1345 udp VPJP [Michael_Collins] [Michael_Collins] ++alta-ana-lm 1346 tcp Alta Analytics License ++ Manager ++alta-ana-lm 1346 udp Alta Analytics License ++ Manager ++bbn-mmc 1347 tcp multi media conferencing ++bbn-mmc 1347 udp multi media conferencing ++bbn-mmx 1348 tcp multi media conferencing ++bbn-mmx 1348 udp multi media conferencing ++sbook 1349 tcp Registration Network ++ Protocol ++sbook 1349 udp Registration Network ++ Protocol ++editbench 1350 tcp Registration Network [Simson_L_Garfinkel] [Simson_L_Garfinkel] ++ Protocol ++editbench 1350 udp Registration Network [Simson_L_Garfinkel] [Simson_L_Garfinkel] ++ Protocol ++equationbuilder 1351 tcp Digital Tool Works (MIT) [Terrence_J_Talbot] [Terrence_J_Talbot] ++equationbuilder 1351 udp Digital Tool Works (MIT) [Terrence_J_Talbot] [Terrence_J_Talbot] ++lotusnote 1352 tcp Lotus Note [Greg_Pflaum] [Greg_Pflaum] 1992-07 ++lotusnote 1352 udp Lotus Note [Greg_Pflaum] [Greg_Pflaum] 1992-07 ++relief 1353 tcp Relief Consulting [John_Feiler] [John_Feiler] ++relief 1353 udp Relief Consulting [John_Feiler] [John_Feiler] ++XSIP-network 1354 tcp Five Across XSIP Network [Glenn_Reid] [Glenn_Reid] ++XSIP-network 1354 udp Five Across XSIP Network [Glenn_Reid] [Glenn_Reid] ++intuitive-edge 1355 tcp Intuitive Edge [Montgomery_Zukowski] [Montgomery_Zukowski] ++intuitive-edge 1355 udp Intuitive Edge [Montgomery_Zukowski] [Montgomery_Zukowski] ++cuillamartin 1356 tcp CuillaMartin Company ++cuillamartin 1356 udp CuillaMartin Company ++pegboard 1357 tcp Electronic PegBoard [Chris_Cuilla] [Chris_Cuilla] ++pegboard 1357 udp Electronic PegBoard [Chris_Cuilla] [Chris_Cuilla] ++connlcli 1358 tcp CONNLCLI ++connlcli 1358 udp CONNLCLI ++ftsrv 1359 tcp FTSRV [Ines_Homem_de_Melo] [Ines_Homem_de_Melo] ++ftsrv 1359 udp FTSRV [Ines_Homem_de_Melo] [Ines_Homem_de_Melo] ++mimer 1360 tcp MIMER [Per_Schroeder] [Per_Schroeder] ++mimer 1360 udp MIMER [Per_Schroeder] [Per_Schroeder] ++linx 1361 tcp LinX [Steffen_Schilke] [Steffen_Schilke] ++linx 1361 udp LinX [Steffen_Schilke] [Steffen_Schilke] ++timeflies 1362 tcp TimeFlies [Doug_Kent] [Doug_Kent] ++timeflies 1362 udp TimeFlies [Doug_Kent] [Doug_Kent] ++ndm-requester 1363 tcp Network DataMover Requester ++ndm-requester 1363 udp Network DataMover Requester ++ndm-server 1364 tcp Network DataMover Server [Toshio_Watanabe] [Toshio_Watanabe] ++ndm-server 1364 udp Network DataMover Server [Toshio_Watanabe] [Toshio_Watanabe] ++adapt-sna 1365 tcp Network Software Associates [Jeffery_Chiao] [Jeffery_Chiao] ++adapt-sna 1365 udp Network Software Associates [Jeffery_Chiao] [Jeffery_Chiao] ++netware-csp 1366 tcp Novell NetWare Comm Service [Laurie_Lindsey] [Laurie_Lindsey] ++ Platform ++netware-csp 1366 udp Novell NetWare Comm Service [Laurie_Lindsey] [Laurie_Lindsey] ++ Platform ++dcs 1367 tcp DCS [Stefan_Siebert] [Stefan_Siebert] ++dcs 1367 udp DCS [Stefan_Siebert] [Stefan_Siebert] ++screencast 1368 tcp ScreenCast [Bill_Tschumy] [Bill_Tschumy] ++screencast 1368 udp ScreenCast [Bill_Tschumy] [Bill_Tschumy] ++gv-us 1369 tcp GlobalView to Unix Shell ++gv-us 1369 udp GlobalView to Unix Shell ++us-gv 1370 tcp Unix Shell to GlobalView [Makoto_Mita] [Makoto_Mita] ++us-gv 1370 udp Unix Shell to GlobalView [Makoto_Mita] [Makoto_Mita] ++fc-cli 1371 tcp Fujitsu Config Protocol ++fc-cli 1371 udp Fujitsu Config Protocol ++fc-ser 1372 tcp Fujitsu Config Protocol [Ryuichi_Horie] [Ryuichi_Horie] ++fc-ser 1372 udp Fujitsu Config Protocol [Ryuichi_Horie] [Ryuichi_Horie] ++chromagrafx 1373 tcp Chromagrafx [Mike_Barthelemy] [Mike_Barthelemy] ++chromagrafx 1373 udp Chromagrafx [Mike_Barthelemy] [Mike_Barthelemy] ++molly 1374 tcp EPI Software Systems [Jim_Vlcek] [Jim_Vlcek] ++molly 1374 udp EPI Software Systems [Jim_Vlcek] [Jim_Vlcek] ++bytex 1375 tcp Bytex [Mary_Ann_Burt] [Mary_Ann_Burt] ++bytex 1375 udp Bytex [Mary_Ann_Burt] [Mary_Ann_Burt] ++ibm-pps 1376 tcp IBM Person to Person [Simon_Phipps] [Simon_Phipps] ++ Software ++ibm-pps 1376 udp IBM Person to Person [Simon_Phipps] [Simon_Phipps] ++ Software ++cichlid 1377 tcp Cichlid License Manager [Andy_Burgess] [Andy_Burgess] ++cichlid 1377 udp Cichlid License Manager [Andy_Burgess] [Andy_Burgess] ++elan 1378 tcp Elan License Manager [Ken_Greer] [Ken_Greer] ++elan 1378 udp Elan License Manager [Ken_Greer] [Ken_Greer] ++dbreporter 1379 tcp Integrity Solutions [Tim_Dawson] [Tim_Dawson] ++dbreporter 1379 udp Integrity Solutions [Tim_Dawson] [Tim_Dawson] ++telesis-licman 1380 tcp Telesis Network License [Karl_Schendel_Jr] [Karl_Schendel_Jr] ++ Manager ++telesis-licman 1380 udp Telesis Network License [Karl_Schendel_Jr] [Karl_Schendel_Jr] ++ Manager ++apple-licman 1381 tcp Apple Network License [Earl_Wallace] [Earl_Wallace] ++ Manager ++apple-licman 1381 udp Apple Network License [Earl_Wallace] [Earl_Wallace] ++ Manager ++ udt_os ++ ++udt-os 1382 tcp IANA assigned this ++ well-formed service name as ++ a replacement for "udt_os". ++ This entry is an alias to "udt-os". This entry is now ++udt_os 1382 tcp udt_os historic, not usable for use with many common service ++ discovery mechanisms. ++ udt_os ++ ++udt-os 1382 udp IANA assigned this ++ well-formed service name as ++ a replacement for "udt_os". ++ This entry is an alias to "udt-os". This entry is now ++udt_os 1382 udp udt_os historic, not usable for use with many common service ++ discovery mechanisms. ++gwha 1383 tcp GW Hannaway Network License [J_Gabriel_Foster] [J_Gabriel_Foster] ++ Manager ++gwha 1383 udp GW Hannaway Network License [J_Gabriel_Foster] [J_Gabriel_Foster] ++ Manager ++os-licman 1384 tcp Objective Solutions License [Donald_Cornwell] [Donald_Cornwell] ++ Manager ++os-licman 1384 udp Objective Solutions License [Donald_Cornwell] [Donald_Cornwell] ++ Manager ++ Atex Publishing License ++ Manager ++ ++atex-elmd 1385 tcp IANA assigned this [Brett_Sorenson] [Brett_Sorenson] ++ well-formed service name as ++ a replacement for ++ "atex_elmd". ++ Atex Publishing License This entry is an alias to "atex-elmd". This entry is now ++atex_elmd 1385 tcp Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service ++ discovery mechanisms. ++ Atex Publishing License ++ Manager ++ ++atex-elmd 1385 udp IANA assigned this [Brett_Sorenson] [Brett_Sorenson] ++ well-formed service name as ++ a replacement for ++ "atex_elmd". ++ Atex Publishing License This entry is an alias to "atex-elmd". This entry is now ++atex_elmd 1385 udp Manager [Brett_Sorenson] [Brett_Sorenson] historic, not usable for use with many common service ++ discovery mechanisms. ++checksum 1386 tcp CheckSum License Manager [Andreas_Glocker] [Andreas_Glocker] ++checksum 1386 udp CheckSum License Manager [Andreas_Glocker] [Andreas_Glocker] ++cadsi-lm 1387 tcp Computer Aided Design [Sulistio_Muljadi] [Sulistio_Muljadi] ++ Software Inc LM ++cadsi-lm 1387 udp Computer Aided Design [Sulistio_Muljadi] [Sulistio_Muljadi] ++ Software Inc LM ++objective-dbc 1388 tcp Objective Solutions DataBase [Donald_Cornwell_2] [Donald_Cornwell_2] ++ Cache ++objective-dbc 1388 udp Objective Solutions DataBase [Donald_Cornwell_2] [Donald_Cornwell_2] ++ Cache ++iclpv-dm 1389 tcp Document Manager ++iclpv-dm 1389 udp Document Manager ++iclpv-sc 1390 tcp Storage Controller ++iclpv-sc 1390 udp Storage Controller ++iclpv-sas 1391 tcp Storage Access Server ++iclpv-sas 1391 udp Storage Access Server ++iclpv-pm 1392 tcp Print Manager ++iclpv-pm 1392 udp Print Manager ++iclpv-nls 1393 tcp Network Log Server ++iclpv-nls 1393 udp Network Log Server ++iclpv-nlc 1394 tcp Network Log Client ++iclpv-nlc 1394 udp Network Log Client ++iclpv-wsm 1395 tcp PC Workstation Manager [A_P_Hobson] [A_P_Hobson] ++ software ++iclpv-wsm 1395 udp PC Workstation Manager [A_P_Hobson] [A_P_Hobson] ++ software ++dvl-activemail 1396 tcp DVL Active Mail ++dvl-activemail 1396 udp DVL Active Mail ++audio-activmail 1397 tcp Audio Active Mail ++audio-activmail 1397 udp Audio Active Mail ++video-activmail 1398 tcp Video Active Mail [Avshalom_Houri] [Avshalom_Houri] ++video-activmail 1398 udp Video Active Mail [Avshalom_Houri] [Avshalom_Houri] ++cadkey-licman 1399 tcp Cadkey License Manager ++cadkey-licman 1399 udp Cadkey License Manager ++cadkey-tablet 1400 tcp Cadkey Tablet Daemon [Joe_McCollough] [Joe_McCollough] ++cadkey-tablet 1400 udp Cadkey Tablet Daemon [Joe_McCollough] [Joe_McCollough] ++goldleaf-licman 1401 tcp Goldleaf License Manager [John_Fox] [John_Fox] ++goldleaf-licman 1401 udp Goldleaf License Manager [John_Fox] [John_Fox] ++prm-sm-np 1402 tcp Prospero Resource Manager ++prm-sm-np 1402 udp Prospero Resource Manager ++prm-nm-np 1403 tcp Prospero Resource Manager [B_Clifford_Neuman] [B_Clifford_Neuman] ++prm-nm-np 1403 udp Prospero Resource Manager [B_Clifford_Neuman] [B_Clifford_Neuman] ++igi-lm 1404 tcp Infinite Graphics License ++ Manager ++igi-lm 1404 udp Infinite Graphics License ++ Manager ++ibm-res 1405 tcp IBM Remote Execution Starter ++ibm-res 1405 udp IBM Remote Execution Starter ++netlabs-lm 1406 tcp NetLabs License Manager ++netlabs-lm 1406 udp NetLabs License Manager ++dbsa-lm 1407 tcp DBSA License Manager [Scott_Shattuck] [Scott_Shattuck] ++dbsa-lm 1407 udp DBSA License Manager [Scott_Shattuck] [Scott_Shattuck] ++sophia-lm 1408 tcp Sophia License Manager [Eric_Brown] [Eric_Brown] ++sophia-lm 1408 udp Sophia License Manager [Eric_Brown] [Eric_Brown] ++here-lm 1409 tcp Here License Manager [David_Ison] [David_Ison] ++here-lm 1409 udp Here License Manager [David_Ison] [David_Ison] ++hiq 1410 tcp HiQ License Manager [Rick_Pugh] [Rick_Pugh] ++hiq 1410 udp HiQ License Manager [Rick_Pugh] [Rick_Pugh] ++af 1411 tcp AudioFile [Jim_Gettys] [Jim_Gettys] ++af 1411 udp AudioFile [Jim_Gettys] [Jim_Gettys] ++innosys 1412 tcp InnoSys ++innosys 1412 udp InnoSys ++innosys-acl 1413 tcp Innosys-ACL [Eric_Welch] [Eric_Welch] ++innosys-acl 1413 udp Innosys-ACL [Eric_Welch] [Eric_Welch] ++ibm-mqseries 1414 tcp IBM MQSeries [Roger_Meli] [Roger_Meli] ++ibm-mqseries 1414 udp IBM MQSeries [Roger_Meli] [Roger_Meli] ++dbstar 1415 tcp DBStar [Jeffrey_Millman] [Jeffrey_Millman] ++dbstar 1415 udp DBStar [Jeffrey_Millman] [Jeffrey_Millman] ++ Novell LU6.2 ++ ++novell-lu6-2 1416 tcp IANA assigned this [Peter_Liu] [Peter_Liu] ++ well-formed service name as ++ a replacement for ++ "novell-lu6.2". ++ This entry is an alias to "novell-lu6-2". This entry is now ++novell-lu6.2 1416 tcp Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service ++ discovery mechanisms. ++ Novell LU6.2 ++ ++novell-lu6-2 1416 udp IANA assigned this [Peter_Liu] [Peter_Liu] ++ well-formed service name as ++ a replacement for ++ "novell-lu6.2". ++ This entry is an alias to "novell-lu6-2". This entry is now ++novell-lu6.2 1416 udp Novell LU6.2 [Peter_Liu] [Peter_Liu] historic, not usable for use with many common service ++ discovery mechanisms. ++timbuktu-srv1 1417 tcp Timbuktu Service 1 Port ++timbuktu-srv1 1417 udp Timbuktu Service 1 Port ++timbuktu-srv2 1418 tcp Timbuktu Service 2 Port ++timbuktu-srv2 1418 udp Timbuktu Service 2 Port ++timbuktu-srv3 1419 tcp Timbuktu Service 3 Port ++timbuktu-srv3 1419 udp Timbuktu Service 3 Port ++timbuktu-srv4 1420 tcp Timbuktu Service 4 Port [Marc_Epard] [Marc_Epard] ++timbuktu-srv4 1420 udp Timbuktu Service 4 Port [Marc_Epard] [Marc_Epard] ++gandalf-lm 1421 tcp Gandalf License Manager [gilmer] [gilmer] ++gandalf-lm 1421 udp Gandalf License Manager [gilmer] [gilmer] ++autodesk-lm 1422 tcp Autodesk License Manager [David_Ko] [David_Ko] ++autodesk-lm 1422 udp Autodesk License Manager [David_Ko] [David_Ko] ++essbase 1423 tcp Essbase Arbor Software ++essbase 1423 udp Essbase Arbor Software ++hybrid 1424 tcp Hybrid Encryption Protocol [Howard_Hart] [Howard_Hart] ++hybrid 1424 udp Hybrid Encryption Protocol [Howard_Hart] [Howard_Hart] ++zion-lm 1425 tcp Zion Software License [David_Ferrero] [David_Ferrero] ++ Manager ++zion-lm 1425 udp Zion Software License [David_Ferrero] [David_Ferrero] ++ Manager ++sais 1426 tcp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 1 ++sais 1426 udp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 1 ++mloadd 1427 tcp mloadd monitoring tool [Bob_Braden_2] [Bob_Braden_2] ++mloadd 1427 udp mloadd monitoring tool [Bob_Braden_2] [Bob_Braden_2] ++informatik-lm 1428 tcp Informatik License Manager [Harald_Schlangmann] [Harald_Schlangmann] ++informatik-lm 1428 udp Informatik License Manager [Harald_Schlangmann] [Harald_Schlangmann] ++nms 1429 tcp Hypercom NMS ++nms 1429 udp Hypercom NMS ++tpdu 1430 tcp Hypercom TPDU [Noor_Chowdhury] [Noor_Chowdhury] ++tpdu 1430 udp Hypercom TPDU [Noor_Chowdhury] [Noor_Chowdhury] ++rgtp 1431 tcp Reverse Gossip Transport [Ian_Jackson] [Ian_Jackson] ++rgtp 1431 udp Reverse Gossip Transport [Ian_Jackson] [Ian_Jackson] ++blueberry-lm 1432 tcp Blueberry Software License [Steve_Beigel] [Steve_Beigel] ++ Manager ++blueberry-lm 1432 udp Blueberry Software License [Steve_Beigel] [Steve_Beigel] ++ Manager ++ms-sql-s 1433 tcp Microsoft-SQL-Server ++ms-sql-s 1433 udp Microsoft-SQL-Server ++ms-sql-m 1434 tcp Microsoft-SQL-Monitor [Peter_Hussey] [Peter_Hussey] ++ms-sql-m 1434 udp Microsoft-SQL-Monitor [Peter_Hussey] [Peter_Hussey] ++ibm-cics 1435 tcp IBM CICS [Geoff_Meacock] [Geoff_Meacock] ++ibm-cics 1435 udp IBM CICS [Geoff_Meacock] [Geoff_Meacock] ++saism 1436 tcp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 2 ++saism 1436 udp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 2 ++tabula 1437 tcp Tabula [Marcelo_Einhorn] [Marcelo_Einhorn] ++tabula 1437 udp Tabula [Marcelo_Einhorn] [Marcelo_Einhorn] ++eicon-server 1438 tcp Eicon Security Agent/Server ++eicon-server 1438 udp Eicon Security Agent/Server ++eicon-x25 1439 tcp Eicon X25/SNA Gateway ++eicon-x25 1439 udp Eicon X25/SNA Gateway ++eicon-slp 1440 tcp Eicon Service Location [Pat_Calhoun] [Pat_Calhoun] ++ Protocol ++eicon-slp 1440 udp Eicon Service Location [Pat_Calhoun] [Pat_Calhoun] ++ Protocol ++cadis-1 1441 tcp Cadis License Management ++cadis-1 1441 udp Cadis License Management ++cadis-2 1442 tcp Cadis License Management [Todd_Wichers] [Todd_Wichers] ++cadis-2 1442 udp Cadis License Management [Todd_Wichers] [Todd_Wichers] ++ies-lm 1443 tcp Integrated Engineering [David_Tong] [David_Tong] ++ Software ++ies-lm 1443 udp Integrated Engineering [David_Tong] [David_Tong] ++ Software ++marcam-lm 1444 tcp Marcam License Management [Therese_Hunt] [Therese_Hunt] ++marcam-lm 1444 udp Marcam License Management [Therese_Hunt] [Therese_Hunt] ++proxima-lm 1445 tcp Proxima License Manager ++proxima-lm 1445 udp Proxima License Manager ++ora-lm 1446 tcp Optical Research Associates ++ License Manager ++ora-lm 1446 udp Optical Research Associates ++ License Manager ++apri-lm 1447 tcp Applied Parallel Research LM [Jim_Dillon] [Jim_Dillon] ++apri-lm 1447 udp Applied Parallel Research LM [Jim_Dillon] [Jim_Dillon] ++oc-lm 1448 tcp OpenConnect License Manager [Sue_Barnhill] [Sue_Barnhill] ++oc-lm 1448 udp OpenConnect License Manager [Sue_Barnhill] [Sue_Barnhill] ++peport 1449 tcp PEport [Qentin_Neill] [Qentin_Neill] ++peport 1449 udp PEport [Qentin_Neill] [Qentin_Neill] ++dwf 1450 tcp Tandem Distributed Workbench [Mike_Bert] [Mike_Bert] ++ Facility ++dwf 1450 udp Tandem Distributed Workbench [Mike_Bert] [Mike_Bert] ++ Facility ++infoman 1451 tcp IBM Information Management [Karen_Burns] [Karen_Burns] ++infoman 1451 udp IBM Information Management [Karen_Burns] [Karen_Burns] ++gtegsc-lm 1452 tcp GTE Government Systems [Mike_Gregory] [Mike_Gregory] ++ License Man ++gtegsc-lm 1452 udp GTE Government Systems [Mike_Gregory] [Mike_Gregory] ++ License Man ++genie-lm 1453 tcp Genie License Manager [Paul_Applegate] [Paul_Applegate] ++genie-lm 1453 udp Genie License Manager [Paul_Applegate] [Paul_Applegate] ++ interHDL License Manager ++ ++interhdl-elmd 1454 tcp IANA assigned this [Eli_Sternheim] [Eli_Sternheim] ++ well-formed service name as ++ a replacement for ++ "interhdl_elmd". ++ This entry is an alias to "interhdl-elmd". This entry is now ++interhdl_elmd 1454 tcp interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service ++ discovery mechanisms. ++ interHDL License Manager ++ ++interhdl-elmd 1454 udp IANA assigned this [Eli_Sternheim] [Eli_Sternheim] ++ well-formed service name as ++ a replacement for ++ "interhdl_elmd". ++ This entry is an alias to "interhdl-elmd". This entry is now ++interhdl_elmd 1454 udp interHDL License Manager [Eli_Sternheim] [Eli_Sternheim] historic, not usable for use with many common service ++ discovery mechanisms. ++esl-lm 1455 tcp ESL License Manager [Abel_Chou] [Abel_Chou] ++esl-lm 1455 udp ESL License Manager [Abel_Chou] [Abel_Chou] ++dca 1456 tcp DCA [Jeff_Garbers_2] [Jeff_Garbers_2] ++dca 1456 udp DCA [Jeff_Garbers_2] [Jeff_Garbers_2] ++valisys-lm 1457 tcp Valisys License Manager [Leslie_Lincoln] [Leslie_Lincoln] ++valisys-lm 1457 udp Valisys License Manager [Leslie_Lincoln] [Leslie_Lincoln] ++nrcabq-lm 1458 tcp Nichols Research Corp. [Howard_Cole] [Howard_Cole] ++nrcabq-lm 1458 udp Nichols Research Corp. [Howard_Cole] [Howard_Cole] ++proshare1 1459 tcp Proshare Notebook ++ Application ++proshare1 1459 udp Proshare Notebook ++ Application ++proshare2 1460 tcp Proshare Notebook [Robin_Kar] [Robin_Kar] ++ Application ++proshare2 1460 udp Proshare Notebook [Robin_Kar] [Robin_Kar] ++ Application ++ IBM Wireless LAN ++ ++ibm-wrless-lan 1461 tcp IANA assigned this [flanne] [flanne] ++ well-formed service name as ++ a replacement for ++ "ibm_wrless_lan". ++ This entry is an alias to "ibm-wrless-lan". This entry is now ++ibm_wrless_lan 1461 tcp IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service ++ discovery mechanisms. ++ IBM Wireless LAN ++ ++ibm-wrless-lan 1461 udp IANA assigned this [flanne] [flanne] ++ well-formed service name as ++ a replacement for ++ "ibm_wrless_lan". ++ This entry is an alias to "ibm-wrless-lan". This entry is now ++ibm_wrless_lan 1461 udp IBM Wireless LAN [flanne] [flanne] historic, not usable for use with many common service ++ discovery mechanisms. ++world-lm 1462 tcp World License Manager [Michael_S_Amirault] [Michael_S_Amirault] ++world-lm 1462 udp World License Manager [Michael_S_Amirault] [Michael_S_Amirault] ++nucleus 1463 tcp Nucleus [Venky_Nagar] [Venky_Nagar] ++nucleus 1463 udp Nucleus [Venky_Nagar] [Venky_Nagar] ++ MSL License Manager ++ ++msl-lmd 1464 tcp IANA assigned this [Matt_Timmermans] [Matt_Timmermans] ++ well-formed service name as ++ a replacement for "msl_lmd". ++ This entry is an alias to "msl-lmd". This entry is now ++msl_lmd 1464 tcp MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service ++ discovery mechanisms. ++ MSL License Manager ++ ++msl-lmd 1464 udp IANA assigned this [Matt_Timmermans] [Matt_Timmermans] ++ well-formed service name as ++ a replacement for "msl_lmd". ++ This entry is an alias to "msl-lmd". This entry is now ++msl_lmd 1464 udp MSL License Manager [Matt_Timmermans] [Matt_Timmermans] historic, not usable for use with many common service ++ discovery mechanisms. ++pipes 1465 tcp Pipes Platform [Mark_Farlin] [Mark_Farlin] ++pipes 1465 udp Pipes Platform [Mark_Farlin] [Mark_Farlin] ++oceansoft-lm 1466 tcp Ocean Software License [Randy_Leonard] [Randy_Leonard] ++ Manager ++oceansoft-lm 1466 udp Ocean Software License [Randy_Leonard] [Randy_Leonard] ++ Manager ++csdmbase 1467 tcp CSDMBASE ++csdmbase 1467 udp CSDMBASE ++csdm 1468 tcp CSDM [Robert_Stabl] [Robert_Stabl] ++csdm 1468 udp CSDM [Robert_Stabl] [Robert_Stabl] ++aal-lm 1469 tcp Active Analysis Limited [David_Snocken] [David_Snocken] ++ License Manager ++aal-lm 1469 udp Active Analysis Limited [David_Snocken] [David_Snocken] ++ License Manager ++uaiact 1470 tcp Universal Analytics [Mark_R_Ludwig] [Mark_R_Ludwig] ++uaiact 1470 udp Universal Analytics [Mark_R_Ludwig] [Mark_R_Ludwig] ++csdmbase 1471 tcp csdmbase ++csdmbase 1471 udp csdmbase ++csdm 1472 tcp csdm [Robert_Stabl] [Robert_Stabl] ++csdm 1472 udp csdm [Robert_Stabl] [Robert_Stabl] ++openmath 1473 tcp OpenMath [Garth_Mayville] [Garth_Mayville] ++openmath 1473 udp OpenMath [Garth_Mayville] [Garth_Mayville] ++telefinder 1474 tcp Telefinder [Jim_White] [Jim_White] ++telefinder 1474 udp Telefinder [Jim_White] [Jim_White] ++taligent-lm 1475 tcp Taligent License Manager [Mark_Sapsford] [Mark_Sapsford] ++taligent-lm 1475 udp Taligent License Manager [Mark_Sapsford] [Mark_Sapsford] ++clvm-cfg 1476 tcp clvm-cfg [Eric_Soderberg] [Eric_Soderberg] ++clvm-cfg 1476 udp clvm-cfg [Eric_Soderberg] [Eric_Soderberg] ++ms-sna-server 1477 tcp ms-sna-server ++ms-sna-server 1477 udp ms-sna-server ++ms-sna-base 1478 tcp ms-sna-base [Gordon_Mangione] [Gordon_Mangione] ++ms-sna-base 1478 udp ms-sna-base [Gordon_Mangione] [Gordon_Mangione] ++dberegister 1479 tcp dberegister [Brian_Griswold] [Brian_Griswold] ++dberegister 1479 udp dberegister [Brian_Griswold] [Brian_Griswold] ++pacerforum 1480 tcp PacerForum [Peter_Caswell] [Peter_Caswell] ++pacerforum 1480 udp PacerForum [Peter_Caswell] [Peter_Caswell] ++airs 1481 tcp AIRS [Bruce_Wilson] [Bruce_Wilson] ++airs 1481 udp AIRS [Bruce_Wilson] [Bruce_Wilson] ++miteksys-lm 1482 tcp Miteksys License Manager [Shane_McRoberts] [Shane_McRoberts] ++miteksys-lm 1482 udp Miteksys License Manager [Shane_McRoberts] [Shane_McRoberts] ++afs 1483 tcp AFS License Manager [Michael_R_Pizolato] [Michael_R_Pizolato] ++afs 1483 udp AFS License Manager [Michael_R_Pizolato] [Michael_R_Pizolato] ++confluent 1484 tcp Confluent License Manager [James_Greenfiel] [James_Greenfiel] ++confluent 1484 udp Confluent License Manager [James_Greenfiel] [James_Greenfiel] ++lansource 1485 tcp LANSource [Christopher_Wells] [Christopher_Wells] ++lansource 1485 udp LANSource [Christopher_Wells] [Christopher_Wells] ++ nms_topo_serv ++ ++nms-topo-serv 1486 tcp IANA assigned this [Sylvia_Siu] [Sylvia_Siu] ++ well-formed service name as ++ a replacement for ++ "nms_topo_serv". ++ This entry is an alias to "nms-topo-serv". This entry is now ++nms_topo_serv 1486 tcp nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service ++ discovery mechanisms. ++ nms_topo_serv ++ ++nms-topo-serv 1486 udp IANA assigned this [Sylvia_Siu] [Sylvia_Siu] ++ well-formed service name as ++ a replacement for ++ "nms_topo_serv". ++ This entry is an alias to "nms-topo-serv". This entry is now ++nms_topo_serv 1486 udp nms_topo_serv [Sylvia_Siu] [Sylvia_Siu] historic, not usable for use with many common service ++ discovery mechanisms. ++localinfosrvr 1487 tcp LocalInfoSrvr [Brian_Matthews_2] [Brian_Matthews_2] ++localinfosrvr 1487 udp LocalInfoSrvr [Brian_Matthews_2] [Brian_Matthews_2] ++docstor 1488 tcp DocStor [Brian_Spears] [Brian_Spears] ++docstor 1488 udp DocStor [Brian_Spears] [Brian_Spears] ++dmdocbroker 1489 tcp dmdocbroker [Razmik_Abnous] [Razmik_Abnous] ++dmdocbroker 1489 udp dmdocbroker [Razmik_Abnous] [Razmik_Abnous] ++insitu-conf 1490 tcp insitu-conf [Paul_Blacknell] [Paul_Blacknell] ++insitu-conf 1490 udp insitu-conf [Paul_Blacknell] [Paul_Blacknell] ++ 1491 Unassigned 2009-08-05 ++stone-design-1 1492 tcp stone-design-1 [Andrew_Stone] [Andrew_Stone] ++stone-design-1 1492 udp stone-design-1 [Andrew_Stone] [Andrew_Stone] ++ netmap_lm ++ ++netmap-lm 1493 tcp IANA assigned this [Phillip_Magson] [Phillip_Magson] ++ well-formed service name as ++ a replacement for ++ "netmap_lm". ++ This entry is an alias to "netmap-lm". This entry is now ++netmap_lm 1493 tcp netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service ++ discovery mechanisms. ++ netmap_lm ++ ++netmap-lm 1493 udp IANA assigned this [Phillip_Magson] [Phillip_Magson] ++ well-formed service name as ++ a replacement for ++ "netmap_lm". ++ This entry is an alias to "netmap-lm". This entry is now ++netmap_lm 1493 udp netmap_lm [Phillip_Magson] [Phillip_Magson] historic, not usable for use with many common service ++ discovery mechanisms. ++ica 1494 tcp ica [John_Richardson] [John_Richardson] ++ica 1494 udp ica [John_Richardson] [John_Richardson] ++cvc 1495 tcp cvc [Bill_Davidson] [Bill_Davidson] ++cvc 1495 udp cvc [Bill_Davidson] [Bill_Davidson] ++liberty-lm 1496 tcp liberty-lm [Jim_Rogers] [Jim_Rogers] ++liberty-lm 1496 udp liberty-lm [Jim_Rogers] [Jim_Rogers] ++rfx-lm 1497 tcp rfx-lm [Bill_Bishop] [Bill_Bishop] ++rfx-lm 1497 udp rfx-lm [Bill_Bishop] [Bill_Bishop] ++sybase-sqlany 1498 tcp Sybase SQL Any [Dave_Neudoerffer] [Dave_Neudoerffer] ++sybase-sqlany 1498 udp Sybase SQL Any [Dave_Neudoerffer] [Dave_Neudoerffer] ++fhc 1499 tcp Federico Heinz Consultora [Federico_Heinz] [Federico_Heinz] ++fhc 1499 udp Federico Heinz Consultora [Federico_Heinz] [Federico_Heinz] ++vlsi-lm 1500 tcp VLSI License Manager [Shue_Lin_Kuo] [Shue_Lin_Kuo] ++vlsi-lm 1500 udp VLSI License Manager [Shue_Lin_Kuo] [Shue_Lin_Kuo] ++saiscm 1501 tcp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 3 ++saiscm 1501 udp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 3 ++shivadiscovery 1502 tcp Shiva [Jonathan_Wenocur] [Jonathan_Wenocur] ++shivadiscovery 1502 udp Shiva [Jonathan_Wenocur] [Jonathan_Wenocur] ++imtc-mcs 1503 tcp Databeam [Jim_Johnston] [Jim_Johnston] ++imtc-mcs 1503 udp Databeam [Jim_Johnston] [Jim_Johnston] ++evb-elm 1504 tcp EVB Software Engineering [B_G_Mahesh] [B_G_Mahesh] ++ License Manager ++evb-elm 1504 udp EVB Software Engineering [B_G_Mahesh] [B_G_Mahesh] ++ License Manager ++funkproxy 1505 tcp Funk Software, Inc. [Robert_D_Vincent] [Robert_D_Vincent] ++funkproxy 1505 udp Funk Software, Inc. [Robert_D_Vincent] [Robert_D_Vincent] ++utcd 1506 tcp Universal Time daemon (utcd) [Walter_Poxon] [Walter_Poxon] ++utcd 1506 udp Universal Time daemon (utcd) [Walter_Poxon] [Walter_Poxon] ++symplex 1507 tcp symplex [Mike_Turley] [Mike_Turley] ++symplex 1507 udp symplex [Mike_Turley] [Mike_Turley] ++diagmond 1508 tcp diagmond [Pete_Moscatelli] [Pete_Moscatelli] ++diagmond 1508 udp diagmond [Pete_Moscatelli] [Pete_Moscatelli] ++robcad-lm 1509 tcp Robcad, Ltd. License Manager [Hindin_Joseph] [Hindin_Joseph] ++robcad-lm 1509 udp Robcad, Ltd. License Manager [Hindin_Joseph] [Hindin_Joseph] ++mvx-lm 1510 tcp Midland Valley Exploration [Neil_Salter] [Neil_Salter] ++ Ltd. Lic. Man. ++mvx-lm 1510 udp Midland Valley Exploration [Neil_Salter] [Neil_Salter] ++ Ltd. Lic. Man. ++3l-l1 1511 tcp 3l-l1 [Ian_A_Young] [Ian_A_Young] ++3l-l1 1511 udp 3l-l1 [Ian_A_Young] [Ian_A_Young] ++wins 1512 tcp Microsoft's Windows Internet [Pradeep_Bahl] [Pradeep_Bahl] ++ Name Service ++wins 1512 udp Microsoft's Windows Internet [Pradeep_Bahl] [Pradeep_Bahl] ++ Name Service ++fujitsu-dtc 1513 tcp Fujitsu Systems Business of ++ America, Inc ++fujitsu-dtc 1513 udp Fujitsu Systems Business of ++ America, Inc ++fujitsu-dtcns 1514 tcp Fujitsu Systems Business of [Charles_A_Higgins] [Charles_A_Higgins] ++ America, Inc ++fujitsu-dtcns 1514 udp Fujitsu Systems Business of [Charles_A_Higgins] [Charles_A_Higgins] ++ America, Inc ++ifor-protocol 1515 tcp ifor-protocol [Dr_R_P_Alston] [Dr_R_P_Alston] ++ifor-protocol 1515 udp ifor-protocol [Dr_R_P_Alston] [Dr_R_P_Alston] ++vpad 1516 tcp Virtual Places Audio data ++vpad 1516 udp Virtual Places Audio data ++vpac 1517 tcp Virtual Places Audio control ++vpac 1517 udp Virtual Places Audio control ++vpvd 1518 tcp Virtual Places Video data ++vpvd 1518 udp Virtual Places Video data ++vpvc 1519 tcp Virtual Places Video control [Avshalom_Houri] [Avshalom_Houri] ++vpvc 1519 udp Virtual Places Video control [Avshalom_Houri] [Avshalom_Houri] ++atm-zip-office 1520 tcp atm zip office [Wilson_Kwan] [Wilson_Kwan] ++atm-zip-office 1520 udp atm zip office [Wilson_Kwan] [Wilson_Kwan] ++ncube-lm 1521 tcp nCube License Manager [Maxine_Yuen] [Maxine_Yuen] ++ncube-lm 1521 udp nCube License Manager [Maxine_Yuen] [Maxine_Yuen] ++ricardo-lm 1522 tcp Ricardo North America [Mike_Flemming] [Mike_Flemming] ++ License Manager ++ricardo-lm 1522 udp Ricardo North America [Mike_Flemming] [Mike_Flemming] ++ License Manager ++cichild-lm 1523 tcp cichild [Andy_Burgess] [Andy_Burgess] ++cichild-lm 1523 udp cichild [Andy_Burgess] [Andy_Burgess] ++ingreslock 1524 tcp ingres ++ingreslock 1524 udp ingres ++orasrv 1525 tcp oracle ++orasrv 1525 udp oracle ++prospero-np 1525 tcp Prospero Directory Service ++ non-priv ++prospero-np 1525 udp Prospero Directory Service ++ non-priv ++pdap-np 1526 tcp Prospero Data Access Prot [B_Clifford_Neuman] [B_Clifford_Neuman] ++ non-priv ++pdap-np 1526 udp Prospero Data Access Prot [B_Clifford_Neuman] [B_Clifford_Neuman] ++ non-priv ++tlisrv 1527 tcp oracle ++tlisrv 1527 udp oracle ++ 1528 Unassigned 2007-10-04 ++coauthor 1529 tcp oracle ++coauthor 1529 udp oracle ++rap-service 1530 tcp rap-service ++rap-service 1530 udp rap-service ++rap-listen 1531 tcp rap-listen [Phil_Servita] [Phil_Servita] ++rap-listen 1531 udp rap-listen [Phil_Servita] [Phil_Servita] ++miroconnect 1532 tcp miroconnect [Michael_Fischer_2] [Michael_Fischer_2] ++miroconnect 1532 udp miroconnect [Michael_Fischer_2] [Michael_Fischer_2] ++virtual-places 1533 tcp Virtual Places Software [Avshalom_Houri] [Avshalom_Houri] ++virtual-places 1533 udp Virtual Places Software [Avshalom_Houri] [Avshalom_Houri] ++micromuse-lm 1534 tcp micromuse-lm [Adam_Kerrison] [Adam_Kerrison] ++micromuse-lm 1534 udp micromuse-lm [Adam_Kerrison] [Adam_Kerrison] ++ampr-info 1535 tcp ampr-info ++ampr-info 1535 udp ampr-info ++ampr-inter 1536 tcp ampr-inter [Rob_Janssen] [Rob_Janssen] ++ampr-inter 1536 udp ampr-inter [Rob_Janssen] [Rob_Janssen] ++sdsc-lm 1537 tcp isi-lm [Len_Wanger] [Len_Wanger] ++sdsc-lm 1537 udp isi-lm [Len_Wanger] [Len_Wanger] ++3ds-lm 1538 tcp 3ds-lm [Keith_Trummel] [Keith_Trummel] ++3ds-lm 1538 udp 3ds-lm [Keith_Trummel] [Keith_Trummel] ++intellistor-lm 1539 tcp Intellistor License Manager [Ron_Vaughn] [Ron_Vaughn] ++intellistor-lm 1539 udp Intellistor License Manager [Ron_Vaughn] [Ron_Vaughn] ++rds 1540 tcp rds ++rds 1540 udp rds ++rds2 1541 tcp rds2 [Sudhakar_Rajamannar] [Sudhakar_Rajamannar] ++rds2 1541 udp rds2 [Sudhakar_Rajamannar] [Sudhakar_Rajamannar] ++gridgen-elmd 1542 tcp gridgen-elmd [John_R_Chawner] [John_R_Chawner] ++gridgen-elmd 1542 udp gridgen-elmd [John_R_Chawner] [John_R_Chawner] ++simba-cs 1543 tcp simba-cs [Betsy_Alexander] [Betsy_Alexander] ++simba-cs 1543 udp simba-cs [Betsy_Alexander] [Betsy_Alexander] ++aspeclmd 1544 tcp aspeclmd [V_Balaji] [V_Balaji] ++aspeclmd 1544 udp aspeclmd [V_Balaji] [V_Balaji] ++vistium-share 1545 tcp vistium-share [Allison_Carleton] [Allison_Carleton] ++vistium-share 1545 udp vistium-share [Allison_Carleton] [Allison_Carleton] ++abbaccuray 1546 tcp abbaccuray [John_Wendt] [John_Wendt] ++abbaccuray 1546 udp abbaccuray [John_Wendt] [John_Wendt] ++laplink 1547 tcp laplink [Michael_Crawford] [Michael_Crawford] ++laplink 1547 udp laplink [Michael_Crawford] [Michael_Crawford] ++axon-lm 1548 tcp Axon License Manager [Mark_Pearce] [Mark_Pearce] ++axon-lm 1548 udp Axon License Manager [Mark_Pearce] [Mark_Pearce] ++shivahose 1549 tcp Shiva Hose ++shivasound 1549 udp Shiva Sound [Kin_Chan] [Kin_Chan] ++3m-image-lm 1550 tcp Image Storage license [J_C_Canessa] [J_C_Canessa] ++ manager 3M Company ++3m-image-lm 1550 udp Image Storage license [J_C_Canessa] [J_C_Canessa] ++ manager 3M Company ++hecmtl-db 1551 tcp HECMTL-DB [Maxime_Belanger] [Maxime_Belanger] ++hecmtl-db 1551 udp HECMTL-DB [Maxime_Belanger] [Maxime_Belanger] ++pciarray 1552 tcp pciarray [Ron_Folk] [Ron_Folk] ++pciarray 1552 udp pciarray [Ron_Folk] [Ron_Folk] ++sna-cs 1553 tcp sna-cs [Tony_Sowter] [Tony_Sowter] ++sna-cs 1553 udp sna-cs [Tony_Sowter] [Tony_Sowter] ++caci-lm 1554 tcp CACI Products Company [Erik_Blume] [Erik_Blume] ++ License Manager ++caci-lm 1554 udp CACI Products Company [Erik_Blume] [Erik_Blume] ++ License Manager ++livelan 1555 tcp livelan [Kaynam_Hedayat] [Kaynam_Hedayat] ++livelan 1555 udp livelan [Kaynam_Hedayat] [Kaynam_Hedayat] ++ VERITAS Private Branch ++ Exchange ++ ++veritas-pbx 1556 tcp IANA assigned this [Stefan_Winkel] [Stefan_Winkel] 2004-04 ++ well-formed service name as ++ a replacement for ++ "veritas_pbx". ++ VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now ++veritas_pbx 1556 tcp Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service ++ discovery mechanisms. ++ VERITAS Private Branch ++ Exchange ++ ++veritas-pbx 1556 udp IANA assigned this [Stefan_Winkel] [Stefan_Winkel] 2004-04 ++ well-formed service name as ++ a replacement for ++ "veritas_pbx". ++ VERITAS Private Branch This entry is an alias to "veritas-pbx". This entry is now ++veritas_pbx 1556 udp Exchange [Stefan_Winkel] [Stefan_Winkel] 2004-04 historic, not usable for use with many common service ++ discovery mechanisms. ++arbortext-lm 1557 tcp ArborText License Manager [David_J_Wilson] [David_J_Wilson] ++arbortext-lm 1557 udp ArborText License Manager [David_J_Wilson] [David_J_Wilson] ++xingmpeg 1558 tcp xingmpeg [Howard_Gordon] [Howard_Gordon] ++xingmpeg 1558 udp xingmpeg [Howard_Gordon] [Howard_Gordon] ++web2host 1559 tcp web2host [Stephen_Johnson] [Stephen_Johnson] ++web2host 1559 udp web2host [Stephen_Johnson] [Stephen_Johnson] ++asci-val 1560 tcp ASCI-RemoteSHADOW [Benjamin_Rosenberg] [Benjamin_Rosenberg] ++asci-val 1560 udp ASCI-RemoteSHADOW [Benjamin_Rosenberg] [Benjamin_Rosenberg] ++facilityview 1561 tcp facilityview [Ed_Green] [Ed_Green] ++facilityview 1561 udp facilityview [Ed_Green] [Ed_Green] ++pconnectmgr 1562 tcp pconnectmgr [Bob_Kaiser] [Bob_Kaiser] ++pconnectmgr 1562 udp pconnectmgr [Bob_Kaiser] [Bob_Kaiser] ++cadabra-lm 1563 tcp Cadabra License Manager [Arthur_Castonguay] [Arthur_Castonguay] ++cadabra-lm 1563 udp Cadabra License Manager [Arthur_Castonguay] [Arthur_Castonguay] ++pay-per-view 1564 tcp Pay-Per-View [Brian_Tung] [Brian_Tung] ++pay-per-view 1564 udp Pay-Per-View [Brian_Tung] [Brian_Tung] ++winddlb 1565 tcp WinDD [Kelly_Sims] [Kelly_Sims] ++winddlb 1565 udp WinDD [Kelly_Sims] [Kelly_Sims] ++corelvideo 1566 tcp CORELVIDEO [Ming_Poon] [Ming_Poon] ++corelvideo 1566 udp CORELVIDEO [Ming_Poon] [Ming_Poon] ++jlicelmd 1567 tcp jlicelmd [Christian_Schormann] [Christian_Schormann] ++jlicelmd 1567 udp jlicelmd [Christian_Schormann] [Christian_Schormann] ++tsspmap 1568 tcp tsspmap [Paul_W_Nelson] [Paul_W_Nelson] ++tsspmap 1568 udp tsspmap [Paul_W_Nelson] [Paul_W_Nelson] ++ets 1569 tcp ets [Carstein_Seeberg] [Carstein_Seeberg] ++ets 1569 udp ets [Carstein_Seeberg] [Carstein_Seeberg] ++orbixd 1570 tcp orbixd [Bridget_Walsh] [Bridget_Walsh] ++orbixd 1570 udp orbixd [Bridget_Walsh] [Bridget_Walsh] ++rdb-dbs-disp 1571 tcp Oracle Remote Data Base [mackin] [mackin] ++rdb-dbs-disp 1571 udp Oracle Remote Data Base [mackin] [mackin] ++chip-lm 1572 tcp Chipcom License Manager ++chip-lm 1572 udp Chipcom License Manager ++itscomm-ns 1573 tcp itscomm-ns [Rich_Thompson] [Rich_Thompson] ++itscomm-ns 1573 udp itscomm-ns [Rich_Thompson] [Rich_Thompson] ++mvel-lm 1574 tcp mvel-lm [David_Bisset] [David_Bisset] ++mvel-lm 1574 udp mvel-lm [David_Bisset] [David_Bisset] ++oraclenames 1575 tcp oraclenames [P_V_Shivkumar] [P_V_Shivkumar] ++oraclenames 1575 udp oraclenames [P_V_Shivkumar] [P_V_Shivkumar] ++moldflow-lm 1576 tcp Moldflow License Manager [Lech_Laskowski] [Lech_Laskowski] ++moldflow-lm 1576 udp Moldflow License Manager [Lech_Laskowski] [Lech_Laskowski] ++hypercube-lm 1577 tcp hypercube-lm [Christopher_McLendon] [Christopher_McLendon] ++hypercube-lm 1577 udp hypercube-lm [Christopher_McLendon] [Christopher_McLendon] ++jacobus-lm 1578 tcp Jacobus License Manager [Tony_Cleveland] [Tony_Cleveland] ++jacobus-lm 1578 udp Jacobus License Manager [Tony_Cleveland] [Tony_Cleveland] ++ioc-sea-lm 1579 tcp ioc-sea-lm [Paul_Nelson] [Paul_Nelson] ++ioc-sea-lm 1579 udp ioc-sea-lm [Paul_Nelson] [Paul_Nelson] ++tn-tl-r1 1580 tcp tn-tl-r1 ++tn-tl-r2 1580 udp tn-tl-r2 [Ed_Kress] [Ed_Kress] ++mil-2045-47001 1581 tcp MIL-2045-47001 [Eric_Whitehill] [Eric_Whitehill] ++mil-2045-47001 1581 udp MIL-2045-47001 [Eric_Whitehill] [Eric_Whitehill] ++msims 1582 tcp MSIMS [Glenn_Olander] [Glenn_Olander] ++msims 1582 udp MSIMS [Glenn_Olander] [Glenn_Olander] ++simbaexpress 1583 tcp simbaexpress [Betsy_Alexander] [Betsy_Alexander] ++simbaexpress 1583 udp simbaexpress [Betsy_Alexander] [Betsy_Alexander] ++tn-tl-fd2 1584 tcp tn-tl-fd2 [Ed_Kress] [Ed_Kress] ++tn-tl-fd2 1584 udp tn-tl-fd2 [Ed_Kress] [Ed_Kress] ++intv 1585 tcp intv [Dermot_Tynand] [Dermot_Tynand] ++intv 1585 udp intv [Dermot_Tynand] [Dermot_Tynand] ++ibm-abtact 1586 tcp ibm-abtact [Sandeep_K_Singhal] [Sandeep_K_Singhal] ++ibm-abtact 1586 udp ibm-abtact [Sandeep_K_Singhal] [Sandeep_K_Singhal] ++ pra_elmd ++ ++pra-elmd 1587 tcp IANA assigned this [Dennis_Mastin] [Dennis_Mastin] ++ well-formed service name as ++ a replacement for ++ "pra_elmd". ++ This entry is an alias to "pra-elmd". This entry is now ++pra_elmd 1587 tcp pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service ++ discovery mechanisms. ++ pra_elmd ++ ++pra-elmd 1587 udp IANA assigned this [Dennis_Mastin] [Dennis_Mastin] ++ well-formed service name as ++ a replacement for ++ "pra_elmd". ++ This entry is an alias to "pra-elmd". This entry is now ++pra_elmd 1587 udp pra_elmd [Dennis_Mastin] [Dennis_Mastin] historic, not usable for use with many common service ++ discovery mechanisms. ++triquest-lm 1588 tcp triquest-lm [Nand_Kumar] [Nand_Kumar] ++triquest-lm 1588 udp triquest-lm [Nand_Kumar] [Nand_Kumar] ++vqp 1589 tcp VQP [Keith_McCloghrie] [Keith_McCloghrie] ++vqp 1589 udp VQP [Keith_McCloghrie] [Keith_McCloghrie] ++gemini-lm 1590 tcp gemini-lm [Tony_Sawyer] [Tony_Sawyer] ++gemini-lm 1590 udp gemini-lm [Tony_Sawyer] [Tony_Sawyer] ++ncpm-pm 1591 tcp ncpm-pm [Ted_Power] [Ted_Power] ++ncpm-pm 1591 udp ncpm-pm [Ted_Power] [Ted_Power] ++commonspace 1592 tcp commonspace [Rob_Chandhok_2] [Rob_Chandhok_2] ++commonspace 1592 udp commonspace [Rob_Chandhok_2] [Rob_Chandhok_2] ++mainsoft-lm 1593 tcp mainsoft-lm [Anand_Gangadharan] [Anand_Gangadharan] ++mainsoft-lm 1593 udp mainsoft-lm [Anand_Gangadharan] [Anand_Gangadharan] ++sixtrak 1594 tcp sixtrak [Bob_Rennie] [Bob_Rennie] ++sixtrak 1594 udp sixtrak [Bob_Rennie] [Bob_Rennie] ++radio 1595 tcp radio ++radio 1595 udp radio ++radio-sm 1596 tcp radio-sm ++radio-bc 1596 udp radio-bc [Ken_Chapman] [Ken_Chapman] ++orbplus-iiop 1597 tcp orbplus-iiop [Robert_A_Kukura] [Robert_A_Kukura] ++orbplus-iiop 1597 udp orbplus-iiop [Robert_A_Kukura] [Robert_A_Kukura] ++picknfs 1598 tcp picknfs [John_Lombardo] [John_Lombardo] ++picknfs 1598 udp picknfs [John_Lombardo] [John_Lombardo] ++simbaservices 1599 tcp simbaservices [Betsy_Alexander] [Betsy_Alexander] ++simbaservices 1599 udp simbaservices [Betsy_Alexander] [Betsy_Alexander] ++issd 1600 tcp issd ++issd 1600 udp issd ++aas 1601 tcp aas [Bob_Beard] [Bob_Beard] ++aas 1601 udp aas [Bob_Beard] [Bob_Beard] ++inspect 1602 tcp inspect [Frank_O_Neill] [Frank_O_Neill] ++inspect 1602 udp inspect [Frank_O_Neill] [Frank_O_Neill] ++picodbc 1603 tcp pickodbc [John_Lombardo] [John_Lombardo] ++picodbc 1603 udp pickodbc [John_Lombardo] [John_Lombardo] ++icabrowser 1604 tcp icabrowser [Brad_Pedersen] [Brad_Pedersen] ++icabrowser 1604 udp icabrowser [Brad_Pedersen] [Brad_Pedersen] ++slp 1605 tcp Salutation Manager ++ (Salutation Protocol) ++slp 1605 udp Salutation Manager ++ (Salutation Protocol) ++slm-api 1606 tcp Salutation Manager (SLM-API) [Tohru_Mori] [Tohru_Mori] ++slm-api 1606 udp Salutation Manager (SLM-API) [Tohru_Mori] [Tohru_Mori] ++stt 1607 tcp stt [Ryan_Bolz] [Ryan_Bolz] ++stt 1607 udp stt [Ryan_Bolz] [Ryan_Bolz] ++smart-lm 1608 tcp Smart Corp. License Manager [Connie_Qiu] [Connie_Qiu] ++smart-lm 1608 udp Smart Corp. License Manager [Connie_Qiu] [Connie_Qiu] ++isysg-lm 1609 tcp isysg-lm [Adam_Curtin] [Adam_Curtin] ++isysg-lm 1609 udp isysg-lm [Adam_Curtin] [Adam_Curtin] ++taurus-wh 1610 tcp taurus-wh [Jeff_Moffatt] [Jeff_Moffatt] ++taurus-wh 1610 udp taurus-wh [Jeff_Moffatt] [Jeff_Moffatt] ++ill 1611 tcp Inter Library Loan [Niall_Murphy] [Niall_Murphy] ++ill 1611 udp Inter Library Loan [Niall_Murphy] [Niall_Murphy] ++netbill-trans 1612 tcp NetBill Transaction Server ++netbill-trans 1612 udp NetBill Transaction Server ++netbill-keyrep 1613 tcp NetBill Key Repository ++netbill-keyrep 1613 udp NetBill Key Repository ++netbill-cred 1614 tcp NetBill Credential Server ++netbill-cred 1614 udp NetBill Credential Server ++netbill-auth 1615 tcp NetBill Authorization Server ++netbill-auth 1615 udp NetBill Authorization Server ++netbill-prod 1616 tcp NetBill Product Server [Marvin_Sirbu] [Marvin_Sirbu] ++netbill-prod 1616 udp NetBill Product Server [Marvin_Sirbu] [Marvin_Sirbu] ++nimrod-agent 1617 tcp Nimrod Inter-Agent [Charles_Lynn] [Charles_Lynn] ++ Communication ++nimrod-agent 1617 udp Nimrod Inter-Agent [Charles_Lynn] [Charles_Lynn] ++ Communication ++skytelnet 1618 tcp skytelnet [Byron_Jones] [Byron_Jones] ++skytelnet 1618 udp skytelnet [Byron_Jones] [Byron_Jones] ++xs-openstorage 1619 tcp xs-openstorage [XuiS_Software_Ltd] [XuiS_Software_Ltd] ++xs-openstorage 1619 udp xs-openstorage [XuiS_Software_Ltd] [XuiS_Software_Ltd] ++faxportwinport 1620 tcp faxportwinport [Chris_Wells] [Chris_Wells] ++faxportwinport 1620 udp faxportwinport [Chris_Wells] [Chris_Wells] ++softdataphone 1621 tcp softdataphone [Dror_Gill] [Dror_Gill] ++softdataphone 1621 udp softdataphone [Dror_Gill] [Dror_Gill] ++ontime 1622 tcp ontime [Keith_Rhodes] [Keith_Rhodes] ++ontime 1622 udp ontime [Keith_Rhodes] [Keith_Rhodes] ++jaleosnd 1623 tcp jaleosnd [Christian_Schormann] [Christian_Schormann] ++jaleosnd 1623 udp jaleosnd [Christian_Schormann] [Christian_Schormann] ++udp-sr-port 1624 tcp udp-sr-port [Herb_Jensen] [Herb_Jensen] ++udp-sr-port 1624 udp udp-sr-port [Herb_Jensen] [Herb_Jensen] ++svs-omagent 1625 tcp svs-omagent [Alberto_Berlen] [Alberto_Berlen] ++svs-omagent 1625 udp svs-omagent [Alberto_Berlen] [Alberto_Berlen] ++shockwave 1626 tcp Shockwave [Sarah_Allen] [Sarah_Allen] ++shockwave 1626 udp Shockwave [Sarah_Allen] [Sarah_Allen] ++t128-gateway 1627 tcp T.128 Gateway [Phil_May] [Phil_May] ++t128-gateway 1627 udp T.128 Gateway [Phil_May] [Phil_May] ++lontalk-norm 1628 tcp LonTalk normal ++lontalk-norm 1628 udp LonTalk normal ++lontalk-urgnt 1629 tcp LonTalk urgent [Bob_Dolin] [Bob_Dolin] 2008-04-10 ++lontalk-urgnt 1629 udp LonTalk urgent [Bob_Dolin] [Bob_Dolin] 2008-04-10 ++oraclenet8cman 1630 tcp Oracle Net8 Cman [Tong_Ming_Lee] [Tong_Ming_Lee] ++oraclenet8cman 1630 udp Oracle Net8 Cman [Tong_Ming_Lee] [Tong_Ming_Lee] ++visitview 1631 tcp Visit view [Tom_Whittaker] [Tom_Whittaker] ++visitview 1631 udp Visit view [Tom_Whittaker] [Tom_Whittaker] ++pammratc 1632 tcp PAMMRATC ++pammratc 1632 udp PAMMRATC ++pammrpc 1633 tcp PAMMRPC [John_Britton] [John_Britton] ++pammrpc 1633 udp PAMMRPC [John_Britton] [John_Britton] ++loaprobe 1634 tcp Log On America Probe [James_Tavares] [James_Tavares] ++loaprobe 1634 udp Log On America Probe [James_Tavares] [James_Tavares] ++edb-server1 1635 tcp EDB Server 1 [Carlos_Portela] [Carlos_Portela] ++edb-server1 1635 udp EDB Server 1 [Carlos_Portela] [Carlos_Portela] ++isdc 1636 tcp ISP shared public data ++ control ++isdc 1636 udp ISP shared public data ++ control ++islc 1637 tcp ISP shared local data ++ control ++islc 1637 udp ISP shared local data ++ control ++ismc 1638 tcp ISP shared management [Nick_Austin] [Nick_Austin] ++ control ++ismc 1638 udp ISP shared management [Nick_Austin] [Nick_Austin] ++ control ++cert-initiator 1639 tcp cert-initiator ++cert-initiator 1639 udp cert-initiator ++cert-responder 1640 tcp cert-responder [Tom_Markson] [Tom_Markson] ++cert-responder 1640 udp cert-responder [Tom_Markson] [Tom_Markson] ++invision 1641 tcp InVision [Christopher_Davey] [Christopher_Davey] ++invision 1641 udp InVision [Christopher_Davey] [Christopher_Davey] ++isis-am 1642 tcp isis-am ++isis-am 1642 udp isis-am ++isis-ambc 1643 tcp isis-ambc [Ken_Chapman] [Ken_Chapman] ++isis-ambc 1643 udp isis-ambc [Ken_Chapman] [Ken_Chapman] ++saiseh 1644 tcp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 4 ++saiseh 1644 udp Satellite-data Acquisition [Bill_Taylor] [Bill_Taylor] ++ System 4 ++sightline 1645 tcp SightLine [admin] [admin] ++sightline 1645 udp SightLine [admin] [admin] ++sa-msg-port 1646 tcp sa-msg-port [Eric_Whitehill] [Eric_Whitehill] ++sa-msg-port 1646 udp sa-msg-port [Eric_Whitehill] [Eric_Whitehill] ++rsap 1647 tcp rsap [Holger_Reif] [Holger_Reif] ++rsap 1647 udp rsap [Holger_Reif] [Holger_Reif] ++concurrent-lm 1648 tcp concurrent-lm [Maggie_Brinsford] [Maggie_Brinsford] ++concurrent-lm 1648 udp concurrent-lm [Maggie_Brinsford] [Maggie_Brinsford] ++kermit 1649 tcp kermit [Frank_da_Cruz] [Frank_da_Cruz] ++kermit 1649 udp kermit [Frank_da_Cruz] [Frank_da_Cruz] ++nkd 1650 tcp nkdn ++nkd 1650 udp nkd ++ shiva_confsrvr ++ ++shiva-confsrvr 1651 tcp IANA assigned this [Mike_Horowitz] [Mike_Horowitz] ++ well-formed service name as ++ a replacement for ++ "shiva_confsrvr". ++ This entry is an alias to "shiva-confsrvr". This entry is now ++shiva_confsrvr 1651 tcp shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service ++ discovery mechanisms. ++ shiva_confsrvr ++ ++shiva-confsrvr 1651 udp IANA assigned this [Mike_Horowitz] [Mike_Horowitz] ++ well-formed service name as ++ a replacement for ++ "shiva_confsrvr". ++ This entry is an alias to "shiva-confsrvr". This entry is now ++shiva_confsrvr 1651 udp shiva_confsrvr [Mike_Horowitz] [Mike_Horowitz] historic, not usable for use with many common service ++ discovery mechanisms. ++xnmp 1652 tcp xnmp [Ali_Saleh] [Ali_Saleh] ++xnmp 1652 udp xnmp [Ali_Saleh] [Ali_Saleh] ++alphatech-lm 1653 tcp alphatech-lm [Joseph_Hauk] [Joseph_Hauk] ++alphatech-lm 1653 udp alphatech-lm [Joseph_Hauk] [Joseph_Hauk] ++stargatealerts 1654 tcp stargatealerts [Tim_Coppernoll] [Tim_Coppernoll] ++stargatealerts 1654 udp stargatealerts [Tim_Coppernoll] [Tim_Coppernoll] ++dec-mbadmin 1655 tcp dec-mbadmin ++dec-mbadmin 1655 udp dec-mbadmin ++dec-mbadmin-h 1656 tcp dec-mbadmin-h [Nick_Shipman] [Nick_Shipman] ++dec-mbadmin-h 1656 udp dec-mbadmin-h [Nick_Shipman] [Nick_Shipman] ++fujitsu-mmpdc 1657 tcp fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] ++fujitsu-mmpdc 1657 udp fujitsu-mmpdc [Katsumi_Oomuro] [Katsumi_Oomuro] ++sixnetudr 1658 tcp sixnetudr [Bob_Rennie] [Bob_Rennie] ++sixnetudr 1658 udp sixnetudr [Bob_Rennie] [Bob_Rennie] ++sg-lm 1659 tcp Silicon Grail License [William_R_Bishop] [William_R_Bishop] ++ Manager ++sg-lm 1659 udp Silicon Grail License [William_R_Bishop] [William_R_Bishop] ++ Manager ++skip-mc-gikreq 1660 tcp skip-mc-gikreq [Tom_Markson] [Tom_Markson] ++skip-mc-gikreq 1660 udp skip-mc-gikreq [Tom_Markson] [Tom_Markson] ++netview-aix-1 1661 tcp netview-aix-1 ++netview-aix-1 1661 udp netview-aix-1 ++netview-aix-2 1662 tcp netview-aix-2 ++netview-aix-2 1662 udp netview-aix-2 ++netview-aix-3 1663 tcp netview-aix-3 ++netview-aix-3 1663 udp netview-aix-3 ++netview-aix-4 1664 tcp netview-aix-4 ++netview-aix-4 1664 udp netview-aix-4 ++netview-aix-5 1665 tcp netview-aix-5 ++netview-aix-5 1665 udp netview-aix-5 ++netview-aix-6 1666 tcp netview-aix-6 ++netview-aix-6 1666 udp netview-aix-6 ++netview-aix-7 1667 tcp netview-aix-7 ++netview-aix-7 1667 udp netview-aix-7 ++netview-aix-8 1668 tcp netview-aix-8 ++netview-aix-8 1668 udp netview-aix-8 ++netview-aix-9 1669 tcp netview-aix-9 ++netview-aix-9 1669 udp netview-aix-9 ++netview-aix-10 1670 tcp netview-aix-10 ++netview-aix-10 1670 udp netview-aix-10 ++netview-aix-11 1671 tcp netview-aix-11 ++netview-aix-11 1671 udp netview-aix-11 ++netview-aix-12 1672 tcp netview-aix-12 [Martha_Crisson] [Martha_Crisson] ++netview-aix-12 1672 udp netview-aix-12 [Martha_Crisson] [Martha_Crisson] ++proshare-mc-1 1673 tcp Intel Proshare Multicast ++proshare-mc-1 1673 udp Intel Proshare Multicast ++proshare-mc-2 1674 tcp Intel Proshare Multicast [Mark_Lewis] [Mark_Lewis] ++proshare-mc-2 1674 udp Intel Proshare Multicast [Mark_Lewis] [Mark_Lewis] ++pdp 1675 tcp Pacific Data Products [Gary_Morton] [Gary_Morton] ++pdp 1675 udp Pacific Data Products [Gary_Morton] [Gary_Morton] ++netcomm1 1676 tcp netcomm1 ++netcomm2 1676 udp netcomm2 [Bulent_Kasman] [Bulent_Kasman] ++groupwise 1677 tcp groupwise [Brent_Bradshaw] [Brent_Bradshaw] ++groupwise 1677 udp groupwise [Brent_Bradshaw] [Brent_Bradshaw] ++prolink 1678 tcp prolink [Brian_Abramson] [Brian_Abramson] ++prolink 1678 udp prolink [Brian_Abramson] [Brian_Abramson] ++darcorp-lm 1679 tcp darcorp-lm [DARcorp] [DARcorp] ++darcorp-lm 1679 udp darcorp-lm [DARcorp] [DARcorp] ++microcom-sbp 1680 tcp microcom-sbp [Boris_B_Maiden] [Boris_B_Maiden] ++microcom-sbp 1680 udp microcom-sbp [Boris_B_Maiden] [Boris_B_Maiden] ++sd-elmd 1681 tcp sd-elmd [Bryan_Otey] [Bryan_Otey] ++sd-elmd 1681 udp sd-elmd [Bryan_Otey] [Bryan_Otey] ++lanyon-lantern 1682 tcp lanyon-lantern [Robin_Lewis] [Robin_Lewis] ++lanyon-lantern 1682 udp lanyon-lantern [Robin_Lewis] [Robin_Lewis] ++ncpm-hip 1683 tcp ncpm-hip [Ken_Hearn] [Ken_Hearn] ++ncpm-hip 1683 udp ncpm-hip [Ken_Hearn] [Ken_Hearn] ++snaresecure 1684 tcp SnareSecure [Marty_Batchelder] [Marty_Batchelder] ++snaresecure 1684 udp SnareSecure [Marty_Batchelder] [Marty_Batchelder] ++n2nremote 1685 tcp n2nremote [Kin_Chan_2] [Kin_Chan_2] ++n2nremote 1685 udp n2nremote [Kin_Chan_2] [Kin_Chan_2] ++cvmon 1686 tcp cvmon [Carol_Ann_Krug] [Carol_Ann_Krug] ++cvmon 1686 udp cvmon [Carol_Ann_Krug] [Carol_Ann_Krug] ++nsjtp-ctrl 1687 tcp nsjtp-ctrl ++nsjtp-ctrl 1687 udp nsjtp-ctrl ++nsjtp-data 1688 tcp nsjtp-data [Orazio_Granato] [Orazio_Granato] ++nsjtp-data 1688 udp nsjtp-data [Orazio_Granato] [Orazio_Granato] ++firefox 1689 tcp firefox [Mark_S_Edwards] [Mark_S_Edwards] ++firefox 1689 udp firefox [Mark_S_Edwards] [Mark_S_Edwards] ++ng-umds 1690 tcp ng-umds [Louis_E_Simard] [Louis_E_Simard] ++ng-umds 1690 udp ng-umds [Louis_E_Simard] [Louis_E_Simard] ++empire-empuma 1691 tcp empire-empuma [Bobby_Krupczak] [Bobby_Krupczak] ++empire-empuma 1691 udp empire-empuma [Bobby_Krupczak] [Bobby_Krupczak] ++sstsys-lm 1692 tcp sstsys-lm [Yih_Wu_Wang] [Yih_Wu_Wang] ++sstsys-lm 1692 udp sstsys-lm [Yih_Wu_Wang] [Yih_Wu_Wang] ++rrirtr 1693 tcp rrirtr ++rrirtr 1693 udp rrirtr ++rrimwm 1694 tcp rrimwm ++rrimwm 1694 udp rrimwm ++rrilwm 1695 tcp rrilwm ++rrilwm 1695 udp rrilwm ++rrifmm 1696 tcp rrifmm ++rrifmm 1696 udp rrifmm ++rrisat 1697 tcp rrisat [Allen_Briggs] [Allen_Briggs] ++rrisat 1697 udp rrisat [Allen_Briggs] [Allen_Briggs] ++rsvp-encap-1 1698 tcp RSVP-ENCAPSULATION-1 ++rsvp-encap-1 1698 udp RSVP-ENCAPSULATION-1 ++rsvp-encap-2 1699 tcp RSVP-ENCAPSULATION-2 [Bob_Braden_2] [Bob_Braden_2] ++rsvp-encap-2 1699 udp RSVP-ENCAPSULATION-2 [Bob_Braden_2] [Bob_Braden_2] ++mps-raft 1700 tcp mps-raft [Jason_Leupen] [Jason_Leupen] ++mps-raft 1700 udp mps-raft [Jason_Leupen] [Jason_Leupen] ++l2f 1701 tcp l2f ++l2f 1701 udp l2f ++l2tp 1701 tcp l2tp [Andy_Valencia] [Andy_Valencia] ++l2tp 1701 udp l2tp [Andy_Valencia] [Andy_Valencia] ++deskshare 1702 tcp deskshare [Sarah_Thompson] [Sarah_Thompson] ++deskshare 1702 udp deskshare [Sarah_Thompson] [Sarah_Thompson] ++hb-engine 1703 tcp hb-engine [Charles_C_L_Chou] [Charles_C_L_Chou] ++hb-engine 1703 udp hb-engine [Charles_C_L_Chou] [Charles_C_L_Chou] ++bcs-broker 1704 tcp bcs-broker [Andy_Warner] [Andy_Warner] ++bcs-broker 1704 udp bcs-broker [Andy_Warner] [Andy_Warner] ++slingshot 1705 tcp slingshot [Paul_Groarke] [Paul_Groarke] ++slingshot 1705 udp slingshot [Paul_Groarke] [Paul_Groarke] ++jetform 1706 tcp jetform [gdeinsta] [gdeinsta] ++jetform 1706 udp jetform [gdeinsta] [gdeinsta] ++vdmplay 1707 tcp vdmplay [David_Thielen] [David_Thielen] ++vdmplay 1707 udp vdmplay [David_Thielen] [David_Thielen] ++gat-lmd 1708 tcp gat-lmd [Igor_Zaoutine] [Igor_Zaoutine] ++gat-lmd 1708 udp gat-lmd [Igor_Zaoutine] [Igor_Zaoutine] ++centra 1709 tcp centra [Drew_Wolff] [Drew_Wolff] ++centra 1709 udp centra [Drew_Wolff] [Drew_Wolff] ++impera 1710 tcp impera [Stepehen_Campbell] [Stepehen_Campbell] ++impera 1710 udp impera [Stepehen_Campbell] [Stepehen_Campbell] ++pptconference 1711 tcp pptconference [John_Tafoya] [John_Tafoya] ++pptconference 1711 udp pptconference [John_Tafoya] [John_Tafoya] ++registrar 1712 tcp resource monitoring service [Ron_Lawson] [Ron_Lawson] ++registrar 1712 udp resource monitoring service [Ron_Lawson] [Ron_Lawson] ++conferencetalk 1713 tcp ConferenceTalk [George_Kajos] [George_Kajos] ++conferencetalk 1713 udp ConferenceTalk [George_Kajos] [George_Kajos] ++sesi-lm 1714 tcp sesi-lm ++sesi-lm 1714 udp sesi-lm ++houdini-lm 1715 tcp houdini-lm [Paul_Breslin] [Paul_Breslin] ++houdini-lm 1715 udp houdini-lm [Paul_Breslin] [Paul_Breslin] ++xmsg 1716 tcp xmsg [Mark_E_Fogle] [Mark_E_Fogle] ++xmsg 1716 udp xmsg [Mark_E_Fogle] [Mark_E_Fogle] ++fj-hdnet 1717 tcp fj-hdnet [Manabu_Makino] [Manabu_Makino] ++fj-hdnet 1717 udp fj-hdnet [Manabu_Makino] [Manabu_Makino] ++h323gatedisc 1718 tcp h323gatedisc ++h323gatedisc 1718 udp h323gatedisc ++h323gatestat 1719 tcp h323gatestat ++h323gatestat 1719 udp h323gatestat ++h323hostcall 1720 tcp h323hostcall [Jim_Toga_2] [Jim_Toga_2] ++h323hostcall 1720 udp h323hostcall [Jim_Toga_2] [Jim_Toga_2] ++caicci 1721 tcp caicci [Sylvia_Scheuren] [Sylvia_Scheuren] ++caicci 1721 udp caicci [Sylvia_Scheuren] [Sylvia_Scheuren] ++hks-lm 1722 tcp HKS License Manager [Michael_Wood] [Michael_Wood] ++hks-lm 1722 udp HKS License Manager [Michael_Wood] [Michael_Wood] ++pptp 1723 tcp pptp [Ken_Crocker] [Ken_Crocker] ++pptp 1723 udp pptp [Ken_Crocker] [Ken_Crocker] ++csbphonemaster 1724 tcp csbphonemaster [Hans_Peter_Heffels] [Hans_Peter_Heffels] ++csbphonemaster 1724 udp csbphonemaster [Hans_Peter_Heffels] [Hans_Peter_Heffels] ++iden-ralp 1725 tcp iden-ralp [Chris_Stanaway] [Chris_Stanaway] ++iden-ralp 1725 udp iden-ralp [Chris_Stanaway] [Chris_Stanaway] ++iberiagames 1726 tcp IBERIAGAMES [Jose_Luis] [Jose_Luis] ++iberiagames 1726 udp IBERIAGAMES [Jose_Luis] [Jose_Luis] ++winddx 1727 tcp winddx [Bill_Andrews] [Bill_Andrews] ++winddx 1727 udp winddx [Bill_Andrews] [Bill_Andrews] ++telindus 1728 tcp TELINDUS [Paul_Pyck] [Paul_Pyck] ++telindus 1728 udp TELINDUS [Paul_Pyck] [Paul_Pyck] ++citynl 1729 tcp CityNL License Management [CityDisc] [CityDisc] ++citynl 1729 udp CityNL License Management [CityDisc] [CityDisc] ++roketz 1730 tcp roketz [Ahti_Heinla] [Ahti_Heinla] ++roketz 1730 udp roketz [Ahti_Heinla] [Ahti_Heinla] ++msiccp 1731 tcp MSICCP [Max_Morris] [Max_Morris] ++msiccp 1731 udp MSICCP [Max_Morris] [Max_Morris] ++proxim 1732 tcp proxim [Srinivas_N_Mogalapa] [Srinivas_N_Mogalapa] ++proxim 1732 udp proxim [Srinivas_N_Mogalapa] [Srinivas_N_Mogalapa] ++siipat 1733 tcp SIMS - SIIPAT Protocol for [Steve_Ryckman] [Steve_Ryckman] ++ Alarm Transmission ++siipat 1733 udp SIMS - SIIPAT Protocol for [Steve_Ryckman] [Steve_Ryckman] ++ Alarm Transmission ++cambertx-lm 1734 tcp Camber Corporation License [Jeannie_Burleson] [Jeannie_Burleson] ++ Management ++cambertx-lm 1734 udp Camber Corporation License [Jeannie_Burleson] [Jeannie_Burleson] ++ Management ++privatechat 1735 tcp PrivateChat [Louis_E_Simard] [Louis_E_Simard] ++privatechat 1735 udp PrivateChat [Louis_E_Simard] [Louis_E_Simard] ++street-stream 1736 tcp street-stream [Glenn_Levitt] [Glenn_Levitt] ++street-stream 1736 udp street-stream [Glenn_Levitt] [Glenn_Levitt] ++ultimad 1737 tcp ultimad [Michael_Lanzetta] [Michael_Lanzetta] ++ultimad 1737 udp ultimad [Michael_Lanzetta] [Michael_Lanzetta] ++gamegen1 1738 tcp GameGen1 [Glen_Pearson] [Glen_Pearson] ++gamegen1 1738 udp GameGen1 [Glen_Pearson] [Glen_Pearson] ++webaccess 1739 tcp webaccess [Christian_Saether] [Christian_Saether] ++webaccess 1739 udp webaccess [Christian_Saether] [Christian_Saether] ++encore 1740 tcp encore [Stuart_Button] [Stuart_Button] ++encore 1740 udp encore [Stuart_Button] [Stuart_Button] ++cisco-net-mgmt 1741 tcp cisco-net-mgmt [John_McCormack] [John_McCormack] ++cisco-net-mgmt 1741 udp cisco-net-mgmt [John_McCormack] [John_McCormack] ++3Com-nsd 1742 tcp 3Com-nsd [Nitza_Steinberg] [Nitza_Steinberg] ++3Com-nsd 1742 udp 3Com-nsd [Nitza_Steinberg] [Nitza_Steinberg] ++cinegrfx-lm 1743 tcp Cinema Graphics License [Rodney_Iwashina] [Rodney_Iwashina] ++ Manager ++cinegrfx-lm 1743 udp Cinema Graphics License [Rodney_Iwashina] [Rodney_Iwashina] ++ Manager ++ncpm-ft 1744 tcp ncpm-ft [Ken_Hearn] [Ken_Hearn] ++ncpm-ft 1744 udp ncpm-ft [Ken_Hearn] [Ken_Hearn] ++remote-winsock 1745 tcp remote-winsock [Avi_Nathan] [Avi_Nathan] ++remote-winsock 1745 udp remote-winsock [Avi_Nathan] [Avi_Nathan] ++ftrapid-1 1746 tcp ftrapid-1 ++ftrapid-1 1746 udp ftrapid-1 ++ftrapid-2 1747 tcp ftrapid-2 [Richard_J_Williams] [Richard_J_Williams] ++ftrapid-2 1747 udp ftrapid-2 [Richard_J_Williams] [Richard_J_Williams] ++oracle-em1 1748 tcp oracle-em1 [Bob_Purvy] [Bob_Purvy] ++oracle-em1 1748 udp oracle-em1 [Bob_Purvy] [Bob_Purvy] ++aspen-services 1749 tcp aspen-services [Mark_B_Hurst] [Mark_B_Hurst] ++aspen-services 1749 udp aspen-services [Mark_B_Hurst] [Mark_B_Hurst] ++sslp 1750 tcp Simple Socket Library's [Dr_Charles_E_Campb] [Dr_Charles_E_Campb] ++ PortMaster ++sslp 1750 udp Simple Socket Library's [Dr_Charles_E_Campb] [Dr_Charles_E_Campb] ++ PortMaster ++swiftnet 1751 tcp SwiftNet [Terry_Lim] [Terry_Lim] ++swiftnet 1751 udp SwiftNet [Terry_Lim] [Terry_Lim] ++lofr-lm 1752 tcp Leap of Faith Research ++ License Manager ++lofr-lm 1752 udp Leap of Faith Research ++ License Manager ++predatar-comms 1753 tcp Predatar Comms Service [Silverstring_Ltd] [Ronnie_De_Giorgio] 2011-09-15 ++ 1753 udp Reserved ++oracle-em2 1754 tcp oracle-em2 [Bob_Purvy] [Bob_Purvy] ++oracle-em2 1754 udp oracle-em2 [Bob_Purvy] [Bob_Purvy] ++ms-streaming 1755 tcp ms-streaming [Bret_O_Rourke] [Bret_O_Rourke] ++ms-streaming 1755 udp ms-streaming [Bret_O_Rourke] [Bret_O_Rourke] ++capfast-lmd 1756 tcp capfast-lmd [Chuck_Neal] [Chuck_Neal] ++capfast-lmd 1756 udp capfast-lmd [Chuck_Neal] [Chuck_Neal] ++cnhrp 1757 tcp cnhrp [William_Stoye] [William_Stoye] ++cnhrp 1757 udp cnhrp [William_Stoye] [William_Stoye] ++tftp-mcast 1758 tcp tftp-mcast [Tom_Emberson] [Tom_Emberson] ++tftp-mcast 1758 udp tftp-mcast [Tom_Emberson] [Tom_Emberson] ++spss-lm 1759 tcp SPSS License Manager [Tex_Hull] [Tex_Hull] ++spss-lm 1759 udp SPSS License Manager [Tex_Hull] [Tex_Hull] ++www-ldap-gw 1760 tcp www-ldap-gw [Nick_Emery] [Nick_Emery] ++www-ldap-gw 1760 udp www-ldap-gw [Nick_Emery] [Nick_Emery] ++cft-0 1761 tcp cft-0 [Martine_Marchand] [Martine_Marchand] ++cft-0 1761 udp cft-0 [Martine_Marchand] [Martine_Marchand] ++cft-1 1762 tcp cft-1 [Martine_Marchand] [Martine_Marchand] ++cft-1 1762 udp cft-1 [Martine_Marchand] [Martine_Marchand] ++cft-2 1763 tcp cft-2 [Martine_Marchand] [Martine_Marchand] ++cft-2 1763 udp cft-2 [Martine_Marchand] [Martine_Marchand] ++cft-3 1764 tcp cft-3 [Martine_Marchand] [Martine_Marchand] ++cft-3 1764 udp cft-3 [Martine_Marchand] [Martine_Marchand] ++cft-4 1765 tcp cft-4 [Martine_Marchand] [Martine_Marchand] ++cft-4 1765 udp cft-4 [Martine_Marchand] [Martine_Marchand] ++cft-5 1766 tcp cft-5 [Martine_Marchand] [Martine_Marchand] ++cft-5 1766 udp cft-5 [Martine_Marchand] [Martine_Marchand] ++cft-6 1767 tcp cft-6 [Martine_Marchand] [Martine_Marchand] ++cft-6 1767 udp cft-6 [Martine_Marchand] [Martine_Marchand] ++cft-7 1768 tcp cft-7 [Martine_Marchand] [Martine_Marchand] ++cft-7 1768 udp cft-7 [Martine_Marchand] [Martine_Marchand] ++bmc-net-adm 1769 tcp bmc-net-adm [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-net-adm 1769 udp bmc-net-adm [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-net-svc 1770 tcp bmc-net-svc [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-net-svc 1770 udp bmc-net-svc [Portnoy_Boxman] [Portnoy_Boxman] ++vaultbase 1771 tcp vaultbase [Jose_A_Sesin] [Jose_A_Sesin] ++vaultbase 1771 udp vaultbase [Jose_A_Sesin] [Jose_A_Sesin] ++essweb-gw 1772 tcp EssWeb Gateway [Bob_Nattenberg] [Bob_Nattenberg] ++essweb-gw 1772 udp EssWeb Gateway [Bob_Nattenberg] [Bob_Nattenberg] ++kmscontrol 1773 tcp KMSControl [Roy_Chastain] [Roy_Chastain] ++kmscontrol 1773 udp KMSControl [Roy_Chastain] [Roy_Chastain] ++global-dtserv 1774 tcp global-dtserv [Nicholas_Davies] [Nicholas_Davies] ++global-dtserv 1774 udp global-dtserv [Nicholas_Davies] [Nicholas_Davies] ++ IANA assigned this ++- 1775 tcp well-formed service name as ++ a replacement for "#". ++ This entry is an alias to "-". This entry is now historic, ++# 1775 tcp not usable for use with many common service discovery ++ mechanisms. ++femis 1776 tcp Federal Emergency Management [Larry_Gerhardstein] [Larry_Gerhardstein] ++ Information System ++femis 1776 udp Federal Emergency Management [Larry_Gerhardstein] [Larry_Gerhardstein] ++ Information System ++powerguardian 1777 tcp powerguardian [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++powerguardian 1777 udp powerguardian [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++prodigy-intrnet 1778 tcp prodigy-internet [Bob_Dedrick] [Bob_Dedrick] ++prodigy-intrnet 1778 udp prodigy-internet [Bob_Dedrick] [Bob_Dedrick] ++pharmasoft 1779 tcp pharmasoft [Ola_Strandberg] [Ola_Strandberg] ++pharmasoft 1779 udp pharmasoft [Ola_Strandberg] [Ola_Strandberg] ++dpkeyserv 1780 tcp dpkeyserv [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++dpkeyserv 1780 udp dpkeyserv [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++answersoft-lm 1781 tcp answersoft-lm [James_A_Brewster] [James_A_Brewster] ++answersoft-lm 1781 udp answersoft-lm [James_A_Brewster] [James_A_Brewster] ++hp-hcip 1782 tcp hp-hcip [Allen_Baker] [Allen_Baker] ++hp-hcip 1782 udp hp-hcip [Allen_Baker] [Allen_Baker] ++ 1783 Decomissioned Port 04/14/00, [naonao] [naonao] ++ ms ++finle-lm 1784 tcp Finle License Manager [Dongling_Wang] [Dongling_Wang] ++finle-lm 1784 udp Finle License Manager [Dongling_Wang] [Dongling_Wang] ++windlm 1785 tcp Wind River Systems License [Will_Dere] [Will_Dere] ++ Manager ++windlm 1785 udp Wind River Systems License [Will_Dere] [Will_Dere] ++ Manager ++funk-logger 1786 tcp funk-logger ++funk-logger 1786 udp funk-logger ++funk-license 1787 tcp funk-license [Cimarron_Boozer][Eric_Wilde] [Cimarron_Boozer][Eric_Wilde] ++funk-license 1787 udp funk-license [Cimarron_Boozer][Eric_Wilde] [Cimarron_Boozer][Eric_Wilde] ++psmond 1788 tcp psmond [Will_Golson] [Will_Golson] ++psmond 1788 udp psmond [Will_Golson] [Will_Golson] ++hello 1789 tcp hello [D_J_Bernstein_2] [D_J_Bernstein_2] ++hello 1789 udp hello [D_J_Bernstein_2] [D_J_Bernstein_2] ++nmsp 1790 tcp Narrative Media Streaming [Paul_Santinelli_Jr] [Paul_Santinelli_Jr] ++ Protocol ++nmsp 1790 udp Narrative Media Streaming [Paul_Santinelli_Jr] [Paul_Santinelli_Jr] ++ Protocol ++ea1 1791 tcp EA1 [Kirk_MacLean] [Kirk_MacLean] ++ea1 1791 udp EA1 [Kirk_MacLean] [Kirk_MacLean] ++ibm-dt-2 1792 tcp ibm-dt-2 [Sam_Borman] [Sam_Borman] ++ibm-dt-2 1792 udp ibm-dt-2 [Sam_Borman] [Sam_Borman] ++rsc-robot 1793 tcp rsc-robot [Andrew_Jay_Schneider] [Andrew_Jay_Schneider] ++rsc-robot 1793 udp rsc-robot [Andrew_Jay_Schneider] [Andrew_Jay_Schneider] ++cera-bcm 1794 tcp cera-bcm [Leo_Moesgaard] [Leo_Moesgaard] ++cera-bcm 1794 udp cera-bcm [Leo_Moesgaard] [Leo_Moesgaard] ++dpi-proxy 1795 tcp dpi-proxy [Charles_Gordon] [Charles_Gordon] ++dpi-proxy 1795 udp dpi-proxy [Charles_Gordon] [Charles_Gordon] ++vocaltec-admin 1796 tcp Vocaltec Server [Scott_Petrack] [Scott_Petrack] ++ Administration ++vocaltec-admin 1796 udp Vocaltec Server [Scott_Petrack] [Scott_Petrack] ++ Administration ++uma 1797 tcp UMA [Martin_Kirk] [Martin_Kirk] ++uma 1797 udp UMA [Martin_Kirk] [Martin_Kirk] ++etp 1798 tcp Event Transfer Protocol [Mike_Wray] [Mike_Wray] ++etp 1798 udp Event Transfer Protocol [Mike_Wray] [Mike_Wray] ++netrisk 1799 tcp NETRISK [Kevin_Green] [Kevin_Green] ++netrisk 1799 udp NETRISK [Kevin_Green] [Kevin_Green] ++ansys-lm 1800 tcp ANSYS-License manager [Suzanne_Lorrin_2] [Suzanne_Lorrin_2] ++ansys-lm 1800 udp ANSYS-License manager [Suzanne_Lorrin_2] [Suzanne_Lorrin_2] ++msmq 1801 tcp Microsoft Message Que [Amnon_Horowitz] [Amnon_Horowitz] ++msmq 1801 udp Microsoft Message Que [Amnon_Horowitz] [Amnon_Horowitz] ++concomp1 1802 tcp ConComp1 [Ed_Vincent] [Ed_Vincent] ++concomp1 1802 udp ConComp1 [Ed_Vincent] [Ed_Vincent] ++hp-hcip-gwy 1803 tcp HP-HCIP-GWY [Allen_Baker] [Allen_Baker] ++hp-hcip-gwy 1803 udp HP-HCIP-GWY [Allen_Baker] [Allen_Baker] ++enl 1804 tcp ENL [Brian_Olson] [Brian_Olson] ++enl 1804 udp ENL [Brian_Olson] [Brian_Olson] ++enl-name 1805 tcp ENL-Name [Brian_Olson] [Brian_Olson] ++enl-name 1805 udp ENL-Name [Brian_Olson] [Brian_Olson] ++musiconline 1806 tcp Musiconline [Craig_Weeks] [Craig_Weeks] ++musiconline 1806 udp Musiconline [Craig_Weeks] [Craig_Weeks] ++fhsp 1807 tcp Fujitsu Hot Standby Protocol [Eiki_Iwata] [Eiki_Iwata] ++fhsp 1807 udp Fujitsu Hot Standby Protocol [Eiki_Iwata] [Eiki_Iwata] ++oracle-vp2 1808 tcp Oracle-VP2 [Craig_Fowler] [Craig_Fowler] ++oracle-vp2 1808 udp Oracle-VP2 [Craig_Fowler] [Craig_Fowler] ++oracle-vp1 1809 tcp Oracle-VP1 [Craig_Fowler] [Craig_Fowler] ++oracle-vp1 1809 udp Oracle-VP1 [Craig_Fowler] [Craig_Fowler] ++jerand-lm 1810 tcp Jerand License Manager [Robert_Monat] [Robert_Monat] ++jerand-lm 1810 udp Jerand License Manager [Robert_Monat] [Robert_Monat] ++scientia-sdb 1811 tcp Scientia-SDB [SYSTEMS_MANAGER] [SYSTEMS_MANAGER] ++scientia-sdb 1811 udp Scientia-SDB [SYSTEMS_MANAGER] [SYSTEMS_MANAGER] ++radius 1812 tcp RADIUS [RFC2865] ++radius 1812 udp RADIUS [RFC2865] ++radius-acct 1813 tcp RADIUS Accounting [RFC2866] ++radius-acct 1813 udp RADIUS Accounting [RFC2866] ++tdp-suite 1814 tcp TDP Suite [Rob_Lockhart] [Rob_Lockhart] ++tdp-suite 1814 udp TDP Suite [Rob_Lockhart] [Rob_Lockhart] ++mmpft 1815 tcp MMPFT [Ralf_Muckenhirn] [Ralf_Muckenhirn] ++mmpft 1815 udp MMPFT [Ralf_Muckenhirn] [Ralf_Muckenhirn] ++harp 1816 tcp HARP [Bjorn_Chambless] [Bjorn_Chambless] ++harp 1816 udp HARP [Bjorn_Chambless] [Bjorn_Chambless] ++rkb-oscs 1817 tcp RKB-OSCS [Robert_Kevin_Breton] [Robert_Kevin_Breton] ++rkb-oscs 1817 udp RKB-OSCS [Robert_Kevin_Breton] [Robert_Kevin_Breton] ++etftp 1818 tcp Enhanced Trivial File [William_Polites] [William_Polites] ++ Transfer Protocol ++etftp 1818 udp Enhanced Trivial File [William_Polites] [William_Polites] ++ Transfer Protocol ++plato-lm 1819 tcp Plato License Manager [Mark_Morris] [Mark_Morris] ++plato-lm 1819 udp Plato License Manager [Mark_Morris] [Mark_Morris] ++mcagent 1820 tcp mcagent [Ryoichi_Shinohara] [Ryoichi_Shinohara] ++mcagent 1820 udp mcagent [Ryoichi_Shinohara] [Ryoichi_Shinohara] ++donnyworld 1821 tcp donnyworld [Don_Oliver] [Don_Oliver] ++donnyworld 1821 udp donnyworld [Don_Oliver] [Don_Oliver] ++es-elmd 1822 tcp es-elmd [David_Duncan] [David_Duncan] ++es-elmd 1822 udp es-elmd [David_Duncan] [David_Duncan] ++unisys-lm 1823 tcp Unisys Natural Language [Raymond_A_Diedrichs] [Raymond_A_Diedrichs] ++ License Manager ++unisys-lm 1823 udp Unisys Natural Language [Raymond_A_Diedrichs] [Raymond_A_Diedrichs] ++ License Manager ++metrics-pas 1824 tcp metrics-pas [Tom_Haapanen] [Tom_Haapanen] ++metrics-pas 1824 udp metrics-pas [Tom_Haapanen] [Tom_Haapanen] ++direcpc-video 1825 tcp DirecPC Video [Chris_Kerrigan] [Chris_Kerrigan] ++direcpc-video 1825 udp DirecPC Video [Chris_Kerrigan] [Chris_Kerrigan] ++ardt 1826 tcp ARDT [Mike_Goddard] [Mike_Goddard] ++ardt 1826 udp ARDT [Mike_Goddard] [Mike_Goddard] ++asi 1827 tcp ASI [Bob_Tournoux] [Bob_Tournoux] ++asi 1827 udp ASI [Bob_Tournoux] [Bob_Tournoux] ++itm-mcell-u 1828 tcp itm-mcell-u [Portnoy_Boxman] [Portnoy_Boxman] ++itm-mcell-u 1828 udp itm-mcell-u [Portnoy_Boxman] [Portnoy_Boxman] ++optika-emedia 1829 tcp Optika eMedia [Daryle_DeBalski] [Daryle_DeBalski] ++optika-emedia 1829 udp Optika eMedia [Daryle_DeBalski] [Daryle_DeBalski] ++net8-cman 1830 tcp Oracle Net8 CMan Admin [Shuvayu_Kanjilal] [Shuvayu_Kanjilal] ++net8-cman 1830 udp Oracle Net8 CMan Admin [Shuvayu_Kanjilal] [Shuvayu_Kanjilal] ++myrtle 1831 tcp Myrtle [Ron_Achin] [Ron_Achin] ++myrtle 1831 udp Myrtle [Ron_Achin] [Ron_Achin] ++tht-treasure 1832 tcp ThoughtTreasure [Erik_Mueller] [Erik_Mueller] ++tht-treasure 1832 udp ThoughtTreasure [Erik_Mueller] [Erik_Mueller] ++udpradio 1833 tcp udpradio [Guus_Sliepen] [Guus_Sliepen] ++udpradio 1833 udp udpradio [Guus_Sliepen] [Guus_Sliepen] ++ardusuni 1834 tcp ARDUS Unicast ++ardusuni 1834 udp ARDUS Unicast ++ardusmul 1835 tcp ARDUS Multicast [Toshikatsu_Ito] [Toshikatsu_Ito] ++ardusmul 1835 udp ARDUS Multicast [Toshikatsu_Ito] [Toshikatsu_Ito] ++ste-smsc 1836 tcp ste-smsc [Tom_Snauwaert] [Tom_Snauwaert] ++ste-smsc 1836 udp ste-smsc [Tom_Snauwaert] [Tom_Snauwaert] ++csoft1 1837 tcp csoft1 [John_Coll] [John_Coll] ++csoft1 1837 udp csoft1 [John_Coll] [John_Coll] ++talnet 1838 tcp TALNET [Aaron_Lav] [Aaron_Lav] ++talnet 1838 udp TALNET [Aaron_Lav] [Aaron_Lav] ++netopia-vo1 1839 tcp netopia-vo1 ++netopia-vo1 1839 udp netopia-vo1 ++netopia-vo2 1840 tcp netopia-vo2 ++netopia-vo2 1840 udp netopia-vo2 ++netopia-vo3 1841 tcp netopia-vo3 ++netopia-vo3 1841 udp netopia-vo3 ++netopia-vo4 1842 tcp netopia-vo4 ++netopia-vo4 1842 udp netopia-vo4 ++netopia-vo5 1843 tcp netopia-vo5 [Marc_Epard] [Marc_Epard] ++netopia-vo5 1843 udp netopia-vo5 [Marc_Epard] [Marc_Epard] ++direcpc-dll 1844 tcp DirecPC-DLL [Chris_Kerrigan] [Chris_Kerrigan] ++direcpc-dll 1844 udp DirecPC-DLL [Chris_Kerrigan] [Chris_Kerrigan] ++altalink 1845 tcp altalink [Alberto_Raydan] [Alberto_Raydan] ++altalink 1845 udp altalink [Alberto_Raydan] [Alberto_Raydan] ++tunstall-pnc 1846 tcp Tunstall PNC [Robert_M_Moore] [Robert_M_Moore] ++tunstall-pnc 1846 udp Tunstall PNC [Robert_M_Moore] [Robert_M_Moore] ++slp-notify 1847 tcp SLP Notification [RFC3082] ++slp-notify 1847 udp SLP Notification [RFC3082] ++fjdocdist 1848 tcp fjdocdist [Yuichi_Ohiwa] [Yuichi_Ohiwa] ++fjdocdist 1848 udp fjdocdist [Yuichi_Ohiwa] [Yuichi_Ohiwa] ++alpha-sms 1849 tcp ALPHA-SMS [Benjamin_Grimm] [Benjamin_Grimm] ++alpha-sms 1849 udp ALPHA-SMS [Benjamin_Grimm] [Benjamin_Grimm] ++gsi 1850 tcp GSI [William_Mullaney] [William_Mullaney] ++gsi 1850 udp GSI [William_Mullaney] [William_Mullaney] ++ctcd 1851 tcp ctcd [John_Ryan] [John_Ryan] ++ctcd 1851 udp ctcd [John_Ryan] [John_Ryan] ++virtual-time 1852 tcp Virtual Time [Angie_S_Morner] [Angie_S_Morner] ++virtual-time 1852 udp Virtual Time [Angie_S_Morner] [Angie_S_Morner] ++vids-avtp 1853 tcp VIDS-AVTP [Sascha_Kuemmel] [Sascha_Kuemmel] ++vids-avtp 1853 udp VIDS-AVTP [Sascha_Kuemmel] [Sascha_Kuemmel] ++buddy-draw 1854 tcp Buddy Draw [Marvin_Shin] [Marvin_Shin] ++buddy-draw 1854 udp Buddy Draw [Marvin_Shin] [Marvin_Shin] ++fiorano-rtrsvc 1855 tcp Fiorano RtrSvc ++fiorano-rtrsvc 1855 udp Fiorano RtrSvc ++fiorano-msgsvc 1856 tcp Fiorano MsgSvc [Albert_Holt_2] [Albert_Holt_2] ++fiorano-msgsvc 1856 udp Fiorano MsgSvc [Albert_Holt_2] [Albert_Holt_2] ++datacaptor 1857 tcp DataCaptor [Steven_M_Forrester] [Steven_M_Forrester] ++datacaptor 1857 udp DataCaptor [Steven_M_Forrester] [Steven_M_Forrester] ++privateark 1858 tcp PrivateArk [Ronen_Zoran] [Ronen_Zoran] ++privateark 1858 udp PrivateArk [Ronen_Zoran] [Ronen_Zoran] ++gammafetchsvr 1859 tcp Gamma Fetcher Server [Cnaan_Aviv] [Cnaan_Aviv] ++gammafetchsvr 1859 udp Gamma Fetcher Server [Cnaan_Aviv] [Cnaan_Aviv] ++sunscalar-svc 1860 tcp SunSCALAR Services [Sanjay_Radia] [Sanjay_Radia] ++sunscalar-svc 1860 udp SunSCALAR Services [Sanjay_Radia] [Sanjay_Radia] ++lecroy-vicp 1861 tcp LeCroy VICP [Anthony_Cake] [Anthony_Cake] ++lecroy-vicp 1861 udp LeCroy VICP [Anthony_Cake] [Anthony_Cake] ++mysql-cm-agent 1862 tcp MySQL Cluster Manager Agent [Andrew_Morgan] [Andrew_Morgan] 2009-12-08 ++mysql-cm-agent 1862 udp MySQL Cluster Manager Agent [Andrew_Morgan] [Andrew_Morgan] 2009-12-08 ++msnp 1863 tcp MSNP [William_Lai] [William_Lai] ++msnp 1863 udp MSNP [William_Lai] [William_Lai] ++paradym-31port 1864 tcp Paradym 31 Port [David_Wooden] [David_Wooden] ++paradym-31port 1864 udp Paradym 31 Port [David_Wooden] [David_Wooden] ++entp 1865 tcp ENTP [Seiko_Epson] [Seiko_Epson] ++entp 1865 udp ENTP [Seiko_Epson] [Seiko_Epson] ++swrmi 1866 tcp swrmi [Jun_Yoshii] [Jun_Yoshii] ++swrmi 1866 udp swrmi [Jun_Yoshii] [Jun_Yoshii] ++udrive 1867 tcp UDRIVE [Robby_Walker] [Robby_Walker] ++udrive 1867 udp UDRIVE [Robby_Walker] [Robby_Walker] ++viziblebrowser 1868 tcp VizibleBrowser [Jimmy_Talbot] [Jimmy_Talbot] ++viziblebrowser 1868 udp VizibleBrowser [Jimmy_Talbot] [Jimmy_Talbot] ++transact 1869 tcp TransAct [TransAct_Futures_Dev] [TransAct_Futures_Dev] ++transact 1869 udp TransAct [TransAct_Futures_Dev] [TransAct_Futures_Dev] ++sunscalar-dns 1870 tcp SunSCALAR DNS Service [Sanjay_Radia] [Sanjay_Radia] ++sunscalar-dns 1870 udp SunSCALAR DNS Service [Sanjay_Radia] [Sanjay_Radia] ++canocentral0 1871 tcp Cano Central 0 ++canocentral0 1871 udp Cano Central 0 ++canocentral1 1872 tcp Cano Central 1 [Mark_McNamara] [Mark_McNamara] ++canocentral1 1872 udp Cano Central 1 [Mark_McNamara] [Mark_McNamara] ++fjmpjps 1873 tcp Fjmpjps ++fjmpjps 1873 udp Fjmpjps ++fjswapsnp 1874 tcp Fjswapsnp [Y_Ohiwa] [Y_Ohiwa] ++fjswapsnp 1874 udp Fjswapsnp [Y_Ohiwa] [Y_Ohiwa] ++westell-stats 1875 tcp westell stats [Thomas_McCabe] [Thomas_McCabe] ++westell-stats 1875 udp westell stats [Thomas_McCabe] [Thomas_McCabe] ++ewcappsrv 1876 tcp ewcappsrv [Howard_Yin] [Howard_Yin] ++ewcappsrv 1876 udp ewcappsrv [Howard_Yin] [Howard_Yin] ++hp-webqosdb 1877 tcp hp-webqosdb [Kim_Scott] [Kim_Scott] ++hp-webqosdb 1877 udp hp-webqosdb [Kim_Scott] [Kim_Scott] ++drmsmc 1878 tcp drmsmc [Katsuhiko_Abe] [Katsuhiko_Abe] ++drmsmc 1878 udp drmsmc [Katsuhiko_Abe] [Katsuhiko_Abe] ++nettgain-nms 1879 tcp NettGain NMS [Dr_Yair_Shapira] [Dr_Yair_Shapira] ++nettgain-nms 1879 udp NettGain NMS [Dr_Yair_Shapira] [Dr_Yair_Shapira] ++vsat-control 1880 tcp Gilat VSAT Control [Yariv_Kaplan] [Yariv_Kaplan] ++vsat-control 1880 udp Gilat VSAT Control [Yariv_Kaplan] [Yariv_Kaplan] ++ibm-mqseries2 1881 tcp IBM WebSphere MQ Everyplace [Jane_Porter] [Jane_Porter] ++ibm-mqseries2 1881 udp IBM WebSphere MQ Everyplace [Jane_Porter] [Jane_Porter] ++ecsqdmn 1882 tcp CA eTrust Common Services [Paul_Wissmiller] [Paul_Wissmiller] ++ecsqdmn 1882 udp CA eTrust Common Services [Paul_Wissmiller] [Paul_Wissmiller] ++ibm-mqisdp 1883 tcp IBM MQSeries SCADA [Andy_Stanford_Clark] [Andy_Stanford_Clark] ++ibm-mqisdp 1883 udp IBM MQSeries SCADA [Andy_Stanford_Clark] [Andy_Stanford_Clark] ++idmaps 1884 tcp Internet Distance Map Svc [Sugih_Jamim] [Sugih_Jamim] ++idmaps 1884 udp Internet Distance Map Svc [Sugih_Jamim] [Sugih_Jamim] ++vrtstrapserver 1885 tcp Veritas Trap Server [Russell_Thrasher] [Russell_Thrasher] ++vrtstrapserver 1885 udp Veritas Trap Server [Russell_Thrasher] [Russell_Thrasher] ++leoip 1886 tcp Leonardo over IP [Dietmar_Finkler] [Dietmar_Finkler] ++leoip 1886 udp Leonardo over IP [Dietmar_Finkler] [Dietmar_Finkler] ++filex-lport 1887 tcp FileX Listening Port [Megan_Woods] [Megan_Woods] ++filex-lport 1887 udp FileX Listening Port [Megan_Woods] [Megan_Woods] ++ncconfig 1888 tcp NC Config Port [Simon_Parker] [Simon_Parker] ++ncconfig 1888 udp NC Config Port [Simon_Parker] [Simon_Parker] ++unify-adapter 1889 tcp Unify Web Adapter Service [Duane_Gibson] [Duane_Gibson] ++unify-adapter 1889 udp Unify Web Adapter Service [Duane_Gibson] [Duane_Gibson] ++wilkenlistener 1890 tcp wilkenListener [Wilken_GmbH] [Wilken_GmbH] ++wilkenlistener 1890 udp wilkenListener [Wilken_GmbH] [Wilken_GmbH] ++childkey-notif 1891 tcp ChildKey Notification ++childkey-notif 1891 udp ChildKey Notification ++childkey-ctrl 1892 tcp ChildKey Control [Ivan_Berardinelli] [Ivan_Berardinelli] ++childkey-ctrl 1892 udp ChildKey Control [Ivan_Berardinelli] [Ivan_Berardinelli] ++elad 1893 tcp ELAD Protocol [Franco_Milan] [Franco_Milan] ++elad 1893 udp ELAD Protocol [Franco_Milan] [Franco_Milan] ++o2server-port 1894 tcp O2Server Port [Tim_Howard] [Tim_Howard] ++o2server-port 1894 udp O2Server Port [Tim_Howard] [Tim_Howard] ++ 1895 tcp unassigned Microsoft (unoffically) using 1895 ++ 1895 udp unassigned Microsoft (unoffically) using 1895 ++b-novative-ls 1896 tcp b-novative license server [Matthias_Riese] [Matthias_Riese] ++b-novative-ls 1896 udp b-novative license server [Matthias_Riese] [Matthias_Riese] ++metaagent 1897 tcp MetaAgent [Marie_France_Dubreui] [Marie_France_Dubreui] ++metaagent 1897 udp MetaAgent [Marie_France_Dubreui] [Marie_France_Dubreui] ++cymtec-port 1898 tcp Cymtec secure management [Michael_Mester] [Michael_Mester] ++cymtec-port 1898 udp Cymtec secure management [Michael_Mester] [Michael_Mester] ++mc2studios 1899 tcp MC2Studios [Michael_Coon] [Michael_Coon] ++mc2studios 1899 udp MC2Studios [Michael_Coon] [Michael_Coon] ++ssdp 1900 tcp SSDP [UPnP_Forum] [UPnP_Forum] ++ssdp 1900 udp SSDP [UPnP_Forum] [UPnP_Forum] ++fjicl-tep-a 1901 tcp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program A ++fjicl-tep-a 1901 udp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program A ++fjicl-tep-b 1902 tcp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program B ++fjicl-tep-b 1902 udp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program B ++linkname 1903 tcp Local Link Name Resolution [Dan_Harrington] [Dan_Harrington] ++linkname 1903 udp Local Link Name Resolution [Dan_Harrington] [Dan_Harrington] ++fjicl-tep-c 1904 tcp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program C ++fjicl-tep-c 1904 udp Fujitsu ICL Terminal [Bob_Lyon] [Bob_Lyon] ++ Emulator Program C ++sugp 1905 tcp Secure UP.Link Gateway [Peter_King] [Peter_King] ++ Protocol ++sugp 1905 udp Secure UP.Link Gateway [Peter_King] [Peter_King] ++ Protocol ++tpmd 1906 tcp TPortMapperReq [Sheila_Devins] [Sheila_Devins] ++tpmd 1906 udp TPortMapperReq [Sheila_Devins] [Sheila_Devins] ++intrastar 1907 tcp IntraSTAR [Peter_Schoenberger] [Peter_Schoenberger] ++intrastar 1907 udp IntraSTAR [Peter_Schoenberger] [Peter_Schoenberger] ++dawn 1908 tcp Dawn [Michael_Crawford_2] [Michael_Crawford_2] ++dawn 1908 udp Dawn [Michael_Crawford_2] [Michael_Crawford_2] ++global-wlink 1909 tcp Global World Link [Nicholas_Davies] [Nicholas_Davies] ++global-wlink 1909 udp Global World Link [Nicholas_Davies] [Nicholas_Davies] ++ultrabac 1910 tcp UltraBac Software [Paul_Bunn] [Paul_Bunn] ++ communications port ++ultrabac 1910 udp UltraBac Software [Paul_Bunn] [Paul_Bunn] ++ communications port ++ Starlight Networks ++mtp 1911 tcp Multimedia Transport [Bruce_Lieberman] [Bruce_Lieberman] ++ Protocol ++ Starlight Networks ++mtp 1911 udp Multimedia Transport [Bruce_Lieberman] [Bruce_Lieberman] ++ Protocol ++rhp-iibp 1912 tcp rhp-iibp [George_Nachman][Tom_Lake] [George_Nachman][Tom_Lake] ++rhp-iibp 1912 udp rhp-iibp [George_Nachman][Tom_Lake] [George_Nachman][Tom_Lake] ++armadp 1913 tcp armadp [Kevin_Welton] [Kevin_Welton] ++armadp 1913 udp armadp [Kevin_Welton] [Kevin_Welton] ++elm-momentum 1914 tcp Elm-Momentum [Willie_Wu] [Willie_Wu] ++elm-momentum 1914 udp Elm-Momentum [Willie_Wu] [Willie_Wu] ++facelink 1915 tcp FACELINK [J_H_Hermans] [J_H_Hermans] ++facelink 1915 udp FACELINK [J_H_Hermans] [J_H_Hermans] ++persona 1916 tcp Persoft Persona [Tom_Spidell] [Tom_Spidell] ++persona 1916 udp Persoft Persona [Tom_Spidell] [Tom_Spidell] ++noagent 1917 tcp nOAgent [Martin_Bestmann] [Martin_Bestmann] ++noagent 1917 udp nOAgent [Martin_Bestmann] [Martin_Bestmann] ++can-nds 1918 tcp IBM Tivole Directory Service ++ - NDS ++can-nds 1918 udp IBM Tivole Directory Service ++ - NDS ++can-dch 1919 tcp IBM Tivoli Directory Service ++ - DCH ++can-dch 1919 udp IBM Tivoli Directory Service ++ - DCH ++can-ferret 1920 tcp IBM Tivoli Directory Service [Nic_Catrambone] [Nic_Catrambone] ++ - FERRET ++can-ferret 1920 udp IBM Tivoli Directory Service [Nic_Catrambone] [Nic_Catrambone] ++ - FERRET ++noadmin 1921 tcp NoAdmin [Martin_Bestmann] [Martin_Bestmann] ++noadmin 1921 udp NoAdmin [Martin_Bestmann] [Martin_Bestmann] ++tapestry 1922 tcp Tapestry [Ken_Oliver] [Ken_Oliver] ++tapestry 1922 udp Tapestry [Ken_Oliver] [Ken_Oliver] ++spice 1923 tcp SPICE [Nicholas_Chua] [Nicholas_Chua] ++spice 1923 udp SPICE [Nicholas_Chua] [Nicholas_Chua] ++xiip 1924 tcp XIIP [Alain_Robert_2] [Alain_Robert_2] ++xiip 1924 udp XIIP [Alain_Robert_2] [Alain_Robert_2] ++discovery-port 1925 tcp Surrogate Discovery Port [Keith_Thompson] [Keith_Thompson] ++discovery-port 1925 udp Surrogate Discovery Port [Keith_Thompson] [Keith_Thompson] ++egs 1926 tcp Evolution Game Server [Simon_Butcher] [Simon_Butcher] ++egs 1926 udp Evolution Game Server [Simon_Butcher] [Simon_Butcher] ++videte-cipc 1927 tcp Videte CIPC Port [Videte_IT] [Videte_IT] ++videte-cipc 1927 udp Videte CIPC Port [Videte_IT] [Videte_IT] ++emsd-port 1928 tcp Expnd Maui Srvr Dscovr [Edo_Yahav] [Edo_Yahav] ++emsd-port 1928 udp Expnd Maui Srvr Dscovr [Edo_Yahav] [Edo_Yahav] ++bandwiz-system 1929 tcp Bandwiz System - Server [Joseph_Weihs] [Joseph_Weihs] ++bandwiz-system 1929 udp Bandwiz System - Server [Joseph_Weihs] [Joseph_Weihs] ++driveappserver 1930 tcp Drive AppServer [Andrew_Johnson] [Andrew_Johnson] ++driveappserver 1930 udp Drive AppServer [Andrew_Johnson] [Andrew_Johnson] ++amdsched 1931 tcp AMD SCHED [Michael_Walsh] [Michael_Walsh] ++amdsched 1931 udp AMD SCHED [Michael_Walsh] [Michael_Walsh] ++ctt-broker 1932 tcp CTT Broker [Jens_Edlund] [Jens_Edlund] ++ctt-broker 1932 udp CTT Broker [Jens_Edlund] [Jens_Edlund] ++xmapi 1933 tcp IBM LM MT Agent ++xmapi 1933 udp IBM LM MT Agent ++xaapi 1934 tcp IBM LM Appl Agent [Helga_Wolin] [Helga_Wolin] ++xaapi 1934 udp IBM LM Appl Agent [Helga_Wolin] [Helga_Wolin] ++macromedia-fcs 1935 tcp Macromedia Flash [Pritham_Shetty] [Pritham_Shetty] ++ Communications Server MX ++macromedia-fcs 1935 udp Macromedia Flash [Pritham_Shetty] [Pritham_Shetty] ++ Communications server MX ++jetcmeserver 1936 tcp JetCmeServer Server Port ++jetcmeserver 1936 udp JetCmeServer Server Port ++jwserver 1937 tcp JetVWay Server Port ++jwserver 1937 udp JetVWay Server Port ++jwclient 1938 tcp JetVWay Client Port ++jwclient 1938 udp JetVWay Client Port ++jvserver 1939 tcp JetVision Server Port ++jvserver 1939 udp JetVision Server Port ++jvclient 1940 tcp JetVision Client Port [Stephen_Tsun] [Stephen_Tsun] ++jvclient 1940 udp JetVision Client Port [Stephen_Tsun] [Stephen_Tsun] ++dic-aida 1941 tcp DIC-Aida [Frans_S_C_Witte] [Frans_S_C_Witte] ++dic-aida 1941 udp DIC-Aida [Frans_S_C_Witte] [Frans_S_C_Witte] ++res 1942 tcp Real Enterprise Service [Bob_Janssen] [Bob_Janssen] ++res 1942 udp Real Enterprise Service [Bob_Janssen] [Bob_Janssen] ++beeyond-media 1943 tcp Beeyond Media [Bob_Deblier] [Bob_Deblier] ++beeyond-media 1943 udp Beeyond Media [Bob_Deblier] [Bob_Deblier] ++close-combat 1944 tcp close-combat [David_Hua] [David_Hua] ++close-combat 1944 udp close-combat [David_Hua] [David_Hua] ++dialogic-elmd 1945 tcp dialogic-elmd [Roger_Kay] [Roger_Kay] ++dialogic-elmd 1945 udp dialogic-elmd [Roger_Kay] [Roger_Kay] ++tekpls 1946 tcp tekpls [Brian_Abramson_2] [Brian_Abramson_2] ++tekpls 1946 udp tekpls [Brian_Abramson_2] [Brian_Abramson_2] ++sentinelsrm 1947 tcp SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23 ++sentinelsrm 1947 udp SentinelSRM [Michael_Zunke_2] [Michael_Zunke_2] 2010-07-23 ++eye2eye 1948 tcp eye2eye [Trevor_Bell] [Trevor_Bell] ++eye2eye 1948 udp eye2eye [Trevor_Bell] [Trevor_Bell] ++ismaeasdaqlive 1949 tcp ISMA Easdaq Live [Stephen_Dunne] [Stephen_Dunne] ++ismaeasdaqlive 1949 udp ISMA Easdaq Live [Stephen_Dunne] [Stephen_Dunne] ++ismaeasdaqtest 1950 tcp ISMA Easdaq Test [Stephen_Dunne] [Stephen_Dunne] ++ismaeasdaqtest 1950 udp ISMA Easdaq Test [Stephen_Dunne] [Stephen_Dunne] ++bcs-lmserver 1951 tcp bcs-lmserver [Andy_Warner] [Andy_Warner] ++bcs-lmserver 1951 udp bcs-lmserver [Andy_Warner] [Andy_Warner] ++mpnjsc 1952 tcp mpnjsc [Takenori_Miyahara] [Takenori_Miyahara] ++mpnjsc 1952 udp mpnjsc [Takenori_Miyahara] [Takenori_Miyahara] ++rapidbase 1953 tcp Rapid Base [Antoni_Wolski] [Antoni_Wolski] ++rapidbase 1953 udp Rapid Base [Antoni_Wolski] [Antoni_Wolski] ++abr-api 1954 tcp ABR-API (diskbridge) ++abr-api 1954 udp ABR-API (diskbridge) ++abr-secure 1955 tcp ABR-Secure Data (diskbridge) [Graham_Wooden] [Graham_Wooden] ++abr-secure 1955 udp ABR-Secure Data (diskbridge) [Graham_Wooden] [Graham_Wooden] ++vrtl-vmf-ds 1956 tcp Vertel VMF DS [Alan_Akahoshi] [Alan_Akahoshi] ++vrtl-vmf-ds 1956 udp Vertel VMF DS [Alan_Akahoshi] [Alan_Akahoshi] ++unix-status 1957 tcp unix-status [Thomas_Erskine] [Thomas_Erskine] ++unix-status 1957 udp unix-status [Thomas_Erskine] [Thomas_Erskine] ++dxadmind 1958 tcp CA Administration Daemon [John_Birrell] [John_Birrell] ++dxadmind 1958 udp CA Administration Daemon [John_Birrell] [John_Birrell] ++simp-all 1959 tcp SIMP Channel [Tim_Hunnewell] [Tim_Hunnewell] ++simp-all 1959 udp SIMP Channel [Tim_Hunnewell] [Tim_Hunnewell] ++nasmanager 1960 tcp Merit DAC NASmanager [Richard_S_Conto] [Richard_S_Conto] ++nasmanager 1960 udp Merit DAC NASmanager [Richard_S_Conto] [Richard_S_Conto] ++bts-appserver 1961 tcp BTS APPSERVER [Carl_Obsorn] [Carl_Obsorn] ++bts-appserver 1961 udp BTS APPSERVER [Carl_Obsorn] [Carl_Obsorn] ++biap-mp 1962 tcp BIAP-MP [Louis_Slothouber] [Louis_Slothouber] ++biap-mp 1962 udp BIAP-MP [Louis_Slothouber] [Louis_Slothouber] ++webmachine 1963 tcp WebMachine [Tim_Jowers] [Tim_Jowers] ++webmachine 1963 udp WebMachine [Tim_Jowers] [Tim_Jowers] ++solid-e-engine 1964 tcp SOLID E ENGINE [Ari_Valtanen] [Ari_Valtanen] ++solid-e-engine 1964 udp SOLID E ENGINE [Ari_Valtanen] [Ari_Valtanen] ++tivoli-npm 1965 tcp Tivoli NPM [Ivana_Cuozzo] [Ivana_Cuozzo] ++tivoli-npm 1965 udp Tivoli NPM [Ivana_Cuozzo] [Ivana_Cuozzo] ++slush 1966 tcp Slush [Damien_Miller] [Damien_Miller] ++slush 1966 udp Slush [Damien_Miller] [Damien_Miller] ++sns-quote 1967 tcp SNS Quote [Robert_Ellman] [Robert_Ellman] ++sns-quote 1967 udp SNS Quote [Robert_Ellman] [Robert_Ellman] ++lipsinc 1968 tcp LIPSinc ++lipsinc 1968 udp LIPSinc ++lipsinc1 1969 tcp LIPSinc 1 [Robert_Armington] [Robert_Armington] ++lipsinc1 1969 udp LIPSinc 1 [Robert_Armington] [Robert_Armington] ++netop-rc 1970 tcp NetOp Remote Control ++netop-rc 1970 udp NetOp Remote Control ++netop-school 1971 tcp NetOp School [NetOp_Technical_Supp] [NetOp_Technical_Supp] ++netop-school 1971 udp NetOp School [NetOp_Technical_Supp] [NetOp_Technical_Supp] ++intersys-cache 1972 tcp Cache [Mark_Hanson] [Mark_Hanson] ++intersys-cache 1972 udp Cache [Mark_Hanson] [Mark_Hanson] ++dlsrap 1973 tcp Data Link Switching Remote [Steve_T_Chiang] [Steve_T_Chiang] ++ Access Protocol ++dlsrap 1973 udp Data Link Switching Remote [Steve_T_Chiang] [Steve_T_Chiang] ++ Access Protocol ++drp 1974 tcp DRP [Richard_Alan_Johnson] [Richard_Alan_Johnson] ++drp 1974 udp DRP [Richard_Alan_Johnson] [Richard_Alan_Johnson] ++tcoflashagent 1975 tcp TCO Flash Agent ++tcoflashagent 1975 udp TCO Flash Agent ++tcoregagent 1976 tcp TCO Reg Agent ++tcoregagent 1976 udp TCO Reg Agent ++tcoaddressbook 1977 tcp TCO Address Book [Allan_Panitch] [Allan_Panitch] ++tcoaddressbook 1977 udp TCO Address Book [Allan_Panitch] [Allan_Panitch] ++unisql 1978 tcp UniSQL ++unisql 1978 udp UniSQL ++unisql-java 1979 tcp UniSQL Java [Keith_Yarbrough] [Keith_Yarbrough] ++unisql-java 1979 udp UniSQL Java [Keith_Yarbrough] [Keith_Yarbrough] ++pearldoc-xact 1980 tcp PearlDoc XACT [Chris_Vertonghen] [Chris_Vertonghen] ++pearldoc-xact 1980 udp PearlDoc XACT [Chris_Vertonghen] [Chris_Vertonghen] ++p2pq 1981 tcp p2pQ [Warren_Alexander] [Warren_Alexander] ++p2pq 1981 udp p2pQ [Warren_Alexander] [Warren_Alexander] ++estamp 1982 tcp Evidentiary Timestamp [Todd_Glassey] [Todd_Glassey] ++estamp 1982 udp Evidentiary Timestamp [Todd_Glassey] [Todd_Glassey] ++lhtp 1983 tcp Loophole Test Protocol [Kade_Hansson] [Kade_Hansson] ++lhtp 1983 udp Loophole Test Protocol [Kade_Hansson] [Kade_Hansson] ++bb 1984 tcp BB [Sean_MacGuire] [Sean_MacGuire] ++bb 1984 udp BB [Sean_MacGuire] [Sean_MacGuire] ++hsrp 1985 tcp Hot Standby Router Protocol [RFC2281] ++hsrp 1985 udp Hot Standby Router Protocol [RFC2281] ++licensedaemon 1986 tcp cisco license management ++licensedaemon 1986 udp cisco license management ++tr-rsrb-p1 1987 tcp cisco RSRB Priority 1 port ++tr-rsrb-p1 1987 udp cisco RSRB Priority 1 port ++tr-rsrb-p2 1988 tcp cisco RSRB Priority 2 port ++tr-rsrb-p2 1988 udp cisco RSRB Priority 2 port ++tr-rsrb-p3 1989 tcp cisco RSRB Priority 3 port ++tr-rsrb-p3 1989 udp cisco RSRB Priority 3 port ++mshnet 1989 tcp MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use ++mshnet 1989 udp MHSnet system [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use ++stun-p1 1990 tcp cisco STUN Priority 1 port ++stun-p1 1990 udp cisco STUN Priority 1 port ++stun-p2 1991 tcp cisco STUN Priority 2 port ++stun-p2 1991 udp cisco STUN Priority 2 port ++stun-p3 1992 tcp cisco STUN Priority 3 port ++stun-p3 1992 udp cisco STUN Priority 3 port ++ipsendmsg 1992 tcp IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use ++ipsendmsg 1992 udp IPsendmsg [Bob_Kummerfeld] [Bob_Kummerfeld] This entry records an unassigned but widespread use ++snmp-tcp-port 1993 tcp cisco SNMP TCP port ++snmp-tcp-port 1993 udp cisco SNMP TCP port ++stun-port 1994 tcp cisco serial tunnel port ++stun-port 1994 udp cisco serial tunnel port ++perf-port 1995 tcp cisco perf port ++perf-port 1995 udp cisco perf port ++tr-rsrb-port 1996 tcp cisco Remote SRB port ++tr-rsrb-port 1996 udp cisco Remote SRB port ++gdp-port 1997 tcp cisco Gateway Discovery ++ Protocol ++gdp-port 1997 udp cisco Gateway Discovery ++ Protocol ++x25-svc-port 1998 tcp cisco X.25 service (XOT) ++x25-svc-port 1998 udp cisco X.25 service (XOT) ++tcp-id-port 1999 tcp cisco identification port ++tcp-id-port 1999 udp cisco identification port ++cisco-sccp 2000 tcp Cisco SCCP [Dan_Wing] [Dan_Wing] 2003-11 ++cisco-sccp 2000 udp Cisco SCCp [Dan_Wing] [Dan_Wing] 2003-11 ++dc 2001 tcp ++wizard 2001 udp curry ++globe 2002 tcp ++globe 2002 udp ++brutus 2003 tcp Brutus Server [Johannes_Skov_Frands] [Johannes_Skov_Frands] 2008-02-28 ++brutus 2003 udp Brutus Server [Johannes_Skov_Frands] [Johannes_Skov_Frands] 2008-02-28 ++mailbox 2004 tcp ++emce 2004 udp CCWS mm conf ++berknet 2005 tcp ++oracle 2005 udp ++invokator 2006 tcp ++raid-cd 2006 udp raid ++dectalk 2007 tcp ++raid-am 2007 udp ++conf 2008 tcp ++terminaldb 2008 udp ++news 2009 tcp ++whosockami 2009 udp ++search 2010 tcp ++ IANA assigned this ++pipe-server 2010 udp well-formed service name as ++ a replacement for ++ "pipe_server". ++ This entry is an alias to "pipe-server". This entry is now ++pipe_server 2010 udp historic, not usable for use with many common service ++ discovery mechanisms. ++raid-cc 2011 tcp raid ++servserv 2011 udp ++ttyinfo 2012 tcp ++raid-ac 2012 udp ++raid-am 2013 tcp ++raid-cd 2013 udp ++troff 2014 tcp ++raid-sf 2014 udp ++cypress 2015 tcp ++raid-cs 2015 udp ++bootserver 2016 tcp ++bootserver 2016 udp ++cypress-stat 2017 tcp ++bootclient 2017 udp ++terminaldb 2018 tcp ++rellpack 2018 udp ++whosockami 2019 tcp ++about 2019 udp ++xinupageserver 2020 tcp ++xinupageserver 2020 udp ++servexec 2021 tcp ++xinuexpansion1 2021 udp ++down 2022 tcp ++xinuexpansion2 2022 udp ++xinuexpansion3 2023 tcp ++xinuexpansion3 2023 udp ++xinuexpansion4 2024 tcp ++xinuexpansion4 2024 udp ++ellpack 2025 tcp ++xribs 2025 udp ++scrabble 2026 tcp ++scrabble 2026 udp ++shadowserver 2027 tcp ++shadowserver 2027 udp ++submitserver 2028 tcp ++submitserver 2028 udp ++hsrpv6 2029 tcp Hot Standby Router Protocol [Ian_Wilson] [Ian_Wilson] 2004-11 ++ IPv6 ++hsrpv6 2029 udp Hot Standby Router Protocol [Ian_Wilson] [Ian_Wilson] 2004-11 ++ IPv6 ++device2 2030 tcp ++device2 2030 udp ++mobrien-chat 2031 tcp mobrien-chat [Mike_O_Brien] [Mike_O_Brien] 2004-11 ++mobrien-chat 2031 udp mobrien-chat [Mike_O_Brien] [Mike_O_Brien] 2004-11 ++blackboard 2032 tcp ++blackboard 2032 udp ++glogger 2033 tcp ++glogger 2033 udp ++scoremgr 2034 tcp ++scoremgr 2034 udp ++imsldoc 2035 tcp ++imsldoc 2035 udp ++e-dpnet 2036 tcp Ethernet WS DP network [Peter_Kaever] [Peter_Kaever] 2005-08 ++e-dpnet 2036 udp Ethernet WS DP network [Peter_Kaever] [Peter_Kaever] 2005-08 ++applus 2037 tcp APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server ++applus 2037 udp APplus Application Server [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-06 Formerly was P2plus Application Server ++objectmanager 2038 tcp ++objectmanager 2038 udp ++prizma 2039 tcp Prizma Monitoring Service [Dotan_Ofek] [Dotan_Ofek] 2005-12 ++prizma 2039 udp Prizma Monitoring Service [Dotan_Ofek] [Dotan_Ofek] 2005-12 ++lam 2040 tcp ++lam 2040 udp ++interbase 2041 tcp ++interbase 2041 udp ++isis 2042 tcp isis ++isis 2042 udp isis ++isis-bcast 2043 tcp isis-bcast [Ken_Chapman] [Ken_Chapman] ++isis-bcast 2043 udp isis-bcast [Ken_Chapman] [Ken_Chapman] ++rimsl 2044 tcp ++rimsl 2044 udp ++cdfunc 2045 tcp ++cdfunc 2045 udp ++sdfunc 2046 tcp ++sdfunc 2046 udp ++dls 2047 tcp ++dls 2047 udp ++dls-monitor 2048 tcp ++dls-monitor 2048 udp ++shilp 2049 tcp <== NOTE Conflict on 2049 ! ++shilp 2049 udp <== NOTE Conflict on 2049 ! ++nfs 2049 tcp Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> ++ Microsystems ++nfs 2049 udp Network File System - Sun [Brent_Callaghan] [Brent_Callaghan] Defined TXT keys: path=<path to mount point> ++ Microsystems ++nfs 2049 sctp Network File System [RFC5665] Defined TXT keys: path=<path to mount point> ++av-emb-config 2050 tcp Avaya EMB Config Port [John_Yeager] [John_Yeager] ++av-emb-config 2050 udp Avaya EMB Config Port [John_Yeager] [John_Yeager] ++epnsdp 2051 tcp EPNSDP [Hiroyasu_Ogata] [Hiroyasu_Ogata] ++epnsdp 2051 udp EPNSDP [Hiroyasu_Ogata] [Hiroyasu_Ogata] ++clearvisn 2052 tcp clearVisn Services Port [Dave_Lyons] [Dave_Lyons] ++clearvisn 2052 udp clearVisn Services Port [Dave_Lyons] [Dave_Lyons] ++lot105-ds-upd 2053 tcp Lot105 DSuper Updates [Piers_Scannell] [Piers_Scannell] ++lot105-ds-upd 2053 udp Lot105 DSuper Updates [Piers_Scannell] [Piers_Scannell] ++weblogin 2054 tcp Weblogin Port [Diego_Saravia] [Diego_Saravia] ++weblogin 2054 udp Weblogin Port [Diego_Saravia] [Diego_Saravia] ++iop 2055 tcp Iliad-Odyssey Protocol [Bruce_Lueckenhoff] [Bruce_Lueckenhoff] ++iop 2055 udp Iliad-Odyssey Protocol [Bruce_Lueckenhoff] [Bruce_Lueckenhoff] ++omnisky 2056 tcp OmniSky Port [Oren_Hurvitz] [Oren_Hurvitz] ++omnisky 2056 udp OmniSky Port [Oren_Hurvitz] [Oren_Hurvitz] ++rich-cp 2057 tcp Rich Content Protocol [Ronen_Vainish] [Ronen_Vainish] ++rich-cp 2057 udp Rich Content Protocol [Ronen_Vainish] [Ronen_Vainish] ++newwavesearch 2058 tcp NewWaveSearchables RMI [Thomas_Kerkau] [Thomas_Kerkau] ++newwavesearch 2058 udp NewWaveSearchables RMI [Thomas_Kerkau] [Thomas_Kerkau] ++bmc-messaging 2059 tcp BMC Messaging Service [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-messaging 2059 udp BMC Messaging Service [Portnoy_Boxman] [Portnoy_Boxman] ++teleniumdaemon 2060 tcp Telenium Daemon IF [Nick_Woronuk] [Nick_Woronuk] ++teleniumdaemon 2060 udp Telenium Daemon IF [Nick_Woronuk] [Nick_Woronuk] ++netmount 2061 tcp NetMount [Alex_Oberlander] [Alex_Oberlander] ++netmount 2061 udp NetMount [Alex_Oberlander] [Alex_Oberlander] ++icg-swp 2062 tcp ICG SWP Port ++icg-swp 2062 udp ICG SWP Port ++icg-bridge 2063 tcp ICG Bridge Port ++icg-bridge 2063 udp ICG Bridge Port ++icg-iprelay 2064 tcp ICG IP Relay Port [Steve_Quintana] [Steve_Quintana] ++icg-iprelay 2064 udp ICG IP Relay Port [Steve_Quintana] [Steve_Quintana] ++dlsrpn 2065 tcp Data Link Switch Read Port [Amir_Peless] [Amir_Peless] ++ Number ++dlsrpn 2065 udp Data Link Switch Read Port [Amir_Peless] [Amir_Peless] ++ Number ++aura 2066 tcp AVM USB Remote Architecture [Diego_Friedel] [Diego_Friedel] 2006-03 ++aura 2066 udp AVM USB Remote Architecture [Diego_Friedel] [Diego_Friedel] 2006-03 ++dlswpn 2067 tcp Data Link Switch Write Port [Amir_Peless] [Amir_Peless] ++ Number ++dlswpn 2067 udp Data Link Switch Write Port [Amir_Peless] [Amir_Peless] ++ Number ++avauthsrvprtcl 2068 tcp Avocent AuthSrv Protocol [Steven_W_Clark_2] [Steven_W_Clark_2] ++avauthsrvprtcl 2068 udp Avocent AuthSrv Protocol [Steven_W_Clark_2] [Steven_W_Clark_2] ++event-port 2069 tcp HTTP Event Port [Larry_Emlich] [Larry_Emlich] ++event-port 2069 udp HTTP Event Port [Larry_Emlich] [Larry_Emlich] ++ah-esp-encap 2070 tcp AH and ESP Encapsulated in [Amy_Weaver] [Amy_Weaver] ++ UDP packet ++ah-esp-encap 2070 udp AH and ESP Encapsulated in [Amy_Weaver] [Amy_Weaver] ++ UDP packet ++acp-port 2071 tcp Axon Control Protocol [Christiaan_Simons] [Christiaan_Simons] ++acp-port 2071 udp Axon Control Protocol [Christiaan_Simons] [Christiaan_Simons] ++msync 2072 tcp GlobeCast mSync [Piers_Scannell_2] [Piers_Scannell_2] ++msync 2072 udp GlobeCast mSync [Piers_Scannell_2] [Piers_Scannell_2] ++gxs-data-port 2073 tcp DataReel Database Socket [Douglas_M_Gaer] [Douglas_M_Gaer] ++gxs-data-port 2073 udp DataReel Database Socket [Douglas_M_Gaer] [Douglas_M_Gaer] ++vrtl-vmf-sa 2074 tcp Vertel VMF SA [Alan_Akahoshi] [Alan_Akahoshi] ++vrtl-vmf-sa 2074 udp Vertel VMF SA [Alan_Akahoshi] [Alan_Akahoshi] ++newlixengine 2075 tcp Newlix ServerWare Engine ++newlixengine 2075 udp Newlix ServerWare Engine ++newlixconfig 2076 tcp Newlix JSPConfig [Jean_Serge_Gagnon] [Jean_Serge_Gagnon] ++newlixconfig 2076 udp Newlix JSPConfig [Jean_Serge_Gagnon] [Jean_Serge_Gagnon] ++tsrmagt 2077 tcp Old Tivoli Storage Manager ++tsrmagt 2077 udp Old Tivoli Storage Manager ++tpcsrvr 2078 tcp IBM Total Productivity [Justin_R_Bendich] [Justin_R_Bendich] ++ Center Server ++tpcsrvr 2078 udp IBM Total Productivity [Justin_R_Bendich] [Justin_R_Bendich] ++ Center Server ++idware-router 2079 tcp IDWARE Router Port [Zdenek_Kolba] [Zdenek_Kolba] ++idware-router 2079 udp IDWARE Router Port [Zdenek_Kolba] [Zdenek_Kolba] ++autodesk-nlm 2080 tcp Autodesk NLM (FLEXlm) [Greg_Suppes] [Greg_Suppes] ++autodesk-nlm 2080 udp Autodesk NLM (FLEXlm) [Greg_Suppes] [Greg_Suppes] ++kme-trap-port 2081 tcp KME PRINTER TRAP PORT [Masakatsu_Matsuo] [Masakatsu_Matsuo] ++kme-trap-port 2081 udp KME PRINTER TRAP PORT [Masakatsu_Matsuo] [Masakatsu_Matsuo] ++infowave 2082 tcp Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku] ++infowave 2082 udp Infowave Mobility Server [Kaz_Kylheku] [Kaz_Kylheku] ++ The TCP port 2083 was already previously assigned by IANA for ++ "RadSec", an early implementation of RADIUS/TLS, prior to ++radsec 2083 tcp Secure Radius Service [IESG] [IETF_Chair] 2005-05 [RFC6614] issuance of this RFC. This early implementation can be ++ configured to be compatible to RADIUS/TLS as specified by the ++ IETF. See [RFC6614], Appendix A for details. ++radsec 2083 udp Secure Radius Service [Mike_McCauley] [Mike_McCauley] 2005-05 ++sunclustergeo 2084 tcp SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11 ++sunclustergeo 2084 udp SunCluster Geographic [Steve_McKinty] [Steve_McKinty] 2005-11 ++ada-cip 2085 tcp ADA Control [Eugene_Frenkel] [Eugene_Frenkel] 2005-11 ++ada-cip 2085 udp ADA Control [Eugene_Frenkel] [Eugene_Frenkel] 2005-11 ++gnunet 2086 tcp GNUnet [Christian_Grothoff] [Christian_Grothoff] 2002-10 ++gnunet 2086 udp GNUnet [Christian_Grothoff] [Christian_Grothoff] 2002-10 ++eli 2087 tcp ELI - Event Logging [Maya_Zimerman] [Maya_Zimerman] ++ Integration ++eli 2087 udp ELI - Event Logging [Maya_Zimerman] [Maya_Zimerman] ++ Integration ++ip-blf 2088 tcp IP Busy Lamp Field [Jeffrey_Szczepanski] [Jeffrey_Szczepanski] 2005-02 ++ip-blf 2088 udp IP Busy Lamp Field [Jeffrey_Szczepanski] [Jeffrey_Szczepanski] 2005-02 ++sep 2089 tcp Security Encapsulation [Maya_Zimerman] [Maya_Zimerman] ++ Protocol - SEP ++sep 2089 udp Security Encapsulation [Maya_Zimerman] [Maya_Zimerman] ++ Protocol - SEP ++lrp 2090 tcp Load Report Protocol [Amir_Peless] [Amir_Peless] ++lrp 2090 udp Load Report Protocol [Amir_Peless] [Amir_Peless] ++prp 2091 tcp PRP [Amir_Peless] [Amir_Peless] ++prp 2091 udp PRP [Amir_Peless] [Amir_Peless] ++descent3 2092 tcp Descent 3 [Kevin_Bentley] [Kevin_Bentley] ++descent3 2092 udp Descent 3 [Kevin_Bentley] [Kevin_Bentley] ++nbx-cc 2093 tcp NBX CC ++nbx-cc 2093 udp NBX CC ++nbx-au 2094 tcp NBX AU ++nbx-au 2094 udp NBX AU ++nbx-ser 2095 tcp NBX SER ++nbx-ser 2095 udp NBX SER ++nbx-dir 2096 tcp NBX DIR [Henry_Houh] [Henry_Houh] ++nbx-dir 2096 udp NBX DIR [Henry_Houh] [Henry_Houh] ++jetformpreview 2097 tcp Jet Form Preview [Zygmunt_Wiercioch] [Zygmunt_Wiercioch] ++jetformpreview 2097 udp Jet Form Preview [Zygmunt_Wiercioch] [Zygmunt_Wiercioch] ++dialog-port 2098 tcp Dialog Port [Joseph_Mathew] [Joseph_Mathew] ++dialog-port 2098 udp Dialog Port [Joseph_Mathew] [Joseph_Mathew] ++h2250-annex-g 2099 tcp H.225.0 Annex G [Gur_Kimchi_2] [Gur_Kimchi_2] ++h2250-annex-g 2099 udp H.225.0 Annex G [Gur_Kimchi_2] [Gur_Kimchi_2] ++amiganetfs 2100 tcp Amiga Network Filesystem [Rudi_Chiarito] [Rudi_Chiarito] ++amiganetfs 2100 udp Amiga Network Filesystem [Rudi_Chiarito] [Rudi_Chiarito] ++rtcm-sc104 2101 tcp rtcm-sc104 [Wolfgang_Rupprecht] [Wolfgang_Rupprecht] ++rtcm-sc104 2101 udp rtcm-sc104 [Wolfgang_Rupprecht] [Wolfgang_Rupprecht] ++zephyr-srv 2102 tcp Zephyr server ++zephyr-srv 2102 udp Zephyr server ++zephyr-clt 2103 tcp Zephyr serv-hm connection ++zephyr-clt 2103 udp Zephyr serv-hm connection ++zephyr-hm 2104 tcp Zephyr hostmanager [Greg_Hudson] [Greg_Hudson] ++zephyr-hm 2104 udp Zephyr hostmanager [Greg_Hudson] [Greg_Hudson] ++minipay 2105 tcp MiniPay [Amir_Herzberg] [Amir_Herzberg] ++minipay 2105 udp MiniPay [Amir_Herzberg] [Amir_Herzberg] ++mzap 2106 tcp MZAP [Dave_Thaler_2] [Dave_Thaler_2] ++mzap 2106 udp MZAP [Dave_Thaler_2] [Dave_Thaler_2] ++bintec-admin 2107 tcp BinTec Admin [Thomas_Schmidt] [Thomas_Schmidt] ++bintec-admin 2107 udp BinTec Admin [Thomas_Schmidt] [Thomas_Schmidt] ++comcam 2108 tcp Comcam [Don_Gilbreath] [Don_Gilbreath] ++comcam 2108 udp Comcam [Don_Gilbreath] [Don_Gilbreath] ++ergolight 2109 tcp Ergolight [Jindra_Ryvola] [Jindra_Ryvola] ++ergolight 2109 udp Ergolight [Jindra_Ryvola] [Jindra_Ryvola] ++umsp 2110 tcp UMSP [Alexander_Bogdanov_2] [Alexander_Bogdanov_2] ++umsp 2110 udp UMSP [Alexander_Bogdanov_2] [Alexander_Bogdanov_2] ++dsatp 2111 tcp OPNET Dynamic Sampling Agent [OPNET_Technologies_Inc] [Edward_Macomber] 2011-09-21 ++ Transaction Protocol ++dsatp 2111 udp OPNET Dynamic Sampling Agent [OPNET_Technologies_Inc] [Edward_Macomber] 2011-09-21 ++ Transaction Protocol ++idonix-metanet 2112 tcp Idonix MetaNet [Paul_Harrison] [Paul_Harrison] ++idonix-metanet 2112 udp Idonix MetaNet [Paul_Harrison] [Paul_Harrison] ++hsl-storm 2113 tcp HSL StoRM [Jost_Faganel] [Jost_Faganel] ++hsl-storm 2113 udp HSL StoRM [Jost_Faganel] [Jost_Faganel] ++newheights 2114 tcp NEWHEIGHTS [Michael_Levy] [Michael_Levy] ++newheights 2114 udp NEWHEIGHTS [Michael_Levy] [Michael_Levy] ++kdm 2115 tcp Key Distribution Manager [Mike_Little] [Mike_Little] ++kdm 2115 udp Key Distribution Manager [Mike_Little] [Mike_Little] ++ccowcmr 2116 tcp CCOWCMR [Mark_Morwood] [Mark_Morwood] ++ccowcmr 2116 udp CCOWCMR [Mark_Morwood] [Mark_Morwood] ++mentaclient 2117 tcp MENTACLIENT ++mentaclient 2117 udp MENTACLIENT ++mentaserver 2118 tcp MENTASERVER [Ilan_Shlosberg] [Ilan_Shlosberg] ++mentaserver 2118 udp MENTASERVER [Ilan_Shlosberg] [Ilan_Shlosberg] ++gsigatekeeper 2119 tcp GSIGATEKEEPER [Steve_Tuecke] [Steve_Tuecke] ++gsigatekeeper 2119 udp GSIGATEKEEPER [Steve_Tuecke] [Steve_Tuecke] ++qencp 2120 tcp Quick Eagle Networks CP [Santa_Dasu] [Santa_Dasu] ++qencp 2120 udp Quick Eagle Networks CP [Santa_Dasu] [Santa_Dasu] ++scientia-ssdb 2121 tcp SCIENTIA-SSDB [SYSTEMS_MANAGER] [SYSTEMS_MANAGER] ++scientia-ssdb 2121 udp SCIENTIA-SSDB [SYSTEMS_MANAGER] [SYSTEMS_MANAGER] ++caupc-remote 2122 tcp CauPC Remote Control [Environics_Oy] [Environics_Oy] ++caupc-remote 2122 udp CauPC Remote Control [Environics_Oy] [Environics_Oy] ++gtp-control 2123 tcp GTP-Control Plane (3GPP) [Alessio_Casati] [Alessio_Casati] ++gtp-control 2123 udp GTP-Control Plane (3GPP) [Alessio_Casati] [Alessio_Casati] ++elatelink 2124 tcp ELATELINK [Tim_Lawrence] [Tim_Lawrence] ++elatelink 2124 udp ELATELINK [Tim_Lawrence] [Tim_Lawrence] ++lockstep 2125 tcp LOCKSTEP [Karl_Forster] [Karl_Forster] ++lockstep 2125 udp LOCKSTEP [Karl_Forster] [Karl_Forster] ++pktcable-cops 2126 tcp PktCable-COPS [Glenn_Russell] [Glenn_Russell] ++pktcable-cops 2126 udp PktCable-COPS [Glenn_Russell] [Glenn_Russell] ++index-pc-wb 2127 tcp INDEX-PC-WB [James_David_Fisher] [James_David_Fisher] ++index-pc-wb 2127 udp INDEX-PC-WB [James_David_Fisher] [James_David_Fisher] ++net-steward 2128 tcp Net Steward Control [Martin_Norman] [Martin_Norman] ++net-steward 2128 udp Net Steward Control [Martin_Norman] [Martin_Norman] ++cs-live 2129 tcp cs-live.com [Matt_Lachance] [Matt_Lachance] ++cs-live 2129 udp cs-live.com [Matt_Lachance] [Matt_Lachance] ++xds 2130 tcp XDS [Peter_Zurich] [Peter_Zurich] ++xds 2130 udp XDS [Peter_Zurich] [Peter_Zurich] ++avantageb2b 2131 tcp Avantageb2b [Avi_Software] [Avi_Software] ++avantageb2b 2131 udp Avantageb2b [Avi_Software] [Avi_Software] ++solera-epmap 2132 tcp SoleraTec End Point Map [Mark_Armstrong] [Mark_Armstrong] ++solera-epmap 2132 udp SoleraTec End Point Map [Mark_Armstrong] [Mark_Armstrong] ++zymed-zpp 2133 tcp ZYMED-ZPP [Gregg_Welker] [Gregg_Welker] ++zymed-zpp 2133 udp ZYMED-ZPP [Gregg_Welker] [Gregg_Welker] ++avenue 2134 tcp AVENUE [Jason_Cater] [Jason_Cater] ++avenue 2134 udp AVENUE [Jason_Cater] [Jason_Cater] ++gris 2135 tcp Grid Resource Information [Steve_Tuecke] [Steve_Tuecke] ++ Server ++gris 2135 udp Grid Resource Information [Steve_Tuecke] [Steve_Tuecke] ++ Server ++appworxsrv 2136 tcp APPWORXSRV [Fred_McLain] [Fred_McLain] ++appworxsrv 2136 udp APPWORXSRV [Fred_McLain] [Fred_McLain] ++connect 2137 tcp CONNECT [Reid_Ligon] [Reid_Ligon] ++connect 2137 udp CONNECT [Reid_Ligon] [Reid_Ligon] ++unbind-cluster 2138 tcp UNBIND-CLUSTER [Francois_Harvey] [Francois_Harvey] ++unbind-cluster 2138 udp UNBIND-CLUSTER [Francois_Harvey] [Francois_Harvey] ++ias-auth 2139 tcp IAS-AUTH ++ias-auth 2139 udp IAS-AUTH ++ias-reg 2140 tcp IAS-REG ++ias-reg 2140 udp IAS-REG ++ias-admind 2141 tcp IAS-ADMIND [Baiju_V_Patel] [Baiju_V_Patel] ++ias-admind 2141 udp IAS-ADMIND [Baiju_V_Patel] [Baiju_V_Patel] ++tdmoip 2142 tcp TDM OVER IP [RFC5087] ++tdmoip 2142 udp TDM OVER IP [RFC5087] ++lv-jc 2143 tcp Live Vault Job Control ++lv-jc 2143 udp Live Vault Job Control ++lv-ffx 2144 tcp Live Vault Fast Object ++ Transfer ++lv-ffx 2144 udp Live Vault Fast Object ++ Transfer ++lv-pici 2145 tcp Live Vault Remote Diagnostic ++ Console Support ++lv-pici 2145 udp Live Vault Remote Diagnostic ++ Console Support ++lv-not 2146 tcp Live Vault Admin Event ++ Notification ++lv-not 2146 udp Live Vault Admin Event ++ Notification ++lv-auth 2147 tcp Live Vault Authentication [Ted_Hess] [Ted_Hess] ++lv-auth 2147 udp Live Vault Authentication [Ted_Hess] [Ted_Hess] ++veritas-ucl 2148 tcp VERITAS UNIVERSAL [Songlin_Ren] [Songlin_Ren] ++ COMMUNICATION LAYER ++veritas-ucl 2148 udp VERITAS UNIVERSAL [Songlin_Ren] [Songlin_Ren] ++ COMMUNICATION LAYER ++acptsys 2149 tcp ACPTSYS [Michael_Lekias] [Michael_Lekias] ++acptsys 2149 udp ACPTSYS [Michael_Lekias] [Michael_Lekias] ++dynamic3d 2150 tcp DYNAMIC3D [Tobias_Wegner] [Tobias_Wegner] ++dynamic3d 2150 udp DYNAMIC3D [Tobias_Wegner] [Tobias_Wegner] ++docent 2151 tcp DOCENT [Hali_Lindbloom] [Hali_Lindbloom] ++docent 2151 udp DOCENT [Hali_Lindbloom] [Hali_Lindbloom] ++gtp-user 2152 tcp GTP-User Plane (3GPP) [Alessio_Casati] [Alessio_Casati] ++gtp-user 2152 udp GTP-User Plane (3GPP) [Alessio_Casati] [Alessio_Casati] ++ctlptc 2153 tcp Control Protocol ++ctlptc 2153 udp Control Protocol ++stdptc 2154 tcp Standard Protocol ++stdptc 2154 udp Standard Protocol ++brdptc 2155 tcp Bridge Protocol [Hideki_Hatta] [Hideki_Hatta] 2007-09-27 ++brdptc 2155 udp Bridge Protocol [Hideki_Hatta] [Hideki_Hatta] 2007-09-27 ++trp 2156 tcp Talari Reliable Protocol [John_E_Dickey] [John_E_Dickey] 2007-09-27 ++trp 2156 udp Talari Reliable Protocol [John_E_Dickey] [John_E_Dickey] 2007-09-27 ++xnds 2157 tcp Xerox Network Document Scan [William_R_Lear] [William_R_Lear] 2008-03-06 ++ Protocol ++xnds 2157 udp Xerox Network Document Scan [William_R_Lear] [William_R_Lear] 2008-03-06 ++ Protocol ++touchnetplus 2158 tcp TouchNetPlus Service [Brian_Toothill] [Brian_Toothill] 2008-03-06 ++touchnetplus 2158 udp TouchNetPlus Service [Brian_Toothill] [Brian_Toothill] 2008-03-06 ++gdbremote 2159 tcp GDB Remote Debug Port [Nigel_Stephens] [Nigel_Stephens] ++gdbremote 2159 udp GDB Remote Debug Port [Nigel_Stephens] [Nigel_Stephens] ++apc-2160 2160 tcp APC 2160 [American_Power_Conve] [American_Power_Conve] ++apc-2160 2160 udp APC 2160 [American_Power_Conve] [American_Power_Conve] ++apc-2161 2161 tcp APC 2161 [American_Power_Conve] [American_Power_Conve] ++apc-2161 2161 udp APC 2161 [American_Power_Conve] [American_Power_Conve] ++navisphere 2162 tcp Navisphere ++navisphere 2162 udp Navisphere ++navisphere-sec 2163 tcp Navisphere Secure [Andreas_Bauer] [Andreas_Bauer] ++navisphere-sec 2163 udp Navisphere Secure [Andreas_Bauer] [Andreas_Bauer] ++ddns-v3 2164 tcp Dynamic DNS Version 3 [Alan_Yates] [Alan_Yates] ++ddns-v3 2164 udp Dynamic DNS Version 3 [Alan_Yates] [Alan_Yates] ++x-bone-api 2165 tcp X-Bone API [Joe_Touch] [Joe_Touch] ++x-bone-api 2165 udp X-Bone API [Joe_Touch] [Joe_Touch] ++iwserver 2166 tcp iwserver [Fred_Surr] [Fred_Surr] ++iwserver 2166 udp iwserver [Fred_Surr] [Fred_Surr] ++raw-serial 2167 tcp Raw Async Serial Link [Benjamin_Green] [Benjamin_Green] ++raw-serial 2167 udp Raw Async Serial Link [Benjamin_Green] [Benjamin_Green] ++easy-soft-mux 2168 tcp easy-soft Multiplexer [Norbert_Kintzler] [Norbert_Kintzler] 2004-11 ++easy-soft-mux 2168 udp easy-soft Multiplexer [Norbert_Kintzler] [Norbert_Kintzler] 2004-11 ++ Backbone for Academic ++brain 2169 tcp Information Notification [Archishmat_Gore] [Archishmat_Gore] 2004-11 ++ (BRAIN) ++ Backbone for Academic ++brain 2169 udp Information Notification [Archishmat_Gore] [Archishmat_Gore] 2004-11 ++ (BRAIN) ++eyetv 2170 tcp EyeTV Server Port [Elgato_Systems] [Elgato_Systems] 2004-11 ++eyetv 2170 udp EyeTV Server Port [Elgato_Systems] [Elgato_Systems] 2004-11 ++msfw-storage 2171 tcp MS Firewall Storage ++msfw-storage 2171 udp MS Firewall Storage ++msfw-s-storage 2172 tcp MS Firewall SecureStorage ++msfw-s-storage 2172 udp MS Firewall SecureStorage ++msfw-replica 2173 tcp MS Firewall Replication ++msfw-replica 2173 udp MS Firewall Replication ++msfw-array 2174 tcp MS Firewall Intra Array [Itai_Greenberg] [Itai_Greenberg] 2004-11 ++msfw-array 2174 udp MS Firewall Intra Array [Itai_Greenberg] [Itai_Greenberg] 2004-11 ++airsync 2175 tcp Microsoft Desktop AirSync ++ Protocol ++airsync 2175 udp Microsoft Desktop AirSync ++ Protocol ++rapi 2176 tcp Microsoft ActiveSync Remote [Jon_Xu] [Jon_Xu] 2005-08 ++ API ++rapi 2176 udp Microsoft ActiveSync Remote [Jon_Xu] [Jon_Xu] 2005-08 ++ API ++qwave 2177 tcp qWAVE Bandwidth Estimate [Gabe_Frost] [Gabe_Frost] 2005-08 ++qwave 2177 udp qWAVE Bandwidth Estimate [Gabe_Frost] [Gabe_Frost] 2005-08 ++bitspeer 2178 tcp Peer Services for BITS [Jeff_Roberts] [Jeff_Roberts] 2005-11 ++bitspeer 2178 udp Peer Services for BITS [Jeff_Roberts] [Jeff_Roberts] 2005-11 ++vmrdp 2179 tcp Microsoft RDP for virtual [Brian_Henry] [Brian_Henry] 2007-03 ++ machines ++vmrdp 2179 udp Microsoft RDP for virtual [Brian_Henry] [Brian_Henry] 2007-03 ++ machines ++mc-gt-srv 2180 tcp Millicent Vendor Gateway [Steve_Glassman] [Steve_Glassman] ++ Server ++mc-gt-srv 2180 udp Millicent Vendor Gateway [Steve_Glassman] [Steve_Glassman] ++ Server ++eforward 2181 tcp eforward [Greg_Pringle] [Greg_Pringle] ++eforward 2181 udp eforward [Greg_Pringle] [Greg_Pringle] ++cgn-stat 2182 tcp CGN status ++cgn-stat 2182 udp CGN status ++cgn-config 2183 tcp Code Green configuration [Chris_Michaelson] [Chris_Michaelson] 2005-08 ++cgn-config 2183 udp Code Green configuration [Chris_Michaelson] [Chris_Michaelson] 2005-08 ++nvd 2184 tcp NVD User [Yves_Gattegno] [Yves_Gattegno] 2004-12 ++nvd 2184 udp NVD User [Yves_Gattegno] [Yves_Gattegno] 2004-12 ++onbase-dds 2185 tcp OnBase Distributed Disk [Paul_Tam] [Paul_Tam] 2004-12 ++ Services ++onbase-dds 2185 udp OnBase Distributed Disk [Paul_Tam] [Paul_Tam] 2004-12 ++ Services ++gtaua 2186 tcp Guy-Tek Automated Update [Daniel_Story] [Daniel_Story] 2008-01-25 ++ Applications ++gtaua 2186 udp Guy-Tek Automated Update [Daniel_Story] [Daniel_Story] 2008-01-25 ++ Applications ++ssmc 2187 tcp Sepehr System Management ++ Control ++ssmd 2187 udp Sepehr System Management [Shahriar_Pourazin] [Shahriar_Pourazin] 2008-12-02 ++ Data ++radware-rpm 2188 tcp Radware Resource Pool [Radware_LTD] [Samuel_Bercovici] 2011-08-05 ++ Manager ++ 2188 udp Reserved ++radware-rpm-s 2189 tcp Secure Radware Resource Pool [Radware_LTD] [Samuel_Bercovici] 2011-08-05 ++ Manager ++ 2189 udp Reserved ++tivoconnect 2190 tcp TiVoConnect Beacon [Jeffrey_J_Peters] [Jeffrey_J_Peters] 2002-08 ++tivoconnect 2190 udp TiVoConnect Beacon [Jeffrey_J_Peters] [Jeffrey_J_Peters] 2002-08 ++tvbus 2191 tcp TvBus Messaging [Brian_W_Beach] [Brian_W_Beach] 2003-01 ++tvbus 2191 udp TvBus Messaging [Brian_W_Beach] [Brian_W_Beach] 2003-01 ++asdis 2192 tcp ASDIS software management [ASDIS_Support] [ASDIS_Support] 2005-08 ++asdis 2192 udp ASDIS software management [ASDIS_Support] [ASDIS_Support] 2005-08 ++drwcs 2193 tcp Dr.Web Enterprise Management [Eugeny_Gladkih] [Eugeny_Gladkih] 2008-01-31 ++ Service ++drwcs 2193 udp Dr.Web Enterprise Management [Eugeny_Gladkih] [Eugeny_Gladkih] 2008-01-31 ++ Service ++ 2194-2196 Unassigned ++mnp-exchange 2197 tcp MNP data exchange [Peter_Pramberger] [Peter_Pramberger] 2004-11 ++mnp-exchange 2197 udp MNP data exchange [Peter_Pramberger] [Peter_Pramberger] 2004-11 ++onehome-remote 2198 tcp OneHome Remote Access ++onehome-remote 2198 udp OneHome Remote Access ++onehome-help 2199 tcp OneHome Service Port [Jim_Herman] [Jim_Herman] 2005-08 ++onehome-help 2199 udp OneHome Service Port [Jim_Herman] [Jim_Herman] 2005-08 ++ici 2200 tcp ICI [Brent_Hines] [Brent_Hines] ++ici 2200 udp ICI [Brent_Hines] [Brent_Hines] ++ats 2201 tcp Advanced Training System ++ Program ++ats 2201 udp Advanced Training System ++ Program ++imtc-map 2202 tcp Int. Multimedia [Pat_Galvin] [Pat_Galvin] ++ Teleconferencing Cosortium ++imtc-map 2202 udp Int. Multimedia [Pat_Galvin] [Pat_Galvin] ++ Teleconferencing Cosortium ++b2-runtime 2203 tcp b2 Runtime Protocol ++b2-runtime 2203 udp b2 Runtime Protocol ++b2-license 2204 tcp b2 License Server [Helge_Frank_Zimpel] [Helge_Frank_Zimpel] 2006-01 ++b2-license 2204 udp b2 License Server [Helge_Frank_Zimpel] [Helge_Frank_Zimpel] 2006-01 ++jps 2205 tcp Java Presentation Server [Leif_Jakob] [Leif_Jakob] 2006-01 ++jps 2205 udp Java Presentation Server [Leif_Jakob] [Leif_Jakob] 2006-01 ++hpocbus 2206 tcp HP OpenCall bus [Jerome_Forissier] [Jerome_Forissier] 2005-12 ++hpocbus 2206 udp HP OpenCall bus [Jerome_Forissier] [Jerome_Forissier] 2005-12 ++hpssd 2207 tcp HP Status and Services [Donald_Welch] [Donald_Welch] 2006-05 ++hpssd 2207 udp HP Status and Services [Donald_Welch] [Donald_Welch] 2006-05 ++hpiod 2208 tcp HP I/O Backend [David_Suffield] [David_Suffield] 2006-05 ++hpiod 2208 udp HP I/O Backend [David_Suffield] [David_Suffield] 2006-05 ++rimf-ps 2209 tcp HP RIM for Files Portal [Patty_Ho] [Patty_Ho] 2007-05 ++ Service ++rimf-ps 2209 udp HP RIM for Files Portal [Patty_Ho] [Patty_Ho] 2007-05 ++ Service ++noaaport 2210 tcp NOAAPORT Broadcast Network ++noaaport 2210 udp NOAAPORT Broadcast Network ++emwin 2211 tcp EMWIN [Antonio_Querubin] [Antonio_Querubin] 2008-03-10 ++emwin 2211 udp EMWIN [Antonio_Querubin] [Antonio_Querubin] 2008-03-10 ++leecoposserver 2212 tcp LeeCO POS Server Service [Patrick_Lee] [Patrick_Lee] 2008-03-10 ++leecoposserver 2212 udp LeeCO POS Server Service [Patrick_Lee] [Patrick_Lee] 2008-03-10 ++kali 2213 tcp Kali [Jay_Cotton] [Jay_Cotton] ++kali 2213 udp Kali [Jay_Cotton] [Jay_Cotton] ++rpi 2214 tcp RDQ Protocol Interface [Les_Mather] [Les_Mather] 2005-12 ++rpi 2214 udp RDQ Protocol Interface [Les_Mather] [Les_Mather] 2005-12 ++ipcore 2215 tcp IPCore.co.za GPRS [Administrator] [Administrator] 2005-12 ++ipcore 2215 udp IPCore.co.za GPRS [Administrator] [Administrator] 2005-12 ++vtu-comms 2216 tcp VTU data service [David_Barrass] [David_Barrass] 2006-01 ++vtu-comms 2216 udp VTU data service [David_Barrass] [David_Barrass] 2006-01 ++gotodevice 2217 tcp GoToDevice Device Management [John_Lisek] [John_Lisek] 2006-01 ++gotodevice 2217 udp GoToDevice Device Management [John_Lisek] [John_Lisek] 2006-01 ++bounzza 2218 tcp Bounzza IRC Proxy [Danko_Alexeyev] [Danko_Alexeyev] 2006-02 ++bounzza 2218 udp Bounzza IRC Proxy [Danko_Alexeyev] [Danko_Alexeyev] 2006-02 ++netiq-ncap 2219 tcp NetIQ NCAP Protocol [Roger_Huebner] [Roger_Huebner] 2010-08-25 ++netiq-ncap 2219 udp NetIQ NCAP Protocol [Roger_Huebner] [Roger_Huebner] 2010-08-25 ++netiq 2220 tcp NetIQ End2End [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++netiq 2220 udp NetIQ End2End [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++rockwell-csp1 2221 tcp Rockwell CSP1 [Brian_Batke] [Brian_Batke] ++rockwell-csp1 2221 udp Rockwell CSP1 [Brian_Batke] [Brian_Batke] ++ EtherNet/IP I/O ++ ++EtherNet-IP-1 2222 tcp IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 ++ well-formed service name as ++ a replacement for ++ "EtherNet/IP-1". ++ New contact added for port 2222 on 2008-02-01 This entry is ++EtherNet/IP-1 2222 tcp EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not ++ usable for use with many common service discovery mechanisms. ++ EtherNet/IP I/O ++ ++EtherNet-IP-1 2222 udp IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 2222 on 2008-02-01 ++ well-formed service name as ++ a replacement for ++ "EtherNet/IP-1". ++ New contact added for port 2222 on 2008-02-01 This entry is ++EtherNet/IP-1 2222 udp EtherNet/IP I/O [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-1". This entry is now historic, not ++ usable for use with many common service discovery mechanisms. ++rockwell-csp2 2223 tcp Rockwell CSP2 [Brian_Batke] [Brian_Batke] ++rockwell-csp2 2223 udp Rockwell CSP2 [Brian_Batke] [Brian_Batke] ++efi-mg 2224 tcp Easy Flexible [Thomas_Efer] [Thomas_Efer] 2006-03 ++ Internet/Multiplayer Games ++efi-mg 2224 udp Easy Flexible [Thomas_Efer] [Thomas_Efer] 2006-03 ++ Internet/Multiplayer Games ++rcip-itu 2225 tcp Resource Connection [ITU_TSB] [ITU_TSB] ++ Initiation Protocol ++ 2225 udp Reserved ++rcip-itu 2225 sctp Resource Connection [ITU_TSB] [ITU_TSB] ++ Initiation Protocol ++di-drm 2226 tcp Digital Instinct DRM ++di-drm 2226 udp Digital Instinct DRM ++di-msg 2227 tcp DI Messaging Service [Sean_Ni] [Sean_Ni] 2006-02 ++di-msg 2227 udp DI Messaging Service [Sean_Ni] [Sean_Ni] 2006-02 ++ehome-ms 2228 tcp eHome Message Server [Peter_Gabriel] [Peter_Gabriel] 2006-01 ++ehome-ms 2228 udp eHome Message Server [Peter_Gabriel] [Peter_Gabriel] 2006-01 ++datalens 2229 tcp DataLens Service [Christopher_Bidwell] [Christopher_Bidwell] 2006-02 ++datalens 2229 udp DataLens Service [Christopher_Bidwell] [Christopher_Bidwell] 2006-02 ++queueadm 2230 tcp MetaSoft Job Queue [Ilya_Melamed] [Ilya_Melamed] 2006-06 ++ Administration Service ++queueadm 2230 udp MetaSoft Job Queue [Ilya_Melamed] [Ilya_Melamed] 2006-06 ++ Administration Service ++wimaxasncp 2231 tcp WiMAX ASN Control Plane [Prakash_Iyer] [Prakash_Iyer] 2006-06 ++ Protocol ++wimaxasncp 2231 udp WiMAX ASN Control Plane [Prakash_Iyer] [Prakash_Iyer] 2006-06 ++ Protocol ++ivs-video 2232 tcp IVS Video default [Thierry_Turletti] [Thierry_Turletti] ++ivs-video 2232 udp IVS Video default [Thierry_Turletti] [Thierry_Turletti] ++infocrypt 2233 tcp INFOCRYPT [Erica_Liu] [Erica_Liu] ++infocrypt 2233 udp INFOCRYPT [Erica_Liu] [Erica_Liu] ++directplay 2234 tcp DirectPlay [Ajay_Jindal] [Ajay_Jindal] ++directplay 2234 udp DirectPlay [Ajay_Jindal] [Ajay_Jindal] ++sercomm-wlink 2235 tcp Sercomm-WLink [Melinda_Tsao] [Melinda_Tsao] ++sercomm-wlink 2235 udp Sercomm-WLink [Melinda_Tsao] [Melinda_Tsao] ++nani 2236 tcp Nani [Steve_Benoit] [Steve_Benoit] ++nani 2236 udp Nani [Steve_Benoit] [Steve_Benoit] ++optech-port1-lm 2237 tcp Optech Port1 License Manager [Gerard_Cannie] [Gerard_Cannie] ++optech-port1-lm 2237 udp Optech Port1 License Manager [Gerard_Cannie] [Gerard_Cannie] ++aviva-sna 2238 tcp AVIVA SNA SERVER [Vick_Keshishian] [Vick_Keshishian] ++aviva-sna 2238 udp AVIVA SNA SERVER [Vick_Keshishian] [Vick_Keshishian] ++imagequery 2239 tcp Image Query [Charles_Jacobs] [Charles_Jacobs] ++imagequery 2239 udp Image Query [Charles_Jacobs] [Charles_Jacobs] ++recipe 2240 tcp RECIPe [Charlie_Limoges] [Charlie_Limoges] 1997-12-16 ++recipe 2240 udp RECIPe [Charlie_Limoges] [Charlie_Limoges] 1997-12-16 ++ivsd 2241 tcp IVS Daemon [Thierry_Turletti] [Thierry_Turletti] ++ivsd 2241 udp IVS Daemon [Thierry_Turletti] [Thierry_Turletti] ++foliocorp 2242 tcp Folio Remote Server [Pat_Mcgowan] [Pat_Mcgowan] ++foliocorp 2242 udp Folio Remote Server [Pat_Mcgowan] [Pat_Mcgowan] ++magicom 2243 tcp Magicom Protocol [Yossi_Appleboum] [Yossi_Appleboum] ++magicom 2243 udp Magicom Protocol [Yossi_Appleboum] [Yossi_Appleboum] ++nmsserver 2244 tcp NMS Server [Dmitry_Krasnonosenki] [Dmitry_Krasnonosenki] ++nmsserver 2244 udp NMS Server [Dmitry_Krasnonosenki] [Dmitry_Krasnonosenki] ++hao 2245 tcp HaO [Panic_Ride] [Panic_Ride] ++hao 2245 udp HaO [Panic_Ride] [Panic_Ride] ++pc-mta-addrmap 2246 tcp PacketCable MTA Addr Map [Dave_Maxwell] [Dave_Maxwell] ++pc-mta-addrmap 2246 udp PacketCable MTA Addr Map [Dave_Maxwell] [Dave_Maxwell] ++antidotemgrsvr 2247 tcp Antidote Deployment Manager [Rod_Waltermann] [Rod_Waltermann] 2006-02 ++ Service ++antidotemgrsvr 2247 udp Antidote Deployment Manager [Rod_Waltermann] [Rod_Waltermann] 2006-02 ++ Service ++ums 2248 tcp User Management Service [Andrew_Crockford] [Andrew_Crockford] ++ums 2248 udp User Management Service [Andrew_Crockford] [Andrew_Crockford] ++rfmp 2249 tcp RISO File Manager Protocol [Shinji_Yamanaka] [Shinji_Yamanaka] ++rfmp 2249 udp RISO File Manager Protocol [Shinji_Yamanaka] [Shinji_Yamanaka] ++remote-collab 2250 tcp remote-collab [Richard_Walters] [Richard_Walters] ++remote-collab 2250 udp remote-collab [Richard_Walters] [Richard_Walters] ++dif-port 2251 tcp Distributed Framework Port [Sebastien_Lambla] [Sebastien_Lambla] ++dif-port 2251 udp Distributed Framework Port [Sebastien_Lambla] [Sebastien_Lambla] ++njenet-ssl 2252 tcp NJENET using SSL [Hans_U_Schmidt] [Hans_U_Schmidt] ++njenet-ssl 2252 udp NJENET using SSL [Hans_U_Schmidt] [Hans_U_Schmidt] ++dtv-chan-req 2253 tcp DTV Channel Request [Richard_Hodges] [Richard_Hodges] ++dtv-chan-req 2253 udp DTV Channel Request [Richard_Hodges] [Richard_Hodges] ++seispoc 2254 tcp Seismic P.O.C. Port [Robert_Reimiller] [Robert_Reimiller] ++seispoc 2254 udp Seismic P.O.C. Port [Robert_Reimiller] [Robert_Reimiller] ++vrtp 2255 tcp VRTP - ViRtue Transfer [Max_Fudim] [Max_Fudim] ++ Protocol ++vrtp 2255 udp VRTP - ViRtue Transfer [Max_Fudim] [Max_Fudim] ++ Protocol ++pcc-mfp 2256 tcp PCC MFP [Kunihiko_Morota] [Kunihiko_Morota] 2005-08 ++pcc-mfp 2256 udp PCC MFP [Kunihiko_Morota] [Kunihiko_Morota] 2005-08 ++simple-tx-rx 2257 tcp simple text/file transfer [Daniel_Kilsdonk] [Daniel_Kilsdonk] 2006-08 ++simple-tx-rx 2257 udp simple text/file transfer [Daniel_Kilsdonk] [Daniel_Kilsdonk] 2006-08 ++rcts 2258 tcp Rotorcraft Communications [Terry_Eldridge] [Terry_Eldridge] 2006-08 ++ Test System ++rcts 2258 udp Rotorcraft Communications [Terry_Eldridge] [Terry_Eldridge] 2006-08 ++ Test System ++ 2259 Unassigned 2011-06-28 ++apc-2260 2260 tcp APC 2260 [American_Power_Conve] [American_Power_Conve] 2002-02 ++apc-2260 2260 udp APC 2260 [American_Power_Conve] [American_Power_Conve] 2002-02 ++comotionmaster 2261 tcp CoMotion Master Server ++comotionmaster 2261 udp CoMotion Master Server ++comotionback 2262 tcp CoMotion Backup Server [Friedman_Wagner_Dobl] [Friedman_Wagner_Dobl] 2005-09 ++comotionback 2262 udp CoMotion Backup Server [Friedman_Wagner_Dobl] [Friedman_Wagner_Dobl] 2005-09 ++ecwcfg 2263 tcp ECweb Configuration Service [Anders_Hjelm] [Anders_Hjelm] 2006-03 ++ecwcfg 2263 udp ECweb Configuration Service [Anders_Hjelm] [Anders_Hjelm] 2006-03 ++apx500api-1 2264 tcp Audio Precision Apx500 API ++ Port 1 ++apx500api-1 2264 udp Audio Precision Apx500 API ++ Port 1 ++apx500api-2 2265 tcp Audio Precision Apx500 API [Robert_Wright] [Robert_Wright] ++ Port 2 ++apx500api-2 2265 udp Audio Precision Apx500 API [Robert_Wright] [Robert_Wright] ++ Port 2 ++mfserver 2266 tcp M-Files Server [Samppa_Lahtinen] [Samppa_Lahtinen] 2004-06 ++mfserver 2266 udp M-files Server [Samppa_Lahtinen] [Samppa_Lahtinen] 2004-06 ++ontobroker 2267 tcp OntoBroker [Dr_Michael_Erdmann] [Dr_Michael_Erdmann] 2004-12 ++ontobroker 2267 udp OntoBroker [Dr_Michael_Erdmann] [Dr_Michael_Erdmann] 2004-12 ++amt 2268 tcp AMT [Tom_Pusateri] [Tom_Pusateri] 2004-12 ++amt 2268 udp AMT [Tom_Pusateri] [Tom_Pusateri] 2004-12 ++mikey 2269 tcp MIKEY [Karl_Norrman] [Karl_Norrman] 2004-12 ++mikey 2269 udp MIKEY [Karl_Norrman] [Karl_Norrman] 2004-12 ++starschool 2270 tcp starSchool [Adam_Ernst] [Adam_Ernst] 2004-12 ++starschool 2270 udp starSchool [Adam_Ernst] [Adam_Ernst] 2004-12 ++mmcals 2271 tcp Secure Meeting Maker ++ Scheduling ++mmcals 2271 udp Secure Meeting Maker ++ Scheduling ++mmcal 2272 tcp Meeting Maker Scheduling [Andrew_H_Derbyshire] [Andrew_H_Derbyshire] 2004-12 ++mmcal 2272 udp Meeting Maker Scheduling [Andrew_H_Derbyshire] [Andrew_H_Derbyshire] 2004-12 ++mysql-im 2273 tcp MySQL Instance Manager [Petr_Chardin] [Petr_Chardin] 2004-12 ++mysql-im 2273 udp MySQL Instance Manager [Petr_Chardin] [Petr_Chardin] 2004-12 ++pcttunnell 2274 tcp PCTTunneller [ProControl_Technolog] [ProControl_Technolog] 2004-12 ++pcttunnell 2274 udp PCTTunneller [ProControl_Technolog] [ProControl_Technolog] 2004-12 ++ibridge-data 2275 tcp iBridge Conferencing ++ibridge-data 2275 udp iBridge Conferencing ++ibridge-mgmt 2276 tcp iBridge Management [Patrick_Fisher] [Patrick_Fisher] 2004-12 ++ibridge-mgmt 2276 udp iBridge Management [Patrick_Fisher] [Patrick_Fisher] 2004-12 ++bluectrlproxy 2277 tcp Bt device control proxy [Mark_de_Rooi] [Mark_de_Rooi] 2004-12 ++bluectrlproxy 2277 udp Bt device control proxy [Mark_de_Rooi] [Mark_de_Rooi] 2004-12 ++s3db 2278 tcp Simple Stacked Sequences [David_Brandon] [David_Brandon] 2006-08 ++ Database ++s3db 2278 udp Simple Stacked Sequences [David_Brandon] [David_Brandon] 2006-08 ++ Database ++xmquery 2279 tcp xmquery [Niels_Christiansen] [Niels_Christiansen] ++xmquery 2279 udp xmquery [Niels_Christiansen] [Niels_Christiansen] ++lnvpoller 2280 tcp LNVPOLLER ++lnvpoller 2280 udp LNVPOLLER ++lnvconsole 2281 tcp LNVCONSOLE ++lnvconsole 2281 udp LNVCONSOLE ++lnvalarm 2282 tcp LNVALARM ++lnvalarm 2282 udp LNVALARM ++lnvstatus 2283 tcp LNVSTATUS ++lnvstatus 2283 udp LNVSTATUS ++lnvmaps 2284 tcp LNVMAPS ++lnvmaps 2284 udp LNVMAPS ++lnvmailmon 2285 tcp LNVMAILMON [John_Payne] [John_Payne] ++lnvmailmon 2285 udp LNVMAILMON [John_Payne] [John_Payne] ++nas-metering 2286 tcp NAS-Metering [Steven_Sawkins] [Steven_Sawkins] ++nas-metering 2286 udp NAS-Metering [Steven_Sawkins] [Steven_Sawkins] ++dna 2287 tcp DNA [Tung_Nguyen] [Tung_Nguyen] ++dna 2287 udp DNA [Tung_Nguyen] [Tung_Nguyen] ++netml 2288 tcp NETML [Jochen_Hansmeyer] [Jochen_Hansmeyer] ++netml 2288 udp NETML [Jochen_Hansmeyer] [Jochen_Hansmeyer] ++dict-lookup 2289 tcp Lookup dict server [William_Fernando_Mat] [William_Fernando_Mat] 2005-01 ++dict-lookup 2289 udp Lookup dict server [William_Fernando_Mat] [William_Fernando_Mat] 2005-01 ++sonus-logging 2290 tcp Sonus Logging Services [Adwait_Sathe] [Adwait_Sathe] 2005-08 ++sonus-logging 2290 udp Sonus Logging Services [Adwait_Sathe] [Adwait_Sathe] 2005-08 ++eapsp 2291 tcp EPSON Advanced Printer Share [SEIKO_EPSON] [SEIKO_EPSON] 2006-06 ++ Protocol ++eapsp 2291 udp EPSON Advanced Printer Share [SEIKO_EPSON] [SEIKO_EPSON] 2006-06 ++ Protocol ++mib-streaming 2292 tcp Sonus Element Management [Linda_Lin] [Linda_Lin] 2006-08 ++ Services ++mib-streaming 2292 udp Sonus Element Management [Linda_Lin] [Linda_Lin] 2006-08 ++ Services ++npdbgmngr 2293 tcp Network Platform Debug [Robert_Byrne] [Robert_Byrne] 2006-09 ++ Manager ++npdbgmngr 2293 udp Network Platform Debug [Robert_Byrne] [Robert_Byrne] 2006-09 ++ Manager ++konshus-lm 2294 tcp Konshus License Manager [Francois_Painchaud] [Francois_Painchaud] ++ (FLEX) ++konshus-lm 2294 udp Konshus License Manager [Francois_Painchaud] [Francois_Painchaud] ++ (FLEX) ++advant-lm 2295 tcp Advant License Manager [Lars_Goran_Magnusson] [Lars_Goran_Magnusson] ++advant-lm 2295 udp Advant License Manager [Lars_Goran_Magnusson] [Lars_Goran_Magnusson] ++theta-lm 2296 tcp Theta License Manager [David_Thompson] [David_Thompson] ++ (Rainbow) ++theta-lm 2296 udp Theta License Manager [David_Thompson] [David_Thompson] ++ (Rainbow) ++d2k-datamover1 2297 tcp D2K DataMover 1 ++d2k-datamover1 2297 udp D2K DataMover 1 ++d2k-datamover2 2298 tcp D2K DataMover 2 [Eric_Lan] [Eric_Lan] ++d2k-datamover2 2298 udp D2K DataMover 2 [Eric_Lan] [Eric_Lan] ++pc-telecommute 2299 tcp PC Telecommute [John_Daniel_Bonamico] [John_Daniel_Bonamico] ++pc-telecommute 2299 udp PC Telecommute [John_Daniel_Bonamico] [John_Daniel_Bonamico] ++cvmmon 2300 tcp CVMMON [Roger_Kumpf] [Roger_Kumpf] ++cvmmon 2300 udp CVMMON [Roger_Kumpf] [Roger_Kumpf] ++cpq-wbem 2301 tcp Compaq HTTP [Scott_Shaffer] [Scott_Shaffer] ++cpq-wbem 2301 udp Compaq HTTP [Scott_Shaffer] [Scott_Shaffer] ++binderysupport 2302 tcp Bindery Support [Narasimha_Rao_N] [Narasimha_Rao_N] ++binderysupport 2302 udp Bindery Support [Narasimha_Rao_N] [Narasimha_Rao_N] ++proxy-gateway 2303 tcp Proxy Gateway [Paul_Funk] [Paul_Funk] ++proxy-gateway 2303 udp Proxy Gateway [Paul_Funk] [Paul_Funk] ++attachmate-uts 2304 tcp Attachmate UTS [George_Gianelos] [George_Gianelos] ++attachmate-uts 2304 udp Attachmate UTS [George_Gianelos] [George_Gianelos] ++mt-scaleserver 2305 tcp MT ScaleServer [Paul_Glaubitz] [Paul_Glaubitz] ++mt-scaleserver 2305 udp MT ScaleServer [Paul_Glaubitz] [Paul_Glaubitz] ++tappi-boxnet 2306 tcp TAPPI BoxNet [Richard_Spartz] [Richard_Spartz] ++tappi-boxnet 2306 udp TAPPI BoxNet [Richard_Spartz] [Richard_Spartz] ++pehelp 2307 tcp pehelp [Jens_Kilian] [Jens_Kilian] ++pehelp 2307 udp pehelp [Jens_Kilian] [Jens_Kilian] ++sdhelp 2308 tcp sdhelp [Annette_Klecha] [Annette_Klecha] ++sdhelp 2308 udp sdhelp [Annette_Klecha] [Annette_Klecha] ++sdserver 2309 tcp SD Server ++sdserver 2309 udp SD Server ++sdclient 2310 tcp SD Client [Jeurgen_Broesamle] [Jeurgen_Broesamle] ++sdclient 2310 udp SD Client [Jeurgen_Broesamle] [Jeurgen_Broesamle] ++messageservice 2311 tcp Message Service ++messageservice 2311 udp Message Service ++wanscaler 2312 tcp WANScaler Communication [Allen_Samuels] [Allen_Samuels] 2006-11 ++ Service ++wanscaler 2312 udp WANScaler Communication [Allen_Samuels] [Allen_Samuels] 2006-11 ++ Service ++iapp 2313 tcp IAPP (Inter Access Point [Henri_Moelard] [Henri_Moelard] ++ Protocol) ++iapp 2313 udp IAPP (Inter Access Point [Henri_Moelard] [Henri_Moelard] ++ Protocol) ++cr-websystems 2314 tcp CR WebSystems [Robin_Giese] [Robin_Giese] ++cr-websystems 2314 udp CR WebSystems [Robin_Giese] [Robin_Giese] ++precise-sft 2315 tcp Precise Sft. [Michael_Landwehr] [Michael_Landwehr] ++precise-sft 2315 udp Precise Sft. [Michael_Landwehr] [Michael_Landwehr] ++sent-lm 2316 tcp SENT License Manager [Pisharath_Krishnan] [Pisharath_Krishnan] ++sent-lm 2316 udp SENT License Manager [Pisharath_Krishnan] [Pisharath_Krishnan] ++attachmate-g32 2317 tcp Attachmate G32 [Bryce_Bhatnagar] [Bryce_Bhatnagar] ++attachmate-g32 2317 udp Attachmate G32 [Bryce_Bhatnagar] [Bryce_Bhatnagar] ++cadencecontrol 2318 tcp Cadence Control [Buck_Caldwell] [Buck_Caldwell] ++cadencecontrol 2318 udp Cadence Control [Buck_Caldwell] [Buck_Caldwell] ++infolibria 2319 tcp InfoLibria [Chris_Chiotasso] [Chris_Chiotasso] ++infolibria 2319 udp InfoLibria [Chris_Chiotasso] [Chris_Chiotasso] ++siebel-ns 2320 tcp Siebel NS [Gilberto_Arnaiz] [Gilberto_Arnaiz] ++siebel-ns 2320 udp Siebel NS [Gilberto_Arnaiz] [Gilberto_Arnaiz] ++rdlap 2321 tcp RDLAP [Robert_Wiebe] [Robert_Wiebe] ++rdlap 2321 udp RDLAP [Robert_Wiebe] [Robert_Wiebe] ++ofsd 2322 tcp ofsd ++ofsd 2322 udp ofsd ++3d-nfsd 2323 tcp 3d-nfsd [Mike_Sherrill] [Mike_Sherrill] ++3d-nfsd 2323 udp 3d-nfsd [Mike_Sherrill] [Mike_Sherrill] ++cosmocall 2324 tcp Cosmocall [Steve_Dellutri] [Steve_Dellutri] ++cosmocall 2324 udp Cosmocall [Steve_Dellutri] [Steve_Dellutri] ++ansysli 2325 tcp ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 ++ansysli 2325 udp ANSYS Licensing Interconnect [Suzanne_Lorrin] [Suzanne_Lorrin] Modified: 27 October 2008 ++idcp 2326 tcp IDCP [Keisokugiken_Corp] [Keisokugiken_Corp] ++idcp 2326 udp IDCP [Keisokugiken_Corp] [Keisokugiken_Corp] ++xingcsm 2327 tcp xingcsm [Dave_Spencer] [Dave_Spencer] ++xingcsm 2327 udp xingcsm [Dave_Spencer] [Dave_Spencer] ++netrix-sftm 2328 tcp Netrix SFTM [Garrett_Herschleb] [Garrett_Herschleb] ++netrix-sftm 2328 udp Netrix SFTM [Garrett_Herschleb] [Garrett_Herschleb] ++nvd 2329 tcp NVD [Peter_Weyman] [Peter_Weyman] ++nvd 2329 udp NVD [Peter_Weyman] [Peter_Weyman] ++tscchat 2330 tcp TSCCHAT [Mike_Jackson] [Mike_Jackson] ++tscchat 2330 udp TSCCHAT [Mike_Jackson] [Mike_Jackson] ++agentview 2331 tcp AGENTVIEW [Ram_Iyer] [Ram_Iyer] ++agentview 2331 udp AGENTVIEW [Ram_Iyer] [Ram_Iyer] ++rcc-host 2332 tcp RCC Host [Martin_Shoemaker] [Martin_Shoemaker] ++rcc-host 2332 udp RCC Host [Martin_Shoemaker] [Martin_Shoemaker] ++snapp 2333 tcp SNAPP [Dan_Burrows] [Dan_Burrows] 2009-09-25 ++snapp 2333 udp SNAPP [Dan_Burrows] [Dan_Burrows] 2009-09-25 ++ace-client 2334 tcp ACE Client Auth ++ace-client 2334 udp ACE Client Auth ++ace-proxy 2335 tcp ACE Proxy [Riaz_Zolfonoon] [Riaz_Zolfonoon] ++ace-proxy 2335 udp ACE Proxy [Riaz_Zolfonoon] [Riaz_Zolfonoon] ++appleugcontrol 2336 tcp Apple UG Control [Gene_Tyacke] [Gene_Tyacke] ++appleugcontrol 2336 udp Apple UG Control [Gene_Tyacke] [Gene_Tyacke] ++ideesrv 2337 tcp ideesrv [Marazzi] [Marazzi] ++ideesrv 2337 udp ideesrv [Marazzi] [Marazzi] ++norton-lambert 2338 tcp Norton Lambert [Richard_de_Mornay] [Richard_de_Mornay] ++norton-lambert 2338 udp Norton Lambert [Richard_de_Mornay] [Richard_de_Mornay] ++3com-webview 2339 tcp 3Com WebView [Jennifer_Grace] [Jennifer_Grace] ++3com-webview 2339 udp 3Com WebView [Jennifer_Grace] [Jennifer_Grace] ++ WRS Registry ++ ++wrs-registry 2340 tcp IANA assigned this [Christophe_Cleraux] [Christophe_Cleraux] ++ well-formed service name as ++ a replacement for ++ "wrs_registry". ++ This entry is an alias to "wrs-registry". This entry is now ++wrs_registry 2340 tcp WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service ++ discovery mechanisms. ++ WRS Registry ++ ++wrs-registry 2340 udp IANA assigned this [Christophe_Cleraux] [Christophe_Cleraux] ++ well-formed service name as ++ a replacement for ++ "wrs_registry". ++ This entry is an alias to "wrs-registry". This entry is now ++wrs_registry 2340 udp WRS Registry [Christophe_Cleraux] [Christophe_Cleraux] historic, not usable for use with many common service ++ discovery mechanisms. ++xiostatus 2341 tcp XIO Status [Randy_Maas] [Randy_Maas] ++xiostatus 2341 udp XIO Status [Randy_Maas] [Randy_Maas] ++manage-exec 2342 tcp Seagate Manage Exec [Jim_Flaherty] [Jim_Flaherty] ++manage-exec 2342 udp Seagate Manage Exec [Jim_Flaherty] [Jim_Flaherty] ++nati-logos 2343 tcp nati logos [James_Juhasz] [James_Juhasz] ++nati-logos 2343 udp nati logos [James_Juhasz] [James_Juhasz] ++fcmsys 2344 tcp fcmsys ++fcmsys 2344 udp fcmsys ++dbm 2345 tcp dbm [Dean_Robson] [Dean_Robson] ++dbm 2345 udp dbm [Dean_Robson] [Dean_Robson] ++ Game Connection Port ++ ++redstorm-join 2346 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_join". ++ This entry is an alias to "redstorm-join". This entry is now ++redstorm_join 2346 tcp Game Connection Port historic, not usable for use with many common service ++ discovery mechanisms. ++ Game Connection Port ++ ++redstorm-join 2346 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_join". ++ This entry is an alias to "redstorm-join". This entry is now ++redstorm_join 2346 udp Game Connection Port historic, not usable for use with many common service ++ discovery mechanisms. ++ Game Announcement and ++ Location ++ ++redstorm-find 2347 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_find". ++ Game Announcement and This entry is an alias to "redstorm-find". This entry is now ++redstorm_find 2347 tcp Location historic, not usable for use with many common service ++ discovery mechanisms. ++ Game Announcement and ++ Location ++ ++redstorm-find 2347 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_find". ++ Game Announcement and This entry is an alias to "redstorm-find". This entry is now ++redstorm_find 2347 udp Location historic, not usable for use with many common service ++ discovery mechanisms. ++ Information to query for ++ game status ++ ++redstorm-info 2348 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_info". ++ Information to query for This entry is an alias to "redstorm-info". This entry is now ++redstorm_info 2348 tcp game status historic, not usable for use with many common service ++ discovery mechanisms. ++ Information to query for ++ game status ++ ++redstorm-info 2348 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "redstorm_info". ++ Information to query for This entry is an alias to "redstorm-info". This entry is now ++redstorm_info 2348 udp game status historic, not usable for use with many common service ++ discovery mechanisms. ++ Diagnostics Port ++ ++redstorm-diag 2349 tcp IANA assigned this [David_Weinstein] [David_Weinstein] ++ well-formed service name as ++ a replacement for ++ "redstorm_diag". ++ This entry is an alias to "redstorm-diag". This entry is now ++redstorm_diag 2349 tcp Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service ++ discovery mechanisms. ++ Diagnostics Port ++ ++redstorm-diag 2349 udp IANA assigned this [David_Weinstein] [David_Weinstein] ++ well-formed service name as ++ a replacement for ++ "redstorm_diag". ++ This entry is an alias to "redstorm-diag". This entry is now ++redstorm_diag 2349 udp Diagnostics Port [David_Weinstein] [David_Weinstein] historic, not usable for use with many common service ++ discovery mechanisms. ++psbserver 2350 tcp Pharos Booking Server ++psbserver 2350 udp Pharos Booking Server ++psrserver 2351 tcp psrserver ++psrserver 2351 udp psrserver ++pslserver 2352 tcp pslserver ++pslserver 2352 udp pslserver ++pspserver 2353 tcp pspserver ++pspserver 2353 udp pspserver ++psprserver 2354 tcp psprserver ++psprserver 2354 udp psprserver ++psdbserver 2355 tcp psdbserver [Paul_Reddy] [Paul_Reddy] ++psdbserver 2355 udp psdbserver [Paul_Reddy] [Paul_Reddy] ++gxtelmd 2356 tcp GXT License Managemant [Robert_Hodgson] [Robert_Hodgson] ++gxtelmd 2356 udp GXT License Managemant [Robert_Hodgson] [Robert_Hodgson] ++unihub-server 2357 tcp UniHub Server [Tim_Kenyon] [Tim_Kenyon] ++unihub-server 2357 udp UniHub Server [Tim_Kenyon] [Tim_Kenyon] ++futrix 2358 tcp Futrix [Peter_Frankenberg] [Peter_Frankenberg] ++futrix 2358 udp Futrix [Peter_Frankenberg] [Peter_Frankenberg] ++flukeserver 2359 tcp FlukeServer [Bill_Marbaker] [Bill_Marbaker] ++flukeserver 2359 udp FlukeServer [Bill_Marbaker] [Bill_Marbaker] ++nexstorindltd 2360 tcp NexstorIndLtd [NexStor_India_Limite] [NexStor_India_Limite] ++nexstorindltd 2360 udp NexstorIndLtd [NexStor_India_Limite] [NexStor_India_Limite] ++tl1 2361 tcp TL1 [Charles_Scott_Robers] [Charles_Scott_Robers] ++tl1 2361 udp TL1 [Charles_Scott_Robers] [Charles_Scott_Robers] ++digiman 2362 tcp digiman [Aaron_S_Kurland] [Aaron_S_Kurland] ++digiman 2362 udp digiman [Aaron_S_Kurland] [Aaron_S_Kurland] ++mediacntrlnfsd 2363 tcp Media Central NFSD [Shivakumar_S_Govind] [Shivakumar_S_Govind] ++mediacntrlnfsd 2363 udp Media Central NFSD [Shivakumar_S_Govind] [Shivakumar_S_Govind] ++oi-2000 2364 tcp OI-2000 [Software_Horizons_In] [Software_Horizons_In] ++oi-2000 2364 udp OI-2000 [Software_Horizons_In] [Software_Horizons_In] ++dbref 2365 tcp dbref [Yoshihiro_Yamazaki] [Yoshihiro_Yamazaki] ++dbref 2365 udp dbref [Yoshihiro_Yamazaki] [Yoshihiro_Yamazaki] ++qip-login 2366 tcp qip-login [Mike_Morgan] [Mike_Morgan] ++qip-login 2366 udp qip-login [Mike_Morgan] [Mike_Morgan] ++service-ctrl 2367 tcp Service Control [Humberto_Sanchez] [Humberto_Sanchez] ++service-ctrl 2367 udp Service Control [Humberto_Sanchez] [Humberto_Sanchez] ++opentable 2368 tcp OpenTable [Brett_Goldstein] [Brett_Goldstein] ++opentable 2368 udp OpenTable [Brett_Goldstein] [Brett_Goldstein] ++ 2369 Unassigned De-registered (28 March 2006) ++ Port 2370 ++l3-hbmon 2370 tcp L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially ++ used by ++ Compaq ++ Port 2370 ++l3-hbmon 2370 udp L3-HBMon [Dolores_Scott] [Dolores_Scott] Unofficially ++ used by ++ Compaq ++worldwire 2371 tcp Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] ++worldwire 2371 udp Compaq WorldWire Port [Michael_Spratte] [Michael_Spratte] ++lanmessenger 2372 tcp LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 ++lanmessenger 2372 udp LanMessenger [Garrett_Padera] [Garrett_Padera] 2008-02-01 ++remographlm 2373 tcp Remograph License Manager [Per_Fahlberg] [Per_Fahlberg] 2009-01-21 ++ 2373 udp Reserved ++hydra 2374 tcp Hydra RPC [Jacob_Feisley] [Jacob_Feisley] 2009-01-21 ++ 2374 udp Reserved ++ 2375-2380 Unassigned ++compaq-https 2381 tcp Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] ++compaq-https 2381 udp Compaq HTTPS [Scott_Shaffer] [Scott_Shaffer] ++ms-olap3 2382 tcp Microsoft OLAP ++ms-olap3 2382 udp Microsoft OLAP ++ms-olap4 2383 tcp Microsoft OLAP [Mosha_Pasumansky] [Mosha_Pasumansky] ++ms-olap4 2383 udp Microsoft OLAP [Mosha_Pasumansky] [Mosha_Pasumansky] ++sd-request 2384 tcp SD-REQUEST ++sd-capacity 2384 udp SD-CAPACITY [Jason_McManus_2] [Jason_McManus_2] ++sd-data 2385 tcp SD-DATA [Jason_McManus_2] [Jason_McManus_2] ++sd-data 2385 udp SD-DATA [Jason_McManus_2] [Jason_McManus_2] ++virtualtape 2386 tcp Virtual Tape ++virtualtape 2386 udp Virtual Tape ++vsamredirector 2387 tcp VSAM Redirector [Ingo_Franzki] [Ingo_Franzki] ++vsamredirector 2387 udp VSAM Redirector [Ingo_Franzki] [Ingo_Franzki] ++mynahautostart 2388 tcp MYNAH AutoStart [Thomas_J_Klehr] [Thomas_J_Klehr] ++mynahautostart 2388 udp MYNAH AutoStart [Thomas_J_Klehr] [Thomas_J_Klehr] ++ovsessionmgr 2389 tcp OpenView Session Mgr [Eric_Pulsipher] [Eric_Pulsipher] ++ovsessionmgr 2389 udp OpenView Session Mgr [Eric_Pulsipher] [Eric_Pulsipher] ++rsmtp 2390 tcp RSMTP [Geoff_Collyer] [Geoff_Collyer] ++rsmtp 2390 udp RSMTP [Geoff_Collyer] [Geoff_Collyer] ++3com-net-mgmt 2391 tcp 3COM Net Management [Prathibha_Nagvar] [Prathibha_Nagvar] ++3com-net-mgmt 2391 udp 3COM Net Management [Prathibha_Nagvar] [Prathibha_Nagvar] ++tacticalauth 2392 tcp Tactical Auth [David_Yon] [David_Yon] ++tacticalauth 2392 udp Tactical Auth [David_Yon] [David_Yon] ++ms-olap1 2393 tcp MS OLAP 1 ++ms-olap1 2393 udp MS OLAP 1 ++ms-olap2 2394 tcp MS OLAP 2 [Mosha_Pasumansky] [Mosha_Pasumansky] ++ms-olap2 2394 udp MS OLAP 2 [Mosha_Pasumansky] [Mosha_Pasumansky] ++ LAN900 Remote ++ ++lan900-remote 2395 tcp IANA assigned this [Tom_Quinlan] [Tom_Quinlan] ++ well-formed service name as ++ a replacement for ++ "lan900_remote". ++ This entry is an alias to "lan900-remote". This entry is now ++lan900_remote 2395 tcp LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service ++ discovery mechanisms. ++ LAN900 Remote ++ ++lan900-remote 2395 udp IANA assigned this [Tom_Quinlan] [Tom_Quinlan] ++ well-formed service name as ++ a replacement for ++ "lan900_remote". ++ This entry is an alias to "lan900-remote". This entry is now ++lan900_remote 2395 udp LAN900 Remote [Tom_Quinlan] [Tom_Quinlan] historic, not usable for use with many common service ++ discovery mechanisms. ++wusage 2396 tcp Wusage [Thomas_Boutell] [Thomas_Boutell] ++wusage 2396 udp Wusage [Thomas_Boutell] [Thomas_Boutell] ++ncl 2397 tcp NCL [Robert_Wiebe] [Robert_Wiebe] ++ncl 2397 udp NCL [Robert_Wiebe] [Robert_Wiebe] ++orbiter 2398 tcp Orbiter [David_Goldberg] [David_Goldberg] ++orbiter 2398 udp Orbiter [David_Goldberg] [David_Goldberg] ++fmpro-fdal 2399 tcp FileMaker, Inc. - Data [Clay_Maeckal] [Clay_Maeckal] ++ Access Layer ++fmpro-fdal 2399 udp FileMaker, Inc. - Data [Clay_Maeckal] [Clay_Maeckal] ++ Access Layer ++opequus-server 2400 tcp OpEquus Server [Gavin_Hutchinson_2] [Gavin_Hutchinson_2] ++opequus-server 2400 udp OpEquus Server [Gavin_Hutchinson_2] [Gavin_Hutchinson_2] ++cvspserver 2401 tcp cvspserver [Jim_Kingdon] [Jim_Kingdon] ++cvspserver 2401 udp cvspserver [Jim_Kingdon] [Jim_Kingdon] ++taskmaster2000 2402 tcp TaskMaster 2000 Server ++taskmaster2000 2402 udp TaskMaster 2000 Server ++taskmaster2000 2403 tcp TaskMaster 2000 Web [Ed_Odjaghian] [Ed_Odjaghian] ++taskmaster2000 2403 udp TaskMaster 2000 Web [Ed_Odjaghian] [Ed_Odjaghian] ++iec-104 2404 tcp IEC 60870-5-104 process [Walter_K_Eichelburg] [Walter_K_Eichelburg] ++ control over IP ++iec-104 2404 udp IEC 60870-5-104 process [Walter_K_Eichelburg] [Walter_K_Eichelburg] ++ control over IP ++trc-netpoll 2405 tcp TRC Netpoll [Bizhan_Ghavami] [Bizhan_Ghavami] ++trc-netpoll 2405 udp TRC Netpoll [Bizhan_Ghavami] [Bizhan_Ghavami] ++jediserver 2406 tcp JediServer [Paul_McEntire] [Paul_McEntire] ++jediserver 2406 udp JediServer [Paul_McEntire] [Paul_McEntire] ++orion 2407 tcp Orion [Matthew_Horoschun] [Matthew_Horoschun] ++orion 2407 udp Orion [Matthew_Horoschun] [Matthew_Horoschun] ++railgun-webaccl 2408 tcp CloudFlare Railgun Web [CloudFlare] [John_Graham_Cumming] 2012-03-09 ++ Acceleration Protocol ++ 2408 udp Reserved 2012-03-09 This entry is being removed on 2012-03-09. ++sns-protocol 2409 tcp SNS Protocol [Amir_Blich] [Amir_Blich] ++sns-protocol 2409 udp SNS Protocol [Amir_Blich] [Amir_Blich] ++vrts-registry 2410 tcp VRTS Registry [Pranay_Varma] [Pranay_Varma] ++vrts-registry 2410 udp VRTS Registry [Pranay_Varma] [Pranay_Varma] ++netwave-ap-mgmt 2411 tcp Netwave AP Management [Johnny_Zweig] [Johnny_Zweig] ++netwave-ap-mgmt 2411 udp Netwave AP Management [Johnny_Zweig] [Johnny_Zweig] ++cdn 2412 tcp CDN [Alan_Noble] [Alan_Noble] ++cdn 2412 udp CDN [Alan_Noble] [Alan_Noble] ++orion-rmi-reg 2413 tcp orion-rmi-reg [J_S_Greenfield_2] [J_S_Greenfield_2] ++orion-rmi-reg 2413 udp orion-rmi-reg [J_S_Greenfield_2] [J_S_Greenfield_2] ++beeyond 2414 tcp Beeyond [Bob_Deblier] [Bob_Deblier] ++beeyond 2414 udp Beeyond [Bob_Deblier] [Bob_Deblier] ++codima-rtp 2415 tcp Codima Remote Transaction [Sylvia_Ross] [Sylvia_Ross] ++ Protocol ++codima-rtp 2415 udp Codima Remote Transaction [Sylvia_Ross] [Sylvia_Ross] ++ Protocol ++rmtserver 2416 tcp RMT Server [Yvon_Marineau] [Yvon_Marineau] ++rmtserver 2416 udp RMT Server [Yvon_Marineau] [Yvon_Marineau] ++composit-server 2417 tcp Composit Server [Katsuaki_Naoi] [Katsuaki_Naoi] ++composit-server 2417 udp Composit Server [Katsuaki_Naoi] [Katsuaki_Naoi] ++cas 2418 tcp cas [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++cas 2418 udp cas [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++attachmate-s2s 2419 tcp Attachmate S2S [Chris_Rominski] [Chris_Rominski] ++attachmate-s2s 2419 udp Attachmate S2S [Chris_Rominski] [Chris_Rominski] ++dslremote-mgmt 2420 tcp DSL Remote Management [Westell] [Westell] ++dslremote-mgmt 2420 udp DSL Remote Management [Westell] [Westell] ++g-talk 2421 tcp G-Talk [Matt_Hammond] [Matt_Hammond] ++g-talk 2421 udp G-Talk [Matt_Hammond] [Matt_Hammond] ++crmsbits 2422 tcp CRMSBITS [Rod_Ward] [Rod_Ward] ++crmsbits 2422 udp CRMSBITS [Rod_Ward] [Rod_Ward] ++rnrp 2423 tcp RNRP [Per_Sahlqvist] [Per_Sahlqvist] ++rnrp 2423 udp RNRP [Per_Sahlqvist] [Per_Sahlqvist] ++kofax-svr 2424 tcp KOFAX-SVR [Steven_Kilby] [Steven_Kilby] 2011-04-25 ++kofax-svr 2424 udp KOFAX-SVR [Steven_Kilby] [Steven_Kilby] 2011-04-25 ++fjitsuappmgr 2425 tcp Fujitsu App Manager [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++fjitsuappmgr 2425 udp Fujitsu App Manager [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++ 2426 Unassigned 2002-04-29 ++mgcp-gateway 2427 tcp Media Gateway Control [Christian_Huitema] [Christian_Huitema] ++ Protocol Gateway ++mgcp-gateway 2427 udp Media Gateway Control [Christian_Huitema] [Christian_Huitema] ++ Protocol Gateway ++ott 2428 tcp One Way Trip Time [Greg_Troxel] [Greg_Troxel] ++ott 2428 udp One Way Trip Time [Greg_Troxel] [Greg_Troxel] ++ft-role 2429 tcp FT-ROLE [Doug_Boone] [Doug_Boone] ++ft-role 2429 udp FT-ROLE [Doug_Boone] [Doug_Boone] ++venus 2430 tcp venus ++venus 2430 udp venus ++venus-se 2431 tcp venus-se ++venus-se 2431 udp venus-se ++codasrv 2432 tcp codasrv ++codasrv 2432 udp codasrv ++codasrv-se 2433 tcp codasrv-se [Robert_Watson] [Robert_Watson] ++codasrv-se 2433 udp codasrv-se [Robert_Watson] [Robert_Watson] ++pxc-epmap 2434 tcp pxc-epmap [Jun_Nakamura] [Jun_Nakamura] ++pxc-epmap 2434 udp pxc-epmap [Jun_Nakamura] [Jun_Nakamura] ++optilogic 2435 tcp OptiLogic [Clark_Williams] [Clark_Williams] ++optilogic 2435 udp OptiLogic [Clark_Williams] [Clark_Williams] ++topx 2436 tcp TOP/X [Dragos_Pop] [Dragos_Pop] ++topx 2436 udp TOP/X [Dragos_Pop] [Dragos_Pop] ++unicontrol 2437 tcp UniControl [Ing_Markus_Huemer] [Ing_Markus_Huemer] ++unicontrol 2437 udp UniControl [Ing_Markus_Huemer] [Ing_Markus_Huemer] ++msp 2438 tcp MSP [Evan_Caves] [Evan_Caves] ++msp 2438 udp MSP [Evan_Caves] [Evan_Caves] ++sybasedbsynch 2439 tcp SybaseDBSynch [Dave_Neudoerffer] [Dave_Neudoerffer] ++sybasedbsynch 2439 udp SybaseDBSynch [Dave_Neudoerffer] [Dave_Neudoerffer] ++spearway 2440 tcp Spearway Lockers [Pierre_Frisch] [Pierre_Frisch] ++spearway 2440 udp Spearway Lockers [Pierre_Frisch] [Pierre_Frisch] ++pvsw-inet 2441 tcp Pervasive I*net Data Server [Chuck_Talk] [Chuck_Talk] ++pvsw-inet 2441 udp Pervasive I*net Data Server [Chuck_Talk] [Chuck_Talk] ++netangel 2442 tcp Netangel [Ladislav_Baranyay] [Ladislav_Baranyay] ++netangel 2442 udp Netangel [Ladislav_Baranyay] [Ladislav_Baranyay] ++powerclientcsf 2443 tcp PowerClient Central Storage [Brian_Klassen] [Brian_Klassen] ++ Facility ++powerclientcsf 2443 udp PowerClient Central Storage [Brian_Klassen] [Brian_Klassen] ++ Facility ++btpp2sectrans 2444 tcp BT PP2 Sectrans [Ian_Daniels] [Ian_Daniels] ++btpp2sectrans 2444 udp BT PP2 Sectrans [Ian_Daniels] [Ian_Daniels] ++dtn1 2445 tcp DTN1 [Bob_Gaddie] [Bob_Gaddie] ++dtn1 2445 udp DTN1 [Bob_Gaddie] [Bob_Gaddie] ++ bues_service ++ ++bues-service 2446 tcp IANA assigned this [Leonhard_Diekmann] [Leonhard_Diekmann] ++ well-formed service name as ++ a replacement for ++ "bues_service". ++ This entry is an alias to "bues-service". This entry is now ++bues_service 2446 tcp bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service ++ discovery mechanisms. ++ bues_service ++ ++bues-service 2446 udp IANA assigned this [Leonhard_Diekmann] [Leonhard_Diekmann] ++ well-formed service name as ++ a replacement for ++ "bues_service". ++ This entry is an alias to "bues-service". This entry is now ++bues_service 2446 udp bues_service [Leonhard_Diekmann] [Leonhard_Diekmann] historic, not usable for use with many common service ++ discovery mechanisms. ++ovwdb 2447 tcp OpenView NNM daemon [Eric_Pulsipher_2] [Eric_Pulsipher_2] ++ovwdb 2447 udp OpenView NNM daemon [Eric_Pulsipher_2] [Eric_Pulsipher_2] ++hpppssvr 2448 tcp hpppsvr [Bridgette_Landers] [Bridgette_Landers] ++hpppssvr 2448 udp hpppsvr [Bridgette_Landers] [Bridgette_Landers] ++ratl 2449 tcp RATL [Paul_Greenfield] [Paul_Greenfield] ++ratl 2449 udp RATL [Paul_Greenfield] [Paul_Greenfield] ++netadmin 2450 tcp netadmin ++netadmin 2450 udp netadmin ++netchat 2451 tcp netchat [Julian_Mehnle] [Julian_Mehnle] ++netchat 2451 udp netchat [Julian_Mehnle] [Julian_Mehnle] ++snifferclient 2452 tcp SnifferClient [Amy_Weaver_2] [Amy_Weaver_2] ++snifferclient 2452 udp SnifferClient [Amy_Weaver_2] [Amy_Weaver_2] ++madge-ltd 2453 tcp madge ltd [Mark_Lyall] [Mark_Lyall] ++madge-ltd 2453 udp madge ltd [Mark_Lyall] [Mark_Lyall] ++indx-dds 2454 tcp IndX-DDS [Paul_Carmichael] [Paul_Carmichael] ++indx-dds 2454 udp IndX-DDS [Paul_Carmichael] [Paul_Carmichael] ++wago-io-system 2455 tcp WAGO-IO-SYSTEM [Jorg_Hoffmann] [Jorg_Hoffmann] ++wago-io-system 2455 udp WAGO-IO-SYSTEM [Jorg_Hoffmann] [Jorg_Hoffmann] ++altav-remmgt 2456 tcp altav-remmgt [Gary_M_Allen] [Gary_M_Allen] ++altav-remmgt 2456 udp altav-remmgt [Gary_M_Allen] [Gary_M_Allen] ++rapido-ip 2457 tcp Rapido_IP [Man_Shuen_Cheung] [Man_Shuen_Cheung] ++rapido-ip 2457 udp Rapido_IP [Man_Shuen_Cheung] [Man_Shuen_Cheung] ++griffin 2458 tcp griffin [Tom_Taylor] [Tom_Taylor] ++griffin 2458 udp griffin [Tom_Taylor] [Tom_Taylor] ++community 2459 tcp Community [David_Schwartz] [David_Schwartz] ++community 2459 udp Community [David_Schwartz] [David_Schwartz] ++ms-theater 2460 tcp ms-theater [Anton_Kucer] [Anton_Kucer] ++ms-theater 2460 udp ms-theater [Anton_Kucer] [Anton_Kucer] ++qadmifoper 2461 tcp qadmifoper ++qadmifoper 2461 udp qadmifoper ++qadmifevent 2462 tcp qadmifevent [Pekka_Takaranta] [Pekka_Takaranta] ++qadmifevent 2462 udp qadmifevent [Pekka_Takaranta] [Pekka_Takaranta] ++lsi-raid-mgmt 2463 tcp LSI RAID Management [Kevin_Copas] [Kevin_Copas] 2008-02-07 ++lsi-raid-mgmt 2463 udp LSI RAID Management [Kevin_Copas] [Kevin_Copas] 2008-02-07 ++direcpc-si 2464 tcp DirecPC SI [Doug_Dillon] [Doug_Dillon] ++direcpc-si 2464 udp DirecPC SI [Doug_Dillon] [Doug_Dillon] ++lbm 2465 tcp Load Balance Management ++lbm 2465 udp Load Balance Management ++lbf 2466 tcp Load Balance Forwarding [Kazuhiro_Koide] [Kazuhiro_Koide] ++lbf 2466 udp Load Balance Forwarding [Kazuhiro_Koide] [Kazuhiro_Koide] ++high-criteria 2467 tcp High Criteria [Konstantin_Iavid] [Konstantin_Iavid] ++high-criteria 2467 udp High Criteria [Konstantin_Iavid] [Konstantin_Iavid] ++qip-msgd 2468 tcp qip_msgd [Mike_Morgan] [Mike_Morgan] ++qip-msgd 2468 udp qip_msgd [Mike_Morgan] [Mike_Morgan] ++mti-tcs-comm 2469 tcp MTI-TCS-COMM [Mario_Bonin] [Mario_Bonin] ++mti-tcs-comm 2469 udp MTI-TCS-COMM [Mario_Bonin] [Mario_Bonin] ++taskman-port 2470 tcp taskman port [Boris_Panteleev] [Boris_Panteleev] ++taskman-port 2470 udp taskman port [Boris_Panteleev] [Boris_Panteleev] ++seaodbc 2471 tcp SeaODBC [Adrian_Hornby] [Adrian_Hornby] ++seaodbc 2471 udp SeaODBC [Adrian_Hornby] [Adrian_Hornby] ++c3 2472 tcp C3 [Eckhard_Grieger] [Eckhard_Grieger] ++c3 2472 udp C3 [Eckhard_Grieger] [Eckhard_Grieger] ++aker-cdp 2473 tcp Aker-cdp [Rodrigo_Ormonde] [Rodrigo_Ormonde] ++aker-cdp 2473 udp Aker-cdp [Rodrigo_Ormonde] [Rodrigo_Ormonde] ++vitalanalysis 2474 tcp Vital Analysis [Srinivas_Reddy] [Srinivas_Reddy] ++vitalanalysis 2474 udp Vital Analysis [Srinivas_Reddy] [Srinivas_Reddy] ++ace-server 2475 tcp ACE Server ++ace-server 2475 udp ACE Server ++ace-svr-prop 2476 tcp ACE Server Propagation ++ace-svr-prop 2476 udp ACE Server Propagation ++ssm-cvs 2477 tcp SecurSight Certificate ++ Valifation Service ++ssm-cvs 2477 udp SecurSight Certificate ++ Valifation Service ++ssm-cssps 2478 tcp SecurSight Authentication ++ Server (SSL) ++ssm-cssps 2478 udp SecurSight Authentication ++ Server (SSL) ++ssm-els 2479 tcp SecurSight Event Logging [John_Linn] [John_Linn] ++ Server (SSL) ++ssm-els 2479 udp SecurSight Event Logging [John_Linn] [John_Linn] ++ Server (SSL) ++powerexchange 2480 tcp Informatica PowerExchange [Dale_Norman] [Dale_Norman] ++ Listener ++powerexchange 2480 udp Informatica PowerExchange [Dale_Norman] [Dale_Norman] ++ Listener ++giop 2481 tcp Oracle GIOP ++giop 2481 udp Oracle GIOP ++giop-ssl 2482 tcp Oracle GIOP SSL ++giop-ssl 2482 udp Oracle GIOP SSL ++ttc 2483 tcp Oracle TTC ++ttc 2483 udp Oracle TTC ++ttc-ssl 2484 tcp Oracle TTC SSL [Chandar_Venkataraman] [Chandar_Venkataraman] ++ttc-ssl 2484 udp Oracle TTC SSL [Chandar_Venkataraman] [Chandar_Venkataraman] ++netobjects1 2485 tcp Net Objects1 ++netobjects1 2485 udp Net Objects1 ++netobjects2 2486 tcp Net Objects2 [Francois_Granade] [Francois_Granade] ++netobjects2 2486 udp Net Objects2 [Francois_Granade] [Francois_Granade] ++pns 2487 tcp Policy Notice Service [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++pns 2487 udp Policy Notice Service [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++moy-corp 2488 tcp Moy Corporation [Gang_Gong_Moy] [Gang_Gong_Moy] ++moy-corp 2488 udp Moy Corporation [Gang_Gong_Moy] [Gang_Gong_Moy] ++tsilb 2489 tcp TSILB [James_Irwin] [James_Irwin] ++tsilb 2489 udp TSILB [James_Irwin] [James_Irwin] ++qip-qdhcp 2490 tcp qip_qdhcp [Mike_Morgan] [Mike_Morgan] ++qip-qdhcp 2490 udp qip_qdhcp [Mike_Morgan] [Mike_Morgan] ++conclave-cpp 2491 tcp Conclave CPP [Larry_Lipstone] [Larry_Lipstone] ++conclave-cpp 2491 udp Conclave CPP [Larry_Lipstone] [Larry_Lipstone] ++groove 2492 tcp GROOVE [Ray_Ozzie] [Ray_Ozzie] ++groove 2492 udp GROOVE [Ray_Ozzie] [Ray_Ozzie] ++talarian-mqs 2493 tcp Talarian MQS [Jim_Stabile] [Jim_Stabile] ++talarian-mqs 2493 udp Talarian MQS [Jim_Stabile] [Jim_Stabile] ++bmc-ar 2494 tcp BMC AR [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-ar 2494 udp BMC AR [Portnoy_Boxman] [Portnoy_Boxman] ++fast-rem-serv 2495 tcp Fast Remote Services [Scott_St_Clair] [Scott_St_Clair] ++fast-rem-serv 2495 udp Fast Remote Services [Scott_St_Clair] [Scott_St_Clair] ++dirgis 2496 tcp DIRGIS [Deutschland_Informat] [Deutschland_Informat] ++dirgis 2496 udp DIRGIS [Deutschland_Informat] [Deutschland_Informat] ++quaddb 2497 tcp Quad DB [Jeff_Rosenthal] [Jeff_Rosenthal] ++quaddb 2497 udp Quad DB [Jeff_Rosenthal] [Jeff_Rosenthal] ++odn-castraq 2498 tcp ODN-CasTraq [Richard_Hodges_2] [Richard_Hodges_2] ++odn-castraq 2498 udp ODN-CasTraq [Richard_Hodges_2] [Richard_Hodges_2] ++unicontrol 2499 tcp UniControl [Ing_Markus_Huemer] [Ing_Markus_Huemer] ++unicontrol 2499 udp UniControl [Ing_Markus_Huemer] [Ing_Markus_Huemer] ++rtsserv 2500 tcp Resource Tracking system ++ server ++rtsserv 2500 udp Resource Tracking system ++ server ++rtsclient 2501 tcp Resource Tracking system [Aubrey_Turner] [Aubrey_Turner] ++ client ++rtsclient 2501 udp Resource Tracking system [Aubrey_Turner] [Aubrey_Turner] ++ client ++kentrox-prot 2502 tcp Kentrox Protocol [Anil_Lakhwara] [Anil_Lakhwara] ++kentrox-prot 2502 udp Kentrox Protocol [Anil_Lakhwara] [Anil_Lakhwara] ++nms-dpnss 2503 tcp NMS-DPNSS [Jean_Christophe_Desi] [Jean_Christophe_Desi] ++nms-dpnss 2503 udp NMS-DPNSS [Jean_Christophe_Desi] [Jean_Christophe_Desi] ++wlbs 2504 tcp WLBS [William_Bain] [William_Bain] ++wlbs 2504 udp WLBS [William_Bain] [William_Bain] ++ppcontrol 2505 tcp PowerPlay Control [Max_Magliaro] [Max_Magliaro] 2004-11 ++ppcontrol 2505 udp PowerPlay Control [Max_Magliaro] [Max_Magliaro] 2004-11 ++jbroker 2506 tcp jbroker [Rohit_Garg_2] [Rohit_Garg_2] ++jbroker 2506 udp jbroker [Rohit_Garg_2] [Rohit_Garg_2] ++spock 2507 tcp spock [Jon_A_Christopher] [Jon_A_Christopher] ++spock 2507 udp spock [Jon_A_Christopher] [Jon_A_Christopher] ++jdatastore 2508 tcp JDataStore [Tod_Landis] [Tod_Landis] ++jdatastore 2508 udp JDataStore [Tod_Landis] [Tod_Landis] ++fjmpss 2509 tcp fjmpss [Makoto_Watanabe] [Makoto_Watanabe] ++fjmpss 2509 udp fjmpss [Makoto_Watanabe] [Makoto_Watanabe] ++fjappmgrbulk 2510 tcp fjappmgrbulk [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++fjappmgrbulk 2510 udp fjappmgrbulk [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++metastorm 2511 tcp Metastorm [Eric_Isom] [Eric_Isom] ++metastorm 2511 udp Metastorm [Eric_Isom] [Eric_Isom] ++citrixima 2512 tcp Citrix IMA ++citrixima 2512 udp Citrix IMA ++citrixadmin 2513 tcp Citrix ADMIN [Myk_Willis] [Myk_Willis] ++citrixadmin 2513 udp Citrix ADMIN [Myk_Willis] [Myk_Willis] ++facsys-ntp 2514 tcp Facsys NTP ++facsys-ntp 2514 udp Facsys NTP ++facsys-router 2515 tcp Facsys Router [Jeff_Hoffman] [Jeff_Hoffman] ++facsys-router 2515 udp Facsys Router [Jeff_Hoffman] [Jeff_Hoffman] ++maincontrol 2516 tcp Main Control [Nathan_Sadia] [Nathan_Sadia] ++maincontrol 2516 udp Main Control [Nathan_Sadia] [Nathan_Sadia] ++call-sig-trans 2517 tcp H.323 Annex E call signaling [Gur_Kimchi_2] [Gur_Kimchi_2] ++ transport ++call-sig-trans 2517 udp H.323 Annex E call signaling [Gur_Kimchi_2] [Gur_Kimchi_2] ++ transport ++willy 2518 tcp Willy [Carl_Johan_Wik] [Carl_Johan_Wik] ++willy 2518 udp Willy [Carl_Johan_Wik] [Carl_Johan_Wik] ++globmsgsvc 2519 tcp globmsgsvc [David_Wiltz] [David_Wiltz] ++globmsgsvc 2519 udp globmsgsvc [David_Wiltz] [David_Wiltz] ++pvsw 2520 tcp Pervasive Listener [Chuck_Talk] [Chuck_Talk] ++pvsw 2520 udp Pervasive Listener [Chuck_Talk] [Chuck_Talk] ++adaptecmgr 2521 tcp Adaptec Manager [Mark_Parenti] [Mark_Parenti] ++adaptecmgr 2521 udp Adaptec Manager [Mark_Parenti] [Mark_Parenti] ++windb 2522 tcp WinDb [Larry_Traylor] [Larry_Traylor] ++windb 2522 udp WinDb [Larry_Traylor] [Larry_Traylor] ++qke-llc-v3 2523 tcp Qke LLC V.3 [Joerg_Niehoff] [Joerg_Niehoff] ++qke-llc-v3 2523 udp Qke LLC V.3 [Joerg_Niehoff] [Joerg_Niehoff] ++optiwave-lm 2524 tcp Optiwave License Management [Slawomir_Krzesinski] [Slawomir_Krzesinski] ++optiwave-lm 2524 udp Optiwave License Management [Slawomir_Krzesinski] [Slawomir_Krzesinski] ++ms-v-worlds 2525 tcp MS V-Worlds [Pete_Wong] [Pete_Wong] ++ms-v-worlds 2525 udp MS V-Worlds [Pete_Wong] [Pete_Wong] ++ema-sent-lm 2526 tcp EMA License Manager [Thaddeus_Perala] [Thaddeus_Perala] ++ema-sent-lm 2526 udp EMA License Manager [Thaddeus_Perala] [Thaddeus_Perala] ++iqserver 2527 tcp IQ Server [Nick_Straguzzi] [Nick_Straguzzi] ++iqserver 2527 udp IQ Server [Nick_Straguzzi] [Nick_Straguzzi] ++ NCR CCL ++ ++ncr-ccl 2528 tcp IANA assigned this [Amitava_Dutta] [Amitava_Dutta] ++ well-formed service name as ++ a replacement for "ncr_ccl". ++ This entry is an alias to "ncr-ccl". This entry is now ++ncr_ccl 2528 tcp NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service ++ discovery mechanisms. ++ NCR CCL ++ ++ncr-ccl 2528 udp IANA assigned this [Amitava_Dutta] [Amitava_Dutta] ++ well-formed service name as ++ a replacement for "ncr_ccl". ++ This entry is an alias to "ncr-ccl". This entry is now ++ncr_ccl 2528 udp NCR CCL [Amitava_Dutta] [Amitava_Dutta] historic, not usable for use with many common service ++ discovery mechanisms. ++utsftp 2529 tcp UTS FTP [David_Moore] [David_Moore] ++utsftp 2529 udp UTS FTP [David_Moore] [David_Moore] ++vrcommerce 2530 tcp VR Commerce [Yosi_Mass] [Yosi_Mass] ++vrcommerce 2530 udp VR Commerce [Yosi_Mass] [Yosi_Mass] ++ito-e-gui 2531 tcp ITO-E GUI [Michael_Haeuptle] [Michael_Haeuptle] ++ito-e-gui 2531 udp ITO-E GUI [Michael_Haeuptle] [Michael_Haeuptle] ++ovtopmd 2532 tcp OVTOPMD [Eric_Pulsipher] [Eric_Pulsipher] ++ovtopmd 2532 udp OVTOPMD [Eric_Pulsipher] [Eric_Pulsipher] ++snifferserver 2533 tcp SnifferServer [Amy_Weaver_3] [Amy_Weaver_3] ++snifferserver 2533 udp SnifferServer [Amy_Weaver_3] [Amy_Weaver_3] ++combox-web-acc 2534 tcp Combox Web Access [Yochai_Cohen] [Yochai_Cohen] ++combox-web-acc 2534 udp Combox Web Access [Yochai_Cohen] [Yochai_Cohen] ++madcap 2535 tcp MADCAP [Stephen_Hanna_2] [Stephen_Hanna_2] ++madcap 2535 udp MADCAP [Stephen_Hanna_2] [Stephen_Hanna_2] ++btpp2audctr1 2536 tcp btpp2audctr1 [Ian_Daniels] [Ian_Daniels] ++btpp2audctr1 2536 udp btpp2audctr1 [Ian_Daniels] [Ian_Daniels] ++upgrade 2537 tcp Upgrade Protocol [Breck_Auten] [Breck_Auten] ++upgrade 2537 udp Upgrade Protocol [Breck_Auten] [Breck_Auten] ++vnwk-prapi 2538 tcp vnwk-prapi [John_Hasselkus] [John_Hasselkus] ++vnwk-prapi 2538 udp vnwk-prapi [John_Hasselkus] [John_Hasselkus] ++vsiadmin 2539 tcp VSI Admin [Rob_Juergens] [Rob_Juergens] ++vsiadmin 2539 udp VSI Admin [Rob_Juergens] [Rob_Juergens] ++lonworks 2540 tcp LonWorks ++lonworks 2540 udp LonWorks ++lonworks2 2541 tcp LonWorks2 [Gary_Bartlett] [Gary_Bartlett] ++lonworks2 2541 udp LonWorks2 [Gary_Bartlett] [Gary_Bartlett] ++udrawgraph 2542 tcp uDraw(Graph) [Bremen] [Bremen] ++udrawgraph 2542 udp uDraw(Graph) [Bremen] [Bremen] ++reftek 2543 tcp REFTEK [Phil_Davidson] [Phil_Davidson] ++reftek 2543 udp REFTEK [Phil_Davidson] [Phil_Davidson] ++novell-zen 2544 tcp Management Daemon Refresh [Ty_Ellis] [Ty_Ellis] ++novell-zen 2544 udp Management Daemon Refresh [Ty_Ellis] [Ty_Ellis] ++sis-emt 2545 tcp sis-emt [Bill_Crawford] [Bill_Crawford] ++sis-emt 2545 udp sis-emt [Bill_Crawford] [Bill_Crawford] ++vytalvaultbrtp 2546 tcp vytalvaultbrtp ++vytalvaultbrtp 2546 udp vytalvaultbrtp ++vytalvaultvsmp 2547 tcp vytalvaultvsmp ++vytalvaultvsmp 2547 udp vytalvaultvsmp ++vytalvaultpipe 2548 tcp vytalvaultpipe [Tim_Boldt] [Tim_Boldt] ++vytalvaultpipe 2548 udp vytalvaultpipe [Tim_Boldt] [Tim_Boldt] ++ipass 2549 tcp IPASS [Michael_Fischer] [Michael_Fischer] ++ipass 2549 udp IPASS [Michael_Fischer] [Michael_Fischer] ++ads 2550 tcp ADS [Michael_O_Connor] [Michael_O_Connor] ++ads 2550 udp ADS [Michael_O_Connor] [Michael_O_Connor] ++isg-uda-server 2551 tcp ISG UDA Server [Dror_Harari] [Dror_Harari] ++isg-uda-server 2551 udp ISG UDA Server [Dror_Harari] [Dror_Harari] ++call-logging 2552 tcp Call Logging [Dean_Webb] [Dean_Webb] ++call-logging 2552 udp Call Logging [Dean_Webb] [Dean_Webb] ++efidiningport 2553 tcp efidiningport [Lynn_Carter] [Lynn_Carter] ++efidiningport 2553 udp efidiningport [Lynn_Carter] [Lynn_Carter] ++vcnet-link-v10 2554 tcp VCnet-Link v10 [Csaba_Mate] [Csaba_Mate] ++vcnet-link-v10 2554 udp VCnet-Link v10 [Csaba_Mate] [Csaba_Mate] ++compaq-wcp 2555 tcp Compaq WCP [Ferruccio_Barletta] [Ferruccio_Barletta] ++compaq-wcp 2555 udp Compaq WCP [Ferruccio_Barletta] [Ferruccio_Barletta] ++nicetec-nmsvc 2556 tcp nicetec-nmsvc ++nicetec-nmsvc 2556 udp nicetec-nmsvc ++nicetec-mgmt 2557 tcp nicetec-mgmt [Joerg_Paulus] [Joerg_Paulus] ++nicetec-mgmt 2557 udp nicetec-mgmt [Joerg_Paulus] [Joerg_Paulus] ++pclemultimedia 2558 tcp PCLE Multi Media [Jacob_Gsoedl] [Jacob_Gsoedl] ++pclemultimedia 2558 udp PCLE Multi Media [Jacob_Gsoedl] [Jacob_Gsoedl] ++lstp 2559 tcp LSTP [Waiki_Wright] [Waiki_Wright] ++lstp 2559 udp LSTP [Waiki_Wright] [Waiki_Wright] ++labrat 2560 tcp labrat [John_Harvey] [John_Harvey] ++labrat 2560 udp labrat [John_Harvey] [John_Harvey] ++mosaixcc 2561 tcp MosaixCC [Steven_Frare] [Steven_Frare] ++mosaixcc 2561 udp MosaixCC [Steven_Frare] [Steven_Frare] ++delibo 2562 tcp Delibo [NovaWiz_LTD] [NovaWiz_LTD] ++delibo 2562 udp Delibo [NovaWiz_LTD] [NovaWiz_LTD] ++cti-redwood 2563 tcp CTI Redwood [Songwon_Chi] [Songwon_Chi] ++cti-redwood 2563 udp CTI Redwood [Songwon_Chi] [Songwon_Chi] ++hp-3000-telnet 2564 tcp HP 3000 NS/VT block mode ++ telnet ++hp-3000-telnet 2564 udp HP 3000 NS/VT block mode ++ telnet ++coord-svr 2565 tcp Coordinator Server [Richard_Steiger] [Richard_Steiger] ++coord-svr 2565 udp Coordinator Server [Richard_Steiger] [Richard_Steiger] ++pcs-pcw 2566 tcp pcs-pcw [W_Jordan_Fitzhugh] [W_Jordan_Fitzhugh] ++pcs-pcw 2566 udp pcs-pcw [W_Jordan_Fitzhugh] [W_Jordan_Fitzhugh] ++clp 2567 tcp Cisco Line Protocol [Susan_Hinrichs] [Susan_Hinrichs] ++clp 2567 udp Cisco Line Protocol [Susan_Hinrichs] [Susan_Hinrichs] ++spamtrap 2568 tcp SPAM TRAP [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++spamtrap 2568 udp SPAM TRAP [Charles_Bennett] [Charles_Bennett] 2008-08-29 ++sonuscallsig 2569 tcp Sonus Call Signal [Mark_Garti] [Mark_Garti] ++sonuscallsig 2569 udp Sonus Call Signal [Mark_Garti] [Mark_Garti] ++hs-port 2570 tcp HS Port [Uri_Doron] [Uri_Doron] ++hs-port 2570 udp HS Port [Uri_Doron] [Uri_Doron] ++cecsvc 2571 tcp CECSVC [Roger_Pao] [Roger_Pao] ++cecsvc 2571 udp CECSVC [Roger_Pao] [Roger_Pao] ++ibp 2572 tcp IBP [Jonathan_Downes] [Jonathan_Downes] ++ibp 2572 udp IBP [Jonathan_Downes] [Jonathan_Downes] ++trustestablish 2573 tcp Trust Establish [Yosi_Mass] [Yosi_Mass] ++trustestablish 2573 udp Trust Establish [Yosi_Mass] [Yosi_Mass] ++blockade-bpsp 2574 tcp Blockade BPSP [Blockade] [Blockade] ++blockade-bpsp 2574 udp Blockade BPSP [Blockade] [Blockade] ++hl7 2575 tcp HL7 [Tim_Jacobs] [Tim_Jacobs] ++hl7 2575 udp HL7 [Tim_Jacobs] [Tim_Jacobs] ++tclprodebugger 2576 tcp TCL Pro Debugger ++tclprodebugger 2576 udp TCL Pro Debugger ++scipticslsrvr 2577 tcp Scriptics Lsrvr [Brent_Welch] [Brent_Welch] ++scipticslsrvr 2577 udp Scriptics Lsrvr [Brent_Welch] [Brent_Welch] ++rvs-isdn-dcp 2578 tcp RVS ISDN DCP [Michael_Zirpel] [Michael_Zirpel] ++rvs-isdn-dcp 2578 udp RVS ISDN DCP [Michael_Zirpel] [Michael_Zirpel] ++mpfoncl 2579 tcp mpfoncl [Itaru_Kimura] [Itaru_Kimura] ++mpfoncl 2579 udp mpfoncl [Itaru_Kimura] [Itaru_Kimura] ++tributary 2580 tcp Tributary [Louis_Lu] [Louis_Lu] ++tributary 2580 udp Tributary [Louis_Lu] [Louis_Lu] ++argis-te 2581 tcp ARGIS TE ++argis-te 2581 udp ARGIS TE ++argis-ds 2582 tcp ARGIS DS [John_Legh_Page] [John_Legh_Page] ++argis-ds 2582 udp ARGIS DS [John_Legh_Page] [John_Legh_Page] ++mon 2583 tcp MON [Jim_Trocki] [Jim_Trocki] ++mon 2583 udp MON [Jim_Trocki] [Jim_Trocki] ++cyaserv 2584 tcp cyaserv [Morgan_Jones] [Morgan_Jones] ++cyaserv 2584 udp cyaserv [Morgan_Jones] [Morgan_Jones] ++netx-server 2585 tcp NETX Server ++netx-server 2585 udp NETX Server ++netx-agent 2586 tcp NETX Agent [Brett_Dolecheck] [Brett_Dolecheck] ++netx-agent 2586 udp NETX Agent [Brett_Dolecheck] [Brett_Dolecheck] ++masc 2587 tcp MASC [Pavlin_Ivanov_Radosl] [Pavlin_Ivanov_Radosl] ++masc 2587 udp MASC [Pavlin_Ivanov_Radosl] [Pavlin_Ivanov_Radosl] ++privilege 2588 tcp Privilege [Gil_Hecht] [Gil_Hecht] ++privilege 2588 udp Privilege [Gil_Hecht] [Gil_Hecht] ++quartus-tcl 2589 tcp quartus tcl [Subroto_Datta] [Subroto_Datta] ++quartus-tcl 2589 udp quartus tcl [Subroto_Datta] [Subroto_Datta] ++idotdist 2590 tcp idotdist [Jason_Hunter] [Jason_Hunter] ++idotdist 2590 udp idotdist [Jason_Hunter] [Jason_Hunter] ++maytagshuffle 2591 tcp Maytag Shuffle [Ken_Ksiazek] [Ken_Ksiazek] ++maytagshuffle 2591 udp Maytag Shuffle [Ken_Ksiazek] [Ken_Ksiazek] ++netrek 2592 tcp netrek [Al_Guetzlaff] [Al_Guetzlaff] ++netrek 2592 udp netrek [Al_Guetzlaff] [Al_Guetzlaff] ++mns-mail 2593 tcp MNS Mail Notice Service [Rumiko_Kikuta] [Rumiko_Kikuta] ++mns-mail 2593 udp MNS Mail Notice Service [Rumiko_Kikuta] [Rumiko_Kikuta] ++dts 2594 tcp Data Base Server [Andreas_Roene] [Andreas_Roene] ++dts 2594 udp Data Base Server [Andreas_Roene] [Andreas_Roene] ++worldfusion1 2595 tcp World Fusion 1 ++worldfusion1 2595 udp World Fusion 1 ++worldfusion2 2596 tcp World Fusion 2 [World_Fusion] [World_Fusion] ++worldfusion2 2596 udp World Fusion 2 [World_Fusion] [World_Fusion] ++homesteadglory 2597 tcp Homestead Glory [John_Tokash] [John_Tokash] ++homesteadglory 2597 udp Homestead Glory [John_Tokash] [John_Tokash] ++citriximaclient 2598 tcp Citrix MA Client [Myk_Willis] [Myk_Willis] ++citriximaclient 2598 udp Citrix MA Client [Myk_Willis] [Myk_Willis] ++snapd 2599 tcp Snap Discovery [Kevin_Osborn] [Kevin_Osborn] ++snapd 2599 udp Snap Discovery [Kevin_Osborn] [Kevin_Osborn] ++hpstgmgr 2600 tcp HPSTGMGR [Kevin_Collins] [Kevin_Collins] ++hpstgmgr 2600 udp HPSTGMGR [Kevin_Collins] [Kevin_Collins] ++discp-client 2601 tcp discp client ++discp-client 2601 udp discp client ++discp-server 2602 tcp discp server [Peter_White] [Peter_White] ++discp-server 2602 udp discp server [Peter_White] [Peter_White] ++servicemeter 2603 tcp Service Meter [Duncan_Hare] [Duncan_Hare] ++servicemeter 2603 udp Service Meter [Duncan_Hare] [Duncan_Hare] ++nsc-ccs 2604 tcp NSC CCS ++nsc-ccs 2604 udp NSC CCS ++nsc-posa 2605 tcp NSC POSA [Tom_Findley] [Tom_Findley] ++nsc-posa 2605 udp NSC POSA [Tom_Findley] [Tom_Findley] ++netmon 2606 tcp Dell Netmon ++netmon 2606 udp Dell Netmon ++connection 2607 tcp Dell Connection [Sudhir_Shetty] [Sudhir_Shetty] ++connection 2607 udp Dell Connection [Sudhir_Shetty] [Sudhir_Shetty] ++wag-service 2608 tcp Wag Service [Gilles_Bourquard] [Gilles_Bourquard] ++wag-service 2608 udp Wag Service [Gilles_Bourquard] [Gilles_Bourquard] ++system-monitor 2609 tcp System Monitor [Greg_Robson_Garth] [Greg_Robson_Garth] ++system-monitor 2609 udp System Monitor [Greg_Robson_Garth] [Greg_Robson_Garth] ++versa-tek 2610 tcp VersaTek [James_Kou] [James_Kou] ++versa-tek 2610 udp VersaTek [James_Kou] [James_Kou] ++lionhead 2611 tcp LIONHEAD [Tim_Rance] [Tim_Rance] ++lionhead 2611 udp LIONHEAD [Tim_Rance] [Tim_Rance] ++qpasa-agent 2612 tcp Qpasa Agent [Craig_Ching] [Craig_Ching] ++qpasa-agent 2612 udp Qpasa Agent [Craig_Ching] [Craig_Ching] ++smntubootstrap 2613 tcp SMNTUBootstrap [Matt_Cecile] [Matt_Cecile] ++smntubootstrap 2613 udp SMNTUBootstrap [Matt_Cecile] [Matt_Cecile] ++neveroffline 2614 tcp Never Offline [Dustin_Brand] [Dustin_Brand] ++neveroffline 2614 udp Never Offline [Dustin_Brand] [Dustin_Brand] ++firepower 2615 tcp firepower [Jason_Volk] [Jason_Volk] ++firepower 2615 udp firepower [Jason_Volk] [Jason_Volk] ++appswitch-emp 2616 tcp appswitch-emp [Ted_Ross] [Ted_Ross] ++appswitch-emp 2616 udp appswitch-emp [Ted_Ross] [Ted_Ross] ++cmadmin 2617 tcp Clinical Context Managers [Mark_Morwood] [Mark_Morwood] ++cmadmin 2617 udp Clinical Context Managers [Mark_Morwood] [Mark_Morwood] ++priority-e-com 2618 tcp Priority E-Com [Marcelo_Einhorn_2] [Marcelo_Einhorn_2] ++priority-e-com 2618 udp Priority E-Com [Marcelo_Einhorn_2] [Marcelo_Einhorn_2] ++bruce 2619 tcp bruce [Alec_Muffett] [Alec_Muffett] ++bruce 2619 udp bruce [Alec_Muffett] [Alec_Muffett] ++lpsrecommender 2620 tcp LPSRecommender [Pritham_Shetty_2] [Pritham_Shetty_2] ++lpsrecommender 2620 udp LPSRecommender [Pritham_Shetty_2] [Pritham_Shetty_2] ++miles-apart 2621 tcp Miles Apart Jukebox Server [Michael_Rathmann] [Michael_Rathmann] ++miles-apart 2621 udp Miles Apart Jukebox Server [Michael_Rathmann] [Michael_Rathmann] ++metricadbc 2622 tcp MetricaDBC [Russ_Olivant] [Russ_Olivant] ++metricadbc 2622 udp MetricaDBC [Russ_Olivant] [Russ_Olivant] ++lmdp 2623 tcp LMDP [Ken_Bailey] [Ken_Bailey] ++lmdp 2623 udp LMDP [Ken_Bailey] [Ken_Bailey] ++aria 2624 tcp Aria [Logan_Bruns] [Logan_Bruns] ++aria 2624 udp Aria [Logan_Bruns] [Logan_Bruns] ++blwnkl-port 2625 tcp Blwnkl Port [Weng_Chin_Yung] [Weng_Chin_Yung] ++blwnkl-port 2625 udp Blwnkl Port [Weng_Chin_Yung] [Weng_Chin_Yung] ++gbjd816 2626 tcp gbjd816 [George_Balesta] [George_Balesta] ++gbjd816 2626 udp gbjd816 [George_Balesta] [George_Balesta] ++moshebeeri 2627 tcp Moshe Beeri [Moshe_Beeri] [Moshe_Beeri] ++moshebeeri 2627 udp Moshe Beeri [Moshe_Beeri] [Moshe_Beeri] ++dict 2628 tcp DICT [Rik_Faith] [Rik_Faith] ++dict 2628 udp DICT [Rik_Faith] [Rik_Faith] ++sitaraserver 2629 tcp Sitara Server ++sitaraserver 2629 udp Sitara Server ++sitaramgmt 2630 tcp Sitara Management ++sitaramgmt 2630 udp Sitara Management ++sitaradir 2631 tcp Sitara Dir [Manickam_R_Sridhar] [Manickam_R_Sridhar] ++sitaradir 2631 udp Sitara Dir [Manickam_R_Sridhar] [Manickam_R_Sridhar] ++irdg-post 2632 tcp IRdg Post [IRdg] [IRdg] ++irdg-post 2632 udp IRdg Post [IRdg] [IRdg] ++interintelli 2633 tcp InterIntelli [Mike_Gagle] [Mike_Gagle] ++interintelli 2633 udp InterIntelli [Mike_Gagle] [Mike_Gagle] ++pk-electronics 2634 tcp PK Electronics [Seb_Ibis] [Seb_Ibis] ++pk-electronics 2634 udp PK Electronics [Seb_Ibis] [Seb_Ibis] ++backburner 2635 tcp Back Burner [Kevin_Teiskoetter] [Kevin_Teiskoetter] ++backburner 2635 udp Back Burner [Kevin_Teiskoetter] [Kevin_Teiskoetter] ++solve 2636 tcp Solve [Peter_Morrison] [Peter_Morrison] ++solve 2636 udp Solve [Peter_Morrison] [Peter_Morrison] ++imdocsvc 2637 tcp Import Document Service [Zia_Bhatti] [Zia_Bhatti] ++imdocsvc 2637 udp Import Document Service [Zia_Bhatti] [Zia_Bhatti] ++sybaseanywhere 2638 tcp Sybase Anywhere [Dave_Neudoerffer] [Dave_Neudoerffer] ++sybaseanywhere 2638 udp Sybase Anywhere [Dave_Neudoerffer] [Dave_Neudoerffer] ++aminet 2639 tcp AMInet [Alcorn_McBride_Inc] [Alcorn_McBride_Inc] ++aminet 2639 udp AMInet [Alcorn_McBride_Inc] [Alcorn_McBride_Inc] ++ Sabbagh Associates Licence ++ Manager ++ ++sai-sentlm 2640 tcp IANA assigned this [Elias_Sabbagh] [Elias_Sabbagh] ++ well-formed service name as ++ a replacement for ++ "sai_sentlm". ++ Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now ++sai_sentlm 2640 tcp Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service ++ discovery mechanisms. ++ Sabbagh Associates Licence ++ Manager ++ ++sai-sentlm 2640 udp IANA assigned this [Elias_Sabbagh] [Elias_Sabbagh] ++ well-formed service name as ++ a replacement for ++ "sai_sentlm". ++ Sabbagh Associates Licence This entry is an alias to "sai-sentlm". This entry is now ++sai_sentlm 2640 udp Manager [Elias_Sabbagh] [Elias_Sabbagh] historic, not usable for use with many common service ++ discovery mechanisms. ++hdl-srv 2641 tcp HDL Server [David_Ely] [David_Ely] ++hdl-srv 2641 udp HDL Server [David_Ely] [David_Ely] ++tragic 2642 tcp Tragic [Stu_Mark] [Stu_Mark] ++tragic 2642 udp Tragic [Stu_Mark] [Stu_Mark] ++gte-samp 2643 tcp GTE-SAMP [Asher_Altman] [Asher_Altman] ++gte-samp 2643 udp GTE-SAMP [Asher_Altman] [Asher_Altman] ++travsoft-ipx-t 2644 tcp Travsoft IPX Tunnel [Jack_Wilson] [Jack_Wilson] ++travsoft-ipx-t 2644 udp Travsoft IPX Tunnel [Jack_Wilson] [Jack_Wilson] ++novell-ipx-cmd 2645 tcp Novell IPX CMD [Juan_Carlos_Luciani] [Juan_Carlos_Luciani] ++novell-ipx-cmd 2645 udp Novell IPX CMD [Juan_Carlos_Luciani] [Juan_Carlos_Luciani] ++and-lm 2646 tcp AND License Manager [Dick_van_der_Sijs] [Dick_van_der_Sijs] ++and-lm 2646 udp AND License Manager [Dick_van_der_Sijs] [Dick_van_der_Sijs] ++syncserver 2647 tcp SyncServer [Shawn_Casey] [Shawn_Casey] ++syncserver 2647 udp SyncServer [Shawn_Casey] [Shawn_Casey] ++upsnotifyprot 2648 tcp Upsnotifyprot [Mario_Leboute] [Mario_Leboute] ++upsnotifyprot 2648 udp Upsnotifyprot [Mario_Leboute] [Mario_Leboute] ++vpsipport 2649 tcp VPSIPPORT [Joon_Radley] [Joon_Radley] ++vpsipport 2649 udp VPSIPPORT [Joon_Radley] [Joon_Radley] ++eristwoguns 2650 tcp eristwoguns [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++eristwoguns 2650 udp eristwoguns [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++ebinsite 2651 tcp EBInSite [Lefteris_Kalamaras] [Lefteris_Kalamaras] ++ebinsite 2651 udp EBInSite [Lefteris_Kalamaras] [Lefteris_Kalamaras] ++interpathpanel 2652 tcp InterPathPanel [Stephen_Misel] [Stephen_Misel] ++interpathpanel 2652 udp InterPathPanel [Stephen_Misel] [Stephen_Misel] ++sonus 2653 tcp Sonus [Mark_Garti] [Mark_Garti] ++sonus 2653 udp Sonus [Mark_Garti] [Mark_Garti] ++ Corel VNC Admin ++ ++corel-vncadmin 2654 tcp IANA assigned this [Oleg_Noskov] [Oleg_Noskov] ++ well-formed service name as ++ a replacement for ++ "corel_vncadmin". ++ This entry is an alias to "corel-vncadmin". This entry is now ++corel_vncadmin 2654 tcp Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service ++ discovery mechanisms. ++ Corel VNC Admin ++ ++corel-vncadmin 2654 udp IANA assigned this [Oleg_Noskov] [Oleg_Noskov] ++ well-formed service name as ++ a replacement for ++ "corel_vncadmin". ++ This entry is an alias to "corel-vncadmin". This entry is now ++corel_vncadmin 2654 udp Corel VNC Admin [Oleg_Noskov] [Oleg_Noskov] historic, not usable for use with many common service ++ discovery mechanisms. ++unglue 2655 tcp UNIX Nt Glue [Peter_Santoro] [Peter_Santoro] ++unglue 2655 udp UNIX Nt Glue [Peter_Santoro] [Peter_Santoro] ++kana 2656 tcp Kana [Colin_Goldstein] [Colin_Goldstein] ++kana 2656 udp Kana [Colin_Goldstein] [Colin_Goldstein] ++sns-dispatcher 2657 tcp SNS Dispatcher ++sns-dispatcher 2657 udp SNS Dispatcher ++sns-admin 2658 tcp SNS Admin ++sns-admin 2658 udp SNS Admin ++sns-query 2659 tcp SNS Query [Mary_Holstege] [Mary_Holstege] ++sns-query 2659 udp SNS Query [Mary_Holstege] [Mary_Holstege] ++gcmonitor 2660 tcp GC Monitor [Gustavo_Rodriguez_Ri] [Gustavo_Rodriguez_Ri] ++gcmonitor 2660 udp GC Monitor [Gustavo_Rodriguez_Ri] [Gustavo_Rodriguez_Ri] ++olhost 2661 tcp OLHOST [Robert_Ripberger] [Robert_Ripberger] ++olhost 2661 udp OLHOST [Robert_Ripberger] [Robert_Ripberger] ++bintec-capi 2662 tcp BinTec-CAPI ++bintec-capi 2662 udp BinTec-CAPI ++bintec-tapi 2663 tcp BinTec-TAPI ++bintec-tapi 2663 udp BinTec-TAPI ++patrol-mq-gm 2664 tcp Patrol for MQ GM ++patrol-mq-gm 2664 udp Patrol for MQ GM ++patrol-mq-nm 2665 tcp Patrol for MQ NM [Portnoy_Boxman] [Portnoy_Boxman] ++patrol-mq-nm 2665 udp Patrol for MQ NM [Portnoy_Boxman] [Portnoy_Boxman] ++extensis 2666 tcp extensis [Milton_Sagen] [Milton_Sagen] ++extensis 2666 udp extensis [Milton_Sagen] [Milton_Sagen] ++alarm-clock-s 2667 tcp Alarm Clock Server ++alarm-clock-s 2667 udp Alarm Clock Server ++alarm-clock-c 2668 tcp Alarm Clock Client ++alarm-clock-c 2668 udp Alarm Clock Client ++toad 2669 tcp TOAD [Michael_Marking] [Michael_Marking] ++toad 2669 udp TOAD [Michael_Marking] [Michael_Marking] ++tve-announce 2670 tcp TVE Announce [Dean_Blackketter] [Dean_Blackketter] ++tve-announce 2670 udp TVE Announce [Dean_Blackketter] [Dean_Blackketter] ++newlixreg 2671 tcp newlixreg [Jean_Serge_Gagnon_2] [Jean_Serge_Gagnon_2] ++newlixreg 2671 udp newlixreg [Jean_Serge_Gagnon_2] [Jean_Serge_Gagnon_2] ++nhserver 2672 tcp nhserver [Adrian_Hornby] [Adrian_Hornby] ++nhserver 2672 udp nhserver [Adrian_Hornby] [Adrian_Hornby] ++firstcall42 2673 tcp First Call 42 [Luke_Bowen] [Luke_Bowen] ++firstcall42 2673 udp First Call 42 [Luke_Bowen] [Luke_Bowen] ++ewnn 2674 tcp ewnn [Yasunari_Yamashita] [Yasunari_Yamashita] ++ewnn 2674 udp ewnn [Yasunari_Yamashita] [Yasunari_Yamashita] ++ttc-etap 2675 tcp TTC ETAP [Daniel_Becker] [Daniel_Becker] ++ttc-etap 2675 udp TTC ETAP [Daniel_Becker] [Daniel_Becker] ++simslink 2676 tcp SIMSLink [Steve_Ryckman] [Steve_Ryckman] ++simslink 2676 udp SIMSLink [Steve_Ryckman] [Steve_Ryckman] ++gadgetgate1way 2677 tcp Gadget Gate 1 Way ++gadgetgate1way 2677 udp Gadget Gate 1 Way ++gadgetgate2way 2678 tcp Gadget Gate 2 Way [Matt_Rollins] [Matt_Rollins] ++gadgetgate2way 2678 udp Gadget Gate 2 Way [Matt_Rollins] [Matt_Rollins] ++syncserverssl 2679 tcp Sync Server SSL [Shawn_Casey] [Shawn_Casey] ++syncserverssl 2679 udp Sync Server SSL [Shawn_Casey] [Shawn_Casey] ++pxc-sapxom 2680 tcp pxc-sapxom [Hideki_Kiriyama] [Hideki_Kiriyama] ++pxc-sapxom 2680 udp pxc-sapxom [Hideki_Kiriyama] [Hideki_Kiriyama] ++mpnjsomb 2681 tcp mpnjsomb [Takenori_Miyahara] [Takenori_Miyahara] ++mpnjsomb 2681 udp mpnjsomb [Takenori_Miyahara] [Takenori_Miyahara] ++ 2682 Removed 2002-04-30 ++ncdloadbalance 2683 tcp NCDLoadBalance [Tim_Stevenson] [Tim_Stevenson] ++ncdloadbalance 2683 udp NCDLoadBalance [Tim_Stevenson] [Tim_Stevenson] ++mpnjsosv 2684 tcp mpnjsosv ++mpnjsosv 2684 udp mpnjsosv ++mpnjsocl 2685 tcp mpnjsocl ++mpnjsocl 2685 udp mpnjsocl ++mpnjsomg 2686 tcp mpnjsomg [Takenori_Miyahara] [Takenori_Miyahara] ++mpnjsomg 2686 udp mpnjsomg [Takenori_Miyahara] [Takenori_Miyahara] ++pq-lic-mgmt 2687 tcp pq-lic-mgmt [Bob_Sledge] [Bob_Sledge] ++pq-lic-mgmt 2687 udp pq-lic-mgmt [Bob_Sledge] [Bob_Sledge] ++md-cg-http 2688 tcp md-cf-http [Lyndon_Nerenberg] [Lyndon_Nerenberg] ++md-cg-http 2688 udp md-cf-http [Lyndon_Nerenberg] [Lyndon_Nerenberg] ++fastlynx 2689 tcp FastLynx [Dave_Sewell] [Dave_Sewell] ++fastlynx 2689 udp FastLynx [Dave_Sewell] [Dave_Sewell] ++hp-nnm-data 2690 tcp HP NNM Embedded Database [Chris_Das] [Chris_Das] ++hp-nnm-data 2690 udp HP NNM Embedded Database [Chris_Das] [Chris_Das] ++itinternet 2691 tcp ITInternet ISM Server [Ron_Ehli] [Ron_Ehli] ++itinternet 2691 udp ITInternet ISM Server [Ron_Ehli] [Ron_Ehli] ++admins-lms 2692 tcp Admins LMS [Dagfinn_Saether] [Dagfinn_Saether] ++admins-lms 2692 udp Admins LMS [Dagfinn_Saether] [Dagfinn_Saether] ++ 2693 tcp Unassigned (Removed 2004-2-6) ++ 2693 udp Unassigned (Removed 2004-2-6) ++pwrsevent 2694 tcp pwrsevent [Yoshinobu_Nakamura] [Yoshinobu_Nakamura] ++pwrsevent 2694 udp pwrsevent [Yoshinobu_Nakamura] [Yoshinobu_Nakamura] ++vspread 2695 tcp VSPREAD [Sumitake_kobayashi] [Sumitake_kobayashi] ++vspread 2695 udp VSPREAD [Sumitake_kobayashi] [Sumitake_kobayashi] ++unifyadmin 2696 tcp Unify Admin [Duane_Gibson] [Duane_Gibson] ++unifyadmin 2696 udp Unify Admin [Duane_Gibson] [Duane_Gibson] ++oce-snmp-trap 2697 tcp Oce SNMP Trap Port [Peter_Teeuwen] [Peter_Teeuwen] ++oce-snmp-trap 2697 udp Oce SNMP Trap Port [Peter_Teeuwen] [Peter_Teeuwen] ++mck-ivpip 2698 tcp MCK-IVPIP [Robert_Vincent] [Robert_Vincent] ++mck-ivpip 2698 udp MCK-IVPIP [Robert_Vincent] [Robert_Vincent] ++csoft-plusclnt 2699 tcp Csoft Plus Client [Nedelcho_Stanev] [Nedelcho_Stanev] ++csoft-plusclnt 2699 udp Csoft Plus Client [Nedelcho_Stanev] [Nedelcho_Stanev] ++tqdata 2700 tcp tqdata [Al_Guetzlaff] [Al_Guetzlaff] ++tqdata 2700 udp tqdata [Al_Guetzlaff] [Al_Guetzlaff] ++sms-rcinfo 2701 tcp SMS RCINFO ++sms-rcinfo 2701 udp SMS RCINFO ++sms-xfer 2702 tcp SMS XFER ++sms-xfer 2702 udp SMS XFER ++sms-chat 2703 tcp SMS CHAT ++sms-chat 2703 udp SMS CHAT ++sms-remctrl 2704 tcp SMS REMCTRL [Tom_Friend] [Tom_Friend] ++sms-remctrl 2704 udp SMS REMCTRL [Tom_Friend] [Tom_Friend] ++sds-admin 2705 tcp SDS Admin [Don_Traub] [Don_Traub] ++sds-admin 2705 udp SDS Admin [Don_Traub] [Don_Traub] ++ncdmirroring 2706 tcp NCD Mirroring [Tim_Stevenson] [Tim_Stevenson] ++ncdmirroring 2706 udp NCD Mirroring [Tim_Stevenson] [Tim_Stevenson] ++emcsymapiport 2707 tcp EMCSYMAPIPORT [Bruce_Ferjulian] [Bruce_Ferjulian] ++emcsymapiport 2707 udp EMCSYMAPIPORT [Bruce_Ferjulian] [Bruce_Ferjulian] ++banyan-net 2708 tcp Banyan-Net [R_Thirumurthy] [R_Thirumurthy] ++banyan-net 2708 udp Banyan-Net [R_Thirumurthy] [R_Thirumurthy] ++supermon 2709 tcp Supermon [Ron_Minnich] [Ron_Minnich] ++supermon 2709 udp Supermon [Ron_Minnich] [Ron_Minnich] ++sso-service 2710 tcp SSO Service ++sso-service 2710 udp SSO Service ++sso-control 2711 tcp SSO Control [Axel_Kern] [Axel_Kern] ++sso-control 2711 udp SSO Control [Axel_Kern] [Axel_Kern] ++aocp 2712 tcp Axapta Object Communication [Jakob_Steen_Hansen] [Jakob_Steen_Hansen] ++ Protocol ++aocp 2712 udp Axapta Object Communication [Jakob_Steen_Hansen] [Jakob_Steen_Hansen] ++ Protocol ++raventbs 2713 tcp Raven Trinity Broker Service ++raventbs 2713 udp Raven Trinity Broker Service ++raventdm 2714 tcp Raven Trinity Data Mover [Daniel_Sorlov] [Daniel_Sorlov] ++raventdm 2714 udp Raven Trinity Data Mover [Daniel_Sorlov] [Daniel_Sorlov] ++hpstgmgr2 2715 tcp HPSTGMGR2 [Kevin_Collins_2] [Kevin_Collins_2] ++hpstgmgr2 2715 udp HPSTGMGR2 [Kevin_Collins_2] [Kevin_Collins_2] ++inova-ip-disco 2716 tcp Inova IP Disco [Chris_Koeritz] [Chris_Koeritz] ++inova-ip-disco 2716 udp Inova IP Disco [Chris_Koeritz] [Chris_Koeritz] ++pn-requester 2717 tcp PN REQUESTER ++pn-requester 2717 udp PN REQUESTER ++pn-requester2 2718 tcp PN REQUESTER 2 [Portnoy_Boxman] [Portnoy_Boxman] ++pn-requester2 2718 udp PN REQUESTER 2 [Portnoy_Boxman] [Portnoy_Boxman] ++scan-change 2719 tcp Scan & Change [Alexander_Raji] [Alexander_Raji] ++scan-change 2719 udp Scan & Change [Alexander_Raji] [Alexander_Raji] ++wkars 2720 tcp wkars [Barry_Shelton] [Barry_Shelton] ++wkars 2720 udp wkars [Barry_Shelton] [Barry_Shelton] ++smart-diagnose 2721 tcp Smart Diagnose [Geoffry_Meek] [Geoffry_Meek] ++smart-diagnose 2721 udp Smart Diagnose [Geoffry_Meek] [Geoffry_Meek] ++proactivesrvr 2722 tcp Proactive Server [Dalit_Naor] [Dalit_Naor] ++proactivesrvr 2722 udp Proactive Server [Dalit_Naor] [Dalit_Naor] ++watchdog-nt 2723 tcp WatchDog NT Protocol [Glen_Sansoucie] [Glen_Sansoucie] ++watchdog-nt 2723 udp WatchDog NT Protocol [Glen_Sansoucie] [Glen_Sansoucie] ++qotps 2724 tcp qotps [Piotr_Parlewicz] [Piotr_Parlewicz] ++qotps 2724 udp qotps [Piotr_Parlewicz] [Piotr_Parlewicz] ++msolap-ptp2 2725 tcp MSOLAP PTP2 [Cristian_Petculescu] [Cristian_Petculescu] ++msolap-ptp2 2725 udp MSOLAP PTP2 [Cristian_Petculescu] [Cristian_Petculescu] ++tams 2726 tcp TAMS [David_Leinbach] [David_Leinbach] ++tams 2726 udp TAMS [David_Leinbach] [David_Leinbach] ++mgcp-callagent 2727 tcp Media Gateway Control [Christian_Huitema] [Christian_Huitema] ++ Protocol Call Agent ++mgcp-callagent 2727 udp Media Gateway Control [Christian_Huitema] [Christian_Huitema] ++ Protocol Call Agent ++sqdr 2728 tcp SQDR [Matthew_Orzen] [Matthew_Orzen] ++sqdr 2728 udp SQDR [Matthew_Orzen] [Matthew_Orzen] ++tcim-control 2729 tcp TCIM Control [Dean_Skelton] [Dean_Skelton] ++tcim-control 2729 udp TCIM Control [Dean_Skelton] [Dean_Skelton] ++nec-raidplus 2730 tcp NEC RaidPlus [Yusuke_Asai] [Yusuke_Asai] ++nec-raidplus 2730 udp NEC RaidPlus [Yusuke_Asai] [Yusuke_Asai] ++fyre-messanger 2731 tcp Fyre Messanger [Robert_Waters] [Robert_Waters] ++fyre-messanger 2731 udp Fyre Messagner [Robert_Waters] [Robert_Waters] ++g5m 2732 tcp G5M [Graham_Klyne] [Graham_Klyne] ++g5m 2732 udp G5M [Graham_Klyne] [Graham_Klyne] ++signet-ctf 2733 tcp Signet CTF [Greg_Broiles] [Greg_Broiles] ++signet-ctf 2733 udp Signet CTF [Greg_Broiles] [Greg_Broiles] ++ccs-software 2734 tcp CCS Software [Bertus_Jacobs] [Bertus_Jacobs] ++ccs-software 2734 udp CCS Software [Bertus_Jacobs] [Bertus_Jacobs] ++netiq-mc 2735 tcp NetIQ Monitor Console [Scott_Southard] [Scott_Southard] 2010-08-25 ++netiq-mc 2735 udp NetIQ Monitor Console [Scott_Southard] [Scott_Southard] 2010-08-25 ++radwiz-nms-srv 2736 tcp RADWIZ NMS SRV [Israel_Shainert] [Israel_Shainert] ++radwiz-nms-srv 2736 udp RADWIZ NMS SRV [Israel_Shainert] [Israel_Shainert] ++srp-feedback 2737 tcp SRP Feedback [Werner_Almesberger] [Werner_Almesberger] ++srp-feedback 2737 udp SRP Feedback [Werner_Almesberger] [Werner_Almesberger] ++ndl-tcp-ois-gw 2738 tcp NDL TCP-OSI Gateway [Martin_Norman] [Martin_Norman] ++ndl-tcp-ois-gw 2738 udp NDL TCP-OSI Gateway [Martin_Norman] [Martin_Norman] ++tn-timing 2739 tcp TN Timing [Paul_Roberts] [Paul_Roberts] ++tn-timing 2739 udp TN Timing [Paul_Roberts] [Paul_Roberts] ++alarm 2740 tcp Alarm [Uriy_Makasjuk] [Uriy_Makasjuk] ++alarm 2740 udp Alarm [Uriy_Makasjuk] [Uriy_Makasjuk] ++tsb 2741 tcp TSB ++tsb 2741 udp TSB ++tsb2 2742 tcp TSB2 [Ashish_Chatterjee] [Ashish_Chatterjee] ++tsb2 2742 udp TSB2 [Ashish_Chatterjee] [Ashish_Chatterjee] ++murx 2743 tcp murx [Thomas_Kuiper] [Thomas_Kuiper] ++murx 2743 udp murx [Thomas_Kuiper] [Thomas_Kuiper] ++honyaku 2744 tcp honyaku [Yasunari_Yamashita] [Yasunari_Yamashita] ++honyaku 2744 udp honyaku [Yasunari_Yamashita] [Yasunari_Yamashita] ++urbisnet 2745 tcp URBISNET [Urbis_Net_Ltd] [Urbis_Net_Ltd] ++urbisnet 2745 udp URBISNET [Urbis_Net_Ltd] [Urbis_Net_Ltd] ++cpudpencap 2746 tcp CPUDPENCAP [Tamir_Zegman] [Tamir_Zegman] ++cpudpencap 2746 udp CPUDPENCAP [Tamir_Zegman] [Tamir_Zegman] ++fjippol-swrly 2747 tcp ++fjippol-swrly 2747 udp ++fjippol-polsvr 2748 tcp ++fjippol-polsvr 2748 udp ++fjippol-cnsl 2749 tcp ++fjippol-cnsl 2749 udp ++fjippol-port1 2750 tcp ++fjippol-port1 2750 udp ++fjippol-port2 2751 tcp [Shoichi_Tachibana] [Shoichi_Tachibana] ++fjippol-port2 2751 udp [Shoichi_Tachibana] [Shoichi_Tachibana] ++rsisysaccess 2752 tcp RSISYS ACCESS [Christophe_Besant] [Christophe_Besant] ++rsisysaccess 2752 udp RSISYS ACCESS [Christophe_Besant] [Christophe_Besant] ++de-spot 2753 tcp de-spot [Sanjay_Parekh] [Sanjay_Parekh] ++de-spot 2753 udp de-spot [Sanjay_Parekh] [Sanjay_Parekh] ++apollo-cc 2754 tcp APOLLO CC [Brand_Communications] [Brand_Communications] ++apollo-cc 2754 udp APOLLO CC [Brand_Communications] [Brand_Communications] ++expresspay 2755 tcp Express Pay [Ben_Higgins] [Ben_Higgins] ++expresspay 2755 udp Express Pay [Ben_Higgins] [Ben_Higgins] ++simplement-tie 2756 tcp simplement-tie [Tzvika_Chumash] [Tzvika_Chumash] ++simplement-tie 2756 udp simplement-tie [Tzvika_Chumash] [Tzvika_Chumash] ++cnrp 2757 tcp CNRP [Jacob_Ulmert] [Jacob_Ulmert] ++cnrp 2757 udp CNRP [Jacob_Ulmert] [Jacob_Ulmert] ++apollo-status 2758 tcp APOLLO Status ++apollo-status 2758 udp APOLLO Status ++apollo-gms 2759 tcp APOLLO GMS [Simon_Hovell] [Simon_Hovell] ++apollo-gms 2759 udp APOLLO GMS [Simon_Hovell] [Simon_Hovell] ++sabams 2760 tcp Saba MS [Davoud_Maha] [Davoud_Maha] ++sabams 2760 udp Saba MS [Davoud_Maha] [Davoud_Maha] ++dicom-iscl 2761 tcp DICOM ISCL ++dicom-iscl 2761 udp DICOM ISCL ++dicom-tls 2762 tcp DICOM TLS [Lawrence_Tarbox] [Lawrence_Tarbox] ++dicom-tls 2762 udp DICOM TLS [Lawrence_Tarbox] [Lawrence_Tarbox] ++desktop-dna 2763 tcp Desktop DNA [Jon_Walker] [Jon_Walker] ++desktop-dna 2763 udp Desktop DNA [Jon_Walker] [Jon_Walker] ++data-insurance 2764 tcp Data Insurance [Brent_Irwin] [Brent_Irwin] ++data-insurance 2764 udp Data Insurance [Brent_Irwin] [Brent_Irwin] ++qip-audup 2765 tcp qip-audup [Mike_Morgan] [Mike_Morgan] ++qip-audup 2765 udp qip-audup [Mike_Morgan] [Mike_Morgan] ++compaq-scp 2766 tcp Compaq SCP [Ferruccio_Barletta] [Ferruccio_Barletta] ++compaq-scp 2766 udp Compaq SCP [Ferruccio_Barletta] [Ferruccio_Barletta] ++uadtc 2767 tcp UADTC ++uadtc 2767 udp UADTC ++uacs 2768 tcp UACS [Vishwas_Lele] [Vishwas_Lele] ++uacs 2768 udp UACS [Vishwas_Lele] [Vishwas_Lele] ++exce 2769 tcp eXcE [Norm_Freedman] [Norm_Freedman] ++exce 2769 udp eXcE [Norm_Freedman] [Norm_Freedman] ++veronica 2770 tcp Veronica [Jonas_Oberg] [Jonas_Oberg] ++veronica 2770 udp Veronica [Jonas_Oberg] [Jonas_Oberg] ++vergencecm 2771 tcp Vergence CM [Mark_Morwood] [Mark_Morwood] ++vergencecm 2771 udp Vergence CM [Mark_Morwood] [Mark_Morwood] ++auris 2772 tcp auris [Francisco_Saez_Aranc] [Francisco_Saez_Aranc] ++auris 2772 udp auris [Francisco_Saez_Aranc] [Francisco_Saez_Aranc] ++rbakcup1 2773 tcp RBackup Remote Backup ++rbakcup1 2773 udp RBackup Remote Backup ++rbakcup2 2774 tcp RBackup Remote Backup [Rob_Cosgrove] [Rob_Cosgrove] ++rbakcup2 2774 udp RBackup Remote Backup [Rob_Cosgrove] [Rob_Cosgrove] ++smpp 2775 tcp SMPP [Owen_Sullivan] [Owen_Sullivan] ++smpp 2775 udp SMPP [Owen_Sullivan] [Owen_Sullivan] ++ridgeway1 2776 tcp Ridgeway Systems & Software ++ridgeway1 2776 udp Ridgeway Systems & Software ++ridgeway2 2777 tcp Ridgeway Systems & Software [Steve_Read] [Steve_Read] ++ridgeway2 2777 udp Ridgeway Systems & Software [Steve_Read] [Steve_Read] ++gwen-sonya 2778 tcp Gwen-Sonya [Mark_Hurst] [Mark_Hurst] ++gwen-sonya 2778 udp Gwen-Sonya [Mark_Hurst] [Mark_Hurst] ++lbc-sync 2779 tcp LBC Sync ++lbc-sync 2779 udp LBC Sync ++lbc-control 2780 tcp LBC Control [Keiji_Michine] [Keiji_Michine] ++lbc-control 2780 udp LBC Control [Keiji_Michine] [Keiji_Michine] ++whosells 2781 tcp whosells [William_Randolph_Roy] [William_Randolph_Roy] ++whosells 2781 udp whosells [William_Randolph_Roy] [William_Randolph_Roy] ++everydayrc 2782 tcp everydayrc [Ahti_Heinla] [Ahti_Heinla] ++everydayrc 2782 udp everydayrc [Ahti_Heinla] [Ahti_Heinla] ++aises 2783 tcp AISES [Daniel_Grazioli] [Daniel_Grazioli] ++aises 2783 udp AISES [Daniel_Grazioli] [Daniel_Grazioli] ++www-dev 2784 tcp world wide web - development ++www-dev 2784 udp world wide web - development ++aic-np 2785 tcp aic-np [Brad_Parker] [Brad_Parker] ++aic-np 2785 udp aic-np [Brad_Parker] [Brad_Parker] ++aic-oncrpc 2786 tcp aic-oncrpc - Destiny MCD [Brad_Parker] [Brad_Parker] ++ database ++aic-oncrpc 2786 udp aic-oncrpc - Destiny MCD [Brad_Parker] [Brad_Parker] ++ database ++piccolo 2787 tcp piccolo - Cornerstone [Dave_Bellivea] [Dave_Bellivea] ++ Software ++piccolo 2787 udp piccolo - Cornerstone [Dave_Bellivea] [Dave_Bellivea] ++ Software ++fryeserv 2788 tcp NetWare Loadable Module - [Joseph_LoPilato] [Joseph_LoPilato] ++ Seagate Software ++fryeserv 2788 udp NetWare Loadable Module - [Joseph_LoPilato] [Joseph_LoPilato] ++ Seagate Software ++media-agent 2789 tcp Media Agent [Nitzan_Daube] [Nitzan_Daube] ++media-agent 2789 udp Media Agent [Nitzan_Daube] [Nitzan_Daube] ++plgproxy 2790 tcp PLG Proxy [Charlie_Hava] [Charlie_Hava] ++plgproxy 2790 udp PLG Proxy [Charlie_Hava] [Charlie_Hava] ++mtport-regist 2791 tcp MT Port Registrator [Maxim_Tseitlin] [Maxim_Tseitlin] ++mtport-regist 2791 udp MT Port Registrator [Maxim_Tseitlin] [Maxim_Tseitlin] ++f5-globalsite 2792 tcp f5-globalsite [Christian_Saether_2] [Christian_Saether_2] ++f5-globalsite 2792 udp f5-globalsite [Christian_Saether_2] [Christian_Saether_2] ++initlsmsad 2793 tcp initlsmsad [Kelly_Green] [Kelly_Green] ++initlsmsad 2793 udp initlsmsad [Kelly_Green] [Kelly_Green] ++ 2794 Unassigned 2006-12-04 ++livestats 2795 tcp LiveStats [Chris_Greene] [Chris_Greene] ++livestats 2795 udp LiveStats [Chris_Greene] [Chris_Greene] ++ac-tech 2796 tcp ac-tech [Chiming_Huang] [Chiming_Huang] ++ac-tech 2796 udp ac-tech [Chiming_Huang] [Chiming_Huang] ++esp-encap 2797 tcp esp-encap [Jorn_Sierwald] [Jorn_Sierwald] ++esp-encap 2797 udp esp-encap [Jorn_Sierwald] [Jorn_Sierwald] ++tmesis-upshot 2798 tcp TMESIS-UPShot [Brian_Schenkenberger] [Brian_Schenkenberger] ++tmesis-upshot 2798 udp TMESIS-UPShot [Brian_Schenkenberger] [Brian_Schenkenberger] ++icon-discover 2799 tcp ICON Discover [Alexander_Falk] [Alexander_Falk] ++icon-discover 2799 udp ICON Discover [Alexander_Falk] [Alexander_Falk] ++acc-raid 2800 tcp ACC RAID [Scott_St_Clair] [Scott_St_Clair] ++acc-raid 2800 udp ACC RAID [Scott_St_Clair] [Scott_St_Clair] ++igcp 2801 tcp IGCP [David_Hampson] [David_Hampson] ++igcp 2801 udp IGCP [David_Hampson] [David_Hampson] ++veritas-tcp1 2802 tcp Veritas TCP1 ++veritas-udp1 2802 udp Veritas UDP1 [Russ_Thrasher] [Russ_Thrasher] ++btprjctrl 2803 tcp btprjctrl [Huw_Thomas] [Huw_Thomas] ++btprjctrl 2803 udp btprjctrl [Huw_Thomas] [Huw_Thomas] ++ March Networks Digital Video ++dvr-esm 2804 tcp Recorders and Enterprise [Paul_Streatch] [Paul_Streatch] 2004-06 ++ Service Manager products ++ March Networks Digital Video ++dvr-esm 2804 udp Recorders and Enterprise [Paul_Streatch] [Paul_Streatch] 2004-06 ++ Service Manager products ++wta-wsp-s 2805 tcp WTA WSP-S [Sebastien_Bury] [Sebastien_Bury] ++wta-wsp-s 2805 udp WTA WSP-S [Sebastien_Bury] [Sebastien_Bury] ++cspuni 2806 tcp cspuni ++cspuni 2806 udp cspuni ++cspmulti 2807 tcp cspmulti [Terumasa_Yoneda] [Terumasa_Yoneda] ++cspmulti 2807 udp cspmulti [Terumasa_Yoneda] [Terumasa_Yoneda] ++j-lan-p 2808 tcp J-LAN-P [Takeshi_Sahara] [Takeshi_Sahara] ++j-lan-p 2808 udp J-LAN-P [Takeshi_Sahara] [Takeshi_Sahara] ++corbaloc 2809 tcp CORBA LOC [Ted_McFadden] [Ted_McFadden] ++corbaloc 2809 udp CORBA LOC [Ted_McFadden] [Ted_McFadden] ++netsteward 2810 tcp Active Net Steward [Keith_Morley] [Keith_Morley] ++netsteward 2810 udp Active Net Steward [Keith_Morley] [Keith_Morley] ++gsiftp 2811 tcp GSI FTP [Von_Welch] [Von_Welch] ++gsiftp 2811 udp GSI FTP [Von_Welch] [Von_Welch] ++atmtcp 2812 tcp atmtcp [Werner_Almesberger] [Werner_Almesberger] ++atmtcp 2812 udp atmtcp [Werner_Almesberger] [Werner_Almesberger] ++llm-pass 2813 tcp llm-pass ++llm-pass 2813 udp llm-pass ++llm-csv 2814 tcp llm-csv [Glen_Sansoucie_2] [Glen_Sansoucie_2] ++llm-csv 2814 udp llm-csv [Glen_Sansoucie_2] [Glen_Sansoucie_2] ++lbc-measure 2815 tcp LBC Measurement ++lbc-measure 2815 udp LBC Measurement ++lbc-watchdog 2816 tcp LBC Watchdog [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++lbc-watchdog 2816 udp LBC Watchdog [Akiyoshi_Ochi] [Akiyoshi_Ochi] ++nmsigport 2817 tcp NMSig Port [Peter_Egli_2] [Peter_Egli_2] ++nmsigport 2817 udp NMSig Port [Peter_Egli_2] [Peter_Egli_2] ++rmlnk 2818 tcp rmlnk ++rmlnk 2818 udp rmlnk ++fc-faultnotify 2819 tcp FC Fault Notification [Dave_Watkins] [Dave_Watkins] ++fc-faultnotify 2819 udp FC Fault Notification [Dave_Watkins] [Dave_Watkins] ++univision 2820 tcp UniVision [Keith_Ansell] [Keith_Ansell] ++univision 2820 udp UniVision [Keith_Ansell] [Keith_Ansell] ++vrts-at-port 2821 tcp VERITAS Authentication [Stefan_Winkel] [Stefan_Winkel] ++ Service ++vrts-at-port 2821 udp VERITAS Authentication [Stefan_Winkel] [Stefan_Winkel] ++ Service ++ka0wuc 2822 tcp ka0wuc [Kit_Haskins] [Kit_Haskins] ++ka0wuc 2822 udp ka0wuc [Kit_Haskins] [Kit_Haskins] ++cqg-netlan 2823 tcp CQG Net/LAN ++cqg-netlan 2823 udp CQG Net/LAN ++cqg-netlan-1 2824 tcp CQG Net/LAN 1 [Jeff_Wood] [Jeff_Wood] ++cqg-netlan-1 2824 udp CQG Net/Lan 1 [Jeff_Wood] [Jeff_Wood] ++ 2825 (unassigned) Possibly ++ assigned ++slc-systemlog 2826 tcp slc systemlog ++slc-systemlog 2826 udp slc systemlog ++slc-ctrlrloops 2827 tcp slc ctrlrloops [Erwin_Hogeweg] [Erwin_Hogeweg] ++slc-ctrlrloops 2827 udp slc ctrlrloops [Erwin_Hogeweg] [Erwin_Hogeweg] ++itm-lm 2828 tcp ITM License Manager [Portnoy_Boxman] [Portnoy_Boxman] ++itm-lm 2828 udp ITM License Manager [Portnoy_Boxman] [Portnoy_Boxman] ++silkp1 2829 tcp silkp1 ++silkp1 2829 udp silkp1 ++silkp2 2830 tcp silkp2 ++silkp2 2830 udp silkp2 ++silkp3 2831 tcp silkp3 ++silkp3 2831 udp silkp3 ++silkp4 2832 tcp silkp4 [Erik_Skyten] [Erik_Skyten] ++silkp4 2832 udp silkp4 [Erik_Skyten] [Erik_Skyten] ++glishd 2833 tcp glishd [Darrell_Schiebel] [Darrell_Schiebel] ++glishd 2833 udp glishd [Darrell_Schiebel] [Darrell_Schiebel] ++evtp 2834 tcp EVTP ++evtp 2834 udp EVTP ++evtp-data 2835 tcp EVTP-DATA [Eric_Bruno] [Eric_Bruno] ++evtp-data 2835 udp EVTP-DATA [Eric_Bruno] [Eric_Bruno] ++catalyst 2836 tcp catalyst [Garret_Tollkuhn] [Garret_Tollkuhn] ++catalyst 2836 udp catalyst [Garret_Tollkuhn] [Garret_Tollkuhn] ++repliweb 2837 tcp Repliweb [William_Orme] [William_Orme] ++repliweb 2837 udp Repliweb [William_Orme] [William_Orme] ++starbot 2838 tcp Starbot [Markus_Sabadello_2] [Markus_Sabadello_2] ++starbot 2838 udp Starbot [Markus_Sabadello_2] [Markus_Sabadello_2] ++nmsigport 2839 tcp NMSigPort [Peter_Egli_2] [Peter_Egli_2] ++nmsigport 2839 udp NMSigPort [Peter_Egli_2] [Peter_Egli_2] ++l3-exprt 2840 tcp l3-exprt ++l3-exprt 2840 udp l3-exprt ++l3-ranger 2841 tcp l3-ranger ++l3-ranger 2841 udp l3-ranger ++l3-hawk 2842 tcp l3-hawk [Dolores_Scott_2] [Dolores_Scott_2] ++l3-hawk 2842 udp l3-hawk [Dolores_Scott_2] [Dolores_Scott_2] ++pdnet 2843 tcp PDnet [Torsten_Scheffler] [Torsten_Scheffler] ++pdnet 2843 udp PDnet [Torsten_Scheffler] [Torsten_Scheffler] ++bpcp-poll 2844 tcp BPCP POLL ++bpcp-poll 2844 udp BPCP POLL ++bpcp-trap 2845 tcp BPCP TRAP [Steve_Van_Duser] [Steve_Van_Duser] ++bpcp-trap 2845 udp BPCP TRAP [Steve_Van_Duser] [Steve_Van_Duser] ++aimpp-hello 2846 tcp AIMPP Hello ++aimpp-hello 2846 udp AIMPP Hello ++aimpp-port-req 2847 tcp AIMPP Port Req [Brian_Martinicky] [Brian_Martinicky] ++aimpp-port-req 2847 udp AIMPP Port Req [Brian_Martinicky] [Brian_Martinicky] ++amt-blc-port 2848 tcp AMT-BLC-PORT [Sandra_Frulloni] [Sandra_Frulloni] ++amt-blc-port 2848 udp AMT-BLC-PORT [Sandra_Frulloni] [Sandra_Frulloni] ++fxp 2849 tcp FXP [Martin_Lichtin] [Martin_Lichtin] ++fxp 2849 udp FXP [Martin_Lichtin] [Martin_Lichtin] ++metaconsole 2850 tcp MetaConsole [Rakesh_Mahajan] [Rakesh_Mahajan] ++metaconsole 2850 udp MetaConsole [Rakesh_Mahajan] [Rakesh_Mahajan] ++webemshttp 2851 tcp webemshttp [Stephen_Tsun] [Stephen_Tsun] ++webemshttp 2851 udp webemshttp [Stephen_Tsun] [Stephen_Tsun] ++bears-01 2852 tcp bears-01 [Bruce_McKinnon] [Bruce_McKinnon] ++bears-01 2852 udp bears-01 [Bruce_McKinnon] [Bruce_McKinnon] ++ispipes 2853 tcp ISPipes [Rajesh_Nandyalam] [Rajesh_Nandyalam] ++ispipes 2853 udp ISPipes [Rajesh_Nandyalam] [Rajesh_Nandyalam] ++infomover 2854 tcp InfoMover [Carla_Caputo] [Carla_Caputo] ++infomover 2854 udp InfoMover [Carla_Caputo] [Carla_Caputo] ++msrp 2855 tcp MSRP over TCP [RFC4975] ++msrp 2855 udp MSRP [RFC4975] ++cesdinv 2856 tcp cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] ++cesdinv 2856 udp cesdinv [Yoshiaki_Tokumoto] [Yoshiaki_Tokumoto] ++simctlp 2857 tcp SimCtIP [Christian_Zietz] [Christian_Zietz] ++simctlp 2857 udp SimCtIP [Christian_Zietz] [Christian_Zietz] ++ecnp 2858 tcp ECNP [Robert_Reimiller] [Robert_Reimiller] ++ecnp 2858 udp ECNP [Robert_Reimiller] [Robert_Reimiller] ++activememory 2859 tcp Active Memory [Joe_Graham] [Joe_Graham] ++activememory 2859 udp Active Memory [Joe_Graham] [Joe_Graham] ++dialpad-voice1 2860 tcp Dialpad Voice 1 ++dialpad-voice1 2860 udp Dialpad Voice 1 ++dialpad-voice2 2861 tcp Dialpad Voice 2 [Wongyu_Cho] [Wongyu_Cho] ++dialpad-voice2 2861 udp Dialpad Voice 2 [Wongyu_Cho] [Wongyu_Cho] ++ttg-protocol 2862 tcp TTG Protocol [Mark_Boler] [Mark_Boler] ++ttg-protocol 2862 udp TTG Protocol [Mark_Boler] [Mark_Boler] ++sonardata 2863 tcp Sonar Data [Ian_Higginbottom] [Ian_Higginbottom] ++sonardata 2863 udp Sonar Data [Ian_Higginbottom] [Ian_Higginbottom] ++astromed-main 2864 tcp main 5001 cmd [Chris_Tate] [Chris_Tate] ++astromed-main 2864 udp main 5001 cmd [Chris_Tate] [Chris_Tate] ++pit-vpn 2865 tcp pit-vpn [Norbert_Sendetzky] [Norbert_Sendetzky] ++pit-vpn 2865 udp pit-vpn [Norbert_Sendetzky] [Norbert_Sendetzky] ++iwlistener 2866 tcp iwlistener [Fred_Surr] [Fred_Surr] ++iwlistener 2866 udp iwlistener [Fred_Surr] [Fred_Surr] ++esps-portal 2867 tcp esps-portal [Nicholas_Stowfis] [Nicholas_Stowfis] ++esps-portal 2867 udp esps-portal [Nicholas_Stowfis] [Nicholas_Stowfis] ++npep-messaging 2868 tcp NPEP Messaging [Kristian_A_Bognaes] [Kristian_A_Bognaes] ++npep-messaging 2868 udp NPEP Messaging [Kristian_A_Bognaes] [Kristian_A_Bognaes] ++icslap 2869 tcp ICSLAP [Richard_Lamb] [Richard_Lamb] ++icslap 2869 udp ICSLAP [Richard_Lamb] [Richard_Lamb] ++daishi 2870 tcp daishi [Patrick_Chipman] [Patrick_Chipman] ++daishi 2870 udp daishi [Patrick_Chipman] [Patrick_Chipman] ++msi-selectplay 2871 tcp MSI Select Play [Paul_Fonte] [Paul_Fonte] ++msi-selectplay 2871 udp MSI Select Play [Paul_Fonte] [Paul_Fonte] ++radix 2872 tcp RADIX [Stein_Roger_Skaflott] [Stein_Roger_Skaflott] 2011-07-06 ++radix 2872 udp RADIX [Stein_Roger_Skaflott] [Stein_Roger_Skaflott] 2011-07-06 ++ 2873 Unassigned 2003-07-23 ++dxmessagebase1 2874 tcp DX Message Base Transport ++ Protocol ++dxmessagebase1 2874 udp DX Message Base Transport ++ Protocol ++dxmessagebase2 2875 tcp DX Message Base Transport [G_E_Ozz_Nixon_Jr] [G_E_Ozz_Nixon_Jr] 2009-01-13 ++ Protocol ++dxmessagebase2 2875 udp DX Message Base Transport [G_E_Ozz_Nixon_Jr] [G_E_Ozz_Nixon_Jr] 2009-01-13 ++ Protocol ++sps-tunnel 2876 tcp SPS Tunnel [Bill_McIntosh] [Bill_McIntosh] ++sps-tunnel 2876 udp SPS Tunnel [Bill_McIntosh] [Bill_McIntosh] ++bluelance 2877 tcp BLUELANCE [Michael_Padrezas] [Michael_Padrezas] ++bluelance 2877 udp BLUELANCE [Michael_Padrezas] [Michael_Padrezas] ++aap 2878 tcp AAP [Stephen_Hanna_2] [Stephen_Hanna_2] ++aap 2878 udp AAP [Stephen_Hanna_2] [Stephen_Hanna_2] ++ucentric-ds 2879 tcp ucentric-ds [Alex_Vasilevsky] [Alex_Vasilevsky] ++ucentric-ds 2879 udp ucentric-ds [Alex_Vasilevsky] [Alex_Vasilevsky] ++synapse 2880 tcp Synapse Transport [Ali_Fracyon] [Ali_Fracyon] ++synapse 2880 udp Synapse Transport [Ali_Fracyon] [Ali_Fracyon] ++ndsp 2881 tcp NDSP ++ndsp 2881 udp NDSP ++ndtp 2882 tcp NDTP ++ndtp 2882 udp NDTP ++ndnp 2883 tcp NDNP [Khelben_Blackstaff] [Khelben_Blackstaff] ++ndnp 2883 udp NDNP [Khelben_Blackstaff] [Khelben_Blackstaff] ++flashmsg 2884 tcp Flash Msg [Jeffrey_Zinkerman] [Jeffrey_Zinkerman] ++flashmsg 2884 udp Flash Msg [Jeffrey_Zinkerman] [Jeffrey_Zinkerman] ++topflow 2885 tcp TopFlow [Ted_Ross] [Ted_Ross] ++topflow 2885 udp TopFlow [Ted_Ross] [Ted_Ross] ++responselogic 2886 tcp RESPONSELOGIC [Bruce_Casey] [Bruce_Casey] ++responselogic 2886 udp RESPONSELOGIC [Bruce_Casey] [Bruce_Casey] ++aironetddp 2887 tcp aironet [Victor_Griswold] [Victor_Griswold] ++aironetddp 2887 udp aironet [Victor_Griswold] [Victor_Griswold] ++spcsdlobby 2888 tcp SPCSDLOBBY [Matthew_Williams] [Matthew_Williams] ++spcsdlobby 2888 udp SPCSDLOBBY [Matthew_Williams] [Matthew_Williams] ++rsom 2889 tcp RSOM [Justine_Higgins] [Justine_Higgins] ++rsom 2889 udp RSOM [Justine_Higgins] [Justine_Higgins] ++cspclmulti 2890 tcp CSPCLMULTI [Yoneda_Terumasa] [Yoneda_Terumasa] ++cspclmulti 2890 udp CSPCLMULTI [Yoneda_Terumasa] [Yoneda_Terumasa] ++cinegrfx-elmd 2891 tcp CINEGRFX-ELMD License [Greg_Ercolano_2] [Greg_Ercolano_2] ++ Manager ++cinegrfx-elmd 2891 udp CINEGRFX-ELMD License [Greg_Ercolano_2] [Greg_Ercolano_2] ++ Manager ++snifferdata 2892 tcp SNIFFERDATA [Jeff_Mangasarian] [Jeff_Mangasarian] ++snifferdata 2892 udp SNIFFERDATA [Jeff_Mangasarian] [Jeff_Mangasarian] ++vseconnector 2893 tcp VSECONNECTOR [Ingo_Franzki] [Ingo_Franzki] ++vseconnector 2893 udp VSECONNECTOR [Ingo_Franzki] [Ingo_Franzki] ++abacus-remote 2894 tcp ABACUS-REMOTE [Mike_Bello] [Mike_Bello] ++abacus-remote 2894 udp ABACUS-REMOTE [Mike_Bello] [Mike_Bello] ++natuslink 2895 tcp NATUS LINK [Jonathan_Mergy] [Jonathan_Mergy] ++natuslink 2895 udp NATUS LINK [Jonathan_Mergy] [Jonathan_Mergy] ++ecovisiong6-1 2896 tcp ECOVISIONG6-1 [Henrik_Holst] [Henrik_Holst] ++ecovisiong6-1 2896 udp ECOVISIONG6-1 [Henrik_Holst] [Henrik_Holst] ++citrix-rtmp 2897 tcp Citrix RTMP [Myk_Willis] [Myk_Willis] ++citrix-rtmp 2897 udp Citrix RTMP [Myk_Willis] [Myk_Willis] ++appliance-cfg 2898 tcp APPLIANCE-CFG [Gary_A_James] [Gary_A_James] ++appliance-cfg 2898 udp APPLIANCE-CFG [Gary_A_James] [Gary_A_James] ++powergemplus 2899 tcp POWERGEMPLUS [Koich_Nakamura] [Koich_Nakamura] ++powergemplus 2899 udp POWERGEMPLUS [Koich_Nakamura] [Koich_Nakamura] ++quicksuite 2900 tcp QUICKSUITE [William_Egge] [William_Egge] ++quicksuite 2900 udp QUICKSUITE [William_Egge] [William_Egge] ++allstorcns 2901 tcp ALLSTORCNS [Steve_Dobson] [Steve_Dobson] ++allstorcns 2901 udp ALLSTORCNS [Steve_Dobson] [Steve_Dobson] ++netaspi 2902 tcp NET ASPI [Johnson_Luo] [Johnson_Luo] ++netaspi 2902 udp NET ASPI [Johnson_Luo] [Johnson_Luo] ++suitcase 2903 tcp SUITCASE [Milton_E_Sagen] [Milton_E_Sagen] ++suitcase 2903 udp SUITCASE [Milton_E_Sagen] [Milton_E_Sagen] ++m2ua 2904 tcp M2UA [Lyndon_Ong] [Lyndon_Ong] ++m2ua 2904 udp M2UA [Lyndon_Ong] [Lyndon_Ong] ++m2ua 2904 sctp M2UA [Lyndon_Ong] [Lyndon_Ong] ++m3ua 2905 tcp M3UA [Lyndon_Ong] [Lyndon_Ong] [RFC4666] ++ 2905 udp De-registered 2001-06-07 ++m3ua 2905 sctp M3UA [Lyndon_Ong] [Lyndon_Ong] [RFC4666] ++caller9 2906 tcp CALLER9 [Shams_Naqi] [Shams_Naqi] ++caller9 2906 udp CALLER9 [Shams_Naqi] [Shams_Naqi] ++webmethods-b2b 2907 tcp WEBMETHODS B2B [Joseph_Hines] [Joseph_Hines] ++webmethods-b2b 2907 udp WEBMETHODS B2B [Joseph_Hines] [Joseph_Hines] ++mao 2908 tcp mao [Marc_Baudoin] [Marc_Baudoin] ++mao 2908 udp mao [Marc_Baudoin] [Marc_Baudoin] ++funk-dialout 2909 tcp Funk Dialout [Cimarron_Boozer] [Cimarron_Boozer] ++funk-dialout 2909 udp Funk Dialout [Cimarron_Boozer] [Cimarron_Boozer] ++tdaccess 2910 tcp TDAccess [Tom_Haapanen] [Tom_Haapanen] ++tdaccess 2910 udp TDAccess [Tom_Haapanen] [Tom_Haapanen] ++blockade 2911 tcp Blockade [Blockade] [Blockade] ++blockade 2911 udp Blockade [Blockade] [Blockade] ++epicon 2912 tcp Epicon [Michael_Khalandovsky] [Michael_Khalandovsky] ++epicon 2912 udp Epicon [Michael_Khalandovsky] [Michael_Khalandovsky] ++boosterware 2913 tcp Booster Ware [Ido_Ben_David] [Ido_Ben_David] ++boosterware 2913 udp Booster Ware [Ido_Ben_David] [Ido_Ben_David] ++gamelobby 2914 tcp Game Lobby [Paul_Ford_Hutchinson] [Paul_Ford_Hutchinson] ++gamelobby 2914 udp Game Lobby [Paul_Ford_Hutchinson] [Paul_Ford_Hutchinson] ++tksocket 2915 tcp TK Socket [Dino_Ciano] [Dino_Ciano] 2011-03-02 ++tksocket 2915 udp TK Socket [Dino_Ciano] [Dino_Ciano] 2011-03-02 ++ Elvin Server ++ ++elvin-server 2916 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "elvin_server". ++ This entry is an alias to "elvin-server". This entry is now ++elvin_server 2916 tcp Elvin Server historic, not usable for use with many common service ++ discovery mechanisms. ++ Elvin Server ++ ++elvin-server 2916 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "elvin_server". ++ This entry is an alias to "elvin-server". This entry is now ++elvin_server 2916 udp Elvin Server historic, not usable for use with many common service ++ discovery mechanisms. ++ Elvin Client ++ ++elvin-client 2917 tcp IANA assigned this [David_Arnold] [David_Arnold] ++ well-formed service name as ++ a replacement for ++ "elvin_client". ++ This entry is an alias to "elvin-client". This entry is now ++elvin_client 2917 tcp Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service ++ discovery mechanisms. ++ Elvin Client ++ ++elvin-client 2917 udp IANA assigned this [David_Arnold] [David_Arnold] ++ well-formed service name as ++ a replacement for ++ "elvin_client". ++ This entry is an alias to "elvin-client". This entry is now ++elvin_client 2917 udp Elvin Client [David_Arnold] [David_Arnold] historic, not usable for use with many common service ++ discovery mechanisms. ++kastenchasepad 2918 tcp Kasten Chase Pad [Marc_Gauthier] [Marc_Gauthier] ++kastenchasepad 2918 udp Kasten Chase Pad [Marc_Gauthier] [Marc_Gauthier] ++roboer 2919 tcp roboER [Paul_Snook] [Paul_Snook] ++roboer 2919 udp roboER [Paul_Snook] [Paul_Snook] ++roboeda 2920 tcp roboEDA [Paul_Snook] [Paul_Snook] ++roboeda 2920 udp roboEDA [Paul_Snook] [Paul_Snook] ++cesdcdman 2921 tcp CESD Contents Delivery [Shinya_Abe] [Shinya_Abe] ++ Management ++cesdcdman 2921 udp CESD Contents Delivery [Shinya_Abe] [Shinya_Abe] ++ Management ++cesdcdtrn 2922 tcp CESD Contents Delivery Data [Shinya_Abe] [Shinya_Abe] ++ Transfer ++cesdcdtrn 2922 udp CESD Contents Delivery Data [Shinya_Abe] [Shinya_Abe] ++ Transfer ++wta-wsp-wtp-s 2923 tcp WTA-WSP-WTP-S [Sebastien_Bury] [Sebastien_Bury] ++wta-wsp-wtp-s 2923 udp WTA-WSP-WTP-S [Sebastien_Bury] [Sebastien_Bury] ++precise-vip 2924 tcp PRECISE-VIP [Michael_Landwehr] [Michael_Landwehr] ++precise-vip 2924 udp PRECISE-VIP [Michael_Landwehr] [Michael_Landwehr] ++ 2925 Unassigned (FRP-Released ++ 12/7/00) ++mobile-file-dl 2926 tcp MOBILE-FILE-DL [Mitsuji_Toda] [Mitsuji_Toda] ++mobile-file-dl 2926 udp MOBILE-FILE-DL [Mitsuji_Toda] [Mitsuji_Toda] ++unimobilectrl 2927 tcp UNIMOBILECTRL [Vikas] [Vikas] ++unimobilectrl 2927 udp UNIMOBILECTRL [Vikas] [Vikas] ++redstone-cpss 2928 tcp REDSTONE-CPSS [Jeff_Looman] [Jeff_Looman] ++redstone-cpss 2928 udp REDSTONE-CPSS [Jeff_Looman] [Jeff_Looman] ++amx-webadmin 2929 tcp AMX-WEBADMIN [Mike_Morris] [Mike_Morris] ++amx-webadmin 2929 udp AMX-WEBADMIN [Mike_Morris] [Mike_Morris] ++amx-weblinx 2930 tcp AMX-WEBLINX [Mike_Morris] [Mike_Morris] ++amx-weblinx 2930 udp AMX-WEBLINX [Mike_Morris] [Mike_Morris] ++circle-x 2931 tcp Circle-X [Norm_Freedman_2] [Norm_Freedman_2] ++circle-x 2931 udp Circle-X [Norm_Freedman_2] [Norm_Freedman_2] ++incp 2932 tcp INCP [Keith_Paulsen] [Keith_Paulsen] ++incp 2932 udp INCP [Keith_Paulsen] [Keith_Paulsen] ++4-tieropmgw 2933 tcp 4-TIER OPM GW [Francois_Peloffy] [Francois_Peloffy] ++4-tieropmgw 2933 udp 4-TIER OPM GW [Francois_Peloffy] [Francois_Peloffy] ++4-tieropmcli 2934 tcp 4-TIER OPM CLI [Francois_Peloffy] [Francois_Peloffy] ++4-tieropmcli 2934 udp 4-TIER OPM CLI [Francois_Peloffy] [Francois_Peloffy] ++qtp 2935 tcp QTP [Cameron_Young] [Cameron_Young] ++qtp 2935 udp QTP [Cameron_Young] [Cameron_Young] ++otpatch 2936 tcp OTPatch [Brett_Goldstein] [Brett_Goldstein] ++otpatch 2936 udp OTPatch [Brett_Goldstein] [Brett_Goldstein] ++pnaconsult-lm 2937 tcp PNACONSULT-LM [Theo_Nijssen] [Theo_Nijssen] ++pnaconsult-lm 2937 udp PNACONSULT-LM [Theo_Nijssen] [Theo_Nijssen] ++sm-pas-1 2938 tcp SM-PAS-1 ++sm-pas-1 2938 udp SM-PAS-1 ++sm-pas-2 2939 tcp SM-PAS-2 ++sm-pas-2 2939 udp SM-PAS-2 ++sm-pas-3 2940 tcp SM-PAS-3 ++sm-pas-3 2940 udp SM-PAS-3 ++sm-pas-4 2941 tcp SM-PAS-4 ++sm-pas-4 2941 udp SM-PAS-4 ++sm-pas-5 2942 tcp SM-PAS-5 [Tom_Haapanen] [Tom_Haapanen] ++sm-pas-5 2942 udp SM-PAS-5 [Tom_Haapanen] [Tom_Haapanen] ++ttnrepository 2943 tcp TTNRepository [Robert_Orr] [Robert_Orr] ++ttnrepository 2943 udp TTNRepository [Robert_Orr] [Robert_Orr] ++megaco-h248 2944 tcp Megaco H-248 [Tom_Taylor_2] [Tom_Taylor_2] ++megaco-h248 2944 udp Megaco H-248 [Tom_Taylor_2] [Tom_Taylor_2] ++megaco-h248 2944 sctp Megaco-H.248 text [Tom_Taylor_3] [Tom_Taylor_3] 2006-09 ++h248-binary 2945 tcp H248 Binary [Tom_Taylor_2] [Tom_Taylor_2] ++h248-binary 2945 udp H248 Binary [Tom_Taylor_2] [Tom_Taylor_2] ++h248-binary 2945 sctp Megaco/H.248 binary [Tom_Taylor_3] [Tom_Taylor_3] 2006-09 ++fjsvmpor 2946 tcp FJSVmpor [Naoki_Hayashi] [Naoki_Hayashi] ++fjsvmpor 2946 udp FJSVmpor [Naoki_Hayashi] [Naoki_Hayashi] ++gpsd 2947 tcp GPS Daemon request/response [Eric_S_Raymond] [Eric_S_Raymond] 2010-04-19 ++ protocol ++gpsd 2947 udp GPS Daemon request/response [Eric_S_Raymond] [Eric_S_Raymond] 2010-04-19 ++ protocol ++wap-push 2948 tcp WAP PUSH ++wap-push 2948 udp WAP PUSH ++wap-pushsecure 2949 tcp WAP PUSH SECURE [WAP_Forum] [WAP_Forum] ++wap-pushsecure 2949 udp WAP PUSH SECURE [WAP_Forum] [WAP_Forum] ++esip 2950 tcp ESIP [David_Stephenson] [David_Stephenson] ++esip 2950 udp ESIP [David_Stephenson] [David_Stephenson] ++ottp 2951 tcp OTTP [Brent_Foster] [Brent_Foster] ++ottp 2951 udp OTTP [Brent_Foster] [Brent_Foster] ++mpfwsas 2952 tcp MPFWSAS [Toru_Murai] [Toru_Murai] ++mpfwsas 2952 udp MPFWSAS [Toru_Murai] [Toru_Murai] ++ovalarmsrv 2953 tcp OVALARMSRV ++ovalarmsrv 2953 udp OVALARMSRV ++ovalarmsrv-cmd 2954 tcp OVALARMSRV-CMD [Eric_Pulsipher] [Eric_Pulsipher] ++ovalarmsrv-cmd 2954 udp OVALARMSRV-CMD [Eric_Pulsipher] [Eric_Pulsipher] ++csnotify 2955 tcp CSNOTIFY [Israel_Beniaminy] [Israel_Beniaminy] ++csnotify 2955 udp CSNOTIFY [Israel_Beniaminy] [Israel_Beniaminy] ++ovrimosdbman 2956 tcp OVRIMOSDBMAN [Dimitrios_Souflis] [Dimitrios_Souflis] ++ovrimosdbman 2956 udp OVRIMOSDBMAN [Dimitrios_Souflis] [Dimitrios_Souflis] ++jmact5 2957 tcp JAMCT5 ++jmact5 2957 udp JAMCT5 ++jmact6 2958 tcp JAMCT6 ++jmact6 2958 udp JAMCT6 ++rmopagt 2959 tcp RMOPAGT [Shuji_Okubo] [Shuji_Okubo] ++rmopagt 2959 udp RMOPAGT [Shuji_Okubo] [Shuji_Okubo] ++dfoxserver 2960 tcp DFOXSERVER [David_Holden] [David_Holden] ++dfoxserver 2960 udp DFOXSERVER [David_Holden] [David_Holden] ++boldsoft-lm 2961 tcp BOLDSOFT-LM [Fredrik_Haglund] [Fredrik_Haglund] ++boldsoft-lm 2961 udp BOLDSOFT-LM [Fredrik_Haglund] [Fredrik_Haglund] ++iph-policy-cli 2962 tcp IPH-POLICY-CLI ++iph-policy-cli 2962 udp IPH-POLICY-CLI ++iph-policy-adm 2963 tcp IPH-POLICY-ADM [Shai_Herzog] [Shai_Herzog] ++iph-policy-adm 2963 udp IPH-POLICY-ADM [Shai_Herzog] [Shai_Herzog] ++bullant-srap 2964 tcp BULLANT SRAP ++bullant-srap 2964 udp BULLANT SRAP ++bullant-rap 2965 tcp BULLANT RAP [Michael_Cahill] [Michael_Cahill] ++bullant-rap 2965 udp BULLANT RAP [Michael_Cahill] [Michael_Cahill] ++idp-infotrieve 2966 tcp IDP-INFOTRIEVE [Kevin_Bruckert] [Kevin_Bruckert] ++idp-infotrieve 2966 udp IDP-INFOTRIEVE [Kevin_Bruckert] [Kevin_Bruckert] ++ssc-agent 2967 tcp SSC-AGENT [George_Dzieciol] [George_Dzieciol] ++ssc-agent 2967 udp SSC-AGENT [George_Dzieciol] [George_Dzieciol] ++enpp 2968 tcp ENPP [Kazuhito_Gassho] [Kazuhito_Gassho] ++enpp 2968 udp ENPP [Kazuhito_Gassho] [Kazuhito_Gassho] ++essp 2969 tcp ESSP [Hitoshi_Ishida] [Hitoshi_Ishida] ++essp 2969 udp ESSP [Hitoshi_Ishida] [Hitoshi_Ishida] ++index-net 2970 tcp INDEX-NET [Chris_J_Wren] [Chris_J_Wren] ++index-net 2970 udp INDEX-NET [Chris_J_Wren] [Chris_J_Wren] ++netclip 2971 tcp NetClip clipboard daemon [Rudi_Chiarito] [Rudi_Chiarito] ++netclip 2971 udp NetClip clipboard daemon [Rudi_Chiarito] [Rudi_Chiarito] ++pmsm-webrctl 2972 tcp PMSM Webrctl [Markus_Michels] [Markus_Michels] ++pmsm-webrctl 2972 udp PMSM Webrctl [Markus_Michels] [Markus_Michels] ++svnetworks 2973 tcp SV Networks [Sylvia_Siu_2] [Sylvia_Siu_2] ++svnetworks 2973 udp SV Networks [Sylvia_Siu_2] [Sylvia_Siu_2] ++signal 2974 tcp Signal [Wyatt_Williams] [Wyatt_Williams] ++signal 2974 udp Signal [Wyatt_Williams] [Wyatt_Williams] ++fjmpcm 2975 tcp Fujitsu Configuration [Hiroki_Kawano] [Hiroki_Kawano] ++ Management Service ++fjmpcm 2975 udp Fujitsu Configuration [Hiroki_Kawano] [Hiroki_Kawano] ++ Management Service ++cns-srv-port 2976 tcp CNS Server Port [Ram_Golla] [Ram_Golla] ++cns-srv-port 2976 udp CNS Server Port [Ram_Golla] [Ram_Golla] ++ttc-etap-ns 2977 tcp TTCs Enterprise Test Access ++ Protocol - NS ++ttc-etap-ns 2977 udp TTCs Enterprise Test Access ++ Protocol - NS ++ttc-etap-ds 2978 tcp TTCs Enterprise Test Access [Daniel_Becker_2] [Daniel_Becker_2] ++ Protocol - DS ++ttc-etap-ds 2978 udp TTCs Enterprise Test Access [Daniel_Becker_2] [Daniel_Becker_2] ++ Protocol - DS ++h263-video 2979 tcp H.263 Video Streaming [Jauvane_C_de_Olivei] [Jauvane_C_de_Olivei] ++h263-video 2979 udp H.263 Video Streaming [Jauvane_C_de_Olivei] [Jauvane_C_de_Olivei] ++wimd 2980 tcp Instant Messaging Service [Kevin_Birch] [Kevin_Birch] ++wimd 2980 udp Instant Messaging Service [Kevin_Birch] [Kevin_Birch] ++mylxamport 2981 tcp MYLXAMPORT [Wei_Gao] [Wei_Gao] ++mylxamport 2981 udp MYLXAMPORT [Wei_Gao] [Wei_Gao] ++iwb-whiteboard 2982 tcp IWB-WHITEBOARD [David_W_Radcliffe] [David_W_Radcliffe] ++iwb-whiteboard 2982 udp IWB-WHITEBOARD [David_W_Radcliffe] [David_W_Radcliffe] ++netplan 2983 tcp NETPLAN [Thomas_Driemeyer] [Thomas_Driemeyer] ++netplan 2983 udp NETPLAN [Thomas_Driemeyer] [Thomas_Driemeyer] ++hpidsadmin 2984 tcp HPIDSADMIN ++hpidsadmin 2984 udp HPIDSADMIN ++hpidsagent 2985 tcp HPIDSAGENT [John_Trudeau] [John_Trudeau] ++hpidsagent 2985 udp HPIDSAGENT [John_Trudeau] [John_Trudeau] ++stonefalls 2986 tcp STONEFALLS [Scott_Grau] [Scott_Grau] ++stonefalls 2986 udp STONEFALLS [Scott_Grau] [Scott_Grau] ++identify 2987 tcp identify ++identify 2987 udp identify ++hippad 2988 tcp HIPPA Reporting Protocol [William_Randolph_Roy] [William_Randolph_Roy] ++hippad 2988 udp HIPPA Reporting Protocol [William_Randolph_Roy] [William_Randolph_Roy] ++zarkov 2989 tcp ZARKOV Intelligent Agent [Robin_Felix] [Robin_Felix] ++ Communication ++zarkov 2989 udp ZARKOV Intelligent Agent [Robin_Felix] [Robin_Felix] ++ Communication ++boscap 2990 tcp BOSCAP [Dirk_Hillbrecht] [Dirk_Hillbrecht] ++boscap 2990 udp BOSCAP [Dirk_Hillbrecht] [Dirk_Hillbrecht] ++wkstn-mon 2991 tcp WKSTN-MON [William_David] [William_David] ++wkstn-mon 2991 udp WKSTN-MON [William_David] [William_David] ++avenyo 2992 tcp Avenyo Server [Bodo_Rueskamp] [Bodo_Rueskamp] ++avenyo 2992 udp Avenyo Server [Bodo_Rueskamp] [Bodo_Rueskamp] ++veritas-vis1 2993 tcp VERITAS VIS1 ++veritas-vis1 2993 udp VERITAS VIS1 ++veritas-vis2 2994 tcp VERITAS VIS2 [Dinkar_Chivaluri] [Dinkar_Chivaluri] ++veritas-vis2 2994 udp VERITAS VIS2 [Dinkar_Chivaluri] [Dinkar_Chivaluri] ++idrs 2995 tcp IDRS [Jeff_Eaton] [Jeff_Eaton] ++idrs 2995 udp IDRS [Jeff_Eaton] [Jeff_Eaton] ++vsixml 2996 tcp vsixml [Rob_Juergens] [Rob_Juergens] ++vsixml 2996 udp vsixml [Rob_Juergens] [Rob_Juergens] ++rebol 2997 tcp REBOL [Holger_Kruse] [Holger_Kruse] ++rebol 2997 udp REBOL [Holger_Kruse] [Holger_Kruse] ++realsecure 2998 tcp Real Secure [Wes_Wilson] [Wes_Wilson] ++realsecure 2998 udp Real Secure [Wes_Wilson] [Wes_Wilson] ++remoteware-un 2999 tcp RemoteWare Unassigned [Tim_Farley] [Tim_Farley] ++remoteware-un 2999 udp RemoteWare Unassigned [Tim_Farley] [Tim_Farley] ++hbci 3000 tcp HBCI [Kurt_Haubner] [Kurt_Haubner] ++hbci 3000 udp HBCI [Kurt_Haubner] [Kurt_Haubner] ++remoteware-cl 3000 tcp RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use ++remoteware-cl 3000 udp RemoteWare Client [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use ++ 3001 Unassigned 2006-05-25 ++exlm-agent 3002 tcp EXLM Agent [Randy_Martin] [Randy_Martin] ++exlm-agent 3002 udp EXLM Agent [Randy_Martin] [Randy_Martin] ++remoteware-srv 3002 tcp RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use ++remoteware-srv 3002 udp RemoteWare Server [Tim_Farley] [Tim_Farley] This entry records an unassigned but widespread use ++cgms 3003 tcp CGMS [Corey_Clinton] [Corey_Clinton] 2011-02-02 ++cgms 3003 udp CGMS [Corey_Clinton] [Corey_Clinton] 2011-02-02 ++csoftragent 3004 tcp Csoft Agent [Nedelcho_Stanev_2] [Nedelcho_Stanev_2] ++csoftragent 3004 udp Csoft Agent [Nedelcho_Stanev_2] [Nedelcho_Stanev_2] ++geniuslm 3005 tcp Genius License Manager [Jakob_Spies] [Jakob_Spies] ++geniuslm 3005 udp Genius License Manager [Jakob_Spies] [Jakob_Spies] ++ii-admin 3006 tcp Instant Internet Admin [Lewis_Donzis] [Lewis_Donzis] ++ii-admin 3006 udp Instant Internet Admin [Lewis_Donzis] [Lewis_Donzis] ++lotusmtap 3007 tcp Lotus Mail Tracking Agent [Ken_Lin] [Ken_Lin] ++ Protocol ++lotusmtap 3007 udp Lotus Mail Tracking Agent [Ken_Lin] [Ken_Lin] ++ Protocol ++midnight-tech 3008 tcp Midnight Technologies [Kyle_Unice] [Kyle_Unice] ++midnight-tech 3008 udp Midnight Technologies [Kyle_Unice] [Kyle_Unice] ++pxc-ntfy 3009 tcp PXC-NTFY [Takeshi_Nishizawa] [Takeshi_Nishizawa] ++pxc-ntfy 3009 udp PXC-NTFY [Takeshi_Nishizawa] [Takeshi_Nishizawa] ++gw 3010 tcp Telerate Workstation ++ping-pong 3010 udp Telerate Workstation [Timo_Sivonen] [Timo_Sivonen] ++trusted-web 3011 tcp Trusted Web ++trusted-web 3011 udp Trusted Web ++twsdss 3012 tcp Trusted Web Client [Alex_Duncan] [Alex_Duncan] ++twsdss 3012 udp Trusted Web Client [Alex_Duncan] [Alex_Duncan] ++gilatskysurfer 3013 tcp Gilat Sky Surfer [Yossi_Gal] [Yossi_Gal] ++gilatskysurfer 3013 udp Gilat Sky Surfer [Yossi_Gal] [Yossi_Gal] ++ Broker Service ++ ++broker-service 3014 tcp IANA assigned this [Dale_Bethers] [Dale_Bethers] ++ well-formed service name as ++ a replacement for ++ "broker_service". ++ This entry is an alias to "broker-service". This entry is now ++broker_service 3014 tcp Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service ++ discovery mechanisms. ++ Broker Service ++ ++broker-service 3014 udp IANA assigned this [Dale_Bethers] [Dale_Bethers] ++ well-formed service name as ++ a replacement for ++ "broker_service". ++ This entry is an alias to "broker-service". This entry is now ++broker_service 3014 udp Broker Service [Dale_Bethers] [Dale_Bethers] historic, not usable for use with many common service ++ discovery mechanisms. ++nati-dstp 3015 tcp NATI DSTP [Paul_Austin] [Paul_Austin] ++nati-dstp 3015 udp NATI DSTP [Paul_Austin] [Paul_Austin] ++ Notify Server ++ ++notify-srvr 3016 tcp IANA assigned this [Hugo_Parra] [Hugo_Parra] ++ well-formed service name as ++ a replacement for ++ "notify_srvr". ++ This entry is an alias to "notify-srvr". This entry is now ++notify_srvr 3016 tcp Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service ++ discovery mechanisms. ++ Notify Server ++ ++notify-srvr 3016 udp IANA assigned this [Hugo_Parra] [Hugo_Parra] ++ well-formed service name as ++ a replacement for ++ "notify_srvr". ++ This entry is an alias to "notify-srvr". This entry is now ++notify_srvr 3016 udp Notify Server [Hugo_Parra] [Hugo_Parra] historic, not usable for use with many common service ++ discovery mechanisms. ++ Event Listener ++ ++event-listener 3017 tcp IANA assigned this [Ted_Tronson] [Ted_Tronson] ++ well-formed service name as ++ a replacement for ++ "event_listener". ++ This entry is an alias to "event-listener". This entry is now ++event_listener 3017 tcp Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service ++ discovery mechanisms. ++ Event Listener ++ ++event-listener 3017 udp IANA assigned this [Ted_Tronson] [Ted_Tronson] ++ well-formed service name as ++ a replacement for ++ "event_listener". ++ This entry is an alias to "event-listener". This entry is now ++event_listener 3017 udp Event Listener [Ted_Tronson] [Ted_Tronson] historic, not usable for use with many common service ++ discovery mechanisms. ++ Service Registry ++ ++srvc-registry 3018 tcp IANA assigned this [Mark_Killgore] [Mark_Killgore] ++ well-formed service name as ++ a replacement for ++ "srvc_registry". ++ This entry is an alias to "srvc-registry". This entry is now ++srvc_registry 3018 tcp Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service ++ discovery mechanisms. ++ Service Registry ++ ++srvc-registry 3018 udp IANA assigned this [Mark_Killgore] [Mark_Killgore] ++ well-formed service name as ++ a replacement for ++ "srvc_registry". ++ This entry is an alias to "srvc-registry". This entry is now ++srvc_registry 3018 udp Service Registry [Mark_Killgore] [Mark_Killgore] historic, not usable for use with many common service ++ discovery mechanisms. ++ Resource Manager ++ ++resource-mgr 3019 tcp IANA assigned this [Gary_Glover] [Gary_Glover] ++ well-formed service name as ++ a replacement for ++ "resource_mgr". ++ This entry is an alias to "resource-mgr". This entry is now ++resource_mgr 3019 tcp Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service ++ discovery mechanisms. ++ Resource Manager ++ ++resource-mgr 3019 udp IANA assigned this [Gary_Glover] [Gary_Glover] ++ well-formed service name as ++ a replacement for ++ "resource_mgr". ++ This entry is an alias to "resource-mgr". This entry is now ++resource_mgr 3019 udp Resource Manager [Gary_Glover] [Gary_Glover] historic, not usable for use with many common service ++ discovery mechanisms. ++cifs 3020 tcp CIFS [Paul_Leach] [Paul_Leach] ++cifs 3020 udp CIFS [Paul_Leach] [Paul_Leach] ++agriserver 3021 tcp AGRI Server [Frank_Neulichedl] [Frank_Neulichedl] ++agriserver 3021 udp AGRI Server [Frank_Neulichedl] [Frank_Neulichedl] ++csregagent 3022 tcp CSREGAGENT [Nedelcho_Stanev] [Nedelcho_Stanev] ++csregagent 3022 udp CSREGAGENT [Nedelcho_Stanev] [Nedelcho_Stanev] ++magicnotes 3023 tcp magicnotes [Karl_Edwall] [Karl_Edwall] ++magicnotes 3023 udp magicnotes [Karl_Edwall] [Karl_Edwall] ++ NDS_SSO ++ ++nds-sso 3024 tcp IANA assigned this [Mel_Oyler] [Mel_Oyler] ++ well-formed service name as ++ a replacement for "nds_sso". ++ This entry is an alias to "nds-sso". This entry is now ++nds_sso 3024 tcp NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service ++ discovery mechanisms. ++ NDS_SSO ++ ++nds-sso 3024 udp IANA assigned this [Mel_Oyler] [Mel_Oyler] ++ well-formed service name as ++ a replacement for "nds_sso". ++ This entry is an alias to "nds-sso". This entry is now ++nds_sso 3024 udp NDS_SSO [Mel_Oyler] [Mel_Oyler] historic, not usable for use with many common service ++ discovery mechanisms. ++arepa-raft 3025 tcp Arepa Raft [Stuart_Schaefer] [Stuart_Schaefer] ++arepa-raft 3025 udp Arepa Raft [Stuart_Schaefer] [Stuart_Schaefer] ++agri-gateway 3026 tcp AGRI Gateway [Agri_Datalog] [Agri_Datalog] ++agri-gateway 3026 udp AGRI Gateway [Agri_Datalog] [Agri_Datalog] ++ LiebDevMgmt_C ++ ++LiebDevMgmt-C 3027 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_C". ++ This entry is an alias to "LiebDevMgmt-C". This entry is now ++LiebDevMgmt_C 3027 tcp LiebDevMgmt_C historic, not usable for use with many common service ++ discovery mechanisms. ++ LiebDevMgmt_C ++ ++LiebDevMgmt-C 3027 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_C". ++ This entry is an alias to "LiebDevMgmt-C". This entry is now ++LiebDevMgmt_C 3027 udp LiebDevMgmt_C historic, not usable for use with many common service ++ discovery mechanisms. ++ LiebDevMgmt_DM ++ ++LiebDevMgmt-DM 3028 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_DM". ++ This entry is an alias to "LiebDevMgmt-DM". This entry is now ++LiebDevMgmt_DM 3028 tcp LiebDevMgmt_DM historic, not usable for use with many common service ++ discovery mechanisms. ++ LiebDevMgmt_DM ++ ++LiebDevMgmt-DM 3028 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_DM". ++ This entry is an alias to "LiebDevMgmt-DM". This entry is now ++LiebDevMgmt_DM 3028 udp LiebDevMgmt_DM historic, not usable for use with many common service ++ discovery mechanisms. ++ LiebDevMgmt_A ++ ++LiebDevMgmt-A 3029 tcp IANA assigned this [Mike_Velten] [Mike_Velten] ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_A". ++ This entry is an alias to "LiebDevMgmt-A". This entry is now ++LiebDevMgmt_A 3029 tcp LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service ++ discovery mechanisms. ++ LiebDevMgmt_A ++ ++LiebDevMgmt-A 3029 udp IANA assigned this [Mike_Velten] [Mike_Velten] ++ well-formed service name as ++ a replacement for ++ "LiebDevMgmt_A". ++ This entry is an alias to "LiebDevMgmt-A". This entry is now ++LiebDevMgmt_A 3029 udp LiebDevMgmt_A [Mike_Velten] [Mike_Velten] historic, not usable for use with many common service ++ discovery mechanisms. ++arepa-cas 3030 tcp Arepa Cas [Stuart_Schaefer] [Stuart_Schaefer] ++arepa-cas 3030 udp Arepa Cas [Stuart_Schaefer] [Stuart_Schaefer] ++eppc 3031 tcp Remote AppleEvents/PPC [Steve_Zellers] [Steve_Zellers] ++ Toolbox ++eppc 3031 udp Remote AppleEvents/PPC [Steve_Zellers] [Steve_Zellers] ++ Toolbox ++redwood-chat 3032 tcp Redwood Chat [Songwon_Chi] [Songwon_Chi] ++redwood-chat 3032 udp Redwood Chat [Songwon_Chi] [Songwon_Chi] ++pdb 3033 tcp PDB [Don_Bowman] [Don_Bowman] ++pdb 3033 udp PDB [Don_Bowman] [Don_Bowman] ++osmosis-aeea 3034 tcp Osmosis / Helix (R) AEEA [Larry_Atkin] [Larry_Atkin] ++ Port ++osmosis-aeea 3034 udp Osmosis / Helix (R) AEEA [Larry_Atkin] [Larry_Atkin] ++ Port ++fjsv-gssagt 3035 tcp FJSV gssagt [Tomoji_Koike] [Tomoji_Koike] ++fjsv-gssagt 3035 udp FJSV gssagt [Tomoji_Koike] [Tomoji_Koike] ++hagel-dump 3036 tcp Hagel DUMP [Haim_Gelfenbeyn] [Haim_Gelfenbeyn] ++hagel-dump 3036 udp Hagel DUMP [Haim_Gelfenbeyn] [Haim_Gelfenbeyn] ++hp-san-mgmt 3037 tcp HP SAN Mgmt [Steve_Britt] [Steve_Britt] ++hp-san-mgmt 3037 udp HP SAN Mgmt [Steve_Britt] [Steve_Britt] ++santak-ups 3038 tcp Santak UPS [Tom_Liu] [Tom_Liu] ++santak-ups 3038 udp Santak UPS [Tom_Liu] [Tom_Liu] ++cogitate 3039 tcp Cogitate, Inc. [Jim_Harlan] [Jim_Harlan] ++cogitate 3039 udp Cogitate, Inc. [Jim_Harlan] [Jim_Harlan] ++tomato-springs 3040 tcp Tomato Springs [Jack_Waller_III] [Jack_Waller_III] ++tomato-springs 3040 udp Tomato Springs [Jack_Waller_III] [Jack_Waller_III] ++di-traceware 3041 tcp di-traceware [Carlos_Hung] [Carlos_Hung] ++di-traceware 3041 udp di-traceware [Carlos_Hung] [Carlos_Hung] ++journee 3042 tcp journee [Kevin_Calman] [Kevin_Calman] ++journee 3042 udp journee [Kevin_Calman] [Kevin_Calman] ++brp 3043 tcp Broadcast Routing Protocol [John_Border] [John_Border] ++brp 3043 udp Broadcast Routing Protocol [John_Border] [John_Border] ++epp 3044 tcp EndPoint Protocol [Stephen_Cipolli] [Stephen_Cipolli] ++epp 3044 udp EndPoint Protocol [Stephen_Cipolli] [Stephen_Cipolli] ++responsenet 3045 tcp ResponseNet [Chul_Yoon] [Chul_Yoon] ++responsenet 3045 udp ResponseNet [Chul_Yoon] [Chul_Yoon] ++di-ase 3046 tcp di-ase [Carlos_Hung] [Carlos_Hung] ++di-ase 3046 udp di-ase [Carlos_Hung] [Carlos_Hung] ++hlserver 3047 tcp Fast Security HL Server [Michael_Zunke] [Michael_Zunke] 2010-07-23 ++hlserver 3047 udp Fast Security HL Server [Michael_Zunke] [Michael_Zunke] 2010-07-23 ++pctrader 3048 tcp Sierra Net PC Trader [Chris_Hahn] [Chris_Hahn] ++pctrader 3048 udp Sierra Net PC Trader [Chris_Hahn] [Chris_Hahn] ++nsws 3049 tcp NSWS [Ray_Gwinn] [Ray_Gwinn] ++nsws 3049 udp NSWS [Ray_Gwinn] [Ray_Gwinn] ++ gds_db ++ ++gds-db 3050 tcp IANA assigned this [Madhukar_N_Thakur] [Madhukar_N_Thakur] ++ well-formed service name as ++ a replacement for "gds_db". ++ This entry is an alias to "gds-db". This entry is now ++gds_db 3050 tcp gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service ++ discovery mechanisms. ++ gds_db ++ ++gds-db 3050 udp IANA assigned this [Madhukar_N_Thakur] [Madhukar_N_Thakur] ++ well-formed service name as ++ a replacement for "gds_db". ++ This entry is an alias to "gds-db". This entry is now ++gds_db 3050 udp gds_db [Madhukar_N_Thakur] [Madhukar_N_Thakur] historic, not usable for use with many common service ++ discovery mechanisms. ++galaxy-server 3051 tcp Galaxy Server [Michael_Andre] [Michael_Andre] ++galaxy-server 3051 udp Galaxy Server [Michael_Andre] [Michael_Andre] ++apc-3052 3052 tcp APC 3052 [American_Power_Conve] [American_Power_Conve] ++apc-3052 3052 udp APC 3052 [American_Power_Conve] [American_Power_Conve] ++dsom-server 3053 tcp dsom-server [Daniel_Sisk] [Daniel_Sisk] ++dsom-server 3053 udp dsom-server [Daniel_Sisk] [Daniel_Sisk] ++amt-cnf-prot 3054 tcp AMT CNF PROT [Marco_Marcucci] [Marco_Marcucci] ++amt-cnf-prot 3054 udp AMT CNF PROT [Marco_Marcucci] [Marco_Marcucci] ++policyserver 3055 tcp Policy Server [Mark_Garti] [Mark_Garti] ++policyserver 3055 udp Policy Server [Mark_Garti] [Mark_Garti] ++cdl-server 3056 tcp CDL Server [Paul_Roberts] [Paul_Roberts] ++cdl-server 3056 udp CDL Server [Paul_Roberts] [Paul_Roberts] ++goahead-fldup 3057 tcp GoAhead FldUp [Alan_Pickrell] [Alan_Pickrell] ++goahead-fldup 3057 udp GoAhead FldUp [Alan_Pickrell] [Alan_Pickrell] ++videobeans 3058 tcp videobeans [Hiroyuki_Takahashi] [Hiroyuki_Takahashi] ++videobeans 3058 udp videobeans [Hiroyuki_Takahashi] [Hiroyuki_Takahashi] ++qsoft 3059 tcp qsoft [James_Kunz] [James_Kunz] ++qsoft 3059 udp qsoft [James_Kunz] [James_Kunz] ++interserver 3060 tcp interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] ++interserver 3060 udp interserver [Madhukar_N_Thakur] [Madhukar_N_Thakur] ++cautcpd 3061 tcp cautcpd ++cautcpd 3061 udp cautcpd ++ncacn-ip-tcp 3062 tcp ncacn-ip-tcp ++ncacn-ip-tcp 3062 udp ncacn-ip-tcp ++ncadg-ip-udp 3063 tcp ncadg-ip-udp [Gabi_Kalmar] [Gabi_Kalmar] ++ncadg-ip-udp 3063 udp ncadg-ip-udp [Gabi_Kalmar] [Gabi_Kalmar] ++rprt 3064 tcp Remote Port Redirector [Robin_Johnston] [Robin_Johnston] ++rprt 3064 udp Remote Port Redirector [Robin_Johnston] [Robin_Johnston] ++slinterbase 3065 tcp slinterbase [Bie_Tie] [Bie_Tie] ++slinterbase 3065 udp slinterbase [Bie_Tie] [Bie_Tie] ++netattachsdmp 3066 tcp NETATTACHSDMP [Mike_Young] [Mike_Young] ++netattachsdmp 3066 udp NETATTACHSDMP [Mike_Young] [Mike_Young] ++fjhpjp 3067 tcp FJHPJP [Ryozo_Furutani] [Ryozo_Furutani] ++fjhpjp 3067 udp FJHPJP [Ryozo_Furutani] [Ryozo_Furutani] ++ls3bcast 3068 tcp ls3 Broadcast ++ls3bcast 3068 udp ls3 Broadcast ++ls3 3069 tcp ls3 [Jim_Thompson] [Jim_Thompson] ++ls3 3069 udp ls3 [Jim_Thompson] [Jim_Thompson] ++mgxswitch 3070 tcp MGXSWITCH [George_Walter] [George_Walter] ++mgxswitch 3070 udp MGXSWITCH [George_Walter] [George_Walter] ++csd-mgmt-port 3071 tcp ContinuStor Manager Port ++csd-mgmt-port 3071 udp ContinuStor Manager Port ++csd-monitor 3072 tcp ContinuStor Monitor Port [Ray_Jantz] [Ray_Jantz] ++csd-monitor 3072 udp ContinuStor Monitor Port [Ray_Jantz] [Ray_Jantz] ++vcrp 3073 tcp Very simple chatroom prot [Andreas_Wurf] [Andreas_Wurf] ++vcrp 3073 udp Very simple chatroom prot [Andreas_Wurf] [Andreas_Wurf] ++xbox 3074 tcp Xbox game port [Damon_Danieli] [Damon_Danieli] ++xbox 3074 udp Xbox game port [Damon_Danieli] [Damon_Danieli] ++orbix-locator 3075 tcp Orbix 2000 Locator ++orbix-locator 3075 udp Orbix 2000 Locator ++orbix-config 3076 tcp Orbix 2000 Config ++orbix-config 3076 udp Orbix 2000 Config ++orbix-loc-ssl 3077 tcp Orbix 2000 Locator SSL ++orbix-loc-ssl 3077 udp Orbix 2000 Locator SSL ++orbix-cfg-ssl 3078 tcp Orbix 2000 Locator SSL [Eric_Newcomer] [Eric_Newcomer] ++orbix-cfg-ssl 3078 udp Orbix 2000 Locator SSL [Eric_Newcomer] [Eric_Newcomer] ++lv-frontpanel 3079 tcp LV Front Panel [Darshan_Shah] [Darshan_Shah] ++lv-frontpanel 3079 udp LV Front Panel [Darshan_Shah] [Darshan_Shah] ++ stm_pproc ++ ++stm-pproc 3080 tcp IANA assigned this [Paul_McGinnis] [Paul_McGinnis] ++ well-formed service name as ++ a replacement for ++ "stm_pproc". ++ This entry is an alias to "stm-pproc". This entry is now ++stm_pproc 3080 tcp stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service ++ discovery mechanisms. ++ stm_pproc ++ ++stm-pproc 3080 udp IANA assigned this [Paul_McGinnis] [Paul_McGinnis] ++ well-formed service name as ++ a replacement for ++ "stm_pproc". ++ This entry is an alias to "stm-pproc". This entry is now ++stm_pproc 3080 udp stm_pproc [Paul_McGinnis] [Paul_McGinnis] historic, not usable for use with many common service ++ discovery mechanisms. ++tl1-lv 3081 tcp TL1-LV ++tl1-lv 3081 udp TL1-LV ++tl1-raw 3082 tcp TL1-RAW ++tl1-raw 3082 udp TL1-RAW ++tl1-telnet 3083 tcp TL1-TELNET [SONET_Internetworkin] [SONET_Internetworkin] ++tl1-telnet 3083 udp TL1-TELNET [SONET_Internetworkin] [SONET_Internetworkin] ++itm-mccs 3084 tcp ITM-MCCS [Portnoy_Boxman] [Portnoy_Boxman] ++itm-mccs 3084 udp ITM-MCCS [Portnoy_Boxman] [Portnoy_Boxman] ++pcihreq 3085 tcp PCIHReq [Paul_Sanders] [Paul_Sanders] ++pcihreq 3085 udp PCIHReq [Paul_Sanders] [Paul_Sanders] ++jdl-dbkitchen 3086 tcp JDL-DBKitchen [Hideo_Wakabayashi] [Hideo_Wakabayashi] ++jdl-dbkitchen 3086 udp JDL-DBKitchen [Hideo_Wakabayashi] [Hideo_Wakabayashi] ++asoki-sma 3087 tcp Asoki SMA [Andrew_Mossberg] [Andrew_Mossberg] ++asoki-sma 3087 udp Asoki SMA [Andrew_Mossberg] [Andrew_Mossberg] ++xdtp 3088 tcp eXtensible Data Transfer [Michael_Shearson] [Michael_Shearson] ++ Protocol ++xdtp 3088 udp eXtensible Data Transfer [Michael_Shearson] [Michael_Shearson] ++ Protocol ++ptk-alink 3089 tcp ParaTek Agent Linking [Robert_Hodgson_2] [Robert_Hodgson_2] ++ptk-alink 3089 udp ParaTek Agent Linking [Robert_Hodgson_2] [Robert_Hodgson_2] ++stss 3090 tcp Senforce Session Services [Peter_Boucher] [Peter_Boucher] ++stss 3090 udp Senforce Session Services [Peter_Boucher] [Peter_Boucher] ++1ci-smcs 3091 tcp 1Ci Server Management [Ralf_Bensmann] [Ralf_Bensmann] ++1ci-smcs 3091 udp 1Ci Server Management [Ralf_Bensmann] [Ralf_Bensmann] ++ 3092 Unassigned 2008-04-22 ++rapidmq-center 3093 tcp Jiiva RapidMQ Center ++rapidmq-center 3093 udp Jiiva RapidMQ Center ++rapidmq-reg 3094 tcp Jiiva RapidMQ Registry [Mark_Ericksen] [Mark_Ericksen] ++rapidmq-reg 3094 udp Jiiva RapidMQ Registry [Mark_Ericksen] [Mark_Ericksen] ++panasas 3095 tcp Panasas rendevous port [Peter_Berger] [Peter_Berger] ++panasas 3095 udp Panasas rendevous port [Peter_Berger] [Peter_Berger] ++ndl-aps 3096 tcp Active Print Server Port [Martin_Norman] [Martin_Norman] ++ndl-aps 3096 udp Active Print Server Port [Martin_Norman] [Martin_Norman] ++ 3097 tcp Reserved ++ 3097 udp Reserved ++itu-bicc-stc 3097 sctp ITU-T Q.1902.1/Q.2150.3 [Greg_Sidebottom] [Greg_Sidebottom] ++umm-port 3098 tcp Universal Message Manager [Phil_Braham] [Phil_Braham] ++umm-port 3098 udp Universal Message Manager [Phil_Braham] [Phil_Braham] ++chmd 3099 tcp CHIPSY Machine Daemon [Trond_Borsting] [Trond_Borsting] ++chmd 3099 udp CHIPSY Machine Daemon [Trond_Borsting] [Trond_Borsting] ++opcon-xps 3100 tcp OpCon/xps [David_Bourland] [David_Bourland] ++opcon-xps 3100 udp OpCon/xps [David_Bourland] [David_Bourland] ++hp-pxpib 3101 tcp HP PolicyXpert PIB Server [Brian_O_Keefe] [Brian_O_Keefe] ++hp-pxpib 3101 udp HP PolicyXpert PIB Server [Brian_O_Keefe] [Brian_O_Keefe] ++slslavemon 3102 tcp SoftlinK Slave Mon Port [Moshe_Livne] [Moshe_Livne] ++slslavemon 3102 udp SoftlinK Slave Mon Port [Moshe_Livne] [Moshe_Livne] ++autocuesmi 3103 tcp Autocue SMI Protocol ++autocuesmi 3103 udp Autocue SMI Protocol ++autocuelog 3104 tcp Autocue Logger Protocol ++autocuetime 3104 udp Autocue Time Service [Geoff_Back] [Geoff_Back] ++cardbox 3105 tcp Cardbox ++cardbox 3105 udp Cardbox ++cardbox-http 3106 tcp Cardbox HTTP [Martin_Kochanski] [Martin_Kochanski] ++cardbox-http 3106 udp Cardbox HTTP [Martin_Kochanski] [Martin_Kochanski] ++business 3107 tcp Business protocol ++business 3107 udp Business protocol ++geolocate 3108 tcp Geolocate protocol ++geolocate 3108 udp Geolocate protocol ++personnel 3109 tcp Personnel protocol [William_Randolph_Roy] [William_Randolph_Roy] ++personnel 3109 udp Personnel protocol [William_Randolph_Roy] [William_Randolph_Roy] ++sim-control 3110 tcp simulator control port [Ian_Bell] [Ian_Bell] ++sim-control 3110 udp simulator control port [Ian_Bell] [Ian_Bell] ++wsynch 3111 tcp Web Synchronous Services [Valery_Fremaux] [Valery_Fremaux] ++wsynch 3111 udp Web Synchronous Services [Valery_Fremaux] [Valery_Fremaux] ++ksysguard 3112 tcp KDE System Guard [Chris_Schlaeger] [Chris_Schlaeger] ++ksysguard 3112 udp KDE System Guard [Chris_Schlaeger] [Chris_Schlaeger] ++cs-auth-svr 3113 tcp CS-Authenticate Svr Port [Cliff_Diamond][Andy_Georgiou] [Cliff_Diamond][Andy_Georgiou] ++cs-auth-svr 3113 udp CS-Authenticate Svr Port [Cliff_Diamond][Andy_Georgiou] [Cliff_Diamond][Andy_Georgiou] ++ccmad 3114 tcp CCM AutoDiscover [Ram_Sudama] [Ram_Sudama] ++ccmad 3114 udp CCM AutoDiscover [Ram_Sudama] [Ram_Sudama] ++mctet-master 3115 tcp MCTET Master ++mctet-master 3115 udp MCTET Master ++mctet-gateway 3116 tcp MCTET Gateway ++mctet-gateway 3116 udp MCTET Gateway ++mctet-jserv 3117 tcp MCTET Jserv [Portnoy_Boxman] [Portnoy_Boxman] ++mctet-jserv 3117 udp MCTET Jserv [Portnoy_Boxman] [Portnoy_Boxman] ++pkagent 3118 tcp PKAgent [Michael_Douglass] [Michael_Douglass] ++pkagent 3118 udp PKAgent [Michael_Douglass] [Michael_Douglass] ++d2000kernel 3119 tcp D2000 Kernel Port ++d2000kernel 3119 udp D2000 Kernel Port ++d2000webserver 3120 tcp D2000 Webserver Port [Tomas_Rajcan] [Tomas_Rajcan] ++d2000webserver 3120 udp D2000 Webserver Port [Tomas_Rajcan] [Tomas_Rajcan] ++ 3121 Unassigned 2003-09-17 ++vtr-emulator 3122 tcp MTI VTR Emulator port [John_Mertus] [John_Mertus] ++vtr-emulator 3122 udp MTI VTR Emulator port [John_Mertus] [John_Mertus] ++edix 3123 tcp EDI Translation Protocol [William_Randolph_Roy] [William_Randolph_Roy] ++edix 3123 udp EDI Translation Protocol [William_Randolph_Roy] [William_Randolph_Roy] ++beacon-port 3124 tcp Beacon Port [James_Paul_Duncan] [James_Paul_Duncan] ++beacon-port 3124 udp Beacon Port [James_Paul_Duncan] [James_Paul_Duncan] ++a13-an 3125 tcp A13-AN Interface [Douglas_Knisely] [Douglas_Knisely] ++a13-an 3125 udp A13-AN Interface [Douglas_Knisely] [Douglas_Knisely] ++ 3126 Unassigned 2007-10-04 ++ctx-bridge 3127 tcp CTX Bridge Port [Alexander_Dubrovsky] [Alexander_Dubrovsky] ++ctx-bridge 3127 udp CTX Bridge Port [Alexander_Dubrovsky] [Alexander_Dubrovsky] ++ndl-aas 3128 tcp Active API Server Port [Martin_Norman] [Martin_Norman] ++ndl-aas 3128 udp Active API Server Port [Martin_Norman] [Martin_Norman] ++netport-id 3129 tcp NetPort Discovery Port [P_T_K_Farrar] [P_T_K_Farrar] ++netport-id 3129 udp NetPort Discovery Port [P_T_K_Farrar] [P_T_K_Farrar] ++icpv2 3130 tcp ICPv2 [Duane_Wessels] [Duane_Wessels] ++icpv2 3130 udp ICPv2 [Duane_Wessels] [Duane_Wessels] ++netbookmark 3131 tcp Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] ++netbookmark 3131 udp Net Book Mark [Yiftach_Ravid] [Yiftach_Ravid] ++ms-rule-engine 3132 tcp Microsoft Business Rule [Anush_Kumar] [Anush_Kumar] ++ Engine Update Service ++ms-rule-engine 3132 udp Microsoft Business Rule [Anush_Kumar] [Anush_Kumar] ++ Engine Update Service ++prism-deploy 3133 tcp Prism Deploy User Port [Joan_Linck] [Joan_Linck] ++prism-deploy 3133 udp Prism Deploy User Port [Joan_Linck] [Joan_Linck] ++ecp 3134 tcp Extensible Code Protocol [Jim_Trek][Mark_Bocko] [Jim_Trek][Mark_Bocko] ++ecp 3134 udp Extensible Code Protocol [Jim_Trek][Mark_Bocko] [Jim_Trek][Mark_Bocko] ++peerbook-port 3135 tcp PeerBook Port [John_Flowers] [John_Flowers] ++peerbook-port 3135 udp PeerBook Port [John_Flowers] [John_Flowers] ++grubd 3136 tcp Grub Server Port [Kord_Campbell] [Kord_Campbell] ++grubd 3136 udp Grub Server Port [Kord_Campbell] [Kord_Campbell] ++rtnt-1 3137 tcp rtnt-1 data packets ++rtnt-1 3137 udp rtnt-1 data packets ++rtnt-2 3138 tcp rtnt-2 data packets [Ron_Muellerschoen] [Ron_Muellerschoen] ++rtnt-2 3138 udp rtnt-2 data packets [Ron_Muellerschoen] [Ron_Muellerschoen] ++incognitorv 3139 tcp Incognito Rendez-Vous [Stephane_Bourque] [Stephane_Bourque] ++incognitorv 3139 udp Incognito Rendez-Vous [Stephane_Bourque] [Stephane_Bourque] ++ariliamulti 3140 tcp Arilia Multiplexor [Stephane_Bourque_2] [Stephane_Bourque_2] ++ariliamulti 3140 udp Arilia Multiplexor [Stephane_Bourque_2] [Stephane_Bourque_2] ++vmodem 3141 tcp VMODEM [Ray_Gwinn] [Ray_Gwinn] ++vmodem 3141 udp VMODEM [Ray_Gwinn] [Ray_Gwinn] ++rdc-wh-eos 3142 tcp RDC WH EOS [Udi_Nir] [Udi_Nir] ++rdc-wh-eos 3142 udp RDC WH EOS [Udi_Nir] [Udi_Nir] ++seaview 3143 tcp Sea View [Jim_Flaherty_2] [Jim_Flaherty_2] ++seaview 3143 udp Sea View [Jim_Flaherty_2] [Jim_Flaherty_2] ++tarantella 3144 tcp Tarantella [Roger_Binns] [Roger_Binns] ++tarantella 3144 udp Tarantella [Roger_Binns] [Roger_Binns] ++ UNAUTHORIZED ++csi-lfap 3145 tcp CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port ++ 3145 by ++ zftpserver ++ UNAUTHORIZED ++csi-lfap 3145 udp CSI-LFAP [Paul_Amsden] [Paul_Amsden] USE: port ++ 3145 by ++ zftpserver ++bears-02 3146 tcp bears-02 [Bruce_McKinnon_2] [Bruce_McKinnon_2] ++bears-02 3146 udp bears-02 [Bruce_McKinnon_2] [Bruce_McKinnon_2] ++rfio 3147 tcp RFIO [Frederic_Hemmer] [Frederic_Hemmer] ++rfio 3147 udp RFIO [Frederic_Hemmer] [Frederic_Hemmer] ++nm-game-admin 3148 tcp NetMike Game Administrator ++nm-game-admin 3148 udp NetMike Game Administrator ++nm-game-server 3149 tcp NetMike Game Server ++nm-game-server 3149 udp NetMike Game Server ++nm-asses-admin 3150 tcp NetMike Assessor ++ Administrator ++nm-asses-admin 3150 udp NetMike Assessor ++ Administrator ++nm-assessor 3151 tcp NetMike Assessor [Andrew_Sharpe] [Andrew_Sharpe] ++nm-assessor 3151 udp NetMike Assessor [Andrew_Sharpe] [Andrew_Sharpe] ++feitianrockey 3152 tcp FeiTian Port [Huang_Yu] [Huang_Yu] ++feitianrockey 3152 udp FeiTian Port [Huang_Yu] [Huang_Yu] ++s8-client-port 3153 tcp S8Cargo Client Port [Jon_S_Kyle] [Jon_S_Kyle] ++s8-client-port 3153 udp S8Cargo Client Port [Jon_S_Kyle] [Jon_S_Kyle] ++ccmrmi 3154 tcp ON RMI Registry [Ram_Sudama] [Ram_Sudama] ++ccmrmi 3154 udp ON RMI Registry [Ram_Sudama] [Ram_Sudama] ++jpegmpeg 3155 tcp JpegMpeg Port [Richard_Bassous] [Richard_Bassous] ++jpegmpeg 3155 udp JpegMpeg Port [Richard_Bassous] [Richard_Bassous] ++indura 3156 tcp Indura Collector [Bruce_Kosbab] [Bruce_Kosbab] ++indura 3156 udp Indura Collector [Bruce_Kosbab] [Bruce_Kosbab] ++e3consultants 3157 tcp CCC Listener Port [Brian_Carnell] [Brian_Carnell] ++e3consultants 3157 udp CCC Listener Port [Brian_Carnell] [Brian_Carnell] ++stvp 3158 tcp SmashTV Protocol [Christian_Wolff] [Christian_Wolff] ++stvp 3158 udp SmashTV Protocol [Christian_Wolff] [Christian_Wolff] ++navegaweb-port 3159 tcp NavegaWeb Tarification [Miguel_Angel_Fernand] [Miguel_Angel_Fernand] ++navegaweb-port 3159 udp NavegaWeb Tarification [Miguel_Angel_Fernand] [Miguel_Angel_Fernand] ++tip-app-server 3160 tcp TIP Application Server [Olivier_Mascia] [Olivier_Mascia] ++tip-app-server 3160 udp TIP Application Server [Olivier_Mascia] [Olivier_Mascia] ++doc1lm 3161 tcp DOC1 License Manager [Greg_Goodson] [Greg_Goodson] ++doc1lm 3161 udp DOC1 License Manager [Greg_Goodson] [Greg_Goodson] ++sflm 3162 tcp SFLM [System_Administrator] [System_Administrator] ++sflm 3162 udp SFLM [System_Administrator] [System_Administrator] ++res-sap 3163 tcp RES-SAP [Bob_Janssen] [Bob_Janssen] ++res-sap 3163 udp RES-SAP [Bob_Janssen] [Bob_Janssen] ++imprs 3164 tcp IMPRS [Lars_Bohn] [Lars_Bohn] ++imprs 3164 udp IMPRS [Lars_Bohn] [Lars_Bohn] ++newgenpay 3165 tcp Newgenpay Engine Service [Ilan_Zisser] [Ilan_Zisser] ++newgenpay 3165 udp Newgenpay Engine Service [Ilan_Zisser] [Ilan_Zisser] ++sossecollector 3166 tcp Quest Spotlight [Greg_Cottman] [Greg_Cottman] 2008-10-23 ++ Out-Of-Process Collector ++sossecollector 3166 udp Quest Spotlight [Greg_Cottman] [Greg_Cottman] 2008-10-23 ++ Out-Of-Process Collector ++nowcontact 3167 tcp Now Contact Public Server ++nowcontact 3167 udp Now Contact Public Server ++poweronnud 3168 tcp Now Up-to-Date Public Server [John_Wallace] [John_Wallace] ++poweronnud 3168 udp Now Up-to-Date Public Server [John_Wallace] [John_Wallace] ++serverview-as 3169 tcp SERVERVIEW-AS ++serverview-as 3169 udp SERVERVIEW-AS ++serverview-asn 3170 tcp SERVERVIEW-ASN ++serverview-asn 3170 udp SERVERVIEW-ASN ++serverview-gf 3171 tcp SERVERVIEW-GF ++serverview-gf 3171 udp SERVERVIEW-GF ++serverview-rm 3172 tcp SERVERVIEW-RM ++serverview-rm 3172 udp SERVERVIEW-RM ++serverview-icc 3173 tcp SERVERVIEW-ICC [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++serverview-icc 3173 udp SERVERVIEW-ICC [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++armi-server 3174 tcp ARMI Server [Bobby_Martin] [Bobby_Martin] ++armi-server 3174 udp ARMI Server [Bobby_Martin] [Bobby_Martin] ++t1-e1-over-ip 3175 tcp T1_E1_Over_IP [Mark_Doyle] [Mark_Doyle] ++t1-e1-over-ip 3175 udp T1_E1_Over_IP [Mark_Doyle] [Mark_Doyle] ++ars-master 3176 tcp ARS Master [Portnoy_Boxman] [Portnoy_Boxman] ++ars-master 3176 udp ARS Master [Portnoy_Boxman] [Portnoy_Boxman] ++phonex-port 3177 tcp Phonex Protocol [Doug_Grover] [Doug_Grover] ++phonex-port 3177 udp Phonex Protocol [Doug_Grover] [Doug_Grover] ++radclientport 3178 tcp Radiance UltraEdge Port [Sri_Subramaniam] [Sri_Subramaniam] ++radclientport 3178 udp Radiance UltraEdge Port [Sri_Subramaniam] [Sri_Subramaniam] ++h2gf-w-2m 3179 tcp H2GF W.2m Handover prot. [Arne_Norefors] [Arne_Norefors] ++h2gf-w-2m 3179 udp H2GF W.2m Handover prot. [Arne_Norefors] [Arne_Norefors] ++mc-brk-srv 3180 tcp Millicent Broker Server [Steve_Glassman] [Steve_Glassman] ++mc-brk-srv 3180 udp Millicent Broker Server [Steve_Glassman] [Steve_Glassman] ++bmcpatrolagent 3181 tcp BMC Patrol Agent ++bmcpatrolagent 3181 udp BMC Patrol Agent ++bmcpatrolrnvu 3182 tcp BMC Patrol Rendezvous [Portnoy_Boxman] [Portnoy_Boxman] ++bmcpatrolrnvu 3182 udp BMC Patrol Rendezvous [Portnoy_Boxman] [Portnoy_Boxman] ++cops-tls 3183 tcp COPS/TLS [Mark_Stevens] [Mark_Stevens] ++cops-tls 3183 udp COPS/TLS [Mark_Stevens] [Mark_Stevens] ++apogeex-port 3184 tcp ApogeeX Port [Tom_Nys] [Tom_Nys] ++apogeex-port 3184 udp ApogeeX Port [Tom_Nys] [Tom_Nys] ++smpppd 3185 tcp SuSE Meta PPPD [Arvin_Schnell] [Arvin_Schnell] ++smpppd 3185 udp SuSE Meta PPPD [Arvin_Schnell] [Arvin_Schnell] ++iiw-port 3186 tcp IIW Monitor User Port [Corey_Burnett] [Corey_Burnett] ++iiw-port 3186 udp IIW Monitor User Port [Corey_Burnett] [Corey_Burnett] ++odi-port 3187 tcp Open Design Listen Port [Phivos_Aristides] [Phivos_Aristides] ++odi-port 3187 udp Open Design Listen Port [Phivos_Aristides] [Phivos_Aristides] ++brcm-comm-port 3188 tcp Broadcom Port [Thomas_L_Johnson] [Thomas_L_Johnson] ++brcm-comm-port 3188 udp Broadcom Port [Thomas_L_Johnson] [Thomas_L_Johnson] ++pcle-infex 3189 tcp Pinnacle Sys InfEx Port [Anthon_van_der_Neut] [Anthon_van_der_Neut] ++pcle-infex 3189 udp Pinnacle Sys InfEx Port [Anthon_van_der_Neut] [Anthon_van_der_Neut] ++csvr-proxy 3190 tcp ConServR Proxy ++csvr-proxy 3190 udp ConServR Proxy ++csvr-sslproxy 3191 tcp ConServR SSL Proxy [Mikhail_Kruk] [Mikhail_Kruk] ++csvr-sslproxy 3191 udp ConServR SSL Proxy [Mikhail_Kruk] [Mikhail_Kruk] ++firemonrcc 3192 tcp FireMon Revision Control [Michael_Bishop] [Michael_Bishop] ++firemonrcc 3192 udp FireMon Revision Control [Michael_Bishop] [Michael_Bishop] ++spandataport 3193 tcp SpanDataPort [Jesse_McKay] [Jesse_McKay] ++spandataport 3193 udp SpanDataPort [Jesse_McKay] [Jesse_McKay] ++magbind 3194 tcp Rockstorm MAG protocol [Jens_Nilsson] [Jens_Nilsson] ++magbind 3194 udp Rockstorm MAG protocol [Jens_Nilsson] [Jens_Nilsson] ++ncu-1 3195 tcp Network Control Unit ++ncu-1 3195 udp Network Control Unit ++ncu-2 3196 tcp Network Control Unit [Charlie_Hundre] [Charlie_Hundre] ++ncu-2 3196 udp Network Control Unit [Charlie_Hundre] [Charlie_Hundre] ++embrace-dp-s 3197 tcp Embrace Device Protocol ++ Server ++embrace-dp-s 3197 udp Embrace Device Protocol ++ Server ++embrace-dp-c 3198 tcp Embrace Device Protocol [Elliot_Schwartz] [Elliot_Schwartz] ++ Client ++embrace-dp-c 3198 udp Embrace Device Protocol [Elliot_Schwartz] [Elliot_Schwartz] ++ Client ++dmod-workspace 3199 tcp DMOD WorkSpace [Nick_Plante] [Nick_Plante] ++dmod-workspace 3199 udp DMOD WorkSpace [Nick_Plante] [Nick_Plante] ++tick-port 3200 tcp Press-sense Tick Port [Boris_Svetlitsky] [Boris_Svetlitsky] ++tick-port 3200 udp Press-sense Tick Port [Boris_Svetlitsky] [Boris_Svetlitsky] ++cpq-tasksmart 3201 tcp CPQ-TaskSmart [Jackie_Lau] [Jackie_Lau] ++cpq-tasksmart 3201 udp CPQ-TaskSmart [Jackie_Lau] [Jackie_Lau] ++intraintra 3202 tcp IntraIntra [Matthew_Asham] [Matthew_Asham] ++intraintra 3202 udp IntraIntra [Matthew_Asham] [Matthew_Asham] ++netwatcher-mon 3203 tcp Network Watcher Monitor ++netwatcher-mon 3203 udp Network Watcher Monitor ++netwatcher-db 3204 tcp Network Watcher DB Access [Hirokazu_Fujisawa] [Hirokazu_Fujisawa] ++netwatcher-db 3204 udp Network Watcher DB Access [Hirokazu_Fujisawa] [Hirokazu_Fujisawa] ++isns 3205 tcp iSNS Server Port [RFC4171] ++isns 3205 udp iSNS Server Port [RFC4171] ++ironmail 3206 tcp IronMail POP Proxy [Mike_Hudack] [Mike_Hudack] ++ironmail 3206 udp IronMail POP Proxy [Mike_Hudack] [Mike_Hudack] ++vx-auth-port 3207 tcp Veritas Authentication Port [Senthil_Ponnuswamy] [Senthil_Ponnuswamy] ++vx-auth-port 3207 udp Veritas Authentication Port [Senthil_Ponnuswamy] [Senthil_Ponnuswamy] ++pfu-prcallback 3208 tcp PFU PR Callback [Tetsuharu_Hanada] [Tetsuharu_Hanada] ++pfu-prcallback 3208 udp PFU PR Callback [Tetsuharu_Hanada] [Tetsuharu_Hanada] ++netwkpathengine 3209 tcp HP OpenView Network Path [Anthony_Walker] [Anthony_Walker] ++ Engine Server ++netwkpathengine 3209 udp HP OpenView Network Path [Anthony_Walker] [Anthony_Walker] ++ Engine Server ++flamenco-proxy 3210 tcp Flamenco Networks Proxy [Corey_Corrick] [Corey_Corrick] ++flamenco-proxy 3210 udp Flamenco Networks Proxy [Corey_Corrick] [Corey_Corrick] ++avsecuremgmt 3211 tcp Avocent Secure Management [Brian_S_Stewart] [Brian_S_Stewart] ++avsecuremgmt 3211 udp Avocent Secure Management [Brian_S_Stewart] [Brian_S_Stewart] ++surveyinst 3212 tcp Survey Instrument [Al_Amet] [Al_Amet] ++surveyinst 3212 udp Survey Instrument [Al_Amet] [Al_Amet] ++neon24x7 3213 tcp NEON 24X7 Mission Control [Tony_Lubrano] [Tony_Lubrano] ++neon24x7 3213 udp NEON 24X7 Mission Control [Tony_Lubrano] [Tony_Lubrano] ++jmq-daemon-1 3214 tcp JMQ Daemon Port 1 ++jmq-daemon-1 3214 udp JMQ Daemon Port 1 ++jmq-daemon-2 3215 tcp JMQ Daemon Port 2 [Martin_West] [Martin_West] ++jmq-daemon-2 3215 udp JMQ Daemon Port 2 [Martin_West] [Martin_West] ++ferrari-foam 3216 tcp Ferrari electronic FOAM [Johann_Deutinger] [Johann_Deutinger] ++ferrari-foam 3216 udp Ferrari electronic FOAM [Johann_Deutinger] [Johann_Deutinger] ++unite 3217 tcp Unified IP & Telecom [Christer_Gunnarsson] [Christer_Gunnarsson] 2009-03-26 ++ Environment ++unite 3217 udp Unified IP & Telecom [Christer_Gunnarsson] [Christer_Gunnarsson] 2009-03-26 ++ Environment ++smartpackets 3218 tcp EMC SmartPackets [Steve_Spataro] [Steve_Spataro] ++smartpackets 3218 udp EMC SmartPackets [Steve_Spataro] [Steve_Spataro] ++wms-messenger 3219 tcp WMS Messenger [Michael_Monasterio] [Michael_Monasterio] ++wms-messenger 3219 udp WMS Messenger [Michael_Monasterio] [Michael_Monasterio] ++xnm-ssl 3220 tcp XML NM over SSL ++xnm-ssl 3220 udp XML NM over SSL ++xnm-clear-text 3221 tcp XML NM over TCP [Mark_Trostler] [Mark_Trostler] ++xnm-clear-text 3221 udp XML NM over TCP [Mark_Trostler] [Mark_Trostler] ++glbp 3222 tcp Gateway Load Balancing Pr [Douglas_McLaggan] [Douglas_McLaggan] ++glbp 3222 udp Gateway Load Balancing Pr [Douglas_McLaggan] [Douglas_McLaggan] ++digivote 3223 tcp DIGIVOTE (R) Vote-Server [Christian_Treczoks] [Christian_Treczoks] ++digivote 3223 udp DIGIVOTE (R) Vote-Server [Christian_Treczoks] [Christian_Treczoks] ++aes-discovery 3224 tcp AES Discovery Port [Ken_Richard] [Ken_Richard] ++aes-discovery 3224 udp AES Discovery Port [Ken_Richard] [Ken_Richard] ++fcip-port 3225 tcp FCIP [RFC3821] ++fcip-port 3225 udp FCIP [RFC3821] ++isi-irp 3226 tcp ISI Industry Software IRP [Peter_Sandstrom] [Peter_Sandstrom] ++isi-irp 3226 udp ISI Industry Software IRP [Peter_Sandstrom] [Peter_Sandstrom] ++dwnmshttp 3227 tcp DiamondWave NMS Server ++dwnmshttp 3227 udp DiamondWave NMS Server ++dwmsgserver 3228 tcp DiamondWave MSG Server [Varma_Bhupatiraju] [Varma_Bhupatiraju] ++dwmsgserver 3228 udp DiamondWave MSG Server [Varma_Bhupatiraju] [Varma_Bhupatiraju] ++global-cd-port 3229 tcp Global CD Port [Vitaly_Revsin_2] [Vitaly_Revsin_2] ++global-cd-port 3229 udp Global CD Port [Vitaly_Revsin_2] [Vitaly_Revsin_2] ++sftdst-port 3230 tcp Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] ++sftdst-port 3230 udp Software Distributor Port [Andrea_Lanza] [Andrea_Lanza] ++ VidiGo communication ++vidigo 3231 tcp (previous was: Delta [Peter_Ijkhout] [Peter_Ijkhout] ++ Solutions Direct) ++ VidiGo communication ++vidigo 3231 udp (previous was: Delta [Peter_Ijkhout] [Peter_Ijkhout] ++ Solutions Direct) ++mdtp 3232 tcp MDT port 2012-02-21 [RFC6513] ++mdtp 3232 udp MDT port 2012-02-21 [RFC6513] ++whisker 3233 tcp WhiskerControl main port [Rudolf_Cardinal] [Rudolf_Cardinal] 2002-02 ++whisker 3233 udp WhiskerControl main port [Rudolf_Cardinal] [Rudolf_Cardinal] 2002-02 ++alchemy 3234 tcp Alchemy Server [Mikhail_Belov] [Mikhail_Belov] 2002-02 ++alchemy 3234 udp Alchemy Server [Mikhail_Belov] [Mikhail_Belov] 2002-02 ++mdap-port 3235 tcp MDAP port [Johan_Deleu] [Johan_Deleu] 2002-02 ++mdap-port 3235 udp MDAP Port [Johan_Deleu] [Johan_Deleu] 2002-02 ++apparenet-ts 3236 tcp appareNet Test Server ++apparenet-ts 3236 udp appareNet Test Server ++apparenet-tps 3237 tcp appareNet Test Packet ++ Sequencer ++apparenet-tps 3237 udp appareNet Test Packet ++ Sequencer ++apparenet-as 3238 tcp appareNet Analysis Server ++apparenet-as 3238 udp appareNet Analysis Server ++apparenet-ui 3239 tcp appareNet User Interface [Fred_Klassen] [Fred_Klassen] 2002-02 ++apparenet-ui 3239 udp appareNet User Interface [Fred_Klassen] [Fred_Klassen] 2002-02 ++triomotion 3240 tcp Trio Motion Control Port [Tony_Matthews] [Tony_Matthews] 2002-02 ++triomotion 3240 udp Trio Motion Control Port [Tony_Matthews] [Tony_Matthews] 2002-02 ++sysorb 3241 tcp SysOrb Monitoring Server [Jakob_Oestergaard] [Jakob_Oestergaard] 2002-02 ++sysorb 3241 udp SysOrb Monitoring Server [Jakob_Oestergaard] [Jakob_Oestergaard] 2002-02 ++sdp-id-port 3242 tcp Session Description ID [Greg_Rose_2] [Greg_Rose_2] 2002-02 ++sdp-id-port 3242 udp Session Description ID [Greg_Rose_2] [Greg_Rose_2] 2002-02 ++timelot 3243 tcp Timelot Port [David_Ferguson] [David_Ferguson] 2002-02 ++timelot 3243 udp Timelot Port [David_Ferguson] [David_Ferguson] 2002-02 ++onesaf 3244 tcp OneSAF [Gene_McCulley] [Gene_McCulley] 2002-02 ++onesaf 3244 udp OneSAF [Gene_McCulley] [Gene_McCulley] 2002-02 ++vieo-fe 3245 tcp VIEO Fabric Executive [James_Cox] [James_Cox] 2002-02 ++vieo-fe 3245 udp VIEO Fabric Executive [James_Cox] [James_Cox] 2002-02 ++dvt-system 3246 tcp DVT SYSTEM PORT ++dvt-system 3246 udp DVT SYSTEM PORT ++dvt-data 3247 tcp DVT DATA LINK [Phillip_Heil] [Phillip_Heil] 2002-02 ++dvt-data 3247 udp DVT DATA LINK [Phillip_Heil] [Phillip_Heil] 2002-02 ++procos-lm 3248 tcp PROCOS LM [Torsten_Rendelmann] [Torsten_Rendelmann] ++procos-lm 3248 udp PROCOS LM [Torsten_Rendelmann] [Torsten_Rendelmann] ++ssp 3249 tcp State Sync Protocol [Stephane_Beaulieu] [Stephane_Beaulieu] 2002-02 ++ssp 3249 udp State Sync Protocol [Stephane_Beaulieu] [Stephane_Beaulieu] 2002-02 ++hicp 3250 tcp HMS hicp port [Joel_Palsson] [Joel_Palsson] 2002-02 ++hicp 3250 udp HMS hicp port [Joel_Palsson] [Joel_Palsson] 2002-02 ++sysscanner 3251 tcp Sys Scanner [Dick_Georges] [Dick_Georges] 2002-02 ++sysscanner 3251 udp Sys Scanner [Dick_Georges] [Dick_Georges] 2002-02 ++dhe 3252 tcp DHE port [Fabrizio_Massimo_Fer] [Fabrizio_Massimo_Fer] 2002-02 ++dhe 3252 udp DHE port [Fabrizio_Massimo_Fer] [Fabrizio_Massimo_Fer] 2002-02 ++pda-data 3253 tcp PDA Data ++pda-data 3253 udp PDA Data ++pda-sys 3254 tcp PDA System [Jian_Fan] [Jian_Fan] 2002-02 ++pda-sys 3254 udp PDA System [Jian_Fan] [Jian_Fan] 2002-02 ++semaphore 3255 tcp Semaphore Connection Port [Jay_Eckles] [Jay_Eckles] 2002-02 ++semaphore 3255 udp Semaphore Connection Port [Jay_Eckles] [Jay_Eckles] 2002-02 ++cpqrpm-agent 3256 tcp Compaq RPM Agent Port ++cpqrpm-agent 3256 udp Compaq RPM Agent Port ++cpqrpm-server 3257 tcp Compaq RPM Server Port [Royal_King] [Royal_King] 2002-02 ++cpqrpm-server 3257 udp Compaq RPM Server Port [Royal_King] [Royal_King] 2002-02 ++ivecon-port 3258 tcp Ivecon Server Port [Serguei_Tevs] [Serguei_Tevs] 2002-02 ++ivecon-port 3258 udp Ivecon Server Port [Serguei_Tevs] [Serguei_Tevs] 2002-02 ++epncdp2 3259 tcp Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 ++epncdp2 3259 udp Epson Network Common Devi [Oishi_Toshiaki] [Oishi_Toshiaki] 2002-02 ++iscsi-target 3260 tcp iSCSI port [Julian_Satran] [Julian_Satran] ++iscsi-target 3260 udp iSCSI port [Julian_Satran] [Julian_Satran] ++winshadow 3261 tcp winShadow [Colin_Barry] [Colin_Barry] ++winshadow 3261 udp winShadow [Colin_Barry] [Colin_Barry] ++necp 3262 tcp NECP [Alberto_Cerpa] [Alberto_Cerpa] ++necp 3262 udp NECP [Alberto_Cerpa] [Alberto_Cerpa] ++ecolor-imager 3263 tcp E-Color Enterprise Imager [Tamara_Baker] [Tamara_Baker] ++ecolor-imager 3263 udp E-Color Enterprise Imager [Tamara_Baker] [Tamara_Baker] ++ccmail 3264 tcp cc:mail/lotus [brockman] [brockman] ++ccmail 3264 udp cc:mail/lotus [brockman] [brockman] ++altav-tunnel 3265 tcp Altav Tunnel [Gary_M_Allen] [Gary_M_Allen] ++altav-tunnel 3265 udp Altav Tunnel [Gary_M_Allen] [Gary_M_Allen] ++ns-cfg-server 3266 tcp NS CFG Server [Aivi_Lie] [Aivi_Lie] ++ns-cfg-server 3266 udp NS CFG Server [Aivi_Lie] [Aivi_Lie] ++ibm-dial-out 3267 tcp IBM Dial Out [Skip_Booth] [Skip_Booth] ++ibm-dial-out 3267 udp IBM Dial Out [Skip_Booth] [Skip_Booth] ++msft-gc 3268 tcp Microsoft Global Catalog ++msft-gc 3268 udp Microsoft Global Catalog ++msft-gc-ssl 3269 tcp Microsoft Global Catalog [Asaf_Kashi] [Asaf_Kashi] ++ with LDAP/SSL ++msft-gc-ssl 3269 udp Microsoft Global Catalog [Asaf_Kashi] [Asaf_Kashi] ++ with LDAP/SSL ++verismart 3270 tcp Verismart [Jay_Weber] [Jay_Weber] ++verismart 3270 udp Verismart [Jay_Weber] [Jay_Weber] ++csoft-prev 3271 tcp CSoft Prev Port [Nedelcho_Stanev_3] [Nedelcho_Stanev_3] ++csoft-prev 3271 udp CSoft Prev Port [Nedelcho_Stanev_3] [Nedelcho_Stanev_3] ++user-manager 3272 tcp Fujitsu User Manager [Yukihiko_Sakurai] [Yukihiko_Sakurai] ++user-manager 3272 udp Fujitsu User Manager [Yukihiko_Sakurai] [Yukihiko_Sakurai] ++sxmp 3273 tcp Simple Extensible [admin] [admin] ++ Multiplexed Protocol ++sxmp 3273 udp Simple Extensible [admin] [admin] ++ Multiplexed Protocol ++ordinox-server 3274 tcp Ordinox Server [Denis_Ducharme] [Denis_Ducharme] ++ordinox-server 3274 udp Ordinox Server [Denis_Ducharme] [Denis_Ducharme] ++samd 3275 tcp SAMD [Edgar_Circenis] [Edgar_Circenis] ++samd 3275 udp SAMD [Edgar_Circenis] [Edgar_Circenis] ++maxim-asics 3276 tcp Maxim ASICs [Dave_Inman] [Dave_Inman] ++maxim-asics 3276 udp Maxim ASICs [Dave_Inman] [Dave_Inman] ++awg-proxy 3277 tcp AWG Proxy [Alex_McDonald] [Alex_McDonald] ++awg-proxy 3277 udp AWG Proxy [Alex_McDonald] [Alex_McDonald] ++lkcmserver 3278 tcp LKCM Server [Javier_Jimenez] [Javier_Jimenez] ++lkcmserver 3278 udp LKCM Server [Javier_Jimenez] [Javier_Jimenez] ++admind 3279 tcp admind [Jeff_Haynes] [Jeff_Haynes] ++admind 3279 udp admind [Jeff_Haynes] [Jeff_Haynes] ++vs-server 3280 tcp VS Server [Scott_Godlew] [Scott_Godlew] ++vs-server 3280 udp VS Server [Scott_Godlew] [Scott_Godlew] ++sysopt 3281 tcp SYSOPT [Tony_Hoffman] [Tony_Hoffman] ++sysopt 3281 udp SYSOPT [Tony_Hoffman] [Tony_Hoffman] ++datusorb 3282 tcp Datusorb [Thomas_Martin] [Thomas_Martin] ++datusorb 3282 udp Datusorb [Thomas_Martin] [Thomas_Martin] ++Apple Remote ++Desktop (Net 3283 tcp Net Assistant [Michael_Stein] [Michael_Stein] 2011-11-09 ++Assistant) ++Apple Remote ++Desktop (Net 3283 udp Net Assistant [Michael_Stein] [Michael_Stein] 2011-11-09 ++Assistant) ++4talk 3284 tcp 4Talk [Tony_Bushnell] [Tony_Bushnell] ++4talk 3284 udp 4Talk [Tony_Bushnell] [Tony_Bushnell] ++plato 3285 tcp Plato [Jim_Battin] [Jim_Battin] ++plato 3285 udp Plato [Jim_Battin] [Jim_Battin] ++e-net 3286 tcp E-Net [Steven_Grigsby] [Steven_Grigsby] ++e-net 3286 udp E-Net [Steven_Grigsby] [Steven_Grigsby] ++directvdata 3287 tcp DIRECTVDATA [Michael_Friedman] [Michael_Friedman] ++directvdata 3287 udp DIRECTVDATA [Michael_Friedman] [Michael_Friedman] ++cops 3288 tcp COPS [Shai_Herzog] [Shai_Herzog] ++cops 3288 udp COPS [Shai_Herzog] [Shai_Herzog] ++enpc 3289 tcp ENPC [SEIKO_EPSON_2] [SEIKO_EPSON_2] ++enpc 3289 udp ENPC [SEIKO_EPSON_2] [SEIKO_EPSON_2] ++caps-lm 3290 tcp CAPS LOGISTICS TOOLKIT - LM [Joseph_Krebs] [Joseph_Krebs] ++caps-lm 3290 udp CAPS LOGISTICS TOOLKIT - LM [Joseph_Krebs] [Joseph_Krebs] ++sah-lm 3291 tcp S A Holditch & Associates - [Randy_Hudgens] [Randy_Hudgens] ++ LM ++sah-lm 3291 udp S A Holditch & Associates - [Randy_Hudgens] [Randy_Hudgens] ++ LM ++cart-o-rama 3292 tcp Cart O Rama [Phillip_Dillinger] [Phillip_Dillinger] ++cart-o-rama 3292 udp Cart O Rama [Phillip_Dillinger] [Phillip_Dillinger] ++fg-fps 3293 tcp fg-fps ++fg-fps 3293 udp fg-fps ++fg-gip 3294 tcp fg-gip [Jean_Marc_Frailong] [Jean_Marc_Frailong] ++fg-gip 3294 udp fg-gip [Jean_Marc_Frailong] [Jean_Marc_Frailong] ++dyniplookup 3295 tcp Dynamic IP Lookup [Eugene_Osovetsky] [Eugene_Osovetsky] ++dyniplookup 3295 udp Dynamic IP Lookup [Eugene_Osovetsky] [Eugene_Osovetsky] ++rib-slm 3296 tcp Rib License Manager [Kristean_Heisler] [Kristean_Heisler] ++rib-slm 3296 udp Rib License Manager [Kristean_Heisler] [Kristean_Heisler] ++cytel-lm 3297 tcp Cytel License Manager [Yogesh_P_Gajjar] [Yogesh_P_Gajjar] ++cytel-lm 3297 udp Cytel License Manager [Yogesh_P_Gajjar] [Yogesh_P_Gajjar] ++deskview 3298 tcp DeskView [Manfred_Randelzofer] [Manfred_Randelzofer] ++deskview 3298 udp DeskView [Manfred_Randelzofer] [Manfred_Randelzofer] ++pdrncs 3299 tcp pdrncs [Paul_Wissenbach] [Paul_Wissenbach] ++pdrncs 3299 udp pdrncs [Paul_Wissenbach] [Paul_Wissenbach] ++ 3300-3301 ++ 3300-3301 unassigned Unauthorized ++ Use by SAP ++ R/3 ++mcs-fastmail 3302 tcp MCS Fastmail [Patti_Jo_Newsom] [Patti_Jo_Newsom] ++mcs-fastmail 3302 udp MCS Fastmail [Patti_Jo_Newsom] [Patti_Jo_Newsom] ++opsession-clnt 3303 tcp OP Session Client ++opsession-clnt 3303 udp OP Session Client ++opsession-srvr 3304 tcp OP Session Server [Amir_Blich] [Amir_Blich] ++opsession-srvr 3304 udp OP Session Server [Amir_Blich] [Amir_Blich] ++odette-ftp 3305 tcp ODETTE-FTP [David_Nash] [David_Nash] [RFC5024] ++odette-ftp 3305 udp ODETTE-FTP [David_Nash] [David_Nash] [RFC5024] ++mysql 3306 tcp MySQL [Monty] [Monty] ++mysql 3306 udp MySQL [Monty] [Monty] ++opsession-prxy 3307 tcp OP Session Proxy [Amir_Blich] [Amir_Blich] ++opsession-prxy 3307 udp OP Session Proxy [Amir_Blich] [Amir_Blich] ++tns-server 3308 tcp TNS Server ++tns-server 3308 udp TNS Server ++tns-adv 3309 tcp TNS ADV [Jerome_Albin] [Jerome_Albin] ++tns-adv 3309 udp TNS ADV [Jerome_Albin] [Jerome_Albin] ++dyna-access 3310 tcp Dyna Access [Dave_Belliveau] [Dave_Belliveau] ++dyna-access 3310 udp Dyna Access [Dave_Belliveau] [Dave_Belliveau] ++mcns-tel-ret 3311 tcp MCNS Tel Ret [Randall_Atkinson] [Randall_Atkinson] ++mcns-tel-ret 3311 udp MCNS Tel Ret [Randall_Atkinson] [Randall_Atkinson] ++appman-server 3312 tcp Application Management ++ Server ++appman-server 3312 udp Application Management ++ Server ++uorb 3313 tcp Unify Object Broker ++uorb 3313 udp Unify Object Broker ++uohost 3314 tcp Unify Object Host [Duane_Gibson] [Duane_Gibson] ++uohost 3314 udp Unify Object Host [Duane_Gibson] [Duane_Gibson] ++cdid 3315 tcp CDID [Andrew_Borisov] [Andrew_Borisov] ++cdid 3315 udp CDID [Andrew_Borisov] [Andrew_Borisov] ++aicc-cmi 3316 tcp AICC/CMI [William_McDonald] [William_McDonald] ++aicc-cmi 3316 udp AICC/CMI [William_McDonald] [William_McDonald] ++vsaiport 3317 tcp VSAI PORT [Rieko_Asai] [Rieko_Asai] ++vsaiport 3317 udp VSAI PORT [Rieko_Asai] [Rieko_Asai] ++ssrip 3318 tcp Swith to Swith Routing [Baba_Hidekazu] [Baba_Hidekazu] ++ Information Protocol ++ssrip 3318 udp Swith to Swith Routing [Baba_Hidekazu] [Baba_Hidekazu] ++ Information Protocol ++sdt-lmd 3319 tcp SDT License Manager [Salvo_Nassisi] [Salvo_Nassisi] ++sdt-lmd 3319 udp SDT License Manager [Salvo_Nassisi] [Salvo_Nassisi] ++officelink2000 3320 tcp Office Link 2000 [Mike_Balch] [Mike_Balch] ++officelink2000 3320 udp Office Link 2000 [Mike_Balch] [Mike_Balch] ++vnsstr 3321 tcp VNSSTR [Takeshi_Ohmura] [Takeshi_Ohmura] ++vnsstr 3321 udp VNSSTR [Takeshi_Ohmura] [Takeshi_Ohmura] ++active-net 3322-3325 Active Networks [Bob_Braden_2] [Bob_Braden_2] ++sftu 3326 tcp SFTU [Eduardo_Rosenberg_de] [Eduardo_Rosenberg_de] ++sftu 3326 udp SFTU [Eduardo_Rosenberg_de] [Eduardo_Rosenberg_de] ++bbars 3327 tcp BBARS [Lou_Harris] [Lou_Harris] ++bbars 3327 udp BBARS [Lou_Harris] [Lou_Harris] ++egptlm 3328 tcp Eaglepoint License Manager [Dave_Benton] [Dave_Benton] ++egptlm 3328 udp Eaglepoint License Manager [Dave_Benton] [Dave_Benton] ++hp-device-disc 3329 tcp HP Device Disc [Shivaun_Albright] [Shivaun_Albright] ++hp-device-disc 3329 udp HP Device Disc [Shivaun_Albright] [Shivaun_Albright] ++mcs-calypsoicf 3330 tcp MCS Calypso ICF ++mcs-calypsoicf 3330 udp MCS Calypso ICF ++mcs-messaging 3331 tcp MCS Messaging ++mcs-messaging 3331 udp MCS Messaging ++mcs-mailsvr 3332 tcp MCS Mail Server [Patti_Jo_Newsom] [Patti_Jo_Newsom] ++mcs-mailsvr 3332 udp MCS Mail Server [Patti_Jo_Newsom] [Patti_Jo_Newsom] ++dec-notes 3333 tcp DEC Notes [Kim_Moraros] [Kim_Moraros] ++dec-notes 3333 udp DEC Notes [Kim_Moraros] [Kim_Moraros] ++directv-web 3334 tcp Direct TV Webcasting ++directv-web 3334 udp Direct TV Webcasting ++directv-soft 3335 tcp Direct TV Software Updates ++directv-soft 3335 udp Direct TV Software Updates ++directv-tick 3336 tcp Direct TV Tickers ++directv-tick 3336 udp Direct TV Tickers ++directv-catlg 3337 tcp Direct TV Data Catalog [Michael_Friedman] [Michael_Friedman] ++directv-catlg 3337 udp Direct TV Data Catalog [Michael_Friedman] [Michael_Friedman] ++anet-b 3338 tcp OMF data b ++anet-b 3338 udp OMF data b ++anet-l 3339 tcp OMF data l ++anet-l 3339 udp OMF data l ++anet-m 3340 tcp OMF data m ++anet-m 3340 udp OMF data m ++anet-h 3341 tcp OMF data h [Per_Sahlqvist] [Per_Sahlqvist] ++anet-h 3341 udp OMF data h [Per_Sahlqvist] [Per_Sahlqvist] ++webtie 3342 tcp WebTIE [Kevin_Frender] [Kevin_Frender] ++webtie 3342 udp WebTIE [Kevin_Frender] [Kevin_Frender] ++ms-cluster-net 3343 tcp MS Cluster Net [David_Dion] [David_Dion] 2009-02-12 ++ms-cluster-net 3343 udp MS Cluster Net [David_Dion] [David_Dion] 2009-02-12 ++bnt-manager 3344 tcp BNT Manager [Engineering_Dept] [Engineering_Dept] ++bnt-manager 3344 udp BNT Manager [Engineering_Dept] [Engineering_Dept] ++influence 3345 tcp Influence [Russ_Ferriday] [Russ_Ferriday] ++influence 3345 udp Influence [Russ_Ferriday] [Russ_Ferriday] ++trnsprntproxy 3346 tcp Trnsprnt Proxy [Grant_Kirby] [Grant_Kirby] ++trnsprntproxy 3346 udp Trnsprnt Proxy [Grant_Kirby] [Grant_Kirby] ++phoenix-rpc 3347 tcp Phoenix RPC [Ian_Anderson] [Ian_Anderson] ++phoenix-rpc 3347 udp Phoenix RPC [Ian_Anderson] [Ian_Anderson] ++pangolin-laser 3348 tcp Pangolin Laser [William_Benner] [William_Benner] ++pangolin-laser 3348 udp Pangolin Laser [William_Benner] [William_Benner] ++chevinservices 3349 tcp Chevin Services [Gus_McNaughton] [Gus_McNaughton] ++chevinservices 3349 udp Chevin Services [Gus_McNaughton] [Gus_McNaughton] ++findviatv 3350 tcp FINDVIATV [Oran_Davis] [Oran_Davis] ++findviatv 3350 udp FINDVIATV [Oran_Davis] [Oran_Davis] ++btrieve 3351 tcp Btrieve port ++btrieve 3351 udp Btrieve port ++ssql 3352 tcp Scalable SQL [Chuck_Talk] [Chuck_Talk] ++ssql 3352 udp Scalable SQL [Chuck_Talk] [Chuck_Talk] ++fatpipe 3353 tcp FATPIPE [Sanchaita_Datta] [Sanchaita_Datta] ++fatpipe 3353 udp FATPIPE [Sanchaita_Datta] [Sanchaita_Datta] ++suitjd 3354 tcp SUITJD [Todd_Moyer] [Todd_Moyer] ++suitjd 3354 udp SUITJD [Todd_Moyer] [Todd_Moyer] ++ordinox-dbase 3355 tcp Ordinox Dbase [Denis_Ducharme] [Denis_Ducharme] ++ordinox-dbase 3355 udp Ordinox Dbase [Denis_Ducharme] [Denis_Ducharme] ++upnotifyps 3356 tcp UPNOTIFYPS [Mark_Fox] [Mark_Fox] ++upnotifyps 3356 udp UPNOTIFYPS [Mark_Fox] [Mark_Fox] ++adtech-test 3357 tcp Adtech Test IP [Robin_Uyeshiro] [Robin_Uyeshiro] ++adtech-test 3357 udp Adtech Test IP [Robin_Uyeshiro] [Robin_Uyeshiro] ++mpsysrmsvr 3358 tcp Mp Sys Rmsvr [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++mpsysrmsvr 3358 udp Mp Sys Rmsvr [Hiroyuki_Kawabuchi] [Hiroyuki_Kawabuchi] ++wg-netforce 3359 tcp WG NetForce [Lee_Wheat] [Lee_Wheat] ++wg-netforce 3359 udp WG NetForce [Lee_Wheat] [Lee_Wheat] ++kv-server 3360 tcp KV Server ++kv-server 3360 udp KV Server ++kv-agent 3361 tcp KV Agent [Thomas_Soranno] [Thomas_Soranno] ++kv-agent 3361 udp KV Agent [Thomas_Soranno] [Thomas_Soranno] ++dj-ilm 3362 tcp DJ ILM [Don_Tyson] [Don_Tyson] ++dj-ilm 3362 udp DJ ILM [Don_Tyson] [Don_Tyson] ++nati-vi-server 3363 tcp NATI Vi Server [Robert_Dye] [Robert_Dye] ++nati-vi-server 3363 udp NATI Vi Server [Robert_Dye] [Robert_Dye] ++creativeserver 3364 tcp Creative Server ++creativeserver 3364 udp Creative Server ++contentserver 3365 tcp Content Server ++contentserver 3365 udp Content Server ++creativepartnr 3366 tcp Creative Partner [Jesus_Ortiz_2] [Jesus_Ortiz_2] ++creativepartnr 3366 udp Creative Partner [Jesus_Ortiz_2] [Jesus_Ortiz_2] ++satvid-datalnk 3367-3371 Satellite Video Data Link [Scott_Engel] [Scott_Engel] ++tip2 3372 tcp TIP 2 [Keith_Evans] [Keith_Evans] ++tip2 3372 udp TIP 2 [Keith_Evans] [Keith_Evans] ++lavenir-lm 3373 tcp Lavenir License Manager [Marius_Matioc] [Marius_Matioc] ++lavenir-lm 3373 udp Lavenir License Manager [Marius_Matioc] [Marius_Matioc] ++cluster-disc 3374 tcp Cluster Disc [Jeff_Hughes] [Jeff_Hughes] ++cluster-disc 3374 udp Cluster Disc [Jeff_Hughes] [Jeff_Hughes] ++vsnm-agent 3375 tcp VSNM Agent [Venkat_Rangan] [Venkat_Rangan] ++vsnm-agent 3375 udp VSNM Agent [Venkat_Rangan] [Venkat_Rangan] ++cdbroker 3376 tcp CD Broker [Moon_Ho_Chung] [Moon_Ho_Chung] ++cdbroker 3376 udp CD Broker [Moon_Ho_Chung] [Moon_Ho_Chung] ++cogsys-lm 3377 tcp Cogsys Network License [Simon_Chinnick] [Simon_Chinnick] ++ Manager ++cogsys-lm 3377 udp Cogsys Network License [Simon_Chinnick] [Simon_Chinnick] ++ Manager ++wsicopy 3378 tcp WSICOPY [James_Overby] [James_Overby] ++wsicopy 3378 udp WSICOPY [James_Overby] [James_Overby] ++socorfs 3379 tcp SOCORFS [Hugo_Charbonneau] [Hugo_Charbonneau] ++socorfs 3379 udp SOCORFS [Hugo_Charbonneau] [Hugo_Charbonneau] ++sns-channels 3380 tcp SNS Channels [Shekar_Pasumarthi] [Shekar_Pasumarthi] ++sns-channels 3380 udp SNS Channels [Shekar_Pasumarthi] [Shekar_Pasumarthi] ++geneous 3381 tcp Geneous [Nick_de_Smith] [Nick_de_Smith] ++geneous 3381 udp Geneous [Nick_de_Smith] [Nick_de_Smith] ++fujitsu-neat 3382 tcp Fujitsu Network Enhanced [Markku_Viima] [Markku_Viima] ++ Antitheft function ++fujitsu-neat 3382 udp Fujitsu Network Enhanced [Markku_Viima] [Markku_Viima] ++ Antitheft function ++esp-lm 3383 tcp Enterprise Software Products [George_Rudy] [George_Rudy] ++ License Manager ++esp-lm 3383 udp Enterprise Software Products [George_Rudy] [George_Rudy] ++ License Manager ++hp-clic 3384 tcp Cluster Management Services [Rajesh_Srinivasaragh] [Rajesh_Srinivasaragh] ++hp-clic 3384 udp Hardware Management [Rajesh_Srinivasaragh] [Rajesh_Srinivasaragh] ++qnxnetman 3385 tcp qnxnetman [Michael_Hunter] [Michael_Hunter] ++qnxnetman 3385 udp qnxnetman [Michael_Hunter] [Michael_Hunter] ++gprs-data 3386 tcp GPRS Data ++gprs-sig 3386 udp GPRS SIG [Ansgar_Bergmann] [Ansgar_Bergmann] ++backroomnet 3387 tcp Back Room Net [Clayton_Wilkinson] [Clayton_Wilkinson] ++backroomnet 3387 udp Back Room Net [Clayton_Wilkinson] [Clayton_Wilkinson] ++cbserver 3388 tcp CB Server [Allen_Wei] [Allen_Wei] ++cbserver 3388 udp CB Server [Allen_Wei] [Allen_Wei] ++ms-wbt-server 3389 tcp MS WBT Server [Ritu_Bahl] [Ritu_Bahl] ++ms-wbt-server 3389 udp MS WBT Server [Ritu_Bahl] [Ritu_Bahl] ++dsc 3390 tcp Distributed Service [Charles_Honton] [Charles_Honton] ++ Coordinator ++dsc 3390 udp Distributed Service [Charles_Honton] [Charles_Honton] ++ Coordinator ++savant 3391 tcp SAVANT [Andy_Bruce] [Andy_Bruce] ++savant 3391 udp SAVANT [Andy_Bruce] [Andy_Bruce] ++efi-lm 3392 tcp EFI License Management [Ross_E_Greinke] [Ross_E_Greinke] ++efi-lm 3392 udp EFI License Management [Ross_E_Greinke] [Ross_E_Greinke] ++d2k-tapestry1 3393 tcp D2K Tapestry Client to ++ Server ++d2k-tapestry1 3393 udp D2K Tapestry Client to ++ Server ++d2k-tapestry2 3394 tcp D2K Tapestry Server to [Eric_Lan] [Eric_Lan] ++ Server ++d2k-tapestry2 3394 udp D2K Tapestry Server to [Eric_Lan] [Eric_Lan] ++ Server ++dyna-lm 3395 tcp Dyna License Manager (Elam) [Anjana_Iyer] [Anjana_Iyer] ++dyna-lm 3395 udp Dyna License Manager (Elam) [Anjana_Iyer] [Anjana_Iyer] ++ Printer Agent ++ ++printer-agent 3396 tcp IANA assigned this [Devon_Taylor] [Devon_Taylor] ++ well-formed service name as ++ a replacement for ++ "printer_agent". ++ This entry is an alias to "printer-agent". This entry is now ++printer_agent 3396 tcp Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service ++ discovery mechanisms. ++ Printer Agent ++ ++printer-agent 3396 udp IANA assigned this [Devon_Taylor] [Devon_Taylor] ++ well-formed service name as ++ a replacement for ++ "printer_agent". ++ This entry is an alias to "printer-agent". This entry is now ++printer_agent 3396 udp Printer Agent [Devon_Taylor] [Devon_Taylor] historic, not usable for use with many common service ++ discovery mechanisms. ++cloanto-lm 3397 tcp Cloanto License Manager [Takeo_Sato] [Takeo_Sato] 2010-04-30 ++cloanto-lm 3397 udp Cloanto License Manager [Takeo_Sato] [Takeo_Sato] 2010-04-30 ++mercantile 3398 tcp Mercantile [Erik_Kragh_Jensen] [Erik_Kragh_Jensen] ++mercantile 3398 udp Mercantile [Erik_Kragh_Jensen] [Erik_Kragh_Jensen] ++csms 3399 tcp CSMS ++csms 3399 udp CSMS ++csms2 3400 tcp CSMS2 [Markus_Michels_2] [Markus_Michels_2] ++csms2 3400 udp CSMS2 [Markus_Michels_2] [Markus_Michels_2] ++filecast 3401 tcp filecast [Eden_Sherry] [Eden_Sherry] ++filecast 3401 udp filecast [Eden_Sherry] [Eden_Sherry] ++fxaengine-net 3402 tcp FXa Engine Network Port [Lucas_Alonso] [Lucas_Alonso] 2002-02 ++fxaengine-net 3402 udp FXa Engine Network Port [Lucas_Alonso] [Lucas_Alonso] 2002-02 ++ 3403 De-registered 2006-10-27 ++ 3404 Removed 2002-05-01 ++nokia-ann-ch1 3405 tcp Nokia Announcement ch 1 ++nokia-ann-ch1 3405 udp Nokia Announcement ch 1 ++nokia-ann-ch2 3406 tcp Nokia Announcement ch 2 [Morteza_Kalhour] [Morteza_Kalhour] 2002-02 ++nokia-ann-ch2 3406 udp Nokia Announcement ch 2 [Morteza_Kalhour] [Morteza_Kalhour] 2002-02 ++ldap-admin 3407 tcp LDAP admin server port [Stephen_Tsun_2] [Stephen_Tsun_2] 2002-02 ++ldap-admin 3407 udp LDAP admin server port [Stephen_Tsun_2] [Stephen_Tsun_2] 2002-02 ++BESApi 3408 tcp BES Api Port [Colin_Griffiths] [Colin_Griffiths] 2002-02 ++BESApi 3408 udp BES Api Port [Colin_Griffiths] [Colin_Griffiths] 2002-02 ++networklens 3409 tcp NetworkLens Event Port ++networklens 3409 udp NetworkLens Event Port ++networklenss 3410 tcp NetworkLens SSL Event [Greg_Bailey] [Greg_Bailey] 2002-02 ++networklenss 3410 udp NetworkLens SSL Event [Greg_Bailey] [Greg_Bailey] 2002-02 ++biolink-auth 3411 tcp BioLink Authenteon server [BioLink_Support] [BioLink_Support] 2002-02 ++biolink-auth 3411 udp BioLink Authenteon server [BioLink_Support] [BioLink_Support] 2002-02 ++xmlblaster 3412 tcp xmlBlaster [Marcel_Ruff] [Marcel_Ruff] 2002-02 ++xmlblaster 3412 udp xmlBlaster [Marcel_Ruff] [Marcel_Ruff] 2002-02 ++svnet 3413 tcp SpecView Networking [Richard_Dickins] [Richard_Dickins] 2002-02 ++svnet 3413 udp SpecView Networking [Richard_Dickins] [Richard_Dickins] 2002-02 ++wip-port 3414 tcp BroadCloud WIP Port ++wip-port 3414 udp BroadCloud WIP Port ++bcinameservice 3415 tcp BCI Name Service [Dennis_Parker] [Dennis_Parker] 2002-02 ++bcinameservice 3415 udp BCI Name Service [Dennis_Parker] [Dennis_Parker] 2002-02 ++commandport 3416 tcp AirMobile IS Command Port [Mike_Klein] [Mike_Klein] 2002-02 ++commandport 3416 udp AirMobile IS Command Port [Mike_Klein] [Mike_Klein] 2002-02 ++csvr 3417 tcp ConServR file translation [Albert_Leung] [Albert_Leung] 2002-02 ++csvr 3417 udp ConServR file translation [Albert_Leung] [Albert_Leung] 2002-02 ++rnmap 3418 tcp Remote nmap [Tuomo_Makinen] [Tuomo_Makinen] 2002-02 ++rnmap 3418 udp Remote nmap [Tuomo_Makinen] [Tuomo_Makinen] 2002-02 ++softaudit 3419 tcp Isogon SoftAudit [Per_Hellberg] [Per_Hellberg] 2002-02 ++softaudit 3419 udp ISogon SoftAudit [Per_Hellberg] [Per_Hellberg] 2002-02 ++ifcp-port 3420 tcp iFCP User Port [RFC4172] ++ifcp-port 3420 udp iFCP User Port [RFC4172] ++bmap 3421 tcp Bull Apprise portmapper [Jeremy_Gilbert] [Jeremy_Gilbert] ++bmap 3421 udp Bull Apprise portmapper [Jeremy_Gilbert] [Jeremy_Gilbert] ++rusb-sys-port 3422 tcp Remote USB System Port [Steven_Klein] [Steven_Klein] 2002-02 ++rusb-sys-port 3422 udp Remote USB System Port [Steven_Klein] [Steven_Klein] 2002-02 ++xtrm 3423 tcp xTrade Reliable Messaging ++xtrm 3423 udp xTrade Reliable Messaging ++xtrms 3424 tcp xTrade over TLS/SSL [Mats_Nilsson] [Mats_Nilsson] 2002-02 ++xtrms 3424 udp xTrade over TLS/SSL [Mats_Nilsson] [Mats_Nilsson] 2002-02 ++agps-port 3425 tcp AGPS Access Port [Kristoffer_Nilsson] [Kristoffer_Nilsson] 2002-02 ++agps-port 3425 udp AGPS Access Port [Kristoffer_Nilsson] [Kristoffer_Nilsson] 2002-02 ++arkivio 3426 tcp Arkivio Storage Protocol [Bruce_Greenblatt] [Bruce_Greenblatt] 2002-02 ++arkivio 3426 udp Arkivio Storage Protocol [Bruce_Greenblatt] [Bruce_Greenblatt] 2002-02 ++websphere-snmp 3427 tcp WebSphere SNMP [Richard_Mills] [Richard_Mills] 2002-02 ++websphere-snmp 3427 udp WebSphere SNMP [Richard_Mills] [Richard_Mills] 2002-02 ++twcss 3428 tcp 2Wire CSS [Wire_IANA_Contact] [Wire_IANA_Contact] 2002-02 ++twcss 3428 udp 2Wire CSS [Wire_IANA_Contact] [Wire_IANA_Contact] 2002-02 ++gcsp 3429 tcp GCSP user port [Anirban_Majumder] [Anirban_Majumder] 2002-03 ++gcsp 3429 udp GCSP user port [Anirban_Majumder] [Anirban_Majumder] 2002-03 ++ssdispatch 3430 tcp Scott Studios Dispatch [Michael_Settles] [Michael_Settles] 2002-03 ++ssdispatch 3430 udp Scott Studios Dispatch [Michael_Settles] [Michael_Settles] 2002-03 ++ndl-als 3431 tcp Active License Server Port [Quentin_Brown] [Quentin_Brown] 2002-03 ++ndl-als 3431 udp Active License Server Port [Quentin_Brown] [Quentin_Brown] 2002-03 ++osdcp 3432 tcp Secure Device Protocol [Peter_Fernandez] [Peter_Fernandez] 2002-03 ++osdcp 3432 udp Secure Device Protocol [Peter_Fernandez] [Peter_Fernandez] 2002-03 ++opnet-smp 3433 tcp OPNET Service Management [OPNET_Technologies_Inc] [Edward_Macomber] 2002-03 2011-09-21 ++ Platform ++opnet-smp 3433 udp OPNET Service Management [OPNET_Technologies_Inc] [Edward_Macomber] 2002-03 2011-09-21 ++ Platform ++opencm 3434 tcp OpenCM Server [Jonathan_S_Shapiro] [Jonathan_S_Shapiro] 2002-03 ++opencm 3434 udp OpenCM Server [Jonathan_S_Shapiro] [Jonathan_S_Shapiro] 2002-03 ++pacom 3435 tcp Pacom Security User Port [Steve_Barton] [Steve_Barton] 2002-03 ++pacom 3435 udp Pacom Security User Port [Steve_Barton] [Steve_Barton] 2002-03 ++gc-config 3436 tcp GuardControl Exchange [Andreas_Schwarz] [Andreas_Schwarz] 2002-03 ++ Protocol ++gc-config 3436 udp GuardControl Exchange [Andreas_Schwarz] [Andreas_Schwarz] 2002-03 ++ Protocol ++autocueds 3437 tcp Autocue Directory Service [Geoff_Back] [Geoff_Back] 2002-03 ++autocueds 3437 udp Autocue Directory Service [Geoff_Back] [Geoff_Back] 2002-03 ++spiral-admin 3438 tcp Spiralcraft Admin [Michael_Toth] [Michael_Toth] 2002-03 ++spiral-admin 3438 udp Spiralcraft Admin [Michael_Toth] [Michael_Toth] 2002-03 ++hri-port 3439 tcp HRI Interface Port [John_Fayos] [John_Fayos] 2002-03 ++hri-port 3439 udp HRI Interface Port [John_Fayos] [John_Fayos] 2002-03 ++ans-console 3440 tcp Net Steward Mgmt Console [John_Richmond] [John_Richmond] 2002-03 ++ans-console 3440 udp Net Steward Mgmt Console [John_Richmond] [John_Richmond] 2002-03 ++connect-client 3441 tcp OC Connect Client ++connect-client 3441 udp OC Connect Client ++connect-server 3442 tcp OC Connect Server [Mike_Velten_2] [Mike_Velten_2] 2002-03 ++connect-server 3442 udp OC Connect Server [Mike_Velten_2] [Mike_Velten_2] 2002-03 ++ov-nnm-websrv 3443 tcp OpenView Network Node [Anthony_Walker] [Anthony_Walker] 2002-03 ++ Manager WEB Server ++ov-nnm-websrv 3443 udp OpenView Network Node [Anthony_Walker] [Anthony_Walker] 2002-03 ++ Manager WEB Server ++denali-server 3444 tcp Denali Server [Joe_Devlin] [Joe_Devlin] 2002-03 ++denali-server 3444 udp Denali Server [Joe_Devlin] [Joe_Devlin] 2002-03 ++monp 3445 tcp Media Object Network [Ron_Herardian] [Ron_Herardian] 2002-03 ++monp 3445 udp Media Object Network [Ron_Herardian] [Ron_Herardian] 2002-03 ++3comfaxrpc 3446 tcp 3Com FAX RPC port [Christopher_Wells_2] [Christopher_Wells_2] 2002-04 ++3comfaxrpc 3446 udp 3Com FAX RPC port [Christopher_Wells_2] [Christopher_Wells_2] 2002-04 ++directnet 3447 tcp DirectNet IM System [Gregory_Richards] [Gregory_Richards] 2002-04 ++directnet 3447 udp DirectNet IM System [Gregory_Richards] [Gregory_Richards] 2002-04 ++dnc-port 3448 tcp Discovery and Net Config [Chi_Chen] [Chi_Chen] 2002-04 ++dnc-port 3448 udp Discovery and Net Config [Chi_Chen] [Chi_Chen] 2002-04 ++hotu-chat 3449 tcp HotU Chat [Tim_Burgess] [Tim_Burgess] 2002-04 ++hotu-chat 3449 udp HotU Chat [Tim_Burgess] [Tim_Burgess] 2002-04 ++castorproxy 3450 tcp CAStorProxy [Raymond_J_Young] [Raymond_J_Young] 2002-04 ++castorproxy 3450 udp CAStorProxy [Raymond_J_Young] [Raymond_J_Young] 2002-04 ++asam 3451 tcp ASAM Services [Mike_Gossett] [Mike_Gossett] 2002-04 ++asam 3451 udp ASAM Services [Mike_Gossett] [Mike_Gossett] 2002-04 ++sabp-signal 3452 tcp SABP-Signalling Protocol [Brendan_McWilliams] [Brendan_McWilliams] 2002-04 ++sabp-signal 3452 udp SABP-Signalling Protocol [Brendan_McWilliams] [Brendan_McWilliams] 2002-04 ++pscupd 3453 tcp PSC Update Port [Reid_B_Ligon] [Reid_B_Ligon] ++pscupd 3453 udp PSC Update Port [Reid_B_Ligon] [Reid_B_Ligon] ++mira 3454 tcp Apple Remote Access Protocol [Mike_Alexander] [Mike_Alexander] ++mira 3454 udp Apple Remote Access Protocol [Mike_Alexander] [Mike_Alexander] ++prsvp 3455 tcp RSVP Port [Bob_Braden] [Bob_Braden] ++prsvp 3455 udp RSVP Port [Bob_Braden] [Bob_Braden] ++vat 3456 tcp VAT default data [Van_Jacobson] [Van_Jacobson] ++vat 3456 udp VAT default data [Van_Jacobson] [Van_Jacobson] ++vat-control 3457 tcp VAT default control [Van_Jacobson] [Van_Jacobson] ++vat-control 3457 udp VAT default control [Van_Jacobson] [Van_Jacobson] ++d3winosfi 3458 tcp D3WinOSFI [Brad_Hamilton] [Brad_Hamilton] ++d3winosfi 3458 udp D3WinOSFI [Brad_Hamilton] [Brad_Hamilton] ++integral 3459 tcp TIP Integral [Olivier_Mascia] [Olivier_Mascia] ++integral 3459 udp TIP Integral [Olivier_Mascia] [Olivier_Mascia] ++edm-manager 3460 tcp EDM Manger ++edm-manager 3460 udp EDM Manger ++edm-stager 3461 tcp EDM Stager ++edm-stager 3461 udp EDM Stager ++edm-std-notify 3462 tcp EDM STD Notify ++edm-std-notify 3462 udp EDM STD Notify ++edm-adm-notify 3463 tcp EDM ADM Notify ++edm-adm-notify 3463 udp EDM ADM Notify ++edm-mgr-sync 3464 tcp EDM MGR Sync ++edm-mgr-sync 3464 udp EDM MGR Sync ++edm-mgr-cntrl 3465 tcp EDM MGR Cntrl [Tom_Hennessy] [Tom_Hennessy] ++edm-mgr-cntrl 3465 udp EDM MGR Cntrl [Tom_Hennessy] [Tom_Hennessy] ++workflow 3466 tcp WORKFLOW [Robert_Hufsky] [Robert_Hufsky] ++workflow 3466 udp WORKFLOW [Robert_Hufsky] [Robert_Hufsky] ++rcst 3467 tcp RCST [Kit_Sturgeon] [Kit_Sturgeon] ++rcst 3467 udp RCST [Kit_Sturgeon] [Kit_Sturgeon] ++ttcmremotectrl 3468 tcp TTCM Remote Controll [Yossi_Cohen_Shahar] [Yossi_Cohen_Shahar] ++ttcmremotectrl 3468 udp TTCM Remote Controll [Yossi_Cohen_Shahar] [Yossi_Cohen_Shahar] ++pluribus 3469 tcp Pluribus [Mark_Miller] [Mark_Miller] ++pluribus 3469 udp Pluribus [Mark_Miller] [Mark_Miller] ++jt400 3470 tcp jt400 ++jt400 3470 udp jt400 ++jt400-ssl 3471 tcp jt400-ssl [Clifton_Nock] [Clifton_Nock] ++jt400-ssl 3471 udp jt400-ssl [Clifton_Nock] [Clifton_Nock] ++jaugsremotec-1 3472 tcp JAUGS N-G Remotec 1 ++jaugsremotec-1 3472 udp JAUGS N-G Remotec 1 ++jaugsremotec-2 3473 tcp JAUGS N-G Remotec 2 [Steven_B_Cliff] [Steven_B_Cliff] 2002-04 ++jaugsremotec-2 3473 udp JAUGS N-G Remotec 2 [Steven_B_Cliff] [Steven_B_Cliff] 2002-04 ++ttntspauto 3474 tcp TSP Automation [Arnie_Koster] [Arnie_Koster] 2002-04 ++ttntspauto 3474 udp TSP Automation [Arnie_Koster] [Arnie_Koster] 2002-04 ++genisar-port 3475 tcp Genisar Comm Port [Candace_Niccolson] [Candace_Niccolson] 2002-04 ++genisar-port 3475 udp Genisar Comm Port [Candace_Niccolson] [Candace_Niccolson] 2002-04 ++nppmp 3476 tcp NVIDIA Mgmt Protocol [Gilbert_Yeung] [Gilbert_Yeung] 2002-04 ++nppmp 3476 udp NVIDIA Mgmt Protocol [Gilbert_Yeung] [Gilbert_Yeung] 2002-04 ++ecomm 3477 tcp eComm link port [Thomas_Soerensen] [Thomas_Soerensen] 2002-04 ++ecomm 3477 udp eComm link port [Thomas_Soerensen] [Thomas_Soerensen] 2002-04 ++stun 3478 tcp Session Traversal Utilities [RFC5389] ++ for NAT (STUN) port ++stun 3478 udp Session Traversal Utilities [RFC5389] ++ for NAT (STUN) port ++turn 3478 tcp TURN over TCP [RFC5766] ++turn 3478 udp TURN over UDP [RFC5766] ++stun-behavior 3478 tcp STUN Behavior Discovery over [RFC5780] ++ TCP ++stun-behavior 3478 udp STUN Behavior Discovery over [RFC5780] ++ UDP ++twrpc 3479 tcp 2Wire RPC [Wire_IANA_Contact] [Wire_IANA_Contact] 2002-04 ++twrpc 3479 udp 2Wire RPC [Wire_IANA_Contact] [Wire_IANA_Contact] 2002-04 ++plethora 3480 tcp Secure Virtual Workspace [Tim_Simms] [Tim_Simms] 2002-04 ++plethora 3480 udp Secure Virtual Workspace [Tim_Simms] [Tim_Simms] 2002-04 ++cleanerliverc 3481 tcp CleanerLive remote ctrl [David_Mojdehi] [David_Mojdehi] 2002-04 ++cleanerliverc 3481 udp CleanerLive remote ctrl [David_Mojdehi] [David_Mojdehi] 2002-04 ++vulture 3482 tcp Vulture Monitoring System [Jason_Santos] [Jason_Santos] 2002-04 ++vulture 3482 udp Vulture Monitoring System [Jason_Santos] [Jason_Santos] 2002-04 ++slim-devices 3483 tcp Slim Devices Protocol [Sean_Adams] [Sean_Adams] 2002-05 ++slim-devices 3483 udp Slim Devices Protocol [Sean_Adams] [Sean_Adams] 2002-05 ++gbs-stp 3484 tcp GBS SnapTalk Protocol [Eric_Harris_Braun] [Eric_Harris_Braun] 2002-05 ++gbs-stp 3484 udp GBS SnapTalk Protocol [Eric_Harris_Braun] [Eric_Harris_Braun] 2002-05 ++celatalk 3485 tcp CelaTalk [Carl_Blundell] [Carl_Blundell] 2002-05 ++celatalk 3485 udp CelaTalk [Carl_Blundell] [Carl_Blundell] 2002-05 ++ifsf-hb-port 3486 tcp IFSF Heartbeat Port [IFSF_Secretary] [IFSF_Secretary] 2002-05 ++ifsf-hb-port 3486 udp IFSF Heartbeat Port [IFSF_Secretary] [IFSF_Secretary] 2002-05 ++ltctcp 3487 tcp LISA TCP Transfer Channel ++ltcudp 3487 udp LISA UDP Transfer Channel [Pit_Vetterick] [Pit_Vetterick] 2002-05 ++fs-rh-srv 3488 tcp FS Remote Host Server [Brian_Nickles] [Brian_Nickles] 2002-05 ++fs-rh-srv 3488 udp FS Remote Host Server [Brian_Nickles] [Brian_Nickles] 2002-05 ++dtp-dia 3489 tcp DTP/DIA [Alexei_V_Soloviev] [Alexei_V_Soloviev] 2002-05 ++dtp-dia 3489 udp DTP/DIA [Alexei_V_Soloviev] [Alexei_V_Soloviev] 2002-05 ++colubris 3490 tcp Colubris Management Port [Gilbert_Moineau] [Gilbert_Moineau] 2002-05 ++colubris 3490 udp Colubris Management Port [Gilbert_Moineau] [Gilbert_Moineau] 2002-05 ++swr-port 3491 tcp SWR Port [Ian_Manning] [Ian_Manning] 2002-05 ++swr-port 3491 udp SWR Port [Ian_Manning] [Ian_Manning] 2002-05 ++tvdumtray-port 3492 tcp TVDUM Tray Port [Peter_Boers] [Peter_Boers] 2002-05 ++tvdumtray-port 3492 udp TVDUM Tray Port [Peter_Boers] [Peter_Boers] 2002-05 ++nut 3493 tcp Network UPS Tools [Russell_Kroll] [Russell_Kroll] 2002-05 ++nut 3493 udp Network UPS Tools [Russell_Kroll] [Russell_Kroll] 2002-05 ++ibm3494 3494 tcp IBM 3494 [Jeffrey_Pilch] [Jeffrey_Pilch] ++ibm3494 3494 udp IBM 3494 [Jeffrey_Pilch] [Jeffrey_Pilch] ++seclayer-tcp 3495 tcp securitylayer over tcp ++seclayer-tcp 3495 udp securitylayer over tcp ++seclayer-tls 3496 tcp securitylayer over tls [Arno_Hollosi] [Arno_Hollosi] 2002-03 ++seclayer-tls 3496 udp securitylayer over tls [Arno_Hollosi] [Arno_Hollosi] 2002-03 ++ipether232port 3497 tcp ipEther232Port [Marcus_Leufgen] [Marcus_Leufgen] 2002-05 ++ipether232port 3497 udp ipEther232Port [Marcus_Leufgen] [Marcus_Leufgen] 2002-05 ++dashpas-port 3498 tcp DASHPAS user port [Albrecht_Mayer] [Albrecht_Mayer] 2002-05 ++dashpas-port 3498 udp DASHPAS user port [Albrecht_Mayer] [Albrecht_Mayer] 2002-05 ++sccip-media 3499 tcp SccIP Media [David_Yon_2] [David_Yon_2] 2002-05 ++sccip-media 3499 udp SccIP Media [David_Yon_2] [David_Yon_2] 2002-05 ++rtmp-port 3500 tcp RTMP Port [Miriam_Wohlgelernter] [Miriam_Wohlgelernter] ++rtmp-port 3500 udp RTMP Port [Miriam_Wohlgelernter] [Miriam_Wohlgelernter] ++isoft-p2p 3501 tcp iSoft-P2P [David_Walling_2] [David_Walling_2] ++isoft-p2p 3501 udp iSoft-P2P [David_Walling_2] [David_Walling_2] ++avinstalldisc 3502 tcp Avocent Install Discovery [Brian_S_Stewart_2] [Brian_S_Stewart_2] ++avinstalldisc 3502 udp Avocent Install Discovery [Brian_S_Stewart_2] [Brian_S_Stewart_2] ++lsp-ping 3503 tcp MPLS LSP-echo Port [RFC4379] ++lsp-ping 3503 udp MPLS LSP-echo Port [RFC4379] ++ironstorm 3504 tcp IronStorm game server [Arnaud_Clermonte] [Arnaud_Clermonte] ++ironstorm 3504 udp IronStorm game server [Arnaud_Clermonte] [Arnaud_Clermonte] ++ccmcomm 3505 tcp CCM communications port [Tom_Bougan] [Tom_Bougan] ++ccmcomm 3505 udp CCM communications port [Tom_Bougan] [Tom_Bougan] ++apc-3506 3506 tcp APC 3506 [American_Power_Conve] [American_Power_Conve] ++apc-3506 3506 udp APC 3506 [American_Power_Conve] [American_Power_Conve] ++nesh-broker 3507 tcp Nesh Broker Port [Jeremy_Maiden] [Jeremy_Maiden] ++nesh-broker 3507 udp Nesh Broker Port [Jeremy_Maiden] [Jeremy_Maiden] ++interactionweb 3508 tcp Interaction Web [Mike_Gagle_2] [Mike_Gagle_2] ++interactionweb 3508 udp Interaction Web [Mike_Gagle_2] [Mike_Gagle_2] ++vt-ssl 3509 tcp Virtual Token SSL Port [Libor_Sykora] [Libor_Sykora] 2002-05 ++vt-ssl 3509 udp Virtual Token SSL Port [Libor_Sykora] [Libor_Sykora] 2002-05 ++xss-port 3510 tcp XSS Port [Joe_Purcell] [Joe_Purcell] 2002-05 ++xss-port 3510 udp XSS Port [Joe_Purcell] [Joe_Purcell] 2002-05 ++webmail-2 3511 tcp WebMail/2 [Dimitris_Michelinaki] [Dimitris_Michelinaki] 2002-05 ++webmail-2 3511 udp WebMail/2 [Dimitris_Michelinaki] [Dimitris_Michelinaki] 2002-05 ++aztec 3512 tcp Aztec Distribution Port [Alan_Francis] [Alan_Francis] 2002-05 ++aztec 3512 udp Aztec Distribution Port [Alan_Francis] [Alan_Francis] 2002-05 ++arcpd 3513 tcp Adaptec Remote Protocol [Hardy_Doelfel] [Hardy_Doelfel] 2002-05 ++arcpd 3513 udp Adaptec Remote Protocol [Hardy_Doelfel] [Hardy_Doelfel] 2002-05 ++must-p2p 3514 tcp MUST Peer to Peer ++must-p2p 3514 udp MUST Peer to Peer ++must-backplane 3515 tcp MUST Backplane [Rick_Stefanik] [Rick_Stefanik] 2002-05 ++must-backplane 3515 udp MUST Backplane [Rick_Stefanik] [Rick_Stefanik] 2002-05 ++smartcard-port 3516 tcp Smartcard Port [Scott_Guthery] [Scott_Guthery] 2002-05 ++smartcard-port 3516 udp Smartcard Port [Scott_Guthery] [Scott_Guthery] 2002-05 ++802-11-iapp 3517 tcp IEEE 802.11 WLANs WG IAPP [Stuart_J_Kerry] [Stuart_J_Kerry] 2002-05 ++802-11-iapp 3517 udp IEEE 802.11 WLANs WG IAPP [Stuart_J_Kerry] [Stuart_J_Kerry] 2002-05 ++artifact-msg 3518 tcp Artifact Message Server [Ron_Capwell] [Ron_Capwell] 2002-06 ++artifact-msg 3518 udp Artifact Message Server [Ron_Capwell] [Ron_Capwell] 2002-06 ++nvmsgd 3519 tcp Netvion Messenger Port ++galileo 3519 udp Netvion Galileo Port ++galileolog 3520 tcp Netvion Galileo Log Port [Ray_Caruso] [Ray_Caruso] 2002-06 ++galileolog 3520 udp Netvion Galileo Log Port [Ray_Caruso] [Ray_Caruso] 2002-06 ++mc3ss 3521 tcp Telequip Labs MC3SS [Michael_Sparks] [Michael_Sparks] 2002-06 ++mc3ss 3521 udp Telequip Labs MC3SS [Michael_Sparks] [Michael_Sparks] 2002-06 ++ NFS service for the domain ++nfs-domainroot tcp root, the root of an [IESG] [IETF_Chair] 2012-04-24 [draft-ietf-nfsv4-federated-fs-dns-srv-namespace-13] Defined TXT keys: none ++ organization's published ++ file name space. ++nssocketport 3522 tcp DO over NSSocketPort [Douglas_Davidson] [Douglas_Davidson] 2002-06 ++nssocketport 3522 udp DO over NSSocketPort [Douglas_Davidson] [Douglas_Davidson] 2002-06 ++odeumservlink 3523 tcp Odeum Serverlink [Mads_Peter_Back] [Mads_Peter_Back] 2002-06 ++odeumservlink 3523 udp Odeum Serverlink [Mads_Peter_Back] [Mads_Peter_Back] 2002-06 ++ecmport 3524 tcp ECM Server port ++ecmport 3524 udp ECM Server port ++eisport 3525 tcp EIS Server port [Paul_Kraus] [Paul_Kraus] 2002-06 ++eisport 3525 udp EIS Server port [Paul_Kraus] [Paul_Kraus] 2002-06 ++starquiz-port 3526 tcp starQuiz Port [Adam_Ernst_2] [Adam_Ernst_2] 2002-06 ++starquiz-port 3526 udp starQuiz Port [Adam_Ernst_2] [Adam_Ernst_2] 2002-06 ++beserver-msg-q 3527 tcp VERITAS Backup Exec Server [Katherine_Wattwood] [Katherine_Wattwood] 2002-06 ++beserver-msg-q 3527 udp VERITAS Backup Exec Server [Katherine_Wattwood] [Katherine_Wattwood] 2002-06 ++jboss-iiop 3528 tcp JBoss IIOP ++jboss-iiop 3528 udp JBoss IIOP ++jboss-iiop-ssl 3529 tcp JBoss IIOP/SSL [Francisco_Reverbel] [Francisco_Reverbel] 2002-06 ++jboss-iiop-ssl 3529 udp JBoss IIOP/SSL [Francisco_Reverbel] [Francisco_Reverbel] 2002-06 ++gf 3530 tcp Grid Friendly [Daivd_P_Chassin] [Daivd_P_Chassin] 2002-06 ++gf 3530 udp Grid Friendly [Daivd_P_Chassin] [Daivd_P_Chassin] 2002-06 ++joltid 3531 tcp Joltid [Ahti_Heinla] [Ahti_Heinla] 2002-06 ++joltid 3531 udp Joltid [Ahti_Heinla] [Ahti_Heinla] 2002-06 ++raven-rmp 3532 tcp Raven Remote Management ++ Control ++raven-rmp 3532 udp Raven Remote Management ++ Control ++raven-rdp 3533 tcp Raven Remote Management Data [Daniel_Sorlov_2] [Daniel_Sorlov_2] 2002-06 ++raven-rdp 3533 udp Raven Remote Management Data [Daniel_Sorlov_2] [Daniel_Sorlov_2] 2002-06 ++urld-port 3534 tcp URL Daemon Port [Jim_Binkley] [Jim_Binkley] 2002-06 ++urld-port 3534 udp URL Daemon Port [Jim_Binkley] [Jim_Binkley] 2002-06 ++ms-la 3535 tcp MS-LA [Eric_Ledoux] [Eric_Ledoux] ++ms-la 3535 udp MS-LA [Eric_Ledoux] [Eric_Ledoux] ++snac 3536 tcp SNAC [Tatsuya_Igarashi] [Tatsuya_Igarashi] 2002-07 ++snac 3536 udp SNAC [Tatsuya_Igarashi] [Tatsuya_Igarashi] 2002-07 ++ni-visa-remote 3537 tcp Remote NI-VISA port [Sinnadurai_Dharshan] [Sinnadurai_Dharshan] 2002-07 ++ni-visa-remote 3537 udp Remote NI-VISA port [Sinnadurai_Dharshan] [Sinnadurai_Dharshan] 2002-07 ++ibm-diradm 3538 tcp IBM Directory Server ++ibm-diradm 3538 udp IBM Directory Server ++ibm-diradm-ssl 3539 tcp IBM Directory Server SSL [Mark_Cavage] [Mark_Cavage] 2002-07 ++ibm-diradm-ssl 3539 udp IBM Directory Server SSL [Mark_Cavage] [Mark_Cavage] 2002-07 ++pnrp-port 3540 tcp PNRP User Port [Igor_Kostic] [Igor_Kostic] 2002-07 ++pnrp-port 3540 udp PNRP User Port [Igor_Kostic] [Igor_Kostic] 2002-07 ++voispeed-port 3541 tcp VoiSpeed Port [Virgilio_Lattanzi] [Virgilio_Lattanzi] 2002-07 ++voispeed-port 3541 udp VoiSpeed Port [Virgilio_Lattanzi] [Virgilio_Lattanzi] 2002-07 ++hacl-monitor 3542 tcp HA cluster monitor [Jason_Ko] [Jason_Ko] 2002-07 ++hacl-monitor 3542 udp HA cluster monitor [Jason_Ko] [Jason_Ko] 2002-07 ++qftest-lookup 3543 tcp qftest Lookup Port [Gregor_Schmid] [Gregor_Schmid] 2002-07 ++qftest-lookup 3543 udp qftest Lookup Port [Gregor_Schmid] [Gregor_Schmid] 2002-07 ++teredo 3544 tcp Teredo Port [RFC4380] ++teredo 3544 udp Teredo Port [RFC4380] ++camac 3545 tcp CAMAC equipment [Eugene_Zhiganov] [Eugene_Zhiganov] 2002-07 ++camac 3545 udp CAMAC equipment [Eugene_Zhiganov] [Eugene_Zhiganov] 2002-07 ++ 3546 Unassigned 2002-09 ++symantec-sim 3547 tcp Symantec SIM [George_Dzieciol] [George_Dzieciol] 2002-07 ++symantec-sim 3547 udp Symantec SIM [George_Dzieciol] [George_Dzieciol] 2002-07 ++interworld 3548 tcp Interworld [John_Stephen] [John_Stephen] 2002-07 ++interworld 3548 udp Interworld [John_Stephen] [John_Stephen] 2002-07 ++tellumat-nms 3549 tcp Tellumat MDR NMS [Hennie_van_der_Merwe] [Hennie_van_der_Merwe] 2002-07 ++tellumat-nms 3549 udp Tellumat MDR NMS [Hennie_van_der_Merwe] [Hennie_van_der_Merwe] 2002-07 ++ssmpp 3550 tcp Secure SMPP [Cormac_Long] [Cormac_Long] 2002-07 ++ssmpp 3550 udp Secure SMPP [Cormac_Long] [Cormac_Long] 2002-07 ++apcupsd 3551 tcp Apcupsd Information Port [Riccardo_Facchetti] [Riccardo_Facchetti] 2002-07 ++apcupsd 3551 udp Apcupsd Information Port [Riccardo_Facchetti] [Riccardo_Facchetti] 2002-07 ++taserver 3552 tcp TeamAgenda Server Port [Dany_Ayotte] [Dany_Ayotte] 2002-07 ++taserver 3552 udp TeamAgenda Server Port [Dany_Ayotte] [Dany_Ayotte] 2002-07 ++rbr-discovery 3553 tcp Red Box Recorder ADP [Simon_Jolly] [Simon_Jolly] 2002-07 ++rbr-discovery 3553 udp Red Box Recorder ADP [Simon_Jolly] [Simon_Jolly] 2002-07 ++questnotify 3554 tcp Quest Notification Server [Rob_Griffin] [Rob_Griffin] 2002-07 ++questnotify 3554 udp Quest Notification Server [Rob_Griffin] [Rob_Griffin] 2002-07 ++razor 3555 tcp Vipul's Razor [Vipul_Ved_Prakash] [Vipul_Ved_Prakash] 2002-07 ++razor 3555 udp Vipul's Razor [Vipul_Ved_Prakash] [Vipul_Ved_Prakash] 2002-07 ++sky-transport 3556 tcp Sky Transport Protocol [Michael_Paddon] [Michael_Paddon] 2002-07 ++sky-transport 3556 udp Sky Transport Protocol [Michael_Paddon] [Michael_Paddon] 2002-07 ++personalos-001 3557 tcp PersonalOS Comm Port [Shane_Roberts] [Shane_Roberts] 2002-07 ++personalos-001 3557 udp PersonalOS Comm Port [Shane_Roberts] [Shane_Roberts] 2002-07 ++mcp-port 3558 tcp MCP user port [Professor_Paul_S_Wa] [Professor_Paul_S_Wa] 2002-07 ++mcp-port 3558 udp MCP user port [Professor_Paul_S_Wa] [Professor_Paul_S_Wa] 2002-07 ++cctv-port 3559 tcp CCTV control port [John_Skidmore] [John_Skidmore] 2002-07 ++cctv-port 3559 udp CCTV control port [John_Skidmore] [John_Skidmore] 2002-07 ++iniserve-port 3560 tcp INIServe port [Peter_Moylan] [Peter_Moylan] 2002-08 ++iniserve-port 3560 udp INIServe port [Peter_Moylan] [Peter_Moylan] 2002-08 ++bmc-onekey 3561 tcp BMC-OneKey [Portnoy_Boxman] [Portnoy_Boxman] 2002-08 ++bmc-onekey 3561 udp BMC-OneKey [Portnoy_Boxman] [Portnoy_Boxman] 2002-08 ++sdbproxy 3562 tcp SDBProxy [Eric_Grange] [Eric_Grange] 2002-08 ++sdbproxy 3562 udp SDBProxy [Eric_Grange] [Eric_Grange] 2002-08 ++watcomdebug 3563 tcp Watcom Debug [Dave_Neudoerffer] [Dave_Neudoerffer] ++watcomdebug 3563 udp Watcom Debug [Dave_Neudoerffer] [Dave_Neudoerffer] ++esimport 3564 tcp Electromed SIM port [Francois_Marchand] [Francois_Marchand] 2002-08 ++esimport 3564 udp Electromed SIM port [Francois_Marchand] [Francois_Marchand] 2002-08 ++m2pa 3565 tcp M2PA [RFC4165] ++ 3565 udp Reserved ++m2pa 3565 sctp M2PA [RFC4165] ++quest-data-hub 3566 tcp Quest Data Hub [Greg_Cottman_2] [Greg_Cottman_2] 2010-10-18 ++ 3566 udp Reserved 2010-10-18 ++oap 3567 tcp Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2002-08 ++oap 3567 udp Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2002-08 ++oap-s 3568 tcp Object Access Protocol over [Bryant_Eastham] [Bryant_Eastham] 2003-01 ++ SSL ++oap-s 3568 udp Object Access Protocol over [Bryant_Eastham] [Bryant_Eastham] 2003-01 ++ SSL ++mbg-ctrl 3569 tcp Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08 ++mbg-ctrl 3569 udp Meinberg Control Service [Martin_Burnicki] [Martin_Burnicki] 2002-08 ++mccwebsvr-port 3570 tcp MCC Web Server Port ++mccwebsvr-port 3570 udp MCC Web Server Port ++megardsvr-port 3571 tcp MegaRAID Server Port ++megardsvr-port 3571 udp MegaRAID Server Port ++megaregsvrport 3572 tcp Registration Server Port [Sreenivas_Bagalkote] [Sreenivas_Bagalkote] 2002-08 ++megaregsvrport 3572 udp Registration Server Port [Sreenivas_Bagalkote] [Sreenivas_Bagalkote] 2002-08 ++tag-ups-1 3573 tcp Advantage Group UPS Suite [James_Goddard] [James_Goddard] 2002-08 ++tag-ups-1 3573 udp Advantage Group UPS Suite [James_Goddard] [James_Goddard] 2002-08 ++dmaf-server 3574 tcp DMAF Server ++dmaf-caster 3574 udp DMAF Caster [Ramakrishna_Nadendla] [Ramakrishna_Nadendla] 2002-08 ++ccm-port 3575 tcp Coalsere CCM Port ++ccm-port 3575 udp Coalsere CCM Port ++cmc-port 3576 tcp Coalsere CMC Port [Chris_Hawkinson] [Chris_Hawkinson] 2002-08 ++cmc-port 3576 udp Coalsere CMC Port [Chris_Hawkinson] [Chris_Hawkinson] 2002-08 ++config-port 3577 tcp Configuration Port ++config-port 3577 udp Configuration Port ++data-port 3578 tcp Data Port [Anupam_Bharali] [Anupam_Bharali] 2002-08 ++data-port 3578 udp Data Port [Anupam_Bharali] [Anupam_Bharali] 2002-08 ++ttat3lb 3579 tcp Tarantella Load Balancing [Jim_Musgrave] [Jim_Musgrave] 2002-08 ++ttat3lb 3579 udp Tarantella Load Balancing [Jim_Musgrave] [Jim_Musgrave] 2002-08 ++nati-svrloc 3580 tcp NATI-ServiceLocator [Jason_Case] [Jason_Case] 2002-08 ++nati-svrloc 3580 udp NATI-ServiceLocator [Jason_Case] [Jason_Case] 2002-08 ++kfxaclicensing 3581 tcp Ascent Capture Licensing [Brad_Hamilton_2] [Brad_Hamilton_2] 2002-08 ++kfxaclicensing 3581 udp Ascent Capture Licensing [Brad_Hamilton_2] [Brad_Hamilton_2] 2002-08 ++press 3582 tcp PEG PRESS Server [Jim_DeLisle] [Jim_DeLisle] 2002-08 ++press 3582 udp PEG PRESS Server [Jim_DeLisle] [Jim_DeLisle] 2002-08 ++canex-watch 3583 tcp CANEX Watch System [Peter_Kollath] [Peter_Kollath] 2002-08 ++canex-watch 3583 udp CANEX Watch System [Peter_Kollath] [Peter_Kollath] 2002-08 ++u-dbap 3584 tcp U-DBase Access Protocol [Bodo_Rueskamp] [Bodo_Rueskamp] 2002-08 ++u-dbap 3584 udp U-DBase Access Protocol [Bodo_Rueskamp] [Bodo_Rueskamp] 2002-08 ++emprise-lls 3585 tcp Emprise License Server ++emprise-lls 3585 udp Emprise License Server ++emprise-lsc 3586 tcp License Server Console [James_J_Diaz] [James_J_Diaz] 2002-08 ++emprise-lsc 3586 udp License Server Console [James_J_Diaz] [James_J_Diaz] 2002-08 ++p2pgroup 3587 tcp Peer to Peer Grouping [Igor_Kostic] [Igor_Kostic] 2002-08 ++p2pgroup 3587 udp Peer to Peer Grouping [Igor_Kostic] [Igor_Kostic] 2002-08 ++sentinel 3588 tcp Sentinel Server [Ian_Gordon] [Ian_Gordon] 2002-08 ++sentinel 3588 udp Sentinel Server [Ian_Gordon] [Ian_Gordon] 2002-08 ++isomair 3589 tcp isomair [Richard_Fleming] [Richard_Fleming] 2002-08 ++isomair 3589 udp isomair [Richard_Fleming] [Richard_Fleming] 2002-08 ++wv-csp-sms 3590 tcp WV CSP SMS Binding [Matti_Salmi] [Matti_Salmi] 2002-08 ++wv-csp-sms 3590 udp WV CSP SMS Binding [Matti_Salmi] [Matti_Salmi] 2002-08 ++gtrack-server 3591 tcp LOCANIS G-TRACK Server ++gtrack-server 3591 udp LOCANIS G-TRACK Server ++gtrack-ne 3592 tcp LOCANIS G-TRACK NE Port [Juergen_Edelhaeuser] [Juergen_Edelhaeuser] 2002-08 ++gtrack-ne 3592 udp LOCANIS G-TRACK NE Port [Juergen_Edelhaeuser] [Juergen_Edelhaeuser] 2002-08 ++bpmd 3593 tcp BP Model Debugger [Keith_Fligg] [Keith_Fligg] 2002-09 ++bpmd 3593 udp BP Model Debugger [Keith_Fligg] [Keith_Fligg] 2002-09 ++mediaspace 3594 tcp MediaSpace ++mediaspace 3594 udp MediaSpace ++shareapp 3595 tcp ShareApp [Jeff_King] [Jeff_King] 2002-09 ++shareapp 3595 udp ShareApp [Jeff_King] [Jeff_King] 2002-09 ++iw-mmogame 3596 tcp Illusion Wireless MMOG [Jan_Vrsinsky] [Jan_Vrsinsky] 2002-09 ++iw-mmogame 3596 udp Illusion Wireless MMOG [Jan_Vrsinsky] [Jan_Vrsinsky] 2002-09 ++a14 3597 tcp A14 (AN-to-SC/MM) ++a14 3597 udp A14 (AN-to-SC/MM) ++a15 3598 tcp A15 (AN-to-AN) [David_Ott] [David_Ott] 2002-09 ++a15 3598 udp A15 (AN-to-AN) [David_Ott] [David_Ott] 2002-09 ++quasar-server 3599 tcp Quasar Accounting Server [Brad_Pepers] [Brad_Pepers] 2002-09 ++quasar-server 3599 udp Quasar Accounting Server [Brad_Pepers] [Brad_Pepers] 2002-09 ++trap-daemon 3600 tcp text relay-answer [John_Willis] [John_Willis] 2002-09 ++trap-daemon 3600 udp text relay-answer [John_Willis] [John_Willis] 2002-09 ++visinet-gui 3601 tcp Visinet Gui [Jeff_Douglass] [Jeff_Douglass] 2002-09 ++visinet-gui 3601 udp Visinet Gui [Jeff_Douglass] [Jeff_Douglass] 2002-09 ++infiniswitchcl 3602 tcp InfiniSwitch Mgr Client [Lee_VanTine] [Lee_VanTine] 2002-09 ++infiniswitchcl 3602 udp InfiniSwitch Mgr Client [Lee_VanTine] [Lee_VanTine] 2002-09 ++int-rcv-cntrl 3603 tcp Integrated Rcvr Control [Dave_Stone] [Dave_Stone] 2002-09 ++int-rcv-cntrl 3603 udp Integrated Rcvr Control [Dave_Stone] [Dave_Stone] 2002-09 ++bmc-jmx-port 3604 tcp BMC JMX Port [Portnoy_Boxman] [Portnoy_Boxman] 2002-09 ++bmc-jmx-port 3604 udp BMC JMX Port [Portnoy_Boxman] [Portnoy_Boxman] 2002-09 ++comcam-io 3605 tcp ComCam IO Port [Don_Gilbreath] [Don_Gilbreath] 2002-09 ++comcam-io 3605 udp ComCam IO Port [Don_Gilbreath] [Don_Gilbreath] 2002-09 ++splitlock 3606 tcp Splitlock Server [Andrew_Tune] [Andrew_Tune] 2002-09 ++splitlock 3606 udp Splitlock Server [Andrew_Tune] [Andrew_Tune] 2002-09 ++precise-i3 3607 tcp Precise I3 [Tomer_Shain] [Tomer_Shain] 2002-09 ++precise-i3 3607 udp Precise I3 [Tomer_Shain] [Tomer_Shain] 2002-09 ++trendchip-dcp 3608 tcp Trendchip control protocol [Ming_Jen_Chen] [Ming_Jen_Chen] 2002-09 ++trendchip-dcp 3608 udp Trendchip control protocol [Ming_Jen_Chen] [Ming_Jen_Chen] 2002-09 ++cpdi-pidas-cm 3609 tcp CPDI PIDAS Connection Mon [Tony_Splaver] [Tony_Splaver] 2002-09 ++cpdi-pidas-cm 3609 udp CPDI PIDAS Connection Mon [Tony_Splaver] [Tony_Splaver] 2002-09 ++echonet 3610 tcp ECHONET [Takeshi_Saito] [Takeshi_Saito] 2002-09 ++echonet 3610 udp ECHONET [Takeshi_Saito] [Takeshi_Saito] 2002-09 ++six-degrees 3611 tcp Six Degrees Port [Zach_Nies] [Zach_Nies] 2002-09 ++six-degrees 3611 udp Six Degrees Port [Zach_Nies] [Zach_Nies] 2002-09 ++hp-dataprotect 3612 tcp HP Data Protector [Stephen_Gold] [Stephen_Gold] 2002-09 ++hp-dataprotect 3612 udp HP Data Protector [Stephen_Gold] [Stephen_Gold] 2002-09 ++alaris-disc 3613 tcp Alaris Device Discovery [Chris_Dern] [Chris_Dern] 2004-06 ++alaris-disc 3613 udp Alaris Device Discovery [Chris_Dern] [Chris_Dern] 2004-06 ++sigma-port 3614 tcp Satchwell Sigma [Dave_Chapman] [Dave_Chapman] 2011-06-06 ++sigma-port 3614 udp Satchwell Sigma [Dave_Chapman] [Dave_Chapman] 2011-06-06 ++start-network 3615 tcp Start Messaging Network [Peter_Rocca] [Peter_Rocca] 2002-10 ++start-network 3615 udp Start Messaging Network [Peter_Rocca] [Peter_Rocca] 2002-10 ++cd3o-protocol 3616 tcp cd3o Control Protocol [Chris_Wilcox] [Chris_Wilcox] 2002-10 ++cd3o-protocol 3616 udp cd3o Control Protocol [Chris_Wilcox] [Chris_Wilcox] 2002-10 ++sharp-server 3617 tcp ATI SHARP Logic Engine [Bill_Reveile] [Bill_Reveile] ++sharp-server 3617 udp ATI SHARP Logic Engine [Bill_Reveile] [Bill_Reveile] ++aairnet-1 3618 tcp AAIR-Network 1 ++aairnet-1 3618 udp AAIR-Network 1 ++aairnet-2 3619 tcp AAIR-Network 2 [James_Mealey] [James_Mealey] 2002-10 ++aairnet-2 3619 udp AAIR-Network 2 [James_Mealey] [James_Mealey] 2002-10 ++ep-pcp 3620 tcp EPSON Projector Control Port ++ep-pcp 3620 udp EPSON Projector Control Port ++ep-nsp 3621 tcp EPSON Network Screen Port [SEIKO_EPSON_3] [SEIKO_EPSON_3] 2002-10 ++ep-nsp 3621 udp EPSON Network Screen Port [SEIKO_EPSON_3] [SEIKO_EPSON_3] 2002-10 ++ff-lr-port 3622 tcp FF LAN Redundancy Port [Fieldbus_Foundation] [Fieldbus_Foundation] 2002-10 ++ff-lr-port 3622 udp FF LAN Redundancy Port [Fieldbus_Foundation] [Fieldbus_Foundation] 2002-10 ++haipe-discover 3623 tcp HAIPIS Dynamic Discovery [Mike_Irani] [Mike_Irani] 2002-10 ++haipe-discover 3623 udp HAIPIS Dynamic Discovery [Mike_Irani] [Mike_Irani] 2002-10 ++dist-upgrade 3624 tcp Distributed Upgrade Port [Jason_Schoon] [Jason_Schoon] 2002-10 ++dist-upgrade 3624 udp Distributed Upgrade Port [Jason_Schoon] [Jason_Schoon] 2002-10 ++volley 3625 tcp Volley [David_Catmull] [David_Catmull] 2002-10 ++volley 3625 udp Volley [David_Catmull] [David_Catmull] 2002-10 ++bvcdaemon-port 3626 tcp bvControl Daemon [Ravi_Gokhale] [Ravi_Gokhale] 2002-10 ++bvcdaemon-port 3626 udp bvControl Daemon [Ravi_Gokhale] [Ravi_Gokhale] 2002-10 ++jamserverport 3627 tcp Jam Server Port [Art_Pope] [Art_Pope] 2002-10 ++jamserverport 3627 udp Jam Server Port [Art_Pope] [Art_Pope] 2002-10 ++ept-machine 3628 tcp EPT Machine Interface [Victor_H_Farrace] [Victor_H_Farrace] 2002-10 ++ept-machine 3628 udp EPT Machine Interface [Victor_H_Farrace] [Victor_H_Farrace] 2002-10 ++escvpnet 3629 tcp ESC/VP.net [Hiroyuki_Hashimoto] [Hiroyuki_Hashimoto] 2002-10 ++escvpnet 3629 udp ESC/VP.net [Hiroyuki_Hashimoto] [Hiroyuki_Hashimoto] 2002-10 ++cs-remote-db 3630 tcp C&S Remote Database Port ++cs-remote-db 3630 udp C&S Remote Database Port ++cs-services 3631 tcp C&S Web Services Port [Computer_Software_Gm] [Computer_Software_Gm] 2002-10 ++cs-services 3631 udp C&S Web Services Port [Computer_Software_Gm] [Computer_Software_Gm] 2002-10 ++distcc 3632 tcp distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None ++distcc 3632 udp distributed compiler [Martin_Pool] [Martin_Pool] 2002-11 Defined TXT keys: None ++wacp 3633 tcp Wyrnix AIS port [Harry_T_Vennik] [Harry_T_Vennik] 2002-11 ++wacp 3633 udp Wyrnix AIS port [Harry_T_Vennik] [Harry_T_Vennik] 2002-11 ++hlibmgr 3634 tcp hNTSP Library Manager [Kenji_Tetsuyama] [Kenji_Tetsuyama] 2002-11 ++hlibmgr 3634 udp hNTSP Library Manager [Kenji_Tetsuyama] [Kenji_Tetsuyama] 2002-11 ++sdo 3635 tcp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2002-11 ++sdo 3635 udp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2002-11 ++servistaitsm 3636 tcp SerVistaITSM [Ralph_Campbell] [Ralph_Campbell] 2002-11 ++servistaitsm 3636 udp SerVistaITSM [Ralph_Campbell] [Ralph_Campbell] 2002-11 ++scservp 3637 tcp Customer Service Port [Jonathan_A_Zdziarsk] [Jonathan_A_Zdziarsk] 2002-11 ++scservp 3637 udp Customer Service Port [Jonathan_A_Zdziarsk] [Jonathan_A_Zdziarsk] 2002-11 ++ehp-backup 3638 tcp EHP Backup Protocol [Ed_Fair] [Ed_Fair] 2002-11 ++ehp-backup 3638 udp EHP Backup Protocol [Ed_Fair] [Ed_Fair] 2002-11 ++xap-ha 3639 tcp Extensible Automation [Mark_Harrison] [Mark_Harrison] 2002-11 ++xap-ha 3639 udp Extensible Automation [Mark_Harrison] [Mark_Harrison] 2002-11 ++netplay-port1 3640 tcp Netplay Port 1 ++netplay-port1 3640 udp Netplay Port 1 ++netplay-port2 3641 tcp Netplay Port 2 [Predrag_Filipovic] [Predrag_Filipovic] 2002-11 ++netplay-port2 3641 udp Netplay Port 2 [Predrag_Filipovic] [Predrag_Filipovic] 2002-11 ++juxml-port 3642 tcp Juxml Replication port [Colin_Reid] [Colin_Reid] 2002-11 ++juxml-port 3642 udp Juxml Replication port [Colin_Reid] [Colin_Reid] 2002-11 ++audiojuggler 3643 tcp AudioJuggler [Morten_Mertner] [Morten_Mertner] 2002-11 ++audiojuggler 3643 udp AudioJuggler [Morten_Mertner] [Morten_Mertner] 2002-11 ++ssowatch 3644 tcp ssowatch [Marie_France_Dubreui] [Marie_France_Dubreui] 2002-11 ++ssowatch 3644 udp ssowatch [Marie_France_Dubreui] [Marie_France_Dubreui] 2002-11 ++cyc 3645 tcp Cyc [Stephen_Reed] [Stephen_Reed] 2003-01 ++cyc 3645 udp Cyc [Stephen_Reed] [Stephen_Reed] 2003-01 ++xss-srv-port 3646 tcp XSS Server Port [Joe_Purcell] [Joe_Purcell] 2003-01 ++xss-srv-port 3646 udp XSS Server Port [Joe_Purcell] [Joe_Purcell] 2003-01 ++splitlock-gw 3647 tcp Splitlock Gateway [Andrew_Tune] [Andrew_Tune] 2003-01 ++splitlock-gw 3647 udp Splitlock Gateway [Andrew_Tune] [Andrew_Tune] 2003-01 ++fjcp 3648 tcp Fujitsu Cooperation Port [Kouji_Sugisawa] [Kouji_Sugisawa] 2003-01 ++fjcp 3648 udp Fujitsu Cooperation Port [Kouji_Sugisawa] [Kouji_Sugisawa] 2003-01 ++nmmp 3649 tcp Nishioka Miyuki Msg Protocol [TAKEDA_Hiroyuki] [TAKEDA_Hiroyuki] 2003-01 ++nmmp 3649 udp Nishioka Miyuki Msg Protocol [TAKEDA_Hiroyuki] [TAKEDA_Hiroyuki] 2003-01 ++prismiq-plugin 3650 tcp PRISMIQ VOD plug-in [Richard_Hodges_3] [Richard_Hodges_3] 2003-01 ++prismiq-plugin 3650 udp PRISMIQ VOD plug-in [Richard_Hodges_3] [Richard_Hodges_3] 2003-01 ++xrpc-registry 3651 tcp XRPC Registry [Slava_Monich] [Slava_Monich] 2003-01 ++xrpc-registry 3651 udp XRPC Registry [Slava_Monich] [Slava_Monich] 2003-01 ++vxcrnbuport 3652 tcp VxCR NBU Default Port [Boris_Star] [Boris_Star] 2003-01 ++vxcrnbuport 3652 udp VxCR NBU Default Port [Boris_Star] [Boris_Star] 2003-01 ++tsp 3653 tcp Tunnel Setup Protocol [Marc_Blanchet] [Marc_Blanchet] 2003-01 [RFC5572] ++tsp 3653 udp Tunnel Setup Protocol [Marc_Blanchet] [Marc_Blanchet] 2003-01 [RFC5572] ++vaprtm 3654 tcp VAP RealTime Messenger [Boris_Polevoy] [Boris_Polevoy] 2003-01 ++vaprtm 3654 udp VAP RealTime Messenger [Boris_Polevoy] [Boris_Polevoy] 2003-01 ++abatemgr 3655 tcp ActiveBatch Exec Agent ++abatemgr 3655 udp ActiveBatch Exec Agent ++abatjss 3656 tcp ActiveBatch Job Scheduler [Ben_Rosenberg] [Ben_Rosenberg] 2003-01 ++abatjss 3656 udp ActiveBatch Job Scheduler [Ben_Rosenberg] [Ben_Rosenberg] 2003-01 ++immedianet-bcn 3657 tcp ImmediaNet Beacon [Bill_Homan] [Bill_Homan] 2003-01 ++immedianet-bcn 3657 udp ImmediaNet Beacon [Bill_Homan] [Bill_Homan] 2003-01 ++ps-ams 3658 tcp PlayStation AMS (Secure) [Edgar_Alan_Tu] [Edgar_Alan_Tu] 2003-01 ++ps-ams 3658 udp PlayStation AMS (Secure) [Edgar_Alan_Tu] [Edgar_Alan_Tu] 2003-01 ++apple-sasl 3659 tcp Apple SASL [David_M_O_Rourke] [David_M_O_Rourke] 2003-01 ++apple-sasl 3659 udp Apple SASL [David_M_O_Rourke] [David_M_O_Rourke] 2003-01 ++can-nds-ssl 3660 tcp IBM Tivoli Directory Service ++ using SSL ++can-nds-ssl 3660 udp IBM Tivoli Directory Service ++ using SSL ++can-ferret-ssl 3661 tcp IBM Tivoli Directory Service [Nic_Catrambone] [Nic_Catrambone] 2003-01 ++ using SSL ++can-ferret-ssl 3661 udp IBM Tivoli Directory Service [Nic_Catrambone] [Nic_Catrambone] 2003-01 ++ using SSL ++pserver 3662 tcp pserver [Patrick_Furlong] [Patrick_Furlong] 2003-01 ++pserver 3662 udp pserver [Patrick_Furlong] [Patrick_Furlong] 2003-01 ++dtp 3663 tcp DIRECWAY Tunnel Protocol [John_Border] [John_Border] 2003-01 ++dtp 3663 udp DIRECWAY Tunnel Protocol [John_Border] [John_Border] 2003-01 ++ups-engine 3664 tcp UPS Engine Port ++ups-engine 3664 udp UPS Engine Port ++ent-engine 3665 tcp Enterprise Engine Port [Mike_Delgrosso] [Mike_Delgrosso] 2003-01 ++ent-engine 3665 udp Enterprise Engine Port [Mike_Delgrosso] [Mike_Delgrosso] 2003-01 ++eserver-pap 3666 tcp IBM eServer PAP [Dave_Gimpl] [Dave_Gimpl] 2003-01 ++eserver-pap 3666 udp IBM EServer PAP [Dave_Gimpl] [Dave_Gimpl] 2003-01 ++infoexch 3667 tcp IBM Information Exchange [Paul_Ford_Hutchinson] [Paul_Ford_Hutchinson] 2003-01 ++infoexch 3667 udp IBM Information Exchange [Paul_Ford_Hutchinson] [Paul_Ford_Hutchinson] 2003-01 ++dell-rm-port 3668 tcp Dell Remote Management [Bradley_Bransom] [Bradley_Bransom] 2003-01 ++dell-rm-port 3668 udp Dell Remote Management [Bradley_Bransom] [Bradley_Bransom] 2003-01 ++casanswmgmt 3669 tcp CA SAN Switch Management [Emre_Tunar] [Emre_Tunar] 2003-01 ++casanswmgmt 3669 udp CA SAN Switch Management [Emre_Tunar] [Emre_Tunar] 2003-01 ++smile 3670 tcp SMILE TCP/UDP Interface [Andre_Petras] [Andre_Petras] 2003-01 ++smile 3670 udp SMILE TCP/UDP Interface [Andre_Petras] [Andre_Petras] 2003-01 ++efcp 3671 tcp e Field Control (EIBnet) [Marc_Goossens] [Marc_Goossens] 2003-01 ++efcp 3671 udp e Field Control (EIBnet) [Marc_Goossens] [Marc_Goossens] 2003-01 ++lispworks-orb 3672 tcp LispWorks ORB [Lisp_Support] [Lisp_Support] ++lispworks-orb 3672 udp LispWorks ORB [Lisp_Support] [Lisp_Support] ++mediavault-gui 3673 tcp Openview Media Vault GUI [Stephen_Gold] [Stephen_Gold] 2003-01 ++mediavault-gui 3673 udp Openview Media Vault GUI [Stephen_Gold] [Stephen_Gold] 2003-01 ++wininstall-ipc 3674 tcp WinINSTALL IPC Port [Bill_Somerville] [Bill_Somerville] 2008-08-13 ++wininstall-ipc 3674 udp WinINSTALL IPC Port [Bill_Somerville] [Bill_Somerville] 2008-08-13 ++calltrax 3675 tcp CallTrax Data Port [Oliver_Bailey] [Oliver_Bailey] 2003-01 ++calltrax 3675 udp CallTrax Data Port [Oliver_Bailey] [Oliver_Bailey] 2003-01 ++va-pacbase 3676 tcp VisualAge Pacbase server [Dominique_Lelievre] [Dominique_Lelievre] 2003-01 ++va-pacbase 3676 udp VisualAge Pacbase server [Dominique_Lelievre] [Dominique_Lelievre] 2003-01 ++roverlog 3677 tcp RoverLog IPC [Tom_Mayo] [Tom_Mayo] 2003-01 ++roverlog 3677 udp RoverLog IPC [Tom_Mayo] [Tom_Mayo] 2003-01 ++ipr-dglt 3678 tcp DataGuardianLT [Bruce_Carlson] [Bruce_Carlson] 2003-01 ++ipr-dglt 3678 udp DataGuardianLT [Bruce_Carlson] [Bruce_Carlson] 2003-01 ++Escale (Newton 3679 tcp Newton Dock [Paul_Guyot] [Paul_Guyot] 2011-11-09 ++Dock) ++Escale (Newton 3679 udp Newton Dock [Paul_Guyot] [Paul_Guyot] 2011-11-09 ++Dock) ++npds-tracker 3680 tcp NPDS Tracker [Paul_Guyot] [Paul_Guyot] 2003-01 ++npds-tracker 3680 udp NPDS Tracker [Paul_Guyot] [Paul_Guyot] 2003-01 ++bts-x73 3681 tcp BTS X73 Port [Todd_Cooper] [Todd_Cooper] 2003-01 ++bts-x73 3681 udp BTS X73 Port [Todd_Cooper] [Todd_Cooper] 2003-01 ++cas-mapi 3682 tcp EMC SmartPackets-MAPI [Koen_Schoofs] [Koen_Schoofs] 2003-01 ++cas-mapi 3682 udp EMC SmartPackets-MAPI [Koen_Schoofs] [Koen_Schoofs] 2003-01 ++bmc-ea 3683 tcp BMC EDV/EA [Portnoy_Boxman] [Portnoy_Boxman] 2003-01 ++bmc-ea 3683 udp BMC EDV/EA [Portnoy_Boxman] [Portnoy_Boxman] 2003-01 ++faxstfx-port 3684 tcp FAXstfX [Alec_Carlson] [Alec_Carlson] 2003-01 ++faxstfx-port 3684 udp FAXstfX [Alec_Carlson] [Alec_Carlson] 2003-01 ++dsx-agent 3685 tcp DS Expert Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++dsx-agent 3685 udp DS Expert Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++tnmpv2 3686 tcp Trivial Network Management [Andrea_Premoli] [Andrea_Premoli] 2003-01 ++tnmpv2 3686 udp Trivial Network Management [Andrea_Premoli] [Andrea_Premoli] 2003-01 ++simple-push 3687 tcp simple-push ++simple-push 3687 udp simple-push ++simple-push-s 3688 tcp simple-push Secure [C_Enrique_Ortiz] [C_Enrique_Ortiz] 2003-01 ++simple-push-s 3688 udp simple-push Secure [C_Enrique_Ortiz] [C_Enrique_Ortiz] 2003-01 ++daap 3689 tcp Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, ++ Protocol (iTunes) Database ID, Machine Name, Password ++daap 3689 udp Digital Audio Access [Amandeep_Jawa] [Amandeep_Jawa] 2003-01 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID, ++ Protocol (iTunes) Database ID, Machine Name, Password ++svn 3690 tcp Subversion [Greg_Hudson_2] [Greg_Hudson_2] 2003-01 ++svn 3690 udp Subversion [Greg_Hudson_2] [Greg_Hudson_2] 2003-01 ++magaya-network 3691 tcp Magaya Network Port [Jesus_David_Rodrigue] [Jesus_David_Rodrigue] 2003-02 ++magaya-network 3691 udp Magaya Network Port [Jesus_David_Rodrigue] [Jesus_David_Rodrigue] 2003-02 ++intelsync 3692 tcp Brimstone IntelSync [Davey_Taylor] [Davey_Taylor] 2003-02 ++intelsync 3692 udp Brimstone IntelSync [Davey_Taylor] [Davey_Taylor] 2003-02 ++ 3693-3694 Unassigned 2007-04-05 ++bmc-data-coll 3695 tcp BMC Data Collection [Portnoy_Boxman] [Portnoy_Boxman] 2003-02 ++bmc-data-coll 3695 udp BMC Data Collection [Portnoy_Boxman] [Portnoy_Boxman] 2003-02 ++telnetcpcd 3696 tcp Telnet Com Port Control [Thomas_J_Pinkl] [Thomas_J_Pinkl] 2003-02 ++telnetcpcd 3696 udp Telnet Com Port Control [Thomas_J_Pinkl] [Thomas_J_Pinkl] 2003-02 ++nw-license 3697 tcp NavisWorks License System [Tim_Wiegand] [Tim_Wiegand] 2003-02 ++nw-license 3697 udp NavisWorks Licnese System [Tim_Wiegand] [Tim_Wiegand] 2003-02 ++sagectlpanel 3698 tcp SAGECTLPANEL [Mark_Gamble] [Mark_Gamble] 2003-02 ++sagectlpanel 3698 udp SAGECTLPANEL [Mark_Gamble] [Mark_Gamble] 2003-02 ++kpn-icw 3699 tcp Internet Call Waiting [B_J_Kortekaas] [B_J_Kortekaas] 2003-02 ++kpn-icw 3699 udp Internet Call Waiting [B_J_Kortekaas] [B_J_Kortekaas] 2003-02 ++lrs-paging 3700 tcp LRS NetPage [Geoffrey_Wossum] [Geoffrey_Wossum] 2003-02 ++lrs-paging 3700 udp LRS NetPage [Geoffrey_Wossum] [Geoffrey_Wossum] 2003-02 ++netcelera 3701 tcp NetCelera [Tarek_Nabhan] [Tarek_Nabhan] 2003-02 ++netcelera 3701 udp NetCelera [Tarek_Nabhan] [Tarek_Nabhan] 2003-02 ++ws-discovery 3702 tcp Web Service Discovery [Christian_Huitema_2] [Christian_Huitema_2] 2003-02 ++ws-discovery 3702 udp Web Service Discovery [Christian_Huitema_2] [Christian_Huitema_2] 2003-02 ++adobeserver-3 3703 tcp Adobe Server 3 ++adobeserver-3 3703 udp Adobe Server 3 ++adobeserver-4 3704 tcp Adobe Server 4 [Frank_Soetebeer] [Frank_Soetebeer] 2003-01 ++adobeserver-4 3704 udp Adobe Server 4 [Frank_Soetebeer] [Frank_Soetebeer] 2003-01 ++adobeserver-5 3705 tcp Adobe Server 5 [Bernd_Paradies] [Bernd_Paradies] 2008-01-14 ++adobeserver-5 3705 udp Adobe Server 5 [Bernd_Paradies] [Bernd_Paradies] 2008-01-14 ++rt-event 3706 tcp Real-Time Event Port ++rt-event 3706 udp Real-Time Event Port ++rt-event-s 3707 tcp Real-Time Event Secure Port [Terry_Gin] [Terry_Gin] 2003-02 ++rt-event-s 3707 udp Real-Time Event Secure Port [Terry_Gin] [Terry_Gin] 2003-02 ++sun-as-iiops 3708 tcp Sun App Svr - Naming [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++sun-as-iiops 3708 udp Sun App Svr - Naming [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++ca-idms 3709 tcp CA-IDMS Server [Dave_Ross] [Dave_Ross] ++ca-idms 3709 udp CA-IDMS Server [Dave_Ross] [Dave_Ross] ++portgate-auth 3710 tcp PortGate Authentication [Scott_Harris] [Scott_Harris] 2003-02 ++portgate-auth 3710 udp PortGate Authentication [Scott_Harris] [Scott_Harris] 2003-02 ++edb-server2 3711 tcp EBD Server 2 [Carlos_Portela] [Carlos_Portela] 2003-02 ++edb-server2 3711 udp EBD Server 2 [Carlos_Portela] [Carlos_Portela] 2003-02 ++sentinel-ent 3712 tcp Sentinel Enterprise [Ian_Gordon_2] [Ian_Gordon_2] 2003-03 ++sentinel-ent 3712 udp Sentinel Enterprise [Ian_Gordon_2] [Ian_Gordon_2] 2003-03 ++tftps 3713 tcp TFTP over TLS [Mark_mayernick] [Mark_mayernick] 2003-03 ++tftps 3713 udp TFTP over TLS [Mark_mayernick] [Mark_mayernick] 2003-03 ++delos-dms 3714 tcp DELOS Direct Messaging [Ekkehard_Morgenstern] [Ekkehard_Morgenstern] 2003-03 ++delos-dms 3714 udp DELOS Direct Messaging [Ekkehard_Morgenstern] [Ekkehard_Morgenstern] 2003-03 ++anoto-rendezv 3715 tcp Anoto Rendezvous Port [Ola_Sandstrom] [Ola_Sandstrom] 2003-03 ++anoto-rendezv 3715 udp Anoto Rendezvous Port [Ola_Sandstrom] [Ola_Sandstrom] 2003-03 ++wv-csp-sms-cir 3716 tcp WV CSP SMS CIR Channel ++wv-csp-sms-cir 3716 udp WV CSP SMS CIR Channel ++wv-csp-udp-cir 3717 tcp WV CSP UDP/IP CIR Channel [Jon_Ingi_Ingimundars] [Jon_Ingi_Ingimundars] 2003-03 ++wv-csp-udp-cir 3717 udp WV CSP UDP/IP CIR Channel [Jon_Ingi_Ingimundars] [Jon_Ingi_Ingimundars] 2003-03 ++opus-services 3718 tcp OPUS Server Port [Detlef_Stoever] [Detlef_Stoever] 2003-03 ++opus-services 3718 udp OPUS Server Port [Detlef_Stoever] [Detlef_Stoever] 2003-03 ++itelserverport 3719 tcp iTel Server Port [Mark_Hendricks] [Mark_Hendricks] 2003-03 ++itelserverport 3719 udp iTel Server Port [Mark_Hendricks] [Mark_Hendricks] 2003-03 ++ufastro-instr 3720 tcp UF Astro. Instr. Services [David_B_Hon] [David_B_Hon] 2003-03 ++ufastro-instr 3720 udp UF Astro. Instr. Services [David_B_Hon] [David_B_Hon] 2003-03 ++xsync 3721 tcp Xsync ++xsync 3721 udp Xsync ++xserveraid 3722 tcp Xserve RAID [Bob_Bradley] [Bob_Bradley] 2003-03 ++xserveraid 3722 udp Xserve RAID [Bob_Bradley] [Bob_Bradley] 2003-03 ++sychrond 3723 tcp Sychron Service Daemon [Robert_Marinelli] [Robert_Marinelli] 2003-03 ++sychrond 3723 udp Sychron Service Daemon [Robert_Marinelli] [Robert_Marinelli] 2003-03 ++blizwow 3724 tcp World of Warcraft [Domain_Tech] [Domain_Tech] 2005-04 ++blizwow 3724 udp World of Warcraft [Domain_Tech] [Domain_Tech] 2005-04 ++na-er-tip 3725 tcp Netia NA-ER Port [Jean_Pierre_Garcia] [Jean_Pierre_Garcia] 2003-04 ++na-er-tip 3725 udp Netia NA-ER Port [Jean_Pierre_Garcia] [Jean_Pierre_Garcia] 2003-04 ++array-manager 3726 tcp Xyratex Array Manager [David_A_Lethe] [David_A_Lethe] 2003-04 ++array-manager 3726 udp Xyartex Array Manager [David_A_Lethe] [David_A_Lethe] 2003-04 ++e-mdu 3727 tcp Ericsson Mobile Data Unit ++e-mdu 3727 udp Ericsson Mobile Data Unit ++e-woa 3728 tcp Ericsson Web on Air [Marco_Casole] [Marco_Casole] 2003-04 ++e-woa 3728 udp Ericsson Web on Air [Marco_Casole] [Marco_Casole] 2003-04 ++fksp-audit 3729 tcp Fireking Audit Port [Richard_Thurman] [Richard_Thurman] 2003-04 ++fksp-audit 3729 udp Fireking Audit Port [Richard_Thurman] [Richard_Thurman] 2003-04 ++client-ctrl 3730 tcp Client Control [Lawrence_W_Dunn] [Lawrence_W_Dunn] 2003-04 ++client-ctrl 3730 udp Client Control [Lawrence_W_Dunn] [Lawrence_W_Dunn] 2003-04 ++smap 3731 tcp Service Manager ++smap 3731 udp Service Manager ++m-wnn 3732 tcp Mobile Wnn [Yasunari_Yamashita] [Yasunari_Yamashita] 2003-04 ++m-wnn 3732 udp Mobile Wnn [Yasunari_Yamashita] [Yasunari_Yamashita] 2003-04 ++multip-msg 3733 tcp Multipuesto Msg Port [Felisa_Ares] [Felisa_Ares] 2003-04 ++multip-msg 3733 udp Multipuesto Msg Port [Felisa_Ares] [Felisa_Ares] 2003-04 ++synel-data 3734 tcp Synel Data Collection Port [David_Ashkenazi] [David_Ashkenazi] 2003-04 ++synel-data 3734 udp Synel Data Collection Port [David_Ashkenazi] [David_Ashkenazi] 2003-04 ++pwdis 3735 tcp Password Distribution [Robert_Erl] [Robert_Erl] 2003-04 ++pwdis 3735 udp Password Distribution [Robert_Erl] [Robert_Erl] 2003-04 ++rs-rmi 3736 tcp RealSpace RMI [Barry_McDarby] [Barry_McDarby] 2003-04 ++rs-rmi 3736 udp RealSpace RMI [Barry_McDarby] [Barry_McDarby] 2003-04 ++xpanel 3737 tcp XPanel Daemon [Lilian_Rudenco] [Lilian_Rudenco] 2009-03-04 ++ 3737 udp Reserved ++versatalk 3738 tcp versaTalk Server Port [Dr_Kingsley_C_Nwos] [Dr_Kingsley_C_Nwos] 2003-04 ++versatalk 3738 udp versaTalk Server Port [Dr_Kingsley_C_Nwos] [Dr_Kingsley_C_Nwos] 2003-04 ++launchbird-lm 3739 tcp Launchbird LicenseManager [Tom_Hawkins] [Tom_Hawkins] 2003-04 ++launchbird-lm 3739 udp Launchbird LicenseManager [Tom_Hawkins] [Tom_Hawkins] 2003-04 ++heartbeat 3740 tcp Heartbeat Protocol [Jeroen_Massar] [Jeroen_Massar] 2003-04 ++heartbeat 3740 udp Heartbeat Protocol [Jeroen_Massar] [Jeroen_Massar] 2003-04 ++wysdma 3741 tcp WysDM Agent [Jim_McDonald] [Jim_McDonald] 2003-04 ++wysdma 3741 udp WysDM Agent [Jim_McDonald] [Jim_McDonald] 2003-04 ++cst-port 3742 tcp CST - Configuration & [Hai_Ou_Yang] [Hai_Ou_Yang] 2003-04 ++ Service Tracker ++cst-port 3742 udp CST - Configuration & [Hai_Ou_Yang] [Hai_Ou_Yang] 2003-04 ++ Service Tracker ++ipcs-command 3743 tcp IP Control Systems Ltd. [Paul_Anderson] [Paul_Anderson] 2003-04 ++ipcs-command 3743 udp IP Control Systems Ltd. [Paul_Anderson] [Paul_Anderson] 2003-04 ++sasg 3744 tcp SASG [Cristian_Petculescu_2] [Cristian_Petculescu_2] 2003-04 ++sasg 3744 udp SASG [Cristian_Petculescu_2] [Cristian_Petculescu_2] 2003-04 ++gw-call-port 3745 tcp GWRTC Call Port [Felisa_Ares] [Felisa_Ares] 2003-04 ++gw-call-port 3745 udp GWRTC Call Port [Felisa_Ares] [Felisa_Ares] 2003-04 ++linktest 3746 tcp LXPRO.COM LinkTest ++linktest 3746 udp LXPRO.COM LinkTest ++linktest-s 3747 tcp LXPRO.COM LinkTest SSL [Greg_Bailey] [Greg_Bailey] 2003-04 ++linktest-s 3747 udp LXPRO.COM LinkTest SSL [Greg_Bailey] [Greg_Bailey] 2003-04 ++webdata 3748 tcp webData [Michael_Whiteley] [Michael_Whiteley] 2003-04 ++webdata 3748 udp webData [Michael_Whiteley] [Michael_Whiteley] 2003-04 ++cimtrak 3749 tcp CimTrak [Robert_E_Johnson_II] [Robert_E_Johnson_II] 2003-04 ++cimtrak 3749 udp CimTrak [Robert_E_Johnson_II] [Robert_E_Johnson_II] 2003-04 ++cbos-ip-port 3750 tcp CBOS/IP ncapsalation port [Thomas_Dannemiller] [Thomas_Dannemiller] 2003-04 ++cbos-ip-port 3750 udp CBOS/IP ncapsalatoin port [Thomas_Dannemiller] [Thomas_Dannemiller] 2003-04 ++gprs-cube 3751 tcp CommLinx GPRS Cube [Peter_Johnson] [Peter_Johnson] 2003-04 ++gprs-cube 3751 udp CommLinx GPRS Cube [Peter_Johnson] [Peter_Johnson] 2003-04 ++vipremoteagent 3752 tcp Vigil-IP RemoteAgent [Bryan_Alvord] [Bryan_Alvord] 2003-04 ++vipremoteagent 3752 udp Vigil-IP RemoteAgent [Bryan_Alvord] [Bryan_Alvord] 2003-04 ++nattyserver 3753 tcp NattyServer Port [Akira_Saito] [Akira_Saito] 2003-04 ++nattyserver 3753 udp NattyServer Port [Akira_Saito] [Akira_Saito] 2003-04 ++timestenbroker 3754 tcp TimesTen Broker Port [David_Aspinwall] [David_Aspinwall] 2003-04 ++timestenbroker 3754 udp TimesTen Broker Port [David_Aspinwall] [David_Aspinwall] 2003-04 ++sas-remote-hlp 3755 tcp SAS Remote Help Server [Gary_T_Ciampa] [Gary_T_Ciampa] 2003-04 ++sas-remote-hlp 3755 udp SAS Remote Help Server [Gary_T_Ciampa] [Gary_T_Ciampa] 2003-04 ++canon-capt 3756 tcp Canon CAPT Port [Takashi_Okazawa] [Takashi_Okazawa] 2003-04 ++canon-capt 3756 udp Canon CAPT Port [Takashi_Okazawa] [Takashi_Okazawa] 2003-04 ++grf-port 3757 tcp GRF Server Port [Robert_Banfill] [Robert_Banfill] 2003-04 ++grf-port 3757 udp GRF Server Port [Robert_Banfill] [Robert_Banfill] 2003-04 ++apw-registry 3758 tcp apw RMI registry [Dan_Davis] [Dan_Davis] 2003-04 ++apw-registry 3758 udp apw RMI registry [Dan_Davis] [Dan_Davis] 2003-04 ++exapt-lmgr 3759 tcp Exapt License Manager [Christoph_Kukulies] [Christoph_Kukulies] 2003-04 ++exapt-lmgr 3759 udp Exapt License Manager [Christoph_Kukulies] [Christoph_Kukulies] 2003-04 ++adtempusclient 3760 tcp adTempus Client [Bill_Wingate] [Bill_Wingate] 2003-05 ++adtempusclient 3760 udp adTEmpus Client [Bill_Wingate] [Bill_Wingate] 2003-05 ++gsakmp 3761 tcp gsakmp port [RFC4535] ++gsakmp 3761 udp gsakmp port [RFC4535] ++gbs-smp 3762 tcp GBS SnapMail Protocol [Eric_Harris_Braun] [Eric_Harris_Braun] 2003-06 ++gbs-smp 3762 udp GBS SnapMail Protocol [Eric_Harris_Braun] [Eric_Harris_Braun] 2003-06 ++xo-wave 3763 tcp XO Wave Control Port [Bjorn_Dittmer_Roche] [Bjorn_Dittmer_Roche] 2003-06 ++xo-wave 3763 udp XO Wave Control Port [Bjorn_Dittmer_Roche] [Bjorn_Dittmer_Roche] 2003-06 ++mni-prot-rout 3764 tcp MNI Protected Routing [Tim_Behne] [Tim_Behne] 2003-06 ++mni-prot-rout 3764 udp MNI Protected Routing [Tim_Behne] [Tim_Behne] 2003-06 ++rtraceroute 3765 tcp Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 ++rtraceroute 3765 udp Remote Traceroute [A_Blake_Cooper] [A_Blake_Cooper] 2003-06 ++ 3766 Unassigned 2009-06-19 ++listmgr-port 3767 tcp ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 ++listmgr-port 3767 udp ListMGR Port [Takashi_Kubota] [Takashi_Kubota] 2003-06 ++rblcheckd 3768 tcp rblcheckd server daemon [Sabri_Berisha] [Sabri_Berisha] 2003-06 ++rblcheckd 3768 udp rblcheckd server daemon [Sabri_Berisha] [Sabri_Berisha] 2003-06 ++haipe-otnk 3769 tcp HAIPE Network Keying [Mike_Irani_2] [Mike_Irani_2] 2003-06 ++haipe-otnk 3769 udp HAIPE Network Keying [Mike_Irani_2] [Mike_Irani_2] 2003-06 ++cindycollab 3770 tcp Cinderella Collaboration [Ulrich_Kortenkamp] [Ulrich_Kortenkamp] 2003-06 ++cindycollab 3770 udp Cinderella Collaboration [Ulrich_Kortenkamp] [Ulrich_Kortenkamp] 2003-06 ++paging-port 3771 tcp RTP Paging Port [Patrick_Ferriter] [Patrick_Ferriter] 2003-06 ++paging-port 3771 udp RTP Paging Port [Patrick_Ferriter] [Patrick_Ferriter] 2003-06 ++ctp 3772 tcp Chantry Tunnel Protocol [Inderpreet_Singh] [Inderpreet_Singh] 2003-06 ++ctp 3772 udp Chantry Tunnel Protocol [Inderpreet_Singh] [Inderpreet_Singh] 2003-06 ++ctdhercules 3773 tcp ctdhercules [Carl_Banzhof] [Carl_Banzhof] 2003-06 ++ctdhercules 3773 udp ctdhercules [Carl_Banzhof] [Carl_Banzhof] 2003-06 ++zicom 3774 tcp ZICOM [Sabu_Das] [Sabu_Das] 2003-06 ++zicom 3774 udp ZICOM [Sabu_Das] [Sabu_Das] 2003-06 ++ispmmgr 3775 tcp ISPM Manager Port [Eric_Anderson] [Eric_Anderson] 2003-06 ++ispmmgr 3775 udp ISPM Manager Port [Eric_Anderson] [Eric_Anderson] 2003-06 ++dvcprov-port 3776 tcp Device Provisioning Port [Rob_Lehew] [Rob_Lehew] 2003-06 ++dvcprov-port 3776 udp Device Provisioning Port [Rob_Lehew] [Rob_Lehew] 2003-06 ++jibe-eb 3777 tcp Jibe EdgeBurst [Chap_Tippin] [Chap_Tippin] 2003-06 ++jibe-eb 3777 udp Jibe EdgeBurst [Chap_Tippin] [Chap_Tippin] 2003-06 ++c-h-it-port 3778 tcp Cutler-Hammer IT Port [Thomas_Ruchti] [Thomas_Ruchti] 2003-06 ++c-h-it-port 3778 udp Cutler-Hammer IT Port [Thomas_Ruchti] [Thomas_Ruchti] 2003-06 ++cognima 3779 tcp Cognima Replication [Ralph_Greenwell] [Ralph_Greenwell] 2003-06 ++cognima 3779 udp Cognima Replication [Ralph_Greenwell] [Ralph_Greenwell] 2003-06 ++nnp 3780 tcp Nuzzler Network Protocol [Andreas_Schwarz_2] [Andreas_Schwarz_2] 2003-06 ++nnp 3780 udp Nuzzler Network Protocol [Andreas_Schwarz_2] [Andreas_Schwarz_2] 2003-06 ++abcvoice-port 3781 tcp ABCvoice server port [Carlos_Gonzalez_Roma] [Carlos_Gonzalez_Roma] 2003-06 ++abcvoice-port 3781 udp ABCvoice server port [Carlos_Gonzalez_Roma] [Carlos_Gonzalez_Roma] 2003-06 ++iso-tp0s 3782 tcp Secure ISO TP0 port [Herbert_Falk] [Herbert_Falk] 2003-06 ++iso-tp0s 3782 udp Secure ISO TP0 port [Herbert_Falk] [Herbert_Falk] 2003-06 ++bim-pem 3783 tcp Impact Mgr./PEM Gateway [Walter_G_Giroir] [Walter_G_Giroir] 2003-07 ++bim-pem 3783 udp Impact Mgr./PEM Gateway [Walter_G_Giroir] [Walter_G_Giroir] 2003-07 ++bfd-control 3784 tcp BFD Control Protocol [RFC5881] ++bfd-control 3784 udp BFD Control Protocol [RFC5881] ++bfd-echo 3785 tcp BFD Echo Protocol [RFC5881] ++bfd-echo 3785 udp BFD Echo Protocol [RFC5881] ++upstriggervsw 3786 tcp VSW Upstrigger port [Mark_Tim_Junghanns] [Mark_Tim_Junghanns] 2003-07 ++upstriggervsw 3786 udp VSW Upstrigger port [Mark_Tim_Junghanns] [Mark_Tim_Junghanns] 2003-07 ++fintrx 3787 tcp Fintrx [Peter_G_L_Potgiese] [Peter_G_L_Potgiese] 2003-07 ++fintrx 3787 udp Fintrx [Peter_G_L_Potgiese] [Peter_G_L_Potgiese] 2003-07 ++isrp-port 3788 tcp SPACEWAY Routing port [Vaibhav_Kumar] [Vaibhav_Kumar] 2003-07 ++isrp-port 3788 udp SPACEWAY Routing port [Vaibhav_Kumar] [Vaibhav_Kumar] 2003-07 ++remotedeploy 3789 tcp RemoteDeploy Administration [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++ Port [July 2003] ++remotedeploy 3789 udp RemoteDeploy Administration [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++ Port [July 2003] ++quickbooksrds 3790 tcp QuickBooks RDS [Almira] [Almira] 2003-07 ++quickbooksrds 3790 udp QuickBooks RDS [Almira] [Almira] 2003-07 ++tvnetworkvideo 3791 tcp TV NetworkVideo Data port [Kevin_Brunner] [Kevin_Brunner] 2003-07 ++tvnetworkvideo 3791 udp TV NetworkVideo Data port [Kevin_Brunner] [Kevin_Brunner] 2003-07 ++sitewatch 3792 tcp e-Watch Corporation [John_M_Baird] [John_M_Baird] 2003-07 ++ SiteWatch ++sitewatch 3792 udp e-Watch Corporation [John_M_Baird] [John_M_Baird] 2003-07 ++ SiteWatch ++dcsoftware 3793 tcp DataCore Software [Andre_Cato] [Andre_Cato] 2003-07 ++dcsoftware 3793 udp DataCore Software [Andre_Cato] [Andre_Cato] 2003-07 ++jaus 3794 tcp JAUS Robots [Steven_B_Cliff] [Steven_B_Cliff] 2003-07 ++jaus 3794 udp JAUS Robots [Steven_B_Cliff] [Steven_B_Cliff] 2003-07 ++myblast 3795 tcp myBLAST Mekentosj port [Alexander_Griekspoor] [Alexander_Griekspoor] 2003-07 ++myblast 3795 udp myBLAST Mekentosj port [Alexander_Griekspoor] [Alexander_Griekspoor] 2003-07 ++spw-dialer 3796 tcp Spaceway Dialer [Patrick_Fisher] [Patrick_Fisher] 2003-07 ++spw-dialer 3796 udp Spaceway Dialer [Patrick_Fisher] [Patrick_Fisher] 2003-07 ++idps 3797 tcp idps [Jean_Francois_Rabass] [Jean_Francois_Rabass] 2003-07 ++idps 3797 udp idps [Jean_Francois_Rabass] [Jean_Francois_Rabass] 2003-07 ++minilock 3798 tcp Minilock [Daniel_Julio_Reyes] [Daniel_Julio_Reyes] 2003-08 ++minilock 3798 udp Minilock [Daniel_Julio_Reyes] [Daniel_Julio_Reyes] 2003-08 ++radius-dynauth 3799 tcp RADIUS Dynamic Authorization [RFC3576] ++radius-dynauth 3799 udp RADIUS Dynamic Authorization [RFC3576] ++pwgpsi 3800 tcp Print Services Interface [Harry_Lewis] [Harry_Lewis] 2003-05 ++pwgpsi 3800 udp Print Services Interface [Harry_Lewis] [Harry_Lewis] 2003-05 ++ibm-mgr 3801 tcp ibm manager service [Tim_Hahn] [Tim_Hahn] 2006-03 ++ibm-mgr 3801 udp ibm manager service [Tim_Hahn] [Tim_Hahn] 2006-03 ++vhd 3802 tcp VHD [Chris_Duncombe] [Chris_Duncombe] ++vhd 3802 udp VHD [Chris_Duncombe] [Chris_Duncombe] ++soniqsync 3803 tcp SoniqSync [Ryan_Melville] [Ryan_Melville] 2004-01 ++soniqsync 3803 udp SoniqSync [Ryan_Melville] [Ryan_Melville] 2004-01 ++iqnet-port 3804 tcp Harman IQNet Port [Bruce_Vander_Werf] [Bruce_Vander_Werf] 2004-02 ++iqnet-port 3804 udp Harman IQNet Port [Bruce_Vander_Werf] [Bruce_Vander_Werf] 2004-02 ++tcpdataserver 3805 tcp ThorGuard Server Port [Joel_E_Steiger] [Joel_E_Steiger] 2004-02 ++tcpdataserver 3805 udp ThorGuard Server Port [Joel_E_Steiger] [Joel_E_Steiger] 2004-02 ++wsmlb 3806 tcp Remote System Manager [Thomas_Fiege] [Thomas_Fiege] 2004-02 ++wsmlb 3806 udp Remote System Manager [Thomas_Fiege] [Thomas_Fiege] 2004-02 ++spugna 3807 tcp SpuGNA Communication Port [Samuele_Sequi] [Samuele_Sequi] 2004-02 ++spugna 3807 udp SpuGNA Communication Port [Samuele_Sequi] [Samuele_Sequi] 2004-02 ++sun-as-iiops-ca 3808 tcp Sun App Svr-IIOPClntAuth [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++sun-as-iiops-ca 3808 udp Sun App Svr-IIOPClntAuth [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++apocd 3809 tcp Java Desktop System [Geoff_Higgins] [Geoff_Higgins] 2006-03 ++ Configuration Agent ++apocd 3809 udp Java Desktop System [Geoff_Higgins] [Geoff_Higgins] 2006-03 ++ Configuration Agent ++wlanauth 3810 tcp WLAN AS server [Bianling_Zhang] [Bianling_Zhang] 2004-02 ++wlanauth 3810 udp WLAN AS server [Bianling_Zhang] [Bianling_Zhang] 2004-02 ++amp 3811 tcp AMP [Northon_Rodrigues] [Northon_Rodrigues] 2004-02 ++amp 3811 udp AMP [Northon_Rodrigues] [Northon_Rodrigues] 2004-02 ++neto-wol-server 3812 tcp netO WOL Server [Martin_Bestmann_2] [Martin_Bestmann_2] 2004-03 ++neto-wol-server 3812 udp netO WOL Server [Martin_Bestmann_2] [Martin_Bestmann_2] 2004-03 ++rap-ip 3813 tcp Rhapsody Interface Protocol [Paul_Zander] [Paul_Zander] 2004-03 ++rap-ip 3813 udp Rhapsody Interface Protocol [Paul_Zander] [Paul_Zander] 2004-03 ++neto-dcs 3814 tcp netO DCS [Martin_Bestmann_2] [Martin_Bestmann_2] 2004-03 ++neto-dcs 3814 udp netO DCS [Martin_Bestmann_2] [Martin_Bestmann_2] 2004-03 ++lansurveyorxml 3815 tcp LANsurveyor XML [Michael_Swan] [Michael_Swan] 2004-04 ++lansurveyorxml 3815 udp LANsurveyor XML [Michael_Swan] [Michael_Swan] 2004-04 ++sunlps-http 3816 tcp Sun Local Patch Server [Barry_Greenberg] [Barry_Greenberg] 2004-04 ++sunlps-http 3816 udp Sun Local Patch Server [Barry_Greenberg] [Barry_Greenberg] 2004-04 ++tapeware 3817 tcp Yosemite Tech Tapeware [Luke_Dion] [Luke_Dion] 2004-04 ++tapeware 3817 udp Yosemite Tech Tapeware [Luke_Dion] [Luke_Dion] 2004-04 ++crinis-hb 3818 tcp Crinis Heartbeat [Eric_McMurry] [Eric_McMurry] 2004-04 ++crinis-hb 3818 udp Crinis Heartbeat [Eric_McMurry] [Eric_McMurry] 2004-04 ++epl-slp 3819 tcp EPL Sequ Layer Protocol [Hans_Weibel] [Hans_Weibel] 2004-10 ++epl-slp 3819 udp EPL Sequ Layer Protocol [Hans_Weibel] [Hans_Weibel] 2004-10 ++scp 3820 tcp Siemens AuD SCP [Johann_Arnold] [Johann_Arnold] 2004-10 ++scp 3820 udp Siemens AuD SCP [Johann_Arnold] [Johann_Arnold] 2004-10 ++pmcp 3821 tcp ATSC PMCP Standard [Graham_Jones] [Graham_Jones] 2004-11 ++pmcp 3821 udp ATSC PMCP Standard [Graham_Jones] [Graham_Jones] 2004-11 ++acp-discovery 3822 tcp Compute Pool Discovery ++acp-discovery 3822 udp Compute Pool Discovery ++acp-conduit 3823 tcp Compute Pool Conduit ++acp-conduit 3823 udp Compute Pool Conduit ++acp-policy 3824 tcp Compute Pool Policy [Andy_Belk_2] [Andy_Belk_2] 2005-02 ++acp-policy 3824 udp Compute Pool Policy [Andy_Belk_2] [Andy_Belk_2] 2005-02 ++ffserver 3825 tcp Antera FlowFusion Process [Armin_Liebchen] [Armin_Liebchen] 2007-06 ++ Simulation ++ffserver 3825 udp Antera FlowFusion Process [Armin_Liebchen] [Armin_Liebchen] 2007-06 ++ Simulation ++warmux 3826 tcp WarMUX game server [Christophe_Gisquet] [Christophe_Gisquet] 2011-05-26 ++warmux 3826 udp WarMUX game server [Christophe_Gisquet] [Christophe_Gisquet] 2011-05-26 ++netmpi 3827 tcp Netadmin Systems MPI service [G_Runfeldt] [G_Runfeldt] 2007-07-10 ++netmpi 3827 udp Netadmin Systems MPI service [G_Runfeldt] [G_Runfeldt] 2007-07-10 ++neteh 3828 tcp Netadmin Systems Event ++ Handler ++neteh 3828 udp Netadmin Systems Event ++ Handler ++neteh-ext 3829 tcp Netadmin Systems Event [Jonas_Krogell] [Jonas_Krogell] 2007-07-10 ++ Handler External ++neteh-ext 3829 udp Netadmin Systems Event [Jonas_Krogell] [Jonas_Krogell] 2007-07-10 ++ Handler External ++cernsysmgmtagt 3830 tcp Cerner System Management [Mike_Craft] [Mike_Craft] 2008-01-29 ++ Agent ++cernsysmgmtagt 3830 udp Cerner System Management [Mike_Craft] [Mike_Craft] 2008-01-29 ++ Agent ++dvapps 3831 tcp Docsvault Application [Ketul_Patel] [Ketul_Patel] 2006-10 ++ Service ++dvapps 3831 udp Docsvault Application [Ketul_Patel] [Ketul_Patel] 2006-10 ++ Service ++xxnetserver 3832 tcp xxNETserver [Lawrence_R_Bulduc] [Lawrence_R_Bulduc] 2006-10 ++xxnetserver 3832 udp xxNETserver [Lawrence_R_Bulduc] [Lawrence_R_Bulduc] 2006-10 ++aipn-auth 3833 tcp AIPN LS Authentication [Qiang_Zhang] [Qiang_Zhang] 2006-10 ++aipn-auth 3833 udp AIPN LS Authentication [Qiang_Zhang] [Qiang_Zhang] 2006-10 ++spectardata 3834 tcp Spectar Data Stream Service ++spectardata 3834 udp Spectar Data Stream Service ++spectardb 3835 tcp Spectar Database Rights [Jan_Rutger_Voorhorst] [Jan_Rutger_Voorhorst] 2006-10 ++ Service ++spectardb 3835 udp Spectar Database Rights [Jan_Rutger_Voorhorst] [Jan_Rutger_Voorhorst] 2006-10 ++ Service ++markem-dcp 3836 tcp MARKEM NEXTGEN DCP ++markem-dcp 3836 udp MARKEM NEXTGEN DCP ++mkm-discovery 3837 tcp MARKEM Auto-Discovery [Vadym_Kargin] [Vadym_Kargin] 2005-08 ++mkm-discovery 3837 udp MARKEM Auto-Discovery [Vadym_Kargin] [Vadym_Kargin] 2005-08 ++sos 3838 tcp Scito Object Server [Arno_Klaassen] [Arno_Klaassen] 2003-11 ++sos 3838 udp Scito Object Server [Arno_Klaassen] [Arno_Klaassen] 2003-11 ++amx-rms 3839 tcp AMX Resource Management [Ron_Barber] [Ron_Barber] 2003-11 ++ Suite ++amx-rms 3839 udp AMX Resource Management [Ron_Barber] [Ron_Barber] 2003-11 ++ Suite ++flirtmitmir 3840 tcp www.FlirtMitMir.de [Carsten_Falticska] [Carsten_Falticska] 2003-11 ++flirtmitmir 3840 udp www.FlirtMitMir.de [Carsten_Falticska] [Carsten_Falticska] 2003-11 ++zfirm-shiprush3 3841 tcp Z-Firm ShipRush v3 [Rafael_Zimberoff] [Rafael_Zimberoff] 2003-11 ++zfirm-shiprush3 3841 udp Z-Firm ShipRush v3 [Rafael_Zimberoff] [Rafael_Zimberoff] 2003-11 ++nhci 3842 tcp NHCI status port [Eric_Welch_2] [Eric_Welch_2] 2003-11 ++nhci 3842 udp NHCI status port [Eric_Welch_2] [Eric_Welch_2] 2003-11 ++quest-agent 3843 tcp Quest Common Agent [Peter_Maher] [Peter_Maher] 2003-11 ++quest-agent 3843 udp Quest Common Agent [Peter_Maher] [Peter_Maher] 2003-11 ++rnm 3844 tcp RNM [sn_w_of_renegade_lab] [sn_w_of_renegade_lab] 2003-11 ++rnm 3844 udp RNM [sn_w_of_renegade_lab] [sn_w_of_renegade_lab] 2003-11 ++v-one-spp 3845 tcp V-ONE Single Port Proxy [Daniel_Becker_3] [Daniel_Becker_3] ++v-one-spp 3845 udp V-ONE Single Port Proxy [Daniel_Becker_3] [Daniel_Becker_3] ++an-pcp 3846 tcp Astare Network PCP [Tony_Gulino] [Tony_Gulino] 2003-08 ++an-pcp 3846 udp Astare Network PCP [Tony_Gulino] [Tony_Gulino] 2003-08 ++msfw-control 3847 tcp MS Firewall Control [Oren_Trutner] [Oren_Trutner] 2003-08 ++msfw-control 3847 udp MS Firewall Control [Oren_Trutner] [Oren_Trutner] 2003-08 ++item 3848 tcp IT Environmental Monitor [Keith_Wright] [Keith_Wright] 2003-08 ++item 3848 udp IT Environmental Monitor [Keith_Wright] [Keith_Wright] 2003-08 ++spw-dnspreload 3849 tcp SPACEWAY DNS Preload [Daniel_Friedman] [Daniel_Friedman] 2003-08 ++spw-dnspreload 3849 udp SPACEWAY DNS Prelaod [Daniel_Friedman] [Daniel_Friedman] 2003-08 ++qtms-bootstrap 3850 tcp QTMS Bootstrap Protocol [Phil_Willis] [Phil_Willis] 2003-08 ++qtms-bootstrap 3850 udp QTMS Bootstrap Protocol [Phil_Willis] [Phil_Willis] 2003-08 ++spectraport 3851 tcp SpectraTalk Port [Madhav_Karhade] [Madhav_Karhade] 2003-08 ++spectraport 3851 udp SpectraTalk Port [Madhav_Karhade] [Madhav_Karhade] 2003-08 ++sse-app-config 3852 tcp SSE App Configuration [Tim_Wilson] [Tim_Wilson] 2003-08 ++sse-app-config 3852 udp SSE App Configuration [Tim_Wilson] [Tim_Wilson] 2003-08 ++sscan 3853 tcp SONY scanning protocol [Takashi_Aihara] [Takashi_Aihara] 2003-08 ++sscan 3853 udp SONY scanning protocol [Takashi_Aihara] [Takashi_Aihara] 2003-08 ++stryker-com 3854 tcp Stryker Comm Port [Andrew_Schultz] [Andrew_Schultz] 2003-08 ++stryker-com 3854 udp Stryker Comm Port [Andrew_Schultz] [Andrew_Schultz] 2003-08 ++opentrac 3855 tcp OpenTRAC [Scott_Miller] [Scott_Miller] 2003-08 ++opentrac 3855 udp OpenTRAC [Scott_Miller] [Scott_Miller] 2003-08 ++informer 3856 tcp INFORMER [Filippo_Fadda] [Filippo_Fadda] 2003-08 ++informer 3856 udp INFORMER [Filippo_Fadda] [Filippo_Fadda] 2003-08 ++trap-port 3857 tcp Trap Port [Norm_Freedman] [Norm_Freedman] 2003-08 ++trap-port 3857 udp Trap Port [Norm_Freedman] [Norm_Freedman] 2003-08 ++trap-port-mom 3858 tcp Trap Port MOM [Norm_Freedman] [Norm_Freedman] 2003-08 ++trap-port-mom 3858 udp Trap Port MOM [Norm_Freedman] [Norm_Freedman] 2003-08 ++nav-port 3859 tcp Navini Port [Chris_Sanders] [Chris_Sanders] 2003-08 ++nav-port 3859 udp Navini Port [Chris_Sanders] [Chris_Sanders] 2003-08 ++sasp 3860 tcp Server/Application State [Alan_Bivens] [Alan_Bivens] 2003-08 ++ Protocol (SASP) ++sasp 3860 udp Server/Application State [Alan_Bivens] [Alan_Bivens] 2003-08 ++ Protocol (SASP) ++winshadow-hd 3861 tcp winShadow Host Discovery [Shu_Wei_Tan] [Shu_Wei_Tan] 2003-03 ++winshadow-hd 3861 udp winShadow Host Discovery [Shu_Wei_Tan] [Shu_Wei_Tan] 2003-03 ++giga-pocket 3862 tcp GIGA-POCKET [Yoshikazu_Watanabe] [Yoshikazu_Watanabe] ++giga-pocket 3862 udp GIGA-POCKET [Yoshikazu_Watanabe] [Yoshikazu_Watanabe] ++asap-tcp 3863 tcp asap tcp port ++asap-udp 3863 udp asap udp port [RFC5352] ++asap-sctp 3863 sctp asap sctp [RFC5352] ++asap-tcp-tls 3864 tcp asap/tls tcp port [RFC5352] ++ 3864 udp Reserved This entry has been removed on 2006-06-23. ++asap-sctp-tls 3864 sctp asap-sctp/tls [RFC5352] ++xpl 3865 tcp xpl automation protocol [Ian_Lowe] [Ian_Lowe] 2003-08 ++xpl 3865 udp xpl automation protocol [Ian_Lowe] [Ian_Lowe] 2003-08 ++dzdaemon 3866 tcp Sun SDViz DZDAEMON Port [Kevin_Rushforth] [Kevin_Rushforth] 2003-08 ++dzdaemon 3866 udp Sun SDViz DZDAEMON Port [Kevin_Rushforth] [Kevin_Rushforth] 2003-08 ++dzoglserver 3867 tcp Sun SDViz DZOGLSERVER Port [Kevin_Rushforth] [Kevin_Rushforth] 2003-08 ++dzoglserver 3867 udp Sun SDViz DZOGLSERVER Port [Kevin_Rushforth] [Kevin_Rushforth] 2003-08 ++diameter 3868 tcp DIAMETER ++ 3868 udp Reserved ++diameter 3868 sctp DIAMETER [RFC3588] ++ovsam-mgmt 3869 tcp hp OVSAM MgmtServer Disco [Mike_Pontillo] [Mike_Pontillo] 2003-08 ++ovsam-mgmt 3869 udp hp OVSAM MgmtServer Disco [Mike_Pontillo] [Mike_Pontillo] 2003-08 ++ovsam-d-agent 3870 tcp hp OVSAM HostAgent Disco [Mike_Pontillo] [Mike_Pontillo] 2003-08 ++ovsam-d-agent 3870 udp hp OVSAM HostAgent Disco [Mike_Pontillo] [Mike_Pontillo] 2003-08 ++avocent-adsap 3871 tcp Avocent DS Authorization [Eduardo_Fernandez] [Eduardo_Fernandez] 2003-08 ++avocent-adsap 3871 udp Avocent DS Authorization [Eduardo_Fernandez] [Eduardo_Fernandez] 2003-08 ++oem-agent 3872 tcp OEM Agent [Narain_Jagathesan] [Narain_Jagathesan] 2003-11 ++oem-agent 3872 udp OEM Agent [Narain_Jagathesan] [Narain_Jagathesan] 2003-11 ++fagordnc 3873 tcp fagordnc [Luis_Zugasti] [Luis_Zugasti] 2003-11 ++fagordnc 3873 udp fagordnc [Luis_Zugasti] [Luis_Zugasti] 2003-11 ++sixxsconfig 3874 tcp SixXS Configuration [Jeroen_Massar] [Jeroen_Massar] 2003-11 ++sixxsconfig 3874 udp SixXS Configuration [Jeroen_Massar] [Jeroen_Massar] 2003-11 ++pnbscada 3875 tcp PNBSCADA [Philip_N_Bergstress] [Philip_N_Bergstress] ++pnbscada 3875 udp PNBSCADA [Philip_N_Bergstress] [Philip_N_Bergstress] ++ DirectoryLockdown Agent ++ ++dl-agent 3876 tcp IANA assigned this [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++ well-formed service name as ++ a replacement for ++ "dl_agent". ++ This entry is an alias to "dl-agent". This entry is now ++dl_agent 3876 tcp DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service ++ discovery mechanisms. ++ DirectoryLockdown Agent ++ ++dl-agent 3876 udp IANA assigned this [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 ++ well-formed service name as ++ a replacement for ++ "dl_agent". ++ This entry is an alias to "dl-agent". This entry is now ++dl_agent 3876 udp DirectoryLockdown Agent [Jason_Lockett][Melanie_Kacerek] [Jason_Lockett][Melanie_Kacerek] 2008-12-16 historic, not usable for use with many common service ++ discovery mechanisms. ++xmpcr-interface 3877 tcp XMPCR Interface Port [Christopher_Carlson] [Christopher_Carlson] 2003-10 ++xmpcr-interface 3877 udp XMPCR Interface Port [Christopher_Carlson] [Christopher_Carlson] 2003-10 ++fotogcad 3878 tcp FotoG CAD interface [Jason_Szabo] [Jason_Szabo] 2003-10 ++fotogcad 3878 udp FotoG CAD interface [Jason_Szabo] [Jason_Szabo] 2003-10 ++appss-lm 3879 tcp appss license manager [Peter_Krueger] [Peter_Krueger] 2003-10 ++appss-lm 3879 udp appss license manager [Peter_Krueger] [Peter_Krueger] 2003-10 ++igrs 3880 tcp IGRS [Huang_Jingnan] [Huang_Jingnan] 2003-10 ++igrs 3880 udp IGRS [Huang_Jingnan] [Huang_Jingnan] 2003-10 ++idac 3881 tcp Data Acquisition and Control [Chatziandreoglou_Chr] [Chatziandreoglou_Chr] 2003-10 ++idac 3881 udp Data Acquisition and Control [Chatziandreoglou_Chr] [Chatziandreoglou_Chr] 2003-10 ++msdts1 3882 tcp DTS Service Port [Sergei_Ivanov] [Sergei_Ivanov] 2003-10 ++msdts1 3882 udp DTS Service Port [Sergei_Ivanov] [Sergei_Ivanov] 2003-10 ++vrpn 3883 tcp VR Peripheral Network [Russell_M_Taylor_II] [Russell_M_Taylor_II] 2003-10 ++vrpn 3883 udp VR Peripheral Network [Russell_M_Taylor_II] [Russell_M_Taylor_II] 2003-10 ++softrack-meter 3884 tcp SofTrack Metering [John_T_McCann] [John_T_McCann] 2003-10 ++softrack-meter 3884 udp SofTrack Metering [John_T_McCann] [John_T_McCann] 2003-10 ++topflow-ssl 3885 tcp TopFlow SSL [Ken_Nelson] [Ken_Nelson] ++topflow-ssl 3885 udp TopFlow SSL [Ken_Nelson] [Ken_Nelson] ++nei-management 3886 tcp NEI management port [Kevin_Murphy_2] [Kevin_Murphy_2] 2003-10 ++nei-management 3886 udp NEI management port [Kevin_Murphy_2] [Kevin_Murphy_2] 2003-10 ++ciphire-data 3887 tcp Ciphire Data Transport [Lars_Eilebrecht] [Lars_Eilebrecht] 2003-10 ++ciphire-data 3887 udp Ciphire Data Transport [Lars_Eilebrecht] [Lars_Eilebrecht] 2003-10 ++ciphire-serv 3888 tcp Ciphire Services [Lars_Eilebrecht] [Lars_Eilebrecht] 2003-10 ++ciphire-serv 3888 udp Ciphire Services [Lars_Eilebrecht] [Lars_Eilebrecht] 2003-10 ++dandv-tester 3889 tcp D and V Tester Control Port [Voiko_Loukanov] [Voiko_Loukanov] 2003-10 ++dandv-tester 3889 udp D and V Tester Control Port [Voiko_Loukanov] [Voiko_Loukanov] 2003-10 ++ndsconnect 3890 tcp Niche Data Server Connect [Roland_Schneider] [Roland_Schneider] 2003-10 ++ndsconnect 3890 udp Niche Data Server Connect [Roland_Schneider] [Roland_Schneider] 2003-10 ++rtc-pm-port 3891 tcp Oracle RTC-PM port [PV_Shivkumar] [PV_Shivkumar] 2003-10 ++rtc-pm-port 3891 udp Oracle RTC-PM port [PV_Shivkumar] [PV_Shivkumar] 2003-10 ++pcc-image-port 3892 tcp PCC-image-port [Shiro_Tamoto] [Shiro_Tamoto] 2003-10 ++pcc-image-port 3892 udp PCC-image-port [Shiro_Tamoto] [Shiro_Tamoto] 2003-10 ++cgi-starapi 3893 tcp CGI StarAPI Server [Garry_Moore] [Garry_Moore] 2003-10 ++cgi-starapi 3893 udp CGI StarAPI Server [Garry_Moore] [Garry_Moore] 2003-10 ++syam-agent 3894 tcp SyAM Agent Port [Michael_Daniele] [Michael_Daniele] 2003-10 ++syam-agent 3894 udp SyAM Agent Port [Michael_Daniele] [Michael_Daniele] 2003-10 ++syam-smc 3895 tcp SyAm SMC Service Port [Michael_Daniele] [Michael_Daniele] 2003-10 ++syam-smc 3895 udp SyAm SMC Service Port [Michael_Daniele] [Michael_Daniele] 2003-10 ++sdo-tls 3896 tcp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2003-10 ++ over TLS ++sdo-tls 3896 udp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2003-10 ++ over TLS ++sdo-ssh 3897 tcp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2003-10 ++ over SSH ++sdo-ssh 3897 udp Simple Distributed Objects [Alexander_Philippou] [Alexander_Philippou] 2003-10 ++ over SSH ++senip 3898 tcp IAS, Inc. SmartEye NET [Matt_Nowicki] [Matt_Nowicki] 2003-10 ++ Internet Protocol ++senip 3898 udp IAS, Inc. SmartEye NET [Matt_Nowicki] [Matt_Nowicki] 2003-10 ++ Internet Protocol ++itv-control 3899 tcp ITV Port [Alex_Nicu] [Alex_Nicu] 2003-10 ++itv-control 3899 udp ITV Port [Alex_Nicu] [Alex_Nicu] 2003-10 ++ Unidata UDT OS ++ ++udt-os 3900 tcp IANA assigned this [James_Powell] [James_Powell] ++ well-formed service name as ++ a replacement for "udt_os". ++ This entry is an alias to "udt-os". This entry is now ++udt_os 3900 tcp Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service ++ discovery mechanisms. ++ Unidata UDT OS ++ ++udt-os 3900 udp IANA assigned this [James_Powell] [James_Powell] ++ well-formed service name as ++ a replacement for "udt_os". ++ This entry is an alias to "udt-os". This entry is now ++udt_os 3900 udp Unidata UDT OS [James_Powell] [James_Powell] historic, not usable for use with many common service ++ discovery mechanisms. ++nimsh 3901 tcp NIM Service Handler [Paul_B_Finley] [Paul_B_Finley] 2003-10 ++nimsh 3901 udp NIM Service Handler [Paul_B_Finley] [Paul_B_Finley] 2003-10 ++nimaux 3902 tcp NIMsh Auxiliary Port [Paul_B_Finley] [Paul_B_Finley] 2003-10 ++nimaux 3902 udp NIMsh Auxiliary Port [Paul_B_Finley] [Paul_B_Finley] 2003-10 ++charsetmgr 3903 tcp CharsetMGR [Tatsuya_Ueda] [Tatsuya_Ueda] 2003-10 ++charsetmgr 3903 udp CharsetMGR [Tatsuya_Ueda] [Tatsuya_Ueda] 2003-10 ++omnilink-port 3904 tcp Arnet Omnilink Port [Ronen_Shaul] [Ronen_Shaul] 2003-10 ++omnilink-port 3904 udp Arnet Omnilink Port [Ronen_Shaul] [Ronen_Shaul] 2003-10 ++mupdate 3905 tcp Mailbox Update (MUPDATE) [RFC3656] ++ protocol ++mupdate 3905 udp Mailbox Update (MUPDATE) [RFC3656] ++ protocol ++topovista-data 3906 tcp TopoVista elevation data [Gregg_Townsend] [Gregg_Townsend] 2003-11 ++topovista-data 3906 udp TopoVista elevation data [Gregg_Townsend] [Gregg_Townsend] 2003-11 ++imoguia-port 3907 tcp Imoguia Port [Emidio_Cunha] [Emidio_Cunha] 2003-11 ++imoguia-port 3907 udp Imoguia Port [Emidio_Cunha] [Emidio_Cunha] 2003-11 ++hppronetman 3908 tcp HP Procurve NetManagement [Devon_Dawson] [Devon_Dawson] 2003-11 ++hppronetman 3908 udp HP Procurve NetManagement [Devon_Dawson] [Devon_Dawson] 2003-11 ++surfcontrolcpa 3909 tcp SurfControl CPA [Hywel_Morgan] [Hywel_Morgan] 2003-11 ++surfcontrolcpa 3909 udp SurfControl CPA [Hywel_Morgan] [Hywel_Morgan] 2003-11 ++prnrequest 3910 tcp Printer Request Port [Brett_Green] [Brett_Green] 2003-11 ++prnrequest 3910 udp Printer Request Port [Brett_Green] [Brett_Green] 2003-11 ++prnstatus 3911 tcp Printer Status Port [Brett_Green] [Brett_Green] 2003-11 ++prnstatus 3911 udp Printer Status Port [Brett_Green] [Brett_Green] 2003-11 ++gbmt-stars 3912 tcp Global Maintech Stars [Harry_Goldschmitt] [Harry_Goldschmitt] 2003-11 ++gbmt-stars 3912 udp Global Maintech Stars [Harry_Goldschmitt] [Harry_Goldschmitt] 2003-11 ++listcrt-port 3913 tcp ListCREATOR Port [Tomokazu_Asai] [Tomokazu_Asai] 2003-11 ++listcrt-port 3913 udp ListCREATOR Port [Tomokazu_Asai] [Tomokazu_Asai] 2003-11 ++listcrt-port-2 3914 tcp ListCREATOR Port 2 [Tomokazu_Asai] [Tomokazu_Asai] 2003-11 ++listcrt-port-2 3914 udp ListCREATOR Port 2 [Tomokazu_Asai] [Tomokazu_Asai] 2003-11 ++agcat 3915 tcp Auto-Graphics Cataloging [Paul_Cope] [Paul_Cope] 2003-11 ++agcat 3915 udp Auto-Graphics Cataloging [Paul_Cope] [Paul_Cope] 2003-11 ++wysdmc 3916 tcp WysDM Controller [Jim_McDonald_2] [Jim_McDonald_2] 2003-11 ++wysdmc 3916 udp WysDM Controller [Jim_McDonald_2] [Jim_McDonald_2] 2003-11 ++aftmux 3917 tcp AFT multiplex port [Alfred_Schmidt] [Alfred_Schmidt] 2003-11 ++aftmux 3917 udp AFT multiples port [Alfred_Schmidt] [Alfred_Schmidt] 2003-11 ++pktcablemmcops 3918 tcp PacketCableMultimediaCOPS [Eric_Rosenfeld] [Eric_Rosenfeld] 2003-11 ++pktcablemmcops 3918 udp PacketCableMultimediaCOPS [Eric_Rosenfeld] [Eric_Rosenfeld] 2003-11 ++hyperip 3919 tcp HyperIP [Dave_Reiland] [Dave_Reiland] 2003-11 ++hyperip 3919 udp HyperIP [Dave_Reiland] [Dave_Reiland] 2003-11 ++exasoftport1 3920 tcp Exasoft IP Port [Alan_Malik] [Alan_Malik] 2003-11 ++exasoftport1 3920 udp Exasoft IP Port [Alan_Malik] [Alan_Malik] 2003-11 ++herodotus-net 3921 tcp Herodotus Net [Adam_Gawne_Cain] [Adam_Gawne_Cain] 2003-11 ++herodotus-net 3921 udp Herodotus Net [Adam_Gawne_Cain] [Adam_Gawne_Cain] 2003-11 ++sor-update 3922 tcp Soronti Update Port [Carleton_Watkins] [Carleton_Watkins] 2003-11 ++sor-update 3922 udp Soronti Update Port [Carleton_Watkins] [Carleton_Watkins] 2003-11 ++symb-sb-port 3923 tcp Symbian Service Broker [Ian_McDowall] [Ian_McDowall] 2003-11 ++symb-sb-port 3923 udp Symbian Service Broker [Ian_McDowall] [Ian_McDowall] 2003-11 ++mpl-gprs-port 3924 tcp MPL_GPRS_PORT [David_Barrass_2] [David_Barrass_2] 2003-11 ++mpl-gprs-port 3924 udp MPL_GPRS_Port [David_Barrass_2] [David_Barrass_2] 2003-11 ++zmp 3925 tcp Zoran Media Port [Gerard_Cerchio] [Gerard_Cerchio] 2003-11 ++zmp 3925 udp Zoran Media Port [Gerard_Cerchio] [Gerard_Cerchio] 2003-11 ++winport 3926 tcp WINPort [Alwin_Egger] [Alwin_Egger] 2003-11 ++winport 3926 udp WINPort [Alwin_Egger] [Alwin_Egger] 2003-11 ++natdataservice 3927 tcp ScsTsr [Ghanshyam_Patel] [Ghanshyam_Patel] 2003-11 ++natdataservice 3927 udp ScsTsr [Ghanshyam_Patel] [Ghanshyam_Patel] 2003-11 ++netboot-pxe 3928 tcp PXE NetBoot Manager [Markus_Treinen] [Markus_Treinen] 2003-11 ++netboot-pxe 3928 udp PXE NetBoot Manager [Markus_Treinen] [Markus_Treinen] 2003-11 ++smauth-port 3929 tcp AMS Port [Angelique_Dokos] [Angelique_Dokos] 2003-11 ++smauth-port 3929 udp AMS Port [Angelique_Dokos] [Angelique_Dokos] 2003-11 ++syam-webserver 3930 tcp Syam Web Server Port [Michael_Daniele] [Michael_Daniele] 2003-11 ++syam-webserver 3930 udp Syam Web Server Port [Michael_Daniele] [Michael_Daniele] 2003-11 ++msr-plugin-port 3931 tcp MSR Plugin Port [Ron_Steed] [Ron_Steed] 2003-11 ++msr-plugin-port 3931 udp MSR Plugin Port [Ron_Steed] [Ron_Steed] 2003-11 ++dyn-site 3932 tcp Dynamic Site System [Steve_Qi] [Steve_Qi] 2003-11 ++dyn-site 3932 udp Dynamic Site System [Steve_Qi] [Steve_Qi] 2003-11 ++plbserve-port 3933 tcp PL/B App Server User Port [Edward_R_Boedecker] [Edward_R_Boedecker] 2003-11 ++plbserve-port 3933 udp PL/B App Server User Port [Edward_R_Boedecker] [Edward_R_Boedecker] 2003-11 ++sunfm-port 3934 tcp PL/B File Manager Port [Edward_R_Boedecker] [Edward_R_Boedecker] 2003-11 ++sunfm-port 3934 udp PL/B File Manager Port [Edward_R_Boedecker] [Edward_R_Boedecker] 2003-11 ++sdp-portmapper 3935 tcp SDP Port Mapper Protocol [James_Pinkerton] [James_Pinkerton] 2003-11 ++sdp-portmapper 3935 udp SDP Port Mapper Protocol [James_Pinkerton] [James_Pinkerton] 2003-11 ++mailprox 3936 tcp Mailprox [Christof_Drescher] [Christof_Drescher] 2003-11 ++mailprox 3936 udp Mailprox [Christof_Drescher] [Christof_Drescher] 2003-11 ++dvbservdsc 3937 tcp DVB Service Discovery [Bert_van_Willigen][Peter_MacAvock] [Bert_van_Willigen][Peter_MacAvock] 2003-11 ++dvbservdsc 3937 udp DVB Service Discovery [Bert_van_Willigen][Peter_MacAvock] [Bert_van_Willigen][Peter_MacAvock] 2003-11 ++ Oracle dbControl Agent po ++ ++dbcontrol-agent 3938 tcp IANA assigned this [Todd_Guay] [Todd_Guay] 2003-11 ++ well-formed service name as ++ a replacement for ++ "dbcontrol_agent". ++ This entry is an alias to "dbcontrol-agent". This entry is ++dbcontrol_agent 3938 tcp Oracle dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service ++ discovery mechanisms. ++ Oracel dbControl Agent po ++ ++dbcontrol-agent 3938 udp IANA assigned this [Todd_Guay] [Todd_Guay] 2003-11 ++ well-formed service name as ++ a replacement for ++ "dbcontrol_agent". ++ This entry is an alias to "dbcontrol-agent". This entry is ++dbcontrol_agent 3938 udp Oracel dbControl Agent po [Todd_Guay] [Todd_Guay] 2003-11 now historic, not usable for use with many common service ++ discovery mechanisms. ++aamp 3939 tcp Anti-virus Application [In_sik_Choi] [In_sik_Choi] 2002-02 ++ Management Port ++aamp 3939 udp Anti-virus Application [In_sik_Choi] [In_sik_Choi] 2002-02 ++ Management Port ++xecp-node 3940 tcp XeCP Node Service [Brent_McCullough] [Brent_McCullough] 2003-11 ++xecp-node 3940 udp XeCP Node Service [Brent_McCullough] [Brent_McCullough] 2003-11 ++homeportal-web 3941 tcp Home Portal Web Server [Christian_Beaumont] [Christian_Beaumont] 2003-11 ++homeportal-web 3941 udp Home Portal Web Server [Christian_Beaumont] [Christian_Beaumont] 2003-11 ++srdp 3942 tcp satellite distribution [Simone_Molendini] [Simone_Molendini] 2003-11 ++srdp 3942 udp satellite distribution [Simone_Molendini] [Simone_Molendini] 2003-11 ++tig 3943 tcp TetraNode Ip Gateway [B_van_Klinken] [B_van_Klinken] 2003-12 ++tig 3943 udp TetraNode Ip Gateway [B_van_Klinken] [B_van_Klinken] 2003-12 ++sops 3944 tcp S-Ops Management [Stefan_Hochuli] [Stefan_Hochuli] 2003-12 ++sops 3944 udp S-Ops Management [Stefan_Hochuli] [Stefan_Hochuli] 2003-12 ++emcads 3945 tcp EMCADS Server Port [Lars_Struwe_Christen] [Lars_Struwe_Christen] 2004-01 ++emcads 3945 udp EMCADS Server Port [Lars_Struwe_Christen] [Lars_Struwe_Christen] 2004-01 ++backupedge 3946 tcp BackupEDGE Server [Frank_Liberato] [Frank_Liberato] 2004-06 ++backupedge 3946 udp BackupEDGE Server [Frank_Liberato] [Frank_Liberato] 2004-06 ++ Connect and Control Protocol ++ccp 3947 tcp for Consumer, Commercial, [Aaron_Myer] [Aaron_Myer] 2004-06 ++ and Industrial Electronic ++ Devices ++ Connect and Control Protocol ++ccp 3947 udp for Consumer, Commercial, [Aaron_Myer] [Aaron_Myer] 2004-06 ++ and Industrial Electronic ++ Devices ++apdap 3948 tcp Anton Paar Device [Martin_Leitner] [Martin_Leitner] 2004-06 ++ Administration Protocol ++apdap 3948 udp Anton Paar Device [Martin_Leitner] [Martin_Leitner] 2004-06 ++ Administration Protocol ++drip 3949 tcp Dynamic Routing Information [Dana_Blair] [Dana_Blair] 2004-06 ++ Protocol ++drip 3949 udp Dynamic Routing Information [Dana_Blair] [Dana_Blair] 2004-06 ++ Protocol ++namemunge 3950 tcp Name Munging [John_C_Klensin] [John_C_Klensin] 2004-07 ++namemunge 3950 udp Name Munging [John_C_Klensin] [John_C_Klensin] 2004-07 ++pwgippfax 3951 tcp PWG IPP Facsimile [Ira_McDonald] [Ira_McDonald] 2004-08 ++pwgippfax 3951 udp PWG IPP Facsimile [Ira_McDonald] [Ira_McDonald] 2004-08 ++i3-sessionmgr 3952 tcp I3 Session Manager [Mike_Gagle_2] [Mike_Gagle_2] 2004-08 ++i3-sessionmgr 3952 udp I3 Session Manager [Mike_Gagle_2] [Mike_Gagle_2] 2004-08 ++xmlink-connect 3953 tcp Eydeas XMLink Connect [David_Crewson] [David_Crewson] 2004-09 ++xmlink-connect 3953 udp Eydeas XMLink Connect [David_Crewson] [David_Crewson] 2004-09 ++adrep 3954 tcp AD Replication RPC [Robert_Ball] [Robert_Ball] 2008-03-26 ++adrep 3954 udp AD Replication RPC [Robert_Ball] [Robert_Ball] 2008-03-26 ++p2pcommunity 3955 tcp p2pCommunity [Tiago_Bittencourt_Si] [Tiago_Bittencourt_Si] 2005-08 ++p2pcommunity 3955 udp p2pCommunity [Tiago_Bittencourt_Si] [Tiago_Bittencourt_Si] 2005-08 ++gvcp 3956 tcp GigE Vision Control [Eric_Carey] [Eric_Carey] 2005-08 ++gvcp 3956 udp GigE Vision Control [Eric_Carey] [Eric_Carey] 2005-08 ++mqe-broker 3957 tcp MQEnterprise Broker ++mqe-broker 3957 udp MQEnterprise Broker ++mqe-agent 3958 tcp MQEnterprise Agent [Bob_Lauria] [Bob_Lauria] 2005-08 ++mqe-agent 3958 udp MQEnterprise Agent [Bob_Lauria] [Bob_Lauria] 2005-08 ++treehopper 3959 tcp Tree Hopper Networking [Gary_Whelan] [Gary_Whelan] 2005-08 ++treehopper 3959 udp Tree Hopper Networking [Gary_Whelan] [Gary_Whelan] 2005-08 ++bess 3960 tcp Bess Peer Assessment [Peter_Verdon] [Peter_Verdon] 2005-08 ++bess 3960 udp Bess Peer Assessment [Peter_Verdon] [Peter_Verdon] 2005-08 ++proaxess 3961 tcp ProAxess Server [Jonas_Ahlqvist] [Jonas_Ahlqvist] 2005-08 ++proaxess 3961 udp ProAxess Server [Jonas_Ahlqvist] [Jonas_Ahlqvist] 2005-08 ++sbi-agent 3962 tcp SBI Agent Protocol [Yossi_Appleboum_2] [Yossi_Appleboum_2] 2005-08 ++sbi-agent 3962 udp SBI Agent Protocol [Yossi_Appleboum_2] [Yossi_Appleboum_2] 2005-08 ++thrp 3963 tcp Teran Hybrid Routing [Spencer_Teran] [Spencer_Teran] 2005-08 ++ Protocol ++thrp 3963 udp Teran Hybrid Routing [Spencer_Teran] [Spencer_Teran] 2005-08 ++ Protocol ++sasggprs 3964 tcp SASG GPRS [Cristian_Petculescu_3] [Cristian_Petculescu_3] 2005-08 ++sasggprs 3964 udp SASG GPRS [Cristian_Petculescu_3] [Cristian_Petculescu_3] 2005-08 ++ati-ip-to-ncpe 3965 tcp Avanti IP to NCPE API [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2005-08 ++ati-ip-to-ncpe 3965 udp Avanti IP to NCPE API [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2005-08 ++bflckmgr 3966 tcp BuildForge Lock Manager [Joe_Senner] [Joe_Senner] 2005-08 ++bflckmgr 3966 udp BuildForge Lock Manager [Joe_Senner] [Joe_Senner] 2005-08 ++ppsms 3967 tcp PPS Message Service [Bart_Schaefer] [Bart_Schaefer] 2005-08 ++ppsms 3967 udp PPS Message Service [Bart_Schaefer] [Bart_Schaefer] 2005-08 ++ianywhere-dbns 3968 tcp iAnywhere DBNS [Graeme_Perrow] [Graeme_Perrow] 2005-08 ++ianywhere-dbns 3968 udp iAnywhere DBNS [Graeme_Perrow] [Graeme_Perrow] 2005-08 ++landmarks 3969 tcp Landmark Messages [Petri_Rauhala] [Petri_Rauhala] 2005-08 ++landmarks 3969 udp Landmark Messages [Petri_Rauhala] [Petri_Rauhala] 2005-08 ++ Defined TXT keys: ++ txtvers ++lanrevagent 3970 tcp LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> ++ vers=<version of LANrev Agent> ++ build=<build number of LANrev Agent> ++ id=<agent identifier> ++ Defined TXT keys: ++ txtvers ++lanrevagent 3970 udp LANrev Agent [Martin_Bestmann_3] [Martin_Bestmann_3] server=<main LANrev server for agent> ++ vers=<version of LANrev Agent> ++ build=<build number of LANrev Agent> ++ id=<agent identifier> ++lanrevserver 3971 tcp LANrev Server [Martin_Bestmann_3] [Martin_Bestmann_3] 2005-08 ++lanrevserver 3971 udp LANrev Server [Martin_Bestmann_3] [Martin_Bestmann_3] 2005-08 ++iconp 3972 tcp ict-control Protocol [Roel_Harbers] [Roel_Harbers] 2005-08 ++iconp 3972 udp ict-control Protocol [Roel_Harbers] [Roel_Harbers] 2005-08 ++progistics 3973 tcp ConnectShip Progistics [Jeff_Skaistis] [Jeff_Skaistis] 2005-08 ++progistics 3973 udp ConnectShip Progistics [Jeff_Skaistis] [Jeff_Skaistis] 2005-08 ++citysearch 3974 tcp Remote Applicant Tracking [Marc_Castelluccio] [Marc_Castelluccio] 2005-08 ++ Service ++citysearch 3974 udp Remote Applicant Tracking [Marc_Castelluccio] [Marc_Castelluccio] 2005-08 ++ Service ++airshot 3975 tcp Air Shot [Shingo_Kimura] [Shingo_Kimura] 2005-08 ++airshot 3975 udp Air Shot [Shingo_Kimura] [Shingo_Kimura] 2005-08 ++opswagent 3976 tcp Opsware Agent ++opswagent 3976 udp Opsware Agent ++opswmanager 3977 tcp Opsware Manager [Dave_Jagoda] [Dave_Jagoda] 2006-06 ++opswmanager 3977 udp Opsware Manager [Dave_Jagoda] [Dave_Jagoda] 2006-06 ++secure-cfg-svr 3978 tcp Secured Configuration Server [Dr_Anupam_Bharali] [Dr_Anupam_Bharali] 2006-06 ++secure-cfg-svr 3978 udp Secured Configuration Server [Dr_Anupam_Bharali] [Dr_Anupam_Bharali] 2006-06 ++smwan 3979 tcp Smith Micro Wide Area [David_Sperling] [David_Sperling] 2006-06 ++ Network Service ++smwan 3979 udp Smith Micro Wide Area [David_Sperling] [David_Sperling] 2006-06 ++ Network Service ++acms 3980 tcp Aircraft Cabin Management [Dustin_Zack] [Dustin_Zack] 2006-06 ++ System ++acms 3980 udp Aircraft Cabin Management [Dustin_Zack] [Dustin_Zack] 2006-06 ++ System ++starfish 3981 tcp Starfish System Admin [Dan_Razzell] [Dan_Razzell] 2006-06 ++starfish 3981 udp Starfish System Admin [Dan_Razzell] [Dan_Razzell] 2006-06 ++eis 3982 tcp ESRI Image Server ++eis 3982 udp ESRI Image Server ++eisp 3983 tcp ESRI Image Service [Keith_Ryden] [Keith_Ryden] 2006-07 ++eisp 3983 udp ESRI Image Service [Keith_Ryden] [Keith_Ryden] 2006-07 ++mapper-nodemgr 3984 tcp MAPPER network node manager ++mapper-nodemgr 3984 udp MAPPER network node manager ++mapper-mapethd 3985 tcp MAPPER TCP/IP server ++mapper-mapethd 3985 udp MAPPER TCP/IP server ++ MAPPER workstation server ++ ++mapper-ws-ethd 3986 tcp IANA assigned this [John_C_Horton] [John_C_Horton] ++ well-formed service name as ++ a replacement for ++ "mapper-ws_ethd". ++ This entry is an alias to "mapper-ws-ethd". This entry is now ++mapper-ws_ethd 3986 tcp MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service ++ discovery mechanisms. ++ MAPPER workstation server ++ ++mapper-ws-ethd 3986 udp IANA assigned this [John_C_Horton] [John_C_Horton] ++ well-formed service name as ++ a replacement for ++ "mapper-ws_ethd". ++ This entry is an alias to "mapper-ws-ethd". This entry is now ++mapper-ws_ethd 3986 udp MAPPER workstation server [John_C_Horton] [John_C_Horton] historic, not usable for use with many common service ++ discovery mechanisms. ++centerline 3987 tcp Centerline [Mark_Simpson] [Mark_Simpson] ++centerline 3987 udp Centerline [Mark_Simpson] [Mark_Simpson] ++dcs-config 3988 tcp DCS Configuration Port [Ian_Cargill] [Ian_Cargill] 2005-08 ++dcs-config 3988 udp DCS Configuration Port [Ian_Cargill] [Ian_Cargill] 2005-08 ++bv-queryengine 3989 tcp BindView-Query Engine ++bv-queryengine 3989 udp BindView-Query Engine ++bv-is 3990 tcp BindView-IS ++bv-is 3990 udp BindView-IS ++bv-smcsrv 3991 tcp BindView-SMCServer ++bv-smcsrv 3991 udp BindView-SMCServer ++bv-ds 3992 tcp BindView-DirectoryServer ++bv-ds 3992 udp BindView-DirectoryServer ++bv-agent 3993 tcp BindView-Agent [David_A_Gayler] [David_A_Gayler] 2005-08 ++bv-agent 3993 udp BindView-Agent [David_A_Gayler] [David_A_Gayler] 2005-08 ++ 3994 Unassigned 2008-04-24 ++iss-mgmt-ssl 3995 tcp ISS Management Svcs SSL [Wes_Wilson] [Wes_Wilson] 2003-10 ++iss-mgmt-ssl 3995 udp ISS Management Svcs SSL [Wes_Wilson] [Wes_Wilson] 2003-10 ++abcsoftware 3996 tcp abcsoftware-01 [Andrew_Zimmerman] [Andrew_Zimmerman] 2004-06 ++abcsoftware 3996 udp abcsoftware-01 [Andrew_Zimmerman] [Andrew_Zimmerman] 2004-06 ++agentsease-db 3997 tcp aes_db [Colin_Hughes] [Colin_Hughes] 2006-02 ++agentsease-db 3997 udp aes_db [Colin_Hughes] [Colin_Hughes] 2006-02 ++dnx 3998 tcp Distributed Nagios Executor [John_Calcote] [John_Calcote] 2007-11-06 ++ Service ++dnx 3998 udp Distributed Nagios Executor [John_Calcote] [John_Calcote] 2007-11-06 ++ Service ++nvcnet 3999 tcp Norman distributes scanning [Kristian_A_Bognaes] [Kristian_A_Bognaes] 2007-11-06 ++ service ++nvcnet 3999 udp Norman distributes scanning [Kristian_A_Bognaes] [Kristian_A_Bognaes] 2007-11-06 ++ service ++terabase 4000 tcp Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ ++ <www.icq.com> ++terabase 4000 udp Terabase [Thor_Olson] [Thor_Olson] Potential Conflict of ports PORT 4000 also used by ICQ ++ <www.icq.com> ++newoak 4001 tcp NewOak [Jim_Philippou] [Jim_Philippou] ++newoak 4001 udp NewOak [Jim_Philippou] [Jim_Philippou] ++pxc-spvr-ft 4002 tcp pxc-spvr-ft ++pxc-spvr-ft 4002 udp pxc-spvr-ft ++pxc-splr-ft 4003 tcp pxc-splr-ft ++pxc-splr-ft 4003 udp pxc-splr-ft ++pxc-roid 4004 tcp pxc-roid ++pxc-roid 4004 udp pxc-roid ++pxc-pin 4005 tcp pxc-pin ++pxc-pin 4005 udp pxc-pin ++pxc-spvr 4006 tcp pxc-spvr ++pxc-spvr 4006 udp pxc-spvr ++pxc-splr 4007 tcp pxc-splr [Dave_Nesbitt] [Dave_Nesbitt] ++pxc-splr 4007 udp pxc-splr [Dave_Nesbitt] [Dave_Nesbitt] ++netcheque 4008 tcp NetCheque accounting [B_Clifford_Neuman] [B_Clifford_Neuman] ++netcheque 4008 udp NetCheque accounting [B_Clifford_Neuman] [B_Clifford_Neuman] ++chimera-hwm 4009 tcp Chimera HWM [Ken_Anderson] [Ken_Anderson] ++chimera-hwm 4009 udp Chimera HWM [Ken_Anderson] [Ken_Anderson] ++samsung-unidex 4010 tcp Samsung Unidex [Konstantin_V_Vyazni] [Konstantin_V_Vyazni] ++samsung-unidex 4010 udp Samsung Unidex [Konstantin_V_Vyazni] [Konstantin_V_Vyazni] ++altserviceboot 4011 tcp Alternate Service Boot [Eric_Dittert] [Eric_Dittert] ++altserviceboot 4011 udp Alternate Service Boot [Eric_Dittert] [Eric_Dittert] ++pda-gate 4012 tcp PDA Gate [Masakuni_Okada] [Masakuni_Okada] ++pda-gate 4012 udp PDA Gate [Masakuni_Okada] [Masakuni_Okada] ++acl-manager 4013 tcp ACL Manager [Toru_Murai] [Toru_Murai] ++acl-manager 4013 udp ACL Manager [Toru_Murai] [Toru_Murai] ++taiclock 4014 tcp TAICLOCK [Dan_Bernstein_3] [Dan_Bernstein_3] ++taiclock 4014 udp TAICLOCK [Dan_Bernstein_3] [Dan_Bernstein_3] ++talarian-mcast1 4015 tcp Talarian Mcast ++talarian-mcast1 4015 udp Talarian Mcast ++talarian-mcast2 4016 tcp Talarian Mcast ++talarian-mcast2 4016 udp Talarian Mcast ++talarian-mcast3 4017 tcp Talarian Mcast ++talarian-mcast3 4017 udp Talarian Mcast ++talarian-mcast4 4018 tcp Talarian Mcast ++talarian-mcast4 4018 udp Talarian Mcast ++talarian-mcast5 4019 tcp Talarian Mcast [Geoff_Mendal] [Geoff_Mendal] ++talarian-mcast5 4019 udp Talarian Mcast [Geoff_Mendal] [Geoff_Mendal] ++trap 4020 tcp TRAP Port [Jeffrey_C_Byrd] [Jeffrey_C_Byrd] ++trap 4020 udp TRAP Port [Jeffrey_C_Byrd] [Jeffrey_C_Byrd] ++nexus-portal 4021 tcp Nexus Portal [Damian_Tarnawsky] [Damian_Tarnawsky] ++nexus-portal 4021 udp Nexus Portal [Damian_Tarnawsky] [Damian_Tarnawsky] ++dnox 4022 tcp DNOX [Leo_Rathnayake] [Leo_Rathnayake] ++dnox 4022 udp DNOX [Leo_Rathnayake] [Leo_Rathnayake] ++esnm-zoning 4023 tcp ESNM Zoning Port [Yong_Cai] [Yong_Cai] ++esnm-zoning 4023 udp ESNM Zoning Port [Yong_Cai] [Yong_Cai] ++tnp1-port 4024 tcp TNP1 User Port [Tony_Gibbs] [Tony_Gibbs] ++tnp1-port 4024 udp TNP1 User Port [Tony_Gibbs] [Tony_Gibbs] ++partimage 4025 tcp Partition Image Port [Franck_Ladurelle] [Franck_Ladurelle] ++partimage 4025 udp Partition Image Port [Franck_Ladurelle] [Franck_Ladurelle] ++as-debug 4026 tcp Graphical Debug Server [Steve_Halverson] [Steve_Halverson] ++as-debug 4026 udp Graphical Debug Server [Steve_Halverson] [Steve_Halverson] ++bxp 4027 tcp bitxpress [Morgan_Doyle] [Morgan_Doyle] ++bxp 4027 udp bitxpress [Morgan_Doyle] [Morgan_Doyle] ++dtserver-port 4028 tcp DTServer Port [Stephen_Aikins] [Stephen_Aikins] ++dtserver-port 4028 udp DTServer Port [Stephen_Aikins] [Stephen_Aikins] ++ip-qsig 4029 tcp IP Q signaling protocol [Toru_Tachibana] [Toru_Tachibana] ++ip-qsig 4029 udp IP Q signaling protocol [Toru_Tachibana] [Toru_Tachibana] ++jdmn-port 4030 tcp Accell/JSP Daemon Port [Art_Grand] [Art_Grand] ++jdmn-port 4030 udp Accell/JSP Daemon Port [Art_Grand] [Art_Grand] ++suucp 4031 tcp UUCP over SSL [Harald_Welte] [Harald_Welte] ++suucp 4031 udp UUCP over SSL [Harald_Welte] [Harald_Welte] ++vrts-auth-port 4032 tcp VERITAS Authorization [Stefan_Winkel] [Stefan_Winkel] ++ Service ++vrts-auth-port 4032 udp VERITAS Authorization [Stefan_Winkel] [Stefan_Winkel] ++ Service ++sanavigator 4033 tcp SANavigator Peer Port [Robert_J_Chansler] [Robert_J_Chansler] ++sanavigator 4033 udp SANavigator Peer Port [Robert_J_Chansler] [Robert_J_Chansler] ++ubxd 4034 tcp Ubiquinox Daemon [Kit_Smithers] [Kit_Smithers] ++ubxd 4034 udp Ubiquinox Daemon [Kit_Smithers] [Kit_Smithers] ++wap-push-http 4035 tcp WAP Push OTA-HTTP port ++wap-push-http 4035 udp WAP Push OTA-HTTP port ++wap-push-https 4036 tcp WAP Push OTA-HTTP secure [Matthieu_Lachance] [Matthieu_Lachance] ++wap-push-https 4036 udp WAP Push OTA-HTTP secure [Matthieu_Lachance] [Matthieu_Lachance] ++ravehd 4037 tcp RaveHD network control [Jason_Howard] [Jason_Howard] 2006-01 ++ravehd 4037 udp RaveHD network control [Jason_Howard] [Jason_Howard] 2006-01 ++fazzt-ptp 4038 tcp Fazzt Point-To-Point ++fazzt-ptp 4038 udp Fazzt Point-To-Point ++fazzt-admin 4039 tcp Fazzt Administration [Lewis_Wolfgang] [Lewis_Wolfgang] 2006-05 ++fazzt-admin 4039 udp Fazzt Administration [Lewis_Wolfgang] [Lewis_Wolfgang] 2006-05 ++yo-main 4040 tcp Yo.net main service [John_Tintor] [John_Tintor] ++yo-main 4040 udp Yo.net main service [John_Tintor] [John_Tintor] ++houston 4041 tcp Rocketeer-Houston [Johnny_C_Norris_II] [Johnny_C_Norris_II] ++houston 4041 udp Rocketeer-Houston [Johnny_C_Norris_II] [Johnny_C_Norris_II] ++ldxp 4042 tcp LDXP [Craig_Calef] [Craig_Calef] ++ldxp 4042 udp LDXP [Craig_Calef] [Craig_Calef] ++nirp 4043 tcp Neighbour Identity ++ Resolution ++nirp 4043 udp Neighbour Identity ++ Resolution ++ltp 4044 tcp Location Tracking Protocol ++ltp 4044 udp Location Tracking Protocol ++ UNAUTHORIZED ++npp 4045 tcp Network Paging Protocol USE: Port ++ 4045 used by ++ NFS ++ UNAUTHORIZED ++npp 4045 udp Network Paging Protocol USE: Port ++ 4045 used by ++ NFS ++acp-proto 4046 tcp Accounting Protocol ++acp-proto 4046 udp Accounting Protocol ++ctp-state 4047 tcp Context Transfer Protocol [Hesham_Soliman] [Hesham_Soliman] 2005-11 ++ctp-state 4047 udp Context Transfer Protocol [Hesham_Soliman] [Hesham_Soliman] 2005-11 ++ 4048 Unassigned 2008-04-24 ++wafs 4049 tcp Wide Area File Services [Yuval_Hager] [Yuval_Hager] 2006-01 ++wafs 4049 udp Wide Area File Services [Yuval_Hager] [Yuval_Hager] 2006-01 ++cisco-wafs 4050 tcp Wide Area File Services [Etai_Lev_Ran] [Etai_Lev_Ran] 2005-02 ++cisco-wafs 4050 udp Wide Area File Services [Etai_Lev_Ran] [Etai_Lev_Ran] 2005-02 ++cppdp 4051 tcp Cisco Peer to Peer [Susan_Sauter] [Susan_Sauter] 2006-07 ++ Distribution Protocol ++cppdp 4051 udp Cisco Peer to Peer [Susan_Sauter] [Susan_Sauter] 2006-07 ++ Distribution Protocol ++interact 4052 tcp VoiceConnect Interact [Jonathan_Custance] [Jonathan_Custance] 2006-07 ++interact 4052 udp VoiceConnect Interact [Jonathan_Custance] [Jonathan_Custance] 2006-07 ++ccu-comm-1 4053 tcp CosmoCall Universe ++ Communications Port 1 ++ccu-comm-1 4053 udp CosmoCall Universe ++ Communications Port 1 ++ccu-comm-2 4054 tcp CosmoCall Universe ++ Communications Port 2 ++ccu-comm-2 4054 udp CosmoCall Universe ++ Communications Port 2 ++ccu-comm-3 4055 tcp CosmoCall Universe [Steve_Dellutri_2] [Steve_Dellutri_2] 2006-07 ++ Communications Port 3 ++ccu-comm-3 4055 udp CosmoCall Universe [Steve_Dellutri_2] [Steve_Dellutri_2] 2006-07 ++ Communications Port 3 ++lms 4056 tcp Location Message Service [Sergey_Burnevsky] [Sergey_Burnevsky] 2006-08 ++lms 4056 udp Location Message Service [Sergey_Burnevsky] [Sergey_Burnevsky] 2006-08 ++wfm 4057 tcp Servigistics WFM server [Yuri_Machkasov_2] [Yuri_Machkasov_2] 2006-08 ++wfm 4057 udp Servigistics WFM server [Yuri_Machkasov_2] [Yuri_Machkasov_2] 2006-08 ++kingfisher 4058 tcp Kingfisher protocol [Vaughan_Wesson] [Vaughan_Wesson] 2006-10 ++kingfisher 4058 udp Kingfisher protocol [Vaughan_Wesson] [Vaughan_Wesson] 2006-10 ++dlms-cosem 4059 tcp DLMS/COSEM [Gyozo_Kmethy] [Gyozo_Kmethy] 2006-11 ++dlms-cosem 4059 udp DLMS/COSEM [Gyozo_Kmethy] [Gyozo_Kmethy] 2006-11 ++ DSMETER Inter-Agent Transfer ++ Channel ++ ++dsmeter-iatc 4060 tcp IANA assigned this [John_McCann] [John_McCann] 2006-12 ++ well-formed service name as ++ a replacement for ++ "dsmeter_iatc". ++ DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now ++dsmeter_iatc 4060 tcp Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service ++ discovery mechanisms. ++ DSMETER Inter-Agent Transfer ++ Channel ++ ++dsmeter-iatc 4060 udp IANA assigned this [John_McCann] [John_McCann] 2006-12 ++ well-formed service name as ++ a replacement for ++ "dsmeter_iatc". ++ DSMETER Inter-Agent Transfer This entry is an alias to "dsmeter-iatc". This entry is now ++dsmeter_iatc 4060 udp Channel [John_McCann] [John_McCann] 2006-12 historic, not usable for use with many common service ++ discovery mechanisms. ++ice-location 4061 tcp Ice Location Service (TCP) ++ice-location 4061 udp Ice Location Service (TCP) ++ice-slocation 4062 tcp Ice Location Service (SSL) ++ice-slocation 4062 udp Ice Location Service (SSL) ++ice-router 4063 tcp Ice Firewall Traversal ++ Service (TCP) ++ice-router 4063 udp Ice Firewall Traversal ++ Service (TCP) ++ice-srouter 4064 tcp Ice Firewall Traversal [Bernard_Normier] [Bernard_Normier] 2006-12 ++ Service (SSL) ++ice-srouter 4064 udp Ice Firewall Traversal [Bernard_Normier] [Bernard_Normier] 2006-12 ++ Service (SSL) ++ Avanti Common Data ++ ++avanti-cdp 4065 tcp IANA assigned this [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 ++ well-formed service name as ++ a replacement for ++ "avanti_cdp". ++ This entry is an alias to "avanti-cdp". This entry is now ++avanti_cdp 4065 tcp Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service ++ discovery mechanisms. ++ Avanti Common Data ++ ++avanti-cdp 4065 udp IANA assigned this [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 ++ well-formed service name as ++ a replacement for ++ "avanti_cdp". ++ This entry is an alias to "avanti-cdp". This entry is now ++avanti_cdp 4065 udp Avanti Common Data [Steve_Meyer_Sr] [Steve_Meyer_Sr] 2007-02 historic, not usable for use with many common service ++ discovery mechanisms. ++pmas 4066 tcp Performance Measurement and [Zenon_Fortuna] [Zenon_Fortuna] 2007-02 ++ Analysis ++pmas 4066 udp Performance Measurement and [Zenon_Fortuna] [Zenon_Fortuna] 2007-02 ++ Analysis ++idp 4067 tcp Information Distribution [Michaela_Vanderveen] [Michaela_Vanderveen] 2007-02 ++ Protocol ++idp 4067 udp Information Distribution [Michaela_Vanderveen] [Michaela_Vanderveen] 2007-02 ++ Protocol ++ipfltbcst 4068 tcp IP Fleet Broadcast [Trung_Huu_Tran] [Trung_Huu_Tran] 2007-03 ++ipfltbcst 4068 udp IP Fleet Broadcast [Trung_Huu_Tran] [Trung_Huu_Tran] 2007-03 ++minger 4069 tcp Minger Email Address [Arvel_Hathcock] [Arvel_Hathcock] 2007-03 ++ Validation Service ++minger 4069 udp Minger Email Address [Arvel_Hathcock] [Arvel_Hathcock] 2007-03 ++ Validation Service ++tripe 4070 tcp Trivial IP Encryption [Mark_Wooding] [Mark_Wooding] 2007-07-10 ++ (TrIPE) ++tripe 4070 udp Trivial IP Encryption [Mark_Wooding] [Mark_Wooding] 2007-07-10 ++ (TrIPE) ++aibkup 4071 tcp Automatically Incremental [Volker_Wiegand] [Volker_Wiegand] 2007-07-10 ++ Backup ++aibkup 4071 udp Automatically Incremental [Volker_Wiegand] [Volker_Wiegand] 2007-07-10 ++ Backup ++zieto-sock 4072 tcp Zieto Socket Communications [Malcolm_McLean] [Malcolm_McLean] 2007-07-19 ++zieto-sock 4072 udp Zieto Socket Communications [Malcolm_McLean] [Malcolm_McLean] 2007-07-19 ++iRAPP 4073 tcp iRAPP Server Protocol [Vladimir_Bickov] [Vladimir_Bickov] 2007-08-20 ++iRAPP 4073 udp iRAPP Server Protocol [Vladimir_Bickov] [Vladimir_Bickov] 2007-08-20 ++cequint-cityid 4074 tcp Cequint City ID UI trigger [Phill_Goeckler] [Phill_Goeckler] 2007-08-20 ++cequint-cityid 4074 udp Cequint City ID UI trigger [Phill_Goeckler] [Phill_Goeckler] 2007-08-20 ++perimlan 4075 tcp ISC Alarm Message Service [Bernie_Malkowski] [Bernie_Malkowski] 2007-08-20 ++perimlan 4075 udp ISC Alarm Message Service [Bernie_Malkowski] [Bernie_Malkowski] 2007-08-20 ++seraph 4076 tcp Seraph DCS [Jason_Spence] [Jason_Spence] 2008-01-22 ++seraph 4076 udp Seraph DCS [Jason_Spence] [Jason_Spence] 2008-01-22 ++ 4077 tcp Reserved ++ascomalarm 4077 udp Ascom IP Alarming [Ascom_Austria_GmbH] [Ascom_Austria_GmbH] 2008-05-01 ++cssp 4078 tcp Coordinated Security Service [Michael_McDaniels] [Michael_McDaniels] 2008-05-01 ++ Protocol ++ 4078 udp Reserved ++santools 4079 tcp SANtools Diagnostic Server [David_A_Lethe_2] [David_A_Lethe_2] 2008-05-01 ++santools 4079 udp SANtools Diagnostic Server [David_A_Lethe_2] [David_A_Lethe_2] 2008-05-01 ++lorica-in 4080 tcp Lorica inside facing ++lorica-in 4080 udp Lorica inside facing ++lorica-in-sec 4081 tcp Lorica inside facing (SSL) ++lorica-in-sec 4081 udp Lorica inside facing (SSL) ++lorica-out 4082 tcp Lorica outside facing ++lorica-out 4082 udp Lorica outside facing ++lorica-out-sec 4083 tcp Lorica outside facing (SSL) [Johannes_Skov_Frands] [Johannes_Skov_Frands] 2008-02-28 ++lorica-out-sec 4083 udp Lorica outside facing (SSL) [Johannes_Skov_Frands] [Johannes_Skov_Frands] 2008-02-28 ++ 4084 tcp Reserved ++fortisphere-vm 4084 udp Fortisphere VM Service [Daniel_Becker_4] [Daniel_Becker_4] 2008-06-03 ++ezmessagesrv 4085 tcp EZNews Newsroom Message [Gerald_R_Jensen] [Gerald_R_Jensen] 2008-06-05 ++ Service ++ 4085 udp Reserved ++ 4086 tcp Reserved ++ftsync 4086 udp Firewall/NAT state table [Heiner_Erne] [Heiner_Erne] 2008-06-06 ++ synchronization ++applusservice 4087 tcp APplus Service [Thomas_Boerkel] [Thomas_Boerkel] 2008-06-05 ++ 4087 udp Reserved ++npsp 4088 tcp Noah Printing Service [Hiromi_Ohara] [Hiromi_Ohara] 2008-06-18 ++ Protocol ++ 4088 udp Reserved ++opencore 4089 tcp OpenCORE Remote Control [Pim_van_Riezen] [Pim_van_Riezen] 2006-07 ++ Service ++opencore 4089 udp OpenCORE Remote Control [Pim_van_Riezen] [Pim_van_Riezen] 2006-07 ++ Service ++omasgport 4090 tcp OMA BCAST Service Guide [Mark_Lipford] [Mark_Lipford] 2006-07 ++omasgport 4090 udp OMA BCAST Service Guide [Mark_Lipford] [Mark_Lipford] 2006-07 ++ewinstaller 4091 tcp EminentWare Installer ++ewinstaller 4091 udp EminentWare Installer ++ewdgs 4092 tcp EminentWare DGS [David_A_Gayler_2] [David_A_Gayler_2] 2006-07 ++ewdgs 4092 udp EminentWare DGS [David_A_Gayler_2] [David_A_Gayler_2] 2006-07 ++pvxpluscs 4093 tcp Pvx Plus CS Host [Michael_King] [Michael_King] 2006-07 ++pvxpluscs 4093 udp Pvx Plus CS Host [Michael_King] [Michael_King] 2006-07 ++sysrqd 4094 tcp sysrq daemon [Julien_Danjou] [Julien_Danjou] 2006-07 ++sysrqd 4094 udp sysrq daemon [Julien_Danjou] [Julien_Danjou] 2006-07 ++xtgui 4095 tcp xtgui information service [Jim_Robanske] [Jim_Robanske] 2006-05 ++xtgui 4095 udp xtgui information service [Jim_Robanske] [Jim_Robanske] 2006-05 ++bre 4096 tcp BRE (Bridge Relay Element) [Stephen_Egbert] [Stephen_Egbert] ++bre 4096 udp BRE (Bridge Relay Element) [Stephen_Egbert] [Stephen_Egbert] ++patrolview 4097 tcp Patrol View [Portnoy_Boxman] [Portnoy_Boxman] ++patrolview 4097 udp Patrol View [Portnoy_Boxman] [Portnoy_Boxman] ++drmsfsd 4098 tcp drmsfsd [Masao_Iwai] [Masao_Iwai] ++drmsfsd 4098 udp drmsfsd [Masao_Iwai] [Masao_Iwai] ++dpcp 4099 tcp DPCP [John_Croft] [John_Croft] ++dpcp 4099 udp DPCP [John_Croft] [John_Croft] ++igo-incognito 4100 tcp IGo Incognito Data Port [Paul_Reddy_2] [Paul_Reddy_2] 2002-02 ++igo-incognito 4100 udp IGo Incognito Data Port [Paul_Reddy_2] [Paul_Reddy_2] 2002-02 ++brlp-0 4101 tcp Braille protocol ++brlp-0 4101 udp Braille protocol ++brlp-1 4102 tcp Braille protocol ++brlp-1 4102 udp Braille protocol ++brlp-2 4103 tcp Braille protocol ++brlp-2 4103 udp Braille protocol ++brlp-3 4104 tcp Braille protocol [Sebastien_Hinderer] [Sebastien_Hinderer] 2006-03 ++brlp-3 4104 udp Braille protocol [Sebastien_Hinderer] [Sebastien_Hinderer] 2006-03 ++shofar 4105 tcp Shofar [ShofarNexus] [John_Kozlowski] 2006-07 2012-02-20 ++shofar 4105 udp Shofar [ShofarNexus] [John_Kozlowski] 2006-07 2012-02-20 ++synchronite 4106 tcp Synchronite [James_Figgins] [James_Figgins] 2006-07 ++synchronite 4106 udp Synchronite [James_Figgins] [James_Figgins] 2006-07 ++j-ac 4107 tcp JDL Accounting LAN Service [Takashi_Sahara] [Takashi_Sahara] 2006-09 ++j-ac 4107 udp JDL Accounting LAN Service [Takashi_Sahara] [Takashi_Sahara] 2006-09 ++accel 4108 tcp ACCEL [Masahiro_Koiwai] [Masahiro_Koiwai] 2006-10 ++accel 4108 udp ACCEL [Masahiro_Koiwai] [Masahiro_Koiwai] 2006-10 ++izm 4109 tcp Instantiated Zero-control [David_Miller] [David_Miller] 2007-02 ++ Messaging ++izm 4109 udp Instantiated Zero-control [David_Miller] [David_Miller] 2007-02 ++ Messaging ++g2tag 4110 tcp G2 RFID Tag Telemetry Data [David_Goodall] [David_Goodall] 2007-02 ++g2tag 4110 udp G2 RFID Tag Telemetry Data [David_Goodall] [David_Goodall] 2007-02 ++xgrid 4111 tcp Xgrid [David_Kramer] [David_Kramer] 2004-11 ++xgrid 4111 udp Xgrid [David_Kramer] [David_Kramer] 2004-11 ++apple-vpns-rp 4112 tcp Apple VPN Server Reporting [Christophe_Allie] [Christophe_Allie] 2006-08 ++ Protocol ++apple-vpns-rp 4112 udp Apple VPN Server Reporting [Christophe_Allie] [Christophe_Allie] 2006-08 ++ Protocol ++aipn-reg 4113 tcp AIPN LS Registration [Qiang_Zhang_2] [Qiang_Zhang_2] 2006-10 ++aipn-reg 4113 udp AIPN LS Registration [Qiang_Zhang_2] [Qiang_Zhang_2] 2006-10 ++jomamqmonitor 4114 tcp JomaMQMonitor [Marcel_Hofstetter] [Marcel_Hofstetter] 2003-01 ++jomamqmonitor 4114 udp JomaMQMonitor [Marcel_Hofstetter] [Marcel_Hofstetter] 2003-01 ++cds 4115 tcp CDS Transfer Agent [Neil_Coggins] [Neil_Coggins] 2006-07 ++cds 4115 udp CDS Transfer Agent [Neil_Coggins] [Neil_Coggins] 2006-07 ++smartcard-tls 4116 tcp smartcard-TLS [Ilan_Mahalal] [Ilan_Mahalal] 2006-04 ++smartcard-tls 4116 udp smartcard-TLS [Ilan_Mahalal] [Ilan_Mahalal] 2006-04 ++hillrserv 4117 tcp Hillr Connection Manager [Freddy_A_Ayuso_Hens] [Freddy_A_Ayuso_Hens] 2008-05-22 ++hillrserv 4117 udp Hillr Connection Manager [Freddy_A_Ayuso_Hens] [Freddy_A_Ayuso_Hens] 2008-05-22 ++netscript 4118 tcp Netadmin Systems NETscript [Goran_Runfeldt] [Goran_Runfeldt] 2006-12 ++ service ++netscript 4118 udp Netadmin Systems NETscript [Goran_Runfeldt] [Goran_Runfeldt] 2006-12 ++ service ++assuria-slm 4119 tcp Assuria Log Manager [Nick_Connor] [Nick_Connor] 2006-12 ++assuria-slm 4119 udp Assuria Log Manager [Nick_Connor] [Nick_Connor] 2006-12 ++ 4120 Unassigned 2007-02-01 ++e-builder 4121 tcp e-Builder Application [James_Caza] [James_Caza] 2006-12 ++ Communication ++e-builder 4121 udp e-Builder Application [James_Caza] [James_Caza] 2006-12 ++ Communication ++fprams 4122 tcp Fiber Patrol Alarm Service [Zhizhong_Zhuang] [Zhizhong_Zhuang] 2006-12 ++fprams 4122 udp Fiber Patrol Alarm Service [Zhizhong_Zhuang] [Zhizhong_Zhuang] 2006-12 ++z-wave 4123 tcp Zensys Z-Wave Control [Anders_Brandt] [Anders_Brandt] 2007-02 ++ Protocol ++z-wave 4123 udp Zensys Z-Wave Control [Anders_Brandt] [Anders_Brandt] 2007-02 ++ Protocol ++tigv2 4124 tcp Rohill TetraNode Ip Gateway [Bert_Bouwers] [Bert_Bouwers] 2007-05 ++ v2 ++tigv2 4124 udp Rohill TetraNode Ip Gateway [Bert_Bouwers] [Bert_Bouwers] 2007-05 ++ v2 ++opsview-envoy 4125 tcp Opsview Envoy [Ton_Voon] [Ton_Voon] 2008-09-26 ++opsview-envoy 4125 udp Opsview Envoy [Ton_Voon] [Ton_Voon] 2008-09-26 ++ddrepl 4126 tcp Data Domain Replication [Pratik_Wadher] [Pratik_Wadher] 2007-05 ++ Service ++ddrepl 4126 udp Data Domain Replication [Pratik_Wadher] [Pratik_Wadher] 2007-05 ++ Service ++unikeypro 4127 tcp NetUniKeyServer [Raymond_Chaw] [Raymond_Chaw] 2007-05 ++unikeypro 4127 udp NetUniKeyServer [Raymond_Chaw] [Raymond_Chaw] 2007-05 ++nufw 4128 tcp NuFW decision delegation ++ protocol ++nufw 4128 udp NuFW decision delegation ++ protocol ++nuauth 4129 tcp NuFW authentication protocol [Eric_Leblond] [Eric_Leblond] 2007-06 ++nuauth 4129 udp NuFW authentication protocol [Eric_Leblond] [Eric_Leblond] 2007-06 ++fronet 4130 tcp FRONET message protocol [Christer_Nygren] [Christer_Nygren] 2007-08-07 ++fronet 4130 udp FRONET message protocol [Christer_Nygren] [Christer_Nygren] 2007-08-07 ++stars 4131 tcp Global Maintech Stars [Harry_Goldschmitt_2] [Harry_Goldschmitt_2] 2007-06 ++stars 4131 udp Global Maintech Stars [Harry_Goldschmitt_2] [Harry_Goldschmitt_2] 2007-06 ++ NUTS Daemon ++ ++nuts-dem 4132 tcp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "nuts_dem". ++ This entry is an alias to "nuts-dem". This entry is now ++nuts_dem 4132 tcp NUTS Daemon historic, not usable for use with many common service ++ discovery mechanisms. ++ NUTS Daemon ++ ++nuts-dem 4132 udp IANA assigned this ++ well-formed service name as ++ a replacement for ++ "nuts_dem". ++ This entry is an alias to "nuts-dem". This entry is now ++nuts_dem 4132 udp NUTS Daemon historic, not usable for use with many common service ++ discovery mechanisms. ++ NUTS Bootp Server ++ ++nuts-bootp 4133 tcp IANA assigned this [Martin_Freiss_2] [Martin_Freiss_2] ++ well-formed service name as ++ a replacement for ++ "nuts_bootp". ++ This entry is an alias to "nuts-bootp". This entry is now ++nuts_bootp 4133 tcp NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service ++ discovery mechanisms. ++ NUTS Bootp Server ++ ++nuts-bootp 4133 udp IANA assigned this [Martin_Freiss_2] [Martin_Freiss_2] ++ well-formed service name as ++ a replacement for ++ "nuts_bootp". ++ This entry is an alias to "nuts-bootp". This entry is now ++nuts_bootp 4133 udp NUTS Bootp Server [Martin_Freiss_2] [Martin_Freiss_2] historic, not usable for use with many common service ++ discovery mechanisms. ++nifty-hmi 4134 tcp NIFTY-Serve HMI protocol [Ryuichi_Suzuki] [Ryuichi_Suzuki] ++nifty-hmi 4134 udp NIFTY-Serve HMI protocol [Ryuichi_Suzuki] [Ryuichi_Suzuki] ++cl-db-attach 4135 tcp Classic Line Database Server ++ Attach ++cl-db-attach 4135 udp Classic Line Database Server ++ Attach ++cl-db-request 4136 tcp Classic Line Database Server ++ Request ++cl-db-request 4136 udp Classic Line Database Server ++ Request ++cl-db-remote 4137 tcp Classic Line Database Server [Arno_Kirmeir] [Arno_Kirmeir] 2007-01 ++ Remote ++cl-db-remote 4137 udp Classic Line Database Server [Arno_Kirmeir] [Arno_Kirmeir] 2007-01 ++ Remote ++nettest 4138 tcp nettest [David_Borman] [David_Borman] 2003-03 ++nettest 4138 udp nettest [David_Borman] [David_Borman] 2003-03 ++thrtx 4139 tcp Imperfect Networks Server [Dinkar_Chivaluri_2] [Dinkar_Chivaluri_2] 2006-02 ++thrtx 4139 udp Imperfect Networks Server [Dinkar_Chivaluri_2] [Dinkar_Chivaluri_2] 2006-02 ++ Cedros Fraud Detection ++ System ++ ++cedros-fds 4140 tcp IANA assigned this [Markus_Michels_3] [Markus_Michels_3] 2006-10 ++ well-formed service name as ++ a replacement for ++ "cedros_fds". ++ Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now ++cedros_fds 4140 tcp System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service ++ discovery mechanisms. ++ Cedros Fraud Detection ++ System ++ ++cedros-fds 4140 udp IANA assigned this [Markus_Michels_3] [Markus_Michels_3] 2006-10 ++ well-formed service name as ++ a replacement for ++ "cedros_fds". ++ Cedros Fraud Detection This entry is an alias to "cedros-fds". This entry is now ++cedros_fds 4140 udp System [Markus_Michels_3] [Markus_Michels_3] 2006-10 historic, not usable for use with many common service ++ discovery mechanisms. ++oirtgsvc 4141 tcp Workflow Server ++oirtgsvc 4141 udp Workflow Server ++oidocsvc 4142 tcp Document Server ++oidocsvc 4142 udp Document Server ++oidsr 4143 tcp Document Replication [Norman_Brie] [Norman_Brie] ++oidsr 4143 udp Document Replication [Norman_Brie] [Norman_Brie] ++ 4144 Unassigned Compuserve (unoffically) is using port 4144 ++vvr-control 4145 tcp VVR Control [Ming_Xu] [Ming_Xu] ++vvr-control 4145 udp VVR Control [Ming_Xu] [Ming_Xu] ++tgcconnect 4146 tcp TGCConnect Beacon [Brian_Becker] [Brian_Becker] 2006-10 ++tgcconnect 4146 udp TGCConnect Beacon [Brian_Becker] [Brian_Becker] 2006-10 ++vrxpservman 4147 tcp Multum Service Manager [Scott_Mager] [Scott_Mager] 2006-10 ++vrxpservman 4147 udp Multum Service Manager [Scott_Mager] [Scott_Mager] 2006-10 ++hhb-handheld 4148 tcp HHB Handheld Client [Steven_G_Loughner] [Steven_G_Loughner] 2007-03 ++hhb-handheld 4148 udp HHB Handheld Client [Steven_G_Loughner] [Steven_G_Loughner] 2007-03 ++agslb 4149 tcp A10 GSLB Service [John_Chiong] [John_Chiong] 2007-07-02 ++agslb 4149 udp A10 GSLB Service [John_Chiong] [John_Chiong] 2007-07-02 ++PowerAlert-nsa 4150 tcp PowerAlert Network Shutdown [Mike_Delgrosso_2] [Mike_Delgrosso_2] 2007-07-02 ++ Agent ++PowerAlert-nsa 4150 udp PowerAlert Network Shutdown [Mike_Delgrosso_2] [Mike_Delgrosso_2] 2007-07-02 ++ Agent ++ Men & Mice Remote Control ++ ++menandmice-noh 4151 tcp IANA assigned this [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 ++ well-formed service name as ++ a replacement for ++ "menandmice_noh". ++ This entry is an alias to "menandmice-noh". This entry is now ++menandmice_noh 4151 tcp Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service ++ discovery mechanisms. ++ Men & Mice Remote Control ++ ++menandmice-noh 4151 udp IANA assigned this [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 ++ well-formed service name as ++ a replacement for ++ "menandmice_noh". ++ This entry is an alias to "menandmice-noh". This entry is now ++menandmice_noh 4151 udp Men & Mice Remote Control [Eggert_Thorlacius] [Eggert_Thorlacius] 2007-08-30 historic, not usable for use with many common service ++ discovery mechanisms. ++ iDigTech Multiplex ++ ++idig-mux 4152 tcp IANA assigned this [Robin_Findley] [Robin_Findley] 2007-05 ++ well-formed service name as ++ a replacement for ++ "idig_mux". ++ This entry is an alias to "idig-mux". This entry is now ++idig_mux 4152 tcp iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service ++ discovery mechanisms. ++ iDigTech Multiplex ++ ++idig-mux 4152 udp IANA assigned this [Robin_Findley] [Robin_Findley] 2007-05 ++ well-formed service name as ++ a replacement for ++ "idig_mux". ++ This entry is an alias to "idig-mux". This entry is now ++idig_mux 4152 udp iDigTech Multiplex [Robin_Findley] [Robin_Findley] 2007-05 historic, not usable for use with many common service ++ discovery mechanisms. ++mbl-battd 4153 tcp MBL Remote Battery [Claudio_Procida] [Claudio_Procida] 2007-05 ++ Monitoring ++mbl-battd 4153 udp MBL Remote Battery [Claudio_Procida] [Claudio_Procida] 2007-05 ++ Monitoring ++atlinks 4154 tcp atlinks device discovery [Scott_Griepentrog] [Scott_Griepentrog] 2002-10 ++atlinks 4154 udp atlinks device discovery [Scott_Griepentrog] [Scott_Griepentrog] 2002-10 ++bzr 4155 tcp Bazaar version control [Martin_Pool_2] [Martin_Pool_2] 2007-02 ++ system ++bzr 4155 udp Bazaar version control [Martin_Pool_2] [Martin_Pool_2] 2007-02 ++ system ++stat-results 4156 tcp STAT Results ++stat-results 4156 udp STAT Results ++stat-scanner 4157 tcp STAT Scanner Control ++stat-scanner 4157 udp STAT Scanner Control ++stat-cc 4158 tcp STAT Command Center [Darwin_Ammala] [Darwin_Ammala] 2007-03 ++stat-cc 4158 udp STAT Command Center [Darwin_Ammala] [Darwin_Ammala] 2007-03 ++nss 4159 tcp Network Security Service [Dave_Wierbowski] [Dave_Wierbowski] 2006-08 ++nss 4159 udp Network Security Service [Dave_Wierbowski] [Dave_Wierbowski] 2006-08 ++jini-discovery 4160 tcp Jini Discovery [Mark_Hodapp] [Mark_Hodapp] ++jini-discovery 4160 udp Jini Discovery [Mark_Hodapp] [Mark_Hodapp] ++omscontact 4161 tcp OMS Contact ++omscontact 4161 udp OMS Contact ++omstopology 4162 tcp OMS Topology [David_Page] [David_Page] 2005-08 ++omstopology 4162 udp OMS Topology [David_Page] [David_Page] 2005-08 ++silverpeakpeer 4163 tcp Silver Peak Peer Protocol [Damon_Ennis] [Damon_Ennis] 2007-03 ++silverpeakpeer 4163 udp Silver Peak Peer Protocol [Damon_Ennis] [Damon_Ennis] 2007-03 ++silverpeakcomm 4164 tcp Silver Peak Communication [Damon_Ennis] [Damon_Ennis] 2007-03 ++ Protocol ++silverpeakcomm 4164 udp Silver Peak Communication [Damon_Ennis] [Damon_Ennis] 2007-03 ++ Protocol ++altcp 4165 tcp ArcLink over Ethernet [Dmitry_Brant] [Dmitry_Brant] 2007-03 ++altcp 4165 udp ArcLink over Ethernet [Dmitry_Brant] [Dmitry_Brant] 2007-03 ++joost 4166 tcp Joost Peer to Peer Protocol [Colm_MacCarthaigh] [Colm_MacCarthaigh] 2007-04 ++joost 4166 udp Joost Peer to Peer Protocol [Colm_MacCarthaigh] [Colm_MacCarthaigh] 2007-04 ++ddgn 4167 tcp DeskDirect Global Network [Laurie_Charlwood] [Laurie_Charlwood] 2007-08-22 ++ddgn 4167 udp DeskDirect Global Network [Laurie_Charlwood] [Laurie_Charlwood] 2007-08-22 ++pslicser 4168 tcp PrintSoft License Server [David_Weisgerber] [David_Weisgerber] 2007-09-27 ++pslicser 4168 udp PrintSoft License Server [David_Weisgerber] [David_Weisgerber] 2007-09-27 ++iadt 4169 tcp Automation Drive Interface [Paul_Suhler] [Paul_Suhler] 2008-02-15 ++ Transport ++iadt-disc 4169 udp Internet ADT Discovery [Paul_A_Suhler] [Paul_A_Suhler] 2009-02-06 ++ Protocol ++d-cinema-csp 4170 tcp SMPTE Content Synchonization [Michael_Karagosian] [Michael_Karagosian] 2008-09-04 ++ Protocol ++ 4170 udp Reserved ++ml-svnet 4171 tcp Maxlogic Supervisor [Taha_Paksu] [Taha_Paksu] 2009-12-21 ++ Communication ++ 4171 udp Reserved ++pcoip 4172 tcp PC over IP [Teradici] [Jeff_Dillabough] 2009-12-23 2012-03-06 ++pcoip 4172 udp PC over IP [Teradici] [Jeff_Dillabough] 2009-12-23 2012-03-06 ++ 4173 tcp Reserved ++mma-discovery 4173 udp MMA Device Discovery [MIDI_Manufacturers_Assoc_Inc] [Tom_White] 2011-11-14 ++smcluster 4174 tcp StorMagic Cluster Services [Chris_Farey] [Chris_Farey] 2011-03-09 ++sm-disc 4174 udp StorMagic Discovery [StorMagic_Ltd] [Chris_Farey] 2011-12-16 ++bccp 4175 tcp Brocade Cluster [Norival_Figueira] [Norival_Figueira] 2010-04-07 ++ Communication Protocol ++ 4175 udp Reserved ++tl-ipcproxy 4176 tcp Translattice Cluster IPC [Michael_Lyle] [Michael_Lyle] 2009-11-03 ++ Proxy ++ 4176 udp Reserved ++wello 4177 tcp Wello P2P pubsub service [Christian_Westbrook] [Christian_Westbrook] 2007-11-15 ++wello 4177 udp Wello P2P pubsub service [Christian_Westbrook] [Christian_Westbrook] 2007-11-15 ++storman 4178 tcp StorMan [Werner_Guertler] [Werner_Guertler] 2009-05-11 ++storman 4178 udp StorMan [Werner_Guertler] [Werner_Guertler] 2009-05-11 ++MaxumSP 4179 tcp Maxum Services [Greg_Stine] [Greg_Stine] 2007-07-05 ++MaxumSP 4179 udp Maxum Services [Greg_Stine] [Greg_Stine] 2007-07-05 ++httpx 4180 tcp HTTPX [Paul_McGough] [Paul_McGough] 2007-02 ++httpx 4180 udp HTTPX [Paul_McGough] [Paul_McGough] 2007-02 ++macbak 4181 tcp MacBak [Wes_Peters] [Wes_Peters] 2007-04 ++macbak 4181 udp MacBak [Wes_Peters] [Wes_Peters] 2007-04 ++pcptcpservice 4182 tcp Production Company Pro TCP [Ben_McNeill] [Ben_McNeill] 2007-05 ++ Service ++pcptcpservice 4182 udp Production Company Pro TCP [Ben_McNeill] [Ben_McNeill] 2007-05 ++ Service ++gmmp 4183 tcp General Metaverse Messaging [Gareth_Nelson] [Gareth_Nelson] 2007-06 ++ Protocol ++gmmp 4183 udp General Metaverse Messaging [Gareth_Nelson] [Gareth_Nelson] 2007-06 ++ Protocol ++ UNIVERSE SUITE MESSAGE ++ SERVICE ++ ++universe-suite 4184 tcp IANA assigned this [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 ++ well-formed service name as ++ a replacement for ++ "universe_suite". ++ UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now ++universe_suite 4184 tcp SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service ++ discovery mechanisms. ++ UNIVERSE SUITE MESSAGE ++ SERVICE ++ ++universe-suite 4184 udp IANA assigned this [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 ++ well-formed service name as ++ a replacement for ++ "universe_suite". ++ UNIVERSE SUITE MESSAGE This entry is an alias to "universe-suite". This entry is now ++universe_suite 4184 udp SERVICE [Gary_ANDREWS] [Gary_ANDREWS] 2008-01-07 historic, not usable for use with many common service ++ discovery mechanisms. ++wcpp 4185 tcp Woven Control Plane Protocol [Christopher_LILJENST] [Christopher_LILJENST] 2008-04-14 ++wcpp 4185 udp Woven Control Plane Protocol [Christopher_LILJENST] [Christopher_LILJENST] 2008-04-14 ++boxbackupstore 4186 tcp Box Backup Store Service [Chris_Wilson] [Chris_Wilson] 2008-09-11 ++ 4186 udp Reserved ++ Cascade Proxy ++ ++csc-proxy 4187 tcp IANA assigned this [Matt_Craighead] [Matt_Craighead] 2008-09-11 ++ well-formed service name as ++ a replacement for ++ "csc_proxy". ++ This entry is an alias to "csc-proxy". This entry is now ++csc_proxy 4187 tcp Cascade Proxy [Matt_Craighead] [Matt_Craighead] 2008-09-11 historic, not usable for use with many common service ++ discovery mechanisms. ++ 4187 udp Reserved ++vatata 4188 tcp Vatata Peer to Peer Protocol [Song_Jian] [Song_Jian] 2008-09-15 ++vatata 4188 udp Vatata Peer to Peer Protocol [Song_Jian] [Song_Jian] 2008-09-15 ++pcep 4189 tcp Path Computation Element ++ Communication Protocol ++ 4189 udp Reserved [RFC5440] ++sieve 4190 tcp ManageSieve Protocol ++ 4190 udp Reserved [RFC5804] ++ 4191 tcp Reserved ++dsmipv6 4191 udp Dual Stack MIPv6 NAT [RFC5555] ++ Traversal ++azeti 4192 tcp Azeti Agent Service [Uwe_Holz] [Uwe_Holz] 2009-11-09 ++azeti-bd 4192 udp azeti blinddate [Michael_Werski] [Michael_Werski] 2010-02-18 ++pvxplusio 4193 tcp PxPlus remote file srvr [Mike_King] [Mike_King] 2009-11-09 ++ 4193 udp Reserved ++ 4194-4198 Unassigned ++eims-admin 4199 tcp EIMS ADMIN [Glenn_Anderson] [Glenn_Anderson] ++eims-admin 4199 udp EIMS ADMIN [Glenn_Anderson] [Glenn_Anderson] ++vrml-multi-use 4200-4299 VRML Multi User Systems [Mitra] [Mitra] ++corelccam 4300 tcp Corel CCam [Jason_Aiken] [Jason_Aiken] ++corelccam 4300 udp Corel CCam [Jason_Aiken] [Jason_Aiken] ++d-data 4301 tcp Diagnostic Data ++d-data 4301 udp Diagnostic Data ++d-data-control 4302 tcp Diagnostic Data Control [Jon_March] [Jon_March] 2006-09 ++d-data-control 4302 udp Diagnostic Data Control [Jon_March] [Jon_March] 2006-09 ++srcp 4303 tcp Simple Railroad Command [Matthias_Trute] [Matthias_Trute] 2007-01 ++ Protocol ++srcp 4303 udp Simple Railroad Command [Matthias_Trute] [Matthias_Trute] 2007-01 ++ Protocol ++owserver 4304 tcp One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers ++owserver 4304 udp One-Wire Filesystem Server [Paul_Alfille] [Paul_Alfille] 2007-01 Defined TXT keys: txtvers ++batman 4305 tcp better approach to mobile [Simon_Wunderlich] [Simon_Wunderlich] 2007-08-30 ++ ad-hoc networking ++batman 4305 udp better approach to mobile [Simon_Wunderlich] [Simon_Wunderlich] 2007-08-30 ++ ad-hoc networking ++pinghgl 4306 tcp Hellgate London [David_Berk] [David_Berk] 2007-08-30 ++pinghgl 4306 udp Hellgate London [David_Berk] [David_Berk] 2007-08-30 ++visicron-vs 4307 tcp Visicron Videoconference [Alexey_Vlaskin] [Alexey_Vlaskin] 2007-10-22 ++ Service ++visicron-vs 4307 udp Visicron Videoconference [Alexey_Vlaskin] [Alexey_Vlaskin] 2007-10-22 ++ Service ++compx-lockview 4308 tcp CompX-LockView [John_Payson] [John_Payson] 2007-10-22 ++compx-lockview 4308 udp CompX-LockView [John_Payson] [John_Payson] 2007-10-22 ++dserver 4309 tcp Exsequi Appliance Discovery [Angelo_Masci] [Angelo_Masci] 2007-01 ++dserver 4309 udp Exsequi Appliance Discovery [Angelo_Masci] [Angelo_Masci] 2007-01 ++mirrtex 4310 tcp Mir-RT exchange service [Sylvain_Robert] [Sylvain_Robert] 2008-02-14 ++mirrtex 4310 udp Mir-RT exchange service [Sylvain_Robert] [Sylvain_Robert] 2008-02-14 ++p6ssmc 4311 tcp P6R Secure Server Management [Jim_Susoy] [Jim_Susoy] 2010-01-21 ++ Console ++ 4311 udp Reserved ++pscl-mgt 4312 tcp Parascale Membership Manager [John_Muth] [John_Muth] 2010-01-21 ++ 4312 udp Reserved ++perrla 4313 tcp PERRLA User Services [Cliff_Batson] [Cliff_Batson] 2010-01-21 ++ 4313 udp Reserved ++ 4314-4319 Unassigned ++fdt-rcatp 4320 tcp FDT Remote Categorization [Russell_P_Holsclaw] [Russell_P_Holsclaw] 2006-03 ++ Protocol ++fdt-rcatp 4320 udp FDT Remote Categorization [Russell_P_Holsclaw] [Russell_P_Holsclaw] 2006-03 ++ Protocol ++rwhois 4321 tcp Remote Who Is [Mark_Kosters] [Mark_Kosters] [RFC2167] ++rwhois 4321 udp Remote Who Is [Mark_Kosters] [Mark_Kosters] [RFC2167] ++trim-event 4322 tcp TRIM Event Service ++trim-event 4322 udp TRIM Event Service ++trim-ice 4323 tcp TRIM ICE Service [Siva_Poobalasingam_2] [Siva_Poobalasingam_2] 2007-02 ++trim-ice 4323 udp TRIM ICE Service [Siva_Poobalasingam_2] [Siva_Poobalasingam_2] 2007-02 ++balour 4324 tcp Balour Game Server [Konstantin_Schauweck] [Konstantin_Schauweck] 2007-02 ++balour 4324 udp Balour Game Server [Konstantin_Schauweck] [Konstantin_Schauweck] 2007-02 ++geognosisman 4325 tcp Cadcorp GeognoSIS Manager ++ Service ++geognosisman 4325 udp Cadcorp GeognoSIS Manager ++ Service ++geognosis 4326 tcp Cadcorp GeognoSIS Service [Martin_Daly] [Martin_Daly] 2006-11 ++geognosis 4326 udp Cadcorp GeognoSIS Service [Martin_Daly] [Martin_Daly] 2006-11 ++jaxer-web 4327 tcp Jaxer Web Protocol [Uri_Sarid] [Uri_Sarid] 2008-01-07 ++jaxer-web 4327 udp Jaxer Web Protocol [Uri_Sarid] [Uri_Sarid] 2008-01-07 ++jaxer-manager 4328 tcp Jaxer Manager Command [Uri_Sarid] [Uri_Sarid] 2008-01-22 ++ Protocol ++jaxer-manager 4328 udp Jaxer Manager Command [Uri_Sarid] [Uri_Sarid] 2008-01-22 ++ Protocol ++ PubliQare Distributed ++publiqare-sync 4329 tcp Environment Synchronisation [Tom_Maaswinkel] [Tom_Maaswinkel] 2011-02-07 ++ Engine ++ 4329 udp Reserved ++ 4330-4339 Unassigned ++gaia 4340 tcp Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 ++gaia 4340 udp Gaia Connector Protocol [Philippe_Detournay] [Philippe_Detournay] 2007-11-12 ++lisp-data 4341 tcp LISP Data Packets [Dino_Farinacci] [Dino_Farinacci] 2007-11-12 ++lisp-data 4341 udp LISP Data Packets [IESG] [IETF_Chair] 2007-11-12 2012-04-26 [draft-ietf-lisp-22] ++lisp-cons 4342 tcp LISP-CONS Control ++lisp-control 4342 udp LISP Data-Triggered Control [IESG] [IETF_Chair] 2007-05 2012-04-26 [draft-ietf-lisp-22] ++unicall 4343 tcp UNICALL [James_Powell_2] [James_Powell_2] ++unicall 4343 udp UNICALL [James_Powell_2] [James_Powell_2] ++vinainstall 4344 tcp VinaInstall [Jay_Slupesky] [Jay_Slupesky] ++vinainstall 4344 udp VinaInstall [Jay_Slupesky] [Jay_Slupesky] ++m4-network-as 4345 tcp Macro 4 Network AS [Paul_Wren] [Paul_Wren] ++m4-network-as 4345 udp Macro 4 Network AS [Paul_Wren] [Paul_Wren] ++elanlm 4346 tcp ELAN LM [Paul_Ballew] [Paul_Ballew] ++elanlm 4346 udp ELAN LM [Paul_Ballew] [Paul_Ballew] ++lansurveyor 4347 tcp LAN Surveyor [Michael_Swan] [Michael_Swan] ++lansurveyor 4347 udp LAN Surveyor [Michael_Swan] [Michael_Swan] ++itose 4348 tcp ITOSE [Michael_Haeuptle] [Michael_Haeuptle] ++itose 4348 udp ITOSE [Michael_Haeuptle] [Michael_Haeuptle] ++fsportmap 4349 tcp File System Port Map [Ron_Minnich_2] [Ron_Minnich_2] ++fsportmap 4349 udp File System Port Map [Ron_Minnich_2] [Ron_Minnich_2] ++net-device 4350 tcp Net Device [Glenn_Peterson] [Glenn_Peterson] ++net-device 4350 udp Net Device [Glenn_Peterson] [Glenn_Peterson] ++plcy-net-svcs 4351 tcp PLCY Net Services [J_J_Ekstrom] [J_J_Ekstrom] ++plcy-net-svcs 4351 udp PLCY Net Services [J_J_Ekstrom] [J_J_Ekstrom] ++pjlink 4352 tcp Projector Link [Mitsuo_Kodama] [Mitsuo_Kodama] 2005-06 ++pjlink 4352 udp Projector Link [Mitsuo_Kodama] [Mitsuo_Kodama] 2005-06 ++f5-iquery 4353 tcp F5 iQuery [Tom_Kee] [Tom_Kee] ++f5-iquery 4353 udp F5 iQuery [Tom_Kee] [Tom_Kee] ++qsnet-trans 4354 tcp QSNet Transmitter ++qsnet-trans 4354 udp QSNet Transmitter ++qsnet-workst 4355 tcp QSNet Workstation ++qsnet-workst 4355 udp QSNet Workstation ++qsnet-assist 4356 tcp QSNet Assistant ++qsnet-assist 4356 udp QSNet Assistant ++qsnet-cond 4357 tcp QSNet Conductor ++qsnet-cond 4357 udp QSNet Conductor ++qsnet-nucl 4358 tcp QSNet Nucleus [Neer_Kleinman] [Neer_Kleinman] ++qsnet-nucl 4358 udp QSNet Nucleus [Neer_Kleinman] [Neer_Kleinman] ++omabcastltkm 4359 tcp OMA BCAST Long-Term Key [Frank_Hartung] [Frank_Hartung] 2007-09-07 ++ Messages ++omabcastltkm 4359 udp OMA BCAST Long-Term Key [Frank_Hartung] [Frank_Hartung] 2007-09-07 ++ Messages ++ Matrix VNet Communication ++ Protocol ++ ++matrix-vnet 4360 tcp IANA assigned this [Rehan_Mahmood] [Rehan_Mahmood] 2009-03-18 ++ well-formed service name as ++ a replacement for ++ "matrix_vnet". ++ Matrix VNet Communication This entry is an alias to "matrix-vnet". This entry is now ++matrix_vnet 4360 tcp Protocol [Rehan_Mahmood] [Rehan_Mahmood] 2009-03-18 historic, not usable for use with many common service ++ discovery mechanisms. ++ 4360 udp Reserved ++ 4361 tcp Reserved ++nacnl 4361 udp NavCom Discovery and Control [Yilei_Jia] [Yilei_Jia] 2009-03-18 ++ Port ++ 4362 tcp Reserved ++afore-vdp-disc 4362 udp AFORE vNode Discovery [Michael_Richardson] [Michael_Richardson] 2011-02-08 ++ protocol ++ 4363-4367 Unassigned ++wxbrief 4368 tcp WeatherBrief Direct [Kim_Alan_Waggoner] [Kim_Alan_Waggoner] 2006-11 ++wxbrief 4368 udp WeatherBrief Direct [Kim_Alan_Waggoner] [Kim_Alan_Waggoner] 2006-11 ++epmd 4369 tcp Erlang Port Mapper Daemon [Erlang] [Erlang] ++epmd 4369 udp Erlang Port Mapper Daemon [Erlang] [Erlang] ++ ELPRO V2 Protocol Tunnel ++ ++elpro-tunnel 4370 tcp IANA assigned this [Harry_Courtice] [Harry_Courtice] 2008-04-14 ++ well-formed service name as ++ a replacement for ++ "elpro_tunnel". ++ This entry is an alias to "elpro-tunnel". This entry is now ++elpro_tunnel 4370 tcp ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service ++ discovery mechanisms. ++ ELPRO V2 Protocol Tunnel ++ ++elpro-tunnel 4370 udp IANA assigned this [Harry_Courtice] [Harry_Courtice] 2008-04-14 ++ well-formed service name as ++ a replacement for ++ "elpro_tunnel". ++ This entry is an alias to "elpro-tunnel". This entry is now ++elpro_tunnel 4370 udp ELPRO V2 Protocol Tunnel [Harry_Courtice] [Harry_Courtice] 2008-04-14 historic, not usable for use with many common service ++ discovery mechanisms. ++l2c-control 4371 tcp LAN2CAN Control [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 ++l2c-disc 4371 udp LAN2CAN Discovery [Phil_Tolson] [Phil_Tolson] 2010-01-21 ++l2c-data 4372 tcp LAN2CAN Data [Phil_Tolson] [Phil_Tolson] 2008-07-07 Modified: 21 January 2010 ++l2c-data 4372 udp LAN2CAN Data [Phil_Tolson] [Phil_Tolson] 2010-01-21 ++remctl 4373 tcp Remote Authenticated Command [Russ_Allbery] [Russ_Allbery] 2007-08-30 ++ Service ++remctl 4373 udp Remote Authenticated Command [Russ_Allbery] [Russ_Allbery] 2007-08-30 ++ Service ++psi-ptt 4374 tcp PSI Push-to-Talk Protocol [Frank_B] [Frank_B] 2008-07-17 ++ 4374 udp Reserved ++tolteces 4375 tcp Toltec EasyShare [Joon_Radley_2] [Joon_Radley_2] 2008-10-21 ++tolteces 4375 udp Toltec EasyShare [Joon_Radley_2] [Joon_Radley_2] 2008-10-21 ++bip 4376 tcp BioAPI Interworking [Jean_Paul_Lemaire] [Jean_Paul_Lemaire] 2007-07-05 ++bip 4376 udp BioAPI Interworking [Jean_Paul_Lemaire] [Jean_Paul_Lemaire] 2007-07-05 ++cp-spxsvr 4377 tcp Cambridge Pixel SPx Server ++cp-spxsvr 4377 udp Cambridge Pixel SPx Server ++cp-spxdpy 4378 tcp Cambridge Pixel SPx Display [Richard_Warren] [Richard_Warren] 2007-07-05 ++cp-spxdpy 4378 udp Cambridge Pixel SPx Display [Richard_Warren] [Richard_Warren] 2007-07-05 ++ctdb 4379 tcp CTDB [Ronnie_Sahlberg] [Ronnie_Sahlberg] 2007-07-05 ++ctdb 4379 udp CTDB [Ronnie_Sahlberg] [Ronnie_Sahlberg] 2007-07-05 ++ 4380-4388 Unassigned ++xandros-cms 4389 tcp Xandros Community Management [Stephen_M_Webb] [Stephen_M_Webb] 2007-05 ++ Service ++xandros-cms 4389 udp Xandros Community Management [Stephen_M_Webb] [Stephen_M_Webb] 2007-05 ++ Service ++wiegand 4390 tcp Physical Access Control [Scott_Guthery_2] [Scott_Guthery_2] 2008-08-25 ++wiegand 4390 udp Physical Access Control [Scott_Guthery_2] [Scott_Guthery_2] 2008-08-25 ++apwi-imserver 4391 tcp American Printware IMServer [Lech_Lakomy] [Lech_Lakomy] 2009-02-12 ++ Protocol ++ 4391 udp Reserved ++apwi-rxserver 4392 tcp American Printware RXServer [Lech_Lakomy] [Lech_Lakomy] 2009-02-12 ++ Protocol ++ 4392 udp Reserved ++apwi-rxspooler 4393 tcp American Printware RXSpooler [Lech_Lakomy] [Lech_Lakomy] 2009-02-12 ++ Protocol ++ 4393 udp Reserved ++ 4394 tcp Reserved ++apwi-disc 4394 udp American Printware Discovery [Lech_Lakomy] [Lech_Lakomy] 2009-02-12 ++omnivisionesx 4395 tcp OmniVision communication for [Vacquier_Serge] [Vacquier_Serge] 2009-02-12 ++ Virtual environments ++omnivisionesx 4395 udp OmniVision communication for [Vacquier_Serge] [Vacquier_Serge] 2009-02-12 ++ Virtual environments ++fly 4396 tcp Fly Object Space [Nigel_Warren] [Nigel_Warren] 2009-02-12 ++ 4396 udp Reserved ++ 4397-4399 Unassigned ++ds-srv 4400 tcp ASIGRA Services [David_Farajun] [David_Farajun] 2004-11 ++ds-srv 4400 udp ASIGRA Services [David_Farajun] [David_Farajun] 2004-11 ++ds-srvr 4401 tcp ASIGRA Televaulting ++ DS-System Service ++ds-srvr 4401 udp ASIGRA Televaulting ++ DS-System Service ++ds-clnt 4402 tcp ASIGRA Televaulting ++ DS-Client Service ++ds-clnt 4402 udp ASIGRA Televaulting ++ DS-Client Service ++ ASIGRA Televaulting ++ds-user 4403 tcp DS-Client ++ Monitoring/Management ++ ASIGRA Televaulting ++ds-user 4403 udp DS-Client ++ Monitoring/Management ++ ASIGRA Televaulting ++ds-admin 4404 tcp DS-System ++ Monitoring/Management ++ ASIGRA Televaulting ++ds-admin 4404 udp DS-System ++ Monitoring/Management ++ds-mail 4405 tcp ASIGRA Televaulting Message ++ Level Restore service ++ds-mail 4405 udp ASIGRA Televaulting Message ++ Level Restore service ++ds-slp 4406 tcp ASIGRA Televaulting [Andrei_Litvinn] [Andrei_Litvinn] 2005-01 ++ DS-Sleeper Service ++ds-slp 4406 udp ASIGRA Televaulting [Andrei_Litvinn] [Andrei_Litvinn] 2005-01 ++ DS-Sleeper Service ++nacagent 4407 tcp Network Access Control Agent [ITGroup] [ITGroup] 2008-06-30 ++ 4407 udp Reserved ++slscc 4408 tcp SLS Technology Control [Steven_Sweeting] [Steven_Sweeting] 2008-01-28 ++ Centre ++ 4408 udp Reserved ++netcabinet-com 4409 tcp Net-Cabinet comunication [Ian_Manning_2] [Ian_Manning_2] 2009-12-16 ++ 4409 udp Reserved ++itwo-server 4410 tcp RIB iTWO Application Server [Kristean_Heisler_2] [Kristean_Heisler_2] 2009-12-16 ++ 4410 udp Reserved ++found 4411 tcp Found Messaging Protocol [Found_Software] [John_Mitchell] 2012-04-11 Defined TXT keys: id, key ++ 4411 udp Reserved ++ 4412-4424 Unassigned ++netrockey6 4425 tcp NetROCKEY6 SMART Plus [Feitian_Technologies] [Feitian_Technologies] 2010-09-15 ++ Service ++netrockey6 4425 udp NetROCKEY6 SMART Plus [Feitian_Technologies] [Feitian_Technologies] 2010-09-15 ++ Service ++beacon-port-2 4426 tcp SMARTS Beacon Port [Eyal_Yardeni] [Eyal_Yardeni] 2003-11 ++beacon-port-2 4426 udp SMARTS Beacon Port [Eyal_Yardeni] [Eyal_Yardeni] 2003-11 ++drizzle 4427 tcp Drizzle database server [Elliot_Murphy] [Elliot_Murphy] 2008-07-09 ++ 4427 udp Reserved ++omviserver 4428 tcp OMV-Investigation [Serge_Vacquier] [Serge_Vacquier] 2009-05-20 ++ Server-Client ++ 4428 udp Reserved ++omviagent 4429 tcp OMV Investigation [Serge_Vacquier] [Serge_Vacquier] 2009-05-20 ++ Agent-Server ++ 4429 udp Reserved ++rsqlserver 4430 tcp REAL SQL Server [Marco_Bambini] [Marco_Bambini] 2008-08-28 ++rsqlserver 4430 udp REAL SQL Server [Marco_Bambini] [Marco_Bambini] 2008-08-28 ++wspipe 4431 tcp adWISE Pipe [Heikki_E] [Heikki_E] 2009-06-18 ++ 4431 udp Reserved ++ 4432 Unassigned ++vop 4433 tcp Versile Object Protocol [Versile_AS] [Tore_Skaug] 2012-02-01 ++ 4433 udp Reserved ++ 4434-4440 Unassigned ++ 4441 tcp Reserved ++netblox 4441 udp Netblox Protocol [Brian_S_Locke] [Brian_S_Locke] 2008-07-10 ++saris 4442 tcp Saris ++saris 4442 udp Saris ++pharos 4443 tcp Pharos [TeleConsult] [TeleConsult] ++pharos 4443 udp Pharos [TeleConsult] [TeleConsult] ++ krb524 ++ assigned the ++krb524 4444 tcp KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used ++ it without an ++ assignment ++ krb524 ++ assigned the ++krb524 4444 udp KRB524 [B_Clifford_Neuman] [B_Clifford_Neuman] port, nv used ++ it without an ++ assignment ++ krb524 ++ assigned the ++nv-video 4444 tcp NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used ++ it without an ++ assignment ++ krb524 ++ assigned the ++nv-video 4444 udp NV Video default [Ron_Frederick] [Ron_Frederick] port, nv used ++ it without an ++ assignment ++upnotifyp 4445 tcp UPNOTIFYP [Mark_Fox] [Mark_Fox] ++upnotifyp 4445 udp UPNOTIFYP [Mark_Fox] [Mark_Fox] ++n1-fwp 4446 tcp N1-FWP ++n1-fwp 4446 udp N1-FWP ++n1-rmgmt 4447 tcp N1-RMGMT [Lori_Tassin] [Lori_Tassin] ++n1-rmgmt 4447 udp N1-RMGMT [Lori_Tassin] [Lori_Tassin] ++asc-slmd 4448 tcp ASC Licence Manager [Casper_Stoel] [Casper_Stoel] ++asc-slmd 4448 udp ASC Licence Manager [Casper_Stoel] [Casper_Stoel] ++privatewire 4449 tcp PrivateWire [Uri_Resnitzky] [Uri_Resnitzky] ++privatewire 4449 udp PrivateWire [Uri_Resnitzky] [Uri_Resnitzky] ++camp 4450 tcp Common ASCII Messaging [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++ Protocol ++camp 4450 udp Common ASCII Messaging [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++ Protocol ++ctisystemmsg 4451 tcp CTI System Msg [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++ctisystemmsg 4451 udp CTI System Msg [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++ctiprogramload 4452 tcp CTI Program Load [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++ctiprogramload 4452 udp CTI Program Load [Control_Technology_Inc] [Clint_Eskew] 2011-10-28 ++nssalertmgr 4453 tcp NSS Alert Manager ++nssalertmgr 4453 udp NSS Alert Manager ++nssagentmgr 4454 tcp NSS Agent Manager [Jim_Hill] [Jim_Hill] ++nssagentmgr 4454 udp NSS Agent Manager [Jim_Hill] [Jim_Hill] ++prchat-user 4455 tcp PR Chat User ++prchat-user 4455 udp PR Chat User ++prchat-server 4456 tcp PR Chat Server ++prchat-server 4456 udp PR Chat Server ++prRegister 4457 tcp PR Register [Donny_Gilor] [Donny_Gilor] ++prRegister 4457 udp PR Register [Donny_Gilor] [Donny_Gilor] ++mcp 4458 tcp Matrix Configuration [Tim_DeBaillie] [Tim_DeBaillie] 2006-12 ++ Protocol ++mcp 4458 udp Matrix Configuration [Tim_DeBaillie] [Tim_DeBaillie] 2006-12 ++ Protocol ++ 4459-4483 Unassigned ++hpssmgmt 4484 tcp hpssmgmt service [David_Straw] [David_Straw] 2005-11 ++hpssmgmt 4484 udp hpssmgmt service [David_Straw] [David_Straw] 2005-11 ++assyst-dr 4485 tcp Assyst Data Repository [Albert_Cester] [Albert_Cester] 2008-08-26 ++ Service ++ 4485 udp Reserved ++icms 4486 tcp Integrated Client Message [Resource_Allocation] [Resource_Allocation] 2010-09-27 ++ Service ++icms 4486 udp Integrated Client Message [Resource_Allocation] [Resource_Allocation] 2010-09-27 ++ Service ++prex-tcp 4487 tcp Protocol for Remote [Daniel_Ruppert] [Daniel_Ruppert] 2010-09-16 ++ Execution over TCP ++ 4487 udp Reserved ++awacs-ice 4488 tcp Apple Wide Area Connectivity [Rory_McGuire] [Rory_McGuire] 2010-09-24 ++ Service ICE Bootstrap ++awacs-ice 4488 udp Apple Wide Area Connectivity [Rory_McGuire] [Rory_McGuire] 2010-09-24 ++ Service ICE Bootstrap ++ 4489-4499 Unassigned ++ipsec-nat-t 4500 tcp IPsec NAT-Traversal [RFC3947] ++ipsec-nat-t 4500 udp IPsec NAT-Traversal [RFC3947] ++ 4501 Unassigned [IANA] [IANA] De-registered 08 June 2001 ++a25-fap-fgw 4502 sctp A25 (FAP-FGW) [ThreeGPP2] [Zhiming_Li] 2012-01-11 ++ 4503-4534 Unassigned ++ehs 4535 tcp Event Heap Server ++ehs 4535 udp Event Heap Server ++ehs-ssl 4536 tcp Event Heap Server SSL [Brad_Johanson] [Brad_Johanson] 2005-08 ++ehs-ssl 4536 udp Event Heap Server SSL [Brad_Johanson] [Brad_Johanson] 2005-08 ++wssauthsvc 4537 tcp WSS Security Service [Mark_Tirschwell] [Mark_Tirschwell] 2006-01 ++wssauthsvc 4537 udp WSS Security Service [Mark_Tirschwell] [Mark_Tirschwell] 2006-01 ++swx-gate 4538 tcp Software Data Exchange [Julien_VALIENTE] [Julien_VALIENTE] 2006-05 ++ Gateway ++swx-gate 4538 udp Software Data Exchange [Julien_VALIENTE] [Julien_VALIENTE] 2006-05 ++ Gateway ++ 4539-4544 Unassigned ++worldscores 4545 tcp WorldScores [Steve_Davis] [Steve_Davis] ++worldscores 4545 udp WorldScores [Steve_Davis] [Steve_Davis] ++sf-lm 4546 tcp SF License Manager [Thomas_Koell] [Thomas_Koell] ++ (Sentinel) ++sf-lm 4546 udp SF License Manager [Thomas_Koell] [Thomas_Koell] ++ (Sentinel) ++lanner-lm 4547 tcp Lanner License Manager [Les_Enstone] [Les_Enstone] ++lanner-lm 4547 udp Lanner License Manager [Les_Enstone] [Les_Enstone] ++synchromesh 4548 tcp Synchromesh [Tom_Hawkins_2] [Tom_Hawkins_2] 2006-02 ++synchromesh 4548 udp Synchromesh [Tom_Hawkins_2] [Tom_Hawkins_2] 2006-02 ++aegate 4549 tcp Aegate PMR Service [Nick_Warrington] [Nick_Warrington] 2006-03 ++aegate 4549 udp Aegate PMR Service [Nick_Warrington] [Nick_Warrington] 2006-03 ++gds-adppiw-db 4550 tcp Perman I Interbase Server [Leo_Lesage] [Leo_Lesage] 2006-04 ++gds-adppiw-db 4550 udp Perman I Interbase Server [Leo_Lesage] [Leo_Lesage] 2006-04 ++ieee-mih 4551 tcp MIH Services [RFC5677] ++ieee-mih 4551 udp MIH Services [RFC5677] ++menandmice-mon 4552 tcp Men and Mice Monitoring [Carsten_Strotmann] [Carsten_Strotmann] 2009-05-20 ++menandmice-mon 4552 udp Men and Mice Monitoring [Carsten_Strotmann] [Carsten_Strotmann] 2009-05-20 ++icshostsvc 4553 tcp ICS host services [Gordan_Vosicki] [Gordan_Vosicki] 2009-09-23 ++ 4553 udp Reserved ++msfrs 4554 tcp MS FRS Replication [Kev_George] [Kev_George] 2006-09 ++msfrs 4554 udp MS FRS Replication [Kev_George] [Kev_George] 2006-09 ++rsip 4555 tcp RSIP Port [RFC3103] ++rsip 4555 udp RSIP Port [RFC3103] ++dtn-bundle-tcp 4556 tcp DTN Bundle TCP CL Protocol ++dtn-bundle-udp 4556 udp DTN Bundle UDP CL Protocol [Michael_Demmer] [Michael_Demmer] 2006-11 ++ 4557 tcp Reserved ++mtcevrunqss 4557 udp Marathon everRun Quorum [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 ++ Service Server ++ 4558 tcp Reserved ++mtcevrunqman 4558 udp Marathon everRun Quorum [David_Schwartz_2] [David_Schwartz_2] 2009-06-18 ++ Service Manager ++hylafax 4559 tcp HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 ++hylafax 4559 udp HylaFAX [Lee_Howard] [Lee_Howard] 2002-03 ++ 4560-4565 Unassigned ++kwtc 4566 tcp Kids Watch Time Control [Larry_Zarou] [Larry_Zarou] 2006-10 ++ Service ++kwtc 4566 udp Kids Watch Time Control [Larry_Zarou] [Larry_Zarou] 2006-10 ++ Service ++tram 4567 tcp TRAM [Joe_Wesley] [Joe_Wesley] ++tram 4567 udp TRAM [Joe_Wesley] [Joe_Wesley] ++bmc-reporting 4568 tcp BMC Reporting [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-reporting 4568 udp BMC Reporting [Portnoy_Boxman] [Portnoy_Boxman] ++ Defined TXT keys: ++ auth plaintext | md5 | rsakeys ++ userid alphanumeric, additionally '_', '+', '-' ++ secret any printable ASCII characters ++ domain any DNS domain name or IP address ++ extension alphanumeric, additionally '*', '#', '_', '+', '-' ++ context alphanumeric, additionally '_', '+', '-' ++iax 4569 tcp Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 ++ welcome alphanumeric, additionally '*', '#', '_', '+', '-' ++ voicemail alphanumeric, additionally '*', '#', '_', '+', '-' ++ reception alphanumeric, additionally '*', '#', '_', '+', '-' ++ echotest alphanumeric, additionally '*', '#', '_', '+', '-' ++ ivrtest alphanumeric, additionally '*', '#', '_', '+', '-' ++ All of these TXT record keys are optional, they may be ++ omitted. Further keys may be added in the future. ++ Defined TXT keys: ++ auth plaintext | md5 | rsakeys ++ userid alphanumeric, additionally '_', '+', '-' ++ secret any printable ASCII characters ++ domain any DNS domain name or IP address ++ extension alphanumeric, additionally '*', '#', '_', '+', '-' ++ context alphanumeric, additionally '_', '+', '-' ++iax 4569 udp Inter-Asterisk eXchange [Benjamin_Kowarsch] [Benjamin_Kowarsch] [RFC5456] trunk yes | no | 0 | 1 ++ welcome alphanumeric, additionally '*', '#', '_', '+', '-' ++ voicemail alphanumeric, additionally '*', '#', '_', '+', '-' ++ reception alphanumeric, additionally '*', '#', '_', '+', '-' ++ echotest alphanumeric, additionally '*', '#', '_', '+', '-' ++ ivrtest alphanumeric, additionally '*', '#', '_', '+', '-' ++ All of these TXT record keys are optional, they may be ++ omitted. Further keys may be added in the future. ++ 4570-4589 Unassigned ++rid 4590 tcp RID over HTTP/TLS [IESG] [IETF_Chair] [RFC6546] ++ 4590 udp Reserved ++l3t-at-an 4591 tcp HRPD L3T (AT-AN) [Avi_Lior] [Avi_Lior] 2009-02-27 ++l3t-at-an 4591 udp HRPD L3T (AT-AN) [Avi_Lior] [Avi_Lior] 2009-02-27 ++ 4592 tcp Reserved ++hrpd-ith-at-an 4592 udp HRPD-ITH (AT-AN) [David_Ott] [David_Ott] 2008-06-05 ++ipt-anri-anri 4593 tcp IPT (ANRI-ANRI) ++ipt-anri-anri 4593 udp IPT (ANRI-ANRI) ++ias-session 4594 tcp IAS-Session (ANRI-ANRI) ++ias-session 4594 udp IAS-Session (ANRI-ANRI) ++ias-paging 4595 tcp IAS-Paging (ANRI-ANRI) ++ias-paging 4595 udp IAS-Paging (ANRI-ANRI) ++ias-neighbor 4596 tcp IAS-Neighbor (ANRI-ANRI) [David_Ott] [David_Ott] 2007-07-31 ++ias-neighbor 4596 udp IAS-Neighbor (ANRI-ANRI) [David_Ott] [David_Ott] 2007-07-31 ++a21-an-1xbs 4597 tcp A21 (AN-1xBS) [David_Ott] [David_Ott] 2006-02 ++a21-an-1xbs 4597 udp A21 (AN-1xBS) [David_Ott] [David_Ott] 2006-02 ++a16-an-an 4598 tcp A16 (AN-AN) [David_Ott] [David_Ott] 2005-12 ++a16-an-an 4598 udp A16 (AN-AN) [David_Ott] [David_Ott] 2005-12 ++a17-an-an 4599 tcp A17 (AN-AN) [David_Ott] [David_Ott] 2006-02 ++a17-an-an 4599 udp A17 (AN-AN) [David_Ott] [David_Ott] 2006-02 ++piranha1 4600 tcp Piranha1 ++piranha1 4600 udp Piranha1 ++piranha2 4601 tcp Piranha2 [Primark_Corporation] [Primark_Corporation] ++piranha2 4601 udp Piranha2 [Primark_Corporation] [Primark_Corporation] ++mtsserver 4602 tcp EAX MTS Server [Pedro_A_Rodriguez] [Pedro_A_Rodriguez] 2008-08-06 ++ 4602 udp Reserved ++menandmice-upg 4603 tcp Men & Mice Upgrade Agent [Eggert_Thorlacius_2] [Eggert_Thorlacius_2] 2010-01-27 ++ 4603 udp Reserved ++ 4604-4657 Unassigned ++playsta2-app 4658 tcp PlayStation2 App Port ++playsta2-app 4658 udp PlayStation2 App Port ++playsta2-lob 4659 tcp PlayStation2 Lobby Port [Noam_Rimon] [Noam_Rimon] 2004-12 ++playsta2-lob 4659 udp PlayStation2 Lobby Port [Noam_Rimon] [Noam_Rimon] 2004-12 ++smaclmgr 4660 tcp smaclmgr [Hiromi_Taki] [Hiromi_Taki] ++smaclmgr 4660 udp smaclmgr [Hiromi_Taki] [Hiromi_Taki] ++kar2ouche 4661 tcp Kar2ouche Peer location [Andy_Krouwel] [Andy_Krouwel] ++ service ++kar2ouche 4661 udp Kar2ouche Peer location [Andy_Krouwel] [Andy_Krouwel] ++ service ++oms 4662 tcp OrbitNet Message Service [Roy_Davies] [Roy_Davies] 2005-08 ++oms 4662 udp OrbitNet Message Service [Roy_Davies] [Roy_Davies] 2005-08 ++noteit 4663 tcp Note It! Message Service [Pedro_Alpedrinha] [Pedro_Alpedrinha] 2006-02 ++noteit 4663 udp Note It! Message Service [Pedro_Alpedrinha] [Pedro_Alpedrinha] 2006-02 ++ems 4664 tcp Rimage Messaging Server [David_V_Raskin] [David_V_Raskin] 2006-02 ++ems 4664 udp Rimage Messaging Server [David_V_Raskin] [David_V_Raskin] 2006-02 ++contclientms 4665 tcp Container Client Message [Bruce_Thompson] [Bruce_Thompson] 2006-02 ++ Service ++contclientms 4665 udp Container Client Message [Bruce_Thompson] [Bruce_Thompson] 2006-02 ++ Service ++eportcomm 4666 tcp E-Port Message Service ++eportcomm 4666 udp E-Port Message Service ++mmacomm 4667 tcp MMA Comm Services ++mmacomm 4667 udp MMA Comm Services ++mmaeds 4668 tcp MMA EDS Service [Robert_Shaffer] [Robert_Shaffer] 2006-02 ++mmaeds 4668 udp MMA EDS Service [Robert_Shaffer] [Robert_Shaffer] 2006-02 ++eportcommdata 4669 tcp E-Port Data Service [Robert_Shaffer] [Robert_Shaffer] 2006-02 ++eportcommdata 4669 udp E-Port Data Service [Robert_Shaffer] [Robert_Shaffer] 2006-02 ++light 4670 tcp Light packets transfer [Adam_Golovenko] [Adam_Golovenko] 2006-10 ++ protocol ++light 4670 udp Light packets transfer [Adam_Golovenko] [Adam_Golovenko] 2006-10 ++ protocol ++acter 4671 tcp Bull RSF action server [Christian_Caudrelier] [Christian_Caudrelier] 2006-02 ++acter 4671 udp Bull RSF action server [Christian_Caudrelier] [Christian_Caudrelier] 2006-02 ++rfa 4672 tcp remote file access server ++rfa 4672 udp remote file access server ++cxws 4673 tcp CXWS Operations [Phil_Abercrombie] [Phil_Abercrombie] 2005-08 ++cxws 4673 udp CXWS Operations [Phil_Abercrombie] [Phil_Abercrombie] 2005-08 ++appiq-mgmt 4674 tcp AppIQ Agent Management [Phil_Abercrombie] [Phil_Abercrombie] 2005-08 ++appiq-mgmt 4674 udp AppIQ Agent Management [Phil_Abercrombie] [Phil_Abercrombie] 2005-08 ++dhct-status 4675 tcp BIAP Device Status ++dhct-status 4675 udp BIAP Device Status ++dhct-alerts 4676 tcp BIAP Generic Alert [Louis_Slothouber] [Louis_Slothouber] 2005-08 ++dhct-alerts 4676 udp BIAP Generic Alert [Louis_Slothouber] [Louis_Slothouber] 2005-08 ++bcs 4677 tcp Business Continuity Servi [Siew_Sim] [Siew_Sim] 2005-08 ++bcs 4677 udp Business Continuity Servi [Siew_Sim] [Siew_Sim] 2005-08 ++traversal 4678 tcp boundary traversal [Kevin_Lu] [Kevin_Lu] 2005-08 ++traversal 4678 udp boundary traversal [Kevin_Lu] [Kevin_Lu] 2005-08 ++mgesupervision 4679 tcp MGE UPS Supervision ++mgesupervision 4679 udp MGE UPS Supervision ++mgemanagement 4680 tcp MGE UPS Management [Lecuivre_J] [Lecuivre_J] 2005-08 ++mgemanagement 4680 udp MGE UPS Management [Lecuivre_J] [Lecuivre_J] 2005-08 ++parliant 4681 tcp Parliant Telephony System [Colin_Henein] [Colin_Henein] 2005-08 ++parliant 4681 udp Parliant Telephony System [Colin_Henein] [Colin_Henein] 2005-08 ++finisar 4682 tcp finisar [Christina_Mercier] [Christina_Mercier] 2005-08 ++finisar 4682 udp finisar [Christina_Mercier] [Christina_Mercier] 2005-08 ++spike 4683 tcp Spike Clipboard Service [Scott_Herscher] [Scott_Herscher] 2005-08 ++spike 4683 udp Spike Clipboard Service [Scott_Herscher] [Scott_Herscher] 2005-08 ++rfid-rp1 4684 tcp RFID Reader Protocol 1.0 [Michael_Mealling_2] [Michael_Mealling_2] 2005-08 ++rfid-rp1 4684 udp RFID Reader Protocol 1.0 [Michael_Mealling_2] [Michael_Mealling_2] 2005-08 ++autopac 4685 tcp Autopac Protocol [Peter_Hallenbeck] [Peter_Hallenbeck] 2005-08 ++autopac 4685 udp Autopac Protocol [Peter_Hallenbeck] [Peter_Hallenbeck] 2005-08 ++msp-os 4686 tcp Manina Service Protocol [Markus_Nix] [Markus_Nix] 2005-08 ++msp-os 4686 udp Manina Service Protocol [Markus_Nix] [Markus_Nix] 2005-08 ++nst 4687 tcp Network Scanner Tool FTP [Mala_Bhat] [Mala_Bhat] 2005-08 ++nst 4687 udp Network Scanner Tool FTP [Mala_Bhat] [Mala_Bhat] 2005-08 ++mobile-p2p 4688 tcp Mobile P2P Service [Hanz_Hager] [Hanz_Hager] 2008-12-04 ++mobile-p2p 4688 udp Mobile P2P Service [Hanz_Hager] [Hanz_Hager] 2008-12-04 ++altovacentral 4689 tcp Altova DatabaseCentral [Altova] [Altova] 2005-08 ++altovacentral 4689 udp Altova DatabaseCentral [Altova] [Altova] 2005-08 ++prelude 4690 tcp Prelude IDS message proto [Yoann_Vandoorselaere] [Yoann_Vandoorselaere] 2005-08 ++prelude 4690 udp Prelude IDS message proto [Yoann_Vandoorselaere] [Yoann_Vandoorselaere] 2005-08 ++mtn 4691 tcp monotone Netsync Protocol [Thomas_Keller] [Thomas_Keller] 2010-12-22 ++mtn 4691 udp monotone Netsync Protocol [Thomas_Keller] [Thomas_Keller] 2010-12-22 ++conspiracy 4692 tcp Conspiracy messaging [Jens_Edlund] [Jens_Edlund] 2005-08 ++conspiracy 4692 udp Conspiracy messaging [Jens_Edlund] [Jens_Edlund] 2005-08 ++ 4693-4699 Unassigned ++netxms-agent 4700 tcp NetXMS Agent ++netxms-agent 4700 udp NetXMS Agent ++netxms-mgmt 4701 tcp NetXMS Management ++netxms-mgmt 4701 udp NetXMS Management ++netxms-sync 4702 tcp NetXMS Server [Victor_Kirhenshtein] [Victor_Kirhenshtein] 2006-07 ++ Synchronization ++netxms-sync 4702 udp NetXMS Server [Victor_Kirhenshtein] [Victor_Kirhenshtein] 2006-07 ++ Synchronization ++ Network Performance Quality ++npqes-test 4703 tcp Evaluation System Test [Zhengli] [Zhengli] 2010-06-28 ++ Service ++ 4703 udp Reserved ++assuria-ins 4704 tcp Assuria Insider [Nick_Connor] [Nick_Connor] 2010-06-30 ++ 4704 udp Reserved ++ 4705-4724 Unassigned ++truckstar 4725 tcp TruckStar Service [Brian_Toothill] [Brian_Toothill] 2010-10-15 ++truckstar 4725 udp TruckStar Service [Brian_Toothill] [Brian_Toothill] 2010-10-15 ++ 4726 tcp Reserved ++a26-fap-fgw 4726 udp A26 (FAP-FGW) [David_Ott] [David_Ott] 2010-10-15 ++fcis 4727 tcp F-Link Client Information ++ Service ++fcis-disc 4727 udp F-Link Client Information [Makoto_Zukawa] [Makoto_Zukawa] 2010-10-15 ++ Service Discovery ++capmux 4728 tcp CA Port Multiplexer [Nigel_Groves] [Nigel_Groves] 2006-06 ++capmux 4728 udp CA Port Multiplexer [Nigel_Groves] [Nigel_Groves] 2006-06 ++ 4729 tcp Reserved ++gsmtap 4729 udp GSM Interface Tap [Harald_Welte] [Harald_Welte] 2009-01-16 ++gearman 4730 tcp Gearman Job Queue System [Eric_Day] [Eric_Day] 2009-01-16 ++gearman 4730 udp Gearman Job Queue System [Eric_Day] [Eric_Day] 2009-01-16 ++remcap 4731 tcp Remote Capture Protocol [Marc_Donner] [Marc_Donner] 2009-01-16 ++ 4731 udp Reserved ++ 4732 tcp Reserved ++ohmtrigger 4732 udp OHM server trigger [Franck_Lefevre] [Franck_Lefevre] 2009-11-18 ++resorcs 4733 tcp RES Orchestration Catalog [Bob_Janssen_2] [Bob_Janssen_2] 2009-11-18 ++ Services ++ 4733 udp Reserved ++ 4734-4736 Unassigned ++ipdr-sp 4737 tcp IPDR/SP [Ken_Sarno] [Ken_Sarno] 2005-08 ++ipdr-sp 4737 udp IPDR/SP [Ken_Sarno] [Ken_Sarno] 2005-08 ++solera-lpn 4738 tcp SoleraTec Locator [Mark_Armstrong] [Mark_Armstrong] 2005-12 ++solera-lpn 4738 udp SoleraTec Locator [Mark_Armstrong] [Mark_Armstrong] 2005-12 ++ipfix 4739 tcp IP Flow Info Export [Nevil_Brownlee] [Nevil_Brownlee] 2005-08 ++ipfix 4739 udp IP Flow Info Export [Nevil_Brownlee] [Nevil_Brownlee] 2005-08 ++ipfix 4739 sctp IP Flow Info Export [Nevil_Brownlee] [Nevil_Brownlee] 2006-01 ++ipfixs 4740 tcp ipfix protocol over TLS [Nevil_Brownlee] [Nevil_Brownlee] 2006-10 ++ipfixs 4740 sctp ipfix protocol over DTLS [Nevil_Brownlee] [Nevil_Brownlee] 2006-10 ++ipfixs 4740 udp ipfix protocol over DTLS [Nevil_Brownlee] [Nevil_Brownlee] 2006-10 ++lumimgrd 4741 tcp Luminizer Manager [George_Hwa] [George_Hwa] 2007-03 ++lumimgrd 4741 udp Luminizer Manager [George_Hwa] [George_Hwa] 2007-03 ++sicct 4742 tcp SICCT ++sicct-sdp 4742 udp SICCT Service Discovery [TeleTrusT_Deutschlan] [TeleTrusT_Deutschlan] 2006-04 ++ Protocol ++openhpid 4743 tcp openhpi HPI service [Thomas_Kanngieser] [Thomas_Kanngieser] 2006-01 ++openhpid 4743 udp openhpi HPI service [Thomas_Kanngieser] [Thomas_Kanngieser] 2006-01 ++ifsp 4744 tcp Internet File [Alex_White] [Alex_White] 2007-09-12 ++ Synchronization Protocol ++ifsp 4744 udp Internet File [Alex_White] [Alex_White] 2007-09-12 ++ Synchronization Protocol ++fmp 4745 tcp Funambol Mobile Push [Andrea_Gazzaniga] [Andrea_Gazzaniga] 2007-01 ++fmp 4745 udp Funambol Mobile Push [Andrea_Gazzaniga] [Andrea_Gazzaniga] 2007-01 ++ 4746-4748 Unassigned ++profilemac 4749 tcp Profile for Mac [David_Sinclair] [David_Sinclair] 2006-05 ++profilemac 4749 udp Profile for Mac [David_Sinclair] [David_Sinclair] 2006-05 ++ssad 4750 tcp Simple Service Auto [Dr_Horst_Herb] [Dr_Horst_Herb] 2005-12 ++ Discovery ++ssad 4750 udp Simple Service Auto [Dr_Horst_Herb] [Dr_Horst_Herb] 2005-12 ++ Discovery ++spocp 4751 tcp Simple Policy Control [Roland_Hedberg_2] [Roland_Hedberg_2] 2005-08 ++ Protocol ++spocp 4751 udp Simple Policy Control [Roland_Hedberg_2] [Roland_Hedberg_2] 2005-08 ++ Protocol ++snap 4752 tcp Simple Network Audio [Dameon_Wagner] [Dameon_Wagner] 2002-02 ++ Protocol ++snap 4752 udp Simple Network Audio [Dameon_Wagner] [Dameon_Wagner] 2002-02 ++ Protocol ++simon 4753 tcp Simple Invocation of Methods [Alexander_Christian] [Alexander_Christian] 2012-04-19 ++ Over Network (SIMON) ++ Simple Invocation of Methods ++simon-disc 4753 udp Over Network (SIMON) [Alexander_Christian] [Alexander_Christian] 2012-04-19 ++ Discovery ++ 4754-4783 Unassigned ++bfd-multi-ctl 4784 tcp BFD Multihop Control [Dave_Katz][Dave_Ward] [Dave_Katz][Dave_Ward] 2006-02 ++bfd-multi-ctl 4784 udp BFD Multihop Control [Dave_Katz][Dave_Ward] [Dave_Katz][Dave_Ward] 2006-02 ++ 4785 tcp Reserved ++cncp 4785 udp Cisco Nexus Control Protocol [Joseph_Swaminathan] [Joseph_Swaminathan] 2009-04-01 ++smart-install 4786 tcp Smart Install Service [Amit_Nigam] [Amit_Nigam] 2009-08-24 ++ 4786 udp Reserved ++ Service Insertion ++sia-ctrl-plane 4787 tcp Architecture (SIA) [Shree_Murthy] [Shree_Murthy] 2009-10-29 ++ Control-Plane ++ 4787 udp Reserved ++ eXtensible Messaging Client Defined TXT keys: txtvers=1 (as described in the draft) ++xmcp 4788 tcp Protocol [Cisco] [Glenn_Matthews] 2011-05-23 2011-10-25 protovers=<comma-separated list of major/minor versions ++ supported> (examples: "protovers=1.0" "protovers=1.1,2.0" ++ 4788 udp Reserved ++ 4789-4799 Unassigned ++iims 4800 tcp Icona Instant Messenging ++ System ++iims 4800 udp Icona Instant Messenging ++ System ++iwec 4801 tcp Icona Web Embedded Chat ++iwec 4801 udp Icona Web Embedded Chat ++ilss 4802 tcp Icona License System Server [Paul_Stephen_Borlie] [Paul_Stephen_Borlie] ++ilss 4802 udp Icona License System Server [Paul_Stephen_Borlie] [Paul_Stephen_Borlie] ++notateit 4803 tcp Notateit Messaging ++notateit-disc 4803 udp Notateit Messaging Discovery [Ean_Black] [Ean_Black] 2009-04-08 ++ 4804 tcp Reserved ++aja-ntv4-disc 4804 udp AJA ntv4 Video System [Mike_Bernadett] [Mike_Bernadett] 2010-06-03 ++ Discovery ++ 4805-4826 Unassigned ++htcp 4827 tcp HTCP [Paul_Vixie] [Paul_Vixie] ++htcp 4827 udp HTCP [Paul_Vixie] [Paul_Vixie] ++ 4828-4836 Unassigned ++varadero-0 4837 tcp Varadero-0 ++varadero-0 4837 udp Varadero-0 ++varadero-1 4838 tcp Varadero-1 ++varadero-1 4838 udp Varadero-1 ++varadero-2 4839 tcp Varadero-2 [Carlos_Arteaga] [Carlos_Arteaga] ++varadero-2 4839 udp Varadero-2 [Carlos_Arteaga] [Carlos_Arteaga] ++opcua-tcp 4840 tcp OPC UA TCP Protocol ++opcua-udp 4840 udp OPC UA TCP Protocol [Randy_Armstrong] [Randy_Armstrong] 2006-09 ++quosa 4841 tcp QUOSA Virtual Library [Uri_Blank] [Uri_Blank] 2006-09 ++ Service ++quosa 4841 udp QUOSA Virtual Library [Uri_Blank] [Uri_Blank] 2006-09 ++ Service ++gw-asv 4842 tcp nCode ICE-flow Library [Ross_Swithenbank] [Ross_Swithenbank] 2006-09 ++ AppServer ++gw-asv 4842 udp nCode ICE-flow Library [Ross_Swithenbank] [Ross_Swithenbank] 2006-09 ++ AppServer ++opcua-tls 4843 tcp OPC UA TCP Protocol over [Randy_Armstrong] [Randy_Armstrong] 2006-09 ++ TLS/SSL ++opcua-tls 4843 udp OPC UA TCP Protocol over [Randy_Armstrong] [Randy_Armstrong] 2006-09 ++ TLS/SSL ++gw-log 4844 tcp nCode ICE-flow Library [Ross_Swithenbank] [Ross_Swithenbank] 2006-09 ++ LogServer ++gw-log 4844 udp nCode ICE-flow Library [Ross_Swithenbank] [Ross_Swithenbank] 2006-09 ++ LogServer ++wcr-remlib 4845 tcp WordCruncher Remote Library [Jason_Dzubak] [Jason_Dzubak] 2008-03-17 ++ Service ++wcr-remlib 4845 udp WordCruncher Remote Library [Jason_Dzubak] [Jason_Dzubak] 2008-03-17 ++ Service ++ Contamac ICM Service ++ ++contamac-icm 4846 tcp IANA assigned this [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 ++ well-formed service name as ++ a replacement for ++ "contamac_icm". ++ This entry is an alias to "contamac-icm". This entry is now ++contamac_icm 4846 tcp Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service ++ discovery mechanisms. ++ Contamac ICM Service ++ ++contamac-icm 4846 udp IANA assigned this [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 ++ well-formed service name as ++ a replacement for ++ "contamac_icm". ++ This entry is an alias to "contamac-icm". This entry is now ++contamac_icm 4846 udp Contamac ICM Service [Abdullah_Obeid] [Abdullah_Obeid] 2008-03-20 historic, not usable for use with many common service ++ discovery mechanisms. ++wfc 4847 tcp Web Fresh Communication [Jonathan_Bastnagel] [Jonathan_Bastnagel] 2007-09-17 ++wfc 4847 udp Web Fresh Communication [Jonathan_Bastnagel] [Jonathan_Bastnagel] 2007-09-17 ++appserv-http 4848 tcp App Server - Admin HTTP ++appserv-http 4848 udp App Server - Admin HTTP ++appserv-https 4849 tcp App Server - Admin HTTPS [Sreeram_Duvvuru] [Sreeram_Duvvuru] 2002-04 ++appserv-https 4849 udp App Server - Admin HTTPS [Sreeram_Duvvuru] [Sreeram_Duvvuru] 2002-04 ++sun-as-nodeagt 4850 tcp Sun App Server - NA [Kedar_Mhaswade] [Kedar_Mhaswade] 2004-11 ++sun-as-nodeagt 4850 udp Sun App Server - NA [Kedar_Mhaswade] [Kedar_Mhaswade] 2004-11 ++derby-repli 4851 tcp Apache Derby Replication [Jorgen_Loland] [Jorgen_Loland] 2008-02-27 ++derby-repli 4851 udp Apache Derby Replication [Jorgen_Loland] [Jorgen_Loland] 2008-02-27 ++ 4852-4866 Unassigned ++unify-debug 4867 tcp Unify Debugger [Ron_Kuris] [Ron_Kuris] 2006-05 ++unify-debug 4867 udp Unify Debugger [Ron_Kuris] [Ron_Kuris] 2006-05 ++phrelay 4868 tcp Photon Relay ++phrelay 4868 udp Photon Relay ++phrelaydbg 4869 tcp Photon Relay Debug [Michael_Hunter] [Michael_Hunter] ++phrelaydbg 4869 udp Photon Relay Debug [Michael_Hunter] [Michael_Hunter] ++cc-tracking 4870 tcp Citcom Tracking Service [Wolfgang_Weidner] [Wolfgang_Weidner] 2005-12 ++cc-tracking 4870 udp Citcom Tracking Service [Wolfgang_Weidner] [Wolfgang_Weidner] 2005-12 ++wired 4871 tcp Wired [Axel_Andersson] [Axel_Andersson] 2006-02 ++wired 4871 udp Wired [Axel_Andersson] [Axel_Andersson] 2006-02 ++ 4872-4875 Unassigned ++tritium-can 4876 tcp Tritium CAN Bus Bridge [James_Kennedy] [James_Kennedy] 2011-02-15 ++ Service ++tritium-can 4876 udp Tritium CAN Bus Bridge [James_Kennedy] [James_Kennedy] 2011-02-15 ++ Service ++lmcs 4877 tcp Lighting Management Control [Timothy_Parry] [Timothy_Parry] 2011-02-15 ++ System ++lmcs 4877 udp Lighting Management Control [Timothy_Parry] [Timothy_Parry] 2011-02-15 ++ System ++ 4878 tcp Reserved ++inst-discovery 4878 udp Agilent Instrument Discovery [Charles_F_Steele] [Charles_F_Steele] 2011-02-15 ++wsdl-event 4879 tcp WSDL Event Receiver [Charles_F_Steele] [Charles_F_Steele] 2011-02-15 ++ 4879 udp Reserved ++hislip 4880 tcp IVI High-Speed LAN [Joe_Mueller] [Joe_Mueller] 2010-01-11 ++ Instrument Protocol ++ 4880 udp Reserved ++ 4881 tcp Reserved ++socp-t 4881 udp SOCP Time Synchronization [Joe_Haver] [Joe_Haver] 2010-05-28 ++ Protocol ++ 4882 tcp Reserved ++socp-c 4882 udp SOCP Control Protocol [Joe_Haver] [Joe_Haver] 2010-05-28 ++wmlserver 4883 tcp Meier-Phelps License Server [William_Phelps] [William_Phelps] 2010-03-22 ++ 4883 udp Reserved ++hivestor 4884 tcp HiveStor Distributed File [Nicholas_Young] [Nicholas_Young] 2008-07-10 ++ System ++hivestor 4884 udp HiveStor Distributed File [Nicholas_Young] [Nicholas_Young] 2008-07-10 ++ System ++abbs 4885 tcp ABBS [Ryan_Rubley] [Ryan_Rubley] ++abbs 4885 udp ABBS [Ryan_Rubley] [Ryan_Rubley] ++ 4886-4893 Unassigned ++lyskom 4894 tcp LysKOM Protocol A [Per_Cederqvist] [Per_Cederqvist] ++lyskom 4894 udp LysKOM Protocol A [Per_Cederqvist] [Per_Cederqvist] ++ 4895-4898 Unassigned ++radmin-port 4899 tcp RAdmin Port [Dmitri_Znosko] [Dmitri_Znosko] 2003-03 ++radmin-port 4899 udp RAdmin Port [Dmitri_Znosko] [Dmitri_Znosko] 2003-03 ++hfcs 4900 tcp HyperFileSQL Client/Server [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 ++ Database Engine ++hfcs 4900 udp HyperFileSQL Client/Server [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 ++ Database Engine ++ FileLocator Remote Search ++ Agent ++ ++flr-agent 4901 tcp IANA assigned this [David_Vest] [David_Vest] 2008-11-19 ++ well-formed service name as ++ a replacement for ++ "flr_agent". ++ FileLocator Remote Search This entry is an alias to "flr-agent". This entry is now ++flr_agent 4901 tcp Agent [David_Vest] [David_Vest] 2008-11-19 historic, not usable for use with many common service ++ discovery mechanisms. ++ 4901 udp Reserved ++magiccontrol 4902 tcp magicCONROL RF and Data [Andreas_Spalenski] [Andreas_Spalenski] 2008-11-24 ++ Interface ++ 4902 udp Reserved ++ 4903-4911 Unassigned ++lutap 4912 tcp Technicolor LUT Access [Markus_Loeffler] [Markus_Loeffler] 2009-02-17 ++ Protocol ++ 4912 udp Reserved ++lutcp 4913 tcp LUTher Control Protocol [Markus_Loeffler] [Markus_Loeffler] 2007-07-03 ++bones 4914 tcp Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 ++bones 4914 udp Bones Remote Control [Andreas_Foedrowitz] [Andreas_Foedrowitz] 2008-06-18 ++frcs 4915 tcp Fibics Remote Control [Ken_Lagarec] [Ken_Lagarec] 2009-04-17 ++ Service ++ 4915 udp Reserved ++ 4916-4936 Unassigned ++ 4937 tcp Reserved ++atsc-mh-ssc 4937 udp ATSC-M/H Service Signaling [Jerry_Whitaker] [Jerry_Whitaker] 2008-10-27 ++ Channel ++ 4938-4939 Unassigned ++eq-office-4940 4940 tcp Equitrac Office ++eq-office-4940 4940 udp Equitrac Office ++eq-office-4941 4941 tcp Equitrac Office ++eq-office-4941 4941 udp Equitrac Office ++eq-office-4942 4942 tcp Equitrac Office [Tom_Haapanen_2] [Tom_Haapanen_2] 2007-07-11 ++eq-office-4942 4942 udp Equitrac Office [Tom_Haapanen_2] [Tom_Haapanen_2] 2007-07-11 ++ 4943-4948 Unassigned ++munin 4949 tcp Munin Graphing Framework [Jimmy_Olsen] [Jimmy_Olsen] 2010-12-24 ++munin 4949 udp Munin Graphing Framework [Jimmy_Olsen] [Jimmy_Olsen] 2010-12-24 ++sybasesrvmon 4950 tcp Sybase Server Monitor [Chris_Irie] [Chris_Irie] 2008-03-26 ++sybasesrvmon 4950 udp Sybase Server Monitor [Chris_Irie] [Chris_Irie] 2008-03-26 ++pwgwims 4951 tcp PWG WIMS [Ira_McDonald] [Ira_McDonald] 2005-12 ++pwgwims 4951 udp PWG WIMS [Ira_McDonald] [Ira_McDonald] 2005-12 ++sagxtsds 4952 tcp SAG Directory Server [Michael_Chirila] [Michael_Chirila] 2006-01 ++sagxtsds 4952 udp SAG Directory Server [Michael_Chirila] [Michael_Chirila] 2006-01 ++dbsyncarbiter 4953 tcp Synchronization Arbiter [Dave_Neudoerffer_2] [Dave_Neudoerffer_2] 2009-11-18 ++ 4953 udp Reserved ++ UNAUTHORIZED ++ 4954-4968 Unassigned USE: port ++ 4967 by ++ Rockwell FTA ++ccss-qmm 4969 tcp CCSS QMessageMonitor ++ccss-qmm 4969 udp CCSS QMessageMonitor ++ccss-qsm 4970 tcp CCSS QSystemMonitor [David_Young] [David_Young] 2006-01 ++ccss-qsm 4970 udp CCSS QSystemMonitor [David_Young] [David_Young] 2006-01 ++ 4971-4982 Unassigned ++ 4983 Unassigned 2005-12-22 ++webyast 4984 tcp WebYast [Federico_Lucifredi] [Federico_Lucifredi] 2009-09-25 ++ 4984 udp Reserved ++gerhcs 4985 tcp GER HC Standard [Roger_Ward] [Roger_Ward] 2009-09-25 ++ 4985 udp Reserved ++mrip 4986 tcp Model Railway Interface [Howard_Amos] [Howard_Amos] 2006-04 ++ Program ++mrip 4986 udp Model Railway Interface [Howard_Amos] [Howard_Amos] 2006-04 ++ Program ++smar-se-port1 4987 tcp SMAR Ethernet Port 1 ++smar-se-port1 4987 udp SMAR Ethernet Port 1 ++smar-se-port2 4988 tcp SMAR Ethernet Port 2 [Delcio_Prizon] [Delcio_Prizon] ++smar-se-port2 4988 udp SMAR Ethernet Port 2 [Delcio_Prizon] [Delcio_Prizon] ++parallel 4989 tcp Parallel for GAUSS (tm) [Matthew_Ford] [Matthew_Ford] 2003-03 ++parallel 4989 udp Parallel for GAUSS (tm) [Matthew_Ford] [Matthew_Ford] 2003-03 ++busycal 4990 tcp BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary ++ Protocol ++busycal 4990 udp BusySync Calendar Synch. [David_Riggle] [David_Riggle] 2008-01-07 Defined TXT keys: Proprietary ++ Protocol ++vrt 4991 tcp VITA Radio Transport [Sam_Bretheim] [Sam_Bretheim] 2009-01-08 ++vrt 4991 udp VITA Radio Transport [Sam_Bretheim] [Sam_Bretheim] 2009-01-08 ++ 4992-4998 Unassigned ++hfcs-manager 4999 tcp HyperFileSQL Client/Server [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 ++ Database Engine Manager ++hfcs-manager 4999 udp HyperFileSQL Client/Server [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 ++ Database Engine Manager ++commplex-main 5000 tcp ++commplex-main 5000 udp ++commplex-link 5001 tcp ++commplex-link 5001 udp ++rfe 5002 tcp radio free ethernet ++rfe 5002 udp radio free ethernet ++fmpro-internal 5003 tcp FileMaker, Inc. - [Clay_Maeckel] [Clay_Maeckel] ++ Proprietary transport ++fmpro-internal 5003 udp FileMaker, Inc. - [Clay_Maeckel] [Clay_Maeckel] ++ Proprietary name binding ++avt-profile-1 5004 tcp RTP media data [RFC3551][RFC4571] ++avt-profile-1 5004 udp RTP media data [RFC3551] ++avt-profile-1 5004 dccp RTP media data [RFC3551][RFC5762] ++avt-profile-2 5005 tcp RTP control protocol [RFC3551][RFC4571] ++avt-profile-2 5005 udp RTP control protocol [RFC3551] ++avt-profile-2 5005 dccp RTP control protocol [RFC3551][RFC5762] ++wsm-server 5006 tcp wsm server [Adam_Berk] [Adam_Berk] ++wsm-server 5006 udp wsm server [Adam_Berk] [Adam_Berk] ++wsm-server-ssl 5007 tcp wsm server ssl [Adam_Berk] [Adam_Berk] ++wsm-server-ssl 5007 udp wsm server ssl [Adam_Berk] [Adam_Berk] ++synapsis-edge 5008 tcp Synapsis EDGE [Paul_Schilling] [Paul_Schilling] ++synapsis-edge 5008 udp Synapsis EDGE [Paul_Schilling] [Paul_Schilling] ++winfs 5009 tcp Microsoft Windows Filesystem [Simon_Skaria] [Simon_Skaria] 2006-01 ++winfs 5009 udp Microsoft Windows Filesystem [Simon_Skaria] [Simon_Skaria] 2006-01 ++telelpathstart 5010 tcp TelepathStart [Helmuth_Breitenfelln] [Helmuth_Breitenfelln] ++telelpathstart 5010 udp TelepathStart [Helmuth_Breitenfelln] [Helmuth_Breitenfelln] ++telelpathattack 5011 tcp TelepathAttack [Helmuth_Breitenfelln] [Helmuth_Breitenfelln] ++telelpathattack 5011 udp TelepathAttack [Helmuth_Breitenfelln] [Helmuth_Breitenfelln] ++nsp 5012 tcp NetOnTap Service [Kim_Hancock] [Kim_Hancock] 2007-10-24 ++nsp 5012 udp NetOnTap Service [Kim_Hancock] [Kim_Hancock] 2007-10-24 ++fmpro-v6 5013 tcp FileMaker, Inc. - [Alex_Chen] [Alex_Chen] 2007-08-01 ++ Proprietary transport ++fmpro-v6 5013 udp FileMaker, Inc. - [Alex_Chen] [Alex_Chen] 2007-08-01 ++ Proprietary transport ++ 5014 tcp Reserved ++onpsocket 5014 udp Overlay Network Protocol [Roger_Matthias] [Roger_Matthias] 2009-08-24 ++fmwp 5015 tcp FileMaker, Inc. - Web [Alex_Chen] [Alex_Chen] 2009-11-25 ++ publishing ++ 5015 udp Reserved ++ 5016-5019 Unassigned ++zenginkyo-1 5020 tcp zenginkyo-1 [Masashi_Suzaki] [Masashi_Suzaki] ++zenginkyo-1 5020 udp zenginkyo-1 [Masashi_Suzaki] [Masashi_Suzaki] ++zenginkyo-2 5021 tcp zenginkyo-2 [Masashi_Suzaki] [Masashi_Suzaki] ++zenginkyo-2 5021 udp zenginkyo-2 [Masashi_Suzaki] [Masashi_Suzaki] ++mice 5022 tcp mice server [Alan_Clifford] [Alan_Clifford] ++mice 5022 udp mice server [Alan_Clifford] [Alan_Clifford] ++htuilsrv 5023 tcp Htuil Server for PLD2 [Dennis_Reinhardt] [Dennis_Reinhardt] ++htuilsrv 5023 udp Htuil Server for PLD2 [Dennis_Reinhardt] [Dennis_Reinhardt] ++scpi-telnet 5024 tcp SCPI-TELNET [Ryan_Columbus] [Ryan_Columbus] 2002-10 ++scpi-telnet 5024 udp SCPI-TELNET [Ryan_Columbus] [Ryan_Columbus] 2002-10 ++scpi-raw 5025 tcp SCPI-RAW [Ryan_Columbus] [Ryan_Columbus] 2002-10 ++scpi-raw 5025 udp SCPI-RAW [Ryan_Columbus] [Ryan_Columbus] 2002-10 ++strexec-d 5026 tcp Storix I/O daemon (data) [Anthony_Johnson] [Anthony_Johnson] 2005-08 ++strexec-d 5026 udp Storix I/O daemon (data) [Anthony_Johnson] [Anthony_Johnson] 2005-08 ++strexec-s 5027 tcp Storix I/O daemon (stat) [Anthony_Johnson] [Anthony_Johnson] 2005-08 ++strexec-s 5027 udp Storix I/O daemon (stat) [Anthony_Johnson] [Anthony_Johnson] 2005-08 ++qvr 5028 tcp Quiqum Virtual Relais [Philipp_Marcel_Albre] [Philipp_Marcel_Albre] 2009-07-06 ++ 5028 udp Reserved ++infobright 5029 tcp Infobright Database Server [Mark_Windrim] [Mark_Windrim] 2009-07-23 ++infobright 5029 udp Infobright Database Server [Mark_Windrim] [Mark_Windrim] 2009-07-23 ++surfpass 5030 tcp SurfPass [Olivier_Guezenec] [Olivier_Guezenec] 2006-12 ++surfpass 5030 udp SurfPass [Olivier_Guezenec] [Olivier_Guezenec] 2006-12 ++ 5031 tcp Reserved ++dmp 5031 udp Direct Message Protocol [Gjermund_Wallenius] [Gjermund_Wallenius] 2009-09-30 ++signacert-agent 5032 tcp SignaCert Enterprise Trust [Harris_Corporation] [Daniel_R_Somerfield] 2011-08-05 ++ Server Agent ++ 5032 udp Reserved ++ 5033-5041 Unassigned ++asnaacceler8db 5042 tcp asnaacceler8db [Walter_Goodwin] [Walter_Goodwin] ++asnaacceler8db 5042 udp asnaacceler8db [Walter_Goodwin] [Walter_Goodwin] ++swxadmin 5043 tcp ShopWorX Administration [Don_W_Fitzpatrick] [Don_W_Fitzpatrick] 2005-08 ++swxadmin 5043 udp ShopWorX Administration [Don_W_Fitzpatrick] [Don_W_Fitzpatrick] 2005-08 ++lxi-evntsvc 5044 tcp LXI Event Service [Nick_Barendt] [Nick_Barendt] 2005-08 ++lxi-evntsvc 5044 udp LXI Event Service [Nick_Barendt] [Nick_Barendt] 2005-08 ++osp 5045 tcp Open Settlement Protocol [Dmitry_Isakbayev] [Dmitry_Isakbayev] 2010-03-05 ++ 5045 udp Reserved ++ 5046 tcp Reserved ++vpm-udp 5046 udp Vishay PM UDP Service [Ashley_Clarke] [Ashley_Clarke] 2010-06-17 ++ 5047 tcp Reserved ++iscape 5047 udp iSCAPE Data Broadcasting [Roland_van_der_Veen] [Roland_van_der_Veen] 2010-06-17 ++texai 5048 tcp Texai Message Service [Stephen_Reed_2] [Stephen_Reed_2] 2010-06-17 ++ 5048 udp Reserved ++ivocalize 5049 tcp iVocalize Web Conference [Bryan_Vergato] [Bryan_Vergato] 2006-05 ++ivocalize 5049 udp iVocalize Web Conference [Bryan_Vergato] [Bryan_Vergato] 2006-05 ++mmcc 5050 tcp multimedia conference [Steve_Casner] [Steve_Casner] ++ control tool ++mmcc 5050 udp multimedia conference [Steve_Casner] [Steve_Casner] ++ control tool ++ita-agent 5051 tcp ITA Agent [Don_Merrell] [Don_Merrell] ++ita-agent 5051 udp ITA Agent [Don_Merrell] [Don_Merrell] ++ita-manager 5052 tcp ITA Manager [Don_Merrell] [Don_Merrell] ++ita-manager 5052 udp ITA Manager [Don_Merrell] [Don_Merrell] ++rlm 5053 tcp RLM License Server [Matt_Christiano_2] [Matt_Christiano_2] 2008-07-28 ++ 5053 udp Reserved ++rlm-admin 5054 tcp RLM administrative interface [Matt_Christiano_2] [Matt_Christiano_2] 2008-07-28 ++ 5054 udp Reserved ++unot 5055 tcp UNOT [Gordon_Mohr_2] [Gordon_Mohr_2] ++unot 5055 udp UNOT [Gordon_Mohr_2] [Gordon_Mohr_2] ++intecom-ps1 5056 tcp Intecom Pointspan 1 [David_Meermans] [David_Meermans] ++intecom-ps1 5056 udp Intecom Pointspan 1 [David_Meermans] [David_Meermans] ++intecom-ps2 5057 tcp Intecom Pointspan 2 [David_Meermans] [David_Meermans] ++intecom-ps2 5057 udp Intecom Pointspan 2 [David_Meermans] [David_Meermans] ++ 5058 tcp Reserved ++locus-disc 5058 udp Locus Discovery [Alan_King] [Alan_King] 2009-08-13 ++sds 5059 tcp SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 ++sds 5059 udp SIP Directory Services [Arthur_Wilton] [Arthur_Wilton] 2006-03 ++sip 5060 tcp SIP [Henning_Schulzrinne] [Henning_Schulzrinne] ++sip 5060 udp SIP [Henning_Schulzrinne] [Henning_Schulzrinne] ++sip-tls 5061 tcp SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] ++sip-tls 5061 udp SIP-TLS [Henning_Schulzrinne] [Henning_Schulzrinne] ++na-localise 5062 tcp Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 ++na-localise 5062 udp Localisation access [Jean_Pierre_Garcia_2] [Jean_Pierre_Garcia_2] 2009-10-28 ++csrpc 5063 tcp centrify secure RPC [Paul_Moore] [Paul_Moore] 2009-10-28 ++ 5063 udp Reserved ++ca-1 5064 tcp Channel Access 1 [Jeffrey_Hill] [Jeffrey_Hill] 2002-08 ++ca-1 5064 udp Channel Access 1 [Jeffrey_Hill] [Jeffrey_Hill] 2002-08 ++ca-2 5065 tcp Channel Access 2 [Jeffrey_Hill] [Jeffrey_Hill] 2002-08 ++ca-2 5065 udp Channel Access 2 [Jeffrey_Hill] [Jeffrey_Hill] 2002-08 ++stanag-5066 5066 tcp STANAG-5066-SUBNET-INTF [Donald_G_Kallgren] [Donald_G_Kallgren] ++stanag-5066 5066 udp STANAG-5066-SUBNET-INTF [Donald_G_Kallgren] [Donald_G_Kallgren] ++authentx 5067 tcp Authentx Service [Alberto_Fernandez] [Alberto_Fernandez] 2006-01 ++authentx 5067 udp Authentx Service [Alberto_Fernandez] [Alberto_Fernandez] 2006-01 ++bitforestsrv 5068 tcp Bitforest Data Service [Ville_Pekka_Vahteala] [Ville_Pekka_Vahteala] 2008-06-05 ++ 5068 udp Reserved ++i-net-2000-npr 5069 tcp I/Net 2000-NPR [Chris_Megede] [Chris_Megede] ++i-net-2000-npr 5069 udp I/Net 2000-NPR [Chris_Megede] [Chris_Megede] ++vtsas 5070 tcp VersaTrans Server Agent [Christopher_Miller] [Christopher_Miller] 2006-02 ++ Service ++vtsas 5070 udp VersaTrans Server Agent [Christopher_Miller] [Christopher_Miller] 2006-02 ++ Service ++powerschool 5071 tcp PowerSchool [Greg_Porter] [Greg_Porter] ++powerschool 5071 udp PowerSchool [Greg_Porter] [Greg_Porter] ++ayiya 5072 tcp Anything In Anything [Jeroen_Massar] [Jeroen_Massar] 2005-08 ++ayiya 5072 udp Anything In Anything [Jeroen_Massar] [Jeroen_Massar] 2005-08 ++tag-pm 5073 tcp Advantage Group Port Mgr [James_Goddard] [James_Goddard] 2005-08 ++tag-pm 5073 udp Advantage Group Port Mgr [James_Goddard] [James_Goddard] 2005-08 ++alesquery 5074 tcp ALES Query [Tim_Maloney] [Tim_Maloney] 2005-08 ++alesquery 5074 udp ALES Query [Tim_Maloney] [Tim_Maloney] 2005-08 ++pvaccess 5075 tcp Experimental Physics and [Matej_Sekoranja] [Matej_Sekoranja] 2012-03-23 ++ Industrial Control System ++ 5075 udp Reserved ++ 5076-5078 Unassigned ++ 5079 tcp Reserved ++cp-spxrpts 5079 udp Cambridge Pixel SPx Reports [Richard_Warren] [Richard_Warren] 2008-09-17 ++onscreen 5080 tcp OnScreen Data Collection [Christopher_Miller_2] [Christopher_Miller_2] 2008-01-14 ++ Service ++onscreen 5080 udp OnScreen Data Collection [Christopher_Miller_2] [Christopher_Miller_2] 2008-01-14 ++ Service ++sdl-ets 5081 tcp SDL - Ent Trans Server [Marc_Morin] [Marc_Morin] 2002-04 ++sdl-ets 5081 udp SDL - Ent Trans Server [Marc_Morin] [Marc_Morin] 2002-04 ++qcp 5082 tcp Qpur Communication Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 ++qcp 5082 udp Qpur Communication Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 ++qfp 5083 tcp Qpur File Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 ++qfp 5083 udp Qpur File Protocol [Joachim_Kluemper] [Joachim_Kluemper] 2008-03-19 ++llrp 5084 tcp EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol ++ Protocol ++llrp 5084 udp EPCglobal Low-Level Reader [Margaret_Wasserman][Paul_Dietrich] [Margaret_Wasserman][Paul_Dietrich] 2006-11 Defined TXT keys: None. RFID reader Low Level Reader Protocol ++ Protocol ++encrypted-llrp 5085 tcp EPCglobal Encrypted LLRP [Margaret_Wasserman] [Margaret_Wasserman] 2006-11 ++encrypted-llrp 5085 udp EPCglobal Encrypted LLRP [Margaret_Wasserman] [Margaret_Wasserman] 2006-11 ++aprigo-cs 5086 tcp Aprigo Collection Service [Ron_Zalkind] [Ron_Zalkind] 2010-05-28 ++ 5086 udp Reserved ++ 5087-5089 Unassigned ++car 5090 sctp Candidate AR ++cxtp 5091 sctp Context Transfer Protocol 2005-07 [RFC4065] ++ 5092 tcp Reserved ++magpie 5092 udp Magpie Binary [Phil_Maker] [Phil_Maker] 2008-06-18 ++sentinel-lm 5093 tcp Sentinel LM [Derick_Snyder] [Derick_Snyder] ++sentinel-lm 5093 udp Sentinel LM [Derick_Snyder] [Derick_Snyder] ++hart-ip 5094 tcp HART-IP [Wally_Pratt_Jr] [Wally_Pratt_Jr] 2010-03-02 ++hart-ip 5094 udp HART-IP [Wally_Pratt_Jr] [Wally_Pratt_Jr] 2010-03-02 ++ 5095-5098 Unassigned ++sentlm-srv2srv 5099 tcp SentLM Srv2Srv [Derick_Snyder] [Derick_Snyder] ++sentlm-srv2srv 5099 udp SentLM Srv2Srv [Derick_Snyder] [Derick_Snyder] ++socalia 5100 tcp Socalia service mux [Alberto_Raydan_2] [Alberto_Raydan_2] 2005-08 ++socalia 5100 udp Socalia service mux [Alberto_Raydan_2] [Alberto_Raydan_2] 2005-08 ++talarian-tcp 5101 tcp Talarian_TCP [Leo_Martins] [Leo_Martins] ++talarian-udp 5101 udp Talarian_UDP [Leo_Martins] [Leo_Martins] ++oms-nonsecure 5102 tcp Oracle OMS non-secure [Todd_Guay] [Todd_Guay] 2005-08 ++oms-nonsecure 5102 udp Oracle OMS non-secure [Todd_Guay] [Todd_Guay] 2005-08 ++actifio-c2c 5103 tcp Actifio C2C [Ravi_Kollipara] [Ravi_Kollipara] 2010-06-18 ++ 5103 udp Reserved ++ 5104 tcp Reserved ++tinymessage 5104 udp TinyMessage [Josip_Medved] [Josip_Medved] 2010-10-20 ++ 5105 tcp Reserved ++hughes-ap 5105 udp Hughes Association Protocol [Varun_Santosh] [Varun_Santosh] 2010-10-20 ++ 5106-5110 Unassigned ++taep-as-svc 5111 tcp TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 ++taep-as-svc 5111 udp TAEP AS service [Liu_Changchun] [Liu_Changchun] 2008-11-05 ++pm-cmdsvr 5112 tcp PeerMe Msg Cmd Service [Marcos_Della] [Marcos_Della] 2005-08 ++pm-cmdsvr 5112 udp PeerMe Msg Cmd Service [Marcos_Della] [Marcos_Della] 2005-08 ++ 5113 Unassigned 2010-11-09 ++ev-services 5114 tcp Enterprise Vault Services [Richard_Jones_2] [Richard_Jones_2] 2009-05-26 ++ 5114 udp Reserved ++autobuild 5115 tcp Symantec Autobuild Service [David_Warden] [David_Warden] 2008-11-17 ++ 5115 udp Reserved ++ 5116 tcp Reserved ++emb-proj-cmd 5116 udp EPSON Projecter Image [SEIKO_EPSON_4] [SEIKO_EPSON_4] 2008-11-17 ++ Transfer ++gradecam 5117 tcp GradeCam Image Processing [Robert_Porter] [Robert_Porter] 2009-09-24 ++ 5117 udp Reserved ++ 5118-5132 Unassigned ++nbt-pc 5133 tcp Policy Commander [Emily_Harris] [Emily_Harris] 2004-11 ++nbt-pc 5133 udp Policy Commander [Emily_Harris] [Emily_Harris] 2004-11 ++ppactivation 5134 tcp PP ActivationServer [Ian_Bradley] [Ian_Bradley] 2009-10-14 ++ 5134 udp Reserved ++ Defined TXT keys: ++erp-scale 5135 tcp ERP-Scale [Ian_Bradley] [Ian_Bradley] 2009-10-14 RFC=<RFC destination and status> ++ Device=<Scale device and status> ++ 5135 udp Reserved ++ 5136 tcp Reserved ++minotaur-sa 5136 udp Minotaur SA [Kenneth_Flynn] [Kenneth_Flynn] 2009-10-14 ++ctsd 5137 tcp MyCTS server port [Jilles_Oldenbeuving] [Jilles_Oldenbeuving] 2002-06 ++ctsd 5137 udp MyCTS server port [Jilles_Oldenbeuving] [Jilles_Oldenbeuving] 2002-06 ++ 5138-5144 Unassigned ++ RMONITOR SECURE ++ ++rmonitor-secure 5145 tcp IANA assigned this [Kory_Hamzeh] [Kory_Hamzeh] ++ well-formed service name as ++ a replacement for ++ "rmonitor_secure". ++ This entry is an alias to "rmonitor-secure". This entry is ++rmonitor_secure 5145 tcp RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service ++ discovery mechanisms. ++ RMONITOR SECURE ++ ++rmonitor-secure 5145 udp IANA assigned this [Kory_Hamzeh] [Kory_Hamzeh] ++ well-formed service name as ++ a replacement for ++ "rmonitor_secure". ++ This entry is an alias to "rmonitor-secure". This entry is ++rmonitor_secure 5145 udp RMONITOR SECURE [Kory_Hamzeh] [Kory_Hamzeh] now historic, not usable for use with many common service ++ discovery mechanisms. ++social-alarm 5146 tcp Social Alarm Service [Shaun_Byrne] [Shaun_Byrne] 2009-08-18 ++ 5146 udp Reserved ++ 5147-5149 Unassigned ++atmp 5150 tcp Ascend Tunnel Management [Kory_Hamzeh] [Kory_Hamzeh] ++ Protocol ++atmp 5150 udp Ascend Tunnel Management [Kory_Hamzeh] [Kory_Hamzeh] ++ Protocol ++ ESRI SDE Instance ++ ++esri-sde 5151 tcp IANA assigned this [Peter_Aronson] [Peter_Aronson] ++ well-formed service name as ++ a replacement for ++ "esri_sde". ++ This entry is an alias to "esri-sde". This entry is now ++esri_sde 5151 tcp ESRI SDE Instance [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service ++ discovery mechanisms. ++ ESRI SDE Remote Start ++ ++esri-sde 5151 udp IANA assigned this [Peter_Aronson] [Peter_Aronson] ++ well-formed service name as ++ a replacement for ++ "esri_sde". ++ This entry is an alias to "esri-sde". This entry is now ++esri_sde 5151 udp ESRI SDE Remote Start [Peter_Aronson] [Peter_Aronson] historic, not usable for use with many common service ++ discovery mechanisms. ++sde-discovery 5152 tcp ESRI SDE Instance Discovery [Peter_Aronson] [Peter_Aronson] ++sde-discovery 5152 udp ESRI SDE Instance Discovery [Peter_Aronson] [Peter_Aronson] ++toruxserver 5153 tcp ToruX Game Server [Josse_van_Dobben_de] [Josse_van_Dobben_de] 2009-07-01 ++ 5153 udp Reserved ++bzflag 5154 tcp BZFlag game server [Tim_Riker] [Tim_Riker] 2003-07 ++bzflag 5154 udp BZFlag game server [Tim_Riker] [Tim_Riker] 2003-07 ++asctrl-agent 5155 tcp Oracle asControl Agent [Todd_Guay] [Todd_Guay] 2005-08 ++asctrl-agent 5155 udp Oracle asControl Agent [Todd_Guay] [Todd_Guay] 2005-08 ++rugameonline 5156 tcp Russian Online Game [Andrey_Mohov] [Andrey_Mohov] 2010-08-17 ++ 5156 udp Reserved ++mediat 5157 tcp Mediat Remote Object [Oliver_Anan] [Oliver_Anan] 2010-09-02 ++ Exchange ++ 5157 udp Reserved ++ 5158-5160 Unassigned ++snmpssh 5161 tcp SNMP over SSH Transport [RFC5592] ++ Model ++ 5161 udp Reserved ++snmpssh-trap 5162 tcp SNMP Notification over SSH [RFC5592] ++ Transport Model ++ 5162 udp Reserved ++sbackup 5163 tcp Shadow Backup [Glenn_Allen] [Glenn_Allen] 2009-08-05 ++ 5163 udp Reserved ++vpa 5164 tcp Virtual Protocol Adapter [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 ++vpa-disc 5164 udp Virtual Protocol Adapter [Douglas_Goodall] [Douglas_Goodall] 2009-08-05 ++ Discovery ++ ife_1corp ++ ++ife-icorp 5165 tcp IANA assigned this [Paul_Annala] [Paul_Annala] ++ well-formed service name as ++ a replacement for ++ "ife_icorp". ++ This entry is an alias to "ife-icorp". This entry is now ++ife_icorp 5165 tcp ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service ++ discovery mechanisms. ++ ife_1corp ++ ++ife-icorp 5165 udp IANA assigned this [Paul_Annala] [Paul_Annala] ++ well-formed service name as ++ a replacement for ++ "ife_icorp". ++ This entry is an alias to "ife-icorp". This entry is now ++ife_icorp 5165 udp ife_1corp [Paul_Annala] [Paul_Annala] historic, not usable for use with many common service ++ discovery mechanisms. ++winpcs 5166 tcp WinPCS Service Connection [Complan_Network_AS] [Complan_Network_AS] 2006-02 ++winpcs 5166 udp WinPCS Service Connection [Complan_Network_AS] [Complan_Network_AS] 2006-02 ++scte104 5167 tcp SCTE104 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 ++scte104 5167 udp SCTE104 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 ++scte30 5168 tcp SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 ++scte30 5168 udp SCTE30 Connection [Thomas_Russell] [Thomas_Russell] 2005-05 ++ 5169-5189 Unassigned ++aol 5190 tcp America-Online [Marty_Lyons] [Marty_Lyons] ++aol 5190 udp America-Online [Marty_Lyons] [Marty_Lyons] ++aol-1 5191 tcp AmericaOnline1 [Bruce_Mackey] [Bruce_Mackey] ++aol-1 5191 udp AmericaOnline1 [Bruce_Mackey] [Bruce_Mackey] ++aol-2 5192 tcp AmericaOnline2 [Bruce_Mackey] [Bruce_Mackey] ++aol-2 5192 udp AmericaOnline2 [Bruce_Mackey] [Bruce_Mackey] ++aol-3 5193 tcp AmericaOnline3 [Bruce_Mackey] [Bruce_Mackey] ++aol-3 5193 udp AmericaOnline3 [Bruce_Mackey] [Bruce_Mackey] ++cpscomm 5194 tcp CipherPoint Config Service [CipherPoint] [CipherPoint] 2010-03-03 ++ 5194 udp Reserved ++ The protocol is used by a ++ license server and client ++ampl-lic 5195 tcp programs to control use of [AMPL_Optimization] [David_M_Gay] 2012-05-25 ++ program licenses that float ++ to networked machines ++ 5195 udp Reserved ++ The protocol is used by two ++ampl-tableproxy 5196 tcp programs that exchange [AMPL_Optimization] [David_M_Gay] 2012-05-25 ++ "table" data used in the ++ AMPL modeling language ++ 5196 udp Reserved ++ 5197-5199 Unassigned ++targus-getdata 5200 tcp TARGUS GetData [John_Keaveney] [John_Keaveney] ++targus-getdata 5200 udp TARGUS GetData [John_Keaveney] [John_Keaveney] ++targus-getdata1 5201 tcp TARGUS GetData 1 [John_Keaveney] [John_Keaveney] ++targus-getdata1 5201 udp TARGUS GetData 1 [John_Keaveney] [John_Keaveney] ++targus-getdata2 5202 tcp TARGUS GetData 2 [John_Keaveney] [John_Keaveney] ++targus-getdata2 5202 udp TARGUS GetData 2 [John_Keaveney] [John_Keaveney] ++targus-getdata3 5203 tcp TARGUS GetData 3 [John_Keaveney] [John_Keaveney] ++targus-getdata3 5203 udp TARGUS GetData 3 [John_Keaveney] [John_Keaveney] ++ 5204-5220 Unassigned ++3exmp 5221 tcp 3eTI Extensible Management [Bill_Rettig] [Bill_Rettig] 2010-05-19 ++ Protocol for OAMP ++ 5221 udp Reserved ++xmpp-client 5222 tcp XMPP Client Connection [RFC6120] ++ 5222 udp Reserved ++hpvirtgrp 5223 tcp HP Virtual Machine Group [John_Williams] [John_Williams] 2007-06 ++ Management ++hpvirtgrp 5223 udp HP Virtual Machine Group [John_Williams] [John_Williams] 2007-06 ++ Management ++hpvirtctrl 5224 tcp HP Virtual Machine Console [John_Williams] [John_Williams] 2007-06 ++ Operations ++hpvirtctrl 5224 udp HP Virtual Machine Console [John_Williams] [John_Williams] 2007-06 ++ Operations ++hp-server 5225 tcp HP Server [Brett_Green_2] [Brett_Green_2] ++hp-server 5225 udp HP Server [Brett_Green_2] [Brett_Green_2] ++hp-status 5226 tcp HP Status [Brett_Green_2] [Brett_Green_2] ++hp-status 5226 udp HP Status [Brett_Green_2] [Brett_Green_2] ++perfd 5227 tcp HP System Performance Metric [Chris_Bertin] [Chris_Bertin] 2009-05-19 ++ Service ++perfd 5227 udp HP System Performance Metric [Chris_Bertin] [Chris_Bertin] 2009-05-19 ++ Service ++hpvroom 5228 tcp HP Virtual Room Service [Scott_Levin] [Scott_Levin] 2009-03-19 ++ 5228 udp Reserved ++ 5229-5231 Unassigned ++csedaemon 5232 tcp Cruse Scanning System [Christof_J_Reetz] [Christof_J_Reetz] 2011-03-09 ++ Service ++ 5232 udp Reserved ++enfs 5233 tcp Etinnae Network File Service [Chris_Peel] [Chris_Peel] 2011-03-09 ++ 5233 udp Reserved ++eenet 5234 tcp EEnet communications [Helmut_Giritzer] [Helmut_Giritzer] 2005-11 ++eenet 5234 udp EEnet communications [Helmut_Giritzer] [Helmut_Giritzer] 2005-11 ++galaxy-network 5235 tcp Galaxy Network Service [Michael_Andre_2] [Michael_Andre_2] 2007-10-04 ++galaxy-network 5235 udp Galaxy Network Service [Michael_Andre_2] [Michael_Andre_2] 2007-10-04 ++padl2sim 5236 tcp ++padl2sim 5236 udp ++mnet-discovery 5237 tcp m-net discovery [Andy_Crick] [Andy_Crick] 2007-11-13 ++mnet-discovery 5237 udp m-net discovery [Andy_Crick] [Andy_Crick] 2007-11-13 ++ 5238-5244 Unassigned ++downtools 5245 tcp DownTools Control Protocol [Jarrod_Sayers] [Jarrod_Sayers] 2009-04-07 ++downtools-disc 5245 udp DownTools Discovery Protocol [Jarrod_Sayers] [Jarrod_Sayers] 2009-04-07 ++ 5246 tcp Reserved ++capwap-control 5246 udp CAPWAP Control Protocol [RFC5415] ++ 5247 tcp Reserved ++capwap-data 5247 udp CAPWAP Data Protocol [RFC5415] ++caacws 5248 tcp CA Access Control Web [Gabriel_Kalmar] [Gabriel_Kalmar] 2008-03-06 ++ Service ++caacws 5248 udp CA Access Control Web [Gabriel_Kalmar] [Gabriel_Kalmar] 2008-03-06 ++ Service ++caaclang2 5249 tcp CA AC Lang Service [Gabriel_Kalmar] [Gabriel_Kalmar] 2008-02-19 ++caaclang2 5249 udp CA AC Lang Service [Gabriel_Kalmar] [Gabriel_Kalmar] 2008-02-19 ++soagateway 5250 tcp soaGateway [Greg_Bodine] [Greg_Bodine] 2002-02 ++soagateway 5250 udp soaGateway [Greg_Bodine] [Greg_Bodine] 2002-02 ++caevms 5251 tcp CA eTrust VM Service [Kevin_Bond] [Kevin_Bond] 2004-11 ++caevms 5251 udp CA eTrust VM Service [Kevin_Bond] [Kevin_Bond] 2004-11 ++movaz-ssc 5252 tcp Movaz SSC [Lou_Berger] [Lou_Berger] 2004-11 ++movaz-ssc 5252 udp Movaz SSC [Lou_Berger] [Lou_Berger] 2004-11 ++kpdp 5253 tcp Kohler Power Device Protocol [Bill_Gross] [Bill_Gross] 2010-11-01 ++ 5253 udp Reserved ++ 5254-5263 Unassigned ++3com-njack-1 5264 tcp 3Com Network Jack Port 1 [Abhay_Rajaram] [Abhay_Rajaram] 2003-03 ++3com-njack-1 5264 udp 3Com Network Jack Port 1 [Abhay_Rajaram] [Abhay_Rajaram] 2003-03 ++3com-njack-2 5265 tcp 3Com Network Jack Port 2 [Abhay_Rajaram] [Abhay_Rajaram] 2003-03 ++3com-njack-2 5265 udp 3Com Network Jack Port 2 [Abhay_Rajaram] [Abhay_Rajaram] 2003-03 ++ 5266-5268 Unassigned ++xmpp-server 5269 tcp XMPP Server Connection [RFC6120] ++ 5269 udp Reserved ++cartographerxmp 5270 tcp Cartographer XMP [Bobby_Krupczak_2] [Bobby_Krupczak_2] 2008-04-03 2011-08-31 ++cartographerxmp 5270 udp Cartographer XMP [Bobby_Krupczak_2] [Bobby_Krupczak_2] 2008-04-03 2011-08-31 ++cuelink 5271 tcp StageSoft CueLink messaging [Todd_Pichler] [Todd_Pichler] 2010-03-26 ++cuelink-disc 5271 udp StageSoft CueLink discovery [Todd_Pichler] [Todd_Pichler] 2010-03-26 ++pk 5272 tcp PK [Patrick_Kara] [Patrick_Kara] ++pk 5272 udp PK [Patrick_Kara] [Patrick_Kara] ++ 5273-5279 Unassigned ++xmpp-bosh 5280 tcp Bidirectional-streams Over [Peter_Saint_Andre] [Peter_Saint_Andre] 2009-11-25 ++ Synchronous HTTP (BOSH) ++ 5280 udp Reserved ++undo-lm 5281 tcp Undo License Manager [Julian_Smith] [Julian_Smith] 2010-04-19 ++ 5281 udp Reserved ++transmit-port 5282 tcp Marimba Transmitter Port [Johan_Eriksson] [Johan_Eriksson] 2002-04 ++transmit-port 5282 udp Marimba Transmitter Port [Johan_Eriksson] [Johan_Eriksson] 2002-04 ++ 5283-5297 Unassigned ++presence 5298 tcp XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See ++ http://www.xmpp.org/registrar/linklocal.html ++presence 5298 udp XMPP Link-Local Messaging [Eric_St_Onge] [Eric_St_Onge] 2008-01-14 Defined TXT keys: See ++ http://www.xmpp.org/registrar/linklocal.html ++nlg-data 5299 tcp NLG Data Service [Andy_Shellam] [Andy_Shellam] 2008-02-19 ++nlg-data 5299 udp NLG Data Service [Andy_Shellam] [Andy_Shellam] 2008-02-19 ++hacl-hb 5300 tcp HA cluster heartbeat [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-hb 5300 udp HA cluster heartbeat [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-gs 5301 tcp HA cluster general services [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-gs 5301 udp HA cluster general services [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-cfg 5302 tcp HA cluster configuration [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-cfg 5302 udp HA cluster configuration [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-probe 5303 tcp HA cluster probing [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-probe 5303 udp HA cluster probing [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-local 5304 tcp HA Cluster Commands [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-local 5304 udp HA Cluster Commands [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-test 5305 tcp HA Cluster Test [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++hacl-test 5305 udp HA Cluster Test [Eric_Soderberg_2][Edward_Yim] [Eric_Soderberg_2][Edward_Yim] ++sun-mc-grp 5306 tcp Sun MC Group [Michael_DeMoney] [Michael_DeMoney] ++sun-mc-grp 5306 udp Sun MC Group [Michael_DeMoney] [Michael_DeMoney] ++sco-aip 5307 tcp SCO AIP [Barrie_Cooper] [Barrie_Cooper] ++sco-aip 5307 udp SCO AIP [Barrie_Cooper] [Barrie_Cooper] ++cfengine 5308 tcp CFengine [Mark_Burgess] [Mark_Burgess] ++cfengine 5308 udp CFengine [Mark_Burgess] [Mark_Burgess] ++jprinter 5309 tcp J Printer [Ken_Blackwell] [Ken_Blackwell] ++jprinter 5309 udp J Printer [Ken_Blackwell] [Ken_Blackwell] ++outlaws 5310 tcp Outlaws [Richard_Fife] [Richard_Fife] ++outlaws 5310 udp Outlaws [Richard_Fife] [Richard_Fife] ++ 5311 Unassigned 2004-05-07 ++permabit-cs 5312 tcp Permabit Client-Server [Jered_Floyd] [Jered_Floyd] 2004-06 ++permabit-cs 5312 udp Permabit Client-Server [Jered_Floyd] [Jered_Floyd] 2004-06 ++rrdp 5313 tcp Real-time & Reliable Data [Ted_Hoshi] [Ted_Hoshi] 2004-06 ++rrdp 5313 udp Real-time & Reliable Data [Ted_Hoshi] [Ted_Hoshi] 2004-06 ++opalis-rbt-ipc 5314 tcp opalis-rbt-ipc [Laurent_Domenech] [Laurent_Domenech] ++opalis-rbt-ipc 5314 udp opalis-rbt-ipc [Laurent_Domenech] [Laurent_Domenech] ++hacl-poll 5315 tcp HA Cluster UDP Polling [Hoa_Nguyen] [Hoa_Nguyen] ++hacl-poll 5315 udp HA Cluster UDP Polling [Hoa_Nguyen] [Hoa_Nguyen] ++hpbladems 5316 tcp HPBladeSystem Monitor [Alan_Minchew] [Alan_Minchew] 2011-05-23 2011-05-16 ++ Service ++ 5316 udp Unassigned 2011-05-16 ++hpdevms 5317 tcp HP Device Monitor Service [Alan_Minchew] [Alan_Minchew] 2011-05-16 ++ 5317 udp Reserved ++pkix-cmc 5318 tcp PKIX Certificate Management [IESG] [IETF_Chair] [RFC6402] ++ using CMS (CMC) ++ 5318 udp Reserved ++ 5319 Unassigned ++bsfserver-zn 5320 tcp Webservices-based Zn [Bert_Paul] [Bert_Paul] 2008-05-01 ++ interface of BSF ++ 5320 udp Reserved ++bsfsvr-zn-ssl 5321 tcp Webservices-based Zn [Bert_Paul] [Bert_Paul] 2008-07-03 ++ interface of BSF over SSL ++ 5321 udp Reserved ++ 5322-5342 Unassigned ++kfserver 5343 tcp Sculptor Database Server [Keith_Ashman] [Keith_Ashman] 2005-12 ++kfserver 5343 udp Sculptor Database Server [Keith_Ashman] [Keith_Ashman] 2005-12 ++xkotodrcp 5344 tcp xkoto DRCP [Jeff_Heisz] [Jeff_Heisz] 2006-02 ++xkotodrcp 5344 udp xkoto DRCP [Jeff_Heisz] [Jeff_Heisz] 2006-02 ++ 5345-5348 Unassigned ++stuns 5349 tcp STUN over TLS [RFC5389] ++stuns 5349 udp Reserved for a future [RFC5389] ++ enhancement of STUN ++turns 5349 tcp TURN over TLS [RFC5766] ++turns 5349 udp Reserved for a future [RFC5766] ++ enhancement of TURN ++stun-behaviors 5349 tcp STUN Behavior Discovery over [RFC5780] ++ TLS ++stun-behaviors 5349 udp Reserved for a future [RFC5780] ++ enhancement of STUN-BEHAVIOR ++nat-pmp-status 5350 tcp NAT-PMP Status Announcements [Stuart_Cheshire] [Stuart_Cheshire] 2007-12-03 ++nat-pmp-status 5350 udp NAT-PMP Status Announcements [Stuart_Cheshire] [Stuart_Cheshire] 2007-12-03 ++nat-pmp 5351 tcp NAT Port Mapping Protocol [Joshua_Graessley] [Joshua_Graessley] 2004-12 ++nat-pmp 5351 udp NAT Port Mapping Protocol [Joshua_Graessley] [Joshua_Graessley] 2004-12 ++dns-llq 5352 tcp DNS Long-Lived Queries [Kiren_Sekar] [Kiren_Sekar] 2005-08 ++dns-llq 5352 udp DNS Long-Lived Queries [Kiren_Sekar] [Kiren_Sekar] 2005-08 ++mdns 5353 tcp Multicast DNS [IESG] [IETF_Chair] [RFC-cheshire-dnsext-multicastdns-15] ++mdns 5353 udp Multicast DNS [IESG] [IETF_Chair] [RFC-cheshire-dnsext-multicastdns-15] ++mdnsresponder 5354 tcp Multicast DNS Responder IPC [Stuart_Cheshire_3] [Stuart_Cheshire_3] 2004-06 ++mdnsresponder 5354 udp Multicast DNS Responder IPC [Stuart_Cheshire_3] [Stuart_Cheshire_3] 2004-06 ++llmnr 5355 tcp LLMNR [Bernard_Aboba] [Bernard_Aboba] 2004-06 ++llmnr 5355 udp LLMNR [Bernard_Aboba] [Bernard_Aboba] 2004-06 ++ms-smlbiz 5356 tcp Microsoft Small Business [Gopikrishna_Sandra] [Gopikrishna_Sandra] 2005-02 ++ms-smlbiz 5356 udp Microsoft Small Business [Gopikrishna_Sandra] [Gopikrishna_Sandra] 2005-02 ++wsdapi 5357 tcp Web Services for Devices [Henry_Rawas] [Henry_Rawas] 2005-08 ++wsdapi 5357 udp Web Services for Devices [Henry_Rawas] [Henry_Rawas] 2005-08 ++wsdapi-s 5358 tcp WS for Devices Secured [Henry_Rawas] [Henry_Rawas] 2005-08 ++wsdapi-s 5358 udp WS for Devices Secured [Henry_Rawas] [Henry_Rawas] 2005-08 ++ms-alerter 5359 tcp Microsoft Alerter [Marc_McClure] [Marc_McClure] 2007-08-07 ++ms-alerter 5359 udp Microsoft Alerter [Marc_McClure] [Marc_McClure] 2007-08-07 ++ms-sideshow 5360 tcp Protocol for Windows [Dan_Polivy] [Dan_Polivy] 2008-03-12 ++ SideShow ++ms-sideshow 5360 udp Protocol for Windows [Dan_Polivy] [Dan_Polivy] 2008-03-12 ++ SideShow ++ms-s-sideshow 5361 tcp Secure Protocol for Windows [Dan_Polivy] [Dan_Polivy] 2008-03-12 ++ SideShow ++ms-s-sideshow 5361 udp Secure Protocol for Windows [Dan_Polivy] [Dan_Polivy] 2008-03-12 ++ SideShow ++serverwsd2 5362 tcp Microsoft Windows Server [Erhan_Soyer_Osman] [Erhan_Soyer_Osman] 2008-03-26 ++ WSD2 Service ++serverwsd2 5362 udp Microsoft Windows Server [Erhan_Soyer_Osman] [Erhan_Soyer_Osman] 2008-03-26 ++ WSD2 Service ++net-projection 5363 tcp Windows Network Projection [Rob_Williams] [Rob_Williams] 2009-02-17 ++net-projection 5363 udp Windows Network Projection [Rob_Williams] [Rob_Williams] 2009-02-17 ++ 5364-5396 Unassigned ++stresstester 5397 tcp StressTester(tm) Injector [Graham_Parsons] [Graham_Parsons] 2005-08 ++stresstester 5397 udp StressTester(tm) Injector [Graham_Parsons] [Graham_Parsons] 2005-08 ++elektron-admin 5398 tcp Elektron Administration [Chris_Hawk] [Chris_Hawk] 2005-08 ++elektron-admin 5398 udp Elektron Administration [Chris_Hawk] [Chris_Hawk] 2005-08 ++securitychase 5399 tcp SecurityChase [Daisuke_Shinomiya] [Daisuke_Shinomiya] 2005-08 ++securitychase 5399 udp SecurityChase [Daisuke_Shinomiya] [Daisuke_Shinomiya] 2005-08 ++excerpt 5400 tcp Excerpt Search [John_Hinsdale] [John_Hinsdale] ++excerpt 5400 udp Excerpt Search [John_Hinsdale] [John_Hinsdale] ++excerpts 5401 tcp Excerpt Search Secure [John_Hinsdale] [John_Hinsdale] ++excerpts 5401 udp Excerpt Search Secure [John_Hinsdale] [John_Hinsdale] ++mftp 5402 tcp OmniCast MFTP [Steve_Bannister] [Steve_Bannister] ++mftp 5402 udp OmniCast MFTP [Steve_Bannister] [Steve_Bannister] ++hpoms-ci-lstn 5403 tcp HPOMS-CI-LSTN [Harold_Froehling] [Harold_Froehling] ++hpoms-ci-lstn 5403 udp HPOMS-CI-LSTN [Harold_Froehling] [Harold_Froehling] ++hpoms-dps-lstn 5404 tcp HPOMS-DPS-LSTN [Harold_Froehling] [Harold_Froehling] ++hpoms-dps-lstn 5404 udp HPOMS-DPS-LSTN [Harold_Froehling] [Harold_Froehling] ++netsupport 5405 tcp NetSupport [Paul_Sanders_2] [Paul_Sanders_2] ++netsupport 5405 udp NetSupport [Paul_Sanders_2] [Paul_Sanders_2] ++systemics-sox 5406 tcp Systemics Sox [Gary_Howland] [Gary_Howland] ++systemics-sox 5406 udp Systemics Sox [Gary_Howland] [Gary_Howland] ++foresyte-clear 5407 tcp Foresyte-Clear [Jorge_Aldana] [Jorge_Aldana] ++foresyte-clear 5407 udp Foresyte-Clear [Jorge_Aldana] [Jorge_Aldana] ++foresyte-sec 5408 tcp Foresyte-Sec [Jorge_Aldana] [Jorge_Aldana] ++foresyte-sec 5408 udp Foresyte-Sec [Jorge_Aldana] [Jorge_Aldana] ++salient-dtasrv 5409 tcp Salient Data Server [Richard_Farnham] [Richard_Farnham] ++salient-dtasrv 5409 udp Salient Data Server [Richard_Farnham] [Richard_Farnham] ++salient-usrmgr 5410 tcp Salient User Manager [Richard_Farnham] [Richard_Farnham] ++salient-usrmgr 5410 udp Salient User Manager [Richard_Farnham] [Richard_Farnham] ++actnet 5411 tcp ActNet [Simon_Robillard] [Simon_Robillard] ++actnet 5411 udp ActNet [Simon_Robillard] [Simon_Robillard] ++continuus 5412 tcp Continuus [Steven_Holtsberg] [Steven_Holtsberg] ++continuus 5412 udp Continuus [Steven_Holtsberg] [Steven_Holtsberg] ++wwiotalk 5413 tcp WWIOTALK [Roger_Knobbe] [Roger_Knobbe] ++wwiotalk 5413 udp WWIOTALK [Roger_Knobbe] [Roger_Knobbe] ++statusd 5414 tcp StatusD [Stephen_Misel_2] [Stephen_Misel_2] ++statusd 5414 udp StatusD [Stephen_Misel_2] [Stephen_Misel_2] ++ns-server 5415 tcp NS Server [Jeffrey_Chiao] [Jeffrey_Chiao] ++ns-server 5415 udp NS Server [Jeffrey_Chiao] [Jeffrey_Chiao] ++sns-gateway 5416 tcp SNS Gateway [Mary_Holstage] [Mary_Holstage] ++sns-gateway 5416 udp SNS Gateway [Mary_Holstage] [Mary_Holstage] ++sns-agent 5417 tcp SNS Agent [Mary_Holstage] [Mary_Holstage] ++sns-agent 5417 udp SNS Agent [Mary_Holstage] [Mary_Holstage] ++mcntp 5418 tcp MCNTP [Heiko_Rupp] [Heiko_Rupp] ++mcntp 5418 udp MCNTP [Heiko_Rupp] [Heiko_Rupp] ++dj-ice 5419 tcp DJ-ICE [Don_Tyson_2] [Don_Tyson_2] ++dj-ice 5419 udp DJ-ICE [Don_Tyson_2] [Don_Tyson_2] ++cylink-c 5420 tcp Cylink-C [John_Jobe] [John_Jobe] ++cylink-c 5420 udp Cylink-C [John_Jobe] [John_Jobe] ++netsupport2 5421 tcp Net Support 2 [Paul_Sanders] [Paul_Sanders] ++netsupport2 5421 udp Net Support 2 [Paul_Sanders] [Paul_Sanders] ++salient-mux 5422 tcp Salient MUX [Richard_Farnham] [Richard_Farnham] ++salient-mux 5422 udp Salient MUX [Richard_Farnham] [Richard_Farnham] ++virtualuser 5423 tcp VIRTUALUSER [Chad_Williams] [Chad_Williams] ++virtualuser 5423 udp VIRTUALUSER [Chad_Williams] [Chad_Williams] ++beyond-remote 5424 tcp Beyond Remote [Michael_Berg] [Michael_Berg] 2004-11 ++beyond-remote 5424 udp Beyond Remote [Michael_Berg] [Michael_Berg] 2004-11 ++br-channel 5425 tcp Beyond Remote Command [Michael_Berg] [Michael_Berg] 2005-08 ++ Channel ++br-channel 5425 udp Beyond Remote Command [Michael_Berg] [Michael_Berg] 2005-08 ++ Channel ++devbasic 5426 tcp DEVBASIC [Curtis_Smith] [Curtis_Smith] ++devbasic 5426 udp DEVBASIC [Curtis_Smith] [Curtis_Smith] ++sco-peer-tta 5427 tcp SCO-PEER-TTA [Andrew_Shire] [Andrew_Shire] ++sco-peer-tta 5427 udp SCO-PEER-TTA [Andrew_Shire] [Andrew_Shire] ++telaconsole 5428 tcp TELACONSOLE [Joseph_M_Newcomer] [Joseph_M_Newcomer] ++telaconsole 5428 udp TELACONSOLE [Joseph_M_Newcomer] [Joseph_M_Newcomer] ++base 5429 tcp Billing and Accounting [Odo_Maletzki] [Odo_Maletzki] ++ System Exchange ++base 5429 udp Billing and Accounting [Odo_Maletzki] [Odo_Maletzki] ++ System Exchange ++radec-corp 5430 tcp RADEC CORP [David_Chell] [David_Chell] ++radec-corp 5430 udp RADEC CORP [David_Chell] [David_Chell] ++park-agent 5431 tcp PARK AGENT [John_Clifford] [John_Clifford] ++park-agent 5431 udp PARK AGENT [John_Clifford] [John_Clifford] ++postgresql 5432 tcp PostgreSQL Database [Tom_Lane] [Tom_Lane] ++postgresql 5432 udp PostgreSQL Database [Tom_Lane] [Tom_Lane] ++pyrrho 5433 tcp Pyrrho DBMS [Malcolm_Crowe] [Malcolm_Crowe] 2005-11 ++pyrrho 5433 udp Pyrrho DBMS [Malcolm_Crowe] [Malcolm_Crowe] 2005-11 ++sgi-arrayd 5434 tcp SGI Array Services Daemon [Karl_Feind] [Karl_Feind] 2005-10 ++sgi-arrayd 5434 udp SGI Array Services Daemon [Karl_Feind] [Karl_Feind] 2005-10 ++sceanics 5435 tcp SCEANICS situation and [Richard_Olsen] [Richard_Olsen] ++ action notification ++sceanics 5435 udp SCEANICS situation and [Richard_Olsen] [Richard_Olsen] ++ action notification ++ 5436 tcp Reserved ++pmip6-cntl 5436 udp pmip6-cntl [RFC5844] ++ 5437 tcp Reserved ++pmip6-data 5437 udp pmip6-data [RFC5844] ++ 5438-5442 Unassigned ++spss 5443 tcp Pearson HTTPS [Pearson] [Pearson] 2008-01-17 ++spss 5443 udp Pearson HTTPS [Pearson] [Pearson] 2008-01-17 ++ UNAUTHORIZED ++ USE: Port ++ 5444 by ++ as-mgtc, ++ AS400 ISeries ++ 5444 Unassigned (IBM), w.32 ++ zotob worm ++ (None), ++ 'ppas' ++ service ++ (EnterpriseDB ++ Corporation) ++smbdirect 5445 tcp Server Message Block over [Microsoft_Corporation_2] [Tom_Talpey] 2012-03-15 ++ Remote Direct Memory Access ++ 5445 udp Reserved ++smbdirect 5445 sctp Server Message Block over [Microsoft_Corporation_2] [Tom_Talpey] 2012-03-15 ++ Remote Direct Memory Access ++ 5446-5452 Unassigned ++surebox 5453 tcp SureBox [Emin_BORU] [Emin_BORU] 2004-11 ++surebox 5453 udp SureBox [Emin_BORU] [Emin_BORU] 2004-11 ++apc-5454 5454 tcp APC 5454 [American_Power_Conve] [American_Power_Conve] ++apc-5454 5454 udp APC 5454 [American_Power_Conve] [American_Power_Conve] ++apc-5455 5455 tcp APC 5455 [American_Power_Conve] [American_Power_Conve] ++apc-5455 5455 udp APC 5455 [American_Power_Conve] [American_Power_Conve] ++apc-5456 5456 tcp APC 5456 [American_Power_Conve] [American_Power_Conve] ++apc-5456 5456 udp APC 5456 [American_Power_Conve] [American_Power_Conve] ++ 5457-5460 Unassigned ++silkmeter 5461 tcp SILKMETER [Klaus_Fellner] [Klaus_Fellner] ++silkmeter 5461 udp SILKMETER [Klaus_Fellner] [Klaus_Fellner] ++ttl-publisher 5462 tcp TTL Publisher [Peter_Jacobs] [Peter_Jacobs] ++ttl-publisher 5462 udp TTL Publisher [Peter_Jacobs] [Peter_Jacobs] ++ttlpriceproxy 5463 tcp TTL Price Proxy [Peter_Jacobs] [Peter_Jacobs] ++ttlpriceproxy 5463 udp TTL Price Proxy [Peter_Jacobs] [Peter_Jacobs] ++quailnet 5464 tcp Quail Networks Object Broker [Craig_N_Bissell] [Craig_N_Bissell] 2006-04 ++quailnet 5464 udp Quail Networks Object Broker [Craig_N_Bissell] [Craig_N_Bissell] 2006-04 ++netops-broker 5465 tcp NETOPS-BROKER [John_R_Deuel] [John_R_Deuel] ++netops-broker 5465 udp NETOPS-BROKER [John_R_Deuel] [John_R_Deuel] ++ 5466-5499 Unassigned ++fcp-addr-srvr1 5500 tcp fcp-addr-srvr1 [Ken_Wittmer] [Ken_Wittmer] ++fcp-addr-srvr1 5500 udp fcp-addr-srvr1 [Ken_Wittmer] [Ken_Wittmer] ++fcp-addr-srvr2 5501 tcp fcp-addr-srvr2 [Ken_Wittmer] [Ken_Wittmer] ++fcp-addr-srvr2 5501 udp fcp-addr-srvr2 [Ken_Wittmer] [Ken_Wittmer] ++fcp-srvr-inst1 5502 tcp fcp-srvr-inst1 [Ken_Wittmer] [Ken_Wittmer] ++fcp-srvr-inst1 5502 udp fcp-srvr-inst1 [Ken_Wittmer] [Ken_Wittmer] ++fcp-srvr-inst2 5503 tcp fcp-srvr-inst2 [Ken_Wittmer] [Ken_Wittmer] ++fcp-srvr-inst2 5503 udp fcp-srvr-inst2 [Ken_Wittmer] [Ken_Wittmer] ++fcp-cics-gw1 5504 tcp fcp-cics-gw1 [Ken_Wittmer] [Ken_Wittmer] ++fcp-cics-gw1 5504 udp fcp-cics-gw1 [Ken_Wittmer] [Ken_Wittmer] ++checkoutdb 5505 tcp Checkout Database [Dirk_Stoop] [Dirk_Stoop] 2007-04 ++checkoutdb 5505 udp Checkout Database [Dirk_Stoop] [Dirk_Stoop] 2007-04 ++amc 5506 tcp Amcom Mobile Connect [Aaron_Fracht_Monroe] [Aaron_Fracht_Monroe] 2010-06-03 ++amc 5506 udp Amcom Mobile Connect [Aaron_Fracht_Monroe] [Aaron_Fracht_Monroe] 2010-06-03 ++ 5507-5552 Unassigned ++sgi-eventmond 5553 tcp SGI Eventmond Port [Andrei_Vilkotski] [Andrei_Vilkotski] 2003-06 ++sgi-eventmond 5553 udp SGI Eventmond Port [Andrei_Vilkotski] [Andrei_Vilkotski] 2003-06 ++sgi-esphttp 5554 tcp SGI ESP HTTP [Vladimir_Legalov] [Vladimir_Legalov] ++sgi-esphttp 5554 udp SGI ESP HTTP [Vladimir_Legalov] [Vladimir_Legalov] ++ UNAUTHORIZED ++ USE: port ++ 5555 by ++ Intermec ++personal-agent 5555 tcp Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; ++ UNAUTHORIZED ++ USE: Port ++ 5555 also ++ used by HP ++ Omniback ++ UNAUTHORIZED ++ USE: port ++ 5555 by ++ Intermec ++personal-agent 5555 udp Personal Agent [Jackie_Wu] [Jackie_Wu] UDPPlus; ++ UNAUTHORIZED ++ USE: Port ++ 5555 also ++ used by HP ++ Omniback ++freeciv 5556 tcp Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 ++freeciv 5556 udp Freeciv gameplay [Reinier_Post_and_Pau] [Reinier_Post_and_Pau] 2006-01 ++farenet 5557 tcp Sandlab FARENET [Kay_T_Labinsky] [Kay_T_Labinsky] 2010-05-03 ++ 5557 udp Reserved ++ 5558-5565 Unassigned ++westec-connect 5566 tcp Westec Connect [Jon_Bolen] [Jon_Bolen] 2009-03-18 ++ 5566 udp Reserved ++m-oap 5567 tcp Multicast Object Access [Bryant_Eastham] [Bryant_Eastham] 2004-11 ++ Protocol ++m-oap 5567 udp Multicast Object Access [Bryant_Eastham] [Bryant_Eastham] 2004-11 ++ Protocol ++sdt 5568 tcp Session Data Transport [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05 ++ Multicast ++sdt 5568 udp Session Data Transport [Daniel_W_Antonuk] [Daniel_W_Antonuk] 2006-05 ++ Multicast ++ PLASA E1.33, Remote Device ++rdmnet-ctrl 5569 tcp Management (RDM) controller [PLASA] [Simon_Newton] 2012-06-01 ++ status notifications ++rdmnet-device 5569 udp PLASA E1.33, Remote Device [PLASA] [Simon_Newton] 2012-06-01 ++ Management (RDM) messages ++ 5570-5572 Unassigned ++sdmmp 5573 tcp SAS Domain Management [Ron_Zuckerman] [Ron_Zuckerman] 2007-08-30 ++ Messaging Protocol ++sdmmp 5573 udp SAS Domain Management [Ron_Zuckerman] [Ron_Zuckerman] 2007-08-30 ++ Messaging Protocol ++lsi-bobcat 5574 tcp SAS IO Forwarding [Mandar_Joshi] [Mandar_Joshi] 2009-02-09 ++ 5574 udp Reserved ++ora-oap 5575 tcp Oracle Access Protocol [Peter_Povinec] [Peter_Povinec] 2010-04-13 ++ 5575 udp Reserved ++ 5576-5578 Unassigned ++fdtracks 5579 tcp FleetDisplay Tracking [Henrik_Woffinden] [Henrik_Woffinden] 2008-09-22 ++ Service ++ 5579 udp Reserved ++tmosms0 5580 tcp T-Mobile SMS Protocol [Ezinne_Oji] [Ezinne_Oji] 2006-06 ++ Message 0 ++tmosms0 5580 udp T-Mobile SMS Protocol [Ezinne_Oji] [Ezinne_Oji] 2006-06 ++ Message 0 ++tmosms1 5581 tcp T-Mobile SMS Protocol [Ezinne_Oji] [Ezinne_Oji] 2006-06 ++ Message 1 ++tmosms1 5581 udp T-Mobile SMS Protocol [Ezinne_Oji] [Ezinne_Oji] 2006-06 ++ Message 1 ++fac-restore 5582 tcp T-Mobile SMS Protocol [Jessica_Yan] [Jessica_Yan] 2008-02-19 ++ Message 3 ++fac-restore 5582 udp T-Mobile SMS Protocol [Jessica_Yan] [Jessica_Yan] 2008-02-19 ++ Message 3 ++tmo-icon-sync 5583 tcp T-Mobile SMS Protocol [Donghwan_Lim] [Donghwan_Lim] 2008-01-22 ++ Message 2 ++tmo-icon-sync 5583 udp T-Mobile SMS Protocol [Donghwan_Lim] [Donghwan_Lim] 2008-01-22 ++ Message 2 ++bis-web 5584 tcp BeInSync-Web [Adi_Ruppin] [Adi_Ruppin] 2005-08 ++bis-web 5584 udp BeInSync-Web [Adi_Ruppin] [Adi_Ruppin] 2005-08 ++bis-sync 5585 tcp BeInSync-sync [Adi_Ruppin] [Adi_Ruppin] 2005-08 ++bis-sync 5585 udp BeInSync-sync [Adi_Ruppin] [Adi_Ruppin] 2005-08 ++ 5586-5596 Unassigned ++ininmessaging 5597 tcp inin secure messaging [Mike_Gagle_2] [Mike_Gagle_2] 2006-05 ++ininmessaging 5597 udp inin secure messaging [Mike_Gagle_2] [Mike_Gagle_2] 2006-05 ++mctfeed 5598 tcp MCT Market Data Feed [Stephane_Touizer] [Stephane_Touizer] 2006-05 ++mctfeed 5598 udp MCT Market Data Feed [Stephane_Touizer] [Stephane_Touizer] 2006-05 ++esinstall 5599 tcp Enterprise Security Remote [Kimberly_Gibbs] [Kimberly_Gibbs] ++ Install ++esinstall 5599 udp Enterprise Security Remote [Kimberly_Gibbs] [Kimberly_Gibbs] ++ Install ++esmmanager 5600 tcp Enterprise Security Manager [Kimberly_Gibbs] [Kimberly_Gibbs] ++esmmanager 5600 udp Enterprise Security Manager [Kimberly_Gibbs] [Kimberly_Gibbs] ++esmagent 5601 tcp Enterprise Security Agent [Kimberly_Gibbs] [Kimberly_Gibbs] ++esmagent 5601 udp Enterprise Security Agent [Kimberly_Gibbs] [Kimberly_Gibbs] ++a1-msc 5602 tcp A1-MSC [Mike_Dolan] [Mike_Dolan] ++a1-msc 5602 udp A1-MSC [Mike_Dolan] [Mike_Dolan] ++a1-bs 5603 tcp A1-BS [Mike_Dolan] [Mike_Dolan] ++a1-bs 5603 udp A1-BS [Mike_Dolan] [Mike_Dolan] ++a3-sdunode 5604 tcp A3-SDUNode [Mike_Dolan] [Mike_Dolan] ++a3-sdunode 5604 udp A3-SDUNode [Mike_Dolan] [Mike_Dolan] ++a4-sdunode 5605 tcp A4-SDUNode [Mike_Dolan] [Mike_Dolan] ++a4-sdunode 5605 udp A4-SDUNode [Mike_Dolan] [Mike_Dolan] ++ 5606-5626 Unassigned ++ninaf 5627 tcp Node Initiated Network [Thomas_Scholl] [Thomas_Scholl] 2006-03 ++ Association Forma ++ninaf 5627 udp Node Initiated Network [Thomas_Scholl] [Thomas_Scholl] 2006-03 ++ Association Forma ++htrust 5628 tcp HTrust API [Karl_Olafsson] [Karl_Olafsson] 2008-10-24 ++htrust 5628 udp HTrust API [Karl_Olafsson] [Karl_Olafsson] 2008-10-24 ++symantec-sfdb 5629 tcp Symantec Storage Foundation [Quang_Thoi] [Quang_Thoi] 2006-11 ++ for Database ++symantec-sfdb 5629 udp Symantec Storage Foundation [Quang_Thoi] [Quang_Thoi] 2006-11 ++ for Database ++precise-comm 5630 tcp PreciseCommunication [Alon_Tamir] [Alon_Tamir] 2006-04 ++precise-comm 5630 udp PreciseCommunication [Alon_Tamir] [Alon_Tamir] 2006-04 ++pcanywheredata 5631 tcp pcANYWHEREdata [Jon_Rosarky] [Jon_Rosarky] ++pcanywheredata 5631 udp pcANYWHEREdata [Jon_Rosarky] [Jon_Rosarky] ++pcanywherestat 5632 tcp pcANYWHEREstat [Jon_Rosarky] [Jon_Rosarky] ++pcanywherestat 5632 udp pcANYWHEREstat [Jon_Rosarky] [Jon_Rosarky] ++beorl 5633 tcp BE Operations Request [Chirag_Desai] [Chirag_Desai] 2006-02 ++ Listener ++beorl 5633 udp BE Operations Request [Chirag_Desai] [Chirag_Desai] 2006-02 ++ Listener ++xprtld 5634 tcp SF Message Service [VR_Satish] [VR_Satish] 2007-08-16 ++xprtld 5634 udp SF Message Service [VR_Satish] [VR_Satish] 2007-08-16 ++sfmsso 5635 tcp SFM Authentication Subsystem [De_Chih_Chien] [De_Chih_Chien] 2008-09-15 ++ 5635 udp Reserved ++sfm-db-server 5636 tcp SFMdb - SFM DB server [De_Chih_Chien] [De_Chih_Chien] 2008-10-06 ++ 5636 udp Reserved ++cssc 5637 tcp Symantec CSSC [Amol_P_Tambe] [Amol_P_Tambe] 2011-02-02 ++ 5637 udp Reserved ++ Symantec Fingerprint Lookup ++flcrs 5638 tcp and Container Reference [Symantec_Corp] [Neel_A_Bhatt] 2012-01-03 ++ Service ++ 5638 udp Reserved ++ics 5639 tcp Symantec Integrity Checking [Symantec_Corp2] [Danzhou_Liu] 2012-05-07 ++ Service ++ 5639 udp Reserved ++ 5640-5645 Unassigned ++vfmobile 5646 tcp Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder] 2011-11-03 ++ 5646 udp Reserved ++ UNAUTHORIZED ++ 5647-5670 Unassigned USE: Port ++ 5666 used by ++ SAIC NRPE ++amqps 5671 tcp amqp protocol over TLS/SSL [Ted_Ross_2] [Ted_Ross_2] 2008-03-26 ++amqps 5671 udp amqp protocol over TLS/SSL [Ted_Ross_2] [Ted_Ross_2] 2008-03-26 ++amqp 5672 tcp AMQP [Pieter_Hintjens] [Pieter_Hintjens] 2006-01 ++amqp 5672 udp AMQP [Pieter_Hintjens] [Pieter_Hintjens] 2006-01 ++amqp 5672 sctp AMQP [Martin_Sustrik] [Martin_Sustrik] 2007-03 ++jms 5673 tcp JACL Message Server [Stuart_Allen] [Stuart_Allen] 2002-02 ++jms 5673 udp JACL Message Server [Stuart_Allen] [Stuart_Allen] 2002-02 ++hyperscsi-port 5674 tcp HyperSCSI Port [Data_Storage_Institu] [Data_Storage_Institu] 2002-02 ++hyperscsi-port 5674 udp HyperSCSI Port [Data_Storage_Institu] [Data_Storage_Institu] 2002-02 ++v5ua 5675 tcp V5UA application port [RFC3807] ++v5ua 5675 udp V5UA application port [RFC3807] ++v5ua 5675 sctp V5UA application port [RFC3807] ++raadmin 5676 tcp RA Administration [Sergei_Zjaikin] [Sergei_Zjaikin] 2002-02 ++raadmin 5676 udp RA Administration [Sergei_Zjaikin] [Sergei_Zjaikin] 2002-02 ++questdb2-lnchr 5677 tcp Quest Central DB2 Launchr [Robert_M_Mackowiak] [Robert_M_Mackowiak] 2002-02 ++questdb2-lnchr 5677 udp Quest Central DB2 Launchr [Robert_M_Mackowiak] [Robert_M_Mackowiak] 2002-02 ++rrac 5678 tcp Remote Replication Agent ++ Connection ++rrac 5678 udp Remote Replication Agent ++ Connection ++dccm 5679 tcp Direct Cable Connect Manager [Mark_Miller_2] [Mark_Miller_2] ++dccm 5679 udp Direct Cable Connect Manager [Mark_Miller_2] [Mark_Miller_2] ++auriga-router 5680 tcp Auriga Router Service [Vincent_Gaudeul] [Vincent_Gaudeul] 2006-02 ++auriga-router 5680 udp Auriga Router Service [Vincent_Gaudeul] [Vincent_Gaudeul] 2006-02 ++ncxcp 5681 tcp Net-coneX Control Protocol [Ryan_Werber] [Ryan_Werber] 2006-06 ++ncxcp 5681 udp Net-coneX Control Protocol [Ryan_Werber] [Ryan_Werber] 2006-06 ++ 5682 tcp Reserved ++brightcore 5682 udp BrightCore control & data [Marko_Bjelac] [Marko_Bjelac] 2010-06-10 ++ transfer exchange ++ 5683 tcp Reserved ++coap 5683 udp Constrained Application 2011-06-13 [draft-ietf-core-coap] ++ Protocol ++ 5684-5687 Unassigned ++ggz 5688 tcp GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01 ++ggz 5688 udp GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01 ++qmvideo 5689 tcp QM video network management [Jamie_Lokier] [Jamie_Lokier] 2006-05 ++ protocol ++qmvideo 5689 udp QM video network management [Jamie_Lokier] [Jamie_Lokier] 2006-05 ++ protocol ++ 5690-5692 Unassigned ++rbsystem 5693 tcp Robert Bosch Data Transfer [Robert_Bosch_GmbH] [Klaus_Warth] 2011-08-01 ++ 5693 udp Reserved ++ 5694-5695 Unassigned ++kmip 5696 tcp Key Management [OASIS_KMIP_Technical_Committee] [Robin_Cover] 2011-07-25 ++ Interoperability Protocol ++ 5696 udp Reserved ++ 5697-5712 Unassigned ++proshareaudio 5713 tcp proshare conf audio [gunner] [gunner] ++proshareaudio 5713 udp proshare conf audio [gunner] [gunner] ++prosharevideo 5714 tcp proshare conf video [gunner] [gunner] ++prosharevideo 5714 udp proshare conf video [gunner] [gunner] ++prosharedata 5715 tcp proshare conf data [gunner] [gunner] ++prosharedata 5715 udp proshare conf data [gunner] [gunner] ++prosharerequest 5716 tcp proshare conf request [gunner] [gunner] ++prosharerequest 5716 udp proshare conf request [gunner] [gunner] ++prosharenotify 5717 tcp proshare conf notify [gunner] [gunner] ++prosharenotify 5717 udp proshare conf notify ++dpm 5718 tcp DPM Communication Server [Sundar_Srinivasan][Vinay_Badami] [Sundar_Srinivasan][Vinay_Badami] ++dpm 5718 udp DPM Communication Server [Sundar_Srinivasan][Vinay_Badami] [Sundar_Srinivasan][Vinay_Badami] ++dpm-agent 5719 tcp DPM Agent Coordinator [Sundar_Srinivasan][Vinay_Badami] [Sundar_Srinivasan][Vinay_Badami] 2006-05 ++dpm-agent 5719 udp DPM Agent Coordinator [Sundar_Srinivasan][Vinay_Badami] [Sundar_Srinivasan][Vinay_Badami] 2006-05 ++ms-licensing 5720 tcp MS-Licensing [Thomas_Lindeman] [Thomas_Lindeman] 2002-11 ++ms-licensing 5720 udp MS-Licensing [Thomas_Lindeman] [Thomas_Lindeman] 2002-11 ++dtpt 5721 tcp Desktop Passthru Service [Dan_Leising] [Dan_Leising] 2005-01 ++dtpt 5721 udp Desktop Passthru Service [Dan_Leising] [Dan_Leising] 2005-01 ++msdfsr 5722 tcp Microsoft DFS Replication [Guhan_Suriyanarayana] [Guhan_Suriyanarayana] 2006-03 ++ Service ++msdfsr 5722 udp Microsoft DFS Replication [Guhan_Suriyanarayana] [Guhan_Suriyanarayana] 2006-03 ++ Service ++omhs 5723 tcp Operations Manager - Health [Gerardo_Dilillo] [Gerardo_Dilillo] 2006-08 ++ Service ++omhs 5723 udp Operations Manager - Health [Gerardo_Dilillo] [Gerardo_Dilillo] 2006-08 ++ Service ++omsdk 5724 tcp Operations Manager - SDK [Gerardo_Dilillo] [Gerardo_Dilillo] 2006-08 ++ Service ++omsdk 5724 udp Operations Manager - SDK [Gerardo_Dilillo] [Gerardo_Dilillo] 2006-08 ++ Service ++ms-ilm 5725 tcp Microsoft Identity Lifecycle [Rob_Ward] [Rob_Ward] ++ Manager ++ 5725 udp Reserved 2008-05-02 ++ms-ilm-sts 5726 tcp Microsoft Lifecycle Manager [Rob_Ward] [Rob_Ward] ++ Secure Token Service ++ 5726 udp Reserved 2008-05-02 ++asgenf 5727 tcp ASG Event Notification [Arman_Bedonian] [Arman_Bedonian] 2009-07-15 ++ Framework ++ 5727 udp Reserved ++io-dist-data 5728 tcp Dist. I/O Comm. Service Data [Harish_Kuttan] [Harish_Kuttan] 2010-03-22 ++ and Control ++io-dist-group 5728 udp Dist. I/O Comm. Service [Harish_Kuttan] [Harish_Kuttan] 2010-03-22 ++ Group Membership ++openmail 5729 tcp Openmail User Agent Layer [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++openmail 5729 udp Openmail User Agent Layer [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++unieng 5730 tcp Steltor's calendar access [Bernard_Desruisseaux] [Bernard_Desruisseaux] ++unieng 5730 udp Steltor's calendar access [Bernard_Desruisseaux] [Bernard_Desruisseaux] ++ 5731-5740 Unassigned ++ida-discover1 5741 tcp IDA Discover Port 1 [MPITech_Support] [MPITech_Support] ++ida-discover1 5741 udp IDA Discover Port 1 [MPITech_Support] [MPITech_Support] ++ida-discover2 5742 tcp IDA Discover Port 2 [MPITech_Support] [MPITech_Support] ++ida-discover2 5742 udp IDA Discover Port 2 [MPITech_Support] [MPITech_Support] ++watchdoc-pod 5743 tcp Watchdoc NetPOD Protocol [Christophe_Chevalier] [Christophe_Chevalier] 2005-08 ++watchdoc-pod 5743 udp Watchdoc NetPOD Protocol [Christophe_Chevalier] [Christophe_Chevalier] 2005-08 ++watchdoc 5744 tcp Watchdoc Server [Christophe_Chevalier] [Christophe_Chevalier] 2004-11 ++watchdoc 5744 udp Watchdoc Server [Christophe_Chevalier] [Christophe_Chevalier] 2004-11 ++fcopy-server 5745 tcp fcopy-server [Moshe_Leibovitch] [Moshe_Leibovitch] ++fcopy-server 5745 udp fcopy-server [Moshe_Leibovitch] [Moshe_Leibovitch] ++fcopys-server 5746 tcp fcopys-server [Moshe_Leibovitch] [Moshe_Leibovitch] ++fcopys-server 5746 udp fcopys-server [Moshe_Leibovitch] [Moshe_Leibovitch] ++tunatic 5747 tcp Wildbits Tunatic [Sylvain_Demongeot] [Sylvain_Demongeot] 2005-08 ++tunatic 5747 udp Wildbits Tunatic [Sylvain_Demongeot] [Sylvain_Demongeot] 2005-08 ++tunalyzer 5748 tcp Wildbits Tunalyzer [Sylvain_Demongeot] [Sylvain_Demongeot] 2005-08 ++tunalyzer 5748 udp Wildbits Tunalyzer [Sylvain_Demongeot] [Sylvain_Demongeot] 2005-08 ++ 5749 Unassigned ++rscd 5750 tcp Bladelogic Agent Service [Brian_Trevor] [Brian_Trevor] 2008-10-24 ++rscd 5750 udp Bladelogic Agent Service [Brian_Trevor] [Brian_Trevor] 2008-10-24 ++ 5751-5754 Unassigned ++openmailg 5755 tcp OpenMail Desk Gateway server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++openmailg 5755 udp OpenMail Desk Gateway server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++ 5756 Unassigned ++x500ms 5757 tcp OpenMail X.500 Directory [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++ Server ++x500ms 5757 udp OpenMail X.500 Directory [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++ Server ++ 5758-5765 Unassigned ++openmailns 5766 tcp OpenMail NewMail Server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++openmailns 5766 udp OpenMail NewMail Server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++s-openmail 5767 tcp OpenMail Suer Agent Layer [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++ (Secure) ++s-openmail 5767 udp OpenMail Suer Agent Layer [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++ (Secure) ++openmailpxy 5768 tcp OpenMail CMTS Server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++openmailpxy 5768 udp OpenMail CMTS Server [OpenMail_Encyclopedi][Don_Loughry] [OpenMail_Encyclopedi][Don_Loughry] ++spramsca 5769 tcp x509solutions Internal CA [Brendan_Fay] [Brendan_Fay] 2006-02 ++spramsca 5769 udp x509solutions Internal CA [Brendan_Fay] [Brendan_Fay] 2006-02 ++spramsd 5770 tcp x509solutions Secure Data [Brendan_Fay] [Brendan_Fay] 2006-02 ++spramsd 5770 udp x509solutions Secure Data [Brendan_Fay] [Brendan_Fay] 2006-02 ++netagent 5771 tcp NetAgent [Bradley_Birnbaum] [Bradley_Birnbaum] ++netagent 5771 udp NetAgent [Bradley_Birnbaum] [Bradley_Birnbaum] ++ 5772-5776 Unassigned ++dali-port 5777 tcp DALI Port [Wayne_Morrow][Michael_Melio] [Wayne_Morrow][Michael_Melio] 2003-10 ++dali-port 5777 udp DALI Port [Wayne_Morrow][Michael_Melio] [Wayne_Morrow][Michael_Melio] 2003-10 ++ 5778-5779 Unassigned ++vts-rpc 5780 tcp Visual Tag System RPC [Graham_Bloice] [Graham_Bloice] 2009-09-17 ++ 5780 udp Reserved ++3par-evts 5781 tcp 3PAR Event Reporting Service [Sushil_Thomas] [Sushil_Thomas] 2008-03-10 ++3par-evts 5781 udp 3PAR Event Reporting Service [Sushil_Thomas] [Sushil_Thomas] 2008-03-10 ++3par-mgmt 5782 tcp 3PAR Management Service [Don_Marselle] [Don_Marselle] 2008-04-09 ++3par-mgmt 5782 udp 3PAR Management Service [Don_Marselle] [Don_Marselle] 2008-04-09 ++3par-mgmt-ssl 5783 tcp 3PAR Management Service with [Don_Marselle] [Don_Marselle] 2008-03-19 ++ SSL ++3par-mgmt-ssl 5783 udp 3PAR Management Service with [Don_Marselle] [Don_Marselle] 2008-03-19 ++ SSL ++ 5784 tcp Reserved ++ibar 5784 udp Cisco Interbox Application [Cullen_Jennings] [Cullen_Jennings] 2010-02-03 ++ Redundancy ++3par-rcopy 5785 tcp 3PAR Inform Remote Copy [Don_Marselle] [Don_Marselle] 2010-02-03 ++3par-rcopy 5785 udp 3PAR Inform Remote Copy [Don_Marselle] [Don_Marselle] 2008-04-09 ++ 5786 tcp Reserved ++cisco-redu 5786 udp redundancy notification [Ming_Zhang] [Ming_Zhang] 2010-02-04 ++ 5787 tcp Reserved ++waascluster 5787 udp Cisco WAAS Cluster Protocol [Winston_Chou] [Winston_Chou] 2011-02-08 ++ 5788-5792 Unassigned ++xtreamx 5793 tcp XtreamX Supervised Peer [Ahmad_Tajuddin_Samsu] [Ahmad_Tajuddin_Samsu] 2007-02 ++ message ++xtreamx 5793 udp XtreamX Supervised Peer [Ahmad_Tajuddin_Samsu] [Ahmad_Tajuddin_Samsu] 2007-02 ++ message ++ 5794 tcp Reserved ++spdp 5794 udp Simple Peered Discovery [Dave_Lindquist] [Dave_Lindquist] 2010-05-27 ++ Protocol ++ 5795-5812 Unassigned ++icmpd 5813 tcp ICMPD [Shane_O_Donnell] [Shane_O_Donnell] ++icmpd 5813 udp ICMPD [Shane_O_Donnell] [Shane_O_Donnell] ++spt-automation 5814 tcp Support Automation [Joshua_Hawkins] [Joshua_Hawkins] 2003-11 ++spt-automation 5814 udp Support Automation [Joshua_Hawkins] [Joshua_Hawkins] 2003-11 ++ 5815-5841 Unassigned ++reversion 5842 tcp Reversion Backup/Restore [Cameo_Systems_Inc] [Craig_Nelson] 2011-09-26 ++ 5842 udp Reserved ++ 5843-5858 Unassigned ++wherehoo 5859 tcp WHEREHOO [Jim_Youll] [Jim_Youll] ++wherehoo 5859 udp WHEREHOO [Jim_Youll] [Jim_Youll] ++ 5860-5862 Unassigned ++ppsuitemsg 5863 tcp PlanetPress Suite Messeng [Yannick_Fortin] [Yannick_Fortin] 2006-02 ++ppsuitemsg 5863 udp PlanetPress Suite Messeng [Yannick_Fortin] [Yannick_Fortin] 2006-02 ++ 5864-5882 Unassigned ++jute 5883 tcp Javascript Unit Test [Mark_Ethan_Trostler] [Mark_Ethan_Trostler] 2011-11-23 ++ Environment ++ 5884-5899 Unassigned ++rfb 5900 tcp Remote Framebuffer [Tristan_Richardson] [Tristan_Richardson] 2006-03 [RFC6143] ++rfb 5900 udp Remote Framebuffer [Tristan_Richardson] [Tristan_Richardson] 2006-03 [RFC6143] ++ 5901-5909 Unassigned ++cm 5910 tcp Context Management [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++cm 5910 udp Context Management [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++cm 5910 sctp Context Management [Justin_Yu] [Justin_Yu] 2011-05-19 ++cpdlc 5911 tcp Controller Pilot Data Link [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++ Communication ++cpdlc 5911 udp Controller Pilot Data Link [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++ Communication ++cpdlc 5911 sctp Controller Pilot Data Link [Justin_Yu] [Justin_Yu] 2011-05-18 ++ Communication ++fis 5912 tcp Flight Information Services [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++fis 5912 udp Flight Information Services [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++fis 5912 sctp Flight Information Services [Justin_Yu] [Justin_Yu] 2011-05-25 ++ads-c 5913 tcp Automatic Dependent [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++ Surveillance ++ads-c 5913 udp Automatic Dependent [Eivan_Cerasi] [Eivan_Cerasi] 2008-10-10 ++ Surveillance ++ads-c 5913 sctp Automatic Dependent [Justin_Yu] [Justin_Yu] 2011-05-25 ++ Surveillance ++ 5914-5962 Unassigned ++indy 5963 tcp Indy Application Server [Bjorn_Lantz] [Bjorn_Lantz] 2004-11 ++indy 5963 udp Indy Application Server [Bjorn_Lantz] [Bjorn_Lantz] 2004-11 ++ 5964-5967 Unassigned ++mppolicy-v5 5968 tcp mppolicy-v5 [Yutaka_Ono] [Yutaka_Ono] ++mppolicy-v5 5968 udp mppolicy-v5 [Yutaka_Ono] [Yutaka_Ono] ++mppolicy-mgr 5969 tcp mppolicy-mgr [Yutaka_Ono] [Yutaka_Ono] ++mppolicy-mgr 5969 udp mppolicy-mgr [Yutaka_Ono] [Yutaka_Ono] ++ 5970-5983 Unassigned ++couchdb 5984 tcp CouchDB [Noah_Slater] [Noah_Slater] 2007-11-27 ++couchdb 5984 udp CouchDB [Noah_Slater] [Noah_Slater] 2007-11-27 ++wsman 5985 tcp WBEM WS-Management HTTP [Jim_Davis] [Jim_Davis] 2006-11 ++wsman 5985 udp WBEM WS-Management HTTP [Jim_Davis] [Jim_Davis] 2006-11 ++wsmans 5986 tcp WBEM WS-Management HTTP over [Jim_Davis] [Jim_Davis] 2006-11 ++ TLS/SSL ++wsmans 5986 udp WBEM WS-Management HTTP over [Jim_Davis] [Jim_Davis] 2006-11 ++ TLS/SSL ++wbem-rmi 5987 tcp WBEM RMI [Jim_Davis] [Jim_Davis] ++wbem-rmi 5987 udp WBEM RMI [Jim_Davis] [Jim_Davis] ++wbem-http 5988 tcp WBEM CIM-XML (HTTP) [Jim_Davis] [Jim_Davis] ++wbem-http 5988 udp WBEM CIM-XML (HTTP) [Jim_Davis] [Jim_Davis] ++wbem-https 5989 tcp WBEM CIM-XML (HTTPS) [Jim_Davis] [Jim_Davis] ++wbem-https 5989 udp WBEM CIM-XML (HTTPS) [Jim_Davis] [Jim_Davis] ++wbem-exp-https 5990 tcp WBEM Export HTTPS [Denise_Eckstein] [Denise_Eckstein] 2004-11 ++wbem-exp-https 5990 udp WBEM Export HTTPS [Denise_Eckstein] [Denise_Eckstein] 2004-11 ++nuxsl 5991 tcp NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03 ++nuxsl 5991 udp NUXSL [Kai_Kretschmann] [Kai_Kretschmann] 2002-03 ++consul-insight 5992 tcp Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 ++consul-insight 5992 udp Consul InSight Security [Arthur_Hillenaar] [Arthur_Hillenaar] 2006-01 ++ 5993-5998 Unassigned ++cvsup 5999 tcp CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] ++cvsup 5999 udp CVSup [Randall_Atkinson_2] [Randall_Atkinson_2] ++x11 6000-6063 tcp X Window System [Stephen_Gildea] [Stephen_Gildea] ++x11 6000-6063 udp X Window System [Stephen_Gildea] [Stephen_Gildea] ++ndl-ahp-svc 6064 tcp NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] ++ndl-ahp-svc 6064 udp NDL-AHP-SVC [John_Richmond_2] [John_Richmond_2] ++winpharaoh 6065 tcp WinPharaoh [Basil_Lee] [Basil_Lee] ++winpharaoh 6065 udp WinPharaoh [Basil_Lee] [Basil_Lee] ++ewctsp 6066 tcp EWCTSP [Mark_Bailon] [Mark_Bailon] ++ewctsp 6066 udp EWCTSP [Mark_Bailon] [Mark_Bailon] ++ 6067 Unassigned 2007-07-17 ++gsmp-ancp 6068 tcp GSMP/ANCP [Avri_Doria] [Avri_Doria] [RFC6320] ++ 6068 udp Reserved ++trip 6069 tcp TRIP [Hussein_F_Salama] [Hussein_F_Salama] ++trip 6069 udp TRIP [Hussein_F_Salama] [Hussein_F_Salama] ++messageasap 6070 tcp Messageasap [Murray_Freeman] [Murray_Freeman] ++messageasap 6070 udp Messageasap [Murray_Freeman] [Murray_Freeman] ++ssdtp 6071 tcp SSDTP [Michael_Shearson_2] [Michael_Shearson_2] ++ssdtp 6071 udp SSDTP [Michael_Shearson_2] [Michael_Shearson_2] ++diagnose-proc 6072 tcp DIAGNOSE-PROC [Allan_Miller] [Allan_Miller] ++diagnose-proc 6072 udp DIAGNOSE-PROC [Allan_Miller] [Allan_Miller] ++directplay8 6073 tcp DirectPlay8 [John_Kane] [John_Kane] ++directplay8 6073 udp DirectPlay8 [John_Kane] [John_Kane] ++max 6074 tcp Microsoft Max [Jay_Beavers] [Jay_Beavers] 2006-02 ++max 6074 udp Microsoft Max [Jay_Beavers] [Jay_Beavers] 2006-02 ++dpm-acm 6075 tcp Microsoft DPM Access Control [Prabu_Ambravaneswara] [Prabu_Ambravaneswara] 2009-10-29 ++ Manager ++ 6075 udp Reserved ++msft-dpm-cert 6076 tcp Microsoft DPM WCF [Microsoft_Corporation] [Prateek_Sharma] 2011-08-04 ++ Certificates ++ 6076 udp Reserved ++ 6077-6081 Unassigned ++ 6082 tcp Reserved ++ APCO Project 25 Common Air ++p25cai 6082 udp Interface - UDP [APCO_Project] [APCO_Project] 2011-05-13 ++ encapsulation ++ 6083 tcp Reserved ++miami-bcast 6083 udp telecomsoftware miami [Peter_Steiner] [Peter_Steiner] 2011-02-22 ++ broadcast ++p2p-sip 6084 tcp Peer to Peer Infrastructure [Cullen_Jennings] [Cullen_Jennings] 2009-01-29 ++ Protocol ++ 6084 udp Reserved ++konspire2b 6085 tcp konspire2b p2p network [Jason_Rohrer] [Jason_Rohrer] 2002-10 ++konspire2b 6085 udp konspire2b p2p network [Jason_Rohrer] [Jason_Rohrer] 2002-10 ++pdtp 6086 tcp PDTP P2P [Tony_Arcieri] [Tony_Arcieri] 2006-03 ++pdtp 6086 udp PDTP P2P [Tony_Arcieri] [Tony_Arcieri] 2006-03 ++ldss 6087 tcp Local Download Sharing [Clifford_Heath] [Clifford_Heath] 2006-05 ++ Service ++ldss 6087 udp Local Download Sharing [Clifford_Heath] [Clifford_Heath] 2006-05 ++ Service ++ 6088-6098 Unassigned ++raxa-mgmt 6099 tcp RAXA Management [Sukanta_Ganguly] [Sukanta_Ganguly] ++ 6099 udp Reserved ++synchronet-db 6100 tcp SynchroNet-db [Arne_Haugland] [Arne_Haugland] ++synchronet-db 6100 udp SynchroNet-db [Arne_Haugland] [Arne_Haugland] ++synchronet-rtc 6101 tcp SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] ++synchronet-rtc 6101 udp SynchroNet-rtc [Arne_Haugland] [Arne_Haugland] ++synchronet-upd 6102 tcp SynchroNet-upd [Arne_Haugland] [Arne_Haugland] ++synchronet-upd 6102 udp SynchroNet-upd [Arne_Haugland] [Arne_Haugland] ++rets 6103 tcp RETS [Bruce_Toback] [Bruce_Toback] ++rets 6103 udp RETS [Bruce_Toback] [Bruce_Toback] ++dbdb 6104 tcp DBDB [Aaron_Brick] [Aaron_Brick] ++dbdb 6104 udp DBDB [Aaron_Brick] [Aaron_Brick] ++primaserver 6105 tcp Prima Server [Prima_Designs_System] [Prima_Designs_System] ++primaserver 6105 udp Prima Server [Prima_Designs_System] [Prima_Designs_System] ++mpsserver 6106 tcp MPS Server [Prima_Designs_System] [Prima_Designs_System] ++mpsserver 6106 udp MPS Server [Prima_Designs_System] [Prima_Designs_System] ++etc-control 6107 tcp ETC Control [Steve_Polishinski] [Steve_Polishinski] ++etc-control 6107 udp ETC Control [Steve_Polishinski] [Steve_Polishinski] ++sercomm-scadmin 6108 tcp Sercomm-SCAdmin [Melinda_Tsao_2] [Melinda_Tsao_2] ++sercomm-scadmin 6108 udp Sercomm-SCAdmin [Melinda_Tsao_2] [Melinda_Tsao_2] ++globecast-id 6109 tcp GLOBECAST-ID [Piers_Scannell_2] [Piers_Scannell_2] ++globecast-id 6109 udp GLOBECAST-ID [Piers_Scannell_2] [Piers_Scannell_2] ++softcm 6110 tcp HP SoftBench CM [Scott_A_Kramer] [Scott_A_Kramer] ++softcm 6110 udp HP SoftBench CM [Scott_A_Kramer] [Scott_A_Kramer] ++spc 6111 tcp HP SoftBench Sub-Process [Scott_A_Kramer] [Scott_A_Kramer] ++ Control ++spc 6111 udp HP SoftBench Sub-Process [Scott_A_Kramer] [Scott_A_Kramer] ++ Control ++dtspcd 6112 tcp Desk-Top Sub-Process Control [Doug_Royer] [Doug_Royer] 2010-12-08 ++ Daemon ++dtspcd 6112 udp Desk-Top Sub-Process Control [Doug_Royer] [Doug_Royer] 2010-12-08 ++ Daemon ++dayliteserver 6113 tcp Daylite Server [Brent_Gulanowski] [Brent_Gulanowski] 2009-08-26 ++ 6113 udp Reserved ++wrspice 6114 tcp WRspice IPC Service [Stephen_R_Whiteley] [Stephen_R_Whiteley] 2010-10-07 ++ 6114 udp Reserved ++xic 6115 tcp Xic IPC Service [Stephen_R_Whiteley] [Stephen_R_Whiteley] 2010-10-07 ++ 6115 udp Reserved ++xtlserv 6116 tcp XicTools License Manager [Stephen_R_Whiteley] [Stephen_R_Whiteley] 2010-10-07 ++ Service ++ 6116 udp Reserved ++daylitetouch 6117 tcp Daylite Touch Sync [Brent_Gulanowski] [Brent_Gulanowski] 2009-08-26 ++ 6117 udp Reserved ++ 6118-6120 Unassigned ++spdy 6121 tcp SPDY for a faster web [Matthew_Lloyd] [Matthew_Lloyd] 2010-04-26 ++ 6121 udp Reserved ++bex-webadmin 6122 tcp Backup Express Web Server [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++bex-webadmin 6122 udp Backup Express Web Server [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++backup-express 6123 tcp Backup Express [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++backup-express 6123 udp Backup Express [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++pnbs 6124 tcp Phlexible Network Backup [William_R_Lear_2] [William_R_Lear_2] 2008-10-23 ++ Service ++pnbs 6124 udp Phlexible Network Backup [William_R_Lear_2] [William_R_Lear_2] 2008-10-23 ++ Service ++ 6125-6132 Unassigned ++nbt-wol 6133 tcp New Boundary Tech WOL [Elizabeth_Zilen] [Elizabeth_Zilen] 2004-11 ++nbt-wol 6133 udp New Boundary Tech WOL [Elizabeth_Zilen] [Elizabeth_Zilen] 2004-11 ++ 6134-6139 Unassigned ++pulsonixnls 6140 tcp Pulsonix Network License [David_Manns] [David_Manns] 2008-02-28 ++ Service ++pulsonixnls 6140 udp Pulsonix Network License [David_Manns] [David_Manns] 2008-02-28 ++ Service ++meta-corp 6141 tcp Meta Corporation License [Osamu_Masuda] [Osamu_Masuda] ++ Manager ++meta-corp 6141 udp Meta Corporation License [Osamu_Masuda] [Osamu_Masuda] ++ Manager ++aspentec-lm 6142 tcp Aspen Technology License [Kevin_Massey] [Kevin_Massey] ++ Manager ++aspentec-lm 6142 udp Aspen Technology License [Kevin_Massey] [Kevin_Massey] ++ Manager ++watershed-lm 6143 tcp Watershed License Manager [David_Ferrero] [David_Ferrero] ++watershed-lm 6143 udp Watershed License Manager [David_Ferrero] [David_Ferrero] ++statsci1-lm 6144 tcp StatSci License Manager - 1 [Scott_Blachowicz] [Scott_Blachowicz] ++statsci1-lm 6144 udp StatSci License Manager - 1 [Scott_Blachowicz] [Scott_Blachowicz] ++statsci2-lm 6145 tcp StatSci License Manager - 2 [Scott_Blachowicz] [Scott_Blachowicz] ++statsci2-lm 6145 udp StatSci License Manager - 2 [Scott_Blachowicz] [Scott_Blachowicz] ++lonewolf-lm 6146 tcp Lone Wolf Systems License [Dan_Klein] [Dan_Klein] ++ Manager ++lonewolf-lm 6146 udp Lone Wolf Systems License [Dan_Klein] [Dan_Klein] ++ Manager ++montage-lm 6147 tcp Montage License Manager [Michael_Ubell] [Michael_Ubell] ++montage-lm 6147 udp Montage License Manager [Michael_Ubell] [Michael_Ubell] ++ricardo-lm 6148 tcp Ricardo North America [M_Flemming] [M_Flemming] ++ License Manager ++ricardo-lm 6148 udp Ricardo North America [M_Flemming] [M_Flemming] ++ License Manager ++tal-pod 6149 tcp tal-pod [Steven_Loomis] [Steven_Loomis] ++tal-pod 6149 udp tal-pod [Steven_Loomis] [Steven_Loomis] ++ 6150-6158 Unassigned ++efb-aci 6159 tcp EFB Application Control [Jonathan_Schaaf] [Jonathan_Schaaf] 2010-02-10 ++ Interface ++ 6159 udp Reserved ++ecmp 6160 tcp Emerson Extensible Control [Bryce_Beeston] [Bryce_Beeston] 2011-06-23 ++ and Management Protocol ++ecmp-data 6160 udp Emerson Extensible Control [Bryce_Beeston] [Bryce_Beeston] 2011-06-23 ++ and Management Protocol Data ++patrol-ism 6161 tcp PATROL Internet Srv Mgr [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 ++patrol-ism 6161 udp PATROL Internet Srv Mgr [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 ++patrol-coll 6162 tcp PATROL Collector [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 ++patrol-coll 6162 udp PATROL Collector [Portnoy_Boxman] [Portnoy_Boxman] 2005-01 ++pscribe 6163 tcp Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 ++pscribe 6163 udp Precision Scribe Cnx Port [Robert_W_Hodges] [Robert_W_Hodges] 2005-01 ++ 6164-6199 Unassigned ++lm-x 6200 tcp LM-X License Manager by [Henrik_Goldman] [Henrik_Goldman] 2006-10 ++ X-Formation ++lm-x 6200 udp LM-X License Manager by [Henrik_Goldman] [Henrik_Goldman] 2006-10 ++ X-Formation ++ 6201-6221 Unassigned ++radmind 6222 tcp Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 ++radmind 6222 udp Radmind Access Protocol [Patrick_M_McNeal] [Patrick_M_McNeal] 2006-03 ++ 6223-6240 Unassigned ++jeol-nsdtp-1 6241 tcp JEOL Network Services Data [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Transport Protocol 1 ++jeol-nsddp-1 6241 udp JEOL Network Services [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Dynamic Discovery Protocol 1 ++jeol-nsdtp-2 6242 tcp JEOL Network Services Data [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Transport Protocol 2 ++jeol-nsddp-2 6242 udp JEOL Network Services [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Dynamic Discovery Protocol 2 ++jeol-nsdtp-3 6243 tcp JEOL Network Services Data [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Transport Protocol 3 ++jeol-nsddp-3 6243 udp JEOL Network Services [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Dynamic Discovery Protocol 3 ++jeol-nsdtp-4 6244 tcp JEOL Network Services Data [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Transport Protocol 4 ++jeol-nsddp-4 6244 udp JEOL Network Services [Kevin_Wellwood] [Kevin_Wellwood] 2008-04-17 ++ Dynamic Discovery Protocol 4 ++ 6245-6250 Unassigned ++tl1-raw-ssl 6251 tcp TL1 Raw Over SSL/TLS [Jim_Humphreys] [Jim_Humphreys] 2008-01-29 ++tl1-raw-ssl 6251 udp TL1 Raw Over SSL/TLS [Jim_Humphreys] [Jim_Humphreys] 2008-01-29 ++tl1-ssh 6252 tcp TL1 over SSH [Jim_Humphreys] [Jim_Humphreys] 2008-01-25 ++tl1-ssh 6252 udp TL1 over SSH [Jim_Humphreys] [Jim_Humphreys] 2008-01-25 ++crip 6253 tcp CRIP [Mike_Rodbell] [Mike_Rodbell] ++crip 6253 udp CRIP [Mike_Rodbell] [Mike_Rodbell] ++ 6254-6266 Unassigned ++gld 6267 tcp GridLAB-D User Interface [David_Chassin] [David_Chassin] 2010-12-10 ++ 6267 udp Reserved ++grid 6268 tcp Grid Authentication [Jason_Hamilton] [Jason_Hamilton] 2006-06 ++grid 6268 udp Grid Authentication [Jason_Hamilton] [Jason_Hamilton] 2006-06 ++grid-alt 6269 tcp Grid Authentication Alt [Jason_Hamilton] [Jason_Hamilton] 2006-06 ++grid-alt 6269 udp Grid Authentication Alt [Jason_Hamilton] [Jason_Hamilton] 2006-06 ++ 6270-6299 Unassigned ++bmc-grx 6300 tcp BMC GRX [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-grx 6300 udp BMC GRX [Portnoy_Boxman] [Portnoy_Boxman] ++ BMC CONTROL-D LDAP SERVER ++ ++bmc-ctd-ldap 6301 tcp IANA assigned this [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 ++ well-formed service name as ++ a replacement for ++ "bmc_ctd_ldap". ++ This entry is an alias to "bmc-ctd-ldap". This entry is now ++bmc_ctd_ldap 6301 tcp BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service ++ discovery mechanisms. ++ BMC CONTROL-D LDAP SERVER ++ ++bmc-ctd-ldap 6301 udp IANA assigned this [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 ++ well-formed service name as ++ a replacement for ++ "bmc_ctd_ldap". ++ This entry is an alias to "bmc-ctd-ldap". This entry is now ++bmc_ctd_ldap 6301 udp BMC CONTROL-D LDAP SERVER [Portnoy_Boxman_2] [Portnoy_Boxman_2] 2006-09 historic, not usable for use with many common service ++ discovery mechanisms. ++ 6302-6305 Unassigned ++ufmp 6306 tcp Unified Fabric Management [Albert_Berlovitch] [Albert_Berlovitch] 2009-12-17 ++ Protocol ++ufmp 6306 udp Unified Fabric Management [Albert_Berlovitch] [Albert_Berlovitch] 2009-12-17 ++ Protocol ++ 6307-6314 Unassigned ++scup 6315 tcp Sensor Control Unit Protocol [Sven_Kopacz] [Sven_Kopacz] 2010-09-01 ++scup-disc 6315 udp Sensor Control Unit Protocol [Sven_Kopacz] [Sven_Kopacz] 2010-09-01 ++ Discovery Protocol ++abb-escp 6316 tcp Ethernet Sensor [Jaime_Antolin] [Jaime_Antolin] 2008-09-25 ++ Communications Protocol ++abb-escp 6316 udp Ethernet Sensor [Jaime_Antolin] [Jaime_Antolin] 2008-09-25 ++ Communications Protocol ++ 6317-6319 Unassigned ++repsvc 6320 tcp Double-Take Replication [James_Wilkinson] [James_Wilkinson] 2006-04 ++ Service ++repsvc 6320 udp Double-Take Replication [James_Wilkinson] [James_Wilkinson] 2006-04 ++ Service ++emp-server1 6321 tcp Empress Software [Srdjan_Holovac] [Srdjan_Holovac] ++ Connectivity Server 1 ++emp-server1 6321 udp Empress Software [Srdjan_Holovac] [Srdjan_Holovac] ++ Connectivity Server 1 ++emp-server2 6322 tcp Empress Software [Srdjan_Holovac] [Srdjan_Holovac] ++ Connectivity Server 2 ++emp-server2 6322 udp Empress Software [Srdjan_Holovac] [Srdjan_Holovac] ++ Connectivity Server 2 ++ 6323 Unassigned ++hrd-ncs 6324 tcp HR Device Network [Hall_Research] [Vishal_Dharmadhikari] 2011-11-29 ++ Configuration Service ++hrd-ns-disc 6324 udp HR Device Network service [Hall_Research] [Vishal_Dharmadhikari] 2011-11-29 ++dt-mgmtsvc 6325 tcp Double-Take Management [Vision_Solutions] [James_Wilkinson2] 2012-06-06 ++ Service ++ 6325 udp Reserved ++ 6326-6342 Unassigned ++sflow 6343 tcp sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06 ++sflow 6343 udp sFlow traffic monitoring [Peter_Phaal] [Peter_Phaal] 2003-06 ++ 6344-6345 Unassigned ++gnutella-svc 6346 tcp gnutella-svc [Serguei_Osokine] [Serguei_Osokine] ++gnutella-svc 6346 udp gnutella-svc [Serguei_Osokine] [Serguei_Osokine] ++gnutella-rtr 6347 tcp gnutella-rtr [Serguei_Osokine] [Serguei_Osokine] ++gnutella-rtr 6347 udp gnutella-rtr [Serguei_Osokine] [Serguei_Osokine] ++ 6348-6349 Unassigned ++adap 6350 tcp App Discovery and Access [Thomas_Kjoernes] [Thomas_Kjoernes] 2010-06-22 ++ Protocol ++adap 6350 udp App Discovery and Access [Thomas_Kjoernes] [Thomas_Kjoernes] 2010-06-22 ++ Protocol ++ 6351-6354 Unassigned ++pmcs 6355 tcp PMCS applications [Pavel_Mendl] [Pavel_Mendl] 2007-03 ++pmcs 6355 udp PMCS applications [Pavel_Mendl] [Pavel_Mendl] 2007-03 ++ 6356-6359 Unassigned ++metaedit-mu 6360 tcp MetaEdit+ Multi-User [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++metaedit-mu 6360 udp MetaEdit+ Multi-User [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++ 6361-6369 Unassigned ++metaedit-se 6370 tcp MetaEdit+ Server [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++ Administration ++metaedit-se 6370 udp MetaEdit+ Server [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++ Administration ++ 6371-6381 Unassigned ++metatude-mds 6382 tcp Metatude Dialogue Server [Menno_Zweistra] [Menno_Zweistra] ++metatude-mds 6382 udp Metatude Dialogue Server [Menno_Zweistra] [Menno_Zweistra] ++ 6383-6388 Unassigned ++clariion-evr01 6389 tcp clariion-evr01 [Dave_DesRoches] [Dave_DesRoches] ++clariion-evr01 6389 udp clariion-evr01 [Dave_DesRoches] [Dave_DesRoches] ++metaedit-ws 6390 tcp MetaEdit+ WebService API [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++metaedit-ws 6390 udp MetaEdit+ WebService API [Steven_Kelly] [Steven_Kelly] 2007-11-12 ++ 6391-6399 Unassigned ++boe-cms 6400 Business Objects CMS contact [Wade_Richards] [Wade_Richards] 2008-05-05 ++ port ++boe-was 6401 boe-was [Wade_Richards] [Wade_Richards] 2008-05-05 ++boe-eventsrv 6402 boe-eventsrv [Wade_Richards] [Wade_Richards] 2008-05-05 ++boe-cachesvr 6403 boe-cachesvr [Wade_Richards] [Wade_Richards] 2008-05-05 ++boe-filesvr 6404 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-pagesvr 6405 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-processsvr 6406 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-resssvr1 6407 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-resssvr2 6408 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-resssvr3 6409 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++boe-resssvr4 6410 Business Objects Enterprise [Wade_Richards] [Wade_Richards] 2008-05-05 ++ internal server ++ 6411-6416 Unassigned ++faxcomservice 6417 tcp Faxcom Message Service [Albert_Leung] [Albert_Leung] 2006-04 ++faxcomservice 6417 udp Faxcom Message Service [Albert_Leung] [Albert_Leung] 2006-04 ++syserverremote 6418 tcp SYserver remote commands [David_Ashkenazi] [David_Ashkenazi] 2010-03-23 ++ 6418 udp Reserved ++svdrp 6419 tcp Simple VDR Protocol [Klaus_Schmidinger] [Klaus_Schmidinger] 2010-03-31 ++ 6419 udp Reserved ++nim-vdrshell 6420 tcp NIM_VDRShell [Rik_Ditter] [Rik_Ditter] 2006-02 ++nim-vdrshell 6420 udp NIM_VDRShell [Rik_Ditter] [Rik_Ditter] 2006-02 ++nim-wan 6421 tcp NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 ++nim-wan 6421 udp NIM_WAN [Rik_Ditter] [Rik_Ditter] 2006-02 ++ 6422-6431 Unassigned ++pgbouncer 6432 tcp PgBouncer [Marko_Kreen] [Marko_Kreen] 2009-02-13 ++ 6432 udp Reserved ++ 6433-6442 Unassigned ++sun-sr-https 6443 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ HTTPS Domain ++sun-sr-https 6443 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ HTTPS Domain ++ Grid Engine Qmaster Service ++ ++sge-qmaster 6444 tcp IANA assigned this [Andreas_Haas] [Andreas_Haas] 2006-08 ++ well-formed service name as ++ a replacement for ++ "sge_qmaster". ++ This entry is an alias to "sge-qmaster". This entry is now ++sge_qmaster 6444 tcp Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Grid Engine Qmaster Service ++ ++sge-qmaster 6444 udp IANA assigned this [Andreas_Haas] [Andreas_Haas] 2006-08 ++ well-formed service name as ++ a replacement for ++ "sge_qmaster". ++ This entry is an alias to "sge-qmaster". This entry is now ++sge_qmaster 6444 udp Grid Engine Qmaster Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Grid Engine Execution ++ Service ++ ++sge-execd 6445 tcp IANA assigned this [Andreas_Haas] [Andreas_Haas] 2006-08 ++ well-formed service name as ++ a replacement for ++ "sge_execd". ++ Grid Engine Execution This entry is an alias to "sge-execd". This entry is now ++sge_execd 6445 tcp Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Grid Engine Execution ++ Service ++ ++sge-execd 6445 udp IANA assigned this [Andreas_Haas] [Andreas_Haas] 2006-08 ++ well-formed service name as ++ a replacement for ++ "sge_execd". ++ Grid Engine Execution This entry is an alias to "sge-execd". This entry is now ++sge_execd 6445 udp Service [Andreas_Haas] [Andreas_Haas] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++mysql-proxy 6446 tcp MySQL Proxy [Kay_Roepke] [Kay_Roepke] 2009-04-22 ++mysql-proxy 6446 udp MySQL Proxy [Kay_Roepke] [Kay_Roepke] 2009-04-22 ++ 6447-6454 Unassigned ++skip-cert-recv 6455 tcp SKIP Certificate Receive [Tom_Markson] [Tom_Markson] ++skip-cert-recv 6455 udp SKIP Certificate Receive [Tom_Markson] [Tom_Markson] ++skip-cert-send 6456 tcp SKIP Certificate Send [Tom_Markson] [Tom_Markson] ++skip-cert-send 6456 udp SKIP Certificate Send [Tom_Markson] [Tom_Markson] ++ 6457-6470 Unassigned ++lvision-lm 6471 tcp LVision License Manager [Brian_McKinnon] [Brian_McKinnon] ++lvision-lm 6471 udp LVision License Manager [Brian_McKinnon] [Brian_McKinnon] ++ 6472-6479 Unassigned ++sun-sr-http 6480 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ HTTP Domain ++sun-sr-http 6480 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ HTTP Domain ++servicetags 6481 tcp Service Tags [Peter_Schow] [Peter_Schow] 2007-01 ++servicetags 6481 udp Service Tags [Peter_Schow] [Peter_Schow] 2007-01 ++ldoms-mgmt 6482 tcp Logical Domains Management [Eric_Sharakan] [Eric_Sharakan] 2008-02-14 ++ Interface ++ldoms-mgmt 6482 udp Logical Domains Management [Eric_Sharakan] [Eric_Sharakan] 2008-02-14 ++ Interface ++SunVTS-RMI 6483 tcp SunVTS RMI [Sumit_Arora] [Sumit_Arora] 2007-06 ++SunVTS-RMI 6483 udp SunVTS RMI [Sumit_Arora] [Sumit_Arora] 2007-06 ++sun-sr-jms 6484 tcp Service Registry Default JMS [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Domain ++sun-sr-jms 6484 udp Service Registry Default JMS [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Domain ++sun-sr-iiop 6485 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOP Domain ++sun-sr-iiop 6485 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOP Domain ++sun-sr-iiops 6486 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOPS Domain ++sun-sr-iiops 6486 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOPS Domain ++sun-sr-iiop-aut 6487 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOPAuth Domain ++sun-sr-iiop-aut 6487 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ IIOPAuth Domain ++sun-sr-jmx 6488 tcp Service Registry Default JMX [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Domain ++sun-sr-jmx 6488 udp Service Registry Default JMX [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Domain ++sun-sr-admin 6489 tcp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Admin Domain ++sun-sr-admin 6489 udp Service Registry Default [Paul_Sterk] [Paul_Sterk] 2006-03 ++ Admin Domain ++ 6490-6499 Unassigned ++boks 6500 tcp BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] ++boks 6500 udp BoKS Master [Magnus_Nystrom] [Magnus_Nystrom] ++ BoKS Servc ++ ++boks-servc 6501 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_servc". ++ This entry is an alias to "boks-servc". This entry is now ++boks_servc 6501 tcp BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Servc ++ ++boks-servc 6501 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_servc". ++ This entry is an alias to "boks-servc". This entry is now ++boks_servc 6501 udp BoKS Servc [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Servm ++ ++boks-servm 6502 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_servm". ++ This entry is an alias to "boks-servm". This entry is now ++boks_servm 6502 tcp BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Servm ++ ++boks-servm 6502 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_servm". ++ This entry is an alias to "boks-servm". This entry is now ++boks_servm 6502 udp BoKS Servm [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Clntd ++ ++boks-clntd 6503 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_clntd". ++ This entry is an alias to "boks-clntd". This entry is now ++boks_clntd 6503 tcp BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Clntd ++ ++boks-clntd 6503 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "boks_clntd". ++ This entry is an alias to "boks-clntd". This entry is now ++boks_clntd 6503 udp BoKS Clntd [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ 6504 Unassigned ++ BoKS Admin Private Port ++ ++badm-priv 6505 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "badm_priv". ++ This entry is an alias to "badm-priv". This entry is now ++badm_priv 6505 tcp BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Admin Private Port ++ ++badm-priv 6505 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "badm_priv". ++ This entry is an alias to "badm-priv". This entry is now ++badm_priv 6505 udp BoKS Admin Private Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Admin Public Port ++ ++badm-pub 6506 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "badm_pub". ++ This entry is an alias to "badm-pub". This entry is now ++badm_pub 6506 tcp BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Admin Public Port ++ ++badm-pub 6506 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "badm_pub". ++ This entry is an alias to "badm-pub". This entry is now ++badm_pub 6506 udp BoKS Admin Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Dir Server, Private ++ Port ++ ++bdir-priv 6507 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "bdir_priv". ++ BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now ++bdir_priv 6507 tcp Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Dir Server, Private ++ Port ++ ++bdir-priv 6507 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "bdir_priv". ++ BoKS Dir Server, Private This entry is an alias to "bdir-priv". This entry is now ++bdir_priv 6507 udp Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Dir Server, Public Port ++ ++bdir-pub 6508 tcp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "bdir_pub". ++ This entry is an alias to "bdir-pub". This entry is now ++bdir_pub 6508 tcp BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++ BoKS Dir Server, Public Port ++ ++bdir-pub 6508 udp IANA assigned this [Magnus_Nystrom] [Magnus_Nystrom] ++ well-formed service name as ++ a replacement for ++ "bdir_pub". ++ This entry is an alias to "bdir-pub". This entry is now ++bdir_pub 6508 udp BoKS Dir Server, Public Port [Magnus_Nystrom] [Magnus_Nystrom] historic, not usable for use with many common service ++ discovery mechanisms. ++mgcs-mfp-port 6509 tcp MGCS-MFP Port [Minoru_Ozaki] [Minoru_Ozaki] ++mgcs-mfp-port 6509 udp MGCS-MFP Port [Minoru_Ozaki] [Minoru_Ozaki] ++mcer-port 6510 tcp MCER Port [Portnoy_Boxman] [Portnoy_Boxman] ++mcer-port 6510 udp MCER Port [Portnoy_Boxman] [Portnoy_Boxman] ++ 6511-6512 Unassigned ++netconf-tls 6513 tcp NETCONF over TLS [RFC5539] ++ 6513 udp Reserved ++syslog-tls 6514 tcp Syslog over TLS [RFC5425] ++syslog-tls 6514 udp syslog over DTLS [RFC6012] ++syslog-tls 6514 dccp syslog over DTLS [RFC6012] ++elipse-rec 6515 tcp Elipse RPC Protocol [F_Englert] [F_Englert] 2007-09-17 ++elipse-rec 6515 udp Elipse RPC Protocol [F_Englert] [F_Englert] 2007-09-17 ++ 6516-6542 Unassigned ++lds-distrib 6543 tcp lds_distrib [Jack_Baker] [Jack_Baker] 2003-06 ++lds-distrib 6543 udp lds_distrib [Jack_Baker] [Jack_Baker] 2003-06 ++lds-dump 6544 tcp LDS Dump Service [Jack_Baker] [Jack_Baker] 2006-02 ++lds-dump 6544 udp LDS Dump Service [Jack_Baker] [Jack_Baker] 2006-02 ++ 6545-6546 Unassigned ++apc-6547 6547 tcp APC 6547 [American_Power_Conve] [American_Power_Conve] ++apc-6547 6547 udp APC 6547 [American_Power_Conve] [American_Power_Conve] ++apc-6548 6548 tcp APC 6548 [American_Power_Conve] [American_Power_Conve] ++apc-6548 6548 udp APC 6548 [American_Power_Conve] [American_Power_Conve] ++apc-6549 6549 tcp APC 6549 [American_Power_Conve] [American_Power_Conve] ++apc-6549 6549 udp APC 6549 [American_Power_Conve] [American_Power_Conve] ++fg-sysupdate 6550 tcp fg-sysupdate [Mark_Beyer] [Mark_Beyer] ++fg-sysupdate 6550 udp fg-sysupdate [Mark_Beyer] [Mark_Beyer] ++sum 6551 tcp Software Update Manager [Jan_Dirven] [Jan_Dirven] 2007-12-13 ++sum 6551 udp Software Update Manager [Jan_Dirven] [Jan_Dirven] 2007-12-13 ++ 6552-6557 Unassigned ++xdsxdm 6558 tcp [Brian_Tackett] [Brian_Tackett] possible contact ++xdsxdm 6558 udp [Brian_Tackett] [Brian_Tackett] possible contact ++ 6559-6565 Unassigned ++sane-port 6566 tcp SANE Control Port [Henning_Meier_Geinit] [Henning_Meier_Geinit] 2002-10 ++sane-port 6566 udp SANE Control Port [Henning_Meier_Geinit] [Henning_Meier_Geinit] 2002-10 ++ 6567 Reserved 2007-01 2011-08-26 This entry has been removed on 2011-08-26. ++ CanIt Storage Manager ++ ++canit-store 6568 tcp IANA assigned this [David_F_Skoll] [David_F_Skoll] 2009-04-22 ++ well-formed service name as ++ a replacement for ++ "canit_store". ++ This entry is an alias to "canit-store". This entry is now ++canit_store 6568 tcp CanIt Storage Manager [David_F_Skoll] [David_F_Skoll] 2009-04-22 historic, not usable for use with many common service ++ discovery mechanisms. ++rp-reputation 6568 udp Roaring Penguin IP Address [David_F_Skoll] [David_F_Skoll] 2010-02-05 ++ Reputation Collection ++ 6569-6578 Unassigned ++affiliate 6579 tcp Affiliate [David_Catmull] [David_Catmull] 2006-01 ++affiliate 6579 udp Affiliate [David_Catmull] [David_Catmull] 2006-01 ++parsec-master 6580 tcp Parsec Masterserver [Andreas_Varga] [Andreas_Varga] ++parsec-master 6580 udp Parsec Masterserver [Andreas_Varga] [Andreas_Varga] ++parsec-peer 6581 tcp Parsec Peer-to-Peer [Andreas_Varga] [Andreas_Varga] ++parsec-peer 6581 udp Parsec Peer-to-Peer [Andreas_Varga] [Andreas_Varga] ++parsec-game 6582 tcp Parsec Gameserver [Andreas_Varga] [Andreas_Varga] ++parsec-game 6582 udp Parsec Gameserver [Andreas_Varga] [Andreas_Varga] ++joaJewelSuite 6583 tcp JOA Jewel Suite [Bob_Rundle] [Bob_Rundle] 2005-11 ++joaJewelSuite 6583 udp JOA Jewel Suite [Bob_Rundle] [Bob_Rundle] 2005-11 ++ 6584-6587 Unassigned ++ Unofficial ++ use of port ++ 6588 Unassigned 6588 by ++ AnalogX and ++ Microsoft ++ 6589-6599 Unassigned ++mshvlm 6600 tcp Microsoft Hyper-V Live [Rajesh_D] [Rajesh_D] 2009-02-03 ++ Migration ++ 6600 udp Reserved ++mstmg-sstp 6601 tcp Microsoft Threat Management [Ori_Yosefi] [Ori_Yosefi] 2009-05-04 ++ Gateway SSTP ++ 6601 udp Reserved ++wsscomfrmwk 6602 tcp Windows WSS Communication [Rong_Yu] [Rong_Yu] 2010-08-10 ++ Framework ++ 6602 udp Reserved ++ 6603-6618 Unassigned ++odette-ftps 6619 tcp ODETTE-FTP over TLS/SSL [Ieuan_Friend] [Ieuan_Friend] 2006-03 [RFC5024] ++odette-ftps 6619 udp ODETTE-FTP over TLS/SSL [Ieuan_Friend] [Ieuan_Friend] 2006-03 [RFC5024] ++kftp-data 6620 tcp Kerberos V5 FTP Data [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++kftp-data 6620 udp Kerberos V5 FTP Data [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++kftp 6621 tcp Kerberos V5 FTP Control [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++kftp 6621 udp Kerberos V5 FTP Control [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++mcftp 6622 tcp Multicast FTP [Bruce_Lueckenhoff_2] [Bruce_Lueckenhoff_2] 2006-02 ++mcftp 6622 udp Multicast FTP [Bruce_Lueckenhoff_2] [Bruce_Lueckenhoff_2] 2006-02 ++ktelnet 6623 tcp Kerberos V5 Telnet [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++ktelnet 6623 udp Kerberos V5 Telnet [Robert_J_Scott] [Robert_J_Scott] 2005-08 ++datascaler-db 6624 tcp DataScaler database [Vasu_Murthy] [Vasu_Murthy] 2010-02-08 ++ 6624 udp Reserved ++datascaler-ctl 6625 tcp DataScaler control [Vasu_Murthy] [Vasu_Murthy] 2010-02-08 ++ 6625 udp Reserved ++wago-service 6626 tcp WAGO Service and Update [Wolfgang_Adler] [Wolfgang_Adler] 2006-04 ++wago-service 6626 udp WAGO Service and Update [Wolfgang_Adler] [Wolfgang_Adler] 2006-04 ++nexgen 6627 tcp Allied Electronics NeXGen [Lou_Seitchik] [Lou_Seitchik] 2005-08 ++nexgen 6627 udp Allied Electronics NeXGen [Lou_Seitchik] [Lou_Seitchik] 2005-08 ++afesc-mc 6628 tcp AFE Stock Channel M/C [K_K_Ho] [K_K_Ho] 2004-04 ++afesc-mc 6628 udp AFE Stock Channel M/C [K_K_Ho] [K_K_Ho] 2004-04 ++ 6629-6630 Unassigned ++ 6631 Unassigned 2004-05-28 ++mxodbc-connect 6632 tcp eGenix mxODBC Connect [Marc_Andre_Lemburg] [Marc_Andre_Lemburg] 2009-11-13 ++ 6632 udp Reserved ++ 6633-6654 Unassigned ++pcs-sf-ui-man 6655 tcp PC SOFT - Software factory [Jerome_AERTS] [Jerome_AERTS] 2010-11-30 ++ UI/manager ++ 6655 udp Reserved ++emgmsg 6656 tcp Emergency Message Control [Gerry_Gorman] [Gerry_Gorman] 2010-12-06 ++ Service ++ 6656 udp Reserved ++ 6657 tcp Reserved ++palcom-disc 6657 udp PalCom Discovery [Boris_Magnusson] [Boris_Magnusson] 2010-12-06 ++ 6658-6664 Unassigned ++ircu 6665-6669 tcp IRCU [Brian_Tackett] [Brian_Tackett] ++ 6665-6669 udp Reserved ++vocaltec-gold 6670 tcp Vocaltec Global Online [Scott_Petrack] [Scott_Petrack] ++ Directory ++vocaltec-gold 6670 udp Vocaltec Global Online [Scott_Petrack] [Scott_Petrack] ++ Directory ++p4p-portal 6671 tcp P4P Portal Service [Chris_Griffiths] [Chris_Griffiths] 2008-07-28 ++p4p-portal 6671 udp P4P Portal Service [Chris_Griffiths] [Chris_Griffiths] 2008-07-28 ++ vision_server ++ ++vision-server 6672 tcp IANA assigned this [Chris_Kramer] [Chris_Kramer] ++ well-formed service name as ++ a replacement for ++ "vision_server". ++ This entry is an alias to "vision-server". This entry is now ++vision_server 6672 tcp vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service ++ discovery mechanisms. ++ vision_server ++ ++vision-server 6672 udp IANA assigned this [Chris_Kramer] [Chris_Kramer] ++ well-formed service name as ++ a replacement for ++ "vision_server". ++ This entry is an alias to "vision-server". This entry is now ++vision_server 6672 udp vision_server [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service ++ discovery mechanisms. ++ vision_elmd ++ ++vision-elmd 6673 tcp IANA assigned this [Chris_Kramer] [Chris_Kramer] ++ well-formed service name as ++ a replacement for ++ "vision_elmd". ++ This entry is an alias to "vision-elmd". This entry is now ++vision_elmd 6673 tcp vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service ++ discovery mechanisms. ++ vision_elmd ++ ++vision-elmd 6673 udp IANA assigned this [Chris_Kramer] [Chris_Kramer] ++ well-formed service name as ++ a replacement for ++ "vision_elmd". ++ This entry is an alias to "vision-elmd". This entry is now ++vision_elmd 6673 udp vision_elmd [Chris_Kramer] [Chris_Kramer] historic, not usable for use with many common service ++ discovery mechanisms. ++ 6674-6677 Unassigned ++vfbp 6678 tcp Viscount Freedom Bridge [Chris_MacDonald] [Chris_MacDonald] 2011-03-16 ++ Protocol ++vfbp-disc 6678 udp Viscount Freedom Bridge [Chris_MacDonald] [Chris_MacDonald] 2011-03-16 ++ Discovery ++osaut 6679 tcp Osorno Automation [Peter_Hombach] [Peter_Hombach] 2011-03-16 ++osaut 6679 udp Osorno Automation [Peter_Hombach] [Peter_Hombach] 2011-03-16 ++ 6680-6686 Unassigned ++clever-ctrace 6687 tcp CleverView for cTrace [David_Cheng] [David_Cheng] 2010-02-01 ++ Message Service ++ 6687 udp Reserved ++clever-tcpip 6688 tcp CleverView for TCP/IP [David_Cheng] [David_Cheng] 2009-10-13 ++ Message Service ++ 6688 udp Reserved ++tsa 6689 tcp Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 ++tsa 6689 udp Tofino Security Appliance [Scott_Howard] [Scott_Howard] 2009-10-13 ++ 6690-6695 Unassigned ++ 6696 tcp Reserved ++babel 6696 udp Babel Routing Protocol 2011-08-15 [RFC6126] ++ 6697-6699 Unassigned ++ 6700 Unassigned 2010-01-26 ++kti-icad-srvr 6701 tcp KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] ++kti-icad-srvr 6701 udp KTI/ICAD Nameserver [Stanley_Knutson] [Stanley_Knutson] ++ 6701 sctp Unassigned 2010-01-26 ++e-design-net 6702 tcp e-Design network [Janos_Lerch] [Janos_Lerch] 2006-02 ++e-design-net 6702 udp e-Design network [Janos_Lerch] [Janos_Lerch] 2006-02 ++ 6702 sctp Unassigned 2010-01-26 ++e-design-web 6703 tcp e-Design web [Janos_Lerch] [Janos_Lerch] 2006-02 ++e-design-web 6703 udp e-Design web [Janos_Lerch] [Janos_Lerch] 2006-02 ++ 6704 udp Reserved ++ 6704 tcp Reserved ++frc-hp 6704 sctp ForCES HP (High Priority) [RFC5811] ++ channel ++ 6705 udp Reserved ++ 6705 tcp Reserved ++frc-mp 6705 sctp ForCES MP (Medium Priority) [RFC5811] ++ channel ++ 6706 udp Reserved ++ 6706 tcp Reserved ++frc-lp 6706 sctp ForCES LP (Low priority) [RFC5811] ++ channel ++ 6707-6713 Unassigned ++ibprotocol 6714 tcp Internet Backplane Protocol [Alessandro_Bassi] [Alessandro_Bassi] ++ibprotocol 6714 udp Internet Backplane Protocol [Alessandro_Bassi] [Alessandro_Bassi] ++fibotrader-com 6715 tcp Fibotrader Communications [Robert_Wetzold] [Robert_Wetzold] 2006-01 ++fibotrader-com 6715 udp Fibotrader Communications [Robert_Wetzold] [Robert_Wetzold] 2006-01 ++ 6716-6766 Unassigned ++bmc-perf-agent 6767 tcp BMC PERFORM AGENT [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-perf-agent 6767 udp BMC PERFORM AGENT [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-perf-mgrd 6768 tcp BMC PERFORM MGRD [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-perf-mgrd 6768 udp BMC PERFORM MGRD [Portnoy_Boxman] [Portnoy_Boxman] ++adi-gxp-srvprt 6769 tcp ADInstruments GxP Server [Mathew_Pitchforth] [Mathew_Pitchforth] 2005-08 ++adi-gxp-srvprt 6769 udp ADInstruments GxP Server [Mathew_Pitchforth] [Mathew_Pitchforth] 2005-08 ++plysrv-http 6770 tcp PolyServe http [Mike_Spitzer] [Mike_Spitzer] 2005-08 ++plysrv-http 6770 udp PolyServe http [Mike_Spitzer] [Mike_Spitzer] 2005-08 ++plysrv-https 6771 tcp PolyServe https [Mike_Spitzer] [Mike_Spitzer] 2005-08 ++plysrv-https 6771 udp PolyServe https [Mike_Spitzer] [Mike_Spitzer] 2005-08 ++ 6772-6784 Unassigned ++dgpf-exchg 6785 tcp DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04 ++dgpf-exchg 6785 udp DGPF Individual Exchange [Thomas_Weise] [Thomas_Weise] 2006-04 ++smc-jmx 6786 tcp Sun Java Web Console JMX [Bill_Edwards] [Bill_Edwards] 2005-08 ++smc-jmx 6786 udp Sun Java Web Console JMX [Bill_Edwards] [Bill_Edwards] 2005-08 ++smc-admin 6787 tcp Sun Web Console Admin [Bill_Edwards] [Bill_Edwards] 2005-08 ++smc-admin 6787 udp Sun Web Console Admin [Bill_Edwards] [Bill_Edwards] 2005-08 ++smc-http 6788 tcp SMC-HTTP [Ratnadeep_Bhattachar] [Ratnadeep_Bhattachar] 2002-11 ++smc-http 6788 udp SMC-HTTP [Ratnadeep_Bhattachar] [Ratnadeep_Bhattachar] 2002-11 ++smc-https 6789 tcp SMC-HTTPS [Ratnadeep_Bhattachar] [Ratnadeep_Bhattachar] 2002-08 ++smc-https 6789 udp SMC-HTTPS [Ratnadeep_Bhattachar] [Ratnadeep_Bhattachar] 2002-08 ++hnmp 6790 tcp HNMP [Jude_George] [Jude_George] ++hnmp 6790 udp HNMP [Jude_George] [Jude_George] ++hnm 6791 tcp Halcyon Network Manager [Richard_Harriss] [Richard_Harriss] 2005-05 ++hnm 6791 udp Halcyon Network Manager [Richard_Harriss] [Richard_Harriss] 2005-05 ++ 6792-6800 Unassigned ++acnet 6801 tcp ACNET Control System [Rich_Neswold] [Rich_Neswold] 2007-02 ++ Protocol ++acnet 6801 udp ACNET Control System [Rich_Neswold] [Rich_Neswold] 2007-02 ++ Protocol ++ 6802-6816 Unassigned ++pentbox-sim 6817 tcp PenTBox Secure IM Protocol [Alberto_Ortega_Llama] [Alberto_Ortega_Llama] 2009-11-04 ++ 6817 udp Reserved ++ 6818-6830 Unassigned ++ambit-lm 6831 tcp ambit-lm [Don_Hejna] [Don_Hejna] ++ambit-lm 6831 udp ambit-lm [Don_Hejna] [Don_Hejna] ++ 6832-6840 Unassigned ++netmo-default 6841 tcp Netmo Default [Urs_Bertschinger] [Urs_Bertschinger] ++netmo-default 6841 udp Netmo Default [Urs_Bertschinger] [Urs_Bertschinger] ++netmo-http 6842 tcp Netmo HTTP [Urs_Bertschinger] [Urs_Bertschinger] ++netmo-http 6842 udp Netmo HTTP [Urs_Bertschinger] [Urs_Bertschinger] ++ 6843-6849 Unassigned ++iccrushmore 6850 tcp ICCRUSHMORE [Dave_Hubbard] [Dave_Hubbard] ++iccrushmore 6850 udp ICCRUSHMORE [Dave_Hubbard] [Dave_Hubbard] ++ 6851-6867 Unassigned ++acctopus-cc 6868 tcp Acctopus Command Channel [Stefan_Auweiler] [Stefan_Auweiler] 2009-11-16 ++acctopus-st 6868 udp Acctopus Status [Stefan_Auweiler] [Stefan_Auweiler] 2009-11-16 ++ 6869-6887 Unassigned ++muse 6888 tcp MUSE [Muse_Communications] [Muse_Communications] ++muse 6888 udp MUSE [Muse_Communications] [Muse_Communications] ++ 6889-6900 Unassigned ++jetstream 6901 tcp Novell Jetstream messaging [Anil_Tyagi] [Anil_Tyagi] 2010-06-11 ++ protocol ++ 6901 udp Reserved ++ 6902-6934 Unassigned ++ethoscan 6935 tcp EthoScan Service [Marty_Campbell] [Marty_Campbell] 2011-06-10 ++ethoscan 6935 udp EthoScan Service [Marty_Campbell] [Marty_Campbell] 2011-06-10 ++xsmsvc 6936 tcp XenSource Management Service [Roger_Klorese] [Roger_Klorese] 2006-06 ++xsmsvc 6936 udp XenSource Management Service [Roger_Klorese] [Roger_Klorese] 2006-06 ++ 6937-6945 Unassigned ++bioserver 6946 tcp Biometrics Server [ISHII_AKIO] [ISHII_AKIO] 2006-01 ++bioserver 6946 udp Biometrics Server [ISHII_AKIO] [ISHII_AKIO] 2006-01 ++ 6947-6950 Unassigned ++otlp 6951 tcp OTLP [Brent_Foster] [Brent_Foster] 2006-04 ++otlp 6951 udp OTLP [Brent_Foster] [Brent_Foster] 2006-04 ++ 6952-6960 Unassigned ++jmact3 6961 tcp JMACT3 [Yutaka_Ono] [Yutaka_Ono] ++jmact3 6961 udp JMACT3 [Yutaka_Ono] [Yutaka_Ono] ++jmevt2 6962 tcp jmevt2 [Yutaka_Ono] [Yutaka_Ono] ++jmevt2 6962 udp jmevt2 [Yutaka_Ono] [Yutaka_Ono] ++swismgr1 6963 tcp swismgr1 [Yutaka_Ono] [Yutaka_Ono] ++swismgr1 6963 udp swismgr1 [Yutaka_Ono] [Yutaka_Ono] ++swismgr2 6964 tcp swismgr2 [Yutaka_Ono] [Yutaka_Ono] ++swismgr2 6964 udp swismgr2 [Yutaka_Ono] [Yutaka_Ono] ++swistrap 6965 tcp swistrap [Yutaka_Ono] [Yutaka_Ono] ++swistrap 6965 udp swistrap [Yutaka_Ono] [Yutaka_Ono] ++swispol 6966 tcp swispol [Yutaka_Ono] [Yutaka_Ono] ++swispol 6966 udp swispol [Yutaka_Ono] [Yutaka_Ono] ++ 6967-6968 Unassigned ++acmsoda 6969 tcp acmsoda [Daniel_Simms] [Daniel_Simms] ++acmsoda 6969 udp acmsoda [Daniel_Simms] [Daniel_Simms] ++ 6970-6996 Unassigned ++MobilitySrv 6997 tcp Mobility XE Protocol [Joseph_T_Savarese] [Joseph_T_Savarese] 2007-06 ++MobilitySrv 6997 udp Mobility XE Protocol [Joseph_T_Savarese] [Joseph_T_Savarese] 2007-06 ++iatp-highpri 6998 tcp IATP-highPri [John_Murphy] [John_Murphy] ++iatp-highpri 6998 udp IATP-highPri [John_Murphy] [John_Murphy] ++iatp-normalpri 6999 tcp IATP-normalPri [John_Murphy] [John_Murphy] ++iatp-normalpri 6999 udp IATP-normalPri [John_Murphy] [John_Murphy] ++afs3-fileserver 7000 tcp file server itself ++afs3-fileserver 7000 udp file server itself ++afs3-callback 7001 tcp callbacks to cache managers ++afs3-callback 7001 udp callbacks to cache managers ++afs3-prserver 7002 tcp users & groups database ++afs3-prserver 7002 udp users & groups database ++afs3-vlserver 7003 tcp volume location database ++afs3-vlserver 7003 udp volume location database ++afs3-kaserver 7004 tcp AFS/Kerberos authentication ++ service ++afs3-kaserver 7004 udp AFS/Kerberos authentication ++ service ++afs3-volser 7005 tcp volume managment server ++afs3-volser 7005 udp volume managment server ++afs3-errors 7006 tcp error interpretation service ++afs3-errors 7006 udp error interpretation service ++afs3-bos 7007 tcp basic overseer process ++afs3-bos 7007 udp basic overseer process ++afs3-update 7008 tcp server-to-server updater ++afs3-update 7008 udp server-to-server updater ++afs3-rmtsys 7009 tcp remote cache manager service ++afs3-rmtsys 7009 udp remote cache manager service ++ups-onlinet 7010 tcp onlinet uninterruptable [Jim_Thompson] [Jim_Thompson] ++ power supplies ++ups-onlinet 7010 udp onlinet uninterruptable [Jim_Thompson] [Jim_Thompson] ++ power supplies ++ Unauthorized ++talon-disc 7011 tcp Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG ++ OpenAFS+OSD ++ system ++ Unauthorized ++talon-disc 7011 udp Talon Discovery Port [Jim_Thompson] [Jim_Thompson] Use by RZG ++ OpenAFS+OSD ++ system ++ Unauthorized ++talon-engine 7012 tcp Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG ++ OpenAFS+OSD ++ system ++ Unauthorized ++talon-engine 7012 udp Talon Engine [Jim_Thompson] [Jim_Thompson] Use by RZG ++ OpenAFS+OSD ++ system ++microtalon-dis 7013 tcp Microtalon Discovery [Jim_Thompson] [Jim_Thompson] ++microtalon-dis 7013 udp Microtalon Discovery [Jim_Thompson] [Jim_Thompson] ++microtalon-com 7014 tcp Microtalon Communications [Jim_Thompson] [Jim_Thompson] ++microtalon-com 7014 udp Microtalon Communications [Jim_Thompson] [Jim_Thompson] ++talon-webserver 7015 tcp Talon Webserver [Jim_Thompson] [Jim_Thompson] ++talon-webserver 7015 udp Talon Webserver [Jim_Thompson] [Jim_Thompson] ++ 7016-7017 Unassigned ++fisa-svc 7018 tcp FISA Service [FAUCONNET_Ingenierie] [FAUCONNET_Ingenierie] 2011-05-19 ++ 7018 udp Reserved ++doceri-ctl 7019 tcp doceri drawing service [Paul_Brown] [Paul_Brown] 2011-04-27 ++ control ++doceri-view 7019 udp doceri drawing service [Paul_Brown] [Paul_Brown] 2011-04-27 ++ screen view ++dpserve 7020 tcp DP Serve [Allan_Stanley] [Allan_Stanley] ++dpserve 7020 udp DP Serve [Allan_Stanley] [Allan_Stanley] ++dpserveadmin 7021 tcp DP Serve Admin [Allan_Stanley] [Allan_Stanley] ++dpserveadmin 7021 udp DP Serve Admin [Allan_Stanley] [Allan_Stanley] ++ctdp 7022 tcp CT Discovery Protocol [James_Kirkwood] [James_Kirkwood] 2005-06 ++ctdp 7022 udp CT Discovery Protocol [James_Kirkwood] [James_Kirkwood] 2005-06 ++ct2nmcs 7023 tcp Comtech T2 NMCS [Bryan_Wilcutt] [Bryan_Wilcutt] 2005-06 ++ct2nmcs 7023 udp Comtech T2 NMCS [Bryan_Wilcutt] [Bryan_Wilcutt] 2005-06 ++vmsvc 7024 tcp Vormetric service [Tom_Boyle] [Tom_Boyle] 2005-06 ++vmsvc 7024 udp Vormetric service [Tom_Boyle] [Tom_Boyle] 2005-06 ++vmsvc-2 7025 tcp Vormetric Service II [Tom_Boyle] [Tom_Boyle] 2005-06 ++vmsvc-2 7025 udp Vormetric Service II [Tom_Boyle] [Tom_Boyle] 2005-06 ++ 7026-7029 Unassigned ++op-probe 7030 tcp ObjectPlanet probe [Bjorn_Jarle_Kvande] [Bjorn_Jarle_Kvande] 2002-04 ++op-probe 7030 udp ObjectPlanet probe [Bjorn_Jarle_Kvande] [Bjorn_Jarle_Kvande] 2002-04 ++ 7031-7039 Unassigned ++ 7040 tcp Reserved ++quest-disc 7040 udp Quest application level [Quest_Software] [Henrik_Johnson] 2012-04-09 ++ network service discovery ++ 7041-7069 Unassigned ++arcp 7070 tcp ARCP [Jude_George] [Jude_George] ++arcp 7070 udp ARCP [Jude_George] [Jude_George] ++iwg1 7071 tcp IWGADTS Aircraft [Don_Sullivan] [Don_Sullivan] 2010-02-16 ++ Housekeeping Message ++iwg1 7071 udp IWGADTS Aircraft [Don_Sullivan] [Don_Sullivan] 2010-02-16 ++ Housekeeping Message ++ 7072-7079 Unassigned ++empowerid 7080 tcp EmpowerID Communication [Matthew_Whited] [Matthew_Whited] 2008-01-16 ++empowerid 7080 udp EmpowerID Communication [Matthew_Whited] [Matthew_Whited] 2008-01-16 ++ 7081-7098 Unassigned ++lazy-ptop 7099 tcp lazy-ptop [Guy_Keren] [Guy_Keren] ++lazy-ptop 7099 udp lazy-ptop [Guy_Keren] [Guy_Keren] ++font-service 7100 tcp X Font Service [Stephen_Gildea] [Stephen_Gildea] ++font-service 7100 udp X Font Service [Stephen_Gildea] [Stephen_Gildea] ++elcn 7101 tcp Embedded Light Control [Michael_Scarito] [Michael_Scarito] 2007-02 ++ Network ++elcn 7101 udp Embedded Light Control [Michael_Scarito] [Michael_Scarito] 2007-02 ++ Network ++ 7102-7106 Unassigned ++ 7107 tcp Reserved ++aes-x170 7107 udp AES-X170 [Richard_Foss] [Richard_Foss] 2011-02-10 ++ 7108-7120 Unassigned ++virprot-lm 7121 tcp Virtual Prototypes License [Victor_Galis] [Victor_Galis] ++ Manager ++virprot-lm 7121 udp Virtual Prototypes License [Victor_Galis] [Victor_Galis] ++ Manager ++ 7122-7127 Unassigned ++scenidm 7128 tcp intelligent data manager [Paul_Ignatius] [Paul_Ignatius] 2006-03 ++scenidm 7128 udp intelligent data manager [Paul_Ignatius] [Paul_Ignatius] 2006-03 ++scenccs 7129 tcp Catalog Content Search [Anil_Sharma] [Anil_Sharma] 2006-04 ++scenccs 7129 udp Catalog Content Search [Anil_Sharma] [Anil_Sharma] 2006-04 ++ 7130-7160 Unassigned ++cabsm-comm 7161 tcp CA BSM Comm [Chun_Ho_Chang] [Chun_Ho_Chang] 2004-11 ++cabsm-comm 7161 udp CA BSM Comm [Chun_Ho_Chang] [Chun_Ho_Chang] 2004-11 ++caistoragemgr 7162 tcp CA Storage Manager [Emre_Tunar] [Emre_Tunar] 2004-11 ++caistoragemgr 7162 udp CA Storage Manager [Emre_Tunar] [Emre_Tunar] 2004-11 ++cacsambroker 7163 tcp CA Connection Broker [David_Roberts] [David_Roberts] 2005-05 ++cacsambroker 7163 udp CA Connection Broker [David_Roberts] [David_Roberts] 2005-05 ++fsr 7164 tcp File System Repository Agent [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2007-07-19 ++fsr 7164 udp File System Repository Agent [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2007-07-19 ++doc-server 7165 tcp Document WCF Server [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2008-01-07 ++doc-server 7165 udp Document WCF Server [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2008-01-07 ++aruba-server 7166 tcp Aruba eDiscovery Server [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2008-01-07 ++aruba-server 7166 udp Aruba eDiscovery Server [Micha_Ben_Efraim] [Micha_Ben_Efraim] 2008-01-07 ++casrmagent 7167 tcp CA SRM Agent [Venkata_Krishna] [Venkata_Krishna] 2010-02-24 ++ 7167 udp Reserved ++cnckadserver 7168 tcp cncKadServer DB & Inventory [Micha_Ben_Efraim_2] [Micha_Ben_Efraim_2] 2011-01-31 ++ Services ++ 7168 udp Reserved ++ccag-pib 7169 tcp Consequor Consulting Process [Frank_Goenninger] [Frank_Goenninger] 2010-02-22 ++ Integration Bridge ++ccag-pib 7169 udp Consequor Consulting Process [Frank_Goenninger] [Frank_Goenninger] 2010-02-22 ++ Integration Bridge ++nsrp 7170 tcp Adaptive Name/Service [Geoff_Back_2] [Geoff_Back_2] 2010-02-01 ++ Resolution ++nsrp 7170 udp Adaptive Name/Service [Geoff_Back_2] [Geoff_Back_2] 2010-02-01 ++ Resolution ++drm-production 7171 tcp Discovery and Retention Mgt [Micha_Ben_Efraim_3] [Micha_Ben_Efraim_3] 2010-02-18 ++ Production ++drm-production 7171 udp Discovery and Retention Mgt [Micha_Ben_Efraim_3] [Micha_Ben_Efraim_3] 2010-02-18 ++ Production ++ 7172 Unassigned ++zsecure 7173 tcp zSecure Server [Hans_Schoone] [Hans_Schoone] 2010-10-01 ++ 7173 udp Reserved ++clutild 7174 tcp Clutild [Cheryl_Stoutenburg] [Cheryl_Stoutenburg] ++clutild 7174 udp Clutild [Cheryl_Stoutenburg] [Cheryl_Stoutenburg] ++ 7175-7199 Unassigned ++fodms 7200 tcp FODMS FLIP [David_Anthony] [David_Anthony] ++fodms 7200 udp FODMS FLIP [David_Anthony] [David_Anthony] ++dlip 7201 tcp DLIP [Albert_Manfredi] [Albert_Manfredi] ++dlip 7201 udp DLIP [Albert_Manfredi] [Albert_Manfredi] ++ 7202-7226 Unassigned ++ramp 7227 tcp Registry A & M Protocol [John_Havard] [John_Havard] 2003-11 ++ramp 7227 udp Registry A $ M Protocol [John_Havard] [John_Havard] 2003-11 ++citrixupp 7228 tcp Citrix Universal Printing [Gary_Barton] [Gary_Barton] 2011-02-24 ++ Port ++ 7228 udp Reserved ++citrixuppg 7229 tcp Citrix UPP Gateway [Gary_Barton] [Gary_Barton] 2011-02-24 ++ 7229 udp Reserved ++ 7230-7235 Unassigned ++display 7236 tcp Wi-Fi Alliance Wi-Fi Display [Wi-Fi_Alliance] [Thomas_Sciorilli] 2012-04-09 Defined TXT keys: _display.tcp. Display Protocol ++ Protocol ++ 7236 udp Reserved ++pads 7237 tcp PADS (Public Area Display [Willie_Jan_Bons] [Willie_Jan_Bons] 2011-03-10 ++ System) Server ++ 7237 udp Reserved ++ 7238-7261 Unassigned ++cnap 7262 tcp Calypso Network Access [Scott_Halberg] [Scott_Halberg] 2009-06-02 ++ Protocol ++cnap 7262 udp Calypso Network Access [Scott_Halberg] [Scott_Halberg] 2009-06-02 ++ Protocol ++ 7263-7271 Unassigned ++watchme-7272 7272 tcp WatchMe Monitoring 7272 [Oliver_Heinz] [Oliver_Heinz] 2005-08 ++watchme-7272 7272 udp WatchMe Monitoring 7272 [Oliver_Heinz] [Oliver_Heinz] 2005-08 ++oma-rlp 7273 tcp OMA Roaming Location [Larry_A_Young] [Larry_A_Young] 2005-08 ++oma-rlp 7273 udp OMA Roaming Location [Larry_A_Young] [Larry_A_Young] 2005-08 ++oma-rlp-s 7274 tcp OMA Roaming Location SEC [Larry_A_Young] [Larry_A_Young] 2005-08 ++oma-rlp-s 7274 udp OMA Roaming Location SEC [Larry_A_Young] [Larry_A_Young] 2005-08 ++oma-ulp 7275 tcp OMA UserPlane Location [Larry_A_Young_2] [Larry_A_Young_2] 2006-02 ++oma-ulp 7275 udp OMA UserPlane Location [Larry_A_Young_2] [Larry_A_Young_2] 2006-02 ++oma-ilp 7276 tcp OMA Internal Location [Khiem_Tran] [Khiem_Tran] 2007-11-06 ++ Protocol ++oma-ilp 7276 udp OMA Internal Location [Khiem_Tran] [Khiem_Tran] 2007-11-06 ++ Protocol ++oma-ilp-s 7277 tcp OMA Internal Location Secure [Khiem_Tran] [Khiem_Tran] 2007-11-06 ++ Protocol ++oma-ilp-s 7277 udp OMA Internal Location Secure [Khiem_Tran] [Khiem_Tran] 2007-11-06 ++ Protocol ++oma-dcdocbs 7278 tcp OMA Dynamic Content Delivery [Avi_Primo] [Avi_Primo] 2008-01-29 ++ over CBS ++oma-dcdocbs 7278 udp OMA Dynamic Content Delivery [Avi_Primo] [Avi_Primo] 2008-01-29 ++ over CBS ++ctxlic 7279 tcp Citrix Licensing [Marc_Binstock] [Marc_Binstock] 2008-01-29 ++ctxlic 7279 udp Citrix Licensing [Marc_Binstock] [Marc_Binstock] 2008-01-29 ++itactionserver1 7280 tcp ITACTIONSERVER 1 [Brian_Taylor] [Brian_Taylor] ++itactionserver1 7280 udp ITACTIONSERVER 1 [Brian_Taylor] [Brian_Taylor] ++itactionserver2 7281 tcp ITACTIONSERVER 2 [Brian_Taylor] [Brian_Taylor] ++itactionserver2 7281 udp ITACTIONSERVER 2 [Brian_Taylor] [Brian_Taylor] ++mzca-action 7282 tcp eventACTION/ussACTION (MZCA) [Gord_Tomlin] [Gord_Tomlin] 2009-01-30 ++ server ++mzca-alert 7282 udp eventACTION/ussACTION (MZCA) [Gord_Tomlin] [Gord_Tomlin] 2010-01-21 ++ alert ++genstat 7283 tcp General Statistics [VSN_International_Ltd] [Sean_D_Solle] 2011-09-28 ++ Rendezvous Protocol ++ 7283 udp Reserved ++ 7284-7299 Unassigned ++swx 7300-7359 The Swiss Exchange [Edgar_Blum] [Edgar_Blum] ++ 7360-7364 Unassigned 2006-02-06 ++lcm-server 7365 tcp LifeKeeper Communications [James_Bottomley] [James_Bottomley] 2006-02 ++lcm-server 7365 udp LifeKeeper Communications [James_Bottomley] [James_Bottomley] 2006-02 ++ 7366-7390 Unassigned 2006-02-06 ++mindfilesys 7391 tcp mind-file system server [Dave_Porter] [Dave_Porter] ++mindfilesys 7391 udp mind-file system server [Dave_Porter] [Dave_Porter] ++mrssrendezvous 7392 tcp mrss-rendezvous server [Dave_Porter] [Dave_Porter] ++mrssrendezvous 7392 udp mrss-rendezvous server [Dave_Porter] [Dave_Porter] ++nfoldman 7393 tcp nFoldMan Remote Publish [Richard_McDonald] [Richard_McDonald] 2006-01 ++nfoldman 7393 udp nFoldMan Remote Publish [Richard_McDonald] [Richard_McDonald] 2006-01 ++fse 7394 tcp File system export of backup [Weibao_Wu] [Weibao_Wu] 2006-04 ++ images ++fse 7394 udp File system export of backup [Weibao_Wu] [Weibao_Wu] 2006-04 ++ images ++winqedit 7395 tcp winqedit [David_Greer] [David_Greer] ++winqedit 7395 udp winqedit [David_Greer] [David_Greer] ++ 7396 Unassigned ++hexarc 7397 tcp Hexarc Command Language [George_Moromisato] [George_Moromisato] 2004-11 ++hexarc 7397 udp Hexarc Command Language [George_Moromisato] [George_Moromisato] 2004-11 ++ 7398-7399 Unassigned ++rtps-discovery 7400 tcp RTPS Discovery [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++rtps-discovery 7400 udp RTPS Discovery [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++rtps-dd-ut 7401 tcp RTPS Data-Distribution [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++ User-Traffic ++rtps-dd-ut 7401 udp RTPS Data-Distribution [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++ User-Traffic ++rtps-dd-mt 7402 tcp RTPS Data-Distribution [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++ Meta-Traffic ++rtps-dd-mt 7402 udp RTPS Data-Distribution [Gerardo_Pardo_Castel] [Gerardo_Pardo_Castel] 2005-10 ++ Meta-Traffic ++ 7403-7409 Unassigned ++ionixnetmon 7410 tcp Ionix Network Monitor [Maxime_Deputter] [Maxime_Deputter] 2006-04 ++ionixnetmon 7410 udp Ionix Network Monitor [Maxime_Deputter] [Maxime_Deputter] 2006-04 ++ 7411-7420 Unassigned ++mtportmon 7421 tcp Matisse Port Monitor [Didier_Cabannes] [Didier_Cabannes] 2004-11 ++mtportmon 7421 udp Matisse Port Monitor [Didier_Cabannes] [Didier_Cabannes] 2004-11 ++ 7422-7425 Unassigned ++pmdmgr 7426 tcp OpenView DM Postmaster [Dave_Lamb] [Dave_Lamb] ++ Manager ++pmdmgr 7426 udp OpenView DM Postmaster [Dave_Lamb] [Dave_Lamb] ++ Manager ++oveadmgr 7427 tcp OpenView DM Event Agent [Dave_Lamb] [Dave_Lamb] ++ Manager ++oveadmgr 7427 udp OpenView DM Event Agent [Dave_Lamb] [Dave_Lamb] ++ Manager ++ovladmgr 7428 tcp OpenView DM Log Agent [Dave_Lamb] [Dave_Lamb] ++ Manager ++ovladmgr 7428 udp OpenView DM Log Agent [Dave_Lamb] [Dave_Lamb] ++ Manager ++opi-sock 7429 tcp OpenView DM rqt [Dave_Lamb] [Dave_Lamb] ++ communication ++opi-sock 7429 udp OpenView DM rqt [Dave_Lamb] [Dave_Lamb] ++ communication ++xmpv7 7430 tcp OpenView DM xmpv7 api pipe [Dave_Lamb] [Dave_Lamb] ++xmpv7 7430 udp OpenView DM xmpv7 api pipe [Dave_Lamb] [Dave_Lamb] ++pmd 7431 tcp OpenView DM ovc/xmpv3 api [Dave_Lamb] [Dave_Lamb] ++ pipe ++pmd 7431 udp OpenView DM ovc/xmpv3 api [Dave_Lamb] [Dave_Lamb] ++ pipe ++ 7432-7436 Unassigned ++faximum 7437 tcp Faximum [George_Pajari] [George_Pajari] ++faximum 7437 udp Faximum [George_Pajari] [George_Pajari] ++ 7438-7442 Unassigned ++oracleas-https 7443 tcp Oracle Application Server [David_McMarlin] [David_McMarlin] 2006-08 ++ HTTPS ++oracleas-https 7443 udp Oracle Application Server [David_McMarlin] [David_McMarlin] 2006-08 ++ HTTPS ++ 7444-7472 Unassigned ++rise 7473 tcp Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 ++rise 7473 udp Rise: The Vieneo Province [Jason_Reskin] [Jason_Reskin] 2007-03 ++ 7474-7490 Unassigned ++telops-lmd 7491 tcp telops-lmd [David_Spencer] [David_Spencer] ++telops-lmd 7491 udp telops-lmd [David_Spencer] [David_Spencer] ++ 7492-7499 Unassigned ++silhouette 7500 tcp Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 ++silhouette 7500 udp Silhouette User [Anthony_Payne] [Anthony_Payne] 2004-02 ++ovbus 7501 tcp HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] ++ovbus 7501 udp HP OpenView Bus Daemon [David_M_Rhodes] [David_M_Rhodes] ++ 7502-7507 Unassigned ++adcp 7508 tcp Automation Device [Holger_Sachs] [Holger_Sachs] 2011-05-27 ++ Configuration Protocol ++ 7508 udp Reserved ++acplt 7509 tcp ACPLT - process automation [Henning_Mersch] [Henning_Mersch] 2010-12-07 ++ service ++ 7509 udp Reserved ++ovhpas 7510 tcp HP OpenView Application [Jeff_Conrad] [Jeff_Conrad] ++ Server ++ovhpas 7510 udp HP OpenView Application [Jeff_Conrad] [Jeff_Conrad] ++ Server ++pafec-lm 7511 tcp pafec-lm [Billy_Dhillon] [Billy_Dhillon] ++pafec-lm 7511 udp pafec-lm [Billy_Dhillon] [Billy_Dhillon] ++ 7512-7541 Unassigned ++saratoga 7542 tcp Saratoga Transfer Protocol [Lloyd_Wood] [Lloyd_Wood] 2007-05 ++saratoga 7542 udp Saratoga Transfer Protocol [Lloyd_Wood] [Lloyd_Wood] 2007-05 ++atul 7543 tcp atul server [Mark_Stapp] [Mark_Stapp] 2006-01 ++atul 7543 udp atul server [Mark_Stapp] [Mark_Stapp] 2006-01 ++nta-ds 7544 tcp FlowAnalyzer DisplayServer [Fred_Messinger] [Fred_Messinger] ++nta-ds 7544 udp FlowAnalyzer DisplayServer [Fred_Messinger] [Fred_Messinger] ++nta-us 7545 tcp FlowAnalyzer UtilityServer [Fred_Messinger] [Fred_Messinger] ++nta-us 7545 udp FlowAnalyzer UtilityServer [Fred_Messinger] [Fred_Messinger] ++cfs 7546 tcp Cisco Fabric service [Rituparna_Agrawal] [Rituparna_Agrawal] 2005-09 ++cfs 7546 udp Cisco Fabric service [Rituparna_Agrawal] [Rituparna_Agrawal] 2005-09 ++cwmp 7547 tcp DSL Forum CWMP [Anton_Okmianski] [Anton_Okmianski] 2006-01 ++cwmp 7547 udp DSL Forum CWMP [Anton_Okmianski] [Anton_Okmianski] 2006-01 ++tidp 7548 tcp Threat Information [Chui_Tin_Yen] [Chui_Tin_Yen] 2006-02 ++ Distribution Protocol ++tidp 7548 udp Threat Information [Chui_Tin_Yen] [Chui_Tin_Yen] 2006-02 ++ Distribution Protocol ++nls-tl 7549 tcp Network Layer Signaling [Melinda_Shore] [Melinda_Shore] 2006-05 ++ Transport Layer ++nls-tl 7549 udp Network Layer Signaling [Melinda_Shore] [Melinda_Shore] 2006-05 ++ Transport Layer ++ 7550 tcp Reserved ++cloudsignaling 7550 udp Cloud Signaling Service [Scott_Dawson] [Scott_Dawson] 2011-07-01 ++ 7551-7559 Unassigned ++sncp 7560 tcp Sniffer Command Protocol [Dominick_Cafarelli] [Dominick_Cafarelli] 2005-08 ++sncp 7560 udp Sniffer Command Protocol [Dominick_Cafarelli] [Dominick_Cafarelli] 2005-08 ++ 7561-7562 Unassigned ++cfw 7563 tcp Control Framework [RFC6230] ++ 7563 udp Reserved ++ 7564-7565 Unassigned ++vsi-omega 7566 tcp VSI Omega [Curtis_Smith] [Curtis_Smith] ++vsi-omega 7566 udp VSI Omega [Curtis_Smith] [Curtis_Smith] ++ 7567-7568 Unassigned ++dell-eql-asm 7569 tcp Dell EqualLogic Host Group [James_E_King_III] [James_E_King_III] ++ Management ++ 7569 udp Reserved ++aries-kfinder 7570 tcp Aries Kfinder [James_King_III] [James_King_III] ++aries-kfinder 7570 udp Aries Kfinder [James_King_III] [James_King_III] ++ 7571-7587 Unassigned ++sun-lm 7588 tcp Sun License Manager [Sophie_Deng] [Sophie_Deng] ++sun-lm 7588 udp Sun License Manager [Sophie_Deng] [Sophie_Deng] ++ 7589-7623 Unassigned ++indi 7624 tcp Instrument Neutral [Elwood_Downey] [Elwood_Downey] 2002-04 ++ Distributed Interface ++indi 7624 udp Instrument Neutral [Elwood_Downey] [Elwood_Downey] 2002-04 ++ Distributed Interface ++ 7625 Unassigned ++simco 7626 tcp SImple Middlebox [RFC4540] ++ COnfiguration (SIMCO) Server ++ 7626 udp De-registered 2006-01-30 ++simco 7626 sctp SImple Middlebox [Sebastian_Kiesel] [Sebastian_Kiesel] 2006-01 ++ COnfiguration (SIMCO) ++soap-http 7627 tcp SOAP Service Port [Donald_Dylla] [Donald_Dylla] 2004-12 ++soap-http 7627 udp SOAP Service Port [Donald_Dylla] [Donald_Dylla] 2004-12 ++zen-pawn 7628 tcp Primary Agent Work [Ty_Ellis] [Ty_Ellis] 2006-05 ++ Notification ++zen-pawn 7628 udp Primary Agent Work [Ty_Ellis] [Ty_Ellis] 2006-05 ++ Notification ++xdas 7629 tcp OpenXDAS Wire Protocol [John_Calcote_2] [John_Calcote_2] 2006-10 ++xdas 7629 udp OpenXDAS Wire Protocol [John_Calcote_2] [John_Calcote_2] 2006-10 ++hawk 7630 tcp HA Web Konsole [Tim_Serong] [Tim_Serong] 2010-03-31 ++ 7630 udp Reserved ++tesla-sys-msg 7631 tcp TESLA System Messaging [Andy_Perreault] [Andy_Perreault] 2010-03-31 ++ 7631 udp Reserved ++ 7632 Unassigned ++pmdfmgt 7633 tcp PMDF Management [Hunter_Goatley] [Hunter_Goatley] ++pmdfmgt 7633 udp PMDF Management [Hunter_Goatley] [Hunter_Goatley] ++ 7634-7647 Unassigned ++cuseeme 7648 tcp bonjour-cuseeme [Marc_Manthey] [Marc_Manthey] 2006-07 ++cuseeme 7648 udp bonjour-cuseeme [Marc_Manthey] [Marc_Manthey] 2006-07 ++ 7649-7671 Unassigned ++imqstomp 7672 tcp iMQ STOMP Server [Amy_Kang] [Amy_Kang] 2009-03-10 ++ 7672 udp Reserved ++imqstomps 7673 tcp iMQ STOMP Server over SSL [Amy_Kang] [Amy_Kang] 2009-03-10 ++ 7673 udp Reserved ++imqtunnels 7674 tcp iMQ SSL tunnel [Shailesh_S_Bavadeka] [Shailesh_S_Bavadeka] 2002-04 ++imqtunnels 7674 udp iMQ SSL tunnel [Shailesh_S_Bavadeka] [Shailesh_S_Bavadeka] 2002-04 ++imqtunnel 7675 tcp iMQ Tunnel [Shailesh_S_Bavadeka] [Shailesh_S_Bavadeka] 2002-04 ++imqtunnel 7675 udp iMQ Tunnel [Shailesh_S_Bavadeka] [Shailesh_S_Bavadeka] 2002-04 ++imqbrokerd 7676 tcp iMQ Broker Rendezvous [Joseph_Di_Pol] [Joseph_Di_Pol] 2002-04 ++imqbrokerd 7676 udp iMQ Broker Rendezvous [Joseph_Di_Pol] [Joseph_Di_Pol] 2002-04 ++sun-user-https 7677 tcp Sun App Server - HTTPS [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++sun-user-https 7677 udp Sun App Server - HTTPS [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++ 7678-7679 Unassigned ++pando-pub 7680 tcp Pando Media Public [Laird_Popkin] [Laird_Popkin] 2008-02-27 ++ Distribution ++pando-pub 7680 udp Pando Media Public [Laird_Popkin] [Laird_Popkin] 2008-02-27 ++ Distribution ++ 7681-7688 Unassigned ++collaber 7689 tcp Collaber Network Service [Rajesh_Akkineni] [Rajesh_Akkineni] 2007-01 ++collaber 7689 udp Collaber Network Service [Rajesh_Akkineni] [Rajesh_Akkineni] 2007-01 ++ 7690-7696 Unassigned ++klio 7697 tcp KLIO communications [Helmut_Giritzer_2] [Helmut_Giritzer_2] 2005-08 ++klio 7697 udp KLIO communications [Helmut_Giritzer_2] [Helmut_Giritzer_2] 2005-08 ++ 7698-7699 Unassigned ++em7-secom 7700 tcp EM7 Secure Communications [Christopher_Cordray] [Christopher_Cordray] 2008-06-05 ++ 7700 udp Reserved ++ 7701-7706 Unassigned ++sync-em7 7707 tcp EM7 Dynamic Updates [Christopher_Cordray] [Christopher_Cordray] 2004-11 ++sync-em7 7707 udp EM7 Dynamic Updates [Christopher_Cordray] [Christopher_Cordray] 2004-11 ++scinet 7708 tcp scientia.net [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2006-01 ++scinet 7708 udp scientia.net [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2006-01 ++ 7709-7719 Unassigned ++medimageportal 7720 tcp MedImage Portal [Robert_Helton] [Robert_Helton] 2003-10 ++medimageportal 7720 udp MedImage Portal [Robert_Helton] [Robert_Helton] 2003-10 ++ 7721-7723 Unassigned ++nsdeepfreezectl 7724 tcp Novell Snap-in Deep Freeze [David_Crowe] [David_Crowe] 2008-01-07 ++ Control ++nsdeepfreezectl 7724 udp Novell Snap-in Deep Freeze [David_Crowe] [David_Crowe] 2008-01-07 ++ Control ++nitrogen 7725 tcp Nitrogen Service [Randy_Lomnes] [Randy_Lomnes] 2004-11 ++nitrogen 7725 udp Nitrogen Service [Randy_Lomnes] [Randy_Lomnes] 2004-11 ++freezexservice 7726 tcp FreezeX Console Service [David_Crowe] [David_Crowe] 2005-06 ++freezexservice 7726 udp FreezeX Console Service [David_Crowe] [David_Crowe] 2005-06 ++trident-data 7727 tcp Trident Systems Data [Jeremy_McClintock] [Jeremy_McClintock] 2005-08 ++trident-data 7727 udp Trident Systems Data [Jeremy_McClintock] [Jeremy_McClintock] 2005-08 ++ 7728-7733 Unassigned ++smip 7734 tcp Smith Protocol over IP [Jim_Pettinato] [Jim_Pettinato] 2007-04 ++smip 7734 udp Smith Protocol over IP [Jim_Pettinato] [Jim_Pettinato] 2007-04 ++ 7735-7737 Unassigned ++aiagent 7738 tcp HP Enterprise Discovery [Matthew_Darwin] [Matthew_Darwin] 2005-08 ++ Agent ++aiagent 7738 udp HP Enterprise Discovery [Matthew_Darwin] [Matthew_Darwin] 2005-08 ++ Agent ++ 7739-7740 Unassigned ++scriptview 7741 tcp ScriptView Network [Reinhard_Wolf] [Reinhard_Wolf] 2010-08-19 ++scriptview 7741 udp ScriptView Network [Reinhard_Wolf] [Reinhard_Wolf] 2010-08-19 ++msss 7742 tcp Mugginsoft Script Server [Jonathan_Mitchell] [Jonathan_Mitchell] 2008-09-08 ++ Service ++ 7742 udp Reserved ++sstp-1 7743 tcp Sakura Script Transfer [Kouichi_Takeda] [Kouichi_Takeda] ++ Protocol ++sstp-1 7743 udp Sakura Script Transfer [Kouichi_Takeda] [Kouichi_Takeda] ++ Protocol ++raqmon-pdu 7744 tcp RAQMON PDU [RFC4712] ++raqmon-pdu 7744 udp RAQMON PDU [RFC4712] ++ 7745-7746 Unassigned ++prgp 7747 tcp Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 ++prgp 7747 udp Put/Run/Get Protocol [Jayasooriah] [Jayasooriah] 2008-02-22 ++ 7748-7776 Unassigned ++cbt 7777 tcp cbt [Tony_Ballardie] [Tony_Ballardie] ++cbt 7777 udp cbt [Tony_Ballardie] [Tony_Ballardie] ++interwise 7778 tcp Interwise [Joseph_Gray] [Joseph_Gray] ++interwise 7778 udp Interwise [Joseph_Gray] [Joseph_Gray] ++vstat 7779 tcp VSTAT [Vinh_Nguyn] [Vinh_Nguyn] ++vstat 7779 udp VSTAT [Vinh_Nguyn] [Vinh_Nguyn] ++ 7780 Unassigned ++accu-lmgr 7781 tcp accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] ++accu-lmgr 7781 udp accu-lmgr [Moises_E_Hernandez] [Moises_E_Hernandez] ++ 7782-7785 Unassigned ++minivend 7786 tcp MINIVEND [Mike_Heins] [Mike_Heins] ++minivend 7786 udp MINIVEND [Mike_Heins] [Mike_Heins] ++popup-reminders 7787 tcp Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 ++popup-reminders 7787 udp Popup Reminders Receive [Robert_Harvey] [Robert_Harvey] 2006-01 ++ 7788 Unassigned ++office-tools 7789 tcp Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 ++office-tools 7789 udp Office Tools Pro Receive [Robert_Harvey] [Robert_Harvey] 2006-01 ++ 7790-7793 Unassigned ++q3ade 7794 tcp Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 ++q3ade 7794 udp Q3ADE Cluster Service [Uffe_Harksen] [Uffe_Harksen] 2005-08 ++ 7795-7796 Unassigned ++pnet-conn 7797 tcp Propel Connector port ++pnet-conn 7797 udp Propel Connector port ++pnet-enc 7798 tcp Propel Encoder port [Leif_Hedstrom] [Leif_Hedstrom] 2002-04 ++pnet-enc 7798 udp Propel Encoder port [Leif_Hedstrom] [Leif_Hedstrom] 2002-04 ++altbsdp 7799 tcp Alternate BSDP Service [Dieter_Siegmund] [Dieter_Siegmund] 2007-10-22 ++altbsdp 7799 udp Alternate BSDP Service [Dieter_Siegmund] [Dieter_Siegmund] 2007-10-22 ++asr 7800 tcp Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> ++asr 7800 udp Apple Software Restore [Jim_Kateley][Shantonu_Sen] [Jim_Kateley][Shantonu_Sen] 2006-01 Defined TXT keys: image=<HTTP URL of disk image> ++ssp-client 7801 tcp Secure Server Protocol - [Rick_Macchio] [Rick_Macchio] 2006-11 ++ client ++ssp-client 7801 udp Secure Server Protocol - [Rick_Macchio] [Rick_Macchio] 2006-11 ++ client ++ 7802-7809 Unassigned ++rbt-wanopt 7810 tcp Riverbed WAN Optimization [Vladimir_Legalov_2] [Vladimir_Legalov_2] 2007-09-04 ++ Protocol ++rbt-wanopt 7810 udp Riverbed WAN Optimization [Vladimir_Legalov_2] [Vladimir_Legalov_2] 2007-09-04 ++ Protocol ++ 7811-7844 Unassigned ++apc-7845 7845 tcp APC 7845 [American_Power_Conve] [American_Power_Conve] ++apc-7845 7845 udp APC 7845 [American_Power_Conve] [American_Power_Conve] ++apc-7846 7846 tcp APC 7846 [American_Power_Conve] [American_Power_Conve] ++apc-7846 7846 udp APC 7846 [American_Power_Conve] [American_Power_Conve] ++ 7847-7868 Unassigned ++mobileanalyzer 7869 tcp MobileAnalyzer& [Jonas_Gyllensvaan] [Jonas_Gyllensvaan] 2009-04-27 ++ MobileMonitor ++ 7869 udp Reserved ++rbt-smc 7870 tcp Riverbed Steelhead Mobile [Gabriel_Levy] [Gabriel_Levy] 2008-08-29 ++ Service ++ 7870 udp Reserved ++mdm 7871 tcp Mobile Device Management [Dan_Harkins] [Dan_Harkins] 2011-08-15 ++ 7871 udp Reserved ++ 7872 tcp Reserved ++mipv6tls 7872 udp TLS-based Mobile IPv6 [IESG] [IETF_Chair] 2012-04-12 [RFC6618] ++ Security ++ 7873-7879 Unassigned ++pss 7880 tcp Pearson [Pearson] [Pearson] 2008-01-17 ++pss 7880 udp Pearson [Pearson] [Pearson] 2008-01-17 ++ 7881-7886 Unassigned ++ubroker 7887 tcp Universal Broker [Nathan_Hammond] [Nathan_Hammond] 2005-10 ++ubroker 7887 udp Universal Broker [Nathan_Hammond] [Nathan_Hammond] 2005-10 ++ 7888-7899 Unassigned ++mevent 7900 tcp Multicast Event [YoonSoo_Kim] [YoonSoo_Kim] 2006-05 ++mevent 7900 udp Multicast Event [YoonSoo_Kim] [YoonSoo_Kim] 2006-05 ++tnos-sp 7901 tcp TNOS Service Protocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++tnos-sp 7901 udp TNOS Service Protocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++tnos-dp 7902 tcp TNOS shell Protocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++tnos-dp 7902 udp TNOS shell Protocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++tnos-dps 7903 tcp TNOS Secure DiaguardProtocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++tnos-dps 7903 udp TNOS Secure DiaguardProtocol [Rene_Kurt] [Rene_Kurt] 2005-08 ++ 7904-7912 Unassigned ++qo-secure 7913 tcp QuickObjects secure port [Jonas_Bovin] [Jonas_Bovin] ++qo-secure 7913 udp QuickObjects secure port [Jonas_Bovin] [Jonas_Bovin] ++ 7914-7931 Unassigned ++t2-drm 7932 tcp Tier 2 Data Resource Manager [Peter_Carlson] [Peter_Carlson] ++t2-drm 7932 udp Tier 2 Data Resource Manager [Peter_Carlson] [Peter_Carlson] ++t2-brm 7933 tcp Tier 2 Business Rules [Peter_Carlson] [Peter_Carlson] ++ Manager ++t2-brm 7933 udp Tier 2 Business Rules [Peter_Carlson] [Peter_Carlson] ++ Manager ++ 7934-7966 Unassigned ++supercell 7967 tcp Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] ++supercell 7967 udp Supercell [Kevin_Nakagawa] [Kevin_Nakagawa] ++ 7968-7978 Unassigned ++micromuse-ncps 7979 tcp Micromuse-ncps [Hing_Wing_To] [Hing_Wing_To] ++micromuse-ncps 7979 udp Micromuse-ncps [Hing_Wing_To] [Hing_Wing_To] ++quest-vista 7980 tcp Quest Vista [Preston_Bannister] [Preston_Bannister] ++quest-vista 7980 udp Quest Vista [Preston_Bannister] [Preston_Bannister] ++sossd-collect 7981 tcp Spotlight on SQL Server [Rob_Griffin_2] [Rob_Griffin_2] 2010-08-30 ++ Desktop Collect ++ 7981 udp Reserved ++sossd-agent 7982 tcp Spotlight on SQL Server [Rob_Griffin_2] [Rob_Griffin_2] 2010-09-13 ++ Desktop Agent ++sossd-disc 7982 udp Spotlight on SQL Server [Rob_Griffin_2] [Rob_Griffin_2] 2010-09-13 ++ Desktop Agent Discovery ++ 7983-7997 Unassigned ++pushns 7997 tcp PUSH Notification Service [Tristan_Seifert] [Tristan_Seifert] 2011-01-31 ++ 7997 udp Reserved ++ 7998 tcp Reserved ++usicontentpush 7998 udp USI Content Push Service [Prakash_Iyer] [Prakash_Iyer] 2009-08-10 ++irdmi2 7999 tcp iRDMI2 ++irdmi2 7999 udp iRDMI2 ++irdmi 8000 tcp iRDMI [Gil_Shafriri] [Gil_Shafriri] ++irdmi 8000 udp iRDMI [Gil_Shafriri] [Gil_Shafriri] ++vcom-tunnel 8001 tcp VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] ++vcom-tunnel 8001 udp VCOM Tunnel [Mark_Lewandowski] [Mark_Lewandowski] ++teradataordbms 8002 tcp Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] ++teradataordbms 8002 udp Teradata ORDBMS [Curt_Ellmann] [Curt_Ellmann] ++mcreport 8003 tcp Mulberry Connect Reporting [Dave_Stoneham] [Dave_Stoneham] 2008-03-10 ++ Service ++mcreport 8003 udp Mulberry Connect Reporting [Dave_Stoneham] [Dave_Stoneham] 2008-03-10 ++ Service ++ 8004 Unassigned ++mxi 8005 tcp MXI Generation II for z/OS [Rob_Scott] [Rob_Scott] 2007-05 ++mxi 8005 udp MXI Generation II for z/OS [Rob_Scott] [Rob_Scott] 2007-05 ++ 8006-8007 Unassigned ++http-alt 8008 tcp HTTP Alternate [James_Gettys] [James_Gettys] ++http-alt 8008 udp HTTP Alternate [James_Gettys] [James_Gettys] ++ 8009-8018 Unassigned ++qbdb 8019 tcp QB DB Dynamic Port [Sridhar_Krishnamurth] [Sridhar_Krishnamurth] 2008-02-15 ++qbdb 8019 udp QB DB Dynamic Port [Sridhar_Krishnamurth] [Sridhar_Krishnamurth] 2008-02-15 ++intu-ec-svcdisc 8020 tcp Intuit Entitlement Service [Daniel_C_McGloin] [Daniel_C_McGloin] 2005-05 ++ and Discovery ++intu-ec-svcdisc 8020 udp Intuit Entitlement Service [Daniel_C_McGloin] [Daniel_C_McGloin] 2005-05 ++ and Discovery ++intu-ec-client 8021 tcp Intuit Entitlement Client [Daniel_C_McGloin] [Daniel_C_McGloin] 2005-05 ++intu-ec-client 8021 udp Intuit Entitlement Client [Daniel_C_McGloin] [Daniel_C_McGloin] 2005-05 ++oa-system 8022 tcp oa-system [Marie_France_Dubreui] [Marie_France_Dubreui] ++oa-system 8022 udp oa-system [Marie_France_Dubreui] [Marie_France_Dubreui] ++ 8023-8024 Unassigned ++ca-audit-da 8025 tcp CA Audit Distribution Agent [Henning_Smith] [Henning_Smith] 2006-07 ++ca-audit-da 8025 udp CA Audit Distribution Agent [Henning_Smith] [Henning_Smith] 2006-07 ++ca-audit-ds 8026 tcp CA Audit Distribution Server [Henning_Smith] [Henning_Smith] 2006-07 ++ca-audit-ds 8026 udp CA Audit Distribution Server [Henning_Smith] [Henning_Smith] 2006-07 ++ 8027-8031 Unassigned ++pro-ed 8032 tcp ProEd ++pro-ed 8032 udp ProEd ++mindprint 8033 tcp MindPrint [Larry_Tusoni] [Larry_Tusoni] ++mindprint 8033 udp MindPrint [Larry_Tusoni] [Larry_Tusoni] ++vantronix-mgmt 8034 tcp .vantronix Management [Reyk_Floeter] [Reyk_Floeter] 2008-02-27 ++vantronix-mgmt 8034 udp .vantronix Management [Reyk_Floeter] [Reyk_Floeter] 2008-02-27 ++ 8035-8039 Unassigned ++ampify 8040 tcp Ampify Messaging Protocol [Tav_Espian] [Tav_Espian] 2010-08-10 ++ampify 8040 udp Ampify Messaging Protocol [Tav_Espian] [Tav_Espian] 2010-08-10 ++ 8041 Unassigned ++fs-agent 8042 tcp FireScope Agent [Matt_Rogers] [Matt_Rogers] 2008-10-16 ++ 8042 udp Reserved ++fs-server 8043 tcp FireScope Server [Matt_Rogers] [Matt_Rogers] 2008-10-16 ++ 8043 udp Reserved ++fs-mgmt 8044 tcp FireScope Management [Matt_Rogers] [Matt_Rogers] 2008-10-16 ++ Interface ++ 8044 udp Reserved ++ 8045-8050 Unassigned ++rocrail 8051 tcp Rocrail Client Service [Rob_Versluis] [Rob_Versluis] 2011-05-23 ++ 8051 udp Reserved ++senomix01 8052 tcp Senomix Timesheets Server [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++senomix01 8052 udp Senomix Timesheets Server [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++senomix02 8053 tcp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix02 8053 udp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix03 8054 tcp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix03 8054 udp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix04 8055 tcp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix04 8055 udp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix05 8056 tcp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix05 8056 udp Senomix Timesheets Server [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix06 8057 tcp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix06 8057 udp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix07 8058 tcp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix07 8058 udp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix08 8059 tcp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++senomix08 8059 udp Senomix Timesheets Client [1 [Charles_O_Dale] [Charles_O_Dale] 2006-07 ++ year assignment] ++ 8060-8073 Unassigned ++gadugadu 8074 tcp Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05 ++gadugadu 8074 udp Gadu-Gadu [Marcin_Gozdalik] [Marcin_Gozdalik] 2006-05 ++ 8075-8079 Unassigned ++http-alt 8080 tcp HTTP Alternate (see port 80) [Stephen_Casner] [Stephen_Casner] ++http-alt 8080 udp HTTP Alternate (see port 80) [Stephen_Casner] [Stephen_Casner] ++sunproxyadmin 8081 tcp Sun Proxy Admin Service [Arvind_Srinivasan] [Arvind_Srinivasan] 2005-08 ++sunproxyadmin 8081 udp Sun Proxy Admin Service [Arvind_Srinivasan] [Arvind_Srinivasan] 2005-08 ++us-cli 8082 tcp Utilistor (Client) [Andy_Brewerton] [Andy_Brewerton] 2005-08 ++us-cli 8082 udp Utilistor (Client) [Andy_Brewerton] [Andy_Brewerton] 2005-08 ++us-srv 8083 tcp Utilistor (Server) [Andy_Brewerton] [Andy_Brewerton] 2005-08 ++us-srv 8083 udp Utilistor (Server) [Andy_Brewerton] [Andy_Brewerton] 2005-08 ++ 8084-8085 Unassigned ++d-s-n 8086 tcp Distributed SCADA Networking [Gary_Hampton] [Gary_Hampton] 2008-02-27 ++ Rendezvous Port ++d-s-n 8086 udp Distributed SCADA Networking [Gary_Hampton] [Gary_Hampton] 2008-02-27 ++ Rendezvous Port ++simplifymedia 8087 tcp Simplify Media SPP Protocol [Emmanuel_Saint_Loube] [Emmanuel_Saint_Loube] 2008-08-08 ++simplifymedia 8087 udp Simplify Media SPP Protocol [Emmanuel_Saint_Loube] [Emmanuel_Saint_Loube] 2008-08-08 ++radan-http 8088 tcp Radan HTTP [Steve_Hay] [Steve_Hay] 2008-06-13 ++radan-http 8088 udp Radan HTTP [Steve_Hay] [Steve_Hay] 2008-06-13 ++ 8089-8090 Unassigned ++jamlink 8091 tcp Jam Link Framework [Evgeniy_Filatov] [Evgeniy_Filatov] 2009-11-25 ++ 8091 udp Reserved ++ 8092-8096 Unassigned ++sac 8097 tcp SAC Port Id [Girish_Bhat] [Girish_Bhat] 2006-04 ++sac 8097 udp SAC Port Id [Girish_Bhat] [Girish_Bhat] 2006-04 ++ 8098-8099 Unassigned ++xprint-server 8100 tcp Xprint Server [John_McKernan] [John_McKernan] ++xprint-server 8100 udp Xprint Server [John_McKernan] [John_McKernan] ++ldoms-migr 8101 tcp Logical Domains Migration [Liam_Merwick] [Liam_Merwick] 2009-01-16 ++ 8101 udp Reserved ++ 8102-8114 Unassigned ++mtl8000-matrix 8115 tcp MTL8000 Matrix [David_Pinch] [David_Pinch] 2002-04 ++mtl8000-matrix 8115 udp MTL8000 Matrix [David_Pinch] [David_Pinch] 2002-04 ++cp-cluster 8116 tcp Check Point Clustering [Roni_Moshitzky] [Roni_Moshitzky] ++cp-cluster 8116 udp Check Point Clustering [Roni_Moshitzky] [Roni_Moshitzky] ++ 8117 Unassigned ++privoxy 8118 tcp Privoxy HTTP proxy [Andreas_Oesterhelt] [Andreas_Oesterhelt] 2002-06 ++privoxy 8118 udp Privoxy HTTP proxy [Andreas_Oesterhelt] [Andreas_Oesterhelt] 2002-06 ++ 8119-8120 Unassigned ++apollo-data 8121 tcp Apollo Data Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++apollo-data 8121 udp Apollo Data Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++apollo-admin 8122 tcp Apollo Admin Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++apollo-admin 8122 udp Apollo Admin Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++ 8123-8127 Unassigned ++paycash-online 8128 tcp PayCash Online Protocol [MegaZone] [MegaZone] 2005-08 ++paycash-online 8128 udp PayCash Online Protocol [MegaZone] [MegaZone] 2005-08 ++paycash-wbp 8129 tcp PayCash Wallet-Browser [MegaZone] [MegaZone] 2005-08 ++paycash-wbp 8129 udp PayCash Wallet-Browser [MegaZone] [MegaZone] 2005-08 ++indigo-vrmi 8130 tcp INDIGO-VRMI [Colin_Caughie] [Colin_Caughie] ++indigo-vrmi 8130 udp INDIGO-VRMI [Colin_Caughie] [Colin_Caughie] ++indigo-vbcp 8131 tcp INDIGO-VBCP [Colin_Caughie] [Colin_Caughie] ++indigo-vbcp 8131 udp INDIGO-VBCP [Colin_Caughie] [Colin_Caughie] ++dbabble 8132 tcp dbabble [Chris_Pugmire] [Chris_Pugmire] ++dbabble 8132 udp dbabble [Chris_Pugmire] [Chris_Pugmire] ++ 8133-8147 Unassigned ++isdd 8148 tcp i-SDD file transfer [Frank_Waarsenburg] [Frank_Waarsenburg] 2004-11 ++isdd 8148 udp i-SDD file transfer [Frank_Waarsenburg] [Frank_Waarsenburg] 2004-11 ++ 8149 tcp Reserved ++eor-game 8149 udp Edge of Reality game data [Sky_Schulz] [Sky_Schulz] 2011-05-09 ++ 8150-8159 Unassigned ++patrol 8160 tcp Patrol [Portnoy_Boxman] [Portnoy_Boxman] ++patrol 8160 udp Patrol [Portnoy_Boxman] [Portnoy_Boxman] ++patrol-snmp 8161 tcp Patrol SNMP [Portnoy_Boxman] [Portnoy_Boxman] ++patrol-snmp 8161 udp Patrol SNMP [Portnoy_Boxman] [Portnoy_Boxman] ++ 8162-8180 Unassigned ++intermapper 8181 tcp Intermapper network [William_Fisher] [William_Fisher] 2011-05-09 ++ management system ++ 8181 udp Reserved ++vmware-fdm 8182 tcp VMware Fault Domain Manager [Ron_Passerini] [Ron_Passerini] 2010-04-27 ++vmware-fdm 8182 udp VMware Fault Domain Manager [Ron_Passerini] [Ron_Passerini] 2010-04-27 ++proremote 8183 tcp ProRemote [Alex_Lelievre] [Alex_Lelievre] 2009-08-18 ++ 8183 udp Reserved ++itach 8184 tcp Remote iTach Connection [Barend_Jacobus_van_d] [Barend_Jacobus_van_d] 2010-04-27 ++itach 8184 udp Remote iTach Connection [Barend_Jacobus_van_d] [Barend_Jacobus_van_d] 2010-04-27 ++ 8185-8191 Unassigned ++spytechphone 8192 tcp SpyTech Phone Service [Bill_Kay] [Bill_Kay] 2006-04 ++spytechphone 8192 udp SpyTech Phone Service [Bill_Kay] [Bill_Kay] 2006-04 ++ 8193 Unassigned ++blp1 8194 tcp Bloomberg data API [Albert_Hou] [Albert_Hou] 2006-05 ++blp1 8194 udp Bloomberg data API [Albert_Hou] [Albert_Hou] 2006-05 ++blp2 8195 tcp Bloomberg feed [Albert_Hou] [Albert_Hou] 2006-05 ++blp2 8195 udp Bloomberg feed [Albert_Hou] [Albert_Hou] 2006-05 ++ 8196-8198 Unassigned ++vvr-data 8199 tcp VVR DATA [Ming_Xu] [Ming_Xu] ++vvr-data 8199 udp VVR DATA [Ming_Xu] [Ming_Xu] ++trivnet1 8200 tcp TRIVNET [Saar_Wilf] [Saar_Wilf] ++trivnet1 8200 udp TRIVNET [Saar_Wilf] [Saar_Wilf] ++trivnet2 8201 tcp TRIVNET [Saar_Wilf] [Saar_Wilf] ++trivnet2 8201 udp TRIVNET [Saar_Wilf] [Saar_Wilf] ++ 8202 tcp Reserved ++aesop 8202 udp Audio+Ethernet Standard Open [POWERSOFT_SRL] [Paolo_Desii][Claudio_Lastrucci] 2012-01-03 ++ Protocol ++ 8203-8203 Unassigned ++lm-perfworks 8204 tcp LM Perfworks [Chris_Flynn] [Chris_Flynn] ++lm-perfworks 8204 udp LM Perfworks [Chris_Flynn] [Chris_Flynn] ++lm-instmgr 8205 tcp LM Instmgr [Chris_Flynn] [Chris_Flynn] ++lm-instmgr 8205 udp LM Instmgr [Chris_Flynn] [Chris_Flynn] ++lm-dta 8206 tcp LM Dta [Chris_Flynn] [Chris_Flynn] ++lm-dta 8206 udp LM Dta [Chris_Flynn] [Chris_Flynn] ++lm-sserver 8207 tcp LM SServer [Chris_Flynn] [Chris_Flynn] ++lm-sserver 8207 udp LM SServer [Chris_Flynn] [Chris_Flynn] ++lm-webwatcher 8208 tcp LM Webwatcher [Chris_Flynn] [Chris_Flynn] ++lm-webwatcher 8208 udp LM Webwatcher [Chris_Flynn] [Chris_Flynn] ++ 8209-8229 Unassigned ++rexecj 8230 tcp RexecJ Server [Curtiss_Howard] [Curtiss_Howard] 2004-11 ++rexecj 8230 udp RexecJ Server [Curtiss_Howard] [Curtiss_Howard] 2004-11 ++ 8231-8242 Unassigned ++synapse-nhttps 8243 tcp Synapse Non Blocking HTTPS [Ruwan_Linton] [Ruwan_Linton] 2008-07-10 ++synapse-nhttps 8243 udp Synapse Non Blocking HTTPS [Ruwan_Linton] [Ruwan_Linton] 2008-07-10 ++ 8244-8275 Unassigned ++pando-sec 8276 tcp Pando Media Controlled [Laird_Popkin] [Laird_Popkin] 2008-02-27 ++ Distribution ++pando-sec 8276 udp Pando Media Controlled [Laird_Popkin] [Laird_Popkin] 2008-02-27 ++ Distribution ++ 8277-8279 Unassigned ++synapse-nhttp 8280 tcp Synapse Non Blocking HTTP [Ruwan_Linton] [Ruwan_Linton] 2008-06-05 ++synapse-nhttp 8280 udp Synapse Non Blocking HTTP [Ruwan_Linton] [Ruwan_Linton] 2008-06-05 ++ 8281-8291 Unassigned ++blp3 8292 tcp Bloomberg professional [Albert_Hou] [Albert_Hou] 2006-05 ++blp3 8292 udp Bloomberg professional [Albert_Hou] [Albert_Hou] 2006-05 ++hiperscan-id 8293 tcp Hiperscan Identification [Thomas_Klose] [Thomas_Klose] 2009-12-15 ++ Service ++ 8293 udp Reserved ++blp4 8294 tcp Bloomberg intelligent client [Albert_Hou] [Albert_Hou] 2006-05 ++blp4 8294 udp Bloomberg intelligent client [Albert_Hou] [Albert_Hou] 2006-05 ++ 8295-8299 Unassigned ++tmi 8300 tcp Transport Management [Steve_Kneizys] [Steve_Kneizys] 2006-11 ++ Interface ++tmi 8300 udp Transport Management [Steve_Kneizys] [Steve_Kneizys] 2006-11 ++ Interface ++amberon 8301 tcp Amberon PPC/PPS [Ronald_Snyder] [Ronald_Snyder] 2006-03 ++amberon 8301 udp Amberon PPC/PPS [Ronald_Snyder] [Ronald_Snyder] 2006-03 ++ 8302-8319 Unassigned ++tnp-discover 8320 tcp Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 ++tnp-discover 8320 udp Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 ++tnp 8321 tcp Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 ++tnp 8321 udp Thin(ium) Network Protocol [Aly_Orady] [Aly_Orady] 2007-08-07 ++ 8322-8350 Unassigned ++server-find 8351 tcp Server Find [Chris_Brown] [Chris_Brown] ++server-find 8351 udp Server Find [Chris_Brown] [Chris_Brown] ++ 8352-8375 Unassigned ++cruise-enum 8376 tcp Cruise ENUM [Steve_Husak] [Steve_Husak] ++cruise-enum 8376 udp Cruise ENUM [Steve_Husak] [Steve_Husak] ++cruise-swroute 8377 tcp Cruise SWROUTE [Steve_Husak] [Steve_Husak] ++cruise-swroute 8377 udp Cruise SWROUTE [Steve_Husak] [Steve_Husak] ++cruise-config 8378 tcp Cruise CONFIG [Steve_Husak] [Steve_Husak] ++cruise-config 8378 udp Cruise CONFIG [Steve_Husak] [Steve_Husak] ++cruise-diags 8379 tcp Cruise DIAGS [Steve_Husak] [Steve_Husak] ++cruise-diags 8379 udp Cruise DIAGS [Steve_Husak] [Steve_Husak] ++cruise-update 8380 tcp Cruise UPDATE [Steve_Husak] [Steve_Husak] ++cruise-update 8380 udp Cruise UPDATE [Steve_Husak] [Steve_Husak] ++ 8381-8382 Unassigned ++m2mservices 8383 tcp M2m Services [Carlos_Arteaga_2] [Carlos_Arteaga_2] 2004-11 ++m2mservices 8383 udp M2m Services [Carlos_Arteaga_2] [Carlos_Arteaga_2] 2004-11 ++ 8384-8399 Unassigned ++cvd 8400 tcp cvd [Aaron_Bilbrey] [Aaron_Bilbrey] ++cvd 8400 udp cvd [Aaron_Bilbrey] [Aaron_Bilbrey] ++sabarsd 8401 tcp sabarsd [Aaron_Bilbrey] [Aaron_Bilbrey] ++sabarsd 8401 udp sabarsd [Aaron_Bilbrey] [Aaron_Bilbrey] ++abarsd 8402 tcp abarsd [Aaron_Bilbrey] [Aaron_Bilbrey] ++abarsd 8402 udp abarsd [Aaron_Bilbrey] [Aaron_Bilbrey] ++admind 8403 tcp admind [Aaron_Bilbrey] [Aaron_Bilbrey] ++admind 8403 udp admind [Aaron_Bilbrey] [Aaron_Bilbrey] ++svcloud 8404 tcp SuperVault Cloud [Nine_Technology_LLC] [Alex_Stoev] 2009-09-14 2011-08-01 ++ 8404 udp Reserved ++svbackup 8405 tcp SuperVault Backup [Nine_Technology_LLC] [Alex_Stoev] 2009-09-14 2011-08-01 ++ 8405 udp Reserved ++ 8406-8415 Unassigned ++espeech 8416 tcp eSpeech Session Protocol [Scott_Tarone] [Scott_Tarone] 2002-11 ++espeech 8416 udp eSpeech Session Protocol [Scott_Tarone] [Scott_Tarone] 2002-11 ++espeech-rtp 8417 tcp eSpeech RTP Protocol [Scott_Tarone] [Scott_Tarone] 2003-04 ++espeech-rtp 8417 udp eSpeech RTP Protocol [Scott_Tarone] [Scott_Tarone] 2003-04 ++ 8418-8441 Unassigned ++cybro-a-bus 8442 tcp CyBro A-bus Protocol [Damir_Skrjanec] [Damir_Skrjanec] 2007-05 ++cybro-a-bus 8442 udp CyBro A-bus Protocol [Damir_Skrjanec] [Damir_Skrjanec] 2007-05 ++pcsync-https 8443 tcp PCsync HTTPS ++pcsync-https 8443 udp PCsync HTTPS ++pcsync-http 8444 tcp PCsync HTTP [Katy_Lynn_McCullough] [Katy_Lynn_McCullough] ++pcsync-http 8444 udp PCsync HTTP [Katy_Lynn_McCullough] [Katy_Lynn_McCullough] ++ 8445-8449 Unassigned ++npmp 8450 tcp npmp [Ian_Chard] [Ian_Chard] ++npmp 8450 udp npmp [Ian_Chard] [Ian_Chard] ++ 8451-8469 Unassigned ++cisco-avp 8470 tcp Cisco Address Validation [Cullen_Jennings] [Cullen_Jennings] 2009-02-13 ++ Protocol ++ 8470 udp Reserved ++pim-port 8471 tcp PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC6559] ++pim-port 8471 sctp PIM over Reliable Transport [IESG] [IETF_Chair] 2008-08-21 [RFC6559] ++ 8471 udp Reserved ++otv 8472 tcp Overlay Transport [Dino_Farinacci] [Dino_Farinacci] 2008-01-07 ++ Virtualization (OTV) ++otv 8472 udp Overlay Transport [Dino_Farinacci] [Dino_Farinacci] 2008-01-07 ++ Virtualization (OTV) ++vp2p 8473 tcp Virtual Point to Point [Jerome_Grimbert] [Jerome_Grimbert] ++vp2p 8473 udp Virtual Point to Point [Jerome_Grimbert] [Jerome_Grimbert] ++noteshare 8474 tcp AquaMinds NoteShare [Michael_McNabb] [Michael_McNabb] 2005-10 ++noteshare 8474 udp AquaMinds NoteShare [Michael_McNabb] [Michael_McNabb] 2005-10 ++ 8475-8499 Unassigned ++fmtp 8500 tcp Flight Message Transfer [Eivan_Cerasi] [Eivan_Cerasi] 2003-12 ++ Protocol ++fmtp 8500 udp Flight Message Transfer [Eivan_Cerasi] [Eivan_Cerasi] 2003-12 ++ Protocol ++cmtp-mgt 8501 tcp CYTEL Message Transfer ++ Management ++cmtp-av 8501 udp CYTEL Message Transfer Audio [Frank_Jakel] [Frank_Jakel] 2011-04-29 ++ and Video ++ 8502-8553 Unassigned ++rtsp-alt 8554 tcp RTSP Alternate (see port [Stephen_Casner_2] [Stephen_Casner_2] ++ 554) ++rtsp-alt 8554 udp RTSP Alternate (see port [Stephen_Casner_2] [Stephen_Casner_2] ++ 554) ++d-fence 8555 tcp SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01 ++d-fence 8555 udp SYMAX D-FENCE [Thomas_Geisel] [Thomas_Geisel] 2003-01 ++ 8556-8566 Unassigned ++oap-admin 8567 tcp Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2005-08 ++ Administration ++oap-admin 8567 udp Object Access Protocol [Bryant_Eastham] [Bryant_Eastham] 2005-08 ++ Administration ++ 8568-8599 Unassigned ++asterix 8600 tcp Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11 ++asterix 8600 udp Surveillance Data [Eivan_Cerasi] [Eivan_Cerasi] 2005-11 ++ 8601-8608 Unassigned ++ 8609 tcp Reserved ++canon-cpnp-disc 8609 tcp Canon CPNP discovery [Canon_Inc] [Ryusuke_Okuhara] 2012-06-08 ++canon-mfnp 8610 tcp Canon MFNP Service [Ritsuto_Sako] [Ritsuto_Sako] 2009-05-04 ++canon-mfnp 8610 udp Canon MFNP Service [Ritsuto_Sako] [Ritsuto_Sako] 2009-05-04 ++canon-bjnp1 8611 tcp Canon BJNP Port 1 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp1 8611 udp Canon BJNP Port 1 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp2 8612 tcp Canon BJNP Port 2 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp2 8612 udp Canon BJNP Port 2 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp3 8613 tcp Canon BJNP Port 3 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp3 8613 udp Canon BJNP Port 3 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp4 8614 tcp Canon BJNP Port 4 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++canon-bjnp4 8614 udp Canon BJNP Port 4 [Atsushi_Nakamura] [Atsushi_Nakamura] 2003-11 ++imink 8615 tcp Imink Service Control [Canon_Inc] [KEN_ICHI_FUJII] 2011-10-10 ++ 8615 udp Reserved ++ 8616-8674 Unassigned ++ Motorola Solutions Customer ++msi-cps-rm 8675 tcp Programming Software for [Motorola_Solutions_Inc] [Jenish_Amin] 2012-03-14 ++ Radio Management ++ Motorola Solutions Customer ++msi-cps-rm-disc 8675 udp Programming Software for [Motorola_Solutions_Inc] [Jenish_Amin] 2012-03-14 ++ Radio Management Discovery ++ 8676-8685 Unassigned ++sun-as-jmxrmi 8686 tcp Sun App Server - JMX/RMI [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++sun-as-jmxrmi 8686 udp Sun App Server - JMX/RMI [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++ 8687-8698 Unassigned ++vnyx 8699 tcp VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11 ++vnyx 8699 udp VNYX Primary Port [Gregg_Green] [Gregg_Green] 2004-11 ++ 8700-8731 Unassigned ++ 8732 tcp Reserved ++dtp-net 8732 udp DASGIP Net Services [Dr_Matthias_Arnold] [Dr_Matthias_Arnold] 2009-03-23 ++ibus 8733 tcp iBus [Silvano_Maffeis] [Silvano_Maffeis] ++ibus 8733 udp iBus [Silvano_Maffeis] [Silvano_Maffeis] ++ 8734-8762 Unassigned ++mc-appserver 8763 tcp MC-APPSERVER [Romeo_Kasanwidjojo] [Romeo_Kasanwidjojo] ++mc-appserver 8763 udp MC-APPSERVER [Romeo_Kasanwidjojo] [Romeo_Kasanwidjojo] ++openqueue 8764 tcp OPENQUEUE [Matt_Jensen] [Matt_Jensen] ++openqueue 8764 udp OPENQUEUE [Matt_Jensen] [Matt_Jensen] ++ultraseek-http 8765 tcp Ultraseek HTTP [Walter_Underwood] [Walter_Underwood] ++ultraseek-http 8765 udp Ultraseek HTTP [Walter_Underwood] [Walter_Underwood] ++ 8766-8769 Unassigned ++dpap 8770 tcp Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, ++ Protocol (iPhoto) Machine Name, Password ++dpap 8770 udp Digital Photo Access [Amandeep_Jawa_2] [Amandeep_Jawa_2] 2004-11 Defined TXT keys: txtvers, Version, iPSh Version, Machine ID, ++ Protocol (iPhoto) Machine Name, Password ++ 8771-8785 Unassigned ++msgclnt 8786 tcp Message Client ++msgclnt 8786 udp Message Client ++msgsrvr 8787 tcp Message Server [Michael_O_Brien] [Michael_O_Brien] 2003-03 ++msgsrvr 8787 udp Message Server [Michael_O_Brien] [Michael_O_Brien] 2003-03 ++ 8788-8792 Unassigned ++acd-pm 8793 tcp Accedian Performance [Marco_Mascitto] [Marco_Mascitto] ++ Measurement ++acd-pm 8793 udp Accedian Performance [Marco_Mascitto] [Marco_Mascitto] ++ Measurement ++ 8794-8799 Unassigned ++sunwebadmin 8800 tcp Sun Web Server Admin Service [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12 ++sunwebadmin 8800 udp Sun Web Server Admin Service [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12 ++ UNAUTHORIZED ++ USE: Port ++ 8801-8803 Unassigned 8801 by IBM ++ z/OS RMF ++ protocol ++truecm 8804 tcp truecm [Scott_Kramer] [Scott_Kramer] ++truecm 8804 udp truecm [Scott_Kramer] [Scott_Kramer] ++ 8805-8872 Unassigned ++dxspider 8873 tcp dxspider linking protocol [Dirk_Koopman] [Dirk_Koopman] 2005-08 ++dxspider 8873 udp dxspider linking protocol [Dirk_Koopman] [Dirk_Koopman] 2005-08 ++ 8874-8879 Unassigned ++cddbp-alt 8880 tcp CDDBP [Steve_Scherf] [Steve_Scherf] ++cddbp-alt 8880 udp CDDBP [Steve_Scherf] [Steve_Scherf] ++ 8881-8882 Unassigned ++secure-mqtt 8883 tcp Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 ++secure-mqtt 8883 udp Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27 ++ 8884-8887 Unassigned ++ddi-tcp-1 8888 tcp NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] ++ddi-udp-1 8888 udp NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] ++ddi-tcp-2 8889 tcp Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] ++ddi-udp-2 8889 udp NewsEDGE server broadcast [Fred_Yao] [Fred_Yao] ++ddi-tcp-3 8890 tcp Desktop Data TCP 2 [Fred_Yao] [Fred_Yao] ++ddi-udp-3 8890 udp NewsEDGE client broadcast [Fred_Yao] [Fred_Yao] ++ddi-tcp-4 8891 tcp Desktop Data TCP 3: NESS [Fred_Yao] [Fred_Yao] ++ application ++ddi-udp-4 8891 udp Desktop Data UDP 3: NESS [Fred_Yao] [Fred_Yao] ++ application ++ddi-tcp-5 8892 tcp Desktop Data TCP 4: FARM [Fred_Yao] [Fred_Yao] ++ product ++ddi-udp-5 8892 udp Desktop Data UDP 4: FARM [Fred_Yao] [Fred_Yao] ++ product ++ddi-tcp-6 8893 tcp Desktop Data TCP 5: [Fred_Yao] [Fred_Yao] ++ NewsEDGE/Web application ++ddi-udp-6 8893 udp Desktop Data UDP 5: [Fred_Yao] [Fred_Yao] ++ NewsEDGE/Web application ++ddi-tcp-7 8894 tcp Desktop Data TCP 6: COAL [Fred_Yao] [Fred_Yao] ++ application ++ddi-udp-7 8894 udp Desktop Data UDP 6: COAL [Fred_Yao] [Fred_Yao] ++ application ++ 8895-8898 Unassigned ++ospf-lite 8899 tcp ospf-lite [Matthew_Thomas] [Matthew_Thomas] 2008-01-07 ++ospf-lite 8899 udp ospf-lite [Matthew_Thomas] [Matthew_Thomas] 2008-01-07 ++jmb-cds1 8900 tcp JMB-CDS 1 [Curtis_Bray] [Curtis_Bray] ++jmb-cds1 8900 udp JMB-CDS 1 [Curtis_Bray] [Curtis_Bray] ++jmb-cds2 8901 tcp JMB-CDS 2 [Curtis_Bray] [Curtis_Bray] ++jmb-cds2 8901 udp JMB-CDS 2 [Curtis_Bray] [Curtis_Bray] ++ 8902-8909 Unassigned ++manyone-http 8910 tcp manyone-http [Matt_King] [Matt_King] 2002-04 ++manyone-http 8910 udp manyone-http [Matt_King] [Matt_King] 2002-04 ++manyone-xml 8911 tcp manyone-xml [Matt_King] [Matt_King] 2002-04 ++manyone-xml 8911 udp manyone-xml [Matt_King] [Matt_King] 2002-04 ++wcbackup 8912 tcp Windows Client Backup [Jim_Lyon] [Jim_Lyon] 2005-11 ++wcbackup 8912 udp Windows Client Backup [Jim_Lyon] [Jim_Lyon] 2005-11 ++dragonfly 8913 tcp Dragonfly System Service [Paul_Hodara] [Paul_Hodara] 2005-11 ++dragonfly 8913 udp Dragonfly System Service [Paul_Hodara] [Paul_Hodara] 2005-11 ++ 8914-8936 Unassigned ++twds 8937 tcp Transaction Warehouse Data [Lance_M_Steenson] [Lance_M_Steenson] 2009-09-18 ++ Service ++ 8937 udp Reserved ++ 8938-8952 Unassigned ++ub-dns-control 8953 tcp unbound dns nameserver [NLnet_Labs_Support] [NLnet_Labs_Support] 2011-05-10 2011-07-11 ++ control ++ 8953 udp Reserved ++cumulus-admin 8954 tcp Cumulus Admin Port [Thomas_Schleu] [Thomas_Schleu] ++cumulus-admin 8954 udp Cumulus Admin Port [Thomas_Schleu] [Thomas_Schleu] ++ 8955-8988 Unassigned ++sunwebadmins 8989 tcp Sun Web Server SSL Admin [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12 ++ Service ++sunwebadmins 8989 udp Sun Web Server SSL Admin [Jyri_J_Virkki] [Jyri_J_Virkki] 2005-12 ++ Service ++http-wmap 8990 tcp webmail HTTP service [Fred_Batty] [Fred_Batty] 2007-12-03 ++http-wmap 8990 udp webmail HTTP service [Fred_Batty] [Fred_Batty] 2007-12-03 ++https-wmap 8991 tcp webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03 ++https-wmap 8991 udp webmail HTTPS service [Fred_Batty] [Fred_Batty] 2007-12-03 ++ 8992-8998 Unassigned ++bctp 8999 tcp Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 ++bctp 8999 udp Brodos Crypto Trade Protocol [Alexander_Sahler] [Alexander_Sahler] 2002-02 ++cslistener 9000 tcp CSlistener [David_Jones] [David_Jones] ++cslistener 9000 udp CSlistener [David_Jones] [David_Jones] ++etlservicemgr 9001 tcp ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 ++etlservicemgr 9001 udp ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 ++dynamid 9002 tcp DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 ++dynamid 9002 udp DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03 ++ 9003-9005 Unassigned ++ 9006 De-Commissioned Port 2000-02-24 ++ 9007 tcp Reserved ++ogs-client 9007 udp Open Grid Services Client [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22 ++ogs-server 9008 tcp Open Grid Services Server [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22 ++ 9008 udp Reserved ++pichat 9009 tcp Pichat Server [Mark_Seuffert] [Mark_Seuffert] 2004-11 ++pichat 9009 udp Pichat Server [Mark_Seuffert] [Mark_Seuffert] 2004-11 ++sdr 9010 tcp Secure Data Replicator [Sufyan_Almajali] [Sufyan_Almajali] 2008-06-27 ++ Protocol ++ 9010 udp Reserved ++ 9011-9019 Unassigned ++tambora 9020 tcp TAMBORA [Jason_van_Zyl] [Jason_van_Zyl] 2002-03 ++tambora 9020 udp TAMBORA [Jason_van_Zyl] [Jason_van_Zyl] 2002-03 ++panagolin-ident 9021 tcp Pangolin Identification [William_Benner_2] [William_Benner_2] 2002-03 ++panagolin-ident 9021 udp Pangolin Identification [William_Benner_2] [William_Benner_2] 2002-03 ++paragent 9022 tcp PrivateArk Remote Agent [Gal_Cucuy] [Gal_Cucuy] 2002-03 ++paragent 9022 udp PrivateArk Remote Agent [Gal_Cucuy] [Gal_Cucuy] 2002-03 ++swa-1 9023 tcp Secure Web Access - 1 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-1 9023 udp Secure Web Access - 1 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-2 9024 tcp Secure Web Access - 2 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-2 9024 udp Secure Web Access - 2 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-3 9025 tcp Secure Web Access - 3 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-3 9025 udp Secure Web Access - 3 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-4 9026 tcp Secure Web Access - 4 [Tim_McGranaghan] [Tim_McGranaghan] ++swa-4 9026 udp Secure Web Access - 4 [Tim_McGranaghan] [Tim_McGranaghan] ++ 9027-9049 Unassigned ++versiera 9050 tcp Versiera Agent Listener [Frank_Pikelner] [Frank_Pikelner] 2010-01-15 ++ 9050 udp Reserved ++fio-cmgmt 9051 tcp Fusion-io Central Manager [Jim_Sermersheim] [Jim_Sermersheim] 2010-01-15 ++ Service ++ 9051 udp Reserved ++ 9052-9079 Unassigned ++glrpc 9080 tcp Groove GLRPC [Adrian_Popescu] [Adrian_Popescu] 2002-09 ++glrpc 9080 udp Groove GLRPC [Adrian_Popescu] [Adrian_Popescu] 2002-09 ++ 9081 Unassigned ++lcs-ap 9082 sctp LCS Application Protocol [Kimmo_Kymalainen] [Kimmo_Kymalainen] 2010-06-04 ++emc-pp-mgmtsvc 9083 tcp EMC PowerPath Mgmt Service [Jim_Perreault] [Jim_Perreault] 2010-06-04 ++ 9083 udp Reserved ++aurora 9084 tcp IBM AURORA Performance [Jeroen_Massar_2] [Jeroen_Massar_2] 2008-08-21 ++ Visualizer ++aurora 9084 udp IBM AURORA Performance [Jeroen_Massar_2] [Jeroen_Massar_2] 2008-08-21 ++ Visualizer ++aurora 9084 sctp IBM AURORA Performance [Jeroen_Massar_2] [Jeroen_Massar_2] 2008-08-21 ++ Visualizer ++ibm-rsyscon 9085 tcp IBM Remote System Console [William_LePera] [William_LePera] 2008-06-18 ++ibm-rsyscon 9085 udp IBM Remote System Console [William_LePera] [William_LePera] 2008-06-18 ++net2display 9086 tcp Vesa Net2Display [Kenneth_B_Ocheltree] [Kenneth_B_Ocheltree] 2008-01-07 ++net2display 9086 udp Vesa Net2Display [Kenneth_B_Ocheltree] [Kenneth_B_Ocheltree] 2008-01-07 ++classic 9087 tcp Classic Data Server [Paul_Cadarette] [Paul_Cadarette] 2007-01 ++classic 9087 udp Classic Data Server [Paul_Cadarette] [Paul_Cadarette] 2007-01 ++sqlexec 9088 tcp IBM Informix SQL Interface [Jonathan_Leffler] [Jonathan_Leffler] 2005-12 ++sqlexec 9088 udp IBM Informix SQL Interface [Jonathan_Leffler] [Jonathan_Leffler] 2005-12 ++sqlexec-ssl 9089 tcp IBM Informix SQL Interface - [Jonathan_Leffler] [Jonathan_Leffler] 2005-12 ++ Encrypted ++sqlexec-ssl 9089 udp IBM Informix SQL Interface - [Jonathan_Leffler] [Jonathan_Leffler] 2005-12 ++ Encrypted ++websm 9090 tcp WebSM [I_Hsing_Tsao] [I_Hsing_Tsao] ++websm 9090 udp WebSM [I_Hsing_Tsao] [I_Hsing_Tsao] ++xmltec-xmlmail 9091 tcp xmltec-xmlmail [Mitch_Kaufman] [Mitch_Kaufman] ++xmltec-xmlmail 9091 udp xmltec-xmlmail [Mitch_Kaufman] [Mitch_Kaufman] ++XmlIpcRegSvc 9092 tcp Xml-Ipc Server Reg [Casey_Harrington] [Casey_Harrington] 2006-01 ++XmlIpcRegSvc 9092 udp Xml-Ipc Server Reg [Casey_Harrington] [Casey_Harrington] 2006-01 ++copycat 9093 tcp Copycat database replication [Microtec_Informatique] [Raphael_Neve] 2012-03-15 ++ service ++ 9093 udp Reserved ++ 9094-9099 Unassigned ++hp-pdl-datastr 9100 tcp PDL Data Streaming Port [Shivaun_Albright] [Shivaun_Albright] 2002-04 ++hp-pdl-datastr 9100 udp PDL Data Streaming Port [Shivaun_Albright] [Shivaun_Albright] 2002-04 ++ The protocol name "pdl-datastream" is primarily registered ++pdl-datastream 9100 tcp Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow ++ a protocol to run on any port number, but the default port ++ for this protocol is 9100. ++ The protocol name "pdl-datastream" is primarily registered ++pdl-datastream 9100 udp Printer PDL Data Stream [Stuart_Cheshire_4] [Stuart_Cheshire_4] 2002-09 for use in DNS SRV records (RFC 2782). DNS SRV records allow ++ a protocol to run on any port number, but the default port ++ for this protocol is 9100. ++bacula-dir 9101 tcp Bacula Director [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++bacula-dir 9101 udp Bacula Director [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++bacula-fd 9102 tcp Bacula File Daemon [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++bacula-fd 9102 udp Bacula File Daemon [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++bacula-sd 9103 tcp Bacula Storage Daemon [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++bacula-sd 9103 udp Bacula Storage Daemon [Kern_Sibbald] [Kern_Sibbald] 2002-01 ++peerwire 9104 tcp PeerWire [Steven_Gerhardt] [Steven_Gerhardt] 2004-02 ++peerwire 9104 udp PeerWire [Steven_Gerhardt] [Steven_Gerhardt] 2004-02 ++xadmin 9105 tcp Xadmin Control Service [Ari SQRT'n Huisken <xadmin&huisken-systems.nl> 15 ++ June 2009] ++xadmin 9105 udp Xadmin Control Service [Ari SQRT'n Huisken <xadmin&huisken-systems.nl> 15 ++ June 2009] ++astergate 9106 tcp Astergate Control Service [Ari_Huisken] [Ari_Huisken] 2010-01-04 ++astergate-disc 9106 udp Astergate Discovery Service [Ari_Huisken] [Ari_Huisken] 2010-01-04 ++astergatefax 9107 tcp AstergateFax Control Service [Gijs_Middelkamp] [Gijs_Middelkamp] 2010-02-03 ++ 9107 udp Reserved ++ 9108-9118 Unassigned ++mxit 9119 tcp MXit Instant Messaging [Marnus_Freeman] [Marnus_Freeman] 2006-02 ++mxit 9119 udp MXit Instant Messaging [Marnus_Freeman] [Marnus_Freeman] 2006-02 ++ 9120-9130 Unassigned ++dddp 9131 tcp Dynamic Device Discovery [Shane_Dick] [Shane_Dick] 2005-08 ++dddp 9131 udp Dynamic Device Discovery [Shane_Dick] [Shane_Dick] 2005-08 ++ 9132-9159 Unassigned ++apani1 9160 tcp apani1 [Neal_Taylor] [Neal_Taylor] ++apani1 9160 udp apani1 [Neal_Taylor] [Neal_Taylor] ++apani2 9161 tcp apani2 [Neal_Taylor] [Neal_Taylor] ++apani2 9161 udp apani2 [Neal_Taylor] [Neal_Taylor] ++apani3 9162 tcp apani3 [Neal_Taylor] [Neal_Taylor] ++apani3 9162 udp apani3 [Neal_Taylor] [Neal_Taylor] ++apani4 9163 tcp apani4 [Neal_Taylor] [Neal_Taylor] ++apani4 9163 udp apani4 [Neal_Taylor] [Neal_Taylor] ++apani5 9164 tcp apani5 [Neal_Taylor] [Neal_Taylor] ++apani5 9164 udp apani5 [Neal_Taylor] [Neal_Taylor] ++ 9165-9190 Unassigned ++sun-as-jpda 9191 tcp Sun AppSvr JPDA [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++sun-as-jpda 9191 udp Sun AppSvr JPDA [Abhijit_Kumar] [Abhijit_Kumar] 2005-11 ++ 9192-9199 Unassigned ++wap-wsp 9200 tcp WAP connectionless session [WAP_Forum] [WAP_Forum] ++ service ++wap-wsp 9200 udp WAP connectionless session [WAP_Forum] [WAP_Forum] ++ service ++wap-wsp-wtp 9201 tcp WAP session service [WAP_Forum] [WAP_Forum] ++wap-wsp-wtp 9201 udp WAP session service [WAP_Forum] [WAP_Forum] ++wap-wsp-s 9202 tcp WAP secure connectionless [WAP_Forum] [WAP_Forum] ++ session service ++wap-wsp-s 9202 udp WAP secure connectionless [WAP_Forum] [WAP_Forum] ++ session service ++wap-wsp-wtp-s 9203 tcp WAP secure session service [WAP_Forum] [WAP_Forum] ++wap-wsp-wtp-s 9203 udp WAP secure session service [WAP_Forum] [WAP_Forum] ++wap-vcard 9204 tcp WAP vCard [WAP_Forum] [WAP_Forum] ++wap-vcard 9204 udp WAP vCard [WAP_Forum] [WAP_Forum] ++wap-vcal 9205 tcp WAP vCal [WAP_Forum] [WAP_Forum] ++wap-vcal 9205 udp WAP vCal [WAP_Forum] [WAP_Forum] ++wap-vcard-s 9206 tcp WAP vCard Secure [WAP_Forum] [WAP_Forum] ++wap-vcard-s 9206 udp WAP vCard Secure [WAP_Forum] [WAP_Forum] ++wap-vcal-s 9207 tcp WAP vCal Secure [WAP_Forum] [WAP_Forum] ++wap-vcal-s 9207 udp WAP vCal Secure [WAP_Forum] [WAP_Forum] ++rjcdb-vcards 9208 tcp rjcdb vCard [Robert_John_Churchil] [Robert_John_Churchil] 2006-01 ++rjcdb-vcards 9208 udp rjcdb vCard [Robert_John_Churchil] [Robert_John_Churchil] 2006-01 ++almobile-system 9209 tcp ALMobile System Service [Rob_Graber] [Rob_Graber] 2006-01 ++almobile-system 9209 udp ALMobile System Service [Rob_Graber] [Rob_Graber] 2006-01 ++oma-mlp 9210 tcp OMA Mobile Location Protocol [Hans_Rohnert] [Hans_Rohnert] 2002-04 ++oma-mlp 9210 udp OMA Mobile Location Protocol [Hans_Rohnert] [Hans_Rohnert] 2002-04 ++oma-mlp-s 9211 tcp OMA Mobile Location Protocol [Hans_Rohnert] [Hans_Rohnert] 2002-04 ++ Secure ++oma-mlp-s 9211 udp OMA Mobile Location Protocol [Hans_Rohnert] [Hans_Rohnert] 2002-04 ++ Secure ++serverviewdbms 9212 tcp Server View dbms access [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++serverviewdbms 9212 udp Server View dbms access [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++serverstart 9213 tcp ServerStart RemoteControl [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++serverstart 9213 udp ServerStart RemoteControl [Detlef_Rothe] [Detlef_Rothe] 2009-05-15 ++ipdcesgbs 9214 tcp IPDC ESG BootstrapService [Joerg_Heuer] [Joerg_Heuer] 2006-02 ++ipdcesgbs 9214 udp IPDC ESG BootstrapService [Joerg_Heuer] [Joerg_Heuer] 2006-02 ++insis 9215 tcp Integrated Setup and Install [Markus_Treinen] [Markus_Treinen] 2006-02 ++ Service ++insis 9215 udp Integrated Setup and Install [Markus_Treinen] [Markus_Treinen] 2006-02 ++ Service ++acme 9216 tcp Aionex Communication [Mark_Sapp] [Mark_Sapp] 2006-04 ++ Management Engine ++acme 9216 udp Aionex Communication [Mark_Sapp] [Mark_Sapp] 2006-04 ++ Management Engine ++fsc-port 9217 tcp FSC Communication Port [Teijo_Mustonen] [Teijo_Mustonen] 2002-03 ++fsc-port 9217 udp FSC Communication Port [Teijo_Mustonen] [Teijo_Mustonen] 2002-03 ++ 9218-9221 Unassigned ++teamcoherence 9222 tcp QSC Team Coherence [Ewan_McNab] [Ewan_McNab] 2004-11 ++teamcoherence 9222 udp QSC Team Coherence [Ewan_McNab] [Ewan_McNab] 2004-11 ++ 9223-9254 Unassigned ++mon 9255 tcp Manager On Network [David_Rouchet] [David_Rouchet] 2007-05 ++mon 9255 udp Manager On Network [David_Rouchet] [David_Rouchet] 2007-05 ++ 9256-9277 Unassigned ++pegasus 9278 tcp Pegasus GPS Platform [Nestor_A_Diaz] [Nestor_A_Diaz] 2009-05-12 ++pegasus 9278 udp Pegasus GPS Platform [Nestor_A_Diaz] [Nestor_A_Diaz] 2009-05-12 ++pegasus-ctl 9279 tcp Pegaus GPS System Control [Nestor_A_Diaz] [Nestor_A_Diaz] 2009-05-12 ++ Interface ++pegasus-ctl 9279 udp Pegaus GPS System Control [Nestor_A_Diaz] [Nestor_A_Diaz] 2009-05-12 ++ Interface ++pgps 9280 tcp Predicted GPS [Jeremy_Freeman] [Jeremy_Freeman] 2008-02-14 ++pgps 9280 udp Predicted GPS [Jeremy_Freeman] [Jeremy_Freeman] 2008-02-14 ++swtp-port1 9281 tcp SofaWare transport port 1 [Amir_Rapson] [Amir_Rapson] 2002-02 ++swtp-port1 9281 udp SofaWare transport port 1 [Amir_Rapson] [Amir_Rapson] 2002-02 ++swtp-port2 9282 tcp SofaWare transport port 2 [Amir_Rapson] [Amir_Rapson] 2002-02 ++swtp-port2 9282 udp SofaWare transport port 2 [Amir_Rapson] [Amir_Rapson] 2002-02 ++callwaveiam 9283 tcp CallWaveIAM [Colin_Kelley] [Colin_Kelley] ++callwaveiam 9283 udp CallWaveIAM [Colin_Kelley] [Colin_Kelley] ++visd 9284 tcp VERITAS Information Serve [Ravi_Tavakely] [Ravi_Tavakely] 2002-02 ++visd 9284 udp VERITAS Information Serve [Ravi_Tavakely] [Ravi_Tavakely] 2002-02 ++n2h2server 9285 tcp N2H2 Filter Service Port [Jim_Irwin] [Jim_Irwin] 2002-02 ++n2h2server 9285 udp N2H2 Filter Service Port [Jim_Irwin] [Jim_Irwin] 2002-02 ++ 9286 tcp Reserved ++n2receive 9286 udp n2 monitoring receiver [Peter_van_Dijk] [Peter_van_Dijk] 2011-01-10 ++cumulus 9287 tcp Cumulus [Thomas_Schleu] [Thomas_Schleu] ++cumulus 9287 udp Cumulus [Thomas_Schleu] [Thomas_Schleu] ++ 9288-9291 Unassigned ++armtechdaemon 9292 tcp ArmTech Daemon [Rohan_Story] [Rohan_Story] ++armtechdaemon 9292 udp ArmTech Daemon [Rohan_Story] [Rohan_Story] ++storview 9293 tcp StorView Client [Ryan_Smith] [Ryan_Smith] 2006-07 ++storview 9293 udp StorView Client [Ryan_Smith] [Ryan_Smith] 2006-07 ++armcenterhttp 9294 tcp ARMCenter http Service [Eric_Thiebaut_George] [Eric_Thiebaut_George] 2006-04 ++armcenterhttp 9294 udp ARMCenter http Service [Eric_Thiebaut_George] [Eric_Thiebaut_George] 2006-04 ++armcenterhttps 9295 tcp ARMCenter https Service [Eric_Thiebaut_George] [Eric_Thiebaut_George] 2006-04 ++armcenterhttps 9295 udp ARMCenter https Service [Eric_Thiebaut_George] [Eric_Thiebaut_George] 2006-04 ++ 9296-9299 Unassigned ++vrace 9300 tcp Virtual Racing Service [Pete_Loeffen] [Pete_Loeffen] 2006-10 ++vrace 9300 udp Virtual Racing Service [Pete_Loeffen] [Pete_Loeffen] 2006-10 ++ 9301-9305 Unassigned ++sphinxql 9306 tcp Sphinx search server (MySQL [Andrew_Aksyonoff] [Andrew_Aksyonoff] 2009-10-20 ++ listener) ++ 9306 udp Reserved ++ 9307-9311 Unassigned ++sphinxapi 9312 tcp Sphinx search server [Andrew_Aksyonoff] [Andrew_Aksyonoff] 2009-10-20 ++ 9312 udp Reserved ++ 9313-9317 Unassigned ++secure-ts 9318 tcp PKIX TimeStamp over TLS [Niklas_Weiss] [Niklas_Weiss] 2004-11 ++secure-ts 9318 udp PKIX TimeStamp over TLS [Niklas_Weiss] [Niklas_Weiss] 2004-11 ++ 9319-9320 Unassigned ++guibase 9321 tcp guibase [Yutaka_Ono] [Yutaka_Ono] ++guibase 9321 udp guibase [Yutaka_Ono] [Yutaka_Ono] ++ 9322-9342 Unassigned ++mpidcmgr 9343 tcp MpIdcMgr [Yutaka_Ono] [Yutaka_Ono] ++mpidcmgr 9343 udp MpIdcMgr [Yutaka_Ono] [Yutaka_Ono] ++mphlpdmc 9344 tcp Mphlpdmc [Yutaka_Ono] [Yutaka_Ono] ++mphlpdmc 9344 udp Mphlpdmc [Yutaka_Ono] [Yutaka_Ono] ++ 9345 Unassigned ++ctechlicensing 9346 tcp C Tech Licensing [Reed_Copsey_Jr] [Reed_Copsey_Jr] ++ctechlicensing 9346 udp C Tech Licensing [Reed_Copsey_Jr] [Reed_Copsey_Jr] ++ 9347-9373 Unassigned ++fjdmimgr 9374 tcp fjdmimgr [Yutaka_Ono] [Yutaka_Ono] ++fjdmimgr 9374 udp fjdmimgr [Yutaka_Ono] [Yutaka_Ono] ++ 9375-9379 Unassigned ++boxp 9380 tcp Brivs! Open Extensible [Danko_Alexeyev] [Danko_Alexeyev] 2007-08-08 ++ Protocol ++boxp 9380 udp Brivs! Open Extensible [Danko_Alexeyev] [Danko_Alexeyev] 2007-08-08 ++ Protocol ++ 9381-9386 Unassigned ++d2dconfig 9387 tcp D2D Configuration Service [Pete_Camble] [Pete_Camble] 2008-12-24 ++ 9387 udp Reserved ++d2ddatatrans 9388 tcp D2D Data Transfer Service [Pete_Camble] [Pete_Camble] 2008-12-24 ++ 9388 udp Reserved ++adws 9389 tcp Active Directory Web [Nitin_Gupta] [Nitin_Gupta] 2008-12-24 ++ Services ++ 9389 udp Reserved ++otp 9390 tcp OpenVAS Transfer Protocol [Tim_Brown] [Tim_Brown] 2008-12-24 ++ 9390 udp Reserved ++ 9391-9395 Unassigned ++fjinvmgr 9396 tcp fjinvmgr [Yutaka_Ono] [Yutaka_Ono] ++fjinvmgr 9396 udp fjinvmgr [Yutaka_Ono] [Yutaka_Ono] ++mpidcagt 9397 tcp MpIdcAgt [Yutaka_Ono] [Yutaka_Ono] ++mpidcagt 9397 udp MpIdcAgt [Yutaka_Ono] [Yutaka_Ono] ++ 9398-9399 Unassigned ++sec-t4net-srv 9400 tcp Samsung Twain for Network [Dongkeun_Kim] [Dongkeun_Kim] 2007-02 ++ Server ++sec-t4net-srv 9400 udp Samsung Twain for Network [Dongkeun_Kim] [Dongkeun_Kim] 2007-02 ++ Server ++sec-t4net-clt 9401 tcp Samsung Twain for Network [Dongkeun_Kim] [Dongkeun_Kim] 2007-02 ++ Client ++sec-t4net-clt 9401 udp Samsung Twain for Network [Dongkeun_Kim] [Dongkeun_Kim] 2007-02 ++ Client ++sec-pc2fax-srv 9402 tcp Samsung PC2FAX for Network [HyeongBae_Yu] [HyeongBae_Yu] 2008-07-31 ++ Server ++sec-pc2fax-srv 9402 udp Samsung PC2FAX for Network [HyeongBae_Yu] [HyeongBae_Yu] 2008-07-31 ++ Server ++ 9403-9417 Unassigned ++git 9418 tcp git pack transfer service [Linus_Torvalds] [Linus_Torvalds] 2005-09 ++git 9418 udp git pack transfer service [Linus_Torvalds] [Linus_Torvalds] 2005-09 ++ 9419-9442 Unassigned ++tungsten-https 9443 tcp WSO2 Tungsten HTTPS [Afkham_Azeez] [Afkham_Azeez] 2006-06 ++tungsten-https 9443 udp WSO2 Tungsten HTTPS [Afkham_Azeez] [Afkham_Azeez] 2006-06 ++wso2esb-console 9444 tcp WSO2 ESB Administration [Ruwan_Linton] [Ruwan_Linton] 2008-08-20 ++ Console HTTPS ++wso2esb-console 9444 udp WSO2 ESB Administration [Ruwan_Linton] [Ruwan_Linton] 2008-08-20 ++ Console HTTPS ++mindarray-ca 9445 tcp MindArray Systems Console [MINDARRAY_SYSTEMS] [ALPESH_DHAMELIA] 2011-10-25 ++ Agent ++ 9445 udp Reserved ++ 9446-9449 Unassigned ++sntlkeyssrvr 9450 tcp Sentinel Keys Server [Martin_Ziskind] [Martin_Ziskind] 2008-08-21 ++sntlkeyssrvr 9450 udp Sentinel Keys Server [Martin_Ziskind] [Martin_Ziskind] 2008-08-21 ++ 9451-9499 Unassigned ++ismserver 9500 tcp ismserver [Ian_Gordon_3] [Ian_Gordon_3] ++ismserver 9500 udp ismserver [Ian_Gordon_3] [Ian_Gordon_3] ++ 9501-9521 Unassigned ++ 9522 tcp Reserved ++sma-spw 9522 udp SMA Speedwire [SMA_Solar_Techology] [SMA_Solar_Techology] 2011-03-08 ++ 9523-9534 Unassigned ++mngsuite 9535 tcp Management Suite Remote [Trevor_Perkes] [Trevor_Perkes] 2010-02-01 ++ Control ++mngsuite 9535 udp Management Suite Remote [Trevor_Perkes] [Trevor_Perkes] 2010-02-01 ++ Control ++laes-bf 9536 tcp Surveillance buffering [Glen_Myers] [Glen_Myers] 2007-05 ++ function ++laes-bf 9536 udp Surveillance buffering [Glen_Myers] [Glen_Myers] 2007-05 ++ function ++ 9537-9554 Unassigned ++trispen-sra 9555 tcp Trispen Secure Remote Access [Jaco_Botha] [Jaco_Botha] 2004-11 ++trispen-sra 9555 udp Trispen Secure Remote Access [Jaco_Botha] [Jaco_Botha] 2004-11 ++ 9556-9591 Unassigned ++ldgateway 9592 tcp LANDesk Gateway [Alan_Butt] [Alan_Butt] 2006-03 ++ldgateway 9592 udp LANDesk Gateway [Alan_Butt] [Alan_Butt] 2006-03 ++cba8 9593 tcp LANDesk Management Agent [Trevor_Perkes] [Trevor_Perkes] 2010-02-01 ++ (cba8) ++cba8 9593 udp LANDesk Management Agent [Trevor_Perkes] [Trevor_Perkes] 2010-02-01 ++ (cba8) ++msgsys 9594 tcp Message System [Alan_Butt] [Alan_Butt] ++msgsys 9594 udp Message System [Alan_Butt] [Alan_Butt] ++pds 9595 tcp Ping Discovery Service [Alan_Butt] [Alan_Butt] ++pds 9595 udp Ping Discovery Service [Alan_Butt] [Alan_Butt] ++mercury-disc 9596 tcp Mercury Discovery [Paul_Mclachlan] [Paul_Mclachlan] 2005-11 ++mercury-disc 9596 udp Mercury Discovery [Paul_Mclachlan] [Paul_Mclachlan] 2005-11 ++pd-admin 9597 tcp PD Administration [Duk_Loi] [Duk_Loi] 2005-11 ++pd-admin 9597 udp PD Administration [Duk_Loi] [Duk_Loi] 2005-11 ++vscp 9598 tcp Very Simple Ctrl Protocol [Ake_Hedman] [Ake_Hedman] 2005-11 ++vscp 9598 udp Very Simple Ctrl Protocol [Ake_Hedman] [Ake_Hedman] 2005-11 ++robix 9599 tcp Robix [Evan_Rosen] [Evan_Rosen] 2005-11 ++robix 9599 udp Robix [Evan_Rosen] [Evan_Rosen] 2005-11 ++micromuse-ncpw 9600 tcp MICROMUSE-NCPW [Hing_Wing_To_2] [Hing_Wing_To_2] ++micromuse-ncpw 9600 udp MICROMUSE-NCPW [Hing_Wing_To_2] [Hing_Wing_To_2] ++ 9601-9611 Unassigned ++streamcomm-ds 9612 tcp StreamComm User Directory [Brian_C_Wiles] [Brian_C_Wiles] ++streamcomm-ds 9612 udp StreamComm User Directory [Brian_C_Wiles] [Brian_C_Wiles] ++ 9613 Unassigned ++iadt-tls 9614 tcp iADT Protocol over TLS [Paul_A_Suhler] [Paul_A_Suhler] 2009-02-05 ++ 9614 udp Reserved ++ 9615 Unassigned ++ eRunbook Agent ++ ++erunbook-agent 9616 tcp IANA assigned this [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 ++ well-formed service name as ++ a replacement for ++ "erunbook_agent". ++ This entry is an alias to "erunbook-agent". This entry is now ++erunbook_agent 9616 tcp eRunbook Agent [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 historic, not usable for use with many common service ++ discovery mechanisms. ++ 9616 udp Reserved ++ eRunbook Server ++ ++erunbook-server 9617 tcp IANA assigned this [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 ++ well-formed service name as ++ a replacement for ++ "erunbook_server". ++ This entry is an alias to "erunbook-server". This entry is ++erunbook_server 9617 tcp eRunbook Server [Gerhard_Wagner] [Gerhard_Wagner] 2009-03-10 now historic, not usable for use with many common service ++ discovery mechanisms. ++ 9617 udp Reserved ++condor 9618 tcp Condor Collector Service [Todd_Tannenbaum] [Todd_Tannenbaum] 2008-04-03 ++condor 9618 udp Condor Collector Service [Todd_Tannenbaum] [Todd_Tannenbaum] 2008-04-03 ++ 9619-9627 Unassigned ++odbcpathway 9628 tcp ODBC Pathway Service [Adrian_Hungate] [Adrian_Hungate] 2007-05 ++odbcpathway 9628 udp ODBC Pathway Service [Adrian_Hungate] [Adrian_Hungate] 2007-05 ++uniport 9629 tcp UniPort SSO Controller [Adrian_Hungate] [Adrian_Hungate] 2007-09-05 ++uniport 9629 udp UniPort SSO Controller [Adrian_Hungate] [Adrian_Hungate] 2007-09-05 ++peoctlr 9630 tcp Peovica Controller [Adrian_Hungate] [Adrian_Hungate] 2009-09-14 ++ 9630 udp Reserved ++peocoll 9631 tcp Peovica Collector [Adrian_Hungate] [Adrian_Hungate] 2009-09-14 ++ 9631 udp Reserved ++ 9632 tcp Reserved ++mc-comm 9632 udp Mobile-C Communications [David_Ko_2] [David_Ko_2] 2009-09-14 ++ 9633-9639 Unassigned ++pqsflows 9640 tcp ProQueSys Flows Service [Sarene_Caiazza] [Sarene_Caiazza] 2010-04-27 ++ 9640 udp Reserved ++ 9641-9666 Unassigned ++xmms2 9667 tcp Cross-platform Music [Juho_Herttua] [Juho_Herttua] 2009-04-14 ++ Multiplexing System ++xmms2 9667 udp Cross-platform Music [Juho_Herttua] [Juho_Herttua] ++ Multiplexing System ++tec5-sdctp 9668 tcp tec5 Spectral Device Control [Michael_Muth] [Michael_Muth] 2009-05-11 ++ Protocol ++tec5-sdctp 9668 udp tec5 Spectral Device Control [Michael_Muth] [Michael_Muth] 2009-05-11 ++ Protocol ++ 9669-9693 Unassigned ++client-wakeup 9694 tcp T-Mobile Client Wakeup [Michael_Schonborn] [Michael_Schonborn] 2009-09-11 ++ Message ++client-wakeup 9694 udp T-Mobile Client Wakeup [Michael_Schonborn] [Michael_Schonborn] 2009-09-11 ++ Message ++ccnx 9695 tcp Content Centric Networking [Van_Jacobson_2][Simon_Barber] [Van_Jacobson_2][Simon_Barber] 2009-09-29 ++ccnx 9695 udp Content Centric Networking [Van_Jacobson_2][Simon_Barber] [Van_Jacobson_2][Simon_Barber] 2009-09-29 ++ 9696-9699 Unassigned ++board-roar 9700 tcp Board M.I.T. Service [Francesco_Rosi] [Francesco_Rosi] 2006-01 ++board-roar 9700 udp Board M.I.T. Service [Francesco_Rosi] [Francesco_Rosi] 2006-01 ++ 9701-9746 Unassigned ++l5nas-parchan 9747 tcp L5NAS Parallel Channel [Lawrence_J_Dickson] [Lawrence_J_Dickson] 2002-03 ++l5nas-parchan 9747 udp L5NAS Parallel Channel [Lawrence_J_Dickson] [Lawrence_J_Dickson] 2002-03 ++ 9748-9749 Unassigned ++board-voip 9750 tcp Board M.I.T. Synchronous [Francesco_Rosi] [Francesco_Rosi] 2006-01 ++ Collaboration ++board-voip 9750 udp Board M.I.T. Synchronous [Francesco_Rosi] [Francesco_Rosi] 2006-01 ++ Collaboration ++ 9751-9752 Unassigned ++rasadv 9753 tcp rasadv [Dave_Thaler_2] [Dave_Thaler_2] ++rasadv 9753 udp rasadv [Dave_Thaler_2] [Dave_Thaler_2] ++ 9754-9761 Unassigned ++tungsten-http 9762 tcp WSO2 Tungsten HTTP [Afkham_Azeez] [Afkham_Azeez] 2006-06 ++tungsten-http 9762 udp WSO2 Tungsten HTTP [Afkham_Azeez] [Afkham_Azeez] 2006-06 ++ 9763-9799 Unassigned ++davsrc 9800 tcp WebDav Source Port [Ethan_Fremen] [Ethan_Fremen] ++davsrc 9800 udp WebDav Source Port [Ethan_Fremen] [Ethan_Fremen] ++sstp-2 9801 tcp Sakura Script Transfer [Kouichi_Takeda_2] [Kouichi_Takeda_2] ++ Protocol-2 ++sstp-2 9801 udp Sakura Script Transfer [Kouichi_Takeda_2] [Kouichi_Takeda_2] ++ Protocol-2 ++davsrcs 9802 tcp WebDAV Source TLS/SSL [Rob_Isaac] [Rob_Isaac] 2003-07 ++davsrcs 9802 udp WebDAV Source TLS/SSL [Rob_Isaac] [Rob_Isaac] 2003-07 ++ 9803-9874 Unassigned ++sapv1 9875 tcp Session Announcement v1 [RFC2974] ++sapv1 9875 udp Session Announcement v1 [RFC2974] ++sd 9876 tcp Session Director [Van_Jacobson] [Van_Jacobson] ++sd 9876 udp Session Director [Van_Jacobson] [Van_Jacobson] ++ 9877-9887 Unassigned ++cyborg-systems 9888 tcp CYBORG Systems [Malcolm_Graham] [Malcolm_Graham] ++cyborg-systems 9888 udp CYBORG Systems [Malcolm_Graham] [Malcolm_Graham] ++ Port for Cable network ++gt-proxy 9889 tcp related data proxy or [Dawei_Qi] [Dawei_Qi] 2010-07-07 ++ repeater ++ Port for Cable network ++gt-proxy 9889 udp related data proxy or [Dawei_Qi] [Dawei_Qi] 2010-07-07 ++ repeater ++ 9890-9897 Unassigned ++monkeycom 9898 tcp MonkeyCom [Yuji_Kuwabara] [Yuji_Kuwabara] ++monkeycom 9898 udp MonkeyCom [Yuji_Kuwabara] [Yuji_Kuwabara] ++sctp-tunneling 9899 tcp SCTP TUNNELING [Lyndon_Ong_2] [Lyndon_Ong_2] ++sctp-tunneling 9899 udp SCTP TUNNELING [Lyndon_Ong_2] [Lyndon_Ong_2] ++iua 9900 tcp IUA [Lyndon_Ong_2] [Lyndon_Ong_2] ++iua 9900 udp IUA [Lyndon_Ong_2] [Lyndon_Ong_2] ++iua 9900 sctp IUA [Lyndon_Ong_2] [Lyndon_Ong_2] ++enrp 9901 udp enrp server channel ++enrp-sctp 9901 sctp enrp server channel [RFC5353] ++enrp-sctp-tls 9902 sctp enrp/tls server channel [RFC5353] ++ 9903 tcp Reserved ++multicast-ping 9903 udp Multicast Ping Protocol 2011-12-09 [RFC6450] ++ 9904-9908 Unassigned ++domaintime 9909 tcp domaintime [Jeffry_Dwight] [Jeffry_Dwight] ++domaintime 9909 udp domaintime [Jeffry_Dwight] [Jeffry_Dwight] ++ 9910 Unassigned ++sype-transport 9911 tcp SYPECom Transport Protocol [Sylvain_Pedneault] [Sylvain_Pedneault] 2003-03 ++sype-transport 9911 udp SYPECom Transport Protocol [Sylvain_Pedneault] [Sylvain_Pedneault] 2003-03 ++ 9912-9949 Unassigned ++apc-9950 9950 tcp APC 9950 [American_Power_Conve] [American_Power_Conve] ++apc-9950 9950 udp APC 9950 [American_Power_Conve] [American_Power_Conve] ++apc-9951 9951 tcp APC 9951 [American_Power_Conve] [American_Power_Conve] ++apc-9951 9951 udp APC 9951 [American_Power_Conve] [American_Power_Conve] ++apc-9952 9952 tcp APC 9952 [American_Power_Conve] [American_Power_Conve] ++apc-9952 9952 udp APC 9952 [American_Power_Conve] [American_Power_Conve] ++acis 9953 tcp 9953 [Thomas_Guth] [Thomas_Guth] 2006-01 ++acis 9953 udp 9953 [Thomas_Guth] [Thomas_Guth] 2006-01 ++hinp 9954 tcp HaloteC Instrument Network [HaloteC_Instruments] [Michel_Stam] 2012-02-07 ++ Protocol ++ 9954 udp Reserved ++alljoyn-stm 9955 tcp Contact Port for AllJoyn [Qualcomm_Innovation_Center] [Craig_Dowell] 2012-03-14 ++ standard messaging ++ Contact Port for AllJoyn ++alljoyn-mcm 9955 udp multiplexed constrained [Qualcomm_Innovation_Center] [Craig_Dowell] 2012-03-14 ++ messaging ++ 9956 tcp Reserved ++alljoyn 9956 udp Alljoyn Name Service [Qualcomm_Innovation_Center] [Craig_Dowell] 2011-12-21 ++ 9957-9965 Unassigned ++odnsp 9966 tcp OKI Data Network Setting [Masato_Sato] [Masato_Sato] 2006-05 ++ Protocol ++odnsp 9966 udp OKI Data Network Setting [Masato_Sato] [Masato_Sato] 2006-05 ++ Protocol ++ 9967-9986 Unassigned ++dsm-scm-target 9987 tcp DSM/SCM Target Interface [Mike_Dyslin] [Mike_Dyslin] 2006-08 ++dsm-scm-target 9987 udp DSM/SCM Target Interface [Mike_Dyslin] [Mike_Dyslin] 2006-08 ++nsesrvr 9988 tcp Software Essentials Secure [Narayanan_Raju] [Narayanan_Raju] 2009-02-05 ++ HTTP server ++ 9988 udp Reserved ++ 9989-9989 Unassigned ++osm-appsrvr 9990 tcp OSM Applet Server [Vinay_Gupta] [Vinay_Gupta] 2003-08 ++osm-appsrvr 9990 udp OSM Applet Server [Vinay_Gupta] [Vinay_Gupta] 2003-08 ++osm-oev 9991 tcp OSM Event Server [Vinay_Gupta] [Vinay_Gupta] 2003-08 ++osm-oev 9991 udp OSM Event Server [Vinay_Gupta] [Vinay_Gupta] 2003-08 ++palace-1 9992 tcp OnLive-1 [Douglas_Crockford] [Douglas_Crockford] ++palace-1 9992 udp OnLive-1 [Douglas_Crockford] [Douglas_Crockford] ++palace-2 9993 tcp OnLive-2 [Douglas_Crockford] [Douglas_Crockford] ++palace-2 9993 udp OnLive-2 [Douglas_Crockford] [Douglas_Crockford] ++palace-3 9994 tcp OnLive-3 [Douglas_Crockford] [Douglas_Crockford] ++palace-3 9994 udp OnLive-3 [Douglas_Crockford] [Douglas_Crockford] ++palace-4 9995 tcp Palace-4 [Douglas_Crockford] [Douglas_Crockford] ++palace-4 9995 udp Palace-4 [Douglas_Crockford] [Douglas_Crockford] ++palace-5 9996 tcp Palace-5 [Douglas_Crockford] [Douglas_Crockford] ++palace-5 9996 udp Palace-5 [Douglas_Crockford] [Douglas_Crockford] ++palace-6 9997 tcp Palace-6 [Douglas_Crockford] [Douglas_Crockford] ++palace-6 9997 udp Palace-6 [Douglas_Crockford] [Douglas_Crockford] ++distinct32 9998 tcp Distinct32 [Anoop_Tewari] [Anoop_Tewari] ++distinct32 9998 udp Distinct32 [Anoop_Tewari] [Anoop_Tewari] ++distinct 9999 tcp distinct [Anoop_Tewari] [Anoop_Tewari] ++distinct 9999 udp distinct [Anoop_Tewari] [Anoop_Tewari] ++ndmp 10000 tcp Network Data Management [Brian_Ehrmantraut] [Brian_Ehrmantraut] ++ Protocol ++ndmp 10000 udp Network Data Management [Brian_Ehrmantraut] [Brian_Ehrmantraut] ++ Protocol ++scp-config 10001 tcp SCP Configuration [Michael_Benz] [Michael_Benz] 2010-08-06 ++scp-config 10001 udp SCP Configuration [Michael_Benz] [Michael_Benz] 2010-08-06 ++documentum 10002 tcp EMC-Documentum Content [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 ++ Server Product ++documentum 10002 udp EMC-Documentum Content [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 ++ Server Product ++ EMC-Documentum Content ++ Server Product ++ ++documentum-s 10003 tcp IANA assigned this [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 ++ well-formed service name as ++ a replacement for ++ "documentum_s". ++ EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now ++documentum_s 10003 tcp Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service ++ discovery mechanisms. ++ EMC-Documentum Content ++ Server Product ++ ++documentum-s 10003 udp IANA assigned this [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 ++ well-formed service name as ++ a replacement for ++ "documentum_s". ++ EMC-Documentum Content This entry is an alias to "documentum-s". This entry is now ++documentum_s 10003 udp Server Product [Reza_Bagherian] [Reza_Bagherian] 2007-07-19 historic, not usable for use with many common service ++ discovery mechanisms. ++emcrmirccd 10004 tcp EMC Replication Manager [Robert_Boudrie] [Robert_Boudrie] 2008-06-09 ++ Client ++ 10004 udp Reserved ++emcrmird 10005 tcp EMC Replication Manager [Robert_Boudrie] [Robert_Boudrie] 2008-06-09 ++ Server ++ 10005 udp Reserved ++ 10006 Unassigned ++mvs-capacity 10007 tcp MVS Capacity [Donna_Dillenberger] [Donna_Dillenberger] ++mvs-capacity 10007 udp MVS Capacity [Donna_Dillenberger] [Donna_Dillenberger] ++octopus 10008 tcp Octopus Multiplexer [Chris_Koeritz_2] [Chris_Koeritz_2] 2002-10 ++octopus 10008 udp Octopus Multiplexer [Chris_Koeritz_2] [Chris_Koeritz_2] 2002-10 ++swdtp-sv 10009 tcp Systemwalker Desktop Patrol [Akira_Ide] [Akira_Ide] 2006-03 ++swdtp-sv 10009 udp Systemwalker Desktop Patrol [Akira_Ide] [Akira_Ide] 2006-03 ++rxapi 10010 tcp ooRexx rxapi services [David_Ashley] [David_Ashley] 2009-07-24 ++ 10010 udp Reserved ++ 10011-10049 Unassigned ++zabbix-agent 10050 tcp Zabbix Agent [Alexei_Vladishev] [Alexei_Vladishev] 2006-02 ++zabbix-agent 10050 udp Zabbix Agent [Alexei_Vladishev] [Alexei_Vladishev] 2006-02 ++zabbix-trapper 10051 tcp Zabbix Trapper [Alexei_Vladishev] [Alexei_Vladishev] 2006-02 ++zabbix-trapper 10051 udp Zabbix Trapper [Alexei_Vladishev] [Alexei_Vladishev] 2006-02 ++ 10052-10054 Unassigned ++qptlmd 10055 tcp Quantapoint FLEXlm Licensing [Justin_Vegso] [Justin_Vegso] 2010-07-01 ++ Service ++ 10055 udp Reserved ++ 10056-10079 Unassigned ++amanda 10080 tcp Amanda [John_Jackson] [John_Jackson] ++amanda 10080 udp Amanda [John_Jackson] [John_Jackson] ++famdc 10081 tcp FAM Archive Server [Frode_Randers] [Frode_Randers] 2006-01 ++famdc 10081 udp FAM Archive Server [Frode_Randers] [Frode_Randers] 2006-01 ++ 10082-10099 Unassigned ++itap-ddtp 10100 tcp VERITAS ITAP DDTP [Saugata_Guha] [Saugata_Guha] 2004-05 ++itap-ddtp 10100 udp VERITAS ITAP DDTP [Saugata_Guha] [Saugata_Guha] 2004-05 ++ezmeeting-2 10101 tcp eZmeeting [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++ezmeeting-2 10101 udp eZmeeting [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++ezproxy-2 10102 tcp eZproxy [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++ezproxy-2 10102 udp eZproxy [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++ezrelay 10103 tcp eZrelay [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++ezrelay 10103 udp eZrelay [Albert_C_Yang] [Albert_C_Yang] 2002-03 ++swdtp 10104 tcp Systemwalker Desktop Patrol [Akira_Ide] [Akira_Ide] 2006-09 ++swdtp 10104 udp Systemwalker Desktop Patrol [Akira_Ide] [Akira_Ide] 2006-09 ++ 10105-10106 Unassigned ++bctp-server 10107 tcp VERITAS BCTP, server [Saugata_Guha] [Saugata_Guha] 2004-05 ++bctp-server 10107 udp VERITAS BCTP, server [Saugata_Guha] [Saugata_Guha] 2004-05 ++ 10108-10109 Unassigned ++nmea-0183 10110 tcp NMEA-0183 Navigational Data [Meindert_Sprang] [Meindert_Sprang] 2009-02-18 ++nmea-0183 10110 udp NMEA-0183 Navigational Data [Meindert_Sprang] [Meindert_Sprang] 2009-02-18 ++ 10111 tcp Reserved ++nmea-onenet 10111 udp NMEA OneNet multicast [National_Marine_Electronics_Association] [Steve_Spitzer] 2011-09-15 ++ messaging ++ 10112 Unassigned ++netiq-endpoint 10113 tcp NetIQ Endpoint [John_Wood] [John_Wood] ++netiq-endpoint 10113 udp NetIQ Endpoint [John_Wood] [John_Wood] ++netiq-qcheck 10114 tcp NetIQ Qcheck [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++netiq-qcheck 10114 udp NetIQ Qcheck [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++netiq-endpt 10115 tcp NetIQ Endpoint [Gary_Weichinger] [Gary_Weichinger] ++netiq-endpt 10115 udp NetIQ Endpoint [Gary_Weichinger] [Gary_Weichinger] ++netiq-voipa 10116 tcp NetIQ VoIP Assessor [Gary_Weichinger] [Gary_Weichinger] ++netiq-voipa 10116 udp NetIQ VoIP Assessor [Gary_Weichinger] [Gary_Weichinger] ++iqrm 10117 tcp NetIQ IQCResource Managament [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++ Svc ++iqrm 10117 udp NetIQ IQCResource Managament [Michael_Sharpe] [Michael_Sharpe] 2010-09-14 ++ Svc ++ 10118-10127 Unassigned ++bmc-perf-sd 10128 tcp BMC-PERFORM-SERVICE DAEMON [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-perf-sd 10128 udp BMC-PERFORM-SERVICE DAEMON [Portnoy_Boxman] [Portnoy_Boxman] ++bmc-gms 10129 tcp BMC General Manager Server [Dima_Seliverstov] [Dima_Seliverstov] 2009-07-28 ++ 10129 udp Reserved ++ 10130-10159 Unassigned ++qb-db-server 10160 tcp QB Database Server [Wei_Wang] [Wei_Wang] 2005-11 ++qb-db-server 10160 udp QB Database Server [Wei_Wang] [Wei_Wang] 2005-11 ++snmptls 10161 tcp SNMP-TLS [RFC6353] ++snmpdtls 10161 udp SNMP-DTLS [RFC6353] ++snmptls-trap 10162 tcp SNMP-Trap-TLS [RFC6353] ++snmpdtls-trap 10162 udp SNMP-Trap-DTLS [RFC6353] ++ 10163-10199 Unassigned ++trisoap 10200 tcp Trigence AE Soap Service [Brigitte_Gagne] [Brigitte_Gagne] 2006-08 ++trisoap 10200 udp Trigence AE Soap Service [Brigitte_Gagne] [Brigitte_Gagne] 2006-08 ++rsms 10201 tcp Remote Server Management [Patrick_H_Piper] [Patrick_H_Piper] 2009-03-06 ++ Service ++rscs 10201 udp Remote Server Control and [Patrick_H_Piper] [Patrick_H_Piper] 2009-03-06 ++ Test Service ++ 10202-10251 Unassigned ++apollo-relay 10252 tcp Apollo Relay Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++apollo-relay 10252 udp Apollo Relay Port [Anthony_Carrabino] [Anthony_Carrabino] 2003-08 ++ 10253-10259 Unassigned ++axis-wimp-port 10260 tcp Axis WIMP Port [Stefan_Eriksson] [Stefan_Eriksson] ++axis-wimp-port 10260 udp Axis WIMP Port [Stefan_Eriksson] [Stefan_Eriksson] ++ 10261-10287 Unassigned ++blocks 10288 tcp Blocks [Carl_Malamud] [Carl_Malamud] ++blocks 10288 udp Blocks [Carl_Malamud] [Carl_Malamud] ++ 10289-10320 Unassigned ++cosir 10321 tcp Computer Op System [Kevin_C_Barber] [Kevin_C_Barber] 2009-01-13 ++ Information Report ++ 10321 udp Reserved ++ 10322-10499 Unassigned ++ 10500 tcp Reserved ++hip-nat-t 10500 udp HIP NAT-Traversal [Ari_Keranen] [Ari_Keranen] [RFC5770] ++ 10501-10539 Unassigned ++MOS-lower 10540 tcp MOS Media Object Metadata [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++ Port ++MOS-lower 10540 udp MOS Media Object Metadata [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++ Port ++MOS-upper 10541 tcp MOS Running Order Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-upper 10541 udp MOS Running Order Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-aux 10542 tcp MOS Low Priority Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-aux 10542 udp MOS Low Priority Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-soap 10543 tcp MOS SOAP Default Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-soap 10543 udp MOS SOAP Default Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-soap-opt 10544 tcp MOS SOAP Optional Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++MOS-soap-opt 10544 udp MOS SOAP Optional Port [Eric_Thorniley] [Eric_Thorniley] 2007-09-17 ++ 10545-10630 Unassigned ++ Port to allow for ++ administration and control ++printopia 10631 tcp of "Printopia" application [Ecamm_Network_LLC] [Chris_Kent] 2011-10-24 ++ software, which provides ++ printing services to mobile ++ users ++ 10631 udp Reserved ++ 10632-10799 Unassigned ++gap 10800 tcp Gestor de Acaparamiento para [Juan_Carlos_Olivares] [Juan_Carlos_Olivares] 2006-03 ++ Pocket PCs ++gap 10800 udp Gestor de Acaparamiento para [Juan_Carlos_Olivares] [Juan_Carlos_Olivares] 2006-03 ++ Pocket PCs ++ 10801-10804 Unassigned ++lpdg 10805 tcp LUCIA Pareja Data Group [Alvaro_P_Dominguez] [Alvaro_P_Dominguez] 2006-02 ++lpdg 10805 udp LUCIA Pareja Data Group [Alvaro_P_Dominguez] [Alvaro_P_Dominguez] 2006-02 ++ 10806-10808 Unassigned ++nbd 10809 tcp Linux Network Block Device [Wouter_Verhelst] [Wouter_Verhelst] 2010-08-02 ++ 10809 udp Reserved ++ 10810 tcp Reserved ++nmc-disc 10810 udp Nuance Mobile Care Discovery [Gordon_Waddell] [Gordon_Waddell] 2011-03-21 ++ 10811-10859 Unassigned ++helix 10860 tcp Helix Client/Server [Matthew_Strange][Larry_Atkin_2] [Matthew_Strange][Larry_Atkin_2] 2009-03-06 ++helix 10860 udp Helix Client/Server [Matthew_Strange][Larry_Atkin_2] [Matthew_Strange][Larry_Atkin_2] 2009-03-06 ++ 10861-10989 Unassigned ++rmiaux 10990 tcp Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2] ++rmiaux 10990 udp Auxiliary RMI Port [Eugen_Bacic_2] [Eugen_Bacic_2] ++ 10991-10999 Unassigned ++irisa 11000 tcp IRISA [V_A_Brauner] [V_A_Brauner] ++irisa 11000 udp IRISA [V_A_Brauner] [V_A_Brauner] ++metasys 11001 tcp Metasys [Tobin_Schuster] [Tobin_Schuster] ++metasys 11001 udp Metasys [Tobin_Schuster] [Tobin_Schuster] ++ 11002-11103 Unassigned ++netapp-icmgmt 11104 tcp NetApp Intercluster [Craig_Everhart] [Craig_Everhart] 2010-07-06 ++ Management ++ 11104 udp Reserved ++netapp-icdata 11105 tcp NetApp Intercluster Data [Craig_Everhart] [Craig_Everhart] 2010-07-06 ++ 11105 udp Reserved ++sgi-lk 11106 tcp SGI LK Licensing service [Michel_Bourget] [Michel_Bourget] 2009-01-06 ++sgi-lk 11106 udp SGI LK Licensing service [Michel_Bourget] [Michel_Bourget] 2009-01-06 ++ 11107-11110 Unassigned ++vce 11111 tcp Viral Computing Environment [Fred_Cohen] [Fred_Cohen] ++ (VCE) ++vce 11111 udp Viral Computing Environment [Fred_Cohen] [Fred_Cohen] ++ (VCE) ++dicom 11112 tcp DICOM [David_Clunie] [David_Clunie] 2005-08 ++dicom 11112 udp DICOM [David_Clunie] [David_Clunie] 2005-08 ++ 11113-11160 Unassigned ++suncacao-snmp 11161 tcp sun cacao snmp access point [Nick_Stephen] [Nick_Stephen] 2005-08 ++suncacao-snmp 11161 udp sun cacao snmp access point [Nick_Stephen] [Nick_Stephen] 2005-08 ++suncacao-jmxmp 11162 tcp sun cacao JMX-remoting [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-jmxmp 11162 udp sun cacao JMX-remoting [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-rmi 11163 tcp sun cacao rmi registry [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-rmi 11163 udp sun cacao rmi registry [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-csa 11164 tcp sun cacao command-streaming [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-csa 11164 udp sun cacao command-streaming [Nick_Stephen] [Nick_Stephen] 2005-08 ++ access point ++suncacao-websvc 11165 tcp sun cacao web service access [Nick_Stephen] [Nick_Stephen] 2005-08 ++ point ++suncacao-websvc 11165 udp sun cacao web service access [Nick_Stephen] [Nick_Stephen] 2005-08 ++ point ++ 11166-11170 Unassigned ++ 11171 tcp Reserved ++snss 11171 udp Surgical Notes Security [David_Lethe] [David_Lethe] 2010-12-24 ++ Service Discovery (SNSS) ++oemcacao-jmxmp 11172 tcp OEM cacao JMX-remoting [David_Sechrest] [David_Sechrest] 2010-09-22 ++ access point ++ 11172 udp Reserved ++t5-straton 11173 tcp Straton Runtime Programing [COPALP] [Jerome_FOLLUT] 2012-03-01 ++ 11173 udp Reserved ++oemcacao-rmi 11174 tcp OEM cacao rmi registry [David_Sechrest] [David_Sechrest] 2010-09-22 ++ access point ++ 11174 udp Reserved ++oemcacao-websvc 11175 tcp OEM cacao web service access [David_Sechrest] [David_Sechrest] 2010-09-22 ++ point ++ 11175 udp Reserved ++ 11176-11200 Unassigned ++smsqp 11201 tcp smsqp [Andres_Seco_Hernande] [Andres_Seco_Hernande] ++smsqp 11201 udp smsqp [Andres_Seco_Hernande] [Andres_Seco_Hernande] ++dcsl-backup 11202 tcp DCSL Network Backup Services [John_Reynolds] [John_Reynolds] 2012-04-17 Defined TXT keys: DCSL-Service ++ 11202 udp Reserved ++ 11203-11207 Unassigned ++wifree 11208 tcp WiFree Service [Jose_Luis_Martin_Pei] [Jose_Luis_Martin_Pei] 2006-03 ++wifree 11208 udp WiFree Service [Jose_Luis_Martin_Pei] [Jose_Luis_Martin_Pei] 2006-03 ++ 11209-11210 Unassigned ++memcache 11211 tcp Memory cache service [Trond_Norbye] [Trond_Norbye] 2009-02-09 ++memcache 11211 udp Memory cache service [Trond_Norbye] [Trond_Norbye] 2009-02-09 ++ 11212-11318 Unassigned ++imip 11319 tcp IMIP [Len_Zuvela] [Len_Zuvela] ++imip 11319 udp IMIP [Len_Zuvela] [Len_Zuvela] ++imip-channels 11320 tcp IMIP Channels Port [Len_Zuvela_2] [Len_Zuvela_2] ++imip-channels 11320 udp IMIP Channels Port [Len_Zuvela_2] [Len_Zuvela_2] ++arena-server 11321 tcp Arena Server Listen [Earl_Brannigan] [Earl_Brannigan] ++arena-server 11321 udp Arena Server Listen [Earl_Brannigan] [Earl_Brannigan] ++ 11322-11366 Unassigned ++atm-uhas 11367 tcp ATM UHAS [Todd_Barker] [Todd_Barker] ++atm-uhas 11367 udp ATM UHAS [Todd_Barker] [Todd_Barker] ++ 11368-11370 Unassigned ++hkp 11371 tcp OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 ++hkp 11371 udp OpenPGP HTTP Keyserver [David_Shaw] [David_Shaw] 2003-05 ++ UNAUTHORIZED ++ 11372-11488 Unassigned USE: port ++ 11488 by ASG ++ Cypress ++asgcypresstcps 11489 tcp ASG Cypress Secure Only [David_Luxford] [David_Luxford] 2010-07-01 ++ 11489 udp Reserved ++ 11490-11599 Unassigned ++tempest-port 11600 tcp Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] ++tempest-port 11600 udp Tempest Protocol Port [Francis_Cianfrocca] [Francis_Cianfrocca] ++ 11601-11719 Unassigned ++h323callsigalt 11720 tcp h323 Call Signal Alternate [Chris_White] [Chris_White] ++h323callsigalt 11720 udp h323 Call Signal Alternate [Chris_White] [Chris_White] ++ 11721-11750 Unassigned ++intrepid-ssl 11751 tcp Intrepid SSL [Robert_Eden] [Robert_Eden] 2003-03 ++intrepid-ssl 11751 udp Intrepid SSL [Robert_Eden] [Robert_Eden] 2003-03 ++ 11752-11795 Unassigned ++lanschool 11796 tcp LanSchool [Stoneware_Inc] [Dana_Doggett] 2012-05-18 ++lanschool-mpt 11796 udp Lanschool Multipoint [Stoneware_Inc] [Dana_Doggett] 2012-05-18 ++ 11797-11875 Unassigned ++xoraya 11876 tcp X2E Xoraya Multichannel [Hannes_K] [Hannes_K] 2010-09-13 ++ protocol ++xoraya 11876 udp X2E Xoraya Multichannel [Hannes_K] [Hannes_K] 2010-09-13 ++ protocol ++ 11877 tcp Reserved ++x2e-disc 11877 udp X2E service discovery [Hannes_K] [Hannes_K] 2010-09-13 ++ protocol ++ 11878-11966 Unassigned ++sysinfo-sp 11967 tcp SysInfo Service Protocol [Mike_Cooper] [Mike_Cooper] 2003-03 ++sysinfo-sp 11967 udp SysInfo Sercice Protocol [Mike_Cooper] [Mike_Cooper] 2003-03 ++ 11968-11996 Unassigned ++wmereceiving 11997 sctp WorldMailExpress [Greg_Foutz] [Greg_Foutz] 2006-03 ++wmedistribution 11998 sctp WorldMailExpress [Greg_Foutz] [Greg_Foutz] 2006-03 ++wmereporting 11999 sctp WorldMailExpress [Greg_Foutz] [Greg_Foutz] 2006-03 ++entextxid 12000 tcp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ XID Exchange ++entextxid 12000 udp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ XID Exchange ++entextnetwk 12001 tcp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Network Priority ++entextnetwk 12001 udp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Network Priority ++entexthigh 12002 tcp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS High Priority ++entexthigh 12002 udp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS High Priority ++entextmed 12003 tcp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Medium Priority ++entextmed 12003 udp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Medium Priority ++entextlow 12004 tcp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Low Priority ++entextlow 12004 udp IBM Enterprise Extender SNA [Eugene_Cox] [Eugene_Cox] ++ COS Low Priority ++dbisamserver1 12005 tcp DBISAM Database Server - [Tim_Young] [Tim_Young] 2002-05 ++ Regular ++dbisamserver1 12005 udp DBISAM Database Server - [Tim_Young] [Tim_Young] 2002-05 ++ Regular ++dbisamserver2 12006 tcp DBISAM Database Server - [Tim_Young] [Tim_Young] 2002-05 ++ Admin ++dbisamserver2 12006 udp DBISAM Database Server - [Tim_Young] [Tim_Young] 2002-05 ++ Admin ++accuracer 12007 tcp Accuracer Database System [Alexander_V_Ivanov] [Alexander_V_Ivanov] 2004-12 ++ Server ++accuracer 12007 udp Accuracer Database System [Alexander_V_Ivanov] [Alexander_V_Ivanov] 2004-12 ++ Server ++accuracer-dbms 12008 tcp Accuracer Database System [Alexander_V_Ivanov] [Alexander_V_Ivanov] 2004-12 ++ Admin ++accuracer-dbms 12008 udp Accuracer Database System [Alexander_V_Ivanov] [Alexander_V_Ivanov] 2004-12 ++ Admin ++ 12009 tcp Reserved ++ghvpn 12009 udp Green Hills VPN [Green_Hills_Software] [Tom_R_Zavisca] 2012-02-07 ++edbsrvr 12010 tcp ElevateDB Server [Tim_Young] [Tim_Young] 2009-05-06 ++ 12010 udp Reserved ++ 12011 Unassigned ++vipera 12012 tcp Vipera Messaging Service [Silvano_Maffeis_2] [Silvano_Maffeis_2] 2005-08 ++vipera 12012 udp Vipera Messaging Service [Silvano_Maffeis_2] [Silvano_Maffeis_2] 2005-08 ++vipera-ssl 12013 tcp Vipera Messaging Service [Silvano_Maffeis_2] [Silvano_Maffeis_2] 2008-01-16 ++ over SSL Communication ++vipera-ssl 12013 udp Vipera Messaging Service [Silvano_Maffeis_2] [Silvano_Maffeis_2] 2008-01-16 ++ over SSL Communication ++ 12014-12108 Unassigned ++rets-ssl 12109 tcp RETS over SSL [Bruce_Toback] [Bruce_Toback] 2003-02 ++rets-ssl 12109 udp RETS over SSL [Bruce_Toback] [Bruce_Toback] 2003-02 ++ 12110-12120 Unassigned ++nupaper-ss 12121 tcp NuPaper Session Service [David_Warden_2] [David_Warden_2] 2005-11 ++nupaper-ss 12121 udp NuPaper Session Service [David_Warden_2] [David_Warden_2] 2005-11 ++ 12122-12167 Unassigned ++cawas 12168 tcp CA Web Access Service [Jon_Press] [Jon_Press] 2005-08 ++cawas 12168 udp CA Web Access Service [Jon_Press] [Jon_Press] 2005-08 ++ 12169-12171 Unassigned ++hivep 12172 tcp HiveP [Dick_Augustsson] [Dick_Augustsson] ++hivep 12172 udp HiveP [Dick_Augustsson] [Dick_Augustsson] ++ 12173-12299 Unassigned ++linogridengine 12300 tcp LinoGrid Engine [Frans_Lundberg] [Frans_Lundberg] 2004-11 ++linogridengine 12300 udp LinoGrid Engine [Frans_Lundberg] [Frans_Lundberg] 2004-11 ++ 12301 Unassigned ++ Remote Administration Daemon ++ (RAD) is a system service ++rads 12302 tcp that offers secure, remote, [Oracle] [Devjani_Ray] 2012-04-20 ++ programmatic access to ++ Solaris system configuration ++ and run-time state ++ 12302 udp Reserved ++ 12303-12320 Unassigned ++warehouse-sss 12321 tcp Warehouse Monitoring Syst [Craig_Steffen] [Craig_Steffen] 2005-08 ++ SSS ++warehouse-sss 12321 udp Warehouse Monitoring Syst [Craig_Steffen] [Craig_Steffen] 2005-08 ++ SSS ++warehouse 12322 tcp Warehouse Monitoring Syst [Craig_Steffen] [Craig_Steffen] 2005-08 ++warehouse 12322 udp Warehouse Monitoring Syst [Craig_Steffen] [Craig_Steffen] 2005-08 ++ 12323-12344 Unassigned ++italk 12345 tcp Italk Chat System [Takayuki_Ito] [Takayuki_Ito] ++italk 12345 udp Italk Chat System [Takayuki_Ito] [Takayuki_Ito] ++ 12346-12752 Unassigned ++tsaf 12753 tcp tsaf port [Andreas_Fehr] [Andreas_Fehr] ++tsaf 12753 udp tsaf port [Andreas_Fehr] [Andreas_Fehr] ++ 12754-13159 Unassigned ++i-zipqd 13160 tcp I-ZIPQD [Chuck_Runquist] [Chuck_Runquist] ++i-zipqd 13160 udp I-ZIPQD [Chuck_Runquist] [Chuck_Runquist] ++ 13161-13215 Unassigned ++bcslogc 13216 tcp Black Crow Software [Ramindur_Singh] [Ramindur_Singh] 2008-12-04 ++ application logging ++bcslogc 13216 udp Black Crow Software [Ramindur_Singh] [Ramindur_Singh] 2008-12-04 ++ application logging ++rs-pias 13217 tcp R&S Proxy Installation [Guido_Kiener] [Guido_Kiener] 2008-12-04 ++ Assistant Service ++rs-pias 13217 udp R&S Proxy Installation [Guido_Kiener] [Guido_Kiener] 2008-12-04 ++ Assistant Service ++emc-vcas-tcp 13218 tcp EMC Virtual CAS Service ++emc-vcas-udp 13218 udp EMV Virtual CAS Service [Mark_O_Connell] [Mark_O_Connell] 2008-12-04 ++ Discovery ++ 13219-13222 Unassigned ++powwow-client 13223 tcp PowWow Client [Paul_K_Peterson] [Paul_K_Peterson] ++powwow-client 13223 udp PowWow Client [Paul_K_Peterson] [Paul_K_Peterson] ++powwow-server 13224 tcp PowWow Server [Paul_K_Peterson] [Paul_K_Peterson] ++powwow-server 13224 udp PowWow Server [Paul_K_Peterson] [Paul_K_Peterson] ++ 13225-13399 Unassigned ++doip-data 13400 tcp DoIP Data [Joerg_Schneider] [Joerg_Schneider] 2011-01-26 ++doip-disc 13400 udp DoIP Discovery [Joerg_Schneider] [Joerg_Schneider] 2011-01-26 ++ 13401-13719 Unassigned ++bprd 13720 tcp BPRD Protocol (VERITAS [Jeff_Holmbeck] [Jeff_Holmbeck] ++ NetBackup) ++bprd 13720 udp BPRD Protocol (VERITAS [Jeff_Holmbeck] [Jeff_Holmbeck] ++ NetBackup) ++bpdbm 13721 tcp BPDBM Protocol (VERITAS [Jeff_Holmbeck] [Jeff_Holmbeck] ++ NetBackup) ++bpdbm 13721 udp BPDBM Protocol (VERITAS [Jeff_Holmbeck] [Jeff_Holmbeck] ++ NetBackup) ++bpjava-msvc 13722 tcp BP Java MSVC Protocol [Tim_Schmidt] [Tim_Schmidt] ++bpjava-msvc 13722 udp BP Java MSVC Protocol [Tim_Schmidt] [Tim_Schmidt] ++ 13723 Unassigned ++vnetd 13724 tcp Veritas Network Utility [Jeff_Holmbeck] [Jeff_Holmbeck] ++vnetd 13724 udp Veritas Network Utility [Jeff_Holmbeck] [Jeff_Holmbeck] ++ 13725-13781 Unassigned ++bpcd 13782 tcp VERITAS NetBackup [Jeff_Holmbeck] [Jeff_Holmbeck] ++bpcd 13782 udp VERITAS NetBackup [Jeff_Holmbeck] [Jeff_Holmbeck] ++vopied 13783 tcp VOPIED Protocol [Jeff_Holmbeck] [Jeff_Holmbeck] ++vopied 13783 udp VOPIED Protocol [Jeff_Holmbeck] [Jeff_Holmbeck] ++ 13784 Unassigned ++nbdb 13785 tcp NetBackup Database [Pat_Tovo] [Pat_Tovo] 2004-12 ++nbdb 13785 udp NetBackup Database [Pat_Tovo] [Pat_Tovo] 2004-12 ++nomdb 13786 tcp Veritas-nomdb [Clayton_Haapala] [Clayton_Haapala] 2005-08 ++nomdb 13786 udp Veritas-nomdb [Clayton_Haapala] [Clayton_Haapala] 2005-08 ++ 13787-13817 Unassigned ++dsmcc-config 13818 tcp DSMCC Config [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-config 13818 udp DSMCC Config [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-session 13819 tcp DSMCC Session Messages [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-session 13819 udp DSMCC Session Messages [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-passthru 13820 tcp DSMCC Pass-Thru Messages [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-passthru 13820 udp DSMCC Pass-Thru Messages [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-download 13821 tcp DSMCC Download Protocol [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-download 13821 udp DSMCC Download Protocol [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++dsmcc-ccp 13822 tcp DSMCC Channel Change [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++ Protocol ++dsmcc-ccp 13822 udp DSMCC Channel Change [Tim_Addington] [Tim_Addington] [ISO/IEC 13818-6 MPEG-2 DSM-CC] ++ Protocol ++bmdss 13823 tcp Blackmagic Design Streaming [Sam_Vaughan] [Sam_Vaughan] 2011-03-01 ++ Server ++ 13823 udp Reserved ++ 13824-13928 Unassigned ++dta-systems 13929 tcp D-TA SYSTEMS [Alexis_Bose] [Alexis_Bose] 2008-12-08 ++dta-systems 13929 udp D-TA SYSTEMS [Alexis_Bose] [Alexis_Bose] 2008-12-08 ++medevolve 13930 tcp MedEvolve Port Requester [Jon_Robertson] [Jon_Robertson] 2008-10-24 ++ 13930 udp Reserved ++ 13931-13999 Unassigned ++scotty-ft 14000 tcp SCOTTY High-Speed [Patrick_Verbeek] [Patrick_Verbeek] 2007-05 ++ Filetransfer ++scotty-ft 14000 udp SCOTTY High-Speed [Patrick_Verbeek] [Patrick_Verbeek] 2007-05 ++ Filetransfer ++sua 14001 tcp SUA [Miguel_Angel_Garcia] [Miguel_Angel_Garcia] ++sua 14001 udp De-Registered [Miguel_Angel_Garcia] [Miguel_Angel_Garcia] 2001-06-06 ++sua 14001 sctp SUA [Miguel_Angel_Garcia] [Miguel_Angel_Garcia] ++ 14002-14032 Unassigned ++sage-best-com1 14033 tcp sage Best! Config Server 1 [Christian_Rubach] [Christian_Rubach] ++sage-best-com1 14033 udp sage Best! Config Server 1 [Christian_Rubach] [Christian_Rubach] ++sage-best-com2 14034 tcp sage Best! Config Server 2 [Christian_Rubach] [Christian_Rubach] ++sage-best-com2 14034 udp sage Best! Config Server 2 [Christian_Rubach] [Christian_Rubach] ++ 14035-14140 Unassigned ++vcs-app 14141 tcp VCS Application [Ming_Xu] [Ming_Xu] ++vcs-app 14141 udp VCS Application [Ming_Xu] [Ming_Xu] ++icpp 14142 tcp IceWall Cert Protocol [Tsutomu_Fujinami] [Tsutomu_Fujinami] 2005-08 ++icpp 14142 udp IceWall Cert Protocol [Tsutomu_Fujinami] [Tsutomu_Fujinami] 2005-08 ++ 14143-14144 Unassigned ++gcm-app 14145 tcp GCM Application [Ming_Xu] [Ming_Xu] ++gcm-app 14145 udp GCM Application [Ming_Xu] [Ming_Xu] ++ 14146-14148 Unassigned ++vrts-tdd 14149 tcp Veritas Traffic Director [Sameer_Deokule] [Sameer_Deokule] 2002-03 ++vrts-tdd 14149 udp Veritas Traffic Director [Sameer_Deokule] [Sameer_Deokule] 2002-03 ++vcscmd 14150 tcp Veritas Cluster Server [Anand_Bhalerao] [Anand_Bhalerao] 2008-10-02 ++ Command Server ++ 14150 udp Reserved ++ 14151-14153 Unassigned ++vad 14154 tcp Veritas Application Director [Rajeev_Verma] [Rajeev_Verma] 2006-02 ++vad 14154 udp Veritas Application Director [Rajeev_Verma] [Rajeev_Verma] 2006-02 ++ 14155-14249 Unassigned ++cps 14250 tcp Fencing Server [Mayank_Vasa] [Mayank_Vasa] 2008-04-03 ++cps 14250 udp Fencing Server [Mayank_Vasa] [Mayank_Vasa] 2008-04-03 ++ 14251-14413 Unassigned ++ca-web-update 14414 tcp CA eTrust Web Update Service [Robert_Ciochon] [Robert_Ciochon] 2006-08 ++ca-web-update 14414 udp CA eTrust Web Update Service [Robert_Ciochon] [Robert_Ciochon] 2006-08 ++ 14415-14935 Unassigned ++hde-lcesrvr-1 14936 tcp hde-lcesrvr-1 [Horizon_Digital_Ente] [Horizon_Digital_Ente] ++hde-lcesrvr-1 14936 udp hde-lcesrvr-1 [Horizon_Digital_Ente] [Horizon_Digital_Ente] ++hde-lcesrvr-2 14937 tcp hde-lcesrvr-2 [Horizon_Digital_Ente] [Horizon_Digital_Ente] ++hde-lcesrvr-2 14937 udp hde-lcesrvr-2 [Horizon_Digital_Ente] [Horizon_Digital_Ente] ++ 14938-14999 Unassigned ++hydap 15000 tcp Hypack Data Aquisition [HYPACK_Inc] [Mircea_Neacsu] 2011-10-27 ++hydap 15000 udp Hypack Data Aquisition [HYPACK_Inc] [Mircea_Neacsu] 2011-10-27 ++ 15001-15117 Unassigned ++ 15118 tcp Reserved ++ v2g Supply Equipment ++v2g-secc 15118 udp Communication Controller [Holger_Lochner] [Holger_Lochner] 2011-04-06 ++ Discovery Protocol ++ 15119-15344 Unassigned ++xpilot 15345 tcp XPilot Contact Port [Bert_Gijsbers] [Bert_Gijsbers] ++xpilot 15345 udp XPilot Contact Port [Bert_Gijsbers] [Bert_Gijsbers] ++ 15346-15362 Unassigned ++3link 15363 tcp 3Link Negotiation [Brant_Thomsen] [Brant_Thomsen] 2003-01 ++3link 15363 udp 3Link Negotiation [Brant_Thomsen] [Brant_Thomsen] 2003-01 ++ 15364-15554 Unassigned ++cisco-snat 15555 tcp Cisco Stateful NAT [Kaushik_Biswas] [Kaushik_Biswas] 2006-03 ++cisco-snat 15555 udp Cisco Stateful NAT [Kaushik_Biswas] [Kaushik_Biswas] 2006-03 ++ 15556-15659 Unassigned ++bex-xr 15660 tcp Backup Express Restore [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++ Server ++bex-xr 15660 udp Backup Express Restore [Chi_Shih_Chang] [Chi_Shih_Chang] 2008-03-19 ++ Server ++ 15661-15739 Unassigned ++ptp 15740 tcp Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> ++ptp 15740 udp Picture Transfer Protocol [Petronel_Bigioi] [Petronel_Bigioi] 2004-11 Defined TXT keys: guid=<Device guid> ++ 15741-15997 Unassigned ++ 15998 tcp Reserved ++2ping 15998 udp 2ping Bi-Directional Ping [Ryan_Finnie] [Ryan_Finnie] 2010-10-06 ++ Service ++programmar 15999 tcp ProGrammar Enterprise [Norman_Wilson] [Norman_Wilson] 2010-10-06 ++ 15999 udp Reserved ++fmsas 16000 tcp Administration Server Access [Mark_Davidson] [Mark_Davidson] 2010-10-06 ++ 16000 udp Reserved ++fmsascon 16001 tcp Administration Server [Mark_Davidson] [Mark_Davidson] 2010-10-06 ++ Connector ++ 16001 udp Reserved ++gsms 16002 tcp GoodSync Mediation Service [Vadim_Maslov] [Vadim_Maslov] 2010-10-06 ++ 16002 udp Reserved ++ 16003 tcp Reserved ++alfin 16003 udp Automation and Control by [Ing_Tomas_Halabala] [Ing_Tomas_Halabala] 2010-10-06 ++ REGULACE.ORG ++ 16004-16019 Unassigned ++jwpc 16020 tcp Filemaker Java Web [Robert_Parks] [Robert_Parks] 2010-05-12 ++ Publishing Core ++ 16020 udp Reserved ++jwpc-bin 16021 tcp Filemaker Java Web [Robert_Parks] [Robert_Parks] 2010-05-12 ++ Publishing Core Binary ++ 16021 udp Reserved ++ 16022-16160 Unassigned ++sun-sea-port 16161 tcp Solaris SEA Port [Dana_Porter] [Dana_Porter] 2003-10 ++sun-sea-port 16161 udp Solaris SEA Port [Dana_Porter] [Dana_Porter] 2003-10 ++solaris-audit 16162 tcp Solaris Audit - secure [Jan_Friedel] [Jan_Friedel] 2009-05-07 ++ remote audit log ++ 16162 udp Reserved ++ 16163-16308 Unassigned ++etb4j 16309 tcp etb4j [Christopher_R_Smith] [Christopher_R_Smith] 2004-11 ++etb4j 16309 udp etb4j [Christopher_R_Smith] [Christopher_R_Smith] 2004-11 ++pduncs 16310 tcp Policy Distribute, Update [Diane_I_Shannon] [Diane_I_Shannon] 2006-08 ++ Notification ++pduncs 16310 udp Policy Distribute, Update [Diane_I_Shannon] [Diane_I_Shannon] 2006-08 ++ Notification ++pdefmns 16311 tcp Policy definition and update [Diane_I_Shannon] [Diane_I_Shannon] 2007-04 ++ management ++pdefmns 16311 udp Policy definition and update [Diane_I_Shannon] [Diane_I_Shannon] 2007-04 ++ management ++ 16312-16359 Unassigned ++netserialext1 16360 tcp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports One ++netserialext1 16360 udp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports One ++netserialext2 16361 tcp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Two ++netserialext2 16361 udp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Two ++ 16362-16366 Unassigned ++netserialext3 16367 tcp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Three ++netserialext3 16367 udp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Three ++netserialext4 16368 tcp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Four ++netserialext4 16368 udp Network Serial Extension [Michael_J_Hoy] [Michael_J_Hoy] ++ Ports Four ++ 16369-16383 Unassigned ++connected 16384 tcp Connected Corp [Nicole_C_Ouellette] [Nicole_C_Ouellette] 2004-02 ++connected 16384 udp Connected Corp [Nicole_C_Ouellette] [Nicole_C_Ouellette] 2004-02 ++ 16385-16618 Unassigned ++xoms 16619 tcp X509 Objects Management [Francis_GASCHET] [Francis_GASCHET] 2008-09-08 ++ Service ++ 16619 udp Reserved ++ 16620-16665 Unassigned ++ 16666 tcp Reserved ++vtp 16666 udp Vidder Tunnel Protocol [Vidder_Inc] [Ted_Schroeder_2] 2011-10-24 ++ 16667-16899 Unassigned ++newbay-snc-mc 16900 tcp Newbay Mobile Client Update [Srinivasa_Nayudu] [Srinivasa_Nayudu] 2009-07-06 ++ Service ++newbay-snc-mc 16900 udp Newbay Mobile Client Update [Srinivasa_Nayudu] [Srinivasa_Nayudu] 2009-07-06 ++ Service ++ 16901-16949 Unassigned ++sgcip 16950 tcp Simple Generic Client [John_Aquilino] [John_Aquilino] ++ Interface Protocol ++sgcip 16950 udp Simple Generic Client [John_Aquilino] [John_Aquilino] ++ Interface Protocol ++ 16951-16990 Unassigned ++intel-rci-mp 16991 tcp INTEL-RCI-MP [Jane_Dashevsky] [Jane_Dashevsky] ++intel-rci-mp 16991 udp INTEL-RCI-MP [Jane_Dashevsky] [Jane_Dashevsky] ++amt-soap-http 16992 tcp Intel(R) AMT SOAP/HTTP [David_T_Hines] [David_T_Hines] 2005-02 ++amt-soap-http 16992 udp Intel(R) AMT SOAP/HTTP [David_T_Hines] [David_T_Hines] 2005-02 ++amt-soap-https 16993 tcp Intel(R) AMT SOAP/HTTPS [David_T_Hines] [David_T_Hines] 2005-02 ++amt-soap-https 16993 udp Intel(R) AMT SOAP/HTTPS [David_T_Hines] [David_T_Hines] 2005-02 ++amt-redir-tcp 16994 tcp Intel(R) AMT Redirection/TCP [Nimrod_Diamant] [Nimrod_Diamant] 2005-02 ++amt-redir-tcp 16994 udp Intel(R) AMT Redirection/TCP [Nimrod_Diamant] [Nimrod_Diamant] 2005-02 ++amt-redir-tls 16995 tcp Intel(R) AMT Redirection/TLS [Nimrod_Diamant] [Nimrod_Diamant] 2005-02 ++amt-redir-tls 16995 udp Intel(R) AMT Redirection/TLS [Nimrod_Diamant] [Nimrod_Diamant] 2005-02 ++ 16996-17006 Unassigned ++isode-dua 17007 tcp ++isode-dua 17007 udp ++ 17008-17184 Unassigned ++soundsvirtual 17185 tcp Sounds Virtual [Richard_Snider] [Richard_Snider] ++soundsvirtual 17185 udp Sounds Virtual [Richard_Snider] [Richard_Snider] ++ 17186-17218 Unassigned ++chipper 17219 tcp Chipper [Ronald_Jimmink] [Ronald_Jimmink] ++chipper 17219 udp Chipper [Ronald_Jimmink] [Ronald_Jimmink] ++ 17220 Unassigned ++ IEEE 1722.1 AVB Discovery, ++avdecc 17221 tcp Enumeration, Connection [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 ++ management, and Control ++ IEEE 1722.1 AVB Discovery, ++avdecc 17221 udp Enumeration, Connection [IEEE_1722_1] [Jeffrey_Daniel_Koftinoff] 2011-11-01 ++ management, and Control ++ 17222 tcp Reserved ++ Control Plane ++cpsp 17222 udp Synchronization Protocol [Randall_Stewart_2] [Randall_Stewart_2] 2011-11-10 ++ (SPSP) ++ 17223-17233 Unassigned ++integrius-stp 17234 tcp Integrius Secure Tunnel [Christian_Klemetsson] [Christian_Klemetsson] 2010-03-04 ++ Protocol ++integrius-stp 17234 udp Integrius Secure Tunnel [Christian_Klemetsson] [Christian_Klemetsson] 2010-03-04 ++ Protocol ++ssh-mgmt 17235 tcp SSH Tectia Manager [Ville_Laurikari] [Ville_Laurikari] 2005-08 ++ssh-mgmt 17235 udp SSH Tectia Manager [Ville_Laurikari] [Ville_Laurikari] 2005-08 ++ 17236-17499 Unassigned ++db-lsp 17500 tcp Dropbox LanSync Protocol [Paul_Bohm] [Paul_Bohm] 2010-01-21 ++db-lsp-disc 17500 udp Dropbox LanSync Discovery [Paul_Bohm] [Paul_Bohm] 2010-01-21 ++ 17501-17728 Unassigned ++ea 17729 tcp Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 ++ea 17729 udp Eclipse Aviation [William_Schmidt] [William_Schmidt] 2006-03 ++ 17730-17753 Unassigned ++zep 17754 tcp Encap. ZigBee Packets [Fred_Fierling] [Fred_Fierling] 2006-02 ++zep 17754 udp Encap. ZigBee Packets [Fred_Fierling] [Fred_Fierling] 2006-02 ++zigbee-ip 17755 tcp ZigBee IP Transport Service [Chris_Herzog] [Chris_Herzog] 2006-05 ++zigbee-ip 17755 udp ZigBee IP Transport Service [Chris_Herzog] [Chris_Herzog] 2006-05 ++zigbee-ips 17756 tcp ZigBee IP Transport Secure [Chris_Herzog] [Chris_Herzog] 2006-05 ++ Service ++zigbee-ips 17756 udp ZigBee IP Transport Secure [Chris_Herzog] [Chris_Herzog] 2006-05 ++ Service ++ 17757-17776 Unassigned ++sw-orion 17777 tcp SolarWinds Orion [Joel_Dolisy] [Joel_Dolisy] 2008-09-10 ++ 17777 udp Reserved ++ 17778-17999 Unassigned ++biimenu 18000 tcp Beckman Instruments, Inc. [R_L_Meyering] [R_L_Meyering] ++biimenu 18000 udp Beckman Instruments, Inc. [R_L_Meyering] [R_L_Meyering] ++ 18001-18103 Unassigned ++radpdf 18104 tcp RAD PDF Service [Christopher_Truxaw] [Christopher_Truxaw] 2010-10-15 ++ 18104 udp Reserved ++ 18105-18135 Unassigned ++racf 18136 tcp z/OS Resource Access Control [Bruce_Wells] [Bruce_Wells] 2010-10-04 ++ Facility ++ 18136 udp Reserved ++ 18137-18180 Unassigned ++opsec-cvp 18181 tcp OPSEC CVP [Alon_Kantor] [Alon_Kantor] ++opsec-cvp 18181 udp OPSEC CVP [Alon_Kantor] [Alon_Kantor] ++opsec-ufp 18182 tcp OPSEC UFP [Alon_Kantor] [Alon_Kantor] ++opsec-ufp 18182 udp OPSEC UFP [Alon_Kantor] [Alon_Kantor] ++opsec-sam 18183 tcp OPSEC SAM [Alon_Kantor] [Alon_Kantor] ++opsec-sam 18183 udp OPSEC SAM [Alon_Kantor] [Alon_Kantor] ++opsec-lea 18184 tcp OPSEC LEA [Alon_Kantor] [Alon_Kantor] ++opsec-lea 18184 udp OPSEC LEA [Alon_Kantor] [Alon_Kantor] ++opsec-omi 18185 tcp OPSEC OMI [Alon_Kantor] [Alon_Kantor] ++opsec-omi 18185 udp OPSEC OMI [Alon_Kantor] [Alon_Kantor] ++ohsc 18186 tcp Occupational Health SC [David_Fudge] [David_Fudge] 2003-08 ++ohsc 18186 udp Occupational Health Sc [David_Fudge] [David_Fudge] 2003-08 ++opsec-ela 18187 tcp OPSEC ELA [Alon_Kantor] [Alon_Kantor] ++opsec-ela 18187 udp OPSEC ELA [Alon_Kantor] [Alon_Kantor] ++ 18188-18240 Unassigned ++checkpoint-rtm 18241 tcp Check Point RTM [Dudi_Hazan] [Dudi_Hazan] ++checkpoint-rtm 18241 udp Check Point RTM [Dudi_Hazan] [Dudi_Hazan] ++ 18242-18261 Unassigned ++gv-pf 18262 tcp GV NetConfig Service [Scott_Libert] [Scott_Libert] 2008-01-29 ++gv-pf 18262 udp GV NetConfig Service [Scott_Libert] [Scott_Libert] 2008-01-29 ++ 18263-18462 Unassigned ++ac-cluster 18463 tcp AC Cluster [Lisa_Zhong] [Lisa_Zhong] ++ac-cluster 18463 udp AC Cluster [Lisa_Zhong] [Lisa_Zhong] ++ 18464-18633 Unassigned ++rds-ib 18634 tcp Reliable Datagram Service [Andy_Grover] [Andy_Grover] 2009-02-27 ++rds-ib 18634 udp Reliable Datagram Service [Andy_Grover] [Andy_Grover] 2009-02-27 ++rds-ip 18635 tcp Reliable Datagram Service [Andy_Grover] [Andy_Grover] 2009-05-20 ++ over IP ++rds-ip 18635 udp Reliable Datagram Service [Andy_Grover] [Andy_Grover] 2009-05-20 ++ over IP ++ 18636-18768 Unassigned ++ique 18769 tcp IQue Protocol [Avi_Drissman] [Avi_Drissman] 2002-07 ++ique 18769 udp IQue Protocol [Avi_Drissman] [Avi_Drissman] 2002-07 ++ 18770-18880 Unassigned ++infotos 18881 tcp Infotos [Marcel_Dube] [Marcel_Dube] 2004-11 ++infotos 18881 udp Infotos [Marcel_Dube] [Marcel_Dube] 2004-11 ++ 18882-18887 Unassigned ++apc-necmp 18888 tcp APCNECMP [Michael_Yip] [Michael_Yip] ++apc-necmp 18888 udp APCNECMP [Michael_Yip] [Michael_Yip] ++ 18889-18999 Unassigned ++igrid 19000 tcp iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 ++igrid 19000 udp iGrid Server [Massimo_Cafaro] [Massimo_Cafaro] 2004-11 ++ 19001-19019 Unassigned ++j-link 19020 tcp J-Link TCP/IP Protocol [SEGGER] [SEGGER] ++ 19020 udp Reserved ++ 19021-19190 Unassigned ++opsec-uaa 19191 tcp OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] ++opsec-uaa 19191 udp OPSEC UAA [Reuven_Harrison] [Reuven_Harrison] ++ 19192-19193 Unassigned ++ua-secureagent 19194 tcp UserAuthority SecureAgent [Reuven_Harrison_2] [Reuven_Harrison_2] 2003-01 ++ua-secureagent 19194 udp UserAuthority SecureAgent [Reuven_Harrison_2] [Reuven_Harrison_2] 2003-01 ++ 19195-19282 Unassigned ++keysrvr 19283 tcp Key Server for SASSAFRAS [Mark_Valence] [Mark_Valence] ++keysrvr 19283 udp Key Server for SASSAFRAS [Mark_Valence] [Mark_Valence] ++ 19284-19314 Unassigned ++keyshadow 19315 tcp Key Shadow for SASSAFRAS [Mark_Valence] [Mark_Valence] ++keyshadow 19315 udp Key Shadow for SASSAFRAS [Mark_Valence] [Mark_Valence] ++ 19316-19397 Unassigned ++mtrgtrans 19398 tcp mtrgtrans [Katsuhito_Muroi] [Katsuhito_Muroi] ++mtrgtrans 19398 udp mtrgtrans [Katsuhito_Muroi] [Katsuhito_Muroi] ++ 19399-19409 Unassigned ++hp-sco 19410 tcp hp-sco [Larry_Schwartz] [Larry_Schwartz] ++hp-sco 19410 udp hp-sco [Larry_Schwartz] [Larry_Schwartz] ++hp-sca 19411 tcp hp-sca [Larry_Schwartz] [Larry_Schwartz] ++hp-sca 19411 udp hp-sca [Larry_Schwartz] [Larry_Schwartz] ++hp-sessmon 19412 tcp HP-SESSMON [Gita_Murthy] [Gita_Murthy] ++hp-sessmon 19412 udp HP-SESSMON [Gita_Murthy] [Gita_Murthy] ++ 19413-19538 Unassigned ++fxuptp 19539 tcp FXUPTP [Keiji_Okuma] [Keiji_Okuma] 2005-08 ++fxuptp 19539 udp FXUPTP [Keiji_Okuma] [Keiji_Okuma] 2005-08 ++sxuptp 19540 tcp SXUPTP [Keiji_Okuma] [Keiji_Okuma] 2002-08 ++sxuptp 19540 udp SXUPTP [Keiji_Okuma] [Keiji_Okuma] 2002-08 ++jcp 19541 tcp JCP Client [Yuji_Sasaki] [Yuji_Sasaki] ++jcp 19541 udp JCP Client [Yuji_Sasaki] [Yuji_Sasaki] ++ 19542-19997 Unassigned ++iec-104-sec 19998 tcp IEC 60870-5-104 process [Grant_Gilchrist] [Grant_Gilchrist] 2010-10-18 ++ control - secure ++ 19998 udp Reserved ++dnp-sec 19999 tcp Distributed Network Protocol [Grant_Gilchrist] [Grant_Gilchrist] 2008-08-04 ++ - Secure ++dnp-sec 19999 udp Distributed Network Protocol [Grant_Gilchrist] [Grant_Gilchrist] 2008-08-04 ++ - Secure ++dnp 20000 tcp DNP [Michael_Thesing] [Michael_Thesing] ++dnp 20000 udp DNP [Michael_Thesing] [Michael_Thesing] ++microsan 20001 tcp MicroSAN [Thomas_E_Ludwig] [Thomas_E_Ludwig] 2004-02 ++microsan 20001 udp MicroSAN [Thomas_E_Ludwig] [Thomas_E_Ludwig] 2004-02 ++commtact-http 20002 tcp Commtact HTTP [Tomas_Svoboda] [Tomas_Svoboda] 2004-12 ++commtact-http 20002 udp Commtact HTTP [Tomas_Svoboda] [Tomas_Svoboda] 2004-12 ++commtact-https 20003 tcp Commtact HTTPS [Tomas_Svoboda] [Tomas_Svoboda] 2004-12 ++commtact-https 20003 udp Commtact HTTPS [Tomas_Svoboda] [Tomas_Svoboda] 2004-12 ++ 20004 Unassigned ++openwebnet 20005 tcp OpenWebNet protocol for [BTicino_S_p_A] [BTicino_S_p_A] 2008-04-09 ++ electric network ++openwebnet 20005 udp OpenWebNet protocol for [BTicino_S_p_A] [BTicino_S_p_A] 2008-04-09 ++ electric network ++ 20006-20011 Unassigned ++ 20012 tcp Reserved ++ss-idi-disc 20012 udp Samsung Interdevice [Hong_Jungkih] [Hong_Jungkih] ++ Interaction discovery ++ss-idi 20013 tcp Samsung Interdevice [Hong_Jungkih] [Hong_Jungkih] ++ Interaction ++ 20013 udp Reserved ++opendeploy 20014 tcp OpenDeploy Listener [Todd_Scallan] [Todd_Scallan] 2005-08 ++opendeploy 20014 udp OpenDeploy Listener [Todd_Scallan] [Todd_Scallan] 2005-08 ++ 20015-20033 Unassigned ++ NetBurner ID Port ++ ++nburn-id 20034 tcp IANA assigned this [Paul_Breed] [Paul_Breed] 2003-11 ++ well-formed service name as ++ a replacement for ++ "nburn_id". ++ This entry is an alias to "nburn-id". This entry is now ++nburn_id 20034 tcp NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service ++ discovery mechanisms. ++ NetBurner ID Port ++ ++nburn-id 20034 udp IANA assigned this [Paul_Breed] [Paul_Breed] 2003-11 ++ well-formed service name as ++ a replacement for ++ "nburn_id". ++ This entry is an alias to "nburn-id". This entry is now ++nburn_id 20034 udp NetBurner ID Port [Paul_Breed] [Paul_Breed] 2003-11 historic, not usable for use with many common service ++ discovery mechanisms. ++ 20035-20045 Unassigned ++tmophl7mts 20046 tcp TMOP HL7 Message Transfer [Tim_Riley] [Tim_Riley] 2009-07-31 ++ Service ++tmophl7mts 20046 udp TMOP HL7 Message Transfer [Tim_Riley] [Tim_Riley] 2009-07-31 ++ Service ++ 20047-20047 Unassigned ++mountd 20048 tcp NFS mount protocol [Nicolas_Williams] [Nicolas_Williams] 2010-08-09 ++mountd 20048 udp NFS mount protocol [Nicolas_Williams] [Nicolas_Williams] 2010-08-09 ++nfsrdma 20049 tcp Network File System (NFS) [RFC5666] ++ over RDMA ++nfsrdma 20049 udp Network File System (NFS) [RFC5666] ++ over RDMA ++nfsrdma 20049 sctp Network File System (NFS) [RFC5666] ++ over RDMA ++ 20050-20166 Unassigned ++tolfab 20167 tcp TOLfab Data Change [Pierre_Couderc] [Pierre_Couderc] 2006-03 ++tolfab 20167 udp TOLfab Data Change [Pierre_Couderc] [Pierre_Couderc] 2006-03 ++ 20168-20201 Unassigned ++ipdtp-port 20202 tcp IPD Tunneling Port [Vikki_Yin_Wei] [Vikki_Yin_Wei] 2003-01 ++ipdtp-port 20202 udp IPD Tunneling Port [Vikki_Yin_Wei] [Vikki_Yin_Wei] 2003-01 ++ 20203-20221 Unassigned ++ipulse-ics 20222 tcp iPulse-ICS [Meggie_Garica_Woodru] [Meggie_Garica_Woodru] ++ipulse-ics 20222 udp iPulse-ICS [Meggie_Garica_Woodru] [Meggie_Garica_Woodru] ++ 20223-20479 Unassigned ++emwavemsg 20480 tcp emWave Message Service [Harald_Striepe] [Harald_Striepe] 2008-02-14 ++emwavemsg 20480 udp emWave Message Service [Harald_Striepe] [Harald_Striepe] 2008-02-14 ++ 20481-20669 Unassigned ++track 20670 tcp Track [Michael_Sweet] [Michael_Sweet] ++track 20670 udp Track [Michael_Sweet] [Michael_Sweet] ++ 20671-20998 Unassigned ++athand-mmp 20999 tcp At Hand MMP [Stepan_Riha] [Stepan_Riha] ++athand-mmp 20999 udp AT Hand MMP [Stepan_Riha] [Stepan_Riha] ++irtrans 21000 tcp IRTrans Control [Marcus_Mueller] [Marcus_Mueller] 2004-11 ++irtrans 21000 udp IRTrans Control [Marcus_Mueller] [Marcus_Mueller] 2004-11 ++ 21001-21552 Unassigned ++rdm-tfs 21553 tcp Raima RDM TFS [Paul_Johnson] [Paul_Johnson] 2011-05-02 ++ 21553 udp Reserved ++dfserver 21554 tcp MineScape Design File Server [Michael_Purser] [Michael_Purser] 2006-06 ++dfserver 21554 udp MineScape Design File Server [Michael_Purser] [Michael_Purser] 2006-06 ++ 21555-21589 Unassigned ++vofr-gateway 21590 tcp VoFR Gateway [Marty_Borden] [Marty_Borden] ++vofr-gateway 21590 udp VoFR Gateway [Marty_Borden] [Marty_Borden] ++ 21591-21799 Unassigned ++tvpm 21800 tcp TVNC Pro Multiplexing [Brian_Blevins] [Brian_Blevins] ++tvpm 21800 udp TVNC Pro Multiplexing [Brian_Blevins] [Brian_Blevins] ++ 21801-21844 Unassigned ++webphone 21845 tcp webphone [Toby_Hosterman] [Toby_Hosterman] ++webphone 21845 udp webphone [Toby_Hosterman] [Toby_Hosterman] ++netspeak-is 21846 tcp NetSpeak Corp. Directory [Toby_Hosterman] [Toby_Hosterman] ++ Services ++netspeak-is 21846 udp NetSpeak Corp. Directory [Toby_Hosterman] [Toby_Hosterman] ++ Services ++netspeak-cs 21847 tcp NetSpeak Corp. Connection [Toby_Hosterman] [Toby_Hosterman] ++ Services ++netspeak-cs 21847 udp NetSpeak Corp. Connection [Toby_Hosterman] [Toby_Hosterman] ++ Services ++netspeak-acd 21848 tcp NetSpeak Corp. Automatic [Toby_Hosterman] [Toby_Hosterman] ++ Call Distribution ++netspeak-acd 21848 udp NetSpeak Corp. Automatic [Toby_Hosterman] [Toby_Hosterman] ++ Call Distribution ++netspeak-cps 21849 tcp NetSpeak Corp. Credit [Toby_Hosterman] [Toby_Hosterman] ++ Processing System ++netspeak-cps 21849 udp NetSpeak Corp. Credit [Toby_Hosterman] [Toby_Hosterman] ++ Processing System ++ 21850-21999 Unassigned ++snapenetio 22000 tcp SNAPenetIO [Kevin_Kuhns] [Kevin_Kuhns] ++snapenetio 22000 udp SNAPenetIO [Kevin_Kuhns] [Kevin_Kuhns] ++optocontrol 22001 tcp OptoControl [Kevin_Kuhns] [Kevin_Kuhns] ++optocontrol 22001 udp OptoControl [Kevin_Kuhns] [Kevin_Kuhns] ++optohost002 22002 tcp Opto Host Port 2 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost002 22002 udp Opto Host Port 2 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost003 22003 tcp Opto Host Port 3 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost003 22003 udp Opto Host Port 3 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost004 22004 tcp Opto Host Port 4 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost004 22004 udp Opto Host Port 4 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost004 22005 tcp Opto Host Port 5 [Doug_Leany] [Doug_Leany] 2006-09 ++optohost004 22005 udp Opto Host Port 5 [Doug_Leany] [Doug_Leany] 2006-09 ++ 22006-22124 Unassigned ++dcap 22125 tcp dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 ++ 22125 udp Reserved ++ 22126-22127 Unassigned ++gsidcap 22128 tcp GSI dCache Access Protocol [Christoph_Anton_Mitt] [Christoph_Anton_Mitt] 2009-03-10 ++ 22128 udp Reserved ++ 22129-22272 Unassigned ++wnn6 22273 tcp wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++wnn6 22273 udp wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++ 22274-22304 Unassigned ++cis 22305 tcp CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 ++cis 22305 udp CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 ++ 22306-22342 Unassigned ++cis-secure 22343 tcp CompactIS Secure Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 ++cis-secure 22343 udp CompactIS Secure Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16 ++ 22344-22346 Unassigned ++WibuKey 22347 tcp WibuKey Standard WkLan [Wolfgang_Voelker] [Wolfgang_Voelker] 2007-06 ++WibuKey 22347 udp WibuKey Standard WkLan [Wolfgang_Voelker] [Wolfgang_Voelker] 2007-06 ++ 22348-22349 Unassigned ++CodeMeter 22350 tcp CodeMeter Standard [Wolfgang_Voelker] [Wolfgang_Voelker] 2007-06 ++CodeMeter 22350 udp CodeMeter Standard [Wolfgang_Voelker] [Wolfgang_Voelker] 2007-06 ++ 22351-22536 Unassigned ++caldsoft-backup 22537 tcp CaldSoft Backup server file [CaldSoft] [Mark_Caldwell] 2011-08-12 ++ transfer ++ 22537 udp Reserved ++ 22538-22554 Unassigned ++vocaltec-wconf 22555 tcp Vocaltec Web Conference [Scott_Petrack] [Scott_Petrack] ++vocaltec-phone 22555 udp Vocaltec Internet Phone [Scott_Petrack] [Scott_Petrack] ++ 22556-22762 Unassigned ++talikaserver 22763 tcp Talika Main Server [Laxman_C_Marathe] [Laxman_C_Marathe] 2006-12 ++talikaserver 22763 udp Talika Main Server [Laxman_C_Marathe] [Laxman_C_Marathe] 2006-12 ++ 22764-22799 Unassigned ++aws-brf 22800 tcp Telerate Information [Timo_Sivonen] [Timo_Sivonen] ++ Platform LAN ++aws-brf 22800 udp Telerate Information [Timo_Sivonen] [Timo_Sivonen] ++ Platform LAN ++ 22801-22950 Unassigned ++brf-gw 22951 tcp Telerate Information [Timo_Sivonen] [Timo_Sivonen] ++ Platform WAN ++brf-gw 22951 udp Telerate Information [Timo_Sivonen] [Timo_Sivonen] ++ Platform WAN ++ 22952-22999 Unassigned ++inovaport1 23000 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 1 ++inovaport1 23000 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 1 ++inovaport2 23001 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 2 ++inovaport2 23001 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 2 ++inovaport3 23002 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 3 ++inovaport3 23002 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 3 ++inovaport4 23003 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 4 ++inovaport4 23003 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 4 ++inovaport5 23004 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 5 ++inovaport5 23004 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 5 ++inovaport6 23005 tcp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 6 ++inovaport6 23005 udp Inova LightLink Server Type [Chris_Koeritz_3] [Chris_Koeritz_3] 2006-10 ++ 6 ++ 23006-23052 Unassigned ++gntp 23053 tcp Generic Notification [Growl_Project] [Chris_Forsythe] 2012-02-07 ++ Transport Protocol ++ 23053 udp Reserved ++ 23054-23271 Unassigned ++ 23272 tcp Reserved ++s102 23272 udp S102 application [Kimmo_Kymalainen] [Kimmo_Kymalainen] 2009-08-26 ++ 23273-23332 Unassigned ++elxmgmt 23333 tcp Emulex HBAnyware Remote [Maziar_Tamadon] [Maziar_Tamadon] 2007-11-06 ++ Management ++elxmgmt 23333 udp Emulex HBAnyware Remote [Maziar_Tamadon] [Maziar_Tamadon] 2007-11-06 ++ Management ++ 23334-23399 Unassigned ++novar-dbase 23400 tcp Novar Data [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++novar-dbase 23400 udp Novar Data [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++novar-alarm 23401 tcp Novar Alarm [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++novar-alarm 23401 udp Novar Alarm [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++novar-global 23402 tcp Novar Global [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++novar-global 23402 udp Novar Global [Keith_Kilroy] [Keith_Kilroy] 2006-02 ++ 23403-23455 Unassigned ++aequus 23456 tcp Aequus Service [James_Anson] [James_Anson] 2009-02-12 ++ 23456 udp Reserved ++aequus-alt 23457 tcp Aequus Service Mgmt [James_Anson] [James_Anson] 2009-02-12 ++ 23457 udp Reserved ++ 23458-23545 Unassigned ++areaguard-neo 23546 tcp AreaGuard Neo - WebServer [SODATSW_spol] [Roman_Stepanek] 2012-05-31 ++ 23546 udp Reserved ++ 23547-23999 Unassigned ++med-ltp 24000 tcp med-ltp [Juergen_Fischbach] [Juergen_Fischbach] ++med-ltp 24000 udp med-ltp [Juergen_Fischbach] [Juergen_Fischbach] ++med-fsp-rx 24001 tcp med-fsp-rx [Juergen_Fischbach] [Juergen_Fischbach] ++med-fsp-rx 24001 udp med-fsp-rx [Juergen_Fischbach] [Juergen_Fischbach] ++med-fsp-tx 24002 tcp med-fsp-tx [Juergen_Fischbach] [Juergen_Fischbach] ++med-fsp-tx 24002 udp med-fsp-tx [Juergen_Fischbach] [Juergen_Fischbach] ++med-supp 24003 tcp med-supp [Juergen_Fischbach] [Juergen_Fischbach] ++med-supp 24003 udp med-supp [Juergen_Fischbach] [Juergen_Fischbach] ++med-ovw 24004 tcp med-ovw [Juergen_Fischbach] [Juergen_Fischbach] ++med-ovw 24004 udp med-ovw [Juergen_Fischbach] [Juergen_Fischbach] ++med-ci 24005 tcp med-ci [Juergen_Fischbach] [Juergen_Fischbach] ++med-ci 24005 udp med-ci [Juergen_Fischbach] [Juergen_Fischbach] ++med-net-svc 24006 tcp med-net-svc [Juergen_Fischbach] [Juergen_Fischbach] ++med-net-svc 24006 udp med-net-svc [Juergen_Fischbach] [Juergen_Fischbach] ++ 24007-24241 Unassigned ++filesphere 24242 tcp fileSphere [Carl_Cedergren] [Carl_Cedergren] ++filesphere 24242 udp fileSphere [Carl_Cedergren] [Carl_Cedergren] ++ 24243-24248 Unassigned ++vista-4gl 24249 tcp Vista 4GL [Mark_Itzcovitz] [Mark_Itzcovitz] ++vista-4gl 24249 udp Vista 4GL [Mark_Itzcovitz] [Mark_Itzcovitz] ++ 24250-24320 Unassigned ++ild 24321 tcp Isolv Local Directory [Mitchell_Bass] [Mitchell_Bass] 2005-08 ++ild 24321 udp Isolv Local Directory [Mitchell_Bass] [Mitchell_Bass] 2005-08 ++ 24322-24385 Unassigned ++ Intel RCI ++ ++intel-rci 24386 tcp IANA assigned this [Mark_Lewis_2] [Mark_Lewis_2] ++ well-formed service name as ++ a replacement for ++ "intel_rci". ++ This entry is an alias to "intel-rci". This entry is now ++intel_rci 24386 tcp Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service ++ discovery mechanisms. ++ Intel RCI ++ ++intel-rci 24386 udp IANA assigned this [Mark_Lewis_2] [Mark_Lewis_2] ++ well-formed service name as ++ a replacement for ++ "intel_rci". ++ This entry is an alias to "intel-rci". This entry is now ++intel_rci 24386 udp Intel RCI [Mark_Lewis_2] [Mark_Lewis_2] historic, not usable for use with many common service ++ discovery mechanisms. ++ 24387-24464 Unassigned ++tonidods 24465 tcp Tonido Domain Server [Madhan_Kanagavel] [Madhan_Kanagavel] 2008-07-18 ++tonidods 24465 udp Tonido Domain Server [Madhan_Kanagavel] [Madhan_Kanagavel] 2008-07-18 ++ 24466-24553 Unassigned ++binkp 24554 tcp BINKP [Max_Masyutin] [Max_Masyutin] ++binkp 24554 udp BINKP [Max_Masyutin] [Max_Masyutin] ++ 24555-24675 Unassigned ++canditv 24676 tcp Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10 ++canditv 24676 udp Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10 ++flashfiler 24677 tcp FlashFiler [Ben_Oram] [Ben_Oram] ++flashfiler 24677 udp FlashFiler [Ben_Oram] [Ben_Oram] ++proactivate 24678 tcp Turbopower Proactivate [Ben_Oram] [Ben_Oram] ++proactivate 24678 udp Turbopower Proactivate [Ben_Oram] [Ben_Oram] ++ 24679 Unassigned ++tcc-http 24680 tcp TCC User HTTP Service [Brian_Kennedy] [Brian_Kennedy] 2006-08 ++tcc-http 24680 udp TCC User HTTP Service [Brian_Kennedy] [Brian_Kennedy] 2006-08 ++ 24681-24753 Unassigned ++cslg 24754 tcp Citrix StorageLink Gateway [Mark_Nijmeijer] [Mark_Nijmeijer] 2009-04-17 ++ 24754 udp Reserved ++ 24755-24921 Unassigned ++find 24922 tcp Find Identification of [Jean_Paul_Moreaux] [Jean_Paul_Moreaux] ++ Network Devices ++find 24922 udp Find Identification of [Jean_Paul_Moreaux] [Jean_Paul_Moreaux] ++ Network Devices ++ 24923-24999 Unassigned ++icl-twobase1 25000 tcp icl-twobase1 [J_A_Sever] [J_A_Sever] ++icl-twobase1 25000 udp icl-twobase1 [J_A_Sever] [J_A_Sever] ++icl-twobase2 25001 tcp icl-twobase2 [J_A_Sever] [J_A_Sever] ++icl-twobase2 25001 udp icl-twobase2 [J_A_Sever] [J_A_Sever] ++icl-twobase3 25002 tcp icl-twobase3 [J_A_Sever] [J_A_Sever] ++icl-twobase3 25002 udp icl-twobase3 [J_A_Sever] [J_A_Sever] ++icl-twobase4 25003 tcp icl-twobase4 [J_A_Sever] [J_A_Sever] ++icl-twobase4 25003 udp icl-twobase4 [J_A_Sever] [J_A_Sever] ++icl-twobase5 25004 tcp icl-twobase5 [J_A_Sever] [J_A_Sever] ++icl-twobase5 25004 udp icl-twobase5 [J_A_Sever] [J_A_Sever] ++icl-twobase6 25005 tcp icl-twobase6 [J_A_Sever] [J_A_Sever] ++icl-twobase6 25005 udp icl-twobase6 [J_A_Sever] [J_A_Sever] ++icl-twobase7 25006 tcp icl-twobase7 [J_A_Sever] [J_A_Sever] ++icl-twobase7 25006 udp icl-twobase7 [J_A_Sever] [J_A_Sever] ++icl-twobase8 25007 tcp icl-twobase8 [J_A_Sever] [J_A_Sever] ++icl-twobase8 25007 udp icl-twobase8 [J_A_Sever] [J_A_Sever] ++icl-twobase9 25008 tcp icl-twobase9 [J_A_Sever] [J_A_Sever] ++icl-twobase9 25008 udp icl-twobase9 [J_A_Sever] [J_A_Sever] ++icl-twobase10 25009 tcp icl-twobase10 [J_A_Sever] [J_A_Sever] ++icl-twobase10 25009 udp icl-twobase10 [J_A_Sever] [J_A_Sever] ++ 25010-25470 Unassigned ++rna 25471 sctp RNSAP User Adaptation for [Dario_S_Tonesi] [Dario_S_Tonesi] 2011-02-07 ++ Iurh ++ 25472-25575 Unassigned ++sauterdongle 25576 tcp Sauter Dongle [Christian_Brecht] [Christian_Brecht] 2010-12-15 ++ 25576 udp Reserved ++ 25577-25603 Unassigned ++idtp 25604 tcp Identifier Tracing Protocol [Huang_Neng-geng] [Huang_Neng-geng] 2011-08-09 ++ 25604 udp Reserved ++ 25605-25792 Unassigned ++vocaltec-hos 25793 tcp Vocaltec Address Server [Scott_Petrack] [Scott_Petrack] ++vocaltec-hos 25793 udp Vocaltec Address Server [Scott_Petrack] [Scott_Petrack] ++ 25794-25899 Unassigned ++tasp-net 25900 tcp TASP Network Comm [Martin_Ellis] [Martin_Ellis] 2004-11 ++tasp-net 25900 udp TASP Network Comm [Martin_Ellis] [Martin_Ellis] 2004-11 ++niobserver 25901 tcp NIObserver [Roman_Oliynyk] [Roman_Oliynyk] ++niobserver 25901 udp NIObserver [Roman_Oliynyk] [Roman_Oliynyk] ++nilinkanalyst 25902 tcp NILinkAnalyst [Roman_Oliynyk_2] [Roman_Oliynyk_2] 2007-08-30 ++nilinkanalyst 25902 udp NILinkAnalyst [Roman_Oliynyk_2] [Roman_Oliynyk_2] 2007-08-30 ++niprobe 25903 tcp NIProbe [Roman_Oliynyk] [Roman_Oliynyk] ++niprobe 25903 udp NIProbe [Roman_Oliynyk] [Roman_Oliynyk] ++ 25904-25999 Unassigned ++quake 26000 tcp quake [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++quake 26000 udp quake [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++ 26001-26132 Unassigned ++ Symbolic Computation ++scscp 26133 tcp Software Composability [Alexander_Konovalov] [Alexander_Konovalov] 2007-11-27 ++ Protocol ++ Symbolic Computation ++scscp 26133 udp Software Composability [Alexander_Konovalov] [Alexander_Konovalov] 2007-11-27 ++ Protocol ++ 26134-26207 Unassigned ++wnn6-ds 26208 tcp wnn6-ds [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++wnn6-ds 26208 udp wnn6-ds [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit] ++ 26209-26259 Unassigned ++ezproxy 26260 tcp eZproxy [Albert_C_Yang] [Albert_C_Yang] ++ezproxy 26260 udp eZproxy [Albert_C_Yang] [Albert_C_Yang] ++ezmeeting 26261 tcp eZmeeting [Albert_C_Yang] [Albert_C_Yang] ++ezmeeting 26261 udp eZmeeting [Albert_C_Yang] [Albert_C_Yang] ++k3software-svr 26262 tcp K3 Software-Server [Jim_Baldridge] [Jim_Baldridge] ++k3software-svr 26262 udp K3 Software-Server [Jim_Baldridge] [Jim_Baldridge] ++k3software-cli 26263 tcp K3 Software-Client [Jim_Baldridge] [Jim_Baldridge] ++k3software-cli 26263 udp K3 Software-Client [Jim_Baldridge] [Jim_Baldridge] ++ 26264 De-registered 2006-04-06 ++ 26265-26485 Unassigned ++exoline-tcp 26486 tcp EXOline-TCP [Lars_Mattsson] [Lars_Mattsson] 2008-12-24 ++exoline-udp 26486 udp EXOline-UDP [Lars_Mattsson] [Lars_Mattsson] 2008-12-24 ++exoconfig 26487 tcp EXOconfig [Urban_Fosseus] [Urban_Fosseus] 2008-12-24 ++exoconfig 26487 udp EXOconfig [Urban_Fosseus] [Urban_Fosseus] 2008-12-24 ++ 26488 Unassigned ++exonet 26489 tcp EXOnet [Urban_Fosseus] [Urban_Fosseus] 2008-12-24 ++exonet 26489 udp EXOnet [Urban_Fosseus] [Urban_Fosseus] 2008-12-24 ++ 26490-26999 Unassigned ++flex-lm 27000-27009 FLEX LM (1-10) [Daniel_Birns] [Daniel_Birns] ++ 27010-27344 Unassigned ++imagepump 27345 tcp ImagePump [Richard_Minner] [Richard_Minner] ++imagepump 27345 udp ImagePump [Richard_Minner] [Richard_Minner] ++ 27346-27441 Unassigned ++jesmsjc 27442 tcp Job controller service [Chris_Newman] [Chris_Newman] 2010-10-15 ++jesmsjc 27442 udp Job controller service [Chris_Newman] [Chris_Newman] 2010-10-15 ++ 27443-27503 Unassigned ++kopek-httphead 27504 tcp Kopek HTTP Head Port [Sten_H_Danielsen] [Sten_H_Danielsen] 2002-07 ++kopek-httphead 27504 udp Kopek HTTP Head Port [Sten_H_Danielsen] [Sten_H_Danielsen] 2002-07 ++ 27505-27781 Unassigned ++ars-vista 27782 tcp ARS VISTA Application [Spencer_Teran_2] [Spencer_Teran_2] 2004-11 ++ars-vista 27782 udp ARS VISTA Application [Spencer_Teran_2] [Spencer_Teran_2] 2004-11 ++ 27783-27998 Unassigned ++tw-auth-key 27999 tcp TW Authentication/Key [Alex_Duncan_2] [Alex_Duncan_2] ++ Distribution and ++tw-auth-key 27999 udp Attribute Certificate [Alex_Duncan_2] [Alex_Duncan_2] ++ Services ++nxlmd 28000 tcp NX License Manager [Anthony_Greatorex] [Anthony_Greatorex] 2004-11 ++nxlmd 28000 udp NX License Manager [Anthony_Greatorex] [Anthony_Greatorex] 2004-11 ++pqsp 28001 tcp PQ Service [Peter_Laschtowitz] [Peter_Laschtowitz] 2009-09-15 ++ 28001 udp Reserved ++ 28002-28239 Unassigned ++siemensgsm 28240 tcp Siemens GSM [David_Anuszewski] [David_Anuszewski] 2004-11 ++siemensgsm 28240 udp Siemens GSM [David_Anuszewski] [David_Anuszewski] 2004-11 ++ 28241-29117 Unassigned ++ 29118 tcp Reserved ++ 29118 udp Reserved ++sgsap 29118 sctp SGsAP in 3GPP [GPP_Specifications] [GPP_Specifications] 2009-06-11 ++ 28119 tcp Reserved ++a27-ran-ran 28119 udp A27 cdma2000 RAN Management [ThreeGPP2] [Zhiming_Li] 2012-04-13 ++ 28120-29166 Unassigned ++otmp 29167 tcp ObTools Message Protocol [Paul_Clark] [Paul_Clark] 2006-02 ++otmp 29167 udp ObTools Message Protocol [Paul_Clark] [Paul_Clark] 2006-02 ++ 29168 tcp Reserved ++ 29168 udp Reserved ++sbcap 29168 sctp SBcAP in 3GPP [GPP_Specifications] [GPP_Specifications] 2009-06-11 ++iuhsctpassoc 29169 sctp HNBAP and RUA Common [John_Meredith] [John_Meredith] 2009-09-08 ++ Association ++ 29170-30000 Unassigned ++pago-services1 30001 tcp Pago Services 1 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03 ++pago-services1 30001 udp Pago Services 1 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03 ++pago-services2 30002 tcp Pago Services 2 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03 ++pago-services2 30002 udp Pago Services 2 [Balduin_Mueller_Plat] [Balduin_Mueller_Plat] 2002-03 ++ 30003-30259 Unassigned ++kingdomsonline 30260 tcp Kingdoms Online [Drake_Bankston] [Drake_Bankston] 2009-08-18 ++ (CraigAvenue) ++kingdomsonline 30260 udp Kingdoms Online [Drake_Bankston] [Drake_Bankston] 2009-08-18 ++ (CraigAvenue) ++ 30261-30998 Unassigned ++ovobs 30999 tcp OpenView Service Desk Client [Service_Desk_Product] [Service_Desk_Product] 2006-05 ++ovobs 30999 udp OpenView Service Desk Client [Service_Desk_Product] [Service_Desk_Product] 2006-05 ++ 31000-31019 Unassigned ++autotrac-acp 31020 tcp Autotrac ACP 245 [Roberto_Jorge_Dino] [Roberto_Jorge_Dino] ++ 31020 udp Reserved ++ 31021-31028 Unassigned ++ 31029 tcp Reserved ++yawn 31029 udp YaWN - Yet Another Windows [David_Spivey] [David_Spivey] 2010-08-30 ++ Notifier ++ 31030-31415 Unassigned ++xqosd 31416 tcp XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 ++xqosd 31416 udp XQoS network monitor [Joe_Elliott] [Joe_Elliott] 2002-06 ++ 31417-31456 Unassigned ++tetrinet 31457 tcp TetriNET Protocol [Emmanuel_Bourg] [Emmanuel_Bourg] 2004-11 ++tetrinet 31457 udp TetriNET Protocol [Emmanuel_Bourg] [Emmanuel_Bourg] 2004-11 ++ 31458-31619 Unassigned ++lm-mon 31620 tcp lm mon [System_Administrator] [System_Administrator] 2003-06 ++lm-mon 31620 udp lm mon [System_Administrator] [System_Administrator] 2003-06 ++ 31621-31684 Unassigned ++ DS Expert Monitor ++ ++dsx-monitor 31685 tcp IANA assigned this [John_Lowery] [John_Lowery] 2008-08-21 ++ well-formed service name as ++ a replacement for ++ "dsx_monitor". ++ This entry is an alias to "dsx-monitor". This entry is now ++dsx_monitor 31685 tcp DS Expert Monitor [John_Lowery] [John_Lowery] 2008-08-21 historic, not usable for use with many common service ++ discovery mechanisms. ++ 31685 udp Reserved ++ 31686-31764 Unassigned ++gamesmith-port 31765 tcp GameSmith Port [Randy_Thompson] [Randy_Thompson] 2002-08 ++gamesmith-port 31765 udp GameSmith Port [Randy_Thompson] [Randy_Thompson] 2002-08 ++ 31766-31947 Unassigned ++ Embedded Device ++ Configuration Protocol TX ++ ++iceedcp-tx 31948 tcp IANA assigned this [Oliver_Lewis] [Oliver_Lewis] 2006-08 ++ well-formed service name as ++ a replacement for ++ "iceedcp_tx". ++ Embedded Device This entry is an alias to "iceedcp-tx". This entry is now ++iceedcp_tx 31948 tcp Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Embedded Device ++ Configuration Protocol TX ++ ++iceedcp-tx 31948 udp IANA assigned this [Oliver_Lewis] [Oliver_Lewis] 2006-08 ++ well-formed service name as ++ a replacement for ++ "iceedcp_tx". ++ Embedded Device This entry is an alias to "iceedcp-tx". This entry is now ++iceedcp_tx 31948 udp Configuration Protocol TX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Embedded Device ++ Configuration Protocol RX ++ ++iceedcp-rx 31949 tcp IANA assigned this [Oliver_Lewis] [Oliver_Lewis] 2006-08 ++ well-formed service name as ++ a replacement for ++ "iceedcp_rx". ++ Embedded Device This entry is an alias to "iceedcp-rx". This entry is now ++iceedcp_rx 31949 tcp Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ Embedded Device ++ Configuration Protocol RX ++ ++iceedcp-rx 31949 udp IANA assigned this [Oliver_Lewis] [Oliver_Lewis] 2006-08 ++ well-formed service name as ++ a replacement for ++ "iceedcp_rx". ++ Embedded Device This entry is an alias to "iceedcp-rx". This entry is now ++iceedcp_rx 31949 udp Configuration Protocol RX [Oliver_Lewis] [Oliver_Lewis] 2006-08 historic, not usable for use with many common service ++ discovery mechanisms. ++ 31950-32248 Unassigned ++iracinghelper 32034 tcp iRacing helper service [Randy_Cassidy] [Randy_Cassidy] 2007-08-30 ++iracinghelper 32034 udp iRacing helper service [Randy_Cassidy] [Randy_Cassidy] 2007-08-30 ++ 31950-32248 Unassigned ++t1distproc60 32249 tcp T1 Distributed Processor [Peter_Beahan] [Peter_Beahan] 2004-11 ++t1distproc60 32249 udp T1 Distributed Processor [Peter_Beahan] [Peter_Beahan] 2004-11 ++ 32250-32482 Unassigned ++apm-link 32483 tcp Access Point Manager Link [Tony_Diodato] [Tony_Diodato] 2005-08 ++apm-link 32483 udp Access Point Manager Link [Tony_Diodato] [Tony_Diodato] 2005-08 ++ 32484-32634 Unassigned ++sec-ntb-clnt 32635 tcp SecureNotebook-CLNT [Eric_Cantineau] [Eric_Cantineau] 2004-11 ++sec-ntb-clnt 32635 udp SecureNotebook-CLNT [Eric_Cantineau] [Eric_Cantineau] 2004-11 ++DMExpress 32636 tcp DMExpress [Arnie_Farrelly] [Arnie_Farrelly] ++DMExpress 32636 udp DMExpress [Arnie_Farrelly] [Arnie_Farrelly] ++ 32637-32766 Unassigned ++filenet-powsrm 32767 tcp FileNet BPM [Chris_Adkins] [Chris_Adkins] 2006-08 ++ WS-ReliableMessaging Client ++filenet-powsrm 32767 udp FileNet BPM [Chris_Adkins] [Chris_Adkins] 2006-08 ++ WS-ReliableMessaging Client ++filenet-tms 32768 tcp Filenet TMS [Daniel_Whelan] [Daniel_Whelan] ++filenet-tms 32768 udp Filenet TMS [Daniel_Whelan] [Daniel_Whelan] ++filenet-rpc 32769 tcp Filenet RPC [Daniel_Whelan] [Daniel_Whelan] ++filenet-rpc 32769 udp Filenet RPC [Daniel_Whelan] [Daniel_Whelan] ++filenet-nch 32770 tcp Filenet NCH [Daniel_Whelan] [Daniel_Whelan] ++filenet-nch 32770 udp Filenet NCH [Daniel_Whelan] [Daniel_Whelan] ++filenet-rmi 32771 tcp FileNET RMI [Chris_Adkins] [Chris_Adkins] ++filenet-rmi 32771 udp FileNet RMI [Chris_Adkins] [Chris_Adkins] ++filenet-pa 32772 tcp FileNET Process Analyzer [Chris_Adkins] [Chris_Adkins] 2003-01 ++filenet-pa 32772 udp FileNET Process Analyzer [Chris_Adkins] [Chris_Adkins] 2003-01 ++filenet-cm 32773 tcp FileNET Component Manager [Chris_Adkins] [Chris_Adkins] 2003-08 ++filenet-cm 32773 udp FileNET Component Manager [Chris_Adkins] [Chris_Adkins] 2003-08 ++filenet-re 32774 tcp FileNET Rules Engine [Chris_Adkins] [Chris_Adkins] 2003-08 ++filenet-re 32774 udp FileNET Rules Engine [Chris_Adkins] [Chris_Adkins] 2003-08 ++filenet-pch 32775 tcp Performance Clearinghouse [Tim_Morgan_2] [Tim_Morgan_2] 2005-11 ++filenet-pch 32775 udp Performance Clearinghouse [Tim_Morgan_2] [Tim_Morgan_2] 2005-11 ++filenet-peior 32776 tcp FileNET BPM IOR [Chris_Adkins] [Chris_Adkins] 2006-05 ++filenet-peior 32776 udp FileNET BPM IOR [Chris_Adkins] [Chris_Adkins] 2006-05 ++filenet-obrok 32777 tcp FileNet BPM CORBA [Chris_Adkins] [Chris_Adkins] 2006-10 ++filenet-obrok 32777 udp FileNet BPM CORBA [Chris_Adkins] [Chris_Adkins] 2006-10 ++ 32778-32800 Unassigned ++mlsn 32801 tcp Multiple Listing Service [Corey_Leong] [Corey_Leong] 2010-10-11 ++ Network ++mlsn 32801 udp Multiple Listing Service [Corey_Leong] [Corey_Leong] 2010-10-11 ++ Network ++ 32802-32810 Unassigned ++retp 32811 tcp Real Estate Transport [Corey_Leong] [Corey_Leong] 2010-10-11 ++ Protocol ++ 32811 udp Reserved ++ 32812-32895 Unassigned ++idmgratm 32896 tcp Attachmate ID Manager [George_Gianelos_2] [George_Gianelos_2] 2003-03 ++idmgratm 32896 udp Attachmate ID Manager [George_Gianelos_2] [George_Gianelos_2] 2003-03 ++ 32897-33122 Unassigned ++aurora-balaena 33123 tcp Aurora (Balaena Ltd) [Andrew_Mather] [Andrew_Mather] 2008-02-14 ++aurora-balaena 33123 udp Aurora (Balaena Ltd) [Andrew_Mather] [Andrew_Mather] 2008-02-14 ++ 33124-33330 Unassigned ++diamondport 33331 tcp DiamondCentral Interface [Edward_Browdy] [Edward_Browdy] 2002-07 ++diamondport 33331 udp DiamondCentral Interface [Edward_Browdy] [Edward_Browdy] 2002-07 ++ 33332 Unassigned ++dgi-serv 33333 tcp Digital Gaslight Service [George_Flanagin] [George_Flanagin] 2010-03-02 ++ 33333 udp Reserved ++speedtrace 33334 tcp SpeedTrace TraceAgent [Holger_Heinrich] [Holger_Heinrich] 2012-02-01 ++speedtrace-disc 33334 udp SpeedTrace TraceAgent [Holger_Heinrich] [Holger_Heinrich] 2012-02-01 ++ Discovery ++ 33335-33433 Unassigned ++traceroute 33434 tcp traceroute use [IANA] [IANA] ++traceroute 33434 udp traceroute use [IANA] [IANA] ++ 33435-33655 Unassigned ++snip-slave 33656 tcp SNIP Slave [Dr_Chris_Tucker] [Dr_Chris_Tucker] 2005-08 ++snip-slave 33656 udp SNIP Slave [Dr_Chris_Tucker] [Dr_Chris_Tucker] 2005-08 ++ 33657-34248 Unassigned ++turbonote-2 34249 tcp TurboNote Relay Server [Peter_Hyde] [Peter_Hyde] ++ Default Port ++turbonote-2 34249 udp TurboNote Relay Server [Peter_Hyde] [Peter_Hyde] ++ Default Port ++ 34250-34377 Unassigned ++p-net-local 34378 tcp P-Net on IP local [Kurt_Nissen] [Kurt_Nissen] 2004-02 ++p-net-local 34378 udp P-Net on IP local [Kurt_Nissen] [Kurt_Nissen] 2004-02 ++p-net-remote 34379 tcp P-Net on IP remote [Kurt_Nissen] [Kurt_Nissen] 2004-02 ++p-net-remote 34379 udp P-Net on IP remote [Kurt_Nissen] [Kurt_Nissen] 2004-02 ++ 34380-34566 Unassigned ++dhanalakshmi 34567 tcp dhanalakshmi.org EDI Service [Girish_Gopalakrishna] [Girish_Gopalakrishna] 2010-04-20 ++ 34567 udp Reserved ++ 34568-34961 Unassigned ++profinet-rt 34962 tcp PROFInet RT Unicast [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++profinet-rt 34962 udp PROFInet RT Unicast [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++profinet-rtm 34963 tcp PROFInet RT Multicast [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++profinet-rtm 34963 udp PROFInet RT Multicast [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++profinet-cm 34964 tcp PROFInet Context Manager [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++profinet-cm 34964 udp PROFInet Context Manager [Peter_Wenzel] [Peter_Wenzel] 2004-11 ++ 34965-34979 Unassigned ++ethercat 34980 tcp EtherCAT Port [Martin_Rostan] [Martin_Rostan] 2003-11 ++ethercat 34980 udp EhterCAT Port [Martin_Rostan] [Martin_Rostan] 2003-11 ++ 34981-35353 Unassigned ++kitim 35354 tcp KIT Messenger [Rudi_Visser] [Rudi_Visser] 2011-07-07 ++ 35354 udp Reserved ++altova-lm 35355 tcp Altova License Management [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 ++altova-lm-disc 35355 udp Altova License Management [Alexander_Falk_2] [Alexander_Falk_2] 2011-07-07 ++ Discovery ++guttersnex 35356 tcp Gutters Note Exchange [Squee_Application_Development] [Tristan_Seifert_2] 2011-07-19 ++ 35356 udp Reserved ++openstack-id 35357 tcp OpenStack ID Service [Rackspace_Hosting] [Ziad_Sawalha] 2011-08-15 ++ 35357 udp Reserved ++ 35358-36000 Unassigned ++allpeers 36001 tcp AllPeers Network [Cedric_Maloux] [Cedric_Maloux] 2007-04 ++allpeers 36001 udp AllPeers Network [Cedric_Maloux] [Cedric_Maloux] 2007-04 ++ 36002-36411 Unassigned ++ 36412 tcp Reserved ++ 36412 udp Reserved ++s1-control 36412 sctp S1-Control Plane (3GPP) [Kimmo_Kymalainen] [Kimmo_Kymalainen] 2009-09-01 ++ 36413-36421 Unassigned ++ 36422 tcp Reserved ++ 36422 udp Reserved ++x2-control 36422 sctp X2-Control Plane (3GPP) [Kimmo_Kymalainen] [Kimmo_Kymalainen] 2009-09-01 ++ 36423-36442 Unassigned ++m2ap 36443 sctp M2 Application Part [Dario_S_Tonesi] [Dario_S_Tonesi] 2011-02-07 ++m3ap 36444 sctp M3 Application Part [Dario_S_Tonesi] [Dario_S_Tonesi] 2011-02-07 ++ 36445-36523 Unassigned ++febooti-aw 36524 tcp Febooti Automation Workshop [Maris_Bormanis] [Maris_Bormanis] 2011-06-10 ++ 36524 udp Reserved ++ 36525-36864 Unassigned ++kastenxpipe 36865 tcp KastenX Pipe [Guy_Cheng] [Guy_Cheng] ++kastenxpipe 36865 udp KastenX Pipe [Guy_Cheng] [Guy_Cheng] ++ 36866-37474 Unassigned ++neckar 37475 tcp science + computing's Venus [Ralf_Allrutz] [Ralf_Allrutz] 2002-02 ++ Administration Port ++neckar 37475 udp science + computing's Venus [Ralf_Allrutz] [Ralf_Allrutz] 2002-02 ++ Administration Port ++ 37476-37653 Unassigned ++unisys-eportal 37654 tcp Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 ++unisys-eportal 37654 udp Unisys ClearPath ePortal [Sung_U_Ro] [Sung_U_Ro] 2006-01 ++ 37655-38200 Unassigned ++galaxy7-data 38201 tcp Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 ++galaxy7-data 38201 udp Galaxy7 Data Tunnel [Tatham_Oddie] [Tatham_Oddie] 2002-09 ++fairview 38202 tcp Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, ++ DevStat=<device status> ++fairview 38202 udp Fairview Message Service [Jim_Lyle] [Jim_Lyle] 2005-11 Defined TXT keys: DevID=<device id>, DevType=<device type>, ++ DevStat=<device status> ++agpolicy 38203 tcp AppGate Policy Server [Martin_Forssen] [Martin_Forssen] 2004-11 ++agpolicy 38203 udp AppGate Policy Server [Martin_Forssen] [Martin_Forssen] 2004-11 ++ 38204-38799 Unassigned ++ Sruth is a service for the ++ distribution of routinely- ++ generated but arbitrary ++ files based on a ++sruth 38800 tcp publish/subscribe [University_Corporation_for_Atmospheric_Research] [Steven_Emmerson] 2012-05-07 ++ distribution model and ++ implemented using a ++ peer-to-peer transport ++ mechanism ++ 38800 udp Reserved ++ 38801-38864 Unassigned ++ Security approval process ++secrmmsafecopya 38865 tcp for use of the secRMM [Squadra_Technologies] [Anthony_LaMark] 2012-03-14 ++ SafeCopy program ++ 38865 udp Reserved ++ 38866-39680 Unassigned ++turbonote-1 39681 tcp TurboNote Default Port [Peter_Hyde] [Peter_Hyde] ++turbonote-1 39681 udp TurboNote Default Port [Peter_Hyde] [Peter_Hyde] ++ 39682-39999 Unassigned ++safetynetp 40000 tcp SafetyNET p [Roland_Rupp] [Roland_Rupp] 2006-11 ++safetynetp 40000 udp SafetyNET p [Roland_Rupp] [Roland_Rupp] 2006-11 ++ 40001-40840 Unassigned ++cscp 40841 tcp CSCP [Michael_Dodge] [Michael_Dodge] ++cscp 40841 udp CSCP [Michael_Dodge] [Michael_Dodge] ++csccredir 40842 tcp CSCCREDIR [Sudhir_Menon] [Sudhir_Menon] ++csccredir 40842 udp CSCCREDIR [Sudhir_Menon] [Sudhir_Menon] ++csccfirewall 40843 tcp CSCCFIREWALL [Sudhir_Menon] [Sudhir_Menon] ++csccfirewall 40843 udp CSCCFIREWALL [Sudhir_Menon] [Sudhir_Menon] ++ 40844-40852 Unassigned ++ 40853 tcp Reserved ++ortec-disc 40853 udp ORTEC Service Discovery [Jesse_Ursery] [Jesse_Ursery] 2010-11-22 ++ 40854-41110 Unassigned ++fs-qos 41111 tcp Foursticks QoS Protocol [Chee_Kent_Lam] [Chee_Kent_Lam] 2002-04 ++fs-qos 41111 udp Foursticks QoS Protocol [Chee_Kent_Lam] [Chee_Kent_Lam] 2002-04 ++ 41112-41120 Unassigned ++tentacle 41121 tcp Tentacle Server [Sancho_Lerena] [Sancho_Lerena] 2009-06-02 ++ 41121 udp Reserved ++ 41122-41793 Unassigned ++crestron-cip 41794 tcp Crestron Control Port [Ed_Ranney] [Ed_Ranney] 2003-01 ++crestron-cip 41794 udp Crestron Control Port [Ed_Ranney] [Ed_Ranney] 2003-01 ++crestron-ctp 41795 tcp Crestron Terminal Port [Ed_Ranney] [Ed_Ranney] 2003-01 ++crestron-ctp 41795 udp Crestron Terminal Port [Ed_Ranney] [Ed_Ranney] 2003-01 ++ 41796-42507 Unassigned ++candp 42508 tcp Computer Associates network [Jon_Press] [Jon_Press] 2005-09 ++ discovery protocol ++candp 42508 udp Computer Associates network [Jon_Press] [Jon_Press] 2005-09 ++ discovery protocol ++candrp 42509 tcp CA discovery response [Jon_Press] [Jon_Press] 2005-08 ++candrp 42509 udp CA discovery response [Jon_Press] [Jon_Press] 2005-08 ++caerpc 42510 tcp CA eTrust RPC [Jon_Press] [Jon_Press] 2005-08 ++caerpc 42510 udp CA eTrust RPC [Jon_Press] [Jon_Press] 2005-08 ++ 42511-43187 Unassigned ++reachout 43188 tcp REACHOUT [Roman_Kriis] [Roman_Kriis] ++reachout 43188 udp REACHOUT [Roman_Kriis] [Roman_Kriis] ++ndm-agent-port 43189 tcp NDM-AGENT-PORT [Roman_Kriis] [Roman_Kriis] ++ndm-agent-port 43189 udp NDM-AGENT-PORT [Roman_Kriis] [Roman_Kriis] ++ip-provision 43190 tcp IP-PROVISION [Roman_Kriis] [Roman_Kriis] ++ip-provision 43190 udp IP-PROVISION [Roman_Kriis] [Roman_Kriis] ++noit-transport 43191 tcp Reconnoiter Agent Data [Theo_Schlossnagle] [Theo_Schlossnagle] 2009-05-19 ++ Transport ++ 43191 udp Reserved ++ 43192-43438 Unassigned ++eq3-update 43439 tcp EQ3 firmware update [eQ-3_AG] [Falk_Werner] 2012-02-10 ++eq3-config 43439 udp EQ3 discovery and [eQ-3_AG] [Falk_Werner] 2012-02-10 ++ configuration ++ew-mgmt 43440 tcp Cisco EnergyWise Management ++ew-disc-cmd 43440 udp Cisco EnergyWise Discovery [John_Parello] [John_Parello] 2009-05-19 ++ and Command Flooding ++ciscocsdb 43441 tcp Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11 ++ciscocsdb 43441 udp Cisco NetMgmt DB Ports [Cisco_Systems] [Cisco_Systems] 2005-11 ++ 43442-44320 Unassigned ++pmcd 44321 tcp PCP server (pmcd) [Ken_McDonell] [Ken_McDonell] 2010-12-20 ++pmcd 44321 udp PCP server (pmcd) [Ken_McDonell] [Ken_McDonell] 2010-12-20 ++pmcdproxy 44322 tcp PCP server (pmcd) proxy [Ken_McDonell] [Ken_McDonell] 2003-07 2010-12-20 ++pmcdproxy 44322 udp PCP server (pmcd) proxy [Ken_McDonell] [Ken_McDonell] 2003-07 2010-12-20 ++ 44323 tcp Reserved ++pcp 44323 udp Port Control Protocol [Dan_Wing] [Dan_Wing] 2011-01-11 ++ UNAUTHORIZED ++ USE: Ports ++ 44324-44543 Unassigned 44515 & 44516 ++ used by NI ++ Device ++ Protocol ++ 44544 tcp Reserved ++domiq 44544 udp DOMIQ Building Automation [DOMIQ_Sp_zoo] [Filip_Zawadiak] 2011-08-29 ++ 44545-44552 Unassigned ++rbr-debug 44553 tcp REALbasic Remote Debug [Aaron_Ballman] [Aaron_Ballman] 2004-11 ++rbr-debug 44553 udp REALbasic Remote Debug [Aaron_Ballman] [Aaron_Ballman] 2004-11 ++ 44554-44599 Unassigned ++ 44600 tcp Reserved ++asihpi 44600 udp AudioScience HPI [Eliot_Blennerhassett] [Eliot_Blennerhassett] 2011-07-07 ++ 44601-44817 Unassigned ++ EtherNet/IP messaging ++ ++EtherNet-IP-2 44818 tcp IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 ++ well-formed service name as ++ a replacement for ++ "EtherNet/IP-2". ++ New contact added for port 44818 on 2008-02-01 This entry is ++EtherNet/IP-2 44818 tcp EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not ++ usable for use with many common service discovery mechanisms. ++ EtherNet/IP messaging ++ ++EtherNet-IP-2 44818 udp IANA assigned this [Brian_Batke_2] [Brian_Batke_2] New contact added for port 44818 on 2008-02-01 ++ well-formed service name as ++ a replacement for ++ "EtherNet/IP-2". ++ New contact added for port 44818 on 2008-02-01 This entry is ++EtherNet/IP-2 44818 udp EtherNet/IP messaging [Brian_Batke_2] [Brian_Batke_2] an alias to "EtherNet-IP-2". This entry is now historic, not ++ usable for use with many common service discovery mechanisms. ++ 44819-44999 Unassigned ++ NSi AutoStore Status ++asmp 45000 tcp Monitoring Protocol data [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01 ++ transfer ++ NSi AutoStore Status ++asmp-mon 45000 udp Monitoring Protocol device [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01 ++ monitoring ++ NSi AutoStore Status ++asmps 45001 tcp Monitoring Protocol secure [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01 ++ data transfer ++ 45001 udp Reserved ++ 45002-45053 Unassigned ++invision-ag 45054 tcp InVision AG [Matthias_Schroer] [Matthias_Schroer] ++invision-ag 45054 udp InVision AG [Matthias_Schroer] [Matthias_Schroer] ++ 45055-45677 Unassigned ++eba 45678 tcp EBA PRISE [Patrick_Kara] [Patrick_Kara] ++eba 45678 udp EBA PRISE [Patrick_Kara] [Patrick_Kara] ++ 45679-45823 Unassigned ++dai-shell 45824 tcp Server for the DAI family of [Data_Access_Inc] [Adam_Robinson] 2012-04-30 ++ client-server products ++ 45824 udp Reserved ++qdb2service 45825 tcp Qpuncture Data Access [Michael_Yun] [Michael_Yun] 2007-10-24 ++ Service ++qdb2service 45825 udp Qpuncture Data Access [Michael_Yun] [Michael_Yun] 2007-10-24 ++ Service ++ 45826-45965 Unassigned ++ssr-servermgr 45966 tcp SSRServerMgr [Jeremy_Gilliat] [Jeremy_Gilliat] ++ssr-servermgr 45966 udp SSRServerMgr [Jeremy_Gilliat] [Jeremy_Gilliat] ++ 45967-46998 Unassigned ++mediabox 46999 tcp MediaBox Server [Alexander_Graef] [Alexander_Graef] 2004-11 ++mediabox 46999 udp MediaBox Server [Alexander_Graef] [Alexander_Graef] 2004-11 ++mbus 47000 tcp Message Bus [Dirk_Kutscher] [Dirk_Kutscher] ++mbus 47000 udp Message Bus [Dirk_Kutscher] [Dirk_Kutscher] ++winrm 47001 tcp Windows Remote Management [Ryan_Mack] [Ryan_Mack] 2009-04-29 ++ Service ++ 47001 udp Reserved ++ 47002-47556 Unassigned ++dbbrowse 47557 tcp Databeam Corporation [Cindy_Martin] [Cindy_Martin] ++dbbrowse 47557 udp Databeam Corporation [Cindy_Martin] [Cindy_Martin] ++ 47558-47623 Unassigned ++directplaysrvr 47624 tcp Direct Play Server [Ajay_Jindal] [Ajay_Jindal] ++directplaysrvr 47624 udp Direct Play Server [Ajay_Jindal] [Ajay_Jindal] ++ 47625-47805 Unassigned ++ap 47806 tcp ALC Protocol [Dave_Robin] [Dave_Robin] ++ap 47806 udp ALC Protocol [Dave_Robin] [Dave_Robin] ++ 47807 Unassigned ++bacnet 47808 tcp Building Automation and [Coleman_Brumley] [Coleman_Brumley] 2011-02-10 ++ Control Networks ++bacnet 47808 udp Building Automation and [Coleman_Brumley] [Coleman_Brumley] 2011-02-10 ++ Control Networks ++ 47809-47999 Unassigned ++nimcontroller 48000 tcp Nimbus Controller [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimcontroller 48000 udp Nimbus Controller [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimspooler 48001 tcp Nimbus Spooler [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimspooler 48001 udp Nimbus Spooler [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimhub 48002 tcp Nimbus Hub [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimhub 48002 udp Nimbus Hub [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimgtw 48003 tcp Nimbus Gateway [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimgtw 48003 udp Nimbus Gateway [Carstein_Seeberg_2] [Carstein_Seeberg_2] ++nimbusdb 48004 tcp NimbusDB Connector [Stephen_Harrison] [Stephen_Harrison] 2011-01-24 ++ 48004 udp Reserved ++nimbusdbctrl 48005 tcp NimbusDB Control [Stephen_Harrison] [Stephen_Harrison] 2011-01-24 ++ 48005 udp Reserved ++ 48006-48048 Unassigned ++3gpp-cbsp 48049 tcp 3GPP Cell Broadcast Service [Gert_Thomasen] [Gert_Thomasen] 2009-12-07 ++ Protocol ++ 48049 udp Reserved ++ 48050-48127 Unassigned ++isnetserv 48128 tcp Image Systems Network [Bengt_Gustafsson] [Bengt_Gustafsson] 2006-05 ++ Services ++isnetserv 48128 udp Image Systems Network [Bengt_Gustafsson] [Bengt_Gustafsson] 2006-05 ++ Services ++blp5 48129 tcp Bloomberg locator [Albert_Hou] [Albert_Hou] 2006-05 ++blp5 48129 udp Bloomberg locator [Albert_Hou] [Albert_Hou] 2006-05 ++ 48130-48555 Unassigned ++com-bardac-dw 48556 tcp com-bardac-dw [Nicholas_J_Howes] [Nicholas_J_Howes] ++com-bardac-dw 48556 udp com-bardac-dw [Nicholas_J_Howes] [Nicholas_J_Howes] ++ 48557-48618 Unassigned ++iqobject 48619 tcp iqobject [Bjorn_de_Bonnenfant] [Bjorn_de_Bonnenfant] 2003-11 ++iqobject 48619 udp iqobject [Bjorn_de_Bonnenfant] [Bjorn_de_Bonnenfant] 2003-11 ++ 48620-48999 Unassigned ++matahari 49000 tcp Matahari Broker [Matahari_Project] [Zane_Bitter] 2011-08-31 ++ 49000 udp Reserved ++ 49001-49150 Unassigned ++ 49151 IANA Reserved ++argus ARGUS Protocol ++arp Address Resolution Protocol ++bbn-rcc-mon BBN RCC Monitoring ++bootp Bootstrap Protocol ++br-sat-mon Backroom SATNET Monitoring ++cftp CFTP ++chaos CHAOS Protocol ++clock DCNET Time Server Protocol ++cmot Common Mgmnt Info Ser and ++ Prot over TCP/IP ++cookie-jar Authentication Scheme ++dcn-meas DCN Measurement Subsystems ++ Protocol ++dgp Dissimilar Gateway Protocol ++dmf-mail Digest Message Format for ++ Mail ++egp Exterior Gateway Protocol ++ehf-mail Encoding Header Field for ++ Mail ++emcon Emission Control Protocol ++fconfig Fujitsu Config Protocol ++ggp Gateway Gateway Protocol ++hmp Host Monitoring Protocol ++host2-ns Host2 Name Server ++icmp Internet Control Message ++ Protocol ++igmp Internet Group Management ++ Protocol ++igp Interior Gateway Protocol ++imap2 Interim Mail Access Protocol ++ version 2 ++ip Internet Protocol ++ipcu Internet Packet Core Utility ++ippc Internet Pluribus Packet ++ Core ++ip-arc Internet Protocol on ARCNET ++ip-arpa Internet Protocol on ARPANET ++ip-cmprs Compressing TCP/IP Headers ++ip-dc Internet Protocol on DC ++ Networks ++ip-dvmrp Distance Vector Multicast ++ Routing Protocol ++ip-e Internet Protocol on ++ Ethernet Networks ++ip-ee Internet Protocol on Exp. ++ Ethernet Nets ++ip-fddi Transmission of IP over FDDI ++ip-hc Internet Protocol on ++ Hyperchannnel ++ip-ieee Internet Protocol on IEEE ++ 802 ++ip-ipx Transmission of 802.2 over ++ IPX Networks ++ip-mtu IP MTU Discovery Options ++ip-netbios Internet Protocol over ++ NetBIOS Networks ++ip-slip Transmission of IP over ++ Serial Lines ++ip-wb Internet Protocol on ++ Wideband Network ++ip-x25 Internet Protocol on X.25 ++ Networks ++irtp Internet Reliable ++ Transaction Protocol ++iso-tp4 ISO Transport Protocol Class ++ 4 ++larp Locus Address Resoultion ++ Protocol ++leaf-1 Leaf-1 Protocol ++leaf-2 Leaf-2 Protocol ++loc-srv Location Service ++mail Format of Electronic Mail ++ Messages ++merit-inp MERIT Internodal Protocol ++mib Management Information Base ++mihcs MIH Command Services [RFC5679] ++mihes MIH Event Services [RFC5679] ++mihis MIH Information Services [RFC5679] ++mfe-nsp MFE Network Services ++ Protocol ++mit-subnet MIT Subnet Support ++mux Multiplexing Protocol ++netblt Bulk Data Transfer Protocol ++neted Network Standard Text Editor ++netrjs Remote Job Service ++nfile A File Access Protocol ++nvp-ii Network Voice Protocol ++ospf Open Shortest Path First ++ Interior GW Protocol ++pcmail Pcmail Transport Protocol ++ppp Point-to-Point Protocol ++prm Packet Radio Measurement ++pup PUP Protocol ++quote Quote of the Day Protocol ++rarp A Reverse Address Resolution ++ Protocol ++ratp Reliable Asynchronous ++ Transfer Protocol ++rdp Reliable Data Protocol ++rip Routing Information Protocol ++rvd Remote Virtual Disk Protocol ++sat-expak Satnet and Backroom EXPAK ++sat-mon SATNET Monitoring ++smi Structure of Management ++ Information ++stp Stream Protocol ++sun-rpc SUN Remote Procedure Call ++tcp Transmission Control ++ Protocol ++tcp-aco TCP Alternate Checksum ++ Option ++thinwire Thinwire Protocol ++tp-tcp ISO Transport Service on top ++ of the TCP ++trunk-1 Trunk-1 Protocol ++trunk-2 Trunk-2 Protocol ++ucl University College London ++ Protocol ++udp User Datagram Protocol ++users Active Users Protocol ++via-ftp VIA Systems-File Transfer ++ Protocol ++visa VISA Protocol ++vmtp Versatile Message ++ Transaction Protocol ++wb-expak Wideband EXPAK ++wb-mon Wideband Monitoring ++xnet Cross Net Debugger ++xns-idp Xerox NS IDP ++ 1Password Password Manager ++1password data sharing and [Roustem_Karimov] [Roustem_Karimov] Defined TXT keys: None ++ synchronization protocol ++a-d-sync Altos Design Synchronization [David_Lasker] [David_Lasker] Defined TXT keys: None ++ protocol ++ Applied Biosystems Universal Defined TXT keys: product=<short product name/model> ++abi-instrument Instrument Framework [Tor_Slettnes] [Tor_Slettnes] description=<readable name> version=<firmware/instrument ++ controller version> ++accessdata-f2d FTK2 Database Discovery [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary ++ Service ++accessdata-f2w FTK2 Backend Processing [Rick_Russell] [Rick_Russell] Defined TXT keys: Proprietary ++ Agent Service ++accessone Strix Systems 5S/AccessOne [Scott_Herscher_2] [Scott_Herscher_2] Defined TXT keys: None ++ protocol ++accountedge MYOB AccountEdge Defined TXT keys: None ++acrobatsrv Adobe Acrobat Defined TXT keys: type, path, FeedType ++acs-ctl-ds tcp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC ++acs-ctl-ds udp Access Control Device [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC ++acs-ctl-gw tcp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC ++acs-ctl-gw udp Access Control Gateway [Honwywell_Security_Group] [John_Dziadosz] 2012-04-09 Defined TXT keys: MAC=, GW-MAC ++actionitems ActionItems [Sailalong_Software] [Sailalong_Software] Defined TXT keys: None ++activeraid Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None ++ Device Management Protocol ++ Encrypted transport of ++activeraid-ssl Active Storage Proprietary [Skip_Levens] [Skip_Levens] Defined TXT keys: None ++ Device Management Protocol ++addressbook Address-O-Matic [Massimiliano_Ribuoli] [Massimiliano_Ribuoli] Defined TXT keys: None ++ Address Book Server used for ++addressbooksrv tcp contacts and calendar [AddressBookServer] [Alexander_Hartner] 2011-10-14 Defined TXT keys: _suffix, _prefix ++ synchronisation ++ difusi Cloud based plug & ++ play network synchronization ++adnodes protocol, content pool [DIFUSI_Inc] [Mike_Wright] 2011-11-07 Defined TXT keys: Proprietary ++ database discovery, and ++ cloudOS SAaS discovery ++ protocol. ++adobe-shadow tcp Adobe Shadow Server [Adobe_Systems] [Mike_Harris] 2012-04-17 Defined TXT keys: id ++adobe-vc Adobe Version Cue Defined TXT keys: txtvers=1, name, version, build ++adisk Automatic Disk Discovery [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX ++adpro-setup ADPRO Security Device Setup [Patrick_Noffke] [Patrick_Noffke] Defined TXT keys: txtvers, type ++aecoretech Apple Application [Hani_Abdelazim] [Hani_Abdelazim] Defined TXT keys: None ++ Engineering Services ++ Defined TXT keys: orb_server=<port #> (optional) CORBA ORB ++ Aeroflex instrumentation and server used for resource discovery product_id=<string> ++aeroflex software [David_Hagood] [David_Hagood] (optional) ID of licensed product ++ txtvers="*IDN?=<identifier>" (optional) as per LXI ++ specification (for not yet LXI compatible instruments) ++aerohive-proxy tcp Aerohive Proxy Configuration [Aerohive_Networks] [Matthew_Gast] 2012-05-31 Defined TXT keys: name, port, username ++ Service ++airdrop tcp Airdrop [Apple_Inc] [Marc_Krochmal_2] 2012-03-02 Defined TXT keys: flags, phash, ehash, cname ++airport AirPort Base Station [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: waMA; ++ Defined TXT keys: mac=<MAC address> ip=<IP address> ++airprojector AirProjector [Yoshinori_Nakayama] [Yoshinori_Nakayama] note=<Location> use=<Status> mainprog=<Main program version> ++ bootprog=<Boot program version> ++airsharing Air Sharing [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None ++airsharingpro Air Sharing Pro [Erik_Rogers][Dave_Howell] [Erik_Rogers][Dave_Howell] Defined TXT keys: None ++aloe-gwp tcp Aloe Gateway Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version ++aloe-pp tcp Aloe Pairing Protocol [Layered_Logic] [Brooks_Bell] 2012-01-04 Defined TXT keys: Version, DeviceName, DeviceModel, ++ DeviceSystem, DeviceSystemVersion, AppName, AppVersion ++amba-cam udp Ambarella Cameras [Louis_Sun] [Louis_Sun] Defined TXT keys: product=<product model name> ++ description=<string name> version=<firmware version> ++ P2PTapWar Sample Application ++amiphd-p2p from "iPhone SDK [Chris_Adamson] [Chris_Adamson] Defined TXT keys: None ++ Development" Book ++ams-htm Proprietary protocol for [AccuMed_Services] [Sam_Carleton_2] 2011-10-20 Defined TXT keys: None ++ Accu-Med HTM ++animolmd Animo License Manager [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None ++animobserver Animo Batch Server [Phil_Barrett] [Phil_Barrett] Defined TXT keys: None ++ Anquet map synchronization ++anquetsync between desktop and handheld [Paul_Lesurf] [Paul_Lesurf] Defined TXT keys: Proprietary ++ devices ++appelezvous Appelezvous [Marco_Piovanelli] [Marco_Piovanelli] Defined TXT keys: None ++apple-ausend Apple Audio Units [James_McCartney] [James_McCartney] Defined TXT keys: None ++apple-mobdev tcp Apple Mobile Device Protocol [Apple_2] [Paul_Chinn][Justin_Ko] 2011-10-20 Defined TXT keys: None ++apple-midi udp Apple MIDI [Doug_Wyatt] [Doug_Wyatt] Defined TXT keys: None ++applerdbg Apple Remote Debug Services [Dave_Springer] [Dave_Springer] Defined TXT keys: None ++ (OpenGL Profiler) ++appletv Apple TV [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, PrVs, OSsi, MniT ++appletv-itunes Apple TV discovery of iTunes [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers ++appletv-pair Apple TV Pairing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers ++aquamon AquaMon Defined TXT keys: None ++arcnet udp Arcturus Networks Inc. [Arcturus_Networks_Inc] [Michael_Durrant] 2011-10-20 Defined TXT keys: None ++ Hardware Services ++aroundsound AroundSound's information [Winzig_LLC] [Around_Sound] 2011-10-20 Defined TXT keys: Proprietary ++ sharing protocol ++astnotify udp Asterisk Caller-ID [Sven_Slezak] [Sven_Slezak] Defined TXT keys: prefix=<country code prefix> (numeric, ++ Notification Service additionally '+') ++astralite Astralite [Tongji_University] [Tongji_University] Defined TXT keys: None ++async address-o-sync [Markus_Brand] [Markus_Brand] Defined TXT keys: None ++ Atlassian Application (JIRA, ++atlassianapp Confluence, Fisheye, [Denise_Fernandez] [Denise_Fernandez] Defined TXT keys: app.url ++ Crucible, Crowd, Bamboo) ++ discovery service ++av Allen Vanguard Hardware [Mike_Bush] [Mike_Bush] Defined TXT keys: Proprietary ++ Service ++avatars tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none ++ hosting service. ++avatars-sec tcp Libravatar federated avatar [libravatar_org] [Francois_Marier] 2011-10-11 Defined TXT keys: none ++ hosting service. ++axis-video Axis Video Cameras [Kristina_Sten] [Kristina_Sten] Defined TXT keys: None ++b3d-convince 3M Unitek Digital [Rajiv_Aaron_Manglani] [Rajiv_Aaron_Manglani] Defined TXT keys: txtvers=1, protovers=<api version>, ++ Orthodontic System guid=<32 hex digits> ++babyphone BabyPhone [Johan_Kool] [Johan_Kool] Defined TXT keys: None ++bdsk BibDesk Sharing [Adam_Maxwell] [Adam_Maxwell] Defined TXT keys: txtvers, authenticate ++beacon Beacon Remote Service [Jeffrey_Sadeli] [Jeffrey_Sadeli] Defined TXT keys: version=<product version>, company=<product ++ company> ++beamer Beamer Data Sharing Protocol [Frank_Szczerba] [Frank_Szczerba] Defined TXT keys: None ++beatpack BeatPack Synchronization [Mathieu_Garcia] [Mathieu_Garcia] Defined TXT keys: None ++ Server for BeatMaker ++beep Xgrid Technology Preview [David_Kramer_2] [David_Kramer_2] Defined TXT keys: None ++bfagent BuildForge Agent [Joe_Senner_2] [Joe_Senner_2] Defined TXT keys: None ++bigbangchess Big Bang Chess [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None ++bigbangmancala Big Bang Mancala [Freeverse_Software] [Freeverse_Software] Defined TXT keys: None ++bitflit tcp Data transfer service [Ramesh_Gupta] [Ramesh_Gupta] 2012-02-21 Defined TXT keys: provider, vendor, user, host, deploy, ++ prototype, schedule ++bittorrent BitTorrent Zeroconf Peer [Robin_Perkins] [Robin_Perkins] Defined TXT keys: None ++ Discovery Protocol ++ Little Black Book Defined TXT keys: product=<application name> ++blackbook Information Exchange [David_HM_Spector][Paul_M_Franceus] [David_HM_Spector][Paul_M_Franceus] description=<application description name> ++ Protocol version=<application version/build number> protovers=<version ++ of protocol in use by by this application> ++bluevertise udp BlueVertise Network Protocol [Fabrizio_Guglielmino] [Fabrizio_Guglielmino] Defined TXT keys: role=<master or slave> ++ (BNP) ++bookworm Bookworm Client Discovery [Arne_Dirks] [Arne_Dirks] Defined TXT keys: flavors ++boundaryscan udp Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, ++ version=<firmware/instrument controller version> ++bousg Bag Of Unusual Strategy Defined TXT keys: None ++ Games ++bri RFID Reader Basic Reader [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: None ++ Interface ++bsqdea Backup Simplicity [Qdea] [Qdea] Defined TXT keys: None ++caldav tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [draft-daboo-srv-caldav] This is an extension of the http service. Defined TXT keys: ++ WebDAV (CalDAV) - non-TLS path=<context path> ++caldavs tcp Calendaring Extensions to [IESG] [IETF_Chair] 2012-02-17 [draft-daboo-srv-caldav] This is an extension of the https service. Defined TXT keys: ++ WebDAV (CalDAV) - over TLS path=<context path> ++caltalk CalTalk [Joe_Groff] [Joe_Groff] Defined TXT keys: None ++carddav tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the http service. Defined TXT keys: ++ (CardDAV) - non-TLS path=<context path> ++carddavs tcp vCard Extensions to WebDAV [IESG] [IETF_Chair] 2012-02-17 [RFC6352] This is an extension of the https service. Defined TXT keys: ++ (CardDAV) - over TLS path=<context path> ++cardsend Card Send Protocol [Jeff_Grossman] [Jeff_Grossman] Defined TXT keys: Proprietary ++carousel tcp Carousel Player Protocol [Tightrope_Media_Systems] [Scott_Jann] 2011-10-17 Defined TXT keys: None ++ IP and Closed-Circuit Defined TXT keys: u=<username>, p=<password>, path=<path to ++cctv Television for Securitiy [Frank_Rottmann] [Frank_Rottmann] XML file> ++ applications ++cheat The Cheat [Chaz_McGarvey] [Chaz_McGarvey] Defined TXT keys: None ++chess Project Gridlock Defined TXT keys: None ++chfts Fluid Theme Server Defined TXT keys: None ++chili The CHILI Radiology System [Andre_Schroter] [Andre_Schroter] Defined TXT keys: None ++ciao tcp Ciao Arduino Protocol [Mike_Colagrosso] [Mike_Colagrosso] 2011-10-24 Defined TXT keys: see www.ciaoapp.com ++ Discovery of JDF (CIP4 Job ++cip4discovery Definition Format) enabled [Stefan_Daun] [Stefan_Daun] Defined TXT keys: None ++ devices ++clipboard Clipboard Sharing Defined TXT keys: None ++clique udp Clique Link-Local Multicast [Telepathy_project] [Telepathy_project] Defined TXT keys: see ++ Chat Room http://telepathy.freedesktop.org/xmpp/clique ++clscts Oracle CLS Cluster Topology [David_Brower] [David_Brower] Defined TXT keys: None ++ Service ++collection Published Collection Object [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? ++com-ocs-es-mcc ElectraStar media centre [OC] [OC] Defined TXT keys: None ++ control protocol ++contactserver Now Contact Defined TXT keys: None ++corroboree Corroboree Server [Heath_Raftery] [Heath_Raftery] Defined TXT keys: None ++cpnotebook2 NoteBook 2 [Circus_Ponies_Suppor] [Circus_Ponies_Suppor] Defined TXT keys: None ++cw-codetap CodeWarrior HTI Xscale [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None ++ PowerTAP ++cw-dpitap CodeWarrior HTI DPI PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None ++cw-oncetap CodeWarrior HTI OnCE [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None ++ PowerTAP ++cw-powertap CodeWarrior HTI COP PowerTAP [Ted_Woodward] [Ted_Woodward] Defined TXT keys: None ++cytv CyTV - Network streaming for [Andreas_Junghans] [Andreas_Junghans] Defined TXT keys: None ++ Elgato EyeTV ++dacp Digital Audio Control [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, Ver, DbId ++ Protocol (iTunes) ++dancepartner Dance partner application [Rory_McClure] [Rory_McClure] Defined TXT keys: None ++ for iPhone ++dataturbine Open Source DataTurbine [Tony_Fountain] [Tony_Fountain] Defined TXT keys: None ++ Streaming Data Middleware ++ Defined TXT keys:txtvers=<TXT-Record version> ++dbaudio tcp d&b audiotechnik remote [d_b_audiotechnik] [Christian_Laendner] 2011-10-06 protovers=<version of proprietary protocol> guid=<type> ++ network name=<name> sn=<serial number> device=<cleartext type> ++ fwver=<firmware version> ++ Defined TXT keys:txtvers=<TXT-Record version> ++dbaudio udp d&b audiotechnik remote [d_b_audiotechnik] [Christian_Laendner] 2011-10-06 protovers=<version of proprietary protocol> guid=<type> ++ network name=<name> sn=<serial number> device=<cleartext type> ++ fwver=<firmware version> ++device-info Device Info [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD device ++ info. ++devonsync tcp DEVONthink synchronization [DEVONtechnologies_LLC] [Rob_Rix][Eric_Boehnisch-Volkmann] 2011-10-18 Defined TXT keys: None at present ++ protocol ++dictation Use of a dictation service [Nuance_Communications_Inc] [Mark_Jackson] 2011-10-27 Defined TXT keys: ver, name ++ by a hand-held device ++difi EyeHome [Elgato] [Elgato] Defined TXT keys: None ++disconnect DisConnect Peer to Peer Game [Michael_S_Bogovich] [Michael_S_Bogovich] Defined TXT keys: None ++ Protocol ++dist-opencl Distributed OpenCL discovery [William_Dillon] [William_Dillon] Defined TXT keys: None ++ protocol ++ditrios Ditrios SOA Framework [Mark_Schmatz] [Mark_Schmatz] Defined TXT keys: ++ Protocol http://www.ditrios.org/index.php?link=tutorial/index#zeroconf ++divelogsync Dive Log Data Sharing and [Greg_McLaughlin] [Greg_McLaughlin] Defined TXT keys: None ++ Synchronization Protocol ++dltimesync udp Local Area Dynamic Time [Geoff_Back_3] [Geoff_Back_3] Defined TXT keys: None ++ Synchronisation Protocol ++dns-sd DNS Service Discovery [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD meta ++ queries. ++ DNS Dynamic Update Service for a given domain may not ++ necessarily be provided by the principal name servers as ++ advertised by the domain's "NS" records, and may not ++dns-update udp DNS Dynamic Update Service [Kiren_Sekar_2] [Kiren_Sekar_2] necessarily always be provided on port 53. The ++ "_dns-update._udp.<domain>." SRV record gives the target host ++ and port where DNS Dynamic Update Service is provided for the ++ named domain. ++dop Roar (Death of Productivity) [Massive_Flow_Product] [Massive_Flow_Product] Defined TXT keys: name=<full username> ++dropcopy DropCopy [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None ++dsgsync Datacolor SpyderGallery [Datacolor] [Heath_Barber] 2011-10-14 Defined TXT keys: Proprietary ++ Desktop Sync Protocol ++ Data Synchronization ++dsl-sync Protocol for Discovery [John_Hogg] [John_Hogg] Defined TXT keys: Proprietary ++ Software products ++dtrmtdesktop Desktop Transporter Remote [Daniel_Stodle] [Daniel_Stodle] Defined TXT keys: None ++ Desktop Protocol ++dxtgsync Documents To Go Desktop Sync [Tim_Boyle] [Tim_Boyle] Defined TXT keys: Proprietary ++ Protocol ++ea-dttx-poker Protocol for EA Downtown [Ben_Lewis] [Ben_Lewis] Defined TXT keys: None ++ Texas Hold 'em ++earphoria Earphoria [Rogue_Amoeba] [Rogue_Amoeba] Defined TXT keys: None ++easyspndlg-sync tcp Sync service for the Easy [Aaron_L_Bratcher] [Aaron_L_Bratcher] 2011-10-17 Defined TXT keys: None ++ Spend Log app ++eb-amuzi Amuzi peer-to-peer session [Zachary_Gramana] [Zachary_Gramana] Defined TXT keys: Proprietary ++ synchronization protocol ++ebms ebXML Messaging [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: Endpoint=</path/to/endpoint> ++ Northrup Grumman/Mission ++ecms Systems/ESL Data Flow [Dan_Goff] [Dan_Goff] Defined TXT keys: None ++ Protocol ++ebreg ebXML Registry [Matthew_MacKenzie] [Matthew_MacKenzie] Defined TXT keys: ++ HttpBinding=</path/to/registry/http/binding> ++ecbyesfsgksc Net Monitor Anti-Piracy [Guy_Meyer] [Guy_Meyer] Defined TXT keys: None ++ Service ++edcp udp LaCie Ethernet Disk [Nicolas_Bouilleaud] [Nicolas_Bouilleaud] Defined TXT keys: ip, mac, dhcp, mask, gtwy, wins, name, ++ Configuration Protocol version ++efkon-elite tcp EFKON Lightweight Interface [EFKON_AG] [Thomas_Kemmer] 2011-10-20 Defined TXT keys: txtvers, protovers, model, serial, scheme, ++ to Traffic Events path ++egistix Egistix Auto-Discovery [Dave_Lindquist_2] [Dave_Lindquist_2] Defined TXT keys: None ++ Interactive Room Software ++eheap Infrastructure (Event Defined TXT keys: None ++ Sharing) ++embrace DataEnvoy [Rob_MacGregor] [Rob_MacGregor] Defined TXT keys: None ++enphase-envoy tcp Enphase Energy Envoy [Enphase_Energy_Inc] [Chris_Eich] 2011-11-08 Defined TXT keys: - txtvers - protovers - serialnum ++ Endpoint Protocol (EP) for ++ep use in Home Automation [Tommy_van_der_Vorst] [Tommy_van_der_Vorst] Defined TXT keys: dns-sd_mdns ++ systems ++esp tcp Extensis Server Protocol [Loren_Barr] [Loren_Barr] 2006-12 Defined TXT keys: none ++eucalyptus Eucalyptus Discovery [Support_Team] [Support_Team] Defined TXT keys: Eucalyptus-DNS-SD ++eventserver Now Up-to-Date Defined TXT keys: None ++evs-notif EVS Notification Center [Eric_Gillet] [Eric_Gillet] Defined TXT keys: ID, Address ++ Protocol ++ewalletsync Synchronization Protocol for [Dan_Amstutz] [Dan_Amstutz] Defined TXT keys: name=<friendly device name> ++ Ilium Software's eWallet ++ Not a real service type. Special 'pretend' service types ++example Example Service Type ("_example._udp" and "_example._tcp") reserved for use in ++ illustrative examples in books and other documentation. ++exb Exbiblio Cascading Service [Claes_Fredrik_Mannby] [Claes_Fredrik_Mannby] Defined TXT keys: Will be described at www.exbiblio.com ++ Protocol ++extensissn Extensis Serial Number [Extensis] [Extensis] Defined TXT keys: None ++eyetvsn EyeTV Sharing [Elgato] [Elgato] Defined TXT keys: txtvers=1, keyhash=<4 bytes> ++facespan FaceSpan [Kerry_Hazelgren] [Kerry_Hazelgren] Defined TXT keys: None ++faxstfx FAXstf [Smith_Micro] [Smith_Micro] Defined TXT keys: None ++feed-sharing NetNewsWire 2.0 [Ranchero_Software] [Ranchero_Software] Defined TXT keys: None ++firetask Firetask task sharing and [Gerald_Aquila] [Gerald_Aquila] Defined TXT keys: None ++ synchronization protocol ++fish Fish [Oriol_Ferrer_Mesia] [Oriol_Ferrer_Mesia] Defined TXT keys: None ++ Defined TXT keys: Currently valid enumerated values: FIX ++ Session Protocol Versions (SESSIONVERSION): 1.1 FIX ++ Application Protocol Versions (APPLICATIONVERSION): 2.7, 3.0, ++fix Financial Information [Joakim_Johansson] [Joakim_Johansson] 4.0, 4.1, 4.2, 4.3, 4.4, 5.0 Possible TXT records defined and ++ Exchange (FIX) Protocol their values (replace uppercase text with enumerations from ++ the list above): txtvers=1 fix=APPLICATIONVERSION fix ++ supported=APPLICATIONVERSION[,APPLICATIONVERSION, ... ++ ,APPLICATIONVERSION] fixt=SESSIONVERSION ++fjork Fjork [John_Schilling] [John_Schilling] Defined TXT keys: None ++fl-purr udp FilmLight Cluster Power [Darrin_Smart] [Darrin_Smart] Defined TXT keys: Proprietary ++ Control Service ++flir-ircam tcp FLIR Infrared Camera [FLIR_Systems_AB] [Bjorn_Roth][Klas_Malmborg] 2011-10-20 Defined TXT keys: Proprietary ++ FileMaker Server ++fmserver-admin Administration Communication [Eric_Jacobson] [Eric_Jacobson] Defined TXT keys: None ++ Service ++fontagentnode FontAgent Pro [Insider_Software] [Insider_Software] Defined TXT keys: None ++foxtrot-serv FoxTrot Search Server [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None ++ Discovery Service ++foxtrot-start FoxTrot Professional Search [Jerome_Seydoux] [Jerome_Seydoux] Defined TXT keys: None ++ Discovery Service ++frameforge-lic FrameForge License [James_W_Walker] [James_W_Walker] Defined TXT keys: Proprietary ++freehand FreeHand MusicPad Pro [Ted_Schroeder] [Ted_Schroeder] Defined TXT keys: None ++ Interface Protocol ++frog Frog Navigation Systems [Rene_Jager] [Rene_Jager] Defined TXT keys: type, name, id ++ftpcroco Crocodile FTP Server [Xnet_Communications] [Xnet_Communications] Defined TXT keys: None ++fv-cert udp Fairview Certificate [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: DevID=<device id>, DevPK=<device public ++ key> ++fv-key udp Fairview Key [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: KeyID=<device id> ++fv-time udp Fairview Time/Date [Jim_Lyle_2] [Jim_Lyle_2] Defined TXT keys: None ++garagepad Entrackment Client Service [Talkative_AB] [Talkative_AB] Defined TXT keys: None ++ G-Force Control via ++gforce-ssmp SoundSpectrum's SSMP TCP [Andy_O_Meara] [Andy_O_Meara] Defined TXT keys: None ++ Protocol ++glasspad GlassPad Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid ++ Protocol ++glasspadserver GlassPadServer Data Exchange [Emmanuel_Merali] [Emmanuel_Merali] Defined TXT keys: guid ++ Protocol ++glrdrvmon OpenGL Driver Monitor [Dave_Springer] [Dave_Springer] Defined TXT keys: None ++gpnp Grid Plug and Play [David_Brower] [David_Brower] Defined TXT keys: None ++grillezvous Roxio ToastAnywhere(tm) Defined TXT keys: AppID=<application id> KeyHash=<application ++ Recorder Sharing license key hash> ++groovesquid tcp Groovesquid Democratic Music [www_nsovocal_com] [Ruben_Beltran] 2011-10-18 Defined TXT keys: None ++ Control Protocol ++growl Growl Defined TXT keys: None ++ Defined TXT keys: Varies; Depends on type of service being ++ offered/resolved Although DNS-SD does not recommend or ++ advocate using GUIDs as the primary name of an offered ++ service why not?, it does support use of GUIDs as service ++ names where developers want to use them that way. Typically ++ users do not browse for GUIDs. They are not user-friendly and ++ not very informative. Typically, the service is advertised as ++ usual, using a user-friendly name. One of the TXT record ++ attributes is a GUID for the service instance. Once the user ++ Special service type for has browsed and chosen the desired service instance via its ++guid resolving by GUID (Globally user-friendly name, the service is resolved, the TXT record ++ Unique Identifier) is retrieved, and the GUID is stored. A given network service ++ instance is therefore being advertised two ways, for example: ++ <User-Friendly-Name>._ptp._tcp.local <GUID>._guid._tcp.local ++ On subsequent accesses to the service, the GUID-based name is ++ resolved, and that particular service instance is discovered, ++ even if the user has subsequently changed the user-friendly ++ name to something else. Note: Although each different logical ++ service type needs to have its own different DNS-SD service ++ type, all GUID-based names use the same pseudo-type: ++ "_guid._tcp". There is no possibility of name conflict ++ because (by definition) GUIDs are globally unique. ++ H.323 Real-time audio, video ++h323 and data communication call [Will_MacDonald] [Will_MacDonald] Defined TXT keys: None ++ setup protocol ++help HELP command [RFC1078] TCP Port Service Multiplexer (TCPMUX) ++hg Mercurial web-based Defined TXT keys: None path=<file system pathname to ++ repository access repository> description=<descriptive name of repository> ++hinz HINZMobil Synchronization [Jorg_Laschke] [Jorg_Laschke] Defined TXT keys: None ++ protocol ++hmcp Home Media Control Protocol [Will_Lahr] [Will_Lahr] Defined TXT keys: None ++home-sharing iTunes Home Sharing [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, hQ, iTSh Version, MID, Database ++ ID, dmb, Version, OSsi, hG, hC, Machine ID ++homeauto iDo Technology Home [Tony_de_Rijk] [Tony_de_Rijk] Defined TXT keys: None ++ Automation Protocol ++honeywell-vid udp Honeywell Video Systems [Shankar_Prasad] [Shankar_Prasad] Defined TXT keys: None ++hotwayd Hotwayd Defined TXT keys: None ++howdy Howdy messaging and [Ozate_Inc] [Joseph_Sickel] 2011-10-12 Defined TXT keys: None ++ notification protocol ++hpr-bldlnx HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 ++ Linux-based Systems ++hpr-bldwin HP Remote Build System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista ++ Microsoft Windows Systems ++ Identifies systems that ++hpr-db house databases for the [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, mstr ++ Remote Build System and ++ Remote Test System ++hpr-rep HP Remote Repository for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: bld, tst, official ++ Build and Test Results ++ HP Remote System that houses ++hpr-toollnx compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 ++ Linux-based Systems ++ HP Remote System that houses ++hpr-toolwin compilers and tools for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista ++ Microsoft Windows Systems ++hpr-tstlnx HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: rh73, rhel3, rhel4, deb31, suse102 ++ Linux-based Systems ++hpr-tstwin HP Remote Test System for [Jeffrey_J_Walls] [Jeffrey_J_Walls] Defined TXT keys: xp, vista ++ Microsoft Windows Systems ++hs-off Hobbyist Software Off [Rob_Jonson] [Rob_Jonson] Defined TXT keys: None ++ Discovery ++htsp Home Tv Streaming Protocol [Andreas_Oman] [Andreas_Oman] Defined TXT keys: None ++ Web browsers like Safari and Internet Explorer (with the ++ Bonjour for Windows plugin) DO NOT browse for DNS-SD service ++ type "_https._tcp" in addition to browsing for "_http._tcp". ++ This is a conscious decision to reduce proliferation of ++ service types, to help keep DNS-SD efficient on the network. ++ Today, if a user types http://www.mybank.com/ into their web ++ browser, the web server automatically redirects the user to ++ https://www.mybank.com/. Rather than having an entirely ++ different DNS-SD service type for https, we recommend using ++https tcp HTTP over SSL/TLS [Tim_Berners_Lee] [Tim_Berners_Lee] the same redirection mechanism: advertise a plain "http" ++ service, which consists of nothing except an HTTP redirection ++ to the desired "https" URL. Work is currently being done on ++ adding mechanisms to HTTP and TLS to allow the server to tell ++ the client that it needs to activate TLS on the current ++ connection before proceeding. If this becomes widely adopted, ++ it further justifies the decision to not create a separate ++ DNS-SD service type "_https._tcp", because security becomes ++ just another one of the things that is negotiated on a ++ per-connection basis (like content-type negotiation today) ++ rather than being an entirely separate thing. ++hyperstream Atempo HyperStream [Laurent_Charmet] [Laurent_Charmet] Defined TXT keys: version=x.y.z.w uuid=<36 bytes UUID string> ++ deduplication server host=<real host name> ++ibiz iBiz Server [IGG_Software] [IGG_Software] Defined TXT keys: None ++ica-networking Image Capture Networking [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None ++ican Northrup Grumman/TASC/ICAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None ++ Protocol ++ichalkboard iChalk [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None ++ichat iChat 1.0 [Jens_Alfke] [Jens_Alfke] Defined TXT keys: Proprietary ++iconquer iConquer [Andrew_Zamler_Carhar] [Andrew_Zamler_Carhar] Defined TXT keys: None ++idata Generic Data Acquisition and [Carson_Fenimore] [Carson_Fenimore] Defined TXT keys: None ++ Control Protocol ++idsync SplashID Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary ++ Service ++ifolder Published iFolder [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? ++ihouse Idle Hands iHouse Protocol [Toby_Smith] [Toby_Smith] Defined TXT keys: None ++ii-drills Instant Interactive Drills [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None ++ii-konane Instant Interactive Konane [Ricky_Sharp] [Ricky_Sharp] Defined TXT keys: None ++ilynx iLynX [iOS_Software] [iOS_Software] Defined TXT keys: None ++imidi iMidi [Robert_Grant] [Robert_Grant] Defined TXT keys: None ++indigo-dvr Indigo Security Digital [Haram_Lee] [Haram_Lee] Defined TXT keys: Proprietary ++ Video Recorders ++infboard tcp InfBoard interactive [Eric_Sean_Conner] [Eric_Sean_Conner] 2011-10-17 Defined TXT keys: Proprietary ++ whiteboard protocol ++inova-ontrack Inova Solutions OnTrack Defined TXT keys: None ++ Display Protocol ++idcws Intermec Device [Thaddeus_Ternes] [Thaddeus_Ternes] Defined TXT keys: version=<x.xx> ++ Configuration Web Services ++iota tcp iotaMed medical records [MITM] [Martin_Wehlou] 2011-10-18 Defined TXT keys: none ++ server ++ipbroadcaster IP Broadcaster [base_t_Interactive] [base_t_Interactive] Defined TXT keys: None ++ipspeaker IP Speaker Control Protocol [Dan_Mahn] [Dan_Mahn] Defined TXT keys: None ++ir-hvac-000 tcp HVAC SMIL Server [Ingersoll_Rand_Inc] [John_Taylor] 2011-09-28 Defined TXT keys: None ++irelay iRelay application discovery [Marc_Diamante] [Marc_Diamante] Defined TXT keys: Proprietary ++ service ++irmc Intego Remote Management [Olivier_Delecluse] [Olivier_Delecluse] Defined TXT keys: RMC Client Version=<version>, MAC ++ Console Address=<address> ++isparx iSparx [Philipp_Dreiss] [Philipp_Dreiss] Defined TXT keys: None ++ispq-vc iSpQ VideoChat [Chris_Silverberg] [Chris_Silverberg] Defined TXT keys: None ++ishare iShare [Steve_Dekorte] [Steve_Dekorte] Defined TXT keys: None ++isticky iSticky [Insist] [Insist] Defined TXT keys: None ++istorm iStorm [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None ++isynchronize tcp iSynchronize data [Smart_Apps_LTD] [Sergey_Bolshedvorsky] 2011-10-11 Defined TXT keys: none ++ synchronization protocol ++itap-publish tcp iTap Publishing Service [HLW_Software_Development_GmbH] [Michael_Lacher] 2011-10-11 Defined TXT keys: uuid=<unique server key> ++ IT-IS International Ltd. Defined TXT keys: type=<product type> configuration=<product ++itis-device Device [Ben_Webster] [Ben_Webster] configuration> description=<human readable description> ++ version=<device and protocol version> ++itsrc iTunes Socket Remote Control [Kevin_Leacock] [Kevin_Leacock] Defined TXT keys: None ++ivef Inter VTS Exchange Format [Harry_ten_Berge] [Harry_ten_Berge] Defined TXT keys: None ++iwork iWork Server [IGG_Software] [IGG_Software] Defined TXT keys: None ++jcan Northrup Grumman/TASC/JCAN [Laurent_Mihalkovic] [Laurent_Mihalkovic] Defined TXT keys: None ++ Protocol ++jeditx Jedit X [Satoshi_Matsumoto] [Satoshi_Matsumoto] Defined TXT keys: None ++jini Jini Service Discovery [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: None ++ Defined TXT keys: hash=<40hex characters> salt=<40hex ++ jollys keychain cloud sync characters> uuid=<40hex characters> Example: ++jnx-kcsync tcp protocol [Patrick_Stein] [Patrick_Stein] 2011-10-24 hash=5e7580598c0d7064d4fc79faaeb42585e1a675f8 ++ salt=f0164cb3a0c3d7efe75abea8fda86d2d56c8dda9 ++ uuid=db61dc092922252e45bbb264f59147138c7fd5fa ++jtag Proprietary [Uwe_Ziegler] [Uwe_Ziegler] Defined TXT keys: blocked=<name of the device>, ++ version=<firmware/instrument controller version> ++jukebox tcp Jukebox Request Service [Gary_Giebler_2] [Gary_Giebler_2] 2011-10-18 Defined TXT keys: None ++ KeynoteAccess is used for ++ sending remote ++keynoteaccess tcp requests/responses when [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None ++ controlling a slideshow with ++ Keynote Remote ++ KeynotePairing is used to ++keynotepairing tcp pair Keynote Remote with [Apple] [Brad_Vaughan] 2011-10-12 Defined TXT keys: None ++ Keynote ++ktp Kabira Transaction Platform [Ramiro_Sarmiento] [Ramiro_Sarmiento] Defined TXT keys: None ++labyrinth udp Labyrinth local multiplayer [Andreas_Alptun] [Andreas_Alptun] Defined TXT keys: None ++ protocol ++lan2p Lan2P Peer-to-Peer Network [Ben_Guild] [Ben_Guild] Defined TXT keys: None ++ Protocol ++lapse Gawker [Phil_Piwonka] [Phil_Piwonka] Defined TXT keys: None ++leaf Lua Embedded Application [Ico_Doornekamp] [Ico_Doornekamp] Defined TXT keys: name=<readable name> product=<product ++ Framework name/model> version=<version number> ++lexicon Lexicon Vocabulary Sharing [Jacob_Godwin_Jones] [Jacob_Godwin_Jones] Defined TXT keys: None ++liaison Liaison [Brian_Cully] [Brian_Cully] Defined TXT keys: None ++ Delicious Library 2 ++library Collection Data Sharing [William_Shipley] [William_Shipley] Defined TXT keys: None ++ Protocol ++ Protocol for setup and ++libratone control of Libratone [Libratone_AS] [Claus_Jensen] 2011-10-27 Defined TXT keys: None ++ products ++licor LI-COR Biosciences [Software_LI-COR_Biosciences] [Kevin_Ediger] 2011-10-18 Defined TXT keys: None ++ instrument discovery ++llrp-secure RFID reader Low Level Reader [Jason_Schoon_2] [Jason_Schoon_2] Defined TXT keys: None ++ Protocol over SSL/TLS ++lobby Gobby [Gobby_0x539] [Gobby_0x539] Defined TXT keys: None ++logicnode udp Logic Pro Distributed Audio [Nikolaus_Gerteis] [Nikolaus_Gerteis] Defined TXT keys: None ++lonbridge Echelon LonBridge Server [Rich_Blomseth] [Rich_Blomseth] Defined TXT keys: None ++lontalk LonTalk over IP (ANSI 852) [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None ++lonworks Echelon LNS Remote Client [Michael_Tennefoss] [Michael_Tennefoss] Defined TXT keys: None ++lsys-appserver Linksys One Application [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: path=value (relative URL) engname=value ++ Server API (string) ++lsys-camera Linksys One Camera API [Frank_Zerangue] [Frank_Zerangue] Defined TXT keys: brand=value (string) model=value (string) ++ version=value (string) ++ Defined TXT keys: model=value (string) serial=value (sring) ++lsys-ezcfg LinkSys EZ Configuration [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) ++ ifversion=value (string) type=value (string) mac=value (12 ++ hex digits) ++ LinkSys Operations, Defined TXT keys: model=value (string) serial=value (sring) ++lsys-oamp Administration, Management, [Frank_Zerangue] [Frank_Zerangue] hwversion=value (string) swversion=value (string) ++ and Provisioning ifversion=value (string) type=value (string) mac=value (12 ++ hex digits) ++ A protocol to remotely ++lumiere tcp control DMX512 devices over [Gangsta_Ltd] [Jean-Charles_Boude] 2011-10-13 Defined TXT keys: None ++ the network ++lumis-lca tcp Lumis Cache Appliance [Lumis] [Rodrigo_Terra] 2011-10-24 Defined TXT keys: none ++ Protocol ++lux-dtp Lux Solis Data Transport [Laurence_Flath] [Laurence_Flath] Defined TXT keys: None ++ Protocol ++lxi LXI [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: txtvers, *IDN?=<response defined by IEEE ++ 488; e.g., manufacturer, model, serial number, version> ++lyrics iPod Lyrics Service [Gary_Giebler] [Gary_Giebler] Defined TXT keys: Proprietary ++macfoh MacFOH [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-admin MacFOH admin services [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-audio udp MacFOH audio stream [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-events udp MacFOH show control events [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-data udp MacFOH realtime data [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-db MacFOH database [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macfoh-remote MacFOH Remote [Shaun_Wexler] [Shaun_Wexler] Defined TXT keys: None ++macminder Mac Minder [Luma_Code] [Luma_Code] Defined TXT keys: None ++maestro Maestro Music Sharing [Luke_Steffen] [Luke_Steffen] Defined TXT keys: None ++ Service ++magicdice Magic Dice Game Protocol [Mike_Yenco] [Mike_Yenco] Defined TXT keys: None ++mandos Mandos Password Server [Mandos_Maintainers] [Mandos_Maintainers] Defined TXT keys: None ++matrix MATRIX Remote AV Switching [Ken_Jibiki] [Ken_Jibiki] Defined TXT keys: None ++mavlink tcp MAVLink Micro Air Vehicle [Roderick_Mann] [Roderick_Mann] 2011-10-20 Defined TXT keys: 0 ++ Communication Protocol ++mbconsumer MediaBroker++ Consumer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None ++mbproducer MediaBroker++ Producer [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None ++mbserver MediaBroker++ Server [Nate_Rivard] [Nate_Rivard] Defined TXT keys: None ++mconnect ClairMail Connect [Sachin_Desai] [Sachin_Desai] Defined TXT keys: None ++mcrcp MediaCentral [equinux] [equinux] Defined TXT keys: None ++ MediaBoardONE Asset and ++mediaboard1 Information Manager data [Thomas_K_Fischer] [Thomas_K_Fischer] Defined TXT keys: None ++ sharing and synchronization ++ protocol ++mediatap tcp Mediatap streaming protocol [Mediatap_GbR] [Mario_Poerner] 2011-10-11 Defined TXT keys: Proprietary ++mesamis Mes Amis [David_Priest] [David_Priest] Defined TXT keys: None ++mi-raysat Mental Ray for Maya [Autodesk] [Autodesk] Defined TXT keys: None ++modolansrv modo LAN Services [Matt_Craig] [Matt_Craig] Defined TXT keys: None ++moneysync SplashMoney Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary ++ Service ++ MoneyWorks Gold and ++moneyworks MoneyWorks Datacentre [Rowan_Daniell] [Rowan_Daniell] Defined TXT keys: None ++ network service ++moodring Bonjour Mood Ring tutorial [Daniel_Steinberg] [Daniel_Steinberg] Defined TXT keys: txtvers=1 mood=<ascii digit from 0-4> ++ program ++mother Mother script server [Jonathan] [Jonathan] Defined TXT keys: user, ssl ++ protocol ++movieslate MovieSlate digital [Cliff_Joyce] [Cliff_Joyce] Defined TXT keys: Proprietary ++ clapperboard ++mp3sushi MP3 Sushi [Alexandre_Carlhian] [Alexandre_Carlhian] Defined TXT keys: None ++mqtt IBM MQ Telemetry Transport [AndySC] [AndySC] Defined TXT keys: topics=<open topic to subscribe to for ++ Broker information>, eg topic=/info ++mslingshot Martian SlingShot [Martin_Technology] [Martin_Technology] Defined TXT keys: displayName, passwordRequired, ++ acceptsUpdates ++mumble Mumble VoIP communication [Thorvald_Natvig] [Thorvald_Natvig] Defined TXT keys: None ++ protocol ++musicmachine Protocol for a distributed [Johan_Mjones] [Johan_Mjones] Defined TXT keys: apiversion, passreq ++ music playing service ++mysync MySync Protocol [Martin_Redington] [Martin_Redington] Defined TXT keys: None ++mttp MenuTunes Sharing [iThink_Software] [iThink_Software] Defined TXT keys: None ++mxim-art2 Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary ++ Automated Roadtest Mk II ++mxim-ice Maxim Integrated Products [Zach_Metzinger] [Zach_Metzinger] Defined TXT keys: Proprietary ++ In-circuit Emulator ++ Defined TXT keys: None mxs.system.id=<system id> ++mxs MatrixStore [Object_Matrix] [Object_Matrix] mxs.system.version=<system layer version> ++ mxs.cluster.id=<cluster id the system belongs to> ++ncbroadcast Network Clipboard Broadcasts [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard ++ at thezaz.com> ++ncdirect Network Clipboard Direct [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard ++ Transfers at thezaz.com> ++ncsyncserver Network Clipboard Sync [Thom_McGrath] [Thom_McGrath] Defined TXT keys: Contact The ZAZ Software <networkclipboard ++ Server at thezaz.com> ++neoriders udp NeoRiders Client Discovery [Jesse_W_Towner] [Jesse_W_Towner] Defined TXT keys: None ++ Protocol ++netrestore NetRestore [Mike_Bombich] [Mike_Bombich] Defined TXT keys: message, status, progress ++netvu-video tcp AD Group NetVu Connected [AD_Holdings] [Kelvin_Lawson] 2011-10-11 Defined TXT keys: none ++ Video ++ Proprietary communication ++nextcap tcp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary ++ solution ++ Proprietary communication ++nextcap udp protocol for NextCap capture [NextDay_Aps] [Claus_Broch] 2012-04-24 Defined TXT keys: Proprietary ++ solution ++ni tcp National Instruments Network [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, DevClass, ProdId, ProdName, SerialNo, ++ Device Status, ImgPath, Comment ++ni-rt tcp National Instruments [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, OS, OSVer, ProcArch ++ Real-Time Target ++ni-sysapi tcp National Instruments System [National_Instruments] [Joshua_Prewitt] 2011-10-24 Defined TXT keys: MAC, Experts, Version ++ API Service ++ntlx-arch American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, ++ Archive Management Service serial ++ American Dynamics Intellex Defined TXT keys: txtvers, macaddress, protovers, model, ++ntlx-ent Enterprise Management [Gary_Sands] [Gary_Sands] serial ++ Service ++ntlx-video American Dynamics Intellex [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, ++ Video Service serial, control, event ++ntx udp Tenasys [Carl_Ellis] [Carl_Ellis] Defined TXT keys: None ++obf Observations Framework [Matthew_Baker] [Matthew_Baker] Defined TXT keys: version=<value> ++ Means for clients to locate Defined TXT keys: txtvers='1' ++objective servers in an Objective [Marc_Bailey] [Marc_Bailey] type={'production'|'standby'|'test'|'demo'} ++ (http://www.objective.com) protocol={['SOAP'],['CORBA']} transport=['iiop']|['http'] ++ instance. ++oce Oce Common Exchange Protocol [Dion_Slijp] [Dion_Slijp] Defined TXT keys: type, version ++od-master OpenDirectory Master [Jason_Thorpe] [Jason_Thorpe] Defined TXT keys: None ++odabsharing OD4Contact [Objective_Decision] [Objective_Decision] Defined TXT keys: None ++odisk Optical Disk Sharing [Bob_Bradley_2] [Bob_Bradley_2] Defined TXT keys: sys, dkX ++officetime-sync OfficeTime Synchronization [Support] [Support] Defined TXT keys: None ++ Protocol ++ofocus-conf OmniFocus setting [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: None ++ configuration ++ofocus-sync OmniFocus document [Timothy_J_Wood] [Timothy_J_Wood] Defined TXT keys: Proprietary ++ synchronization ++olpc-activity1 udp One Laptop per Child [One_Laptop_per_Child] [One_Laptop_per_Child] Defined TXT keys: Shared_Activity_Protocol_1.0 ++ activity ++oma-bcast-sg OMA BCAST Service Guide [Stefan_Ekenberg] [Stefan_Ekenberg] Defined TXT keys: None ++ Discovery Service ++ Open Mobile Alliance (OMA) ++omadm-bootstrap tcp Device Management (DM) [Open_Mobile_Alliance] [Open_Mobile_Alliance_Device_Management_DM_Working_Group] 2011-08-19 Defined TXT keys: None ++ Bootstrap Server Discovery ++ Service ++omni-bookmark OmniWeb [The_Omni_Group] [The_Omni_Group] Defined TXT keys: None ++ Service for remote control ++omni-live of Omnisphere virtual [Glenn_Olander_2] [Glenn_Olander_2] Defined TXT keys: omni-livetxt.html ++ instrument ++openbase OpenBase SQL Defined TXT keys: None ++opencu udp Conferencing Protocol [Marc_Manthey_2] [Marc_Manthey_2] Defined TXT keys: None ++oprofile oprofile server protocol [Rob_Bradford] [Rob_Bradford] Defined TXT keys: None ++oscit udp Open Sound Control Interface [Gaspard_Bucher] [Gaspard_Bucher] Defined TXT keys: None ++ Transfer ++ovready ObjectVideo OV Ready [Gary_Myers] [Gary_Myers] Defined TXT keys: txtvers, protovers ++ Protocol ++owhttpd OWFS (1-wire file system) [Paul_H_Alfille] [Paul_H_Alfille] Defined TXT keys: txtvers ++ web server ++parentcontrol Remote Parental Controls [John_Scalo] [John_Scalo] Defined TXT keys: None ++passwordwallet PasswordWallet Data [Sanford_Selznick] [Sanford_Selznick] Defined TXT keys: None ++ Synchronization Protocol ++pcast Mac OS X Podcast Producer [Nick_Brosnahan] [Nick_Brosnahan] Defined TXT keys: None ++ Server ++p2pchat udp Peer-to-Peer Chat (Sample [Roger_Pantos] [Roger_Pantos] Defined TXT keys: None ++ Java Bonjour application) ++pairandshare tcp Pair & Share data protocol [Intel] [Joshua_Boelter] 2011-10-18 Defined TXT keys: Proprietary ++panoply tcp Panoply multimedia composite [Natarajan_Balasundar] [Natarajan_Balasundar] Defined TXT keys: None ++ transfer protocol ++parabay-p2p tcp Parabay P2P protocol [Vishnu_Varadaraj] [Vishnu_Varadaraj] Defined TXT keys: None ++parity tcp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary ++ Radio - Intercom - Telefony) ++parity udp PA-R-I-Ty (Public Address - [ims_Info] [Oskar_Persano] 2011-10-20 Defined TXT keys: Proprietary ++ Radio - Intercom - Telefony) ++pgpkey-hkp Horowitz Key Protocol (HKP) [Marc_Horowitz] [Marc_Horowitz] Defined TXT keys: None ++pgpkey-http PGP Keyserver using HTTP/1.1 [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP ++ applications reside> normally: "path=/pks/" ++pgpkey-https PGP Keyserver using HTTPS [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: path=<path on the server where the HKP ++ applications reside> normally: "path=/pks/" ++pgpkey-ldap PGP Keyserver using LDAP [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: None ++pgpkey-mailto PGP Key submission using [Jeroen_Massar_3] [Jeroen_Massar_3] Defined TXT keys: user=<user portion of the mail address> ++ SMTP ++photoparata Photo Parata Event [Sam_Carleton] [Sam_Carleton] Defined TXT keys: None ++ Photography Software ++photosmithsync tcp Photosmith's iPad to [Photosmith] [Chris_Horne] 2011-10-27 Defined TXT keys: None ++ Lightroom sync protocol ++pictua Pictua Intercommunication [Isaack_Rasmussen] [Isaack_Rasmussen] Defined TXT keys: None ++ Protocol ++piesync pieSync Computer to Computer [Timothy_Wayper] [Timothy_Wayper] Defined TXT keys: None ++ Synchronization ++piu Pedestal Interface Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None ++ RPM-PSI ++poch Parallel OperatiOn and [Dean_Dauger] [Dean_Dauger] Defined TXT keys: None ++ Control Heuristic (Pooch) ++podcastproxy tcp Protocol for communication [Moritz_Schmale] [Moritz_Schmale] 2011-10-07 Defined TXT keys: None ++ between Podcast ++ Communication channel for ++pokeeye "Poke Eye" Elgato EyeTV [Kristoffer_Lawson] [Kristoffer_Lawson] Defined TXT keys: None ++ remote controller ++powereasy-erp PowerEasy ERP [Ulaganathan_Sriramul] [Ulaganathan_Sriramul] Defined TXT keys: ip, port, name, instance, cgi-alias, ++ major-version, minor-version, custom ++powereasy-pos PowerEasy Point of Sale [Murthy_Parthasarathi] [Murthy_Parthasarathi] Defined TXT keys: ip, port, type, device-id, major-version, ++ minor-version, custom ++pplayer-ctrl Piano Player Remote Control [Juraj_Zopp] [Juraj_Zopp] Defined TXT keys: Proprietary ++ Defined TXT keys: See ++ http://www.xmpp.org/registrar/linklocal.html Note: ++ Registration updated May 2007. Was formerly listed as "iChat ++ AV" (Apple's IM client for Mac OS X) with TXT keys: txtvers, ++ port.p2pj, phsh, vc, 1st, AIM, msg, status, last When first ++ shipped in Mac OS X 10.2, iChat's peer-to-peer messaging ++presence Peer-to-peer messaging / [XMPP_Registrar] [XMPP_Registrar] protocol was created to solve the problem of serverless ++ Link-Local Messaging messaging between peers on the same link. However, there is ++ nothing inherent in the protocol that limits it to being only ++ link-local; it was simply an artifact of iChat in Mac OS X ++ 10.2 using link-local Multicast DNS to discover peers. With ++ the advent of Wide-Area DNS-SD, it is also possible to use ++ iChat's peer-to-peer messaging between machines on different ++ links. ++print-caps Retrieve a description of a [Troy_Bergstrand] [Troy_Bergstrand] Defined TXT keys: None ++ device's print capabilities ++ Port to allow for ++ administration and control ++printopia tcp of "Printopia" application [Ecamm_Network_LLC] [Chris_Kent] 2011-10-24 Defined TXT keys: uuid = 55A346CB-C87C-4569-A4B0-248E6388893B ++ software, which provides vers = 1.0 ++ printing services to mobile ++ users ++profilemac Profile for Mac medical [David_Sinclair_2] [David_Sinclair_2] Defined TXT keys: None ++ practice management software ++prolog Prolog [Mike_Brady] [Mike_Brady] Defined TXT keys: version=<version number> ++protonet Protonet node and service [Ali_Jelveh] [Ali_Jelveh] Defined TXT keys: version, notes ++ discovery protocol ++psap udp Progal Service Advertising [Soren_Weber] [Soren_Weber] Defined TXT keys: c0, c1, ..., cn ++ Protocol ++ Physical Security ++psia Interoperability Alliance [Frank_Yeh] [Frank_Yeh] Defined TXT keys: txtvers, protovers ++ Protocol ++pstmailsync tcp File synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> ++ protocol for Pst Mail Sync ++pstmailsync-ssl tcp Secured file synchronization [Arrow_Bit_SL] [Javier_Nigro] 2012-04-26 Defined TXT keys: uuid=<unique instance identifier> ++ protocol for Pst Mail Sync ++ptnetprosrv2 PTNetPro Service [Apple_Computer] [Apple_Computer] Defined TXT keys: None Profiling and performance analysis ++ protocol for Shark 4.0 and BigTop. ++ptp-init tcp Picture Transfer [Canon_Inc] [Tatsuhiko_Sakai] 2011-10-03 Defined TXT keys: srvver, mn, mf, md, srv, tid ++ Protocol(PTP) Initiator ++ptp-req PTP Initiation Request [Mark_Wood] [Mark_Wood] Defined TXT keys: txtvers, guid, c0, c1, c2, ..., where the ++ Protocol number of c_n attributes is variable ++puzzle Protocol used for puzzle [Michael_Thomason] [Michael_Thomason] Defined TXT keys: None ++ games ++pvaccess tcp Experimental Physics and [Matej_Sekoranja] [Matej_Sekoranja] 2012-03-23 Defined TXT keys: None ++ Industrial Control System ++qbox QBox Appliance Locator [Geoff_Back_4] [Geoff_Back_4] Defined TXT keys: None ++qttp QuickTime Transfer Protocol [Stuart_Cheshire_5] [Stuart_Cheshire_5] Defined TXT keys: u=<username> p=<password> path=<path to ++ document> (Same as for _http._tcp) ++quad tcp Distributed Game Data [Niall_Hogg] [Niall_Hogg] 2011-10-25 Defined TXT keys: Proprietary ++quinn Quinn Game Server [Simon_Haertel] [Simon_Haertel] Defined TXT keys: None ++rakket Rakket Client Protocol [Orion_Reblitz_Richar] [Orion_Reblitz_Richar] Defined TXT keys: None ++radiotag RadioTAG: Event tagging for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None ++ radio services ++radiovis RadioVIS: Visualisation for [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None ++ radio services ++ RadioEPG: Electronic ++radioepg Programme Guide for radio [Andy_Buckingham] [Andy_Buckingham] Defined TXT keys: None ++ services ++radioport tcp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE ++radioport udp RadioPort Message Service [Bob_Iannucci] [Bob_Iannucci] 2011-11-23 Defined TXT keys: NONE ++raop Remote Audio Output Protocol [BonjourDev] [BonjourDev] 2011-10-14 Defined TXT keys: None ++ (AirTunes) ++rbr RBR Instrument Communication [Greg_Johnson] [Greg_Johnson] Defined TXT keys: None ++rce PowerCard [DeVoeSquared] [DeVoeSquared] Defined TXT keys: None ++rdp Windows Remote Desktop [Jugaari] [Jugaari] Defined TXT keys: None ++ Protocol ++realplayfavs RealPlayer Shared Favorites [RealNetworks] [RealNetworks] Defined TXT keys: None ++recipe-box tcp The Recipe Box Exchange [Corpus_Collusion] [Kathy_Tafel] 2011-08-23 Defined TXT keys: txtvers ++recipe-sharing tcp Recipe Sharing Protocol [Daniel_G_Taylor] [Daniel_G_Taylor] 2007-11 Defined TXT keys: ++ [http://www.recipemanager.org/rsp/rsp10draft.html#dnssd] ++ Remote Device Control Defined TXT keys: txtvers=<TXT record version tag> ++remote Protocol [Gregory_Dudek] [Gregory_Dudek] protovers=<protocol vesion number> forground=<primary device ++ or system> version=<firmware/instrument controller version> ++remoteburn LaCie Remote Burn [Serge_DE_LUCA] [Serge_DE_LUCA] Defined TXT keys: server_version, min_client_version ++renderpipe ARTvps RenderDrive/PURE [Andrew_Hoddinott] [Andrew_Hoddinott] Defined TXT keys: None ++ Renderer Protocol ++rendezvouspong RendezvousPong [Math_Game_House_Soft] [Math_Game_House_Soft] Defined TXT keys: None ++renkara-sync Renkara synchronization [Michael_J_Primeaux] [Michael_J_Primeaux] Defined TXT keys: None ++ protocol ++resol-vbus RESOL VBus [Daniel_Wippermann] [Daniel_Wippermann] Defined TXT keys: None ++retrospect Retrospect backup and [Michael_Marks] [Michael_Marks] Defined TXT keys: None ++ restore service ++ Remote Frame Buffer Client Defined TXT keys: server=dns-name/ip-address:port of ++rfbc (Used by VNC viewers in [Ole_Morten_Duesund] [Ole_Morten_Duesund] currently displayed VNC server. Empty if not showing ++ listen-mode) anything/available. ++rfid RFID Reader Mach1(tm) [Paul_Dietrich] [Paul_Dietrich] Defined TXT keys: None ++ Protocol ++rgb tcp RGB Spectrum Device [RGB_Spectrum] [Steve_Hershey] 2011-10-10 Defined TXT keys: Keyboard, Mouse, Option1, Option2, Option3, ++ Discovery Option4, ModelName ++riousbprint Remote I/O USB Printer [Rob_Newberry] [Rob_Newberry] Defined TXT keys: See BonjourPrinting.pdf. ++ Protocol ++roku-rcp Roku Control Protocol [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 ++rql RemoteQuickLaunch [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None ++rsmp-server Remote System Management [Geoff_Back_3] [Geoff_Back_3] Defined TXT keys: apiver=<major.minor> ++ Protocol (Server Instance) ++rubygems RubyGems GemServer [Rich_Kilmer] [Rich_Kilmer] Defined TXT keys: None ++rym-rrc tcp Raymarine remote control [Raymarine_UK_Limited] [Geoffrey_Beer] 2012-05-24 2012-06-04 Defined TXT keys: raymarine-mfd-rrc-version, ++ protocol raymarine-mfd-model, raymarine-mfd-serial ++safarimenu Safari Menu [Jesus_De_Meyer] [Jesus_De_Meyer] Defined TXT keys: None ++sallingbridge Salling Clicker Sharing [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None ++sallingclicker Salling Clicker Service [Jonas_Salling] [Jonas_Salling] Defined TXT keys: None ++ Salutafugi Peer-To-Peer Java ++salutafugijms Message Service [David_Walend] [David_Walend] Defined TXT keys: SalutaProperties ++ Implementation ++sandvox Sandvox [Karelia_Software] [Karelia_Software] Defined TXT keys: None ++sc-golf StrawberryCat Golf Protocol [Phil_Willoughby] [Phil_Willoughby] Defined TXT keys: None ++scanner Bonjour Scanning [Baskaran_Subramaniam] [Baskaran_Subramaniam] Defined TXT keys: None ++schick Schick [Heiko_Kretschmer] [Heiko_Kretschmer] Defined TXT keys: None ++scone Scone [James_Moore] [James_Moore] Defined TXT keys: None ++scpi-raw IEEE 488.2 (SCPI) Socket [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None ++scpi-telnet IEEE 488.2 (SCPI) Telnet [Nick_Barendt_3] [Nick_Barendt_3] Defined TXT keys: None ++sdsharing Speed Download [Yazsoft] [Yazsoft] Defined TXT keys: None ++see SubEthaEdit 2 [TheCodingMonkeys] [TheCodingMonkeys] Defined TXT keys: txtvers=1, name=<Full Name>, userid=<User ++ ID>, version=2 ++seeCard seeCard [Stefan_Pantke] [Stefan_Pantke] Defined TXT keys: None ++senteo-http Senteo Assessment Software [Michael_Boyle] [Michael_Boyle] Defined TXT keys: None ++ Protocol ++sentillion-vlc Sentillion Vault System [George_Hartz] [George_Hartz] Defined TXT keys: None ++sentillion-vlt Sentillion Vault Systems [George_Hartz] [George_Hartz] Defined TXT keys: None ++ Cluster ++sepvsync SEPV Application Data [Kazuya_Ogata] [Kazuya_Ogata] Defined TXT keys: Proprietary ++ Synchronization Protocol ++serendipd serendiPd Shared Patches for [Hans_Christoph_Stein] [Hans_Christoph_Stein] Defined TXT keys: None ++ Pure Data ++servereye ServerEye AgentContainer [Andreas_Behr] [Andreas_Behr] Defined TXT keys: None ++ Communication Protocol ++servermgr Mac OS X Server Admin [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None ++services DNS Service Discovery [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Not a service type. Special name reserved for DNS-SD meta ++ queries. ++sessionfs Session File Sharing [Anthony_Williams] [Anthony_Williams] Defined TXT keys: Text keys are the file extensions of any ++ file the user plans to share, i.e. pdf, doc, mp3. ++sftp-ssh Secure File Transfer [Bryan_Cole] [Bryan_Cole] Defined TXT keys: u=<username> p=<password> path=<path> ++ Protocol over SSH ++ Defined TXT keys: username The login username to use ++ Window Shifter server (optional) ssh_tunnel Whether an SSH tunnel must be used ++shifter protocol [Antoine_Martin] [Antoine_Martin] (required) iface The network interface the server is on ++ (required - may be empty) version Software version (required) ++ ID Server Identifier (requried) ++shipsgm Swift Office Ships [Verek] [Verek] Defined TXT keys: None ++shipsinvit Swift Office Ships [Verek] [Verek] Defined TXT keys: None ++shoppersync SplashShopper [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary ++ Synchronization Service ++shoutcast Nicecast [Rogue_Amoeba_2] [Rogue_Amoeba_2] Defined TXT keys: None ++ Medical simulation patient ++simmon monitor syncronisation [Niels_Castle] [Niels_Castle] Defined TXT keys: None ++ protocol ++simusoftpong simusoftpong iPhone game [Anders_Svensson] [Anders_Svensson] Defined TXT keys: Proprietary ++ protocol ++ Defined TXT keys: ++ sipver SIP version ++ sipstd RFC number of SIP standard to comply with ++ auth plaintext | md5 | rsakeys ++ userid alphanumeric, additionally '_', '+', '-' ++ secret any printable ASCII characters ++ realm SIP realm (see RFC3261) ++ fromuser username for SIP "from" header (see RFC3261) ++ fromdomain domain for SIP "from" header (see RFC3261) ++ registrar SIP registrar (see RFC3261) ++sip udp Session Initiation Protocol, [Benjamin_Kowarsch] [Benjamin_Kowarsch] proxy SIP proxy (see RFC3261) ++ signalling protocol for VoIP natproxy SIP proxy for NATed clients ++ outproxy outbound SIP proxy (see RFC3261) ++ stunserver STUN server DNS name or IP address ++ contact SIP URI (see RFC3261) ++ dtmfmode inband | rfc2833 | sipinfo ++ welcome SIP URI (see RFC3261) ++ voicemail SIP URI (see RFC3261) ++ reception SIP URI (see RFC3261) ++ echotest SIP URI (see RFC3261) ++ ivrtest SIP URI (see RFC3261) ++ Further TXT record keys may be added in the future. ++sipuri Session Initiation Protocol [Jae_Woo_Lee] [Jae_Woo_Lee] Defined TXT keys: Defined in URL specification ++ Uniform Resource Identifier ++sironaxray Sirona Xray Protocol [Michael_Dalpiaz] [Michael_Dalpiaz] Defined TXT keys: Manufacturer=Sirona ++skype Skype Defined TXT keys: platform, status, auth, rversion, version ++sleep-proxy udp Sleep Proxy Server [Stuart_Cheshire_5][Marc_Krochmal] [Stuart_Cheshire_5][Marc_Krochmal] Defined TXT keys: None ++slimcli SliMP3 Server Command-Line [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None ++ Interface ++slimhttp SliMP3 Server Web Interface [Dean_Blackketter_2] [Dean_Blackketter_2] Defined TXT keys: None ++smartenergy Smart Energy Profile [Robby_Simpson] [Robby_Simpson] Defined TXT keys: See http://www.zigbee.org/SmartEnergy ++smb Server Message Block over Defined TXT keys: u=<username> p=<password> path=<path> ++ TCP/IP ++sms Short Text Message Sending [Christian_Flintrup] [Christian_Flintrup] Defined TXT keys: Proprietary ++ and Delivery Status Service ++ Syncellence file Defined TXT keys: device=<device type> protocol=<version ++smsync synchronization protocol [Dialectro_Software] [Gord_Peters] 2011-10-20 number> os=<operating system name> osver=<operating system ++ version> ++soap Simple Object Access [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None ++ Protocol ++socketcloud Socketcloud distributed [Robert_Goodyear] [Robert_Goodyear] Defined TXT keys: system, service, process, context, ++ application framework direction, status, progress, health, directive, flags ++sox Simple Object eXchange [Igor_Mozolevsky] [Igor_Mozolevsky] Defined TXT keys: Proprietary ++sparechange SpareChange data sharing [Dave_Carrigan] [Dave_Carrigan] Defined TXT keys: None ++ protocol ++spearcat sPearCat Host Discovery [Pierre_Frisch_2] [Pierre_Frisch_2] Defined TXT keys: applicationname=<Application Name>, ++ osname=<OS Name>, sslsupport=<Uses SSL> ++spidap tcp Sierra Photonics Inc. data [Sierra_Photonics_Inc] [Support_Staff] 2011-10-20 Defined TXT keys: None ++ protocol ++spincrisis Spin Crisis [Sphera_Software] [Sphera_Software] Defined TXT keys: None ++spl-itunes launchTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None ++spr-itunes netTunes [David_Nanian_2] [David_Nanian_2] Defined TXT keys: None ++splashsync SplashData Synchronization [Justin_Cepelak] [Justin_Cepelak] Defined TXT keys: Proprietary ++ Service ++ Defined TXT keys: txtvers=1 cport= the port for the content ++ HTTP server (secondary HTTP server used for content ++ publishing) mode= the mode in which the HMP device is ++spx-hmp tcp SpinetiX HMP [SpinetiX_S_A] [Diego_Santa_Cruz] 2011-10-18 currently operating, one of "normal", "safe" or "recovery" ++ serial= serial number of the HMP device firmware= firmware ++ version string (e.g., 2.1.0-0.1.7844) model= model string ++ (e.g., HMP100) ++ssh tcp SSH Remote Login Protocol [Tatu_Ylonen] [Tatu_Ylonen] Defined TXT keys: u=<username> p=<password> ++ssscreenshare Screen Sharing Defined TXT keys: None ++strateges Strateges [Jean_Olivier_Lanctot] [Jean_Olivier_Lanctot] Defined TXT keys: None ++sge-exec Sun Grid Engine (Execution [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None ++ Host) ++sge-qmaster Sun Grid Engine (Master) [Bill_Van_Etten] [Bill_Van_Etten] Defined TXT keys: None ++soda tcp Secure On Device API [Smith_Micro_Software_Inc] [David_Sperling_2] 2011-10-10 Defined TXT keys: a. ssid=<Wi-Fi SSID of the device> b. ++ bssid=<Wi-Fi BSSID of the device> ++souschef SousChef Recipe Sharing [Ben] [Ben] Defined TXT keys: None ++ Protocol ++ Defined TXT keys: txtvers=1 path=<relative or absolute URL of ++ endpoint> protovers=<number> [if not specified then default ++ SPARQL Protocol and RDF is 1.0, corresponding to SPARQL version] binding=<HTTP | ++sparql Query Language [Alex_Tucker] [Alex_Tucker] SOAP> [if not specified then default is HTTP] vocabs=<space ++ separated list of URIs> [RDF vocabularies or OWL ontologies ++ used by the endpoint] metadata=<URL> [to fetch RDF/XML ++ description of SPARQL service] ++sqp tcp Square Connect Control [Square_Connect_Inc] [Mat_Henshall] 2011-10-07 Defined TXT keys: Proprietary ++ Protocol ++stanza Lexcycle Stanza service for [Marc_Prud_hommeaux] [Marc_Prud_hommeaux] Defined TXT keys: None ++ discovering shared books ++stickynotes Sticky Notes [Johnnie_Walker] [Johnnie_Walker] Defined TXT keys: None ++stotp tcp One Time Pad Synchronisation [softthere_com] [James_Crosby] 2011-10-17 Defined TXT keys: None ++supple Supple Service protocol [Dave_Christianson] [Dave_Christianson] Defined TXT keys: type url ++surveillus Surveillus Networks [Mark_Lewis_3] [Mark_Lewis_3] Defined TXT keys: None ++ Discovery Protocol ++svn Subversion [CollabNet] [CollabNet] Defined TXT keys: None ++swcards Signwave Card Sharing [Signwave_Networking] [Signwave_Networking] Defined TXT keys: None ++ Protocol ++switcher Wireless home control remote [Steve_Splonskowski] [Steve_Splonskowski] Defined TXT keys: None ++ control protocol ++swordfish Swordfish Protocol for [Jim_Wallace] [Jim_Wallace] Defined TXT keys: None ++ Input/Output ++ Framework for transferring ++swyp any file from any app, to [ExoMachina] [Alexander_List] 2011-12-06 Defined TXT keys: NONE ++ any app on any device: ++ simply with a swyp. ++sxqdea Synchronize! Pro X [Qdea] [Qdea] Defined TXT keys: None ++sybase-tds Sybase Server Defined TXT keys: None ++syncopation Syncopation Synchronization [Sonzea] [Sonzea] Defined TXT keys: None ++ Protocol by Sonzea ++syncqdea Synchronize! X Plus 2.0 [Qdea] [Qdea] Defined TXT keys: None ++synergy Synergy Peer Discovery [Karl_Timmermann] [Karl_Timmermann] Defined TXT keys: None ++synksharing SynkSharing synchronization [Benjamin_Rister] [Benjamin_Rister] Defined TXT keys: None ++ protocol ++taccounting Data Transmission and [John_MacMullin] [John_MacMullin] Defined TXT keys: None ++ Synchronization ++tango Tango Remote Control [Tony_Amundson] [Tony_Amundson] Defined TXT keys: None ++ Protocol ++tapinoma-ecs Tapinoma Easycontact [Bonjour] [Bonjour] Defined TXT keys: None ++ receiver ++ Task Coach Two-way ++taskcoachsync Synchronization Protocol for [Jerome_Laheurte] [Jerome_Laheurte] Defined TXT keys: None ++ iPhone ++ Defined TXT keys: txtvers=1, sesna, seid, setype, cosna, ++tbricks tbricks internal protocol [Joakim_Johansson] [Joakim_Johansson] coid, cotype, sysna, syna, syid, subsyid, venid, protocols, ++ pid ++tcode Time Code [Marshall_Anschutz] [Marshall_Anschutz] Defined TXT keys: None ++tcu Tracking Control Unit by [James_Nikolai] [James_Nikolai] Defined TXT keys: None ++ RPM-PSI ++te-faxserver TE-SYSTEMS GmbH Fax Server [Tobias_Erichsen] [Tobias_Erichsen] Defined TXT keys: Proprietary ++ Daemon ++teamlist ARTIS Team Task [ARTIS_Software] [ARTIS_Software] Defined TXT keys: None ++teleport udp teleport [Julien_Robert] [Julien_Robert] Defined TXT keys: None ++tenir-rc tcp Proprietary [Tenir_Software] [Steve_Gums] 2011-10-27 Defined TXT keys: Proprietary ++tera-fsmgr Terascala Filesystem Manager [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary ++ Protocol ++tera-mp Terascala Maintenance [Mike_Nuss] [Mike_Nuss] Defined TXT keys: Proprietary ++ Protocol ++tf-redeye ThinkFlood RedEye IR bridge [Matt_Eagar] [Matt_Eagar] Defined TXT keys: None ++thumbwrestling tinkerbuilt Thumb Wrestling [Jamie_Halmick] [Jamie_Halmick] Defined TXT keys: None ++ game ++ticonnectmgr TI Connect Manager Discovery [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None ++ Service ++tinavigator TI Navigator Hub 1.0 [Stephen_Reid] [Stephen_Reid] Defined TXT keys: None ++ Discovery Service ++tivo-device tcp TiVo Device Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None ++tivo-hme TiVo Home Media Engine [Developer_Support] [Developer_Support] Defined TXT keys: None ++ Protocol ++tivo-mindrpc tcp TiVo RPC Protocol [TiVo_Inc] [Developer_Support_2] 2011-10-18 Defined TXT keys: None ++tivo-music TiVo Music Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None ++tivo-photos TiVo Photos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: None ++tivo-remote TiVo Remote Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN ++tivo-videos TiVo Videos Protocol [Developer_Support] [Developer_Support] Defined TXT keys: protocol, path, swversion, platform, TSN ++todogwa 2Do Sync Helper Tool for Mac [Fahad_Gilani] [Fahad_Gilani] Defined TXT keys: None ++ OS X and PCs ++tomboy Tomboy [Alex_Graveley] [Alex_Graveley] Defined TXT keys: None ++toothpicserver ToothPics Dental Office [Milton_Pulis] [Milton_Pulis] Defined TXT keys: None ++ Support Server ++touch-able iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, CtlN, DbId, Ver, DvTy, OSsi, DvSv ++ Controllable ++touch-remote iPhone and iPod touch Remote [Amandeep_Jawa_3] [Amandeep_Jawa_3] Defined TXT keys: txtvers, DvNm, Pair, RemV, RemN, DvTy ++ Pairing ++tri-vis-client triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None ++ Client ++tri-vis-server triCerat Simplify Visibility [Christopher_Karper] [Christopher_Karper] Defined TXT keys: None ++ Server ++tryst Tryst [Francisco_Ryan_Tolma] [Francisco_Ryan_Tolma] Defined TXT keys: None ++ The Social Broadband Defined TXT keys: there is no TXT keys defined for this ++tsbiis tcp Interference Information [Sergio_Luis] [Sergio_Luis] 2012-02-27 protocol ++ Sharing ++tt4inarow Trivial Technology's 4 in a [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None ++ Row ++ttcheckers Trivial Technology's [Nicolas_Payette] [Nicolas_Payette] Defined TXT keys: None ++ Checkers ++ttp4daemon TechTool Pro 4 Anti-Piracy [Micromat] [Micromat] Defined TXT keys: None ++ Service ++tunage Tunage Media Control Service [Matt_Patenaude] [Matt_Patenaude] Defined TXT keys: None ++tuneranger TuneRanger [Acertant] [Acertant] Defined TXT keys: None ++ TZ-Software remote procedure ++tzrpc tcp call based synchronization [Thomas_Zwick] [Thomas_Zwick] 2011-10-12 Defined TXT keys: Proprietary ++ protocol ++ubertragen Ubertragen [Widgetschmie_de] [Widgetschmie_de] Defined TXT keys: None ++uddi Universal Description, [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD ++ Discovery and Integration ++ Universal Description, ++uddi-inq Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD ++ Inquiry ++ Universal Description, ++uddi-pub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD ++ Publishing ++ Universal Description, ++uddi-sub Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD ++ Subscription ++ Universal Description, ++uddi-sec Discovery and Integration [Paul_Denning] [Paul_Denning] Defined TXT keys: TBD ++ Security ++upnp Universal Plug and Play [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None ++urlbookmark URL Advertising [Sven_S_Porst] [Sven_S_Porst] Defined TXT keys: URL=<URL that is advertised>, name=<Name of ++ the bookmark> ++uswi Universal Switching [Roger_Lemberg] [Roger_Lemberg] Defined TXT keys: None ++ Corporation products ++utest uTest [Gregory_Power] [Gregory_Power] Defined TXT keys: None ++uwsgi Unbit Web Server Gateway [Roberto_De_Ioris] [Roberto_De_Ioris] Defined TXT keys: None ++ Interface ++ve-decoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, ++ Decoder Control Service serial, path, idp ++ve-encoder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, ++ Encoder Control Service serial, path, idp ++ve-recorder American Dynamics VideoEdge [Gary_Sands] [Gary_Sands] Defined TXT keys: txtvers, macaddress, protovers, model, ++ Recorder Control Service serial, path, idp ++virtualdj VirtualDJ Remote Control [Atomix_Productions] [Stephane_Clavel] 2011-10-12 Defined TXT keys: None ++ protocol ++ Defined TXT keys: Version=<service version> Type=<service ++visel visel Q-System services [Lehpaner_Sasa] [Lehpaner_Sasa] type> Name=<service Name> Zone=<service zone> ID=<serviceID> ++ SString=<serviceString> SString1=<serviceString> ++ Virtual Object System (using Defined TXT keys: url=<Object URL with full path> ++vos VOP/TCP) [Reed_Hedges][Peter_Amstutz] [Reed_Hedges][Peter_Amstutz] type=<Comma-seperated list of object types> title=<Short ++ title of service> descr=<Short description of service> ++vue4rendercow VueProRenderCow Defined TXT keys: None ++vxi-11 VXI-11 TCP/IP Instrument [Nick_Barendt_2] [Nick_Barendt_2] Defined TXT keys: None ++ Protocol ++walkietalkie Walkie Talkie [Johan_Kool] [Johan_Kool] Defined TXT keys: None ++we-jell Proprietary collaborative [Vaughn_Amann] [Vaughn_Amann] Defined TXT keys: user=<user name> stat=<OK, DND, AWY, ++ messaging protocol FWD:uname> agent=<agent type> ++ World Wide Web Distributed ++webdav Authoring and Versioning [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> ++ (WebDAV) ++webdavs WebDAV over SSL/TLS [Y_Y_Goland] [Y_Y_Goland] Defined TXT keys: u=<username> p=<password> path=<path> ++webissync WebIS Sync Protocol [Alex_Kac] [Alex_Kac] Defined TXT keys: None ++wedraw weDraw document sharing [Oleksandr_Zakharchuk] [Oleksandr_Zakharchuk] Defined TXT keys: None ++ protocol ++whamb Whamb [Whamb] [Whamb] Defined TXT keys: None ++whistler Honeywell Video Systems [Shankar_Prasad_2] [Shankar_Prasad_2] Defined TXT keys: None ++wicop udp WiFi Control Platform [Santorini_LLC] [Cameron_Colpitts] 2011-10-25 Defined TXT keys: state=<state> loc=<location> ++witap WiTap Sample Game Protocol [Rory_McGuire_2] [Rory_McGuire_2] Defined TXT keys: None ++witapvoice witapvoice [Roberto_Garcia] [Roberto_Garcia] Defined TXT keys: None ++wkgrpsvr Workgroup Server Discovery [Forest_Hill] [Forest_Hill] Defined TXT keys: None ++workstation Workgroup Manager [Kevin_Arnold] [Kevin_Arnold] Defined TXT keys: None ++wormhole Roku Cascade Wormhole [Don_Woodward] [Don_Woodward] Defined TXT keys: txtvers=1 ++ Protocol ++workgroup Novell collaboration [Brady_Anderson] [Brady_Anderson] Defined TXT keys: version=? description=? ++ workgroup ++writietalkie Writie Talkie Data Sharing [Yin_Ki_Lau] [Yin_Ki_Lau] Defined TXT keys: None ++ws Web Services [Andrew_Donoho] [Andrew_Donoho] Defined TXT keys: None ++wtc-heleos Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None ++ HELEOS ++wtc-qels Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None ++ QELS ++wtc-rex Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None ++ Optilab rEX ++wtc-viscostar Wyatt Technology Corporation [Roy_Reapor] [Roy_Reapor] Defined TXT keys: None ++ ViscoStar ++wtc-wpr Wyatt Technology Corporation [Brent_Fulgham] [Brent_Fulgham] Defined TXT keys: None ++ DynaPro Plate Reader ++wwdcpic PictureSharing sample code [Marc_Krochmal] [Marc_Krochmal] Defined TXT keys: None ++x-on x-on services [Matthias_Burghardt] [Matthias_Burghardt] Defined TXT keys: Proprietary ++ synchronisation protocol ++x-plane9 udp x-plane9 [Austin_Meyer] [Austin_Meyer] Defined TXT keys: None ++xcodedistcc Xcode Distributed Compiler [Scott_Tooker] [Scott_Tooker] Defined TXT keys: None ++xgate-rmi xGate Remote Management [Tim_Jobling] [Tim_Jobling] Defined TXT keys: tech=value (string) model=value (string) ++ Interface version=value (string) ++xmp Xperientia Mobile Protocol [Henric_Bergh] [Henric_Bergh] 2007-01 Defined TXT keys: txtvers, user, system, nodeid, desc ++xsanclient Xsan Client [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None ++xsanserver Xsan Server [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None ++xsansystem Xsan System [Jeff_Albouze] [Jeff_Albouze] Defined TXT keys: None ++xtimelicence xTime License [AppMac_Software] [AppMac_Software] Defined TXT keys: None ++xtshapro xTime Project [AppMac_Software] [AppMac_Software] Defined TXT keys: None ++ XUL (XML User Interface Defined TXT keys: u=<username> p=<password> path=<path to ++xul-http Language) transported over [Eran_Gampel] [Eran_Gampel] document> (Same as for _http._tcp) ++ HTTP ++yakumo udp Yakumo iPhone OS Device [Daniel_Heffernan] [Daniel_Heffernan] Defined TXT keys: None ++ Control Protocol ++z-wave tcp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM ++z-wave udp Z-Wave Service Discovery [Sigma_Designs_Inc] [Anders_Brandt_2] 2011-10-03 Defined TXT keys: NIF, EP, LM ++zeromq tcp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note ++ messaging ++zeromq udp High performance brokerless [Daniel_Holth] [Daniel_Holth] 2012-04-24 Defined TXT keys: type, app, label, note ++ messaging ++ ++ People ++ ++ ID Name Organization Contact URI Last ++ Updated ++[AMTEC_S_p_A] AMTEC S.p.A mailto:sp.amtec&interbusiness.it ++[APCO_Project] Steve Glass APCO Project 25 mailto:admin&sedition.org.au 2011-05-13 ++[ARTIS_Software] ARTIS Software mailto:contact&artissoftware.com ++[ASDIS_Support] ASDIS Support mailto:support&asdis.de 2005-08 ++[A_Blake_Cooper] A. Blake Cooper mailto:blake&cluebie.net 2003-06 ++[A_Boninn] A. Boninn mailto:aboninn&hotmail.com ++[A_P_Hobson] A.P. Hobson mailto:A.P.Hobson&bra0112.wins.icl.co.uk ++[Aaron_Ballman] Aaron Ballman mailto:aaron&realsoftware.com 2004-11 ++[Aaron_Bilbrey] Aaron Bilbrey mailto:abilbrey&commvault.com ++[Aaron_Brick] Aaron Brick mailto:aa&lithic.org ++[Aaron_Fracht_Monroe] Aaron Fracht-Monroe mailto:afracht-monroe&amcomsoft.com 2010-06-03 ++[Aaron_L_Bratcher] Aaron L. Bratcher mailto:aaronlbratcher&yahoo.com 2011-10-17 ++[Aaron_Lav] Aaron Lav mailto:aaron&taltrade.com ++[Aaron_Myer] Aaron Myer mailto:aaron.myer&in2nets.com 2004-06 ++[Aaron_S_Kurland] Aaron S. Kurland mailto:akurland&netsilicon.com ++[Aaron_Stein] Aaron Stein mailto:aaron.stein&ca.com ++[Abdullah_Obeid] Abdullah Obeid mailto:a.obeid&contamac.nl 2008-03-20 ++[Abel_Chou] Abel Chou mailto:abel&willy.esl.com ++[Abhay_Rajaram] Abhay Rajaram mailto:Abhay_Rajaram&3com.com 2003-03 ++[Abhijit_Kumar] Abhijit Kumar mailto:as-iana-ports&sun.com 2005-11 ++[AccuMed_Services] AccuMed Services mailto:scarleton&accu-med.com 2011-10-20 ++[Acertant] Acertant ++ Technologies, Inc. ++[AD_Holdings] AD Holdings mailto:klawson&ad-holdings.co.uk 2011-10-11 ++[Adam_Berk] Adam Berk mailto:aberk&empirix.com ++[Adam_Curtin] Adam Curtin mailto:adam.curtin&isysg.com ++[Adam_Ernst] Adam Ernst mailto:cosmicsoft&cosmicsoft.net 2004-12 ++[Adam_Ernst_2] Adam Ernst mailto:contact&cosmicsoft.net 2002-06 ++[Adam_Gawne_Cain] Adam Gawne-Cain mailto:adam&gawncainresearch.co.uk 2003-11 ++[Adam_Golovenko] Adam Golovenko mailto:golovenko&gmail.com 2006-10 ++[Adam_Kerrison] Adam Kerrison mailto:adamµmuse.co.uk ++[Adam_Maxwell] Adam Maxwell mailto:amaxwell&mac.com ++[Adam_Robinson] Adam Robinson Data Access, Inc. mailto:adam&dataaccessinc.com 2012-04-30 ++[AddressBookServer] AddressBookServer.com mailto:iana&addressbookserver.com 2011-10-18 ++[Adi_Ruppin] Adi Ruppin mailto:adi.ruppin&data-pod.com 2005-08 ++[Administrator] Administrator mailto:admin&ipcore.co.za 2005-12 ++[Adobe_Systems] Adobe Systems Inc. mailto:mikeharr&adobe.com 2012-04-17 ++[Adrian_Hornby] Adrian Hornby mailto:Adrian.Hornby&aran.co.uk ++[Adrian_Hungate] Adrian Hungate mailto:adrian&haqa.co.uk 2009-09-14 ++[Adrian_Mancini] Adrian Mancini mailto:adrian.mancini&entrust.com ++[Adrian_Pell] Adrian Pell mailto:PELL_ADRIAN/HP-UnitedKingdom_om6@hplb.hpl.hp.com ++[Adrian_Popescu] Adrian Popescu mailto:Adrian_Popescu&groove.net 2002-09 ++[Adrien_de_Croy] Adrien de Croy mailto:adrien&qbik.com ++[Adwait_Sathe] Adwait Sathe mailto:asathe&sonusnet.com 2005-08 ++[Aerohive_Networks] Aerohive Networks mailto:iana&aerohive.com 2012-06-04 ++[Afkham_Azeez] Afkham Azeez mailto:azeez&wso2.com 2006-06 ++[Agri_Datalog] Agri Datalog mailto:contact&agri-datalog.com ++[Ahmad_Tajuddin_Samsu] Ahmad Tajuddin Samsudin mailto:tajuddin&tmrnd.com.my 2007-02 ++[Ahti_Heinla] Ahti Heinla mailto:ahti&ahti.bluemoon.ee 2002-06 ++[Aivi_Lie] Aivi Lie mailto:LIEA&netsoft.com ++[Ajay_Jindal] Ajay Jindal mailto:ajayjµsoft.com ++[Ake_Hedman] Ake Hedman mailto:akhe&eurosource.se 2005-11 ++[Akira_Ide] Akira Ide mailto:ide.akira&jp.fujitsu.com 2006-09 ++[Akira_Saito] Akira Saito mailto:admin&kobu.com 2003-04 ++[Akiyoshi_Ochi] Akiyoshi Ochi mailto:akiyoshi&net.paso.fujitsu.co.jp ++[Al_Amet] Al Amet mailto:aamet&point-inc.com ++[Al_Guetzlaff] Al Guetzlaff mailto:aeg&teamquest.com ++[Alain_Durand] Alain Durand mailto:Alain.Durand&imag.fr ++[Alain_Robert] Alain Robert mailto:arobert&par.sita.int ++[Alain_Robert_2] Alain Robert mailto:Alain.Robert&hmrinc.com ++[Alan_Akahoshi] Alan Akahoshi mailto:alan-akahoshi&vertel.com ++[Alan_Bivens] Alan Bivens mailto:jbivens&us.ibm.com 2003-08 ++[Alan_Butt] Alan Butt mailto:alan.butt&landesk.com 2006-03 ++[Alan_Clifford] Alan Clifford mailto:alan&clifford.ac ++[Alan_Dano] Alan Dano mailto:wiseobject&yahoo.com ++[Alan_Francis] Alan Francis mailto:AlanF&zonal.co.uk 2002-05 ++[Alan_King] Alan King Enabling Technology mailto:aking&etdesigners.com 2009-08-13 ++ Pty. Ltd. ++[Alan_Malik] Alan Malik mailto:alan&exasoft.co.uk 2003-11 ++[Alan_Minchew] Alan Minchew mailto:alan.minchew&hp.com 2011-05-23 ++[Alan_Noble] Alan Noble mailto:noble&netmind.com ++[Alan_Pickrell] Alan Pickrell mailto:alanp&goahead.com ++[Alan_Potter] Alan Potter mailto:potter&movies.enet.dec.com ++[Alan_Robertson] Alan Robertson mailto:alanr&unix.sh ++[Alan_Sandell] Alan Sandell mailto:alan.sandell&ist.co.uk 2008-05-01 ++[Alan_Ungar] Alan Ungar mailto:aungar&farradyne.com ++[Alan_Yates] Alan Yates mailto:alany&ay.com.au ++[Albert_Berlovitch] Albert Berlovitch mailto:albertb&voltaire.com 2009-12-17 ++[Albert_C_Yang] Albert C. Yang mailto:albert.yang&ezmeeting.com 2002-03 ++[Albert_Cester] Albert Cester mailto:albert.cester&assyst-intl.com 2008-08-26 ++[Albert_G_Broscius] Albert G. Broscius mailto:broscius&dsl.cis.upenn.edu ++[Albert_Holt] Albert Holt mailto:alberth&triosoftware.com ++[Albert_Holt_2] Albert Holt mailto:alberth&fiorano.com ++[Albert_Hou] Albert Hou mailto:ahou1&bloomberg.com 2006-05 ++[Albert_Leung] Albert Leung mailto:aleung&biscom.com 2006-04 ++[Albert_Manfredi] Albert Manfredi mailto:manfredi&engr05.comsys.rockwell.com ++[Alberto_Berlen] Alberto Berlen mailto:aberlen&vnet.ibm.com ++[Alberto_Cerpa] Alberto Cerpa mailto:cerpa&isi.edu ++[Alberto_Fernandez] Alberto Fernandez mailto:af&xtec.com 2006-01 ++[Alberto_Ortega_Llama] Alberto Ortega Llamas mailto:alberto.kun666&gmail.com 2009-11-04 ++[Alberto_Raydan] Alberto Raydan mailto:alberto&altasol.com ++[Alberto_Raydan_2] Alberto Raydan mailto:raydan_a&socalia.com 2005-08 ++[Albrecht_Mayer] Albrecht Mayer mailto:albrecht.mayer&infineon.com 2002-05 ++[Alcorn_McBride_Inc] Alcorn McBride Inc. mailto:jeff&alcorn.com ++[Alec_Carlson] Alec Carlson mailto:acarlson&smithmicro.com 2003-01 ++[Alec_Muffett] Alec Muffett mailto:alecm&sun.com ++[Alejandro_Bonet] Alejandro Bonet mailto:babel&ctv.es ++[Alessandro_Bassi] Alessandro Bassi mailto:abassi&cs.utk.edu ++[Alessio_Casati] Alessio Casati mailto:a.casati&computer.org ++[Alex_Chen] Alex Chen mailto:alex_chen&filemaker.com 2009-11-25 ++[Alex_Duncan] Alex Duncan mailto:alex.duncan&sse.ie ++[Alex_Duncan_2] Alex Duncan mailto:Alex.Duncan&sse.ie ++[Alex_Graveley] Alex Graveley mailto:alex&beatniksoftware.com ++[Alex_Kac] Alex Kac mailto:webis_sync_protocol&webis.net ++[Alex_Lelievre] Alex Lelievre mailto:alex&folabs.com 2009-08-18 ++[Alex_McDonald] Alex McDonald mailto:alexm&an.hp.com ++[Alex_Nicu] Alex Nicu mailto:alex.nicu&philips.com 2003-10 ++[Alex_Oberlander] Alex Oberlander mailto:alexo&netmount.com ++[Alex_Stoev] Alex Stoev Nine Technology, LLC mailto:astoev&ninetechnology.com 2011-08-01 ++[Alex_Tucker] Alex Tucker mailto:alex&floop.org.uk ++[Alex_Vasilevsky] Alex Vasilevsky mailto:alexv&204.165.216.115 ++[Alex_White] Alex White mailto:alex&intralan.co.uk 2007-09-12 ++[Alexander_Bogdanov] Alexander Bogdanov mailto:alexandr_bgd&softhome.net ++[Alexander_Bogdanov_2] Alexander Bogdanov mailto:alexander_bgd&softhome.net ++[Alexander_Christian] Alexander Christian mailto:alexander.christian&root1.de 2012-04-19 ++[Alexander_Dubrovsky] Alexander Dubrovsky mailto:dubrovsky_alex&emc.com ++[Alexander_Falk] Alexander Falk mailto:falk&icon.at ++[Alexander_Falk_2] Alexander Falk Altova, Inc. mailto:al&altova.com 2011-07-07 ++[Alexander_Graef] Alexander Graef mailto:alex&graef.cc 2004-11 ++[Alexander_Griekspoor] Alexander Griekspoor mailto:a.griekspoor&nki.nl 2003-07 ++[Alexander_Hartner] Alexander Hartner AddressBookServer.com mailto:dev&addressbookserver.com 2011-10-14 ++[Alexander_Konovalov] Alexander Konovalov mailto:konovalov&member.ams.org 2007-11-27 ++[Alexander_List] Alexander List mailto:alist&exomachina.com 2011-12-06 ++[Alexander_Medvinsky] Alexander Medvinsky mailto:smedvinsky&gi.com ++[Alexander_Philippou] Alexander Philippou mailto:alex&noemax.com 2003-10 ++[Alexander_Raji] Alexander Raji mailto:araji&lucent.com ++[Alexander_Sahler] Alexander Sahler mailto:alexander.sahler&brodos.de 2002-02 ++[Alexander_V_Ivanov] Alexander V. Ivanov mailto:support&aidaim.com 2004-12 ++[Alexandre_Carlhian] Alexandre Carlhian mailto:alex&appeule.com ++[Alexandre_Lechenne] Alexandre Lechenne mailto:alexandre.lechenne&selectron.ch 2008-12-10 ++[Alexei_V_Soloviev] Alexei V. Soloviev mailto:avsolov&lab127.karelia.ru 2002-05 ++[Alexei_Vladishev] Alexei Vladishev mailto:alexei.vladishev&zabbix.com 2006-02 ++[Alexey_Vlaskin] Alexey Vlaskin mailto:avlaskin&visicron.com 2007-10-22 ++[Alexis_Bose] Alexis Bose mailto:abose&d-ta.com 2008-12-08 ++[Alfred_Schmidt] Alfred Schmidt mailto:a.schmidt&aft-werdohl.de 2003-11 ++[Ali_Fracyon] Ali Fracyon mailto:sxdev&modulardreams.com ++[Ali_Jelveh] Ali Jelveh mailto:ali&protonet.info ++[Ali_Saleh] Ali Saleh mailto:scomm&cerf.net ++[Allan_Miller] Allan Miller mailto:amiller&handsfreenetworks.com ++[Allan_Panitch] Allan Panitch mailto:allanp&tcosoft.com ++[Allan_Stanley] Allan Stanley mailto:allan&hummingbird.com ++[Allen_Baker] Allen Baker mailto:abaker&boi.hp.com ++[Allen_Briggs] Allen Briggs mailto:briggs&access.rrinc.com ++[Allen_Samuels] Allen Samuels mailto:allen.samuels&citrix.com 2006-11 ++[Allen_Wei] Allen Wei mailto:Allen_Wei&arborsoft.com ++[Allison_Carleton] Allison Carleton mailto:acarleto&naper1.napervilleil.ncr.com ++[Almira] Almira mailto:almira_niciu&intuit.com 2003-07 ++[Alon_Kantor] Alon Kantor mailto:alonk&checkpoint.com ++[Alon_Tamir] Alon Tamir mailto:alon_tamir&symantec.com 2006-04 ++[ALPESH_DHAMELIA] ALPESH DHAMELIA MINDARRAY SYSTEMS (P) mailto:alpesh&mindarraysystems.com 2011-10-25 ++ LTD. ++[Altova] Altova mailto:has&altova.com 2005-08 ++[Alvaro_P_Dominguez] Alvaro P. Dominguez mailto:alpado&gmail.com 2006-02 ++[Alwin_Egger] Alwin Egger mailto:alwin.egger&tegonal.com 2003-11 ++[Aly_Orady] Aly Orady Atto Devices Inc. mailto:aly.orady&attodevices.com 2007-08-07 ++[Amanda] mailto:amanda-core&amanda.org ++[Amandeep_Jawa] Amandeep Jawa mailto:daap&apple.com 2003-01 ++[Amandeep_Jawa_2] Amandeep Jawa mailto:dpap&apple.com 2004-11 ++[Amandeep_Jawa_3] Amandeep Jawa mailto:daap&apple.com ++[Amatzia_Ben_Artzi] Amatzia Ben-Artzi ++[American_Power_Conve] American Power mailto:ports&apcc.com 2002-02 ++ Conversion ++[Amir_Blich] Amir Blich mailto:amir&netmanage.co.il ++[Amir_Herzberg] Amir Herzberg mailto:amirh&vnet.ibm.com ++[Amir_Peless] Amir Peless mailto:amirp&radware.co.il ++[Amir_Rapson] Amir Rapson mailto:rapson&sofaware.com 2002-02 ++[Amit_Nigam] Amit Nigam mailto:amnigam&cisco.com 2009-08-24 ++[Amitava_Dutta] Amitava Dutta mailto:Amitava.Dutta&woodbridgenj.ncr.com ++[Amnon_Horowitz] Amnon Horowitz mailto:amnonhµsoft.com ++[Amol_P_Tambe] Amol P Tambe mailto:amol_tambe&symantec.com 2011-02-02 ++[AMPL_Optimization] AMPL Optimization, mailto:dmg&l.com 2012-05-25 ++ Inc. ++[Amy_Kang] Amy Kang mailto:amy.kang&sun.com 2009-03-10 ++[Amy_Weaver] Amy Weaver mailto:aweaver&vpnet.com ++[Amy_Weaver_2] Amy Weaver mailto:amy_weaver&nai.com ++[Amy_Weaver_3] Amy Weaver mailto:Amy_Weaver&nai.com ++[Anand_Bhalerao] Anand Bhalerao mailto:anand_bhalerao&symantec.com 2008-10-02 ++[Anand_Gangadharan] Anand Gangadharan mailto:anand&goa.mainsoft.com ++[Anastasios_Kotsikona] Anastasios Kotsikonas mailto:tasos&cs.bu.edu ++[Anders_Borg] Anders Borg mailto:anders.borg&solid.se 2004-11 ++[Anders_Brandt] Anders Brandt Zensys Inc. mailto:abr&zen-sys.com 2007-02 ++[Anders_Brandt_2] Anders Brandt Sigma Designs, Inc. mailto:anders_brandt&sigmadesigns.com 2011-10-03 ++[Anders_Hjelm] Anders Hjelm mailto:anders.hjelm&ec.se 2006-03 ++[Anders_Klemets] Anders Klemets mailto:andersklµsoft.com ++[Anders_Svensson] Anders Svensson mailto:pong&simusoft.dk ++[Andre_Cato] Andre Cato mailto:andre.cato&datacore.com 2003-07 ++[Andre_Kramer] Andre Kramer mailto:Andre.Kramer&ansa.co.uk ++[Andre_Petras] Andre Petras mailto:a.petras&arcor.de 2003-01 ++[Andre_Schroter] Andre Schroter mailto:A.Schroeter&chili-radiology.com ++[Andrea_Gazzaniga] Andrea Gazzaniga mailto:gazzaniga&funambol.com 2007-01 ++[Andrea_Lanza] Andrea Lanza mailto:andrea.lanza&frameweb.it ++[Andrea_Premoli] Andrea Premoli mailto:Andrea_maria.Premoli&icn.siemens.it 2003-01 ++[Andreas_Alptun] Andreas Alptun mailto:info&illusionlabs.se ++[Andreas_Bauer] Andreas Bauer mailto:bauer_andreas&emc.com ++[Andreas_Behr] Andreas Behr mailto:andreas.behr&kraemer-it.de ++[Andreas_Fehr] Andreas Fehr mailto:andreas&mrs.ch ++[Andreas_Foedrowitz] Andreas Foedrowitz mailto:andreas.foedrowitz&thomson.net 2008-06-18 ++[Andreas_Glocker] Andreas Glocker mailto:glocker&sirius.com ++[Andreas_Haas] Andreas Haas mailto:andreas.haas&sun.com 2006-08 ++[Andreas_Heidemann] Andreas Heidemann mailto:a.heidemann&ais-gmbh.de ++[Andreas_Junghans] Andreas Junghans mailto:cytv&lucid-cake.net ++[Andreas_Oesterhelt] Andreas Oesterhelt mailto:oes&privoxy.org 2002-06 ++[Andreas_Oman] Andreas Oeman mailto:andreas&lonelycoder.com ++[Andreas_Roene] Andreas Roene mailto:support&home-online.de ++[Andreas_Schwarz] Andreas Schwarz mailto:andi&trancefield.de 2002-03 ++[Andreas_Schwarz_2] Andreas Schwarz mailto:andreas.schwarz&securepoint.de 2003-06 ++[Andreas_Spalenski] Andreas Spalenski mailto:andreas.spalenski&trsystems.de 2008-11-24 ++[Andreas_Terzis] Andreas Terzis mailto:terzis&cs.ucla.edu ++[Andreas_Varga] Andreas Varga mailto:sid&parsec.org ++[Andreas_Wetzel] Andreas Wetzel mailto:mickey&enforcer.cc 2002-09 ++[Andreas_Wurf] Andreas Wurf mailto:a.wurf&mediatools.de ++[Andrei_Litvinn] Andrei Litvinn mailto:support&asigra.com 2005-01 ++[Andrei_Vilkotski] Andrei Vilkotski mailto:andreiv&sgi.com 2003-06 ++[Andres_Seco_Hernande] Andres Seco Hernandez mailto:AndresSH&alamin.org ++[Andrew_Aksyonoff] Andrew Aksyonoff mailto:shodan&sphinxsearch.com 2009-10-20 ++[Andrew_Andrews] Andrew Andrews mailto:Andrew.Andrews&nsius.com 2011-09-01 ++[Andrew_Borisov] Andrew Borisov mailto:hdr&chat.ru ++[Andrew_Chernow] Andrew Chernow mailto:andrew&esilo.com 2007-01 ++[Andrew_Crockford] Andrew Crockford mailto:andrew.crockford&modus-interactive.co.uk ++[Andrew_Donoho] Andrew Donoho mailto:awd&us.ibm.com ++[Andrew_Draper] Andrew Draper mailto:adraper&altera.com ++[Andrew_H_Derbyshire] Andrew H Derbyshire mailto:ahd&meetingmaker.plus.kew.com 2004-12 ++[Andrew_Hoddinott] Andrew Hoddinott mailto:support&artvps.com ++[Andrew_Jay_Schneider] Andrew Jay Schneider mailto:ajs&relsoft.com ++[Andrew_Johnson] Andrew Johnson mailto:andrew.johnson&bliss-support.demon.co.uk ++[Andrew_Mather] Andrew Mather mailto:info&balaena.com 2008-02-14 ++[Andrew_Morgan] Andrew Morgan mailto:andrew.morgan&sun.com 2009-12-08 ++[Andrew_Mossberg] Andrew Mossberg mailto:amossberg&asoki.net ++[Andrew_Schultz] Andrew Schultz mailto:aschultz&strykercom.com 2003-08 ++[Andrew_Sharpe] Andrew Sharpe mailto:help&smartsims.com ++[Andrew_Shire] Andrew Shire mailto:sndrewsh&sco.com ++[Andrew_Sinclair] Andrew Sinclair mailto:andrsinµsoft.com ++[Andrew_Stone] Andrew Stone mailto:andrew&stone.com ++[Andrew_Tridgell] Andrew Tridgell mailto:tridge&samba.anu.edu.au ++[Andrew_Tune] Andrew Tune mailto:Andrew.Tune&splitlock.com 2003-01 ++[Andrew_Watson] Andrew Watson mailto:andrew&omg.org ++[Andrew_Zamler_Carhar] Andrew Zamler-Carhart mailto:andrew&zamler-carhart.com ++[Andrew_Zimmerman] Andrew Zimmerman mailto:andrew&zimmerman.net 2004-06 ++[Andrey_Mohov] Andrey Mohov mailto:mohov_andrey&mail.ru 2010-08-17 ++[AndySC] AndySC mailto:AndySC&uk.ibm.com ++[Andy_Belk] Andy Belk mailto:abelk&apple.com ++[Andy_Belk_2] Andy Belk mailto:register1&azulsystems.com 2005-02 ++[Andy_Brewerton] Andy Brewerton mailto:andy.brewerton&otium.co.uk 2005-08 ++[Andy_Bruce] Andy Bruce mailto:franklin_yah&yahoo.com ++[Andy_Buckingham] Andy Buckingham mailto:feedback&radiodns.org ++[Andy_Burgess] Andy Burgess mailto:aab&cichlid.com ++[Andy_Crick] Andy Crick mailto:acrick&haascnc.com 2007-11-13 ++[Andy_Georgiou] Andy Georgiou mailto:ageorgiou&crypto-solutions.co.uk ++[Andy_Grover] Andy Grover mailto:andy.grover&oracle.com 2009-05-20 ++[Andy_Heron] Andy Heron mailto:btexact.ports&bt.com ++[Andy_Krouwel] Andy Krouwel mailto:andy&kar2ouche.com ++[Andy_Malis] Andy Malis mailto:malis_a&timeplex.com ++[Andy_McKeen] Andy McKeen mailto:mckeen&osf.org ++[Andy_O_Meara] Andy O'Meara mailto:andy&soundspectrum.com ++[Andy_Perreault] Andy Perreault mailto:aperreault&erlphase.com 2010-03-31 ++[Andy_Shellam] Andy Shellam mailto:andy&networkmail.eu 2008-02-19 ++[Andy_Stanford_Clark] Andy Stanford-Clark mailto:andysc&uk.ibm.com ++[Andy_Valencia] Andy Valencia mailto:vandys&vandys-lap.cisco.com ++[Andy_Warner] Andy Warner mailto:andyw&knoware.nl ++[Angelique_Dokos] Angelique Dokos mailto:angelique.dokos&hp.com 2003-11 ++[Angelo_Masci] Angelo Masci mailto:angelomasci&yahoo.co.uk 2007-01 ++[Angie_S_Morner] Angie S. Morner mailto:webmaster&dsbcpas.com ++[Anil_Lakhwara] Anil Lakhwara mailto:anil_lakhwara&kentrox.com ++[Anil_Sharma] Anil Sharma mailto:anil.sharma&scentric.com 2006-04 ++[Anil_Tyagi] Anil Tyagi mailto:tanil&novell.com 2010-06-11 ++[Anirban_Majumder] Anirban Majumder mailto:majumderanirban&lycos.com 2002-03 ++[Anjana_Iyer] Anjana Iyer mailto:anjana&dyna.com ++[Ann_Huang] Ann Huang mailto:annhuang&apple.com ++[Annette_DeSchon] Annette DeSchon mailto:DESCHON&isi.edu ++[Annette_Klecha] Annette Klecha mailto:annette_klecha&bbn.hp.com ++[Anoop_Tewari] Anoop Tewari mailto:anoop&next.distinct.com ++[Ansgar_Bergmann] Ansgar Bergmann mailto:Ansgar.Bergmann&etsi.fr ++[Anthon_van_der_Neut] Anthon van der Neut mailto:anthon&mnt.org ++[Anthony_Cake] Anthony Cake mailto:anthonyrc&lecroy.com ++[Anthony_Carrabino] Anthony Carrabino mailto:anthonyc&vistasoftware.com 2003-08 ++[Anthony_Gonzalez] Anthony Gonzalez mailto:agonzal1&telcordia.com ++[Anthony_Greatorex] Anthony Greatorex mailto:greatore&ugs.com 2004-11 ++[Anthony_Johnson] Anthony Johnson mailto:stxadmin&storix.com 2005-08 ++[Anthony_LaMark] Anthony LaMark Squadra Technologies mailto:anthony&squadratechnologies.com 2012-03-14 ++[Anthony_Payne] Anthony Payne mailto:opayne&pacbell.net 2004-02 ++[Anthony_Stahler] Anthony Stahler mailto:imunfair&yahoo.com 2004-11 ++[Anthony_Walker] Anthony Walker mailto:anthony_walker&hp.com 2002-03 ++[Anthony_Williams] Anthony Williams mailto:tonydubs&gmail.com ++[Antoine_Martin] Antoine Martin mailto:antoine&nagafix.co.uk ++[Anton_Kucer] Anton Kucer mailto:akucerµsoft.com ++[Anton_Okmianski] Anton Okmianski mailto:aokmians&cisco.com 2006-01 ++[Antoni_Wolski] Antoni Wolski mailto:antoni.wolski&vtt.fi ++[Antonio_Querubin] Antonio Querubin mailto:tony&lava.net 2008-03-10 ++[Anupam_Bharali] Anupam Bharali mailto:ianaports&juniper.net 2002-08 ++[Anush_Kumar] Anush Kumar mailto:anushkµsoft.com ++[Apple] Apple mailto:vaughan&apple.com 2011-10-12 ++[Apple_2] Apple mailto:justin.ko&apple.com 2011-10-20 ++[Apple_Inc] Apple Inc. mailto:marc&apple.com 2012-03-02 ++[AppMac_Software] AppMac Software mailto:appmac&appmac.com ++[Apple_Computer] Apple Computer mailto:perftools-feedback&group.apple.com ++[Archishmat_Gore] Archishmat Gore mailto:archisgore&yahoo.com 2004-11 ++[Arcturus_Networks_Inc] Arcturus Networks mailto:mdurrant&arcturusnetworks.com 2011-10-20 ++ Inc. ++[Around_Sound] Around Sound Winzig LLC mailto:aroundsound&winzig.com 2011-10-20 ++[Ari_Huisken] Ari SQRT'n Huisken mailto:astergate&huisken-systems.nl 2010-01-04 ++[Ari_Keranen] Ari Keraenen mailto:ari.keranen&ericsson.com 2009-12-17 ++[Ari_Valtanen] Ari Valtanen mailto:ari.valtanen&solidtech.com ++[Arjen_Lentz] Arjen Lentz mailto:arjen&mysql.com 2004-11 ++[Arman_Bedonian] Arman Bedonian mailto:Arman.Bedonian&asg.com 2009-07-15 ++[Armin_Liebchen] Armin Liebchen mailto:armin&anteradesign.com 2007-06 ++[Armin_Sawusch] Armin Sawusch mailto:armin&esd1.esd.de ++[Arnaud_Clermonte] Arnaud Clermonte mailto:clermonte&4xtechnologies.com ++[Arne_Dirks] Arne Dirks mailto:ad&bnc.net ++[Arne_Haugland] Arne Haugland mailto:Arne.Haugland¶soldev.com ++[Arne_Norefors] Arne Norefors mailto:Arne.Norefors&ericsson.com ++[Arnie_Farrelly] Arnie Farrelly mailto:afarrelly&syncsort.com ++[Arnie_Koster] Arnie Koster mailto:akoster&teltone.com 2002-04 ++[Arno_Hollosi] Arno Hollosi mailto:arno.hollosi&cio.gv.at 2002-03 ++[Arno_Kirmeir] Arno Kirmeir mailto:Arno.kirmeir&sage.de 2007-01 ++[Arno_Klaassen] Arno Klaassen mailto:arno&ccr.jussieu.fr 2003-11 ++[Arnold_Dittmann] Arnold Dittmann mailto:dittmann&isbcad.de ++[Arnold_E_Mauer] Arnold E. Mauer mailto:amauer&vrms.com 2003-04 ++[Arrow_Bit_SL] Arrow Bit SL mailto:info&arrowbit.com 2012-04-26 ++[Art_Cancro] Art Cancro mailto:ajc&uncensored.citadel.org ++[Art_Grand] Art Grand mailto:aig&unify.com ++[Art_Pope] Art Pope mailto:apope&sarnoff.com 2002-10 ++[Arthur_Barr] Arthur Barr mailto:arthur.barr&uk.ibm.com 2008-02-27 ++[Arthur_Castonguay] Arthur Castonguay mailto:arthurc&doe.carleton.ca ++[Arthur_Hillenaar] Arthur Hillenaar mailto:arthur.hillenaar&consul.com 2006-01 ++[Arthur_Wilton] Arthur Wilton mailto:art&awilton.com 2006-03 ++[Arvel_Hathcock] Arvel Hathcock mailto:arvel&altn.com 2007-03 ++[Arvin_Schnell] Arvin Schnell mailto:arvin&suse.de ++[Arvind_Srinivasan] Arvind Srinivasan mailto:arvind.srinivasan&sun.com 2005-08 ++[Asaf_Kashi] Asaf Kashi mailto:asafkµsoft.com ++[Ascom_Austria_GmbH] Ascom Austria GmbH mailto:info&ascom.at 2008-05-01 ++[Asher_Altman] Asher Altman mailto:Asher.Altman&gsc.gte.com ++[Ashish_Chatterjee] Ashish Chatterjee mailto:achatterjee&freeway.proxy.lucent.com ++[Ashit_Patel] Ashit Patel mailto:Ashit.Patel&eng.sun.com ++[Ashley_Clarke] Ashley Clarke mailto:Ashley.clarke&vishaypg.com 2010-06-17 ++[Ashok_Marwaha] Ashok Marwaha ++[Ashvin_Sanghvi] Ashvin Sanghvi mailto:AshvinSµsoft.com ++[Ashwani_Singhal] Ashwani Singhal mailto:Ashwani.Singhal&netscout.com 2010-04-07 ++[Atomix_Productions] Atomix Productions mailto:corporate&atomixproductions.com 2011-10-12 ++[Atsushi_Nakamura] Atsushi Nakamura mailto:nakamura.atsushi318&canon.co.jp 2003-11 ++[Aubrey_Turner] Aubrey Turner mailto:S95525ta%25etsuacad.bitnet@ETSUADMN.ETSU.EDU ++[Austin_Meyer] Austin Meyer mailto:austin&x-plane.com ++[Autodesk] Autodesk mailto:me.licensing&autodesk.com ++[Avi_Drissman] Avi Drissman mailto:ique-protocol&harrisbaseview.com 2002-07 ++[Avi_Lior] Avi Lior mailto:avi&bridgewatersystems.com 2009-02-27 ++[Avi_Nathan] Avi Nathan mailto:avinµsoft.com ++[Avi_Primo] Avi Primo mailto:aprimo&celltick.com 2008-01-29 ++[Avi_Software] Avi Software mailto:srobert&logava.com ++[Avri_Doria] Avri Doria mailto:avri.doria&nokia.com ++[Avshalom_Houri] Avshalom Houri mailto:Avshalom&ubique.com ++[Axel_Andersson] Axel Andersson mailto:axel&zankasoftware.com 2006-02 ++[Axel_Kern] Axel Kern mailto:axel.kern&betasystems.com ++[BTicino_S_p_A] BTicino S.p.A. mailto:admin-myopen&myopen-bticino.it 2008-04-09 ++[B_Clifford_Neuman] B. Clifford Neuman mailto:bcn&isi.edu ++[B_G_Mahesh] B.G. Mahesh mailto:mahesh&sett.com ++[B_J_Kortekaas] B. J. Kortekaas mailto:b.j.kortekaas&kpn.com 2003-02 ++[B_van_Klinken] B. van Klinken mailto:b.vklinken&rohill.nl 2003-12 ++[Baba_Hidekazu] Baba Hidekazu mailto:baba&flare.nd.net.fujitsu.co.jp ++[Baiju_V_Patel] Baiju V. Patel mailto:Baiju.v.patel&intel.com ++[Balduin_Mueller_Plat] Balduin Mueller-Platz mailto:balduin.mueller-platz&pago.de 2002-03 ++[Barbara_Foss] Barbara Foss mailto:BGFOSS&rchvmv.vnet.ibm.com ++[Barend_Jacobus_van_d] Barend Jacobus van der mailto:berneau.v&gmail.com 2010-04-27 ++ Merwe ++[Barney_Wolff] Barney Wolff mailto:barney&databus.com ++[Barrie_Cooper] Barrie Cooper mailto:barrie&sco.com ++[Barry_Greenberg] Barry Greenberg mailto:barry.greenberg&sun.com 2004-04 ++[Barry_H_Feild] Barry H. Feild mailto:barry&intersan.net ++[Barry_McDarby] Barry McDarby mailto:realspace&starwolf.biz 2003-04 ++[Barry_Shelton] Barry Shelton mailto:bshelton&wirelessknowledge.com ++[Barry_Whyte] Barry Whyte mailto:barry_whyte&uk.ibm.com ++[Bart_Schaefer] Bart Schaefer mailto:bart&suburbansoftware.com 2005-08 ++[Basil_Lee] Basil Lee mailto:basil.lee&gnnettest.com ++[Baskaran_Subramaniam] Baskaran Subramaniam mailto:baskaran&apple.com ++[Ben] Ben mailto:ben&acaciatreesoftware.com ++[Ben_Guild] Ben Guild mailto:smash&smashsworld.com ++[Ben_Higgins] Ben Higgins mailto:bhiggins&netcom.ca ++[Ben_Lewis] Ben Lewis mailto:apple&method-solutions.com ++[Ben_McNeill] Ben McNeill mailto:ben.mcneill&cinexec.com 2007-05 ++[Ben_Oram] Ben Oram mailto:beno&turbopower.com ++[Ben_Pracht] Ben Pracht mailto:ben.pracht&tivoli.com ++[Ben_Rosenberg] Ben Rosenberg mailto:brosenberg&advsyscon.com 2003-01 ++[Ben_Schluricke] Ben Schluricke mailto:support&pftp.de ++[Ben_Webster] Ben Webster mailto:b.webster&itisint.com ++[Bengt_Gustafsson] Bengt Gustafsson mailto:bengt.gustafsson&imagesystems.se 2006-05 ++[Benjamin_Green] Benjamin Green mailto:ben&lh.co.nz ++[Benjamin_Grimm] Benjamin Grimm mailto:bg&webnetix.de ++[Benjamin_Kowarsch] Benjamin Kowarsch mailto:benjamin&sunrise-tel.com 2004-11 ++[Benjamin_Rister] Benjamin Rister mailto:support&decimus.net ++[Benjamin_Rosenberg] Benjamin Rosenberg mailto:brosenberg&advsyscon.com ++[Bernard_Aboba] Bernard Aboba mailto:bernardaµsoft.com 2004-06 ++[Bernard_Desruisseaux] Bernard Desruisseaux mailto:bernard&steltor.com ++[Bernard_Normier] Bernard Normier mailto:bernard&zeroc.com 2006-12 ++[Bernard_Volz] Bernard Volz mailto:volz&cisco.com ++[Bernd_Paradies] Bernd Paradies mailto:bparadie&adobe.com 2008-01-14 ++[Bernie_Malkowski] Bernie Malkowski mailto:bmalkowski&integratedsecuritycorp.com 2007-08-20 ++[Bernie_Volz] Bernie Volz mailto:volz&cisco.com ++[Bert_Bouwers] Bert Bouwers mailto:e.bouwers&rohill.nl 2007-05 ++[Bert_Gijsbers] Bert Gijsbers mailto:bert&xpilot.org ++[Bert_Paul] Bert Paul mailto:bert.paul&apertio.com 2008-07-03 ++[Bert_Van_der_Linden] Bert Van der Linden mailto:bert&propel.com ++[Bert_van_Willigen] Bert van Willigen mailto:bert.vanwilligen&philips.com 2003-11 ++[Bertus_Jacobs] Bertus Jacobs mailto:bertus&ccs-software.co.za ++[Beth_Crespo] Beth Crespo mailto:beth.crespo&hp.com ++[Betsy_Alexander] Betsy Alexander tel:+1-604-681-4549 ++[Beverly_Moody] Beverly Moody mailto:Beverly_Moody&stercomm.com ++[Bianling_Zhang] Bianling Zhang mailto:blzhang&iwncomm.com 2004-02 ++[Bie_Tie] Bie Tie mailto:stie&interbase.com ++[Bill_Andrews] Bill Andrews mailto:billa&vnd.tek.com ++[Bill_Bishop] Bill Bishop mailto:bil&rfx.rfx.com ++[Bill_Carroll] Bill Carroll mailto:billc&xactlabs.com ++[Bill_Crawford] Bill Crawford mailto:Bill.Crawford&securicor.co.uk ++[Bill_Croft] Bill Croft mailto:Croft&sumex-aim.stanford.edu ++[Bill_Davidson] Bill Davidson mailto:billd&equalizer.cray.com ++[Bill_Edwards] Bill Edwards mailto:bill.edwards&sun.com 2005-08 ++[Bill_Fenner] Bill Fenner mailto:fenner&parc.xerox.com ++[Bill_Gross] Bill Gross mailto:william.gross&kohler.com 2010-11-01 ++[Bill_Harrell] Bill Harrell ++[Bill_Homan] Bill Homan mailto:bhoman&spanworks.com 2003-01 ++[Bill_Kay] Bill Kay mailto:bkay&spy-tec.com 2006-04 ++[Bill_Marbaker] Bill Marbaker mailto:wrm&fortenet.com ++[Bill_McIntosh] Bill McIntosh mailto:bmcintosh&fortresstech.com ++[Bill_Reding] Bill Reding mailto:redingb&nwdt.natwest.co.uk ++[Bill_Rettig] Bill Rettig mailto:WRettig&efji.com 2010-05-19 ++[Bill_Reveile] Bill Reveile mailto:breveile&allentek.com ++[Bill_Schiefelbein] Bill Schiefelbein mailto:schief&aspen.cray.com ++[Bill_Simpson] Bill Simpson mailto:wsimpson&greendragon.com ++[Bill_Simpson_2] Bill Simpson mailto:Bill.Simpson&um.cc.umich.edu ++[Bill_Somerville] Bill Somerville mailto:Bill.Somerville&scalable.com 2008-08-13 ++[Bill_Taylor] Bill Taylor mailto:sais&ssec.wisc.edu ++[Bill_Tschumy] Bill Tschumy mailto:other!bill&uunet.uu.net ++[Bill_Van_Etten] Bill Van Etten mailto:Bill&bioteam.net ++[Bill_Weinman] Bill Weinman mailto:wew&bearnet.com ++[Bill_Wingate] Bill Wingate mailto:bill.wingate&arcanadev.com 2003-05 ++[Billy_Dhillon] Billy Dhillon mailto:bdsos&pafec.co.uk ++[BioLink_Support] BioLink Support mailto:reginfo&biolinkusa.com 2002-02 ++[Bizhan_Ghavami] Bizhan Ghavami mailto:ghavami&telcores.com ++[Bjorn_Chambless] Bjorn Chambless mailto:bjorn&cs.pdx.edu ++[Bjorn_Dittmer_Roche] Bjorn Dittmer-Roche mailto:bjorn&xowave.com 2003-06 ++[Bjorn_Jarle_Kvande] Bjorn Jarle Kvande mailto:bjorn&objectplanet.com 2002-04 ++[Bjorn_Lantz] Bjorn Lantz mailto:bjorn.lantz&encode.se 2004-11 ++[Bjorn_Roth] Bjorn Roth FLIR Systems AB mailto:bjorn.roth&flir.se 2011-10-20 ++[Bjorn_de_Bonnenfant] Bjorn de Bonnenfant mailto:bdeb&iqobject.com 2003-11 ++[Blakely_Snyder] Blakely Snyder Ventureforth Inc. mailto:bsnyder&ventureforth.com 2011-11-03 ++[Blockade] VP - Research & mailto:development&blockade.com ++ Development ++[Bob_Beard] Bob Beard mailto:bobb&lachman.com ++[Bob_Braden] Bob Braden mailto:Braden&isi.edu ++[Bob_Braden_2] Bob Braden mailto:braden&isi.edu ++[Bob_Bradley] Bob Bradley mailto:bradley&apple.com 2003-03 ++[Bob_Bradley_2] Bob Bradley mailto:bradley&apple.com ++[Bob_Deblier] Bob Deblier mailto:bob&virtualunlimited.com ++[Bob_Dedrick] Bob Dedrick mailto:bob&staff.prodigy.com ++[Bob_Dolin] Bob Dolin mailto:bdolin&echelon.com 2008-04-10 ++[Bob_Gaddie] Bob Gaddie mailto:bobg&dtn.com ++[Bob_Iannucci] Bob Iannucci mailto:bob&rail.com 2011-11-23 ++[Bob_Janssen] Bob Janssen mailto:bob&res.nl ++[Bob_Janssen_2] Bob Janssen mailto:b.janssen&ressoftware.com 2009-11-18 ++[Bob_Kaiser] Bob Kaiser mailto:BKaiser&palindrome.com ++[Bob_Kummerfeld] Bob Kummerfeld mailto:bob&sarad.cs.su.oz.au ++[Bob_Lauria] Bob Lauria mailto:bob.lauria&asg.com 2005-08 ++[Bob_Lyon] Bob Lyon mailto:bl&oasis.icl.co.uk ++[Bob_Natale] Bob Natale mailto:bob.natale&appliedsnmp.com ++[Bob_Nattenberg] Bob Nattenberg mailto:bnattenberg&arborsoft.com ++[Bob_Purvy] Bob Purvy mailto:bpurvy&us.oracle.com ++[Bob_Rennie] Bob Rennie mailto:rjrennie&wizvax.net ++[Bob_Rundle] Bob Rundle mailto:rundle&rundle.com 2005-11 ++[Bob_Sledge] Bob Sledge mailto:bob&pqsystems.com ++[Bob_Stewart] Bob Stewart mailto:STEWART&xyplex.com ++[Bob_Thomas] Bob Thomas mailto:rhthomas&cisco.com ++[Bob_Tournoux] Bob Tournoux mailto:bob.tournoux&usiny.mail.abb.com ++[Bobby_Krupczak] Bobby Krupczak mailto:rdk&empiretech.com ++[Bobby_Krupczak_2] Bobby Krupczak mailto:rdk&krupczak.org 2008-04-03 ++[Bobby_Martin] Bobby Martin mailto:bobbymartin&hotmail.com ++[Bodo_Rueskamp] Bodo Rueskamp mailto:br&itchigo.com 2002-08 ++[Bonjour] Bonjour mailto:bonjour&tapinoma.com ++[BonjourDev] BonjourDev mailto:bonjourdev&apple.com 2011-10-14 ++[Boris_B_Maiden] Boris B. Maiden mailto:Boris_Maiden&smtp.microcom.com ++[Boris_Magnusson] Boris Magnusson mailto:boris&cs.lth.se 2010-12-06 ++[Boris_Panteleev] Boris Panteleev mailto:bpanteleev&himel.com ++[Boris_Polevoy] Boris Polevoy mailto:vapcom&mail.ru 2003-01 ++[Boris_Star] Boris Star mailto:boris.star&veritas.com 2003-01 ++[Boris_Svetlitsky] Boris Svetlitsky mailto:boris&press-sense.com ++[Brad_Hamilton] Brad Hamilton mailto:bh&picksys.com ++[Brad_Hamilton_2] Brad Hamilton mailto:brad_hamilton&kofax.com 2002-08 ++[Brad_Johanson] Brad Johanson mailto:bradj&tidebreak.com 2005-08 ++[Brad_Parker] Brad Parker mailto:brad&american.com ++[Brad_Pedersen] Brad Pedersen mailto:bradp&citrix.com ++[Brad_Pepers] Brad Pepers mailto:brad&linuxcanada.com 2002-09 ++[Brad_Spear] Brad Spear mailto:spear&platinum.com ++[Brad_Vaughan] Brad Vaughan Apple mailto:vaughan&apple.com 2011-10-12 ++[Brad_Wright] Brad Wright mailto:bradwrµsoft.com ++[Bradley_Birnbaum] Bradley Birnbaum mailto:bradley.birnbaum&eshare.com ++[Bradley_Bransom] Bradley Bransom mailto:bradley_bransom&dell.com 2003-01 ++[Brady_Anderson] Brady Anderson mailto:banderso&novell.com ++[Brand_Communications] Brand Communications mailto:donovan&brandcomms.com ++[Brandon_Potter] Brandon Potter mailto:iana&brandonpotter.com 2006-01 ++[Brant_Thomsen] Brant Thomsen mailto:brant_thomsen&3com.com 2003-01 ++[Breck_Auten] Breck Auten mailto:bauten&dst-inc.com ++[Bremen] University of Bremen, mailto:udrawgraph&informatik.uni-bremen.de ++ FB3 ++[Brendan_Fay] Brendan Fay mailto:brendan.fay&x509solutions.com 2006-02 ++[Brendan_McWilliams] Brendan McWilliams mailto:brendan.mcwilliams&vf.vodafone.co.uk 2002-04 ++[Brent_Bradshaw] Brent Bradshaw mailto:bbradshaw&novell.com ++[Brent_Callaghan] Brent Callaghan mailto:brent&terra.eng.sun.com ++[Brent_Foster] Brent Foster mailto:brent.foster&onstreamsystems.com 2006-04 ++[Brent_Fulgham] Brent Fulgham mailto:bfulgham&wyatt.com ++[Brent_Gulanowski] Brent Gulanowski mailto:bgulanowski&marketcircle.com 2009-08-26 ++[Brent_Hines] Brent Hines mailto:brent.hines&unisys.com ++[Brent_Irwin] Brent Irwin mailto:birwin&standard.com ++[Brent_McCullough] Brent McCullough mailto:bmccullough&timemgmt.com 2003-11 ++[Brent_Welch] Brent Welch mailto:welch&scriptics.com ++[Bret_O_Rourke] Bret O'Rourke mailto:bretorµsoft.com ++[Brett_Dolecheck] Brett Dolecheck mailto:Dolecheck&ipmetrics.com ++[Brett_Goldstein] Brett Goldstein mailto:bgoldstein&opentable.com ++[Brett_Green] Brett Green mailto:brett_green&hp.com 2003-11 ++[Brett_Green_2] Brett Green mailto:Brett_Green&hp.com ++[Brett_Sorenson] Brett Sorenson mailto:bcs&atex.com ++[Brian_Abramson] Brian Abramson mailto:brianab&soul.tv.tek.com ++[Brian_Abramson_2] Brian Abramson mailto:brianab&vnd.tek.com ++[Brian_Batke] Brian Batke mailto:csp.protocol&gmail.com ++[Brian_Batke_2] Brian Batke mailto:eip.jsig&gmail.com ++[Brian_Becker] Brian Becker mailto:bbecker&tgc-usa.com 2006-10 ++[Brian_Blevins] Brian Blevins mailto:brian.blevins&tridia.com ++[Brian_C_Wiles] Brian C. Wiles mailto:brian&streamcomm.com ++[Brian_Carnell] Brian Carnell mailto:brian&e3consultants.com ++[Brian_Cully] Brian Cully mailto:shmit&kublai.com ++[Brian_Dickman] Brian Dickman mailto:brian&novastor.com ++[Brian_Ehrmantraut] Brian Ehrmantraut mailto:bae&netapp.com ++[Brian_Griswold] Brian Griswold mailto:brian&dancingbear.com ++[Brian_Henry] Brian Henry mailto:brian.henryµsoft.com 2007-03 ++[Brian_Kennedy] Brian Kennedy mailto:BrianK&targetedconvergence.com 2006-08 ++[Brian_Klassen] Brian Klassen mailto:Brian.Klassen&unisys.com ++[Brian_Lloyd] Brian Lloyd mailto:brian&lloyd.com ++[Brian_Martinicky] Brian Martinicky mailto:Brian_Martinicky&automationintelligence.com ++[Brian_Matthews] Brian Matthews mailto:bmatthews&mosaicsystems.com ++[Brian_Matthews_2] Brian Matthews mailto:brian_matthews&ibist.ibis.com ++[Brian_McKinnon] Brian McKinnon mailto:bmk&lvision.com ++[Brian_Nickles] Brian Nickles mailto:RogueSpear91&hotmail.com 2002-05 ++[Brian_O_Keefe] Brian O'Keefe mailto:bokeefe&cnd.hp.com ++[Brian_Olson] Brian Olson mailto:briolson&pacbell.net ++[Brian_Reid] Brian Reid mailto:reid&decwrl.dec.com ++[Brian_S_Locke] Brian S. Locke mailto:blocke&zortlabs.com 2008-07-10 ++[Brian_S_Stewart] Brian S. Stewart mailto:Brian.Stewart&avocent.com ++[Brian_S_Stewart_2] Brian S. Stewart mailto:Brian.Stewart&avovent.com ++[Brian_Schenkenberger] Brian Schenkenberger mailto:VAXman&tmesis.com ++[Brian_Spears] Brian Spears mailto:bspears&salix.com ++[Brian_Tackett] Brian Tackett mailto:cym&acrux.net ++[Brian_Taylor] Brian Taylor mailto:btaylor&imagetag.com ++[Brian_Toothill] Brian Toothill mailto:brian.toothill&touchstar.co.uk 2010-10-15 ++[Brian_Trammell] Brian Trammell mailto:btrammell&iventurelab.com ++[Brian_Trevor] Brian Trevor mailto:btrevor&bmc.com 2008-10-24 ++[Brian_Tung] Brian Tung mailto:brian&isi.edu ++[Brian_W_Beach] Brian W. Beach mailto:brian&tivo.com 2003-01 ++[Bridget_Navoda] Bridget Navoda mailto:Bridget_Navoda&dell.com ++[Bridget_Walsh] Bridget Walsh mailto:bwalsh&iona.ie ++[Bridgette_Landers] Bridgette Landers mailto:blanders&boi.hp.com ++[Brigitte_Gagne] Brigitte Gagne mailto:bgagne&trigence.com 2006-08 ++[Brooks_Bell] Brooks Bell Layered Logic, Inc. mailto:brooks&layeredlogic.com 2012-01-04 ++[Bruce_Carlson] Bruce Carlson mailto:bruce.carlson&iprintl.com 2003-01 ++[Bruce_Casey] Bruce Casey mailto:bcasey&responselogic.com ++[Bruce_Davie] Bruce Davie mailto:bsd&cisco.com ++[Bruce_Ferjulian] Bruce Ferjulian mailto:ferjulian_bruce&emc.com ++[Bruce_Greenblatt] Bruce Greenblatt mailto:bruce&arkivio.com 2002-02 ++[Bruce_Hestand] Bruce Hestand mailto:Bruce.Hestand&veritas.com ++[Bruce_Kosbab] Bruce Kosbab mailto:bruce.kosbab&indurasoft.com ++[Bruce_Lieberman] Bruce Lieberman mailto:brucel&iserver.starlight.com ++[Bruce_Lueckenhoff] Bruce Lueckenhoff mailto:brucelu&cisco.com ++[Bruce_Lueckenhoff_2] Bruce Lueckenhoff mailto:bruce&scalabledesign.com 2006-02 ++[Bruce_Mackey] Bruce Mackey mailto:BAMackey&aol.com ++[Bruce_McKinnon] Bruce McKinnon mailto:brucemck&bears.aust.com ++[Bruce_McKinnon_2] Bruce McKinnon mailto:brucemck&bearsolutions.com.au ++[Bruce_Thompson] Bruce Thompson mailto:brucet&actioninformationsystems.com 2006-02 ++[Bruce_Toback] Bruce Toback mailto:btoback&optc.com 2003-02 ++[Bruce_Vander_Werf] Bruce Vander Werf mailto:bvanderwerf&crownintl.com 2004-02 ++[Bruce_Wells] Bruce Wells mailto:brwells&us.ibm.com 2010-10-04 ++[Bruce_Wilson] Bruce Wilson tel:+1-905-771-6161 ++[Bryan_Alvord] Bryan Alvord mailto:bryan&vaticor.com 2003-04 ++[Bryan_Cole] Bryan Cole mailto:bryan.cole&teraview.com ++[Bryan_Otey] Bryan Otey mailto:bwo&softdesk.com ++[Bryan_Vergato] Bryan Vergato mailto:iana&ivocalize.com 2006-05 ++[Bryan_Wilcutt] Bryan Wilcutt mailto:bwilcutt&comtechefdata.com 2005-06 ++[Bryant_Eastham] Bryant Eastham mailto:protocols&pewla.us.pewg.panasonic.com 2005-08 ++[Bryce_Beeston] Bryce Beeston mailto:bryce.beeston&emerson.com 2011-06-23 ++[Bryce_Bhatnagar] Bryce Bhatnagar mailto:BRYCEBH&attachmate.com ++[Buck_Caldwell] Buck Caldwell mailto:buck_c&polygon.com ++[Bulent_Kasman] Bulent Kasman mailto:BKasman&symantec.com ++[Byron_Jones] Byron Jones mailto:byronj&bellsouth.net ++[C_Enrique_Ortiz] C. Enrique Ortiz mailto:eortiz&j2medeveloper.com 2003-01 ++[C_Philip_Wood] C. Philip Wood mailto:cpw&lanl.gov ++[CaldSoft] CaldSoft mailto:development&caldsoft.co.uk 2011-08-12 ++[Cameo_Systems_Inc] Cameo Systems Inc. mailto:craig&reversion.ca 2011-09-26 ++[Cameron_Colpitts] Cameron Colpitts Santorini, LLC mailto:cameron&santorinillc.com 2011-10-25 ++[Cameron_Young] Cameron Young mailto:Cameron_Young&inetco.com ++[Candace_Niccolson] Candace Niccolson mailto:cniccolson&genisar.com 2002-04 ++[Canon_Inc] Canon Inc. mailto:fujii.ken-ichi149&canon.co.jp 2011-10-10 ++[Carl_Banzhof] Carl Banzhof mailto:cbanzhof&citadel.com 2003-06 ++[Carl_Blundell] Carl Blundell mailto:cblundell&celador.co.uk 2002-05 ++[Carl_Cedergren] Carl Cedergren mailto:asperon&home.se ++[Carl_Ellis] Carl Ellis mailto:carl.ellis&tenasys.com ++[Carl_First] Carl First mailto:Carl.L.First&intel.com ++[Carl_Johan_Wik] Carl-Johan Wik mailto:cjw&hudsmoar.com ++[Carl_Malamud] Carl Malamud ++[Carl_Obsorn] Carl Obsorn mailto:carl_osborn&sabre.com ++[Carl_Uno_Manros] Carl-Uno Manros mailto:manros&cp10.es.xerox.com ++[Carla_Caputo] Carla Caputo mailto:caputo&emc.com ++[Carleton_Watkins] Carleton Watkins mailto:carleton&soronti.com 2003-11 ++[Carlisle_Adams] Carlisle Adams mailto:Cadams&entrust.com ++[Carlos_Arteaga] Carlos Arteaga mailto:carteaga&abacoinc.com ++[Carlos_Arteaga_2] Carlos Arteaga mailto:carteaga&adelphia.net 2004-11 ++[Carlos_Gonzalez_Roma] Carlos Gonzalez-Roman mailto:iana&abcdatos.com 2003-06 ++ Ferrer ++[Carlos_Hung] Carlos Hung mailto:chung&digisle.net ++[Carlos_Portela] Carlos Portela mailto:cportela&simple-sw.com 2003-02 ++[Carol_Ann_Krug] Carol Ann Krug mailto:carolann&hpmfas3.cup.hp.com ++[Carson_Fenimore] Carson Fenimore mailto:carson.fenimore&inl.gov ++[Carstein_Seeberg] Carstein Seeberg mailto:case&boole.no ++[Carstein_Seeberg_2] Carstein Seeberg mailto:case&nimsoft.no ++[Carsten_Falticska] Carsten Falticska mailto:falticska&freenet.de 2003-11 ++[Carsten_Strotmann] Carsten Strotmann mailto:carsten.strotmann&menandmice.com 2009-05-20 ++[Casey_Harrington] Casey Harrington mailto:charrington&isxinc.com 2006-01 ++[Casper_Stoel] Casper Stoel mailto:cbs&ascinc.com ++[Cedric_Maloux] Cedric Maloux mailto:cedric&allpeers.com 2007-04 ++[Chad_Williams] Chad Williams mailto:chad&apple.com ++[Chandar_Venkataraman] Chandar Venkataraman mailto:CVENKATA&us.oracle.com ++[Chaoyi_Lang] Chaoyi Lang mailto:chao-yi_lang&maxtor.com 2006-01 ++[Chap_Tippin] Chap Tippin mailto:chad.tippin&jibeinc.com 2003-06 ++[Charles_A_Higgins] Charles A. Higgins mailto:75730.2257&compuserve.com ++[Charles_Bennett] Charles Bennett mailto:bennettc&ohio.edu 2008-08-29 ++[Charles_C_L_Chou] Charles C.L. Chou mailto:cchou&zoom.com ++[Charles_F_Steele] Charles F Steele mailto:charles_steele&agilent.com 2011-02-15 ++[Charles_Gordon] Charles Gordon mailto:cgordon&digprod.com ++[Charles_Honton] Charles Honton mailto:chas&honton.org ++[Charles_Jacobs] Charles Jacobs mailto:cjacobs&numinous.com ++[Charles_Lynn] Charles Lynn mailto:clynn&bbn.com ++[Charles_O_Dale] Charles O'Dale mailto:codale&hfx.andara.com 2006-07 ++[Charles_Oram] Charles Oram mailto:charleso&cardax.com ++[Charles_Perkins] Charles Perkins mailto:cperkins&eng.sun.com ++[Charles_Scott_Robers] Charles Scott Roberson mailto:chip&cerent.com ++[Charles_Watt] Charles Watt mailto:watt&sware.com ++[Charles_Wright] Charles Wright mailto:cpwright&villagenet.com ++[Charlie_Hava] Charlie Hava mailto:charlieh&aks.com ++[Charlie_Hundre] Charlie Hundre mailto:charlie&rdsrv.reco.com.tw ++[Charlie_Limoges] Charlie Limoges mailto:Charlie.Limoges&gdc4s.com ++[Chatziandreoglou_Chr] Chatziandreoglou Christos mailto:chatzi&xan.forthnet.gr 2003-10 ++[Chaz_McGarvey] Chaz McGarvey mailto:chaz&brokenzipper.com ++[Chee_Kent_Lam] Chee Kent Lam mailto:cklam&foursticks.com 2002-04 ++[Cheryl_Stoutenburg] Cheryl Stoutenburg mailto:cstoutenburg&vnet.ibm.com ++[Chi_Chen] Chi Chen mailto:chichen&us.ibm.com 2002-04 ++[Chi_Shih_Chang] Chi Shih Chang mailto:cchang&syncsort.com 2008-03-19 ++[Chiew_Farn_Chung] Chiew Farn Chung mailto:cfchung&asprova.com ++[Chiming_Huang] Chiming Huang mailto:chuang&ac-tech.com ++[Chirag_Desai] Chirag Desai mailto:Chirag_Desai&symantec.com 2006-02 ++[Chris_Adamson] Chris Adamson mailto:invalidname&gmail.com ++[Chris_Adkins] Chris Adkins mailto:cadkins&filenet.com 2006-10 ++[Chris_Bertin] Chris Bertin mailto:chris.bertin&hp.com 2009-05-19 ++[Chris_Brown] Chris Brown mailto:chrisb&chancery.com ++[Chris_Chiotasso] Chris Chiotasso mailto:cchiotasso&infolibria.com ++[Chris_Cuilla] Chris Cuilla mailto:balr!vpnet!cuilla!chris&clout.chi.il.us ++[Chris_Das] Chris Das mailto:cdas&cnd.hp.com ++[Chris_Dern] Chris Dern mailto:cdern&nospam.alarismed.com 2004-06 ++[Chris_Duncombe] Chris Duncombe mailto:cdunc&atpeng.com ++[Chris_Eich] Chris Eich Enphase Energy, Inc. mailto:ceich&enphaseenergy.com 2011-11-08 ++[Chris_Farey] Chris Farey StorMagic Ltd mailto:chris_farey&stormagic.com 2011-12-16 ++[Chris_Flynn] Chris Flynn mailto:cflynn&landmark.com ++[Chris_Forsythe] Chris Forsythe The Growl Project mailto:chris&growl.info 2012-02-07 ++[Chris_Greene] Chris Greene mailto:cgreeneOA&avidsports.com ++[Chris_Griffin] Chris Griffin mailto:cgriffin&dka.com ++[Chris_Griffiths] Chris Griffiths mailto:chris_griffiths&cable.comcast.com 2008-07-28 ++[Chris_Hahn] Chris Hahn mailto:chrish&sierra.net ++[Chris_Hawk] Chris Hawk mailto:chris&corriente.net 2005-08 ++[Chris_Hawkinson] Chris Hawkinson mailto:chawkinson&coalsere.com 2002-08 ++[Chris_Herzog] Chris Herzog mailto:zog&stg.com 2006-05 ++[Chris_Horne] Chris Horne Photosmith mailto:ckhorne&photosmithapp.com 2011-10-27 ++[Chris_Irie] Chris Irie mailto:irie&sybase.com 2008-03-26 ++[Chris_J_Wren] Chris J. Wren mailto:C.Wren&lucent.com ++[Chris_Kent] Chris Kent Ecamm Network, LLC mailto:chris&ecamm.com 2011-10-24 ++[Chris_Kerrigan] Chris Kerrigan mailto:ckerrigan&hns.com ++[Chris_Koeritz] Chris Koeritz mailto:ckoeritz&inovacorp.com ++[Chris_Koeritz_2] Chris Koeritz mailto:fred&gruntose.com 2002-10 ++[Chris_Koeritz_3] Chris Koeritz mailto:portmanager&inovasolutions.com 2006-10 ++[Chris_Kramer] Chris Kramer mailto:CKramer&gis.shl.com ++[Chris_Larsson] Chris Larsson mailto:clarsson&vnet.ibm.com ++[Chris_LeCroy] Chris LeCroy mailto:lecroy&apple.com ++[Chris_MacDonald] Chris MacDonald mailto:chris&viscount.com 2011-03-16 ++[Chris_Megede] Chris Megede mailto:chris.megede&tac.com ++[Chris_Michaelson] Chris Michaelson mailto:chris&codegreennetworks.com 2005-08 ++[Chris_Newman] Chris Newman mailto:chris.newman&oracle.com 2010-10-15 ++[Chris_Peel] Chris Peel mailto:chrispeel.gsi&googlemail.com 2011-03-09 ++[Chris_Pugmire] Chris Pugmire mailto:chrisp&netwinsite.com ++[Chris_Ranch] Chris Ranch mailto:cranch&novell.com ++[Chris_Rominski] Chris Rominski mailto:ChrisRom&attachmate.com ++[Chris_Ryland] Chris Ryland mailto:cpr&emsoftware.com 2004-11 ++[Chris_Sanders] Chris Sanders mailto:csanders&navini.com 2003-08 ++[Chris_Schlaeger] Chris Schlaeger mailto:cs&kde.org ++[Chris_Silverberg] Chris Silverberg mailto:csilverberg&nanocom.com ++[Chris_Stanaway] Chris Stanaway mailto:stanaway&comm.mot.com ++[Chris_Tate] Chris Tate mailto:ctate&astromed.com ++[Chris_Thornhill] Chris Thornhill mailto:port_contact&cjt.ca ++[Chris_Vertonghen] Chris Vertonghen mailto:chrisv&pearldoc.com ++[Chris_Wells] Chris Wells mailto:chris_wells&lansource.com ++[Chris_White] Chris White mailto:cjwhite&cisco.com ++[Chris_Wilcox] Chris Wilcox mailto:cwilcox&cd3o.com 2002-10 ++[Chris_Wilson] Chris Wilson mailto:chris+iana&qwirx.com 2008-09-11 ++[Christer_Gunnarsson] Christer Gunnarsson mailto:christer.gunnarsson&ascom.se 2009-03-26 ++[Christer_Nygren] Christer Nygren mailto:christer.nygren&fro.se 2007-08-07 ++[Christiaan_Simons] Christiaan Simons mailto:christiaan.simons&axon.nl ++[Christian_Beaumont] Christian Beaumont mailto:chrisb&lantronix.com 2003-11 ++[Christian_Brecht] Christian Brecht mailto:Christian.Brecht&sauter-gmbh.de 2010-12-15 ++[Christian_Callsen] Christian Callsen mailto:Christian.Callsen&eng.sun.com ++[Christian_Catchpole] Christian Catchpole mailto:christian&catchpole.net 2002-03 ++[Christian_Caudrelier] Christian Caudrelier mailto:Christian.Caudrelier&bull.net 2006-02 ++[Christian_Flintrup] Christian Flintrup mailto:chr&gigahost.dk ++[Christian_Grothoff] Christian Grothoff mailto:grothoff&cs.purdue.edu 2002-10 ++[Christian_Huitema] Christian Huitema mailto:huitema&research.telcordia.com ++[Christian_Huitema_2] Christian Huitema mailto:huitemaµsoft.com 2003-02 ++[Christian_Klemetsson] Christian Klemetsson Integrius AB mailto:christian.klemetsson&integrius.se 2010-03-04 ++[Christian_Laendner] Christian Laendner d&b audiotechnik mailto:software.support&dbaudio.com 2011-10-06 ++[Christian_Rubach] Christian Rubach mailto:Christian_Rubach&bestsoftware.com ++[Christian_Saether] Christian Saether mailto:ChristianS&asymetrix.com ++[Christian_Saether_2] Christian Saether mailto:c.saether&f5.com ++[Christian_Schormann] Christian Schormann mailto:100410.3063&compuserve.com ++[Christian_Stredicke] Christian Stredicke mailto:stredicke&snom.de ++[Christian_Treczoks] Christian Treczoks mailto:ct&braehler.com ++[Christian_Westbrook] Christian Westbrook mailto:cw&wellohorld.com 2007-11-15 ++[Christian_Wolff] Christian Wolff mailto:stvp&smash.tv ++[Christian_Zietz] Christian Zietz mailto:czietz&gmx.net ++[Christina_Mercier] Christina Mercier mailto:christina.mercier&finisar.com 2005-08 ++[Christof_Drescher] Christof Drescher mailto:drescher&mailprox.net 2003-11 ++[Christof_J_Reetz] Christof J. Reetz mailto:cjr&netplan.de 2011-03-09 ++[Christoph_Anton_Mitt] Christoph Anton Mitterer mailto:calestyo&scientia.net 2009-03-10 ++[Christoph_Kukulies] Christoph Kukulies mailto:info&exapt.de 2003-04 ++[Christophe_Allie] Christophe Allie mailto:callie&apple.com 2006-08 ++[Christophe_Besant] Christophe Besant ++[Christophe_Chevalier] Christophe Chevalier mailto:chevalier&archimed.fr 2005-08 ++[Christophe_Cleraux] Christophe Cleraux mailto:chrisc&wrs.com ++[Christophe_Gisquet] Christophe Gisquet mailto:christophe.gisquet&gmail.com 2011-05-26 ++[Christopher_Allen] Christopher Allen mailto:ChristopherA&consensus.com ++[Christopher_Bidwell] Christopher Bidwell mailto:cbidwell&silvercreeksystems.com 2006-02 ++[Christopher_Carlson] Christopher Carlson mailto:cjc&dobbz.com 2003-10 ++[Christopher_Cordray] Christopher Cordray mailto:ccordray&sciencelogic.com 2008-06-05 ++[Christopher_Davey] Christopher Davey mailto:niallocl&quay.ie ++[Christopher_Durham] Christopher Durham mailto:chrisdu&sco.com ++[Christopher_Karper] Christopher Karper mailto:ckarper&dev.tricerat.com ++[Christopher_LILJENST] Christopher LILJENSTOLPE mailto:cdl&asgaard.org 2008-04-14 ++[Christopher_Leong] Christopher Leong mailto:leong&kolmod.mlo.dec.com ++[Christopher_McLendon] Christopher McLendon mailto:cem&hyper.com ++[Christopher_Miller] Christopher Miller mailto:Chris.Miller&versatrans.com 2006-02 ++[Christopher_Miller_2] Christopher Miller mailto:chris.miller&versatrans.com 2008-01-14 ++[Christopher_R_Smith] Christopher R. Smith mailto:csmith4&us.ibm.com 2004-11 ++[Christopher_Tengi] Christopher Tengi mailto:tengi&princeton.edu ++[Christopher_Truxaw] Christopher Truxaw mailto:ctruxaw&redsoftware.com 2010-10-15 ++[Christopher_Wells] Christopher Wells mailto:Christopher_Wells&3com.com ++[Christopher_Wells_2] Christopher Wells mailto:christopher_wells&3com.com 2002-04 ++[Chuck_McManis] Chuck McManis mailto:cmcmanis&freegate.net ++[Chuck_Neal] Chuck Neal mailto:chuck&phase3.com ++[Chuck_Runquist] Chuck Runquist mailto:crunquist&quarterdeck.com ++[Chuck_Spitz] Chuck Spitz mailto:spich04&cai.com ++[Chuck_Talk] Chuck Talk mailto:ctalk&pervasive.com ++[Chui_Tin_Yen] Chui-Tin Yen mailto:tin&cisco.com 2006-02 ++[Chul_Yoon] Chul Yoon mailto:cyoon&responsenetworks.com ++[Chun_Ho_Chang] Chun-Ho Chang mailto:chun-ho.chang&ca.com 2004-11 ++[Cimarron_Boozer] Cimarron Boozer mailto:cboozer&funk.com ++[Cindy_Martin] Cindy Martin mailto:cmartin&databeam.com ++[CipherPoint] CipherPoint Software, mailto:wshea&cipherpointsoftware.com 2010-03-03 ++ inc. ++[Circus_Ponies_Suppor] Circus Ponies Support mailto:support&circusponies.com ++[Cisco] Cisco mailto:glenn.matthews&cisco.com 2011-10-25 ++[Cisco_Systems] Cisco Systems mailto:nmtg-port-numbers&cisco.com 2005-11 ++[CityDisc] CityDisc mailto:citydisc&euronet.nl ++[Claes_Fredrik_Mannby] Claes-Fredrik Mannby mailto:cf&mannby.com ++[Clark_Williams] Clark Williams mailto:clark&wirespeed.com ++[Claudio_Lastrucci] Claudio Lastrucci POWERSOFT S.R.L. mailto:claudio.lastrucci&powersoft.it 2012-01-03 ++[Claudio_Procida] Claudio Procida mailto:claudio&emeraldion.it 2007-05 ++[Claus_Broch] Claus Broch NextDay Aps mailto:nextday&infinite-loop.dk 2012-04-24 ++[Claus_Jensen] Claus Jensen Libratone A/S mailto:cjn&libratone.com 2011-10-27 ++[Claus_Thor_Barth] Claus Thor Barth mailto:iana&barth.dk ++[Clay_Maeckal] Clay Maeckal mailto:clay_maeckel&filemaker.com ++[Clay_Maeckel] Clay Maeckel mailto:clay_maeckel&filemaker.com ++[Clayton_Haapala] Clayton Haapala mailto:clay.haapala&veritas.com 2005-08 ++[Clayton_Wilkinson] Clayton Wilkinson mailto:cwilkinson&carreker.com ++[Cliff_Batson] Cliff Batson mailto:cliff&perrla.com 2010-01-21 ++[Cliff_Diamond] Cliff Diamond mailto:cdiamond&crypto-solutions.co.uk ++[Cliff_Joyce] Cliff Joyce mailto:cliffjoyce&pureblend.com ++[Clifford_Heath] Clifford Heath mailto:cjh&managesoft.com 2006-05 ++[Clifton_Nock] Clifton Nock mailto:cnock&us.ibm.com ++[Clint_Eskew] Clint Eskew Control Technology mailto:ceskew&controltechnology.com 2011-10-28 ++ Inc. ++[CloudFlare] CloudFlare, Inc. mailto:help&cloudflare.com 2012-03-09 ++[Cnaan_Aviv] Cnaan Aviv mailto:cnaan&gammasite.com ++[Coleman_Brumley] Coleman Brumley mailto:cbrumley&polarsoft.biz 2011-02-10 ++[Colin_Barry] Colin Barry mailto:cbarry&gbahn.com ++[Colin_Caughie] Colin Caughie mailto:cfc&indigo-avs.com ++[Colin_Goldstein] Colin Goldstein mailto:Colin&kana.com ++[Colin_Griffiths] Colin Griffiths mailto:colin.griffiths&interlinksoftware.com 2002-02 ++[Colin_Henein] Colin Henein mailto:iana&cmh.parliant.com 2005-08 ++[Colin_Hughes] Colin Hughes mailto:chughes&agentsease.net 2006-02 ++[Colin_Kelley] Colin Kelley mailto:cdk&callwave.com ++[Colin_Reid] Colin Reid mailto:creid&projux.com 2002-11 ++[CollabNet] CollabNet mailto:info&collab.net ++[Colm_MacCarthaigh] Colm MacCarthaigh mailto:colm.maccarthaigh&joost.com 2007-04 ++[Complan_Network_AS] Complan Network AS mailto:knut&winpcs.com 2006-02 ++[Computer_Software_Gm] Computer Software mailto:BrunoRistok&cs-ag.de 2002-10 ++ GmbH ++[Connie_Qiu] Connie Qiu mailto:connie&scdb.com ++[Conny_Larsson] Conny Larsson mailto:cocke&vnet.ibm.com ++[Control_Technology_Inc] Control Technology mailto:ceskew&controltechnology.com 2011-10-28 ++ Inc. ++[COPALP] COPALP mailto:jf&copalp.com 2012-03-01 ++[Corey_Burnett] Corey Burnett mailto:corey.burnett&biopop.com ++[Corey_Clinton] Corey Clinton mailto:ccclinton&travisassoc.com 2011-02-02 ++[Corey_Corrick] Corey Corrick mailto:corey.corrick&flamenconetworks.com ++[Corey_Leong] Corey Leong mailto:cleong&gr8c.org 2010-10-11 ++[Cormac_Long] Cormac Long mailto:webmaster&smsforum.net 2002-07 ++[Corpus_Collusion] Corpus Collusion mailto:developer&corpuscollusion.com 2011-08-23 ++[Craig_Calef] Craig Calef mailto:craig&katmango.com ++[Craig_Ching] Craig Ching mailto:cching&mqsoftware.com ++[Craig_Dowell] Craig Dowell Qualcomm Innovation mailto:cdowell&quicinc.com 2011-12-21 ++ Center, Inc. ++[Craig_Everhart] Craig Everhart mailto:Craig.Everhart&netapp.com 2010-07-06 ++[Craig_Fowler] Craig Fowler mailto:cfowler&us.oracle.com ++[Craig_Langfahl] Craig Langfahl mailto:Craig_J_Langfahl&ccm.ch.intel.com ++[Craig_N_Bissell] Craig N. Bissell mailto:craig&quailnetworks.com 2006-04 ++[Craig_Nelson] Craig Nelson Cameo Systems Inc. mailto:craig&reversion.ca 2011-09-26 ++[Craig_Rogers] Craig Rogers mailto:Rogers&isi.edu ++[Craig_Steffen] Craig Steffen mailto:csteffen&ncsa.uiuc.edu 2005-08 ++[Craig_Weeks] Craig Weeks mailto:cweeks&syspace.co.uk ++[Cristian_Petculescu] Cristian Petculescu mailto:cristpµsoft.com ++[Cristian_Petculescu_2] Cristian Petculescu mailto:cristp&hotmail.com 2003-04 ++[Cristian_Petculescu_3] Cristian Petculescu mailto:petcu40&gmail.com 2005-08 ++[Cryo_Networks] Cryo-Networks mailto:p.favre&cryo-networks.fr ++[Csaba_Mate] Csaba Mate mailto:mc36&freemail.c3.hu ++[Cullen_Jennings] Cullen Jennings mailto:fluffy&cisco.com 2010-02-03 ++[Curt_Ellmann] Curt Ellmann mailto:curt.ellmann&ncr.com ++[Curt_Mayer] Curt Mayer mailto:curt&emergent.com ++[Curt_Schimmel] Curt Schimmel mailto:curt&small-tree.com 2005-11 ++[Curtis_Anderson] Curtis Anderson mailto:canderson&turbolinux.com ++[Curtis_Anderson_2] Curtis Anderson mailto:ecanderson&turbolinux.com ++[Curtis_Bray] Curtis Bray mailto:CurtisB&creativedesign.com ++[Curtis_Smith] Curtis Smith mailto:curtis.smith&vsin.com ++[Curtiss_Howard] Curtiss Howard mailto:cjhoward&unity.ncsu.edu 2004-11 ++[DARcorp] mailto:DARcorp&aol.com ++[d_b_audiotechnik] d&b audiotechnik mailto:software.support&dbaudio.com 2011-10-06 ++[D_J_Bernstein] D. J. Bernstein mailto:djb&silverton.berkeley.edu ++[D_J_Bernstein_2] D. J. Bernstein mailto:djb&koobera.math.uic.edu ++[Dagfinn_Saether] Dagfinn Saether mailto:Dagfinn&admins.com ++[Daisuke_Shinomiya] Daisuke Shinomiya mailto:shinomiya.daisu&jp.fujitsu.com 2005-08 ++[Daivd_P_Chassin] Daivd P. Chassin mailto:david.chassin&pnl.gov 2002-06 ++[Dale_Bethers] Dale Bethers mailto:dbethers&novell.com ++[Dale_Norman] Dale Norman mailto:dnorman&informatica.com ++[Dalit_Naor] Dalit Naor mailto:dalit&il.ibm.com ++[Dameon_Wagner] Dameon Wagner mailto:d.wagner&freemail.absa.co.za 2002-02 ++[Damian_Tarnawsky] Damian Tarnawsky mailto:support&nexusconcepts.com ++[Damien_Miller] Damien Miller mailto:damien&ibs.com.au ++[Damir_Skrjanec] Damir Skrjanec mailto:damir.skrjanec&cybrotech.co.uk 2007-05 ++[Damon_Danieli] Damon Danieli mailto:damondµsoft.com ++[Damon_Ennis] Damon Ennis mailto:damon&silver-peak.com 2007-03 ++[Dan_Amstutz] Dan Amstutz mailto:dan&iliumsoft.com ++[Dan_Bernstein] Dan Bernstein mailto:djb&silverton.berkeley.edu ++[Dan_Bernstein_2] Dan Bernstein mailto:djb&cr.yp.to ++[Dan_Bernstein_3] Dan Bernstein mailto:djb&koobera.math.uic.edu ++[Dan_Burrows] Dan Burrows mailto:dburrows&overlandstorage.com 2009-09-25 ++[Dan_Cummings] Dan Cummings mailto:doc&cnr.com ++[Dan_Davis] Dan Davis mailto:Dan.A.Davis&hp.com 2003-04 ++[Dan_Flowers] Dan Flowers mailto:flowers&smaug.lkg.dec.com ++[Dan_Goff] Dan Goff mailto:Dan.Goff&ngc.com ++[Dan_Harkins] Dan Harkins mailto:dharkins&lounge.org 2011-08-15 ++[Dan_Harrington] Dan Harrington mailto:dth&lucent.com ++[Dan_Klein] Dan Klein mailto:dvk&lonewolf.com ++[Dan_Leising] Dan Leising mailto:dleisingµsoft.com 2005-01 ++[Dan_Mahn] Dan Mahn mailto:dan.mahn&digidescorp.com ++[Dan_Polivy] Dan Polivy mailto:dpolivyµsoft.com 2008-03-12 ++[Dan_Razzell] Dan Razzell mailto:dan&starfishsystems.ca 2006-06 ++[Dan_Shia] Dan Shia mailto:dset!shia&uunet.uu.net ++[Dan_Smith] Dan Smith mailto:dan.smith&den.galileo.com ++[Dan_Wing] Dan Wing mailto:dwing&cisco.com 2011-01-11 ++[Dana_Blair] Dana Blair mailto:dblair&cisco.com 2004-06 ++[Dana_Doggett] Dana Doggett Stoneware Inc. mailto:dana.doggett&stone-ware.com 2012-05-18 ++[Dana_Porter] Dana Porter mailto:dana.porter&sun.com 2003-10 ++[Daniel_Becker] Daniel Becker mailto:becker2d&ttc.com ++[Daniel_Becker_2] Daniel Becker mailto:beckerd&ttc.com ++[Daniel_Becker_3] Daniel Becker mailto:dbecker&v-one.com ++[Daniel_Becker_4] Daniel Becker mailto:Dan.Becker&fortisphere.com 2008-06-03 ++[Daniel_Birns] Daniel Birns mailto:daniel&globes.com ++[Daniel_C_McGloin] Daniel C. McGloin mailto:daniel_mcgloin&intuit.com 2005-05 ++[Daniel_Friedman] Daniel Friedman mailto:dfriedman&hns.com 2003-08 ++[Daniel_G_Taylor] Daniel G. Taylor mailto:dan&programmer-art.org 2007-11 ++[Daniel_Grazioli] Daniel Grazioli mailto:dgrazioli&pgaero.co.uk ++[Daniel_Heffernan] Daniel Heffernan mailto:me&daniel.ie ++[Daniel_Holth] Daniel Holth mailto:dholth&fastmail.fm 2012-04-24 ++[Daniel_J_Walsh] Daniel J Walsh mailto:dwalsh&bindview.com ++[Daniel_Julio_Reyes] Daniel Julio Reyes mailto:danieljreyes&yahoo.com 2003-08 ++[Daniel_Kilsdonk] Daniel Kilsdonk mailto:dan&prospeed.net 2006-08 ++[Daniel_Mavrakis] Daniel Mavrakis mailto:system&venus.mctel.fr ++[Daniel_Mavrakis_2] Daniel Mavrakis mailto:mavrakis&mctel.fr ++[Daniel_R_Somerfield] Daniel R Somerfield mailto:dsomerfi&harris.com 2011-08-05 ++[Daniel_Ruppert] Daniel Ruppert mailto:daniel&kaffi.lu 2010-09-16 ++[Daniel_Simms] Daniel Simms mailto:dsimms&acm.uiuc.edu ++[Daniel_Sisk] Daniel Sisk mailto:daniel.sisk&pnl.gov ++[Daniel_Sorlov] Daniel Sorlov mailto:Daniel&sorlov.com ++[Daniel_Sorlov_2] Daniel Sorlov mailto:daniel&sorlov.com 2002-06 ++[Daniel_Steinberg] Daniel Steinberg mailto:daniel&oreilly.com ++[Daniel_Stodle] Daniel Stodle mailto:daniels&cs.uit.no ++[Daniel_Story] Daniel Story mailto:dan&guy-tek.com 2008-01-25 ++[Daniel_Tappan] Daniel Tappan mailto:Tappan&bbn.com ++[Daniel_W_Antonuk] Daniel W. Antonuk mailto:dantonuk&etcconnect.com 2006-05 ++[Daniel_Whelan] Daniel Whelan mailto:dwhelan&filenet.com ++[Daniel_Wippermann] Daniel Wippermann mailto:Daniel.Wippermann&resol.de ++[Danko_Alexeyev] Danko Alexeyev mailto:virtuall&virtuall.info 2007-08-08 ++[Dany_Ayotte] Dany Ayotte mailto:ayotte&teamsoft.com 2002-07 ++[Danzhou_Liu] Danzhou Liu Symantec mailto:Danzhou_Liu&symantec.com 2012-05-07 ++[Dario_S_Tonesi] Dario S. Tonesi mailto:dario.tonesi&nsn.com 2011-02-07 ++[Darrell_Schiebel] Darrell Schiebel mailto:dschieb&cv.nrao.edu ++[Darrin_Smart] Darrin Smart mailto:dns-sd&filmlight.ltd.uk ++[Darshan_Shah] Darshan Shah mailto:darshan.shah&ni.com ++[Darwin_Ammala] Darwin Ammala mailto:dammala&harris.com 2007-03 ++[Daryle_DeBalski] Daryle DeBalski mailto:ddebalski&optika.com ++[Data_Access_Inc] Data Access, Inc. mailto:development&dataaccessinc.com 2012-04-30 ++ Data Storage ++[Data_Storage_Institu] Institute of mailto:Patrick&dsi.nus.edu.sg 2002-02 ++ Singapore ++[Datacolor] Datacolor mailto:hbarber&datacolor.com 2011-10-14 ++[Dave_Bellivea] Dave Bellivea mailto:DaveBelliveau&corsof.com ++[Dave_Belliveau] Dave Belliveau mailto:DaveBelliveau&cornerstonesoftware.com ++[Dave_Benton] Dave Benton mailto:dave.benton&eaglepoint.com ++[Dave_Buehmann] Dave Buehmann mailto:ingr!daveb&uunet.uu.net ++[Dave_Carrigan] Dave Carrigan mailto:dave&openshut.net ++[Dave_Chapman] Dave Chapman mailto:dave.chapman&buildings.schneider-electric.com 2011-06-06 ++[Dave_Christianson] Dave Christianson mailto:dbc1&cs.washington.edu ++[Dave_Clark] Dave Clark mailto:ddc&lcs.mit.edu ++[Dave_Craft] Dave Craft mailto:gpfs&ibm.com 2004-11 ++[Dave_DesRoches] Dave DesRoches mailto:ddesroches&clariion.com ++[Dave_Feinleib] Dave Feinleib mailto:davefeµsoft.com ++[Dave_Gimpl] Dave Gimpl mailto:gimpl&us.ibm.com 2003-01 ++[Dave_Hines] Dave Hines mailto:d.hines&high-availability.com 2004-11 ++[Dave_Howell] Dave Howell mailto:dave&avatron.com ++[Dave_Hubbard] Dave Hubbard mailto:dave&icc.net ++[Dave_Inman] Dave Inman mailto:davei&mxim.com ++[Dave_Jagoda] Dave Jagoda mailto:dj&opsware.com 2006-06 ++[Dave_Katz] Dave Katz mailto:dkatz&juniper.net 2006-02 ++[Dave_Lamb] Dave Lamb mailto:rdl&rdl.cnd.hp.com ++[Dave_LeBlang] Dave LeBlang mailto:leglang&atria.com ++[Dave_Lindquist] Dave Lindquist mailto:dlindquist&egistix.com 2010-05-27 ++[Dave_Lindquist_2] Dave Lindquist mailto:dlindquist&egistix.com ++[Dave_Lyons] Dave Lyons mailto:dlyons&dnpg.com ++[Dave_Maxwell] Dave Maxwell mailto:d.maxwell&cablelabs.com ++[Dave_Mills] Dave Mills mailto:mills&udel.edu ++[Dave_Mills_2] Dave Mills mailto:Mills&huey.udel.edu ++[Dave_Nesbitt] Dave Nesbitt mailto:nesbitt&cp10.es.xerox.com ++[Dave_Neudoerffer] Dave Neudoerffer mailto:Dave.Neudoerffer&ianywhere.com ++[Dave_Neudoerffer_2] Dave Neudoerffer mailto:dave.neudoerffer&sybase.com 2009-11-18 ++[Dave_Porter] Dave Porter mailto:porter&mango.com ++[Dave_Reiland] Dave Reiland mailto:dave.reiland&netex.com 2003-11 ++[Dave_Robin] Dave Robin mailto:iana_ports&daverobin.com ++[Dave_Ross] Dave Ross mailto:david.ross&ca.com ++[Dave_Ruedger] Dave Ruedger mailto:daver&datalode.com 2003-11 ++[Dave_Sewell] Dave Sewell mailto:dave&sewelldev.com ++[Dave_Simmons] Dave Simmons mailto:dsimmons¯omedia.com ++[Dave_Spencer] Dave Spencer mailto:dspencer&xingtech.com ++[Dave_Springer] Dave Springer mailto:daves&apple.com ++[Dave_Stampe] Dave Stampe mailto:dstampe&psych.toronto.edu ++[Dave_Stone] Dave Stone mailto:dstone01&harris.com 2002-09 ++[Dave_Stoneham] Dave Stoneham mailto:dave&mulberry-consultants.co.uk 2008-03-10 ++[Dave_Thaler] Dave Thaler mailto:thalerd&eecs.umich.edu ++[Dave_Thaler_2] Dave Thaler mailto:dthalerµsoft.com ++[Dave_Ward] Dave Ward mailto:dward&cisco.com 2006-02 ++[Dave_Watkins] Dave Watkins mailto:davew&boi.hp.com ++[Dave_Wierbowski] Dave Wierbowski mailto:wierbows&us.ibm.com 2006-08 ++[Davey_Taylor] Davey Taylor mailto:davey.taylor&brimstone.net 2003-02 ++[David_A_Gayler] David A. Gayler mailto:David.Gayler&bindview.com 2005-08 ++[David_A_Gayler_2] David A. Gayler mailto:dgayler&eminentware.com 2006-07 ++[David_A_Gomberg] David A. Gomberg mailto:gomberg&gateway.mitre.org ++[David_A_Lethe] David A. Lethe mailto:david_lethe&us.xyratex.com 2003-04 ++[David_A_Lethe_2] David A Lethe mailto:david&santools.com 2008-05-01 ++[David_Anderson] David Anderson mailto:davea&ssl.berkeley.edu 2004-11 ++[David_Anthony] David Anthony mailto:anthony&power.amasd.anatcp.rockwell.com ++[David_Anuszewski] David Anuszewski mailto:david.anuszewski&siemens.com 2004-11 ++[David_Arko] David Arko mailto:darko&hpfcrn.fc.hp.com ++[David_Arnold] David Arnold mailto:davida&pobox.com ++[David_Ashkenazi] David Ashkenazi mailto:david&synel.co.il 2010-03-23 ++[David_Ashley] David Ashley mailto:david.ashley.ibm&gmail.com 2009-07-24 ++[David_Aspinwall] David Aspinwall mailto:aspinwall×ten.com 2003-04 ++[David_B_Hon] David B. Hon mailto:hon&astro.ufl.edu 2003-03 ++[David_Barrass] David Barrass mailto:dbarrass&bartecautoid.com 2006-01 ++[David_Barrass_2] David Barrass mailto:david.barrass&minorplante.com 2003-11 ++[David_Berk] David Berk mailto:dberk&ping-0.com 2007-08-30 ++[David_Bisset] David Bisset mailto:dbisset&mvel.demon.co.uk ++[David_Borman] David Borman mailto:dab&windriver.com 2003-03 ++[David_Bourland] David Bourland mailto:DBourland&smausa.com ++[David_Brandon] David Brandon mailto:dade&smoolabs.net 2006-08 ++[David_Brower] David Brower mailto:david.brower&oracle.com ++[David_Catmull] David Catmull mailto:uncommon&uncommonplace.com 2006-01 ++[David_Chassin] David Chassin mailto:david.chassin&pnl.gov 2010-12-10 ++[David_Chell] David Chell mailto:david&softlife.co.nz ++[David_Cheng] David Cheng mailto:davec&aesclever.com 2010-02-01 ++[David_Clark] David Clark mailto:ddc&lcs.mit.edu ++[David_Clunie] David Clunie mailto:dclunie&dclunie.com 2005-08 ++[David_Cooper] David Cooper mailto:david.cooper&oracle.com ++[David_Crewson] David Crewson mailto:davidc&eydeas.net 2004-09 ++[David_Crowe] David Crowe mailto:dcrowe&faronics.com 2008-01-07 ++[David_Dion] David Dion mailto:David.Dionµsoft.com 2009-02-12 ++[David_Duncan] David Duncan mailto:dduncan&es.com ++[David_Dunetz] David Dunetz mailto:david&sweetware.com ++[David_Ely] David Ely mailto:dely&cnri.reston.va.us ++[David_F_Skoll] David F. Skoll mailto:dfs&roaringpenguin.com 2010-02-05 ++[David_Farajun] David Farajun mailto:dfarajun&asigra.com 2004-11 ++[David_Ferguson] David Ferguson mailto:dferguson&xtralot.com 2002-02 ++[David_Ferrero] David Ferrero mailto:david&zion.com ++[David_Fudge] David Fudge mailto:david.fudge&tssi.co.uk 2003-08 ++[David_Goldberg] David Goldberg mailto:dgoldberg&callisto.com ++[David_Goodall] David Goodall mailto:david.goodall&g2microsystems.com 2007-02 ++[David_Greer] David Greer mailto:david_greer&robelle.com ++[David_HM_Spector] David HM Spector mailto:spector&zeitgeist.com ++[David_Hagood] David Hagood mailto:david.hagood&aeroflex.com ++[David_Hampson] David Hampson mailto:davidha&codemasters.com ++[David_Holden] David Holden mailto:mdh&rentek.net ++[David_Hornsby] David Hornsby mailto:djh&munnari.oz.au ++[David_Hua] David Hua mailto:davhuaµsoft.com ++[David_Hughes] David Hughes mailto:bambi&hughes.com.au ++[David_Ison] David Ison mailto:here&dialup.oar.net ++[David_J_Wilson] David J. Wilson mailto:djw&arbortext.com ++[David_Jones] David Jones mailto:djones&cincom.com ++[David_Ko] David Ko mailto:dko&autodesk.com ++[David_Ko_2] David Ko mailto:david.dk.ko&gmail.com 2009-09-14 ++[David_Kramer] David Kramer mailto:dkramer&apple.com 2004-11 ++[David_Kramer_2] David Kramer mailto:dkramer&apple.com ++[David_Lasker] David Lasker mailto:dave&altosdesign.com ++[David_Leinbach] David Leinbach mailto:dleinbach&jti.bc.ca ++[David_Lemson] David Lemson mailto:dlemsonµsoft.com ++[David_Lethe] David Lethe mailto:david&santools.com 2010-12-24 ++[David_Luxford] David Luxford mailto:david.luxford&asg.com 2010-07-01 ++[David_M_Gay] David M. Gay AMPL Optimization, mailto:dmg&l.com 2012-05-25 ++ Inc. ++[David_M_O_Rourke] David M. O'Rourke mailto:daveo&apple.com 2003-01 ++[David_M_Rhodes] David M. Rhodes mailto:davidrho&cnd.hp.com ++[David_Manns] David Manns mailto:davidm&pulsonix.com 2008-02-28 ++[David_McLaughlin] David McLaughlin mailto:davidmclaughlin&accessdata.com 2004-11 ++[David_McMarlin] David McMarlin mailto:david.mcmarlin&oracle.com 2006-08 ++[David_Meermans] David Meermans mailto:david.meermans&aastra.com ++[David_Merchant] David Merchant mailto:d.f.merchant&livjm.ac.uk ++[David_Miller] David Miller mailto:dave.dsm&gmail.com 2007-02 ++[David_Misunas] David Misunas mailto:DMisunas&micom.com ++[David_Mojdehi] David Mojdehi mailto:david.mojdehi&autodesk.com 2002-04 ++[David_Moore] David Moore mailto:dmoore&uttc-uts.com ++[David_Nanian] David Nanian mailto:dnanian&shirt-pocket.com 2007-09-28 ++[David_Nanian_2] David Nanian mailto:dnanian&shirt-pocket.com ++[David_Nash] David Nash mailto:dnash&ford.com ++[David_Ott] David Ott mailto:dott&qualcomm.com 2010-10-15 ++[David_Page] David Page mailto:david.page&sun.com 2005-08 ++[David_Pinch] David Pinch mailto:dpinch&mtl-inst.com 2002-04 ++[David_Priest] David Priest mailto:priest&sfu.ca ++[David_Reed] David Reed ++[David_Riggle] David Riggle mailto:dave&busymac.com 2008-01-07 ++[David_Roberts] David Roberts mailto:David.Roberts&ca.com 2005-05 ++[David_Rouchet] David Rouchet mailto:david.rouchet&medialon.com 2007-05 ++[David_Schwartz] David Schwartz mailto:davids&webmaster.com ++[David_Schwartz_2] David Schwartz mailto:david.schwartz&marathontechnologies.com 2009-06-18 ++[David_Sechrest] David Sechrest mailto:david.sechrest&oracle.com 2010-09-22 ++[David_Shaw] David Shaw mailto:dshaw&jabberwocky.com 2003-05 ++[David_Sinclair] David Sinclair mailto:dev&profilemac.com 2006-05 ++[David_Sinclair_2] David Sinclair mailto:bonjour&profilemac.com ++[David_Snocken] David Snocken tel:+44-71-437-7009 ++[David_Spencer] David Spencer mailto:dspencer&telops.com ++[David_Sperling] David Sperling mailto:dsperling&smithmicro.com 2006-06 ++[David_Sperling_2] David Sperling Smith Micro Software, mailto:dsperling&smithmicro.com 2011-10-10 ++ Inc. ++[David_Spivey] David Spivey mailto:DavidTSpivey&gmail.com 2010-08-30 ++[David_Stephenson] David Stephenson mailto:david_stephenson&hp.com ++[David_Straw] David Straw mailto:david.straw&hp.com 2005-11 ++[David_Suffield] David Suffield mailto:david.suffield&hp.com 2006-05 ++[David_T_Hines] David T. Hines mailto:david.hines&intel.com 2005-02 ++[David_Thielen] David Thielen mailto:support&windward.net ++[David_Thompson] David Thompson mailto:theta&theta-ent.com ++[David_Tong] David Tong mailto:David_Tong&integrated.mb.ca ++[David_Troeger] David Troeger mailto:David_Troeger&dell.com ++[David_Turner] David Turner mailto:digital&quetico.tbaytel.net ++[David_V_Raskin] David V. Raskin mailto:draskin&rimage.com 2006-02 ++[David_Vest] David Vest mailto:dave&mythicsoft.com 2008-11-19 ++[David_W_Radcliffe] David W. Radcliffe mailto:info&radsolution.co.uk ++[David_Walend] David Walend mailto:david&walend.net ++ mailto:dev&salutafugijms.dev.java.net ++[David_Walling] David Walling mailto:sylvanhollow&yahoo.com 2006-03 ++[David_Walling_2] David Walling mailto:dwalling&isoft.com ++[David_Warden] David Warden mailto:david_warden&symantec.com 2008-11-17 ++[David_Warden_2] David Warden mailto:warden&nupaper.com 2005-11 ++[David_Weinstein] David Weinstein mailto:david.weinstein&redstorm.com ++[David_Weisgerber] David Weisgerber mailto:david.weisgerber&printsoft.de 2007-09-27 ++[David_Wilson] David Wilson mailto:dwilson&integral-ie.com ++[David_Wiltz] David Wiltz mailto:dwiltz&hf.intel.com ++[David_Wooden] David Wooden mailto:dwooden&wizdom.com ++[David_Yon] David Yon mailto:yon&tactical-sw.com ++[David_Yon_2] David Yon mailto:dyon&dialout.net 2002-05 ++[David_Young] David Young mailto:david.young&ccsseurope.co.uk 2006-01 ++[David_Zimmerman] David Zimmerman mailto:dpz&rutgers.edu ++[Davoud_Maha] Davoud Maha mailto:dmaha&saba.com ++[Dawei_Qi] Dawei Qi mailto:dqi&galaxytelecomms.com 2010-07-07 ++[DeVoeSquared] DeVoeSquared mailto:support&devoesquared.com ++[De_Chih_Chien] De-Chih Chien mailto:de-chih_chien&symantec.com 2008-10-06 ++[Dean_Blackketter] Dean Blackketter mailto:dean&corp.webtv.net ++[Dean_Blackketter_2] Dean Blackketter mailto:dean&slimdevices.com ++[Dean_Dauger] Dean Dauger mailto:D&daugerresearch.com ++[Dean_Robson] Dean Robson mailto:dean.robson&fujitsu.com.au ++[Dean_Skelton] Dean Skelton mailto:mdskel&ftw.rsc.raytheon.com ++[Dean_Webb] Dean Webb mailto:dean.webb&ascend.com ++[Delcio_Prizon] Delcio Prizon mailto:dprizon&smar.com.br ++[Denis_Ducharme] Denis Ducharme mailto:dducharme&softek.com ++[Denis_Leclerc] Denis Leclerc mailto:DLeclerc&banyan.com ++[Denise_Eckstein] Denise Eckstein mailto:denise.eckstein&hp.com 2004-11 ++[Denise_Fernandez] Denise Fernandez mailto:dcbfernandez&gmail.com ++[Dennis_Batchelder] Dennis Batchelder mailto:dennis&capres.com ++[Dennis_Dube] Dennis Dube mailto:ddube&modicon.com ++[Dennis_Mastin] Dennis Mastin mailto:dennis&tasmania.platte.com ++[Dennis_Parker] Dennis Parker mailto:dparker&broadcloud.com 2002-02 ++[Dennis_Reinhardt] Dennis Reinhardt mailto:DennisR&dair.com ++[Derick_Snyder] Derick Snyder mailto:dsnyder&rainbow.com ++[Dermot_Tynand] Dermot Tynand mailto:dtynan&claddagh.ie ++[Derrick_Hisatake] Derrick Hisatake mailto:derrick.i.hisatake&intel.com ++[Desmond_Chan] Desmond Chan mailto:deschan&prismedia.com ++[Detlef_Rothe] Detlef Rothe mailto:detlef.rothe&ts.fujitsu.com 2009-05-15 ++[Detlef_Stoever] Detlef Stoever mailto:mail&ivotec.com 2003-03 ++ Deutschland Informations ++[Deutschland_Informat] und mailto:beratung&dirg.de ++ Reservierungsgesellschaft ++ mbH ++[Developer_Support] Developer Support mailto:devsupport&tivo.com ++[Developer_Support_2] Developer Support TiVo Inc. mailto:devsupport&tivo.com 2011-10-18 ++[Devjani_Ray] Devjani Ray Oracle Corporation mailto:Devjani.Ray&oracle.com 2012-04-20 ++[Devon_Dawson] Devon Dawson mailto:devon.dawson&hp.com 2003-11 ++[Devon_Taylor] Devon Taylor mailto:dtaylor&novell.com ++[DEVONtechnologies_LLC] DEVONtechnologies, mailto:info&devontechnologies.com 2011-10-18 ++ LLC ++[Dialectro_Software] Dialectro Software mailto:g&dialectro.com 2011-10-20 ++[Diane_Downie] Diane Downie mailto:downie&jibe.mv.com ++[Diane_I_Shannon] Diane I. Shannon mailto:shannond&us.ibm.com 2007-04 ++[Dick_Augustsson] Dick Augustsson mailto:dick&skenbe.net ++[Dick_Georges] Dick Georges mailto:georges&monaco.net 2002-02 ++[Dick_van_der_Sijs] Dick van der Sijs mailto:dick&and.nl ++[Didier_Cabannes] Didier Cabannes mailto:Didier&matisse.com 2004-11 ++[Diego_Friedel] Diego Friedel mailto:d.friedel&avm.de 2006-03 ++[Diego_Santa_Cruz] Diego Santa Cruz SpinetiX S.A. mailto:Diego.SantaCruz&spinetix.com 2011-10-18 ++[Diego_Saravia] Diego Saravia mailto:dsa&unsa.edu.ar ++[Dieter_Siegmund] Dieter Siegmund mailto:dieter&apple.com 2007-10-22 ++[Dietmar_Finkler] Dietmar Finkler mailto:d.finkler&hermstedt.de ++[DIFUSI_Inc] DIFUSI, Inc. mailto:mike&difusi.com 2011-11-07 ++[Dima_Seliverstov] Dima Seliverstov mailto:Dima_Seliverstov&bmc.com 2009-07-28 ++[Dimitrios_Souflis] Dimitrios Souflis mailto:dsouflis&altera.gr ++[Dimitris_Michelinaki] Dimitris Michelinakis mailto:dimitris&michelinakis.gr 2002-05 ++[Dinkar_Chivaluri] Dinkar Chivaluri mailto:dinkar&veritas.com ++[Dinkar_Chivaluri_2] Dinkar Chivaluri mailto:dchivaluri&imperfectnetworks.com 2006-02 ++[Dino_Ciano] Dino Ciano mailto:DCiano&tickets.com 2011-03-02 ++[Dino_Farinacci] Dino Farinacci mailto:dino&cisco.com 2008-08-21 ++[Dion_Slijp] Dion Slijp mailto:dion.slijp&oce.com ++[Dirk_Hillbrecht] Dirk Hillbrecht mailto:dirk&hillbrecht.de ++[Dirk_Koopman] Dirk Koopman mailto:djk&tobit.co.uk 2005-08 ++[Dirk_Kutscher] Dirk Kutscher mailto:dku&informatik.uni-bremen.de ++[Dirk_Materlik] Dirk Materlik mailto:materlik&blubbsoft.de 2005-11 ++[Dirk_Stoop] Dirk Stoop mailto:dirk&madebysofa.com 2007-04 ++[Dmitri_Znosko] Dmitri Znosko mailto:support&radmin.com 2003-03 ++[Dmitry_Brant] Dmitry Brant mailto:dmitry_brant&lincolnelectric.com 2007-03 ++[Dmitry_Isakbayev] Dmitry Isakbayev mailto:dmitry&transnexus.com 2010-03-05 ++[Dmitry_Krasnonosenki] Dmitry Krasnonosenkikh mailto:Dmitry_Krasnonosenkih&nmss.com ++[Dmitry_Obuvalin] Dmitry Obuvalin mailto:pulse.cc&mail.ru 2006-02 ++[Dolores_Scott] Dolores Scott mailto:Dolores.Scott&l-3security.com ++[Dolores_Scott_2] Dolores Scott mailto:dolores.scott&l-3security.com ++[Domain_Tech] Domain Tech mailto:Domainnametech&blizzard.com 2005-04 ++[Dominick_Cafarelli] Dominick Cafarelli mailto:dominick.cafarelli&networkgeneral.com 2005-08 ++[Dominique_Lelievre] Dominique Lelievre mailto:dominique.lelievre&fr.ibm.com 2003-01 ++[DOMIQ_Sp_zoo] DOMIQ Sp. z o.o. mailto:registries&domiq.pl 2011-08-29 ++[Don_Bowman] Don Bowman mailto:don&pixstream.com ++[Don_Gibson] Don Gibson mailto:sequent!aero!twinsun!ashtate.A-T.COM!dong&uunet.UU.NET ++[Don_Gilbreath] Don Gilbreath mailto:don&comcam.net 2002-09 ++[Don_Hejna] Don Hejna mailto:djhejna&ambit.com ++[Don_Loughry] Don Loughry mailto:DON_LOUGHRY&hp-cupertino-om4.om.hp.com ++[Don_Marselle] Don Marselle mailto:don.marselle&3par.com 2008-04-09 ++[Don_Merrell] Don Merrell mailto:donmer&axent.com ++[Don_Oliver] Don Oliver mailto:don&donnyworld.com ++[Don_Payette] Don Payette mailto:Don.Payette&unisys.com ++[Don_Provan] Don Provan mailto:donp&xlnvax.novell.com ++[Don_Provan_2] Don Provan mailto:donp&sjf.novell.com ++[Don_Stedman] Don Stedman mailto:dones&stisystems.com ++[Don_Sullivan] Don Sullivan mailto:donald.v.sullivan&nasa.gov 2010-02-16 ++[Don_Traub] Don Traub mailto:don.traub&sun.com ++[Don_Tyson] Don Tyson ++[Don_Tyson_2] Don Tyson mailto:don.tyson&cor.dowjones.com ++[Don_W_Fitzpatrick] Don W. Fitzpatrick mailto:dwf&internetworxsystems.com 2005-08 ++[Don_Woodward] Don Woodward mailto:dwoodward&rokulabs.com ++[Donald_Cornwell] Donald Cornwell mailto:don.cornwell&objective.com ++[Donald_Cornwell_2] Donald Cornwell ++[Donald_D_Woelz] Donald D. Woelz mailto:don&genroco.com ++[Donald_Dylla] Donald Dylla mailto:donald.dylla&hp.com 2004-12 ++[Donald_E_Eastlake] Donald E. Eastlake 3rd mailto:d3e3e3&gmail.com ++[Donald_Eastlake] Donald Eastlake mailto:d3e3e3&gmail.com ++[Donald_G_Kallgren] Donald G. Kallgren mailto:Donald.Kallgren&nc3a.nato.int ++[Donald_Welch] Donald Welch mailto:donald.welch&hp.com 2006-05 ++[Donghwan_Lim] Donghwan Lim mailto:donghwan.lim&t-mobile.com 2008-01-22 ++[Dongkeun_Kim] Dongkeun Kim mailto:dongkeun70.kim&samsung.com 2007-02 ++[Dongling_Wang] Dongling Wang mailto:dongling&finle.com ++[Donna_Dillenberger] Donna Dillenberger mailto:engd&us.ibm.com ++[Donny_Gilor] Donny Gilor mailto:dgilor&pop01.ny.us.ibm.net ++[Doriano_Blengino] Doriano Blengino mailto:tecnico_remove_&_remove_xonelectronics.it ++[Dotan_Ofek] Dotan Ofek mailto:dotan.ofek&prizmasoft.com 2005-12 ++[Doug_Boone] Doug Boone mailto:dboone&atg.clr.com ++[Doug_Dillon] Doug Dillon mailto:dillon&hns.com ++[Doug_Grover] Doug Grover mailto:dgrover&phonex.com ++[Doug_Karl] Doug Karl mailto:KARL-D&osu-20.ircc.ohio-state.edu ++[Doug_Kent] Doug Kent mailto:mouthers@slugg&nwnexus.wa.com ++[Doug_Leany] Doug Leany mailto:DLEANY&opto22.com 2006-09 ++[Doug_Rosenthal] Doug Rosenthal mailto:rosenthl&krypton.einet.net ++[Doug_Royer] Doug Royer mailto:DouglasRoyer&gmail.com 2010-12-09 ++[Doug_Wyatt] Doug Wyatt mailto:dwyatt&apple.com ++[Douglas_Crockford] Douglas Crockford mailto:douglas&crockford.com ++[Douglas_Davidson] Douglas Davidson mailto:drd&apple.com 2002-06 ++[Douglas_Goodall] Douglas Goodall mailto:douglas_goodall&mac.com 2009-08-05 ++[Douglas_Kadlecek] Douglas Kadlecek mailto:doug&dkware.com 2004-11 ++[Douglas_Knisely] Douglas Knisely mailto:dnk&lucent.com ++[Douglas_M_Gaer] Douglas M. Gaer mailto:doug&datareel.com ++[Douglas_McLaggan] Douglas McLaggan mailto:glbp-info&cisco.com ++[Dr_Anupam_Bharali] Dr. Anupam Bharali mailto:paniana&gmail.com 2006-06 ++[Dr_Charles_E_Campb] Dr. Charles E. Campbell mailto:cec&gryphon.gsfc.nasa.gov ++ Jr. ++[Dr_Chris_Tucker] Dr. Chris Tucker mailto:chris.tucker&ioltd.co.uk 2005-08 ++[Dr_Horst_Herb] Dr Horst Herb mailto:horst&dorrigomedical.com 2005-12 ++[Dr_Kingsley_C_Nwos] Dr. Kingsley C. Nwosu mailto:knwosu&aglowmail.com 2003-04 ++[Dr_Matthias_Arnold] Dr. Matthias Arnold mailto:m.arnold&dasgip.de 2009-03-23 ++[Dr_Michael_Erdmann] Dr. Michael Erdmann mailto:erdmann&ontoprise.de 2004-12 ++[Dr_R_P_Alston] Dr. R.P. Alston mailto:robin&gradient.com ++[Dr_Yair_Shapira] Dr. Yair Shapira mailto:yair&flashnetworks.com ++[Dragos_Pop] Dragos Pop mailto:dragos&cs.ubbcluj.ro ++[Drake_Bankston] Drake Bankston mailto:IANA.KingdomsOnline&gmail.com 2009-08-18 ++[Drew_Wolff] Drew Wolff mailto:dwolff¢ra.net ++[Dror_Gill] Dror Gill mailto:drorgi&vnet.ibm.com ++[Dror_Harari] Dror Harari mailto:Dror.Harari&isgsoft.com ++[Duane_Gibson] Duane Gibson mailto:ianaportmaster&unify.com ++[Duane_Kiser] Duane Kiser mailto:dkiser&jsexpress.com ++[Duane_Wessels] Duane Wessels mailto:wessels&nlanr.net ++[Dudi_Hazan] Dudi Hazan mailto:dudi&checkpoint.com ++[Duk_Loi] Duk Loi mailto:dloi&peerdirect.com 2005-11 ++[Duncan_Hare] Duncan Hare mailto:Duncan.Hare&synoia.com ++[Dustin_Brand] Dustin Brand mailto:amo&amo.net ++[Dustin_Zack] Dustin Zack mailto:dustin.e.zack&gmail.com 2006-06 ++[E_Wald] E. Wald mailto:ewald&via.enet.dec.com ++[Ean_Black] Ean Black mailto:eanb&bladesoftware.co.uk 2009-04-08 ++[Earl_Brannigan] Earl Brannigan mailto:earl.brannigan&lindenhous.co.uk ++[Earl_Wallace] Earl Wallace mailto:earlw&apple.com ++[Ecamm_Network_LLC] Ecamm Network, LLC mailto:chris&ecamm.com 2011-10-24 ++[Eckhard_Grieger] Eckhard Grieger mailto:e.grieger&com-on.de ++[Ed_Barron] Ed Barron ++[Ed_Cain] Ed Cain mailto:cain&edn-unix.dca.mil ++[Ed_Fair] Ed Fair mailto:ed_fair&yahoo.com 2002-11 ++[Ed_Green] Ed Green mailto:egreen&pmeasuring.com ++[Ed_Kress] Ed Kress mailto:eskress&thinknet.com ++[Ed_Metcalf] Ed Metcalf mailto:emetcalf&tripwiresecurity.com ++[Ed_Odjaghian] Ed Odjaghian mailto:edo&datacap.com ++[Ed_Ranney] Ed Ranney mailto:eranney&crestron.com 2003-01 ++[Ed_Vincent] Ed Vincent mailto:edv&concomp.com ++[Eddie_Kohler] Eddie Kohler IETF dccp WG mailto:kohler&cs.ucla.edu ++[Eden_Sherry] Eden Sherry mailto:eden&pair.com ++[Edgar_Alan_Tu] Edgar Alan Tu mailto:Edgar_Tu&playstation.sony.com 2003-01 ++[Edgar_Blum] Edgar Blum mailto:edgar.blum&swx.ch ++[Edgar_Circenis] Edgar Circenis mailto:ec&fc.hp.com ++[Edo_Yahav] Edo Yahav mailto:standards&expand.com ++[Eduardo_Fernandez] Eduardo Fernandez mailto:eduardo.fernandez&avocent.com 2003-08 ++[Eduardo_Rosenberg_de] Eduardo Rosenberg de mailto:eduardor&spacenet.com.br ++ Moura ++[Edward_Browdy] Edward Browdy mailto:ebrowdy&cryptek.com 2002-07 ++[Edward_Macomber] Edward Macomber OPNET Technologies mailto:tmacomber&opnet.com 2011-09-21 ++ Inc ++[Edward_R_Boedecker] Edward R. Boedecker mailto:boedeck1&flash.net 2003-11 ++[Edward_Reus] Edward Reus mailto:edwardrµsoft.com ++[Edward_T_O_Shea] Edward T. O'Shea mailto:oshea&bellsouth.net ++[Edward_Yim] Edward Yim mailto:eyim&hpmfas4.cup.hp.com ++[EFKON_AG] EFKON AG mailto:t.kemmer&efkon.com 2011-10-20 ++[Eggert_Thorlacius] Eggert Thorlacius mailto:eggert&menandmice.com 2007-08-30 ++[Eggert_Thorlacius_2] Eggert Thorlacius mailto:eggi&menandmice.com 2010-01-27 ++[Egon_Meier_Engelen] Egon Meier-Engelen mailto:egon.meier-engelen&dlr.de ++[Eiki_Iwata] Eiki Iwata mailto:eiki&nd.net.fujitsu.co.jp ++[Eivan_Cerasi] Eivan Cerasi mailto:eivan.cerasi&eurocontrol.int 2008-10-10 ++[Ekkehard_Morgenstern] Ekkehard Morgenstern mailto:ekkehard&ekkehardmorgenstern.de 2003-03 ++[Elgato] Elgato mailto:support&elgato.com ++[Elgato_Systems] Elgato Systems mailto:portinfo&elgato.com 2004-11 ++[Eli_Sternheim] Eli Sternheim mailto:eli&interhdl.com ++[Elias_Sabbagh] Elias Sabbagh mailto:ehs&sabbagh.com ++[Eliot_Blennerhassett] Eliot Blennerhassett mailto:eblennerhassett&audioscience.com 2011-07-07 ++[Eliot_Moss] Eliot Moss mailto:EBM&xx.lcs.mit.edu ++[Elizabeth_Zilen] Elizabeth Zilen mailto:ezilen&newboundary.com 2004-11 ++[Elliot_Murphy] Elliot Murphy mailto:elliot.murphy&gmail.com 2008-07-09 ++[Elliot_Schwartz] Elliot Schwartz mailto:elliot&mit.edu ++[Elwood_Downey] Elwood Downey mailto:ecdowney&clearskyinstitute.com 2002-04 ++[Emidio_Cunha] Emidio Cunha mailto:emidio&janeladigital.com 2003-11 ++[Emily_Harris] Emily Harris mailto:eharris&newboundary.com 2004-11 ++[Emin_BORU] Emin BORU mailto:emin&danismanlik.net 2004-11 ++[Emmanuel_Bourg] Emmanuel Bourg mailto:smanux&lfjr.net 2004-11 ++[Emmanuel_Merali] Emmanuel Merali mailto:emumerali&gmail.com ++[Emmanuel_Saint_Loube] Emmanuel Saint-Loubert mailto:emmanuel&simplifymedia.com 2008-08-08 ++[Emmanuel_Tychon] Emmanuel Tychon mailto:etychon&cisco.com 2006-03 ++[Emre_Tunar] Emre Tunar mailto:emre.tunar&ca.com 2004-11 ++[Engineering_Dept] Engineering Dept. mailto:domains&badgernt.com ++[Enphase_Energy_Inc] Enphase Energy, Inc. mailto:ceich&enphaseenergy.com 2011-11-08 ++[Enrique_Corujo] Enrique Corujo mailto:enrique&caclearing.com 2006-02 ++[Environics_Oy] Environics Oy mailto:pasi.nuutinmaki&environics.fi ++[eQ-3_AG] eQ-3 AG mailto:andreas.hueschemenger&eq-3.de 2012-02-10 ++[Eran_Gampel] Eran Gampel mailto:eran&aoe6.net ++[Erhan_Soyer_Osman] Erhan Soyer-Osman mailto:erhansoµsoft.com 2008-03-26 ++[Eric_Anderson] Eric Anderson mailto:eanderson&netvision.com 2003-06 ++[Eric_Boehnisch-Volkmann] Eric Boehnisch-Volkmann DEVONtechnologies, mailto:eboehnisch&devo-technologies.com 2011-10-18 ++ LLC ++[Eric_Brown] Eric Brown mailto:sst!emerald!eric&uunet.uu.net ++[Eric_Bruno] Eric Bruno mailto:ebruno&solution-soft.com ++[Eric_Cantineau] Eric Cantineau mailto:eric&securenotebook.com 2004-11 ++[Eric_Carey] Eric Carey mailto:ecarey&corecoimaging.com 2005-08 ++[Eric_Day] Eric Day mailto:eday&oddments.org 2009-01-16 ++[Eric_Dittert] Eric Dittert mailto:Eric_Dittert&ccm.jf.intel.com ++[Eric_Gillet] Eric Gillet mailto:e.gillet&evs.tv ++[Eric_Grange] Eric Grange mailto:egrange&creative-it.net 2002-08 ++[Eric_Hackman] Eric Hackman mailto:ehackman&millapps.com ++[Eric_Harris_Braun] Eric Harris-Braun mailto:eric&glassbead.com 2003-06 ++[Eric_Isom] Eric Isom mailto:eisom&metastorm.com ++[Eric_Jacksch] Eric Jacksch mailto:jacksch&tenebris.ca ++[Eric_Jacobson] Eric Jacobson mailto:eric_jacobson&filemaker.com ++[Eric_Johnson] Eric Johnson mailto:eric&gruver.net ++[Eric_Lan] Eric Lan mailto:elan&d2k.com ++[Eric_Leblond] Eric Leblond mailto:eric&inl.fr 2007-06 ++[Eric_Ledoux] Eric Ledoux mailto:ericleµsoft.com ++[Eric_McMurry] Eric McMurry mailto:emcmurry&crinisnetworks.com 2004-04 ++[Eric_Newcomer] Eric Newcomer mailto:eric.newcomer&iona.com ++[Eric_Peterson] Eric Peterson mailto:lcc.eric&seas.ucla.edu ++[Eric_Pulsipher] Eric Pulsipher mailto:eric_pulsipher&hp.com ++[Eric_Pulsipher_2] Eric Pulsipher mailto:eric_pulsipher&fc.hp.com ++[Eric_Rosenfeld] Eric Rosenfeld mailto:e.rosenfeld&cablelabs.com 2003-11 ++[Eric_S_Raymond] Eric S. Raymond mailto:esr&thyrsus.com 2010-04-19 ++[Eric_Sean_Conner] Eric Sean Conner mailto:esconner&me.com 2011-10-17 ++[Eric_Sharakan] Eric Sharakan mailto:ldoms-iana-ports&sun.com 2008-02-14 ++[Eric_Soderberg] Eric Soderberg mailto:seric&cup.hp.com ++[Eric_Soderberg_2] Eric Soderberg mailto:seric&hposl102.cup.hp ++[Eric_St_Onge] Eric St. Onge mailto:stonge&apple.com 2008-01-14 ++[Eric_Thiebaut_George] Eric Thiebaut-George mailto:erict&aurema.com 2006-04 ++[Eric_Thorniley] Eric Thorniley mailto:eric&etcomms.co.uk 2007-09-17 ++[Eric_Welch] Eric Welch ++[Eric_Welch_2] Eric Welch mailto:eric&innosys.com 2003-11 ++[Eric_Whitehill] Eric Whitehill mailto:Eric.Whitehill&itt.com ++[Eric_Wilde] Eric Wilde mailto:eric&funk.com ++[Erica_Liu] Erica Liu mailto:liue&isolation.com ++[Ericko_Shimada] Ericko Shimada mailto:eriko&kel.fujitsu.co.jp ++[Erik_Blume] Erik Blume mailto:erikb&caciasl.com ++[Erik_Kragh_Jensen] Erik Kragh Jensen mailto:kragh&inet.uni2.dk ++[Erik_Mueller] Erik Mueller mailto:erik&signiform.com ++[Erik_Rogers] Erik Rogers mailto:erik&avatron.com ++[Erik_Sea] Erik Sea mailto:sea&apple.com ++[Erik_Skyten] Erik Skyten mailto:eki&silknet.com ++[Eriko_Shimada] Eriko Shimada mailto:eriko&kel.fujitsu.co.jp ++[Erlang] Erlang/OTP support mailto:epmd&erix.ericsson.se 2004-12 ++[Erwin_Hogeweg] Erwin Hogeweg mailto:erwin&airtech.demon.nl ++[Etai_Lev_Ran] Etai Lev-Ran mailto:elevran&cisco.com 2005-02 ++[Ethan_Fremen] Ethan Fremen mailto:mindlace&digicool.com ++[Eugen_Bacic] Eugen Bacic mailto:ebacic&texar.com ++[Eugen_Bacic_2] Eugen Bacic mailto:eugen&texar.com ++[Eugene_Cox] Eugene Cox mailto:genecox&raleigh.ibm.com ++[Eugene_Frenkel] Eugene Frenkel mailto:eugene&ada-usa.com 2005-11 ++[Eugene_Osovetsky] Eugene Osovetsky mailto:eugeneo&geocities.com ++[Eugene_Zhiganov] Eugene Zhiganov mailto:zed&dfe3300.karelia.ru 2002-07 ++[Eugeny_Gladkih] Eugeny Gladkih mailto:john&drweb.com 2008-01-31 ++[Evan_Caves] Evan Caves mailto:evan&acc.com ++[Evan_Rosen] Evan Rosen mailto:evan&robix.com 2005-11 ++[Evgeniy_Filatov] Evgeniy Filatov mailto:evgeniyfilatov&yandex.ru 2009-11-25 ++[Ewan_McNab] Ewan McNab mailto:ewan&qsc.co.uk 2004-11 ++[ExoMachina] ExoMachina mailto:hello&exomachina.com 2011-12-06 ++[Extensis] Extensis mailto:webmaster&extensis.com ++[Eyal_Yardeni] Eyal Yardeni mailto:eyal.yardeni&smarts.com 2003-11 ++[Ezinne_Oji] Ezinne Oji mailto:ezinne.oji&t-mobile.com 2006-06 ++[F_Englert] Fl SQRTDEGvio Englert mailto:flavio&elipse.com.br 2007-09-17 ++[Fabrizio_Guglielmino] Fabrizio Guglielmino mailto:guglielmino&infitsrl.com ++[Fabrizio_Massimo_Fer] Fabrizio Massimo Ferrara mailto:fmf&gesi.it 2002-02 ++[Fahad_Gilani] Fahad Gilani mailto:fahad&guidedways.com ++[Faith_Zack] Faith Zack mailto:faithz&sco.com ++[Falk_Werner] Falk Werner eQ-3 AG mailto:falk.werner&entwicklung.eq-3.de 2012-02-10 ++[Farid_Faez] Farid Faez mailto:farid_faez&hp.com ++[FAUCONNET_Ingenierie] FAUCONNET Ingenierie mailto:dev&fisa.fr 2011-05-19 ++ SA ++[Federico_Heinz] Federico Heinz mailto:federico&heinz.com ++[Federico_Lucifredi] Federico Lucifredi mailto:flucifredi&novell.com 2009-09-25 ++[Feitian_Technologies] Feitian Technologies mailto:product&ftsafe.com 2010-09-15 ++[Felisa_Ares] Felisa Ares mailto:faa06&tid.es 2003-04 ++[Ferdi_Ladeira] Ferdi Ladeira Fraxion Software mailto:f.lad.mail&gmail.com 2012-03-21 ++[Ferruccio_Barletta] Ferruccio Barletta mailto:ferruccio.barletta&compaq.com ++[Fieldbus_Foundation] Fieldbus Foundation mailto:dave.glanzer&fieldbus.org 2002-10 ++[Filip_Zawadiak] Filip Zawadiak DOMIQ Sp. z o.o. mailto:fzawadiak&domiq.pl 2011-08-29 ++[Filippo_Fadda] Filippo Fadda mailto:fadda&osway.com 2003-08 ++[FLIR_Systems_AB] FLIR Systems AB mailto:bjorn.roth&flir.se 2011-10-20 ++[Florence_Wyman] Florence Wyman mailto:wyman&peabody.plk.af.mil ++[Fons_Rademakers] Fons Rademakers mailto:Fons.Rademakers&cern.ch ++[Forest_Hill] Forest Hill mailto:forest&apple.com ++[Found_Software] Found Software, Inc. mailto:john&foundapp.com 2012-04-11 ++[Francesco_Rosi] Francesco Rosi mailto:frosi&orenburg.com 2006-01 ++[Francis_Cianfrocca] Francis Cianfrocca mailto:francis&tempest.com ++[Francis_GASCHET] Francis GASCHET NUMLOG mailto:fg&numlog.fr 2008-09-08 ++[Francisco_Reverbel] Francisco Reverbel mailto:reverbel&ime.usp.br 2002-06 ++[Francisco_Ryan_Tolma] Francisco Ryan Tolmasky mailto:ftolmasky&adelphia.net ++[Francisco_Saez_Aranc] Francisco Saez Arance mailto:fsaez&tid.es ++[Franck_Ladurelle] Franck Ladurelle mailto:ladurelf&partimage.org ++[Franck_Lefevre] Franck Lefevre mailto:franck.lefevre&digitalairways.com 2009-11-18 ++[Franco_Milan] Franco Milan mailto:franco&eladit.com ++[Francois_Granade] Francois Granade mailto:francois&netobjects.com ++[Francois_Harvey] Francois Harvey mailto:securiweb&pandore.qc.ca ++[Francois_Marchand] Francois Marchand mailto:francois.marchand&electromed.com 2002-08 ++[Francois_Marier] Francois Marier libravatar.org mailto:francois&libravatar.org 2011-10-11 ++[Francois_Painchaud] Francois Painchaud mailto:fpainchaud&konshus.com ++[Francois_Peloffy] Francois Peloffy mailto:fpeloffy&4tier.com ++[Frank_B] Frank Bredenbr mailto:fbredenbroecker&psi.de 2008-07-17 ++ SQRT\\partialcker ++[Frank_Blakely] Frank Blakely mailto:frankb&hpptc16.rose.hp.com ++[Frank_Goenninger] Frank Goenninger mailto:frank.goenninger&consequor.de 2010-02-22 ++[Frank_Hartung] Frank Hartung mailto:Frank.Hartung&ericsson.com 2007-09-07 ++[Frank_J_Wacho] Frank J. Wacho mailto:WANCHO&wsmr-simtel20.army.mil ++[Frank_Jakel] Frank Jaekel mailto:Frank.Jaekel&cytel.de 2011-04-29 ++[Frank_Kappe] Frank Kappe mailto:fkappe&iicm.tu-graz.ac.at ++[Frank_Liberato] Frank Liberato mailto:frankµlite.com 2004-06 ++[Frank_Neulichedl] Frank Neulichedl mailto:frank&websmile.com ++[Frank_O_Neill] Frank O'Neill mailto:frank&morse.ilo.dec.com ++[Frank_Pikelner] Frank Pikelner mailto:frank.pikelner&netcraftcommunications.com 2010-01-15 ++[Frank_Quick] Frank Quick mailto:fquick&qualcomm.com ++[Frank_Rottmann] Frank Rottmann mailto:Frank.Rottmann&web.de ++[Frank_Soetebeer] Frank Soetebeer mailto:frsoeteb&adobe.com 2003-01 ++[Frank_Szczerba] Frank Szczerba mailto:frank&appmobi.com ++[Frank_Waarsenburg] Frank Waarsenburg mailto:frank&eye-display.nl 2004-11 ++[Frank_Yeh] Frank Yeh mailto:fyeh&us.ibm.com ++[Frank_Zerangue] Frank Zerangue mailto:fzerang&cisco.com ++[Frank_da_Cruz] Frank da Cruz mailto:fdc&watsun.cc.columbia.edu ++[Frans_Lundberg] Frans Lundberg mailto:frans&linova.com 2004-11 ++[Frans_S_C_Witte] Frans S.C. Witte mailto:fscwitte&dicgroep.nl ++[Franz_Josef_Leuders] Franz-Josef Leuders mailto:development&tobit.com ++[Fraxion_Software] Fraxion Software mailto:info&fraxion.biz 2012-03-21 ++[Fred_Batty] Fred Batty mailto:fredb&sun.com 2007-12-03 ++[Fred_Cohen] Fred Cohen mailto:fc&all.net ++[Fred_Fierling] Fred Fierling mailto:fff&exegin.com 2006-02 ++[Fred_Klassen] Fred Klassen mailto:fklassen&jaalam.com 2002-02 ++[Fred_McLain] Fred McLain mailto:fmclain&appworx.com ++[Fred_Messinger] Fred Messinger mailto:fredm&cisco.com ++[Fred_Surr] Fred Surr mailto:quest_iana&oz.quest.com ++[Fred_Yao] Fred Yao mailto:Fred_Yao&ddigate2.desktopdata.com ++[Freddy_A_Ayuso_Hens] Freddy A. Ayuso-Henson mailto:fayusohenson&hillr.com 2008-05-22 ++[Frederic_Hemmer] Frederic Hemmer mailto:Frederic.Hemmer&cern.ch ++[Frederic_Weymann] Frederic Weymann mailto:contact&fizzban.net ++[Frederick_Parent] Frederick Parent mailto:fparent&elfiq.com 2005-11 ++[Fredrik_Haglund] Fredrik Haglund mailto:fredik.haglund&boldsoft.com ++[Freeverse_Software] Freeverse Software mailto:info&freeverse.com ++[Friedman_Wagner_Dobl] Friedman Wagner-Dobler mailto:Friedman.Wagner-Dobler&gdc4s.com 2005-09 ++[Frode_Randers] Frode Randers mailto:Frode.Randers&tietoenator.com 2006-01 ++[GPP_Specifications] John M Meredith 3GPP Specifications mailto:john.meredith&etsi.org 2009-06-11 ++ Manager ++[G_E_Ozz_Nixon_Jr] G.E. Ozz Nixon Jr. mailto:ozznixon&gmail.com 2009-01-13 ++[G_Runfeldt] G SQRT\\partialran mailto:goran&netadmin.se 2007-07-10 ++ Runfeldt ++[Gabe_Frost] Gabe Frost mailto:gfrostµsoft.com 2005-08 ++[Gabi_Kalmar] Gabi Kalmar mailto:kalga01&cai.com ++[Gabriel_Kalmar] Gabriel Kalmar mailto:kalga01&ca.com 2008-03-06 ++[Gabriel_Levy] Gabriel Levy mailto:glevy&riverbed.com 2008-08-29 ++[Gal_Cucuy] Gal Cucuy mailto:galc&cyber-ark.com 2002-03 ++[Gang_Gong_Moy] Gang Gong Moy ++[Gangsta_Ltd] Gangsta Ltd. mailto:jc&gangstamedia.com 2011-10-13 ++[Gareth_Nelson] Gareth Nelson mailto:gareth&garethnelson.com 2007-06 ++[Gareth_Nelson_2] Gareth Nelson mailto:gareth&litesim.com 2008-08-22 ++[Garret_Tollkuhn] Garret Tollkuhn mailto:garret&multiviewgroup.com ++[Garrett_Herschleb] Garrett Herschleb mailto:garrett&netrix.com ++[Garrett_Padera] Garrett Padera mailto:garrett&garrettsites.net 2008-02-01 ++[Garry_Moore] Garry Moore mailto:garry.moore&cgi.com 2003-10 ++[Garth_Mayville] Garth Mayville mailto:mayville&maplesoft.on.ca ++[Gary_ANDREWS] Gary ANDREWS mailto:gan&orsyp.com 2008-01-07 ++[Gary_A_James] Gary A. James mailto:gary.james&criticallink.com ++[Gary_Aston] Gary Aston mailto:Gary.Aston&datadrivenlogistics.com 2009-03-10 ++[Gary_Bartlett] Gary Bartlett mailto:garyb&echelon.com ++[Gary_Barton] Gary Barton mailto:gary.barton&citrix.com 2011-02-24 ++[Gary_Giebler] Gary Giebler mailto:gary&giebler.com ++[Gary_Giebler_2] Gary Giebler mailto:gary&giebler.com 2011-10-18 ++[Gary_Glover] Gary Glover mailto:gglover&novell.com ++[Gary_Hampton] Gary Hampton mailto:GH&2hti.com 2008-02-27 ++[Gary_Howland] Gary Howland mailto:gary&systemics.com ++[Gary_Lewis] Gary Lewis mailto:GaryL&hq.mylex.com ++[Gary_M_Allen] Gary M. Allen mailto:gallen&symantec.com ++[Gary_Malkin] Gary Malkin mailto:gmalkin&xylogics.com ++[Gary_Morton] Gary Morton mailto:mortong&pacdata.com ++[Gary_Myers] Gary Myers mailto:gmyers&objectvideo.com ++[Gary_S_Malkin] Gary S. Malkin mailto:GMALKIN&xylogics.com ++[Gary_Sands] Gary Sands mailto:gsands&tycoint.com ++[Gary_T_Ciampa] Gary T. Ciampa mailto:Gary.Ciampa&sas.com 2003-04 ++[Gary_Weichinger] Gary Weichinger mailto:gary.weichinger&netiq.com ++[Gary_Whelan] Gary Whelan mailto:gwhelan&sybonic.com 2005-08 ++[Gaspard_Bucher] Gaspard Bucher mailto:gaspard&teti.ch ++[Gavin_Hutchinson] Gavin Hutchinson mailto:gavinh&visionlogistics.com ++[Gavin_Hutchinson_2] Gavin Hutchinson mailto:gavinh&tesl.com ++[Gene_McCulley] Gene McCulley mailto:mcculley&cuspy.com 2002-02 ++[Gene_Tyacke] Gene Tyacke mailto:gene&apple.com ++[Geoff_Back] Geoff Back mailto:geoff&autocue.co.uk 2002-03 ++[Geoff_Back_2] Geoff Back mailto:geoff&demonlair.co.uk 2010-02-01 ++[Geoff_Back_3] Geoff Back mailto:geoff&demonlair.co.uk ++[Geoff_Back_4] Geoff Back mailto:geoff.back&autocue.co.uk ++[Geoff_Collyer] Geoff Collyer mailto:geoff&research.bell-labs.com ++[Geoff_Goodfellow] Geoff Goodfellow mailto:Geoff&fernwood.mpk.ca.us ++[Geoff_Higgins] Geoff Higgins mailto:geoff.higgins&sun.com 2006-03 ++[Geoff_Meacock] Geoff Meacock mailto:gbibmswl&ibmmail.com ++[Geoff_Mendal] Geoff Mendal mailto:mendal&talarian.com ++[Geoffrey_Beer] Geoffrey Beer Raymarine UK Limited mailto:Geoff.Beer&raymarine.com 2012-05-24 ++[Geoffrey_Wossum] Geoffrey Wossum mailto:geoffrey&pager.net 2003-02 ++[Geoffry_Meek] Geoffry Meek mailto:geoff&meek.com ++[George_Balesta] George Balesta mailto:George.Baletsa&tfn.com ++[George_Dzieciol] George Dzieciol mailto:gdzieciol&symantec.com 2002-07 ++[George_Flanagin] George Flanagin mailto:george&digitalgaslight.com 2010-03-02 ++[George_Gianelos] George Gianelos mailto:Georgegi&attachmate.com ++[George_Gianelos_2] George Gianelos mailto:GeorgeGi&attachmate.com 2003-03 ++[George_Hartz] George Hartz mailto:george.hartz&sentillion.com ++[George_Hwa] George Hwa mailto:ghwa&luminescent.com 2007-03 ++[George_Kajos] George Kajos mailto:gkajos&mail1.videoserver.com ++[George_Moromisato] George Moromisato mailto:gpm&neurohack.com 2004-11 ++[George_Nachman] George Nachman ++[George_Pajari] George Pajari mailto:George.Pajari&faximum.com ++[George_Rudy] George Rudy mailto:george&entsoft.com ++[George_Walter] George Walter mailto:george.walter&ascentialsoftware.com ++[Gerald_Aquila] Gerald Aquila mailto:gerald.aquila&gmail.com ++[Gerald_McBrearty] Gerald McBrearty ++[Gerald_Mesaric] Gerald Mesaric mailto:gmesaric&hyperwave.com ++[Gerald_R_Jensen] Gerald R. Jensen mailto:tech&autodatasys.com 2008-06-05 ++[Gerard_Cannie] Gerard Cannie mailto:jcannie&opticaltech.com ++[Gerard_Cerchio] Gerard Cerchio mailto:gjpc&circlesoft.com 2003-11 ++[Gerardo_Dilillo] Gerardo Dilillo mailto:MOMIANAµsoft.com 2006-08 ++[Gerardo_Pardo_Castel] Gerardo Pardo-Castellote mailto:gerardo.pardo&rti.com 2005-10 ++[Gerben_Wierda] Gerben Wierda mailto:Gerben_Wierda&rna.nl ++[Gerd_Beling] Gerd Beling mailto:GBELING&isi.edu ++[Gerg_Cole] Gerg Cole mailto:gcole&corp.borland.com ++[Gerhard_Wagner] Gerhard Wagner mailto:gw&nova-ratio.de 2009-03-10 ++[Gerry_Dubois] Gerry Dubois mailto:gdubois&carriustech.com 2005-08 ++[Gerry_Gorman] Gerry Gorman mailto:gerry.gorman&emclock.com 2010-12-06 ++[Gert_Thomasen] Gert Thomasen mailto:gert.thomasen&etsi.org 2009-12-07 ++[Ghanshyam_Patel] Ghanshyam Patel mailto:gpatel&natinc.com 2003-11 ++[Gijs_Middelkamp] Gijs Middelkamp mailto:astergate-fax&huisken-systems.nl 2010-02-03 ++[Gil_Greenbaum] Gil Greenbaum mailto:gcole&nisd.cam.unisys.com ++[Gil_Hecht] Gil Hecht mailto:GilH&aks.com ++[Gil_Shafriri] Gil Shafriri mailto:shafriri&ilccm1.iil.intel.com ++[Gilbert_Moineau] Gilbert Moineau mailto:gilbert.moineau&colubris.com 2002-05 ++[Gilbert_Yeung] Gilbert Yeung mailto:gyeung&nvidia.com 2002-04 ++[Gilberto_Arnaiz] Gilberto Arnaiz mailto:garnaiz&siebel.com ++[Gilles_Bourquard] Gilles Bourquard mailto:gbo&wag.ch ++[Gilles_Gameiro] Gilles Gameiro mailto:ggameiro&birdland.com ++[Girish_Bhat] Girish Bhat mailto:gbhat&cranite.com 2006-04 ++[Girish_Gopalakrishna] Girish Gopalakrishnan mailto:girish&shankar-software.org 2010-04-20 ++[Gita_Murthy] Gita Murthy mailto:gita&cup.hp.com ++[Gjermund_Wallenius] Gjermund Wallenius mailto:gwallenius&ndlocis.mil.no 2009-09-30 ++[Glen_Myers] Glen Myers mailto:glen.myers&ipfabrics.com 2007-05 ++[Glen_Pearson] Glen Pearson mailto:GlenP&multigen.com ++[Glen_Sansoucie] Glen Sansoucie mailto:gsansoucie&loftware.com ++[Glen_Sansoucie_2] Glen Sansoucie mailto:glen&llmwin.com ++[Glenn_Allen] Glenn Allen mailto:gallen&goorooinc.com 2009-08-05 ++[Glenn_Anderson] Glenn Anderson mailto:glenn&qualcomm.co.nz ++[Glenn_Davis] Glenn Davis mailto:support&unidata.ucar.edu ++[Glenn_Levitt] Glenn Levitt mailto:streetd1&ix.netcom.com ++[Glenn_Matthews] Glenn Matthews mailto:glenn.matthews&cisco.com 2011-05-23 ++[Glenn_Olander] Glenn Olander mailto:gjo&msi.com ++[Glenn_Olander_2] Glenn Olander mailto:glenn&greenoak.com ++[Glenn_Peterson] Glenn Peterson mailto:glennpµsoft.com ++[Glenn_Reid] Glenn Reid mailto:port-reg&fiveacross.com 2004-11 ++[Glenn_Russell] Glenn Russell mailto:grussell&cablelabs.com ++[Gobby_0x539] 0x539 dev group http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi ++[Gopikrishna_Sandra] Gopikrishna Sandra mailto:v-gosandµsoft.com 2005-02 ++[Goran_Runfeldt] Goeran Runfeldt mailto:goran&netadmin.se 2006-12 ++[Gord_Peters] Gord Peters Dialectro Software mailto:g&dialectro.com 2011-10-20 ++[Gord_Tomlin] Gord Tomlin mailto:gord.tomlin&actionsoftware.com 2010-01-21 ++[Gordan_Vosicki] Gordan Vosicki mailto:admin&icsa.ch 2009-09-23 ++[Gordon_C_Galligher] Gordon C. Galligher mailto:gorpong&ping.chi.il.us ++[Gordon_Mangione] Gordon Mangione mailto:gordmµsoft.com ++[Gordon_Mohr] Gordon Mohr mailto:gojomo&usa.net ++[Gordon_Mohr_2] Gordon Mohr mailto:gmohr&cmgisolutions.com ++[Gordon_Waddell] Gordon Waddell mailto:gordon.waddell&nuance.com 2011-03-21 ++[Graeme_Perrow] Graeme Perrow mailto:gperrow&ianywhere.com 2005-08 ++[Graham_Bloice] Graham Bloice mailto:graham.bloice&trihedral.com 2009-09-17 ++[Graham_Jones] Graham Jones mailto:gjones&nab.org 2004-11 ++[Graham_Klyne] Graham Klyne mailto:GK&acm.org ++[Graham_Parsons] Graham Parsons mailto:graham.parsons&reflective.com 2005-08 ++[Graham_Wooden] Graham Wooden mailto:graham&g-rock.net ++[Grant_Gilchrist] Grant Gilchrist mailto:grant&enernex.com 2010-10-18 ++[Grant_Kirby] Grant Kirby mailto:grant_kirby&ccm.al.intel.com ++[Green_Hills_Software] Green Hills Software mailto:iana-contact&ghs.com 2012-02-07 ++[Greg_Bailey] Greg Bailey mailto:gbailey&lxpro.com 2003-04 ++[Greg_Banks] Greg Banks mailto:gnb&sgi.com 2004-11 ++[Greg_Bodine] Greg Bodine mailto:gregory.bodine&ca.com 2002-02 ++[Greg_Broiles] Greg Broiles mailto:greg&sac.net ++[Greg_Cottman] Greg Cottman mailto:greg.cottman&quest.com 2008-10-23 ++[Greg_Cottman_2] Greg Cottman mailto:Greg.Cottman&quest.com 2010-10-18 ++[Greg_Ercolano] Greg Ercolano mailto:erco&netcom.com ++[Greg_Ercolano_2] Greg Ercolano mailto:erco&cinegrfx.com ++[Greg_Foutz] Greg Foutz mailto:gregf&adminovation.com 2006-03 ++[Greg_Goodson] Greg Goodson mailto:ggoodson&group1software.co.uk ++[Greg_Hudson] Greg Hudson mailto:zephyr-bugs&mit.edu ++[Greg_Hudson_2] Greg Hudson mailto:ghudson&mit.edu 2003-01 ++[Greg_Johnson] Greg Johnson mailto:greg.johnson&ieee.org ++[Greg_McLaughlin] Greg McLaughlin mailto:ggregm&moremobilesoftware.com ++[Greg_Pflaum] Greg Pflaum mailto:iris.com!Greg_Pflaum&uunet.uu.net 1992-07 ++[Greg_Porter] Greg Porter mailto:gporter&powerschool.com ++[Greg_Pringle] Greg Pringle mailto:admin&corvedia.com ++[Greg_Robson_Garth] Greg Robson-Garth mailto:gregr&alphalink.com.au ++[Greg_Rose] Greg Rose mailto:Greg_Rose&sydney.sterling.com ++[Greg_Rose_2] Greg Rose mailto:ggr&qualcomm.com 2002-02 ++[Greg_Sidebottom] Greg Sidebottom mailto:gregside&home.com ++[Greg_Stine] Greg Stine mailto:greg.stine&siemens.com 2007-07-05 ++[Greg_Suppes] Greg Suppes mailto:greg.suppes&autodesk.com ++[Greg_Troxel] Greg Troxel mailto:gdt&ir.bbn.com ++[Gregg_Green] Gregg Green mailto:legal&vnyx.net 2004-11 ++[Gregg_Townsend] Gregg Townsend mailto:gmt&cs.arizona.edu 2003-11 ++[Gregg_Welker] Gregg Welker mailto:greggw&zmi.com ++[Gregor_Schmid] Gregor Schmid mailto:gs&qfs.de 2002-07 ++[Gregory_Dudek] Gregory Dudek mailto:dudek&y1d.com ++[Gregory_Hostettler] Gregory Hostettler mailto:ghostettler&caracal.ch 2004-11 ++[Gregory_Power] Gregory Power mailto:gpower&apple.com ++[Gregory_Richards] Gregory Richards mailto:Richards&codu.org 2002-04 ++[Growl_Project] The Growl Project mailto:support&growl.info 2012-02-07 ++[Guhan_Suriyanarayana] Guhan Suriyanarayanan mailto:guhansµsoft.com 2006-03 ++[Guido_Kiener] Guido Kiener mailto:Guido.Kiener&rohde-schwarz.com 2008-12-04 ++[Gur_Kimchi] Gur Kimchi mailto:gkimchiµsoft.com 2008-05-20 ++[Gur_Kimchi_2] Gur Kimchi mailto:gur.kimchi&vocaltec.com ++[Gus_McNaughton] Gus McNaughton mailto:gus&chevin.com ++[Gustavo_Rodriguez_Ri] Gustavo Rodriguez-Rivera mailto:grr&geodesic.com ++[Guus_Sliepen] Guus Sliepen mailto:guus&warande3094.warande.uu.nl ++[Guy_Cheng] Guy Cheng mailto:GCHE&kastenchase.com ++[Guy_Keren] Guy Keren mailto:Guy_Keren&mail.stil.scitex.com ++[Guy_Meyer] Guy Meyer mailto:rominar&mac.com ++[Gyozo_Kmethy] Gyozo Kmethy mailto:gyozo.kmethy&gnarus.hu 2006-11 ++[Hai_Ou_Yang] Hai Ou-Yang mailto:hai.ou-yang&sun.com 2003-04 ++[Haim_Gelfenbeyn] Haim Gelfenbeyn mailto:haim&hageltech.com ++[Hal_Henderson] Hal Henderson mailto:hhenders&novell.com ++[Hali_Lindbloom] Hali Lindbloom mailto:halil&docent.com ++[Hall_Research] Hall Research mailto:vishal&hallresearch.com 2011-11-29 ++[HaloteC_Instruments] HaloteC Instruments mailto:michel.stam&halotec.com 2012-02-07 ++ B.V. ++[Hani_Abdelazim] Hani Abdelazim mailto:hani&apple.com ++[Hannes_K] Hannes K SQRTSlber mailto:hannes.kaelber&x2e.de 2010-09-13 ++[Hans_Christoph_Stein] Hans-Christoph Steiner mailto:hans&eds.org ++[Hans_Peter_Heffels] Hans-Peter Heffels mailto:hostmaster&csb-system.com ++[Hans_Rohnert] Hans Rohnert mailto:hans.rohnert&siemens.com 2002-04 ++[Hans_Schoone] Hans Schoone mailto:Hans.Schoone&nl.ibm.com 2010-10-01 ++[Hans_U_Schmidt] Hans U Schmidt mailto:schmidth&de.ibm.com ++[Hans_Weibel] Hans Weibel mailto:hans.weibel&zhwin.ch 2004-10 ++[Hanz_Hager] Hanz Hager mailto:Hanz.Hager&comhem.se 2008-12-04 ++[Harald_Schlangmann] Harald Schlangmann mailto:schlangm&informatik.uni-muenchen.de ++[Harald_Striepe] Harald Striepe mailto:harald&quantumintech.com 2008-02-14 ++[Harald_Welte] Harald Welte mailto:laforge&gnumonks.org 2009-01-16 ++[Haram_Lee] Haram Lee mailto:layne&indigo-security.com ++[Hardy_Doelfel] Hardy Doelfel mailto:hardy_doelfel&adaptec.com 2002-05 ++[Harinder_Bhasin] Harinder Bhasin mailto:Harinder.Bhasin&sun.com ++[Harish_Kuttan] Harish Kuttan mailto:harish.k&hp.com 2010-03-22 ++[Harold_Froehling] Harold Froehling mailto:hrf&cup.hp.com ++[Harris_Corporation] Harris, Corporation mailto:dsomerfi&harris.com 2011-08-05 ++[Harry_Courtice] Harry Courtice mailto:harry.courtice&elprotech.com 2008-04-14 ++[Harry_Goldschmitt] Harry Goldschmitt mailto:hgoldschmitt&hgac.com 2003-11 ++[Harry_Goldschmitt_2] Harry Goldschmitt mailto:harry&hgac.com 2007-06 ++[Harry_Lewis] Harry Lewis mailto:harryl&us.ibm.com 2003-05 ++[Harry_T_Vennik] Harry T. Vennik mailto:htvennik&zonnet.nl 2002-11 ++[Harry_ten_Berge] Harry ten Berge mailto:berge&hitt.nl ++[Harvey_S_Schultz] Harvey S. Schultz mailto:harvey&acm.org ++[Heath_Barber] Heath Barber Datacolor mailto:hbarber&datacolor.com 2011-10-14 ++[Heath_Raftery] Heath Raftery mailto:heath&hrsoftworks.net ++[Heikki_E] Heikki Ellil SQRTS mailto:heikki.ellila&western.fi 2009-06-18 ++[Heiko_Kretschmer] Heiko Kretschmer mailto:info&wurst-wasser.net ++[Heiko_Rupp] Heiko Rupp mailto:hwr&pilhuhn.de ++[Heiko_Schlichting] Heiko Schlichting mailto:heiko&fu-berlin.de ++[Heiner_Erne] Heiner Erne Hirschmann Automation mailto:heiner.erne&hirschmann.de 2008-06-06 ++ and Control GmbH ++[Heinz_Wrobel] Heinz Wrobel mailto:hwrobel&gmx.de ++[Helga_Wolin] Helga Wolin mailto:hwolin&us.ibm.com ++[Helge_Frank_Zimpel] Helge-Frank Zimpel mailto:helge.zimpel&baeurer.de 2006-01 ++[Helmut_Giritzer] Helmut Giritzer mailto:helmut.giritzer&epluse.at 2005-11 ++[Helmut_Giritzer_2] Helmut Giritzer mailto:helmut.giritzer&o.roteskreuz.at 2005-08 ++[Helmuth_Breitenfelln] Helmuth Breitenfellner mailto:hbreitenf&vnet.imb.com ++[Honwywell_Security_Group] Honwywell Security mailto:john.dziadosz&honeywell.com 2012-04-09 ++ Group ++[Hennie_van_der_Merwe] Hennie van der Merwe mailto:hvandermerwe&tellumat.com 2002-07 ++[Henning_Meier_Geinit] Henning Meier-Geinitz mailto:henning&meier-geinitz.de 2002-10 ++[Henning_Mersch] Henning Mersch mailto:h.mersch&plt.rwth-aachen.de 2010-12-07 ++[Henning_Schulzrinne] Henning Schulzrinne mailto:hgs&cs.columbia.edu ++[Henning_Smith] Henning Smith mailto:henning.smith&ca.com 2006-07 ++[Henri_Moelard] Henri Moelard mailto:moelard&lucent.com ++[Henric_Bergh] Henric Bergh mailto:henric&bergh.nu 2007-01 ++[Henrik_Goldman] Henrik Goldman mailto:hg&x-formation.com 2006-10 ++[Henrik_Holst] Henrik Holst mailto:henrik.holst&ecovision.se ++[Henrik_Johnson] Henrik Johnson Quest Software mailto:henrik.johnson&quest.com 2012-04-09 ++[Henrik_Woffinden] Henrik Woffinden mailto:hw&nitramlexa.com 2008-09-22 ++[Henry_Haverinen] Henry Haverinen mailto:henry.haverinen&nokia.com ++[Henry_Houh] Henry Houh mailto:hhouh&nbxcorp.com ++[Henry_Rawas] Henry Rawas mailto:henryrµsoft.com 2005-08 ++[Henry_Strickland] Henry Strickland mailto:strick&yak.net ++[Herb_Jensen] Herb Jensen mailto:HWJensen&nfsrv.avionics.itt.com ++[Herb_Sutter] Herb Sutter mailto:HerbS&cntc.com ++[Herbert_Falk] Herbert Falk mailto:herb&sisconet.com 2003-06 ++[Hesham_Soliman] Hesham Soliman mailto:H.Soliman&flarion.com 2005-11 ++[Hewlett_Packard] Hewlett Packard ++[Hideki_Hatta] Hideki Hatta mailto:ponum&canon-is.co.jp 2007-09-27 ++[Hideki_Kiriyama] Hideki Kiriyama mailto:kiriyama&cp10.es.xerox.com ++[Hideo_Wakabayashi] Hideo Wakabayashi mailto:hiwaka&alles.or.jp ++[Hindin_Joseph] Hindin Joseph mailto:hindin%25robcad@uunet.uu.net ++[Hing_Wing_To] Hing Wing To mailto:wing.to&mircromuse.com ++[Hing_Wing_To_2] Hing Wing To mailto:wing.toµmuse.com ++[Hirokazu_Fujisawa] Hirokazu Fujisawa mailto:fujisawa&pfu.fujitsu.com ++[Hiroki_Kawano] Hiroki Kawano mailto:kawano&saint.nm.fujitsu.co.jp ++[Hiromi_Ohara] Hiromi Ohara mailto:Hiromi.Ohara&fujixerox.co.jp 2008-06-18 ++[Hiromi_Taki] Hiromi Taki mailto:stg-togo&saint.nm.fujitsu.co.jp ++[Hiroyasu_Ogata] Hiroyasu Ogata mailto:Ogata.Hiroyasu&exc.epson.co.jp ++[Hiroyuki_Hashimoto] Hiroyuki Hashimoto mailto:easymp&exc.epson.co.jp 2002-10 ++[Hiroyuki_Kawabuchi] Hiroyuki Kawabuchi mailto:buchi&ael.fujitsu.co.jp ++[Hiroyuki_Takahashi] Hiroyuki Takahashi mailto:hiro.takahashi&eng.sun.com ++[Hitoshi_Ishida] Hitoshi Ishida mailto:ishida.hitoshi&exc.epson.co.jp ++[HLW_Software_Development_GmbH] HLW Software mailto:office&hlw-software.com 2011-10-11 ++ Development GmbH ++[Hoa_Nguyen] Hoa Nguyen mailto:hoan&cup.hp.com ++[Hokey_Stenn] Hokey Stenn mailto:hokey&plus5.com ++[Holger_Heinrich] Holger Heinrich mailto:holger2222&googlemail.com 2012-02-01 ++[Holger_Kruse] Holger Kruse mailto:holger&rebol.net ++[Holger_Lochner] Holger Lochner mailto:holger.lochner&daimler.com 2011-04-06 ++[Holger_Reif] Holger Reif mailto:Holger.Reif&prakinf.tu-ilmenau.de ++[Holger_Sachs] Holger Sachs mailto:hlsa&de.festo.com 2011-05-27 ++[Hong_Jungkih] Hong, Jungkih mailto:jungkih.hong&samsung.com 2010-09-20 ++[Horizon_Digital_Ente] Horizon Digital mailto:info&hde.co.jp ++ Enterprise Inc. ++[Howard_Amos] Howard Amos mailto:amos&ccww.co.uk 2006-04 ++[Howard_Cole] Howard Cole mailto:hcole&tumbleweed.nrcabq.com ++[Howard_Gordon] Howard Gordon mailto:hgordon&system.xingtech.com ++[Howard_Hart] Howard Hart mailto:hch&hybrid.com ++[Howard_Yin] Howard Yin mailto:howard.yin&ericsson.com ++[Huang_Jingnan] Huang Jingnan mailto:huangjnb&lenovo.com 2003-10 ++[Huang_Neng-geng] Huang Neng-geng mailto:huangng&ngweb.org 2011-08-09 ++ mailto:nghuang&ieee.org ++[Huang_Yu] Huang Yu mailto:llw&ftsafe.com ++[Hugh_Thomas] Hugh Thomas mailto:thomas&oils.enet.dec.com ++[Hugo_Charbonneau] Hugo Charbonneau ++[Hugo_Parra] Hugo Parra mailto:hparra&novell.com ++[Humberto_Sanchez] Humberto Sanchez mailto:Humberto_Sanchez&hp.com ++[Hunter_Goatley] Hunter Goatley mailto:goathunter&goatley.com ++[Hussein_F_Salama] Hussein F. Salama mailto:hsalama&cisco.com ++[Huw_Thomas] Huw Thomas mailto:huw.thomas&bt.com ++[HyeongBae_Yu] HyeongBae Yu mailto:hyeongbae.yu&samsung.com 2008-07-31 ++[HYPACK_Inc] HYPACK Inc. mailto:mircea&hypack.com 2011-10-27 ++[Hywel_Morgan] Hywel Morgan mailto:hywelm&surfcontrol.com 2003-11 ++[IANA] IANA mailto:iana&iana.org ++[IEEE_1722_1] IEEE-1722.1 mailto:jeff.koftinoff&ieee.com 2011-11-01 ++[IESG] IESG mailto:iesg&ietf.org ++[IETF_Chair] IETF Chair IETF mailto:chair&ietf.org ++[IFSF_Secretary] IFSF Secretary mailto:secretary&ifsf.org 2002-05 ++[IGG_Software] IGG Software mailto:ian&iggsoftware.com ++[IRdg] IRdg, Inc. mailto:jtaylor&irdg.com ++[ISHII_AKIO] ISHII AKIO mailto:ishii.akio&jp.fujitsu.com 2006-01 ++[ITGroup] ITGroup mailto:itgroup&stillsecure.com 2008-06-30 ++ ITU TSB, Place des ++[ITU_TSB] Nations, CH-1211 mailto:tsbmail&itu.int 2006-06 ++ Geneva 20 ++[I_Hsing_Tsao] I-Hsing Tsao mailto:itsao&austin.ibm.com ++[Ian_A_Young] Ian A. Young mailto:iay&threel.co.uk ++[Ian_Anderson] Ian Anderson mailto:ian_anderson&phoenix.com ++[Ian_Bell] Ian Bell mailto:ianb&arca-technologies.com ++[Ian_Bradley] Ian Bradley mailto:ian.bradley&pocketprograms.com 2009-10-14 ++ mailto:development&pocketprograms.com ++[Ian_Cargill] Ian Cargill mailto:ian.cargill&e-dendrite.com 2005-08 ++[Ian_Chard] Ian Chard mailto:ian&tanagra.demon.co.uk ++[Ian_Daniels] Ian Daniels mailto:btexact.ports&bt.com ++[Ian_Gordon] Ian Gordon mailto:ian.s.gordon&btopenworld.com 2002-08 ++[Ian_Gordon_2] Ian Gordon mailto:ian&n-genltd.co.uk 2003-03 ++[Ian_Gordon_3] Ian Gordon mailto:iangµmuse.co.uk ++[Ian_Higginbottom] Ian Higginbottom mailto:sonardata&sonardata.com ++[Ian_Jackson] Ian Jackson mailto:iwj&cam-orl.co.uk ++[Ian_Lowe] Ian Lowe mailto:ian&xplproject.org.uk 2003-08 ++[Ian_Manning] Ian Manning mailto:imanning&dtsuk.com 2002-05 ++[Ian_Manning_2] Ian Manning mailto:ian&baycastle.co.uk 2009-12-16 ++[Ian_McDowall] Ian McDowall mailto:ian.mcdowall&symbian.com 2003-11 ++[Ian_Miller] Ian Miller mailto:IANA-reg&adder.com 2006-03 ++[Ian_Wilson] Ian Wilson mailto:hsrp-info&cisco.com 2004-11 ++[Ibtsam_Mahfouz] Ibtsam Mahfouz mailto:imahfouz&cisco.com ++[Ico_Doornekamp] Ico Doornekamp mailto:ico&saedra.nl ++[Ido_Ben_David] Ido Ben-David mailto:dgntcom&netvision.net.il ++[Ieuan_Friend] Ieuan Friend mailto:ieuan.friend&dip.co.uk 2006-03 ++[Igor_Kostic] Igor Kostic mailto:igorkoµsoft.com 2002-08 ++[Igor_Mozolevsky] Igor Mozolevsky mailto:igor&itaufait.com ++[Igor_Plotnikov] Igor Plotnikov mailto:igor&uroam.com ++[Igor_Zaoutine] Igor Zaoutine mailto:igor&global-tech.com ++[Ilan_Mahalal] Ilan Mahalal mailto:imahalal&axalto.com 2006-04 ++[Ilan_Shlosberg] Ilan Shlosberg mailto:ilan&mentasoftware.com ++[Ilan_Zisser] Ilan Zisser mailto:ilan&newgenpay.com ++[Illan_Raab] Illan Raab mailto:iraab&synoptics.com ++[Ilya_Melamed] Ilya Melamed mailto:ilya77&gmail.com 2006-06 ++[ims_Info] ims Info Management mailto:ope&ims-info.ch 2011-10-20 ++ Systems AG ++[In_sik_Choi] In-sik Choi mailto:iscard&virusdesk.com 2002-02 ++[Inderpreet_Singh] Inderpreet Singh mailto:isingh&chantrynetworks.com 2003-06 ++[Ines_Homem_de_Melo] Ines Homem de Melo mailto:sidinf&brfapesp.bitnet ++[Ing_Markus_Huemer] Ing. Markus Huemer mailto:markus.huemer&hsd.at ++[Ing_Tomas_Halabala] Ing. Tomas Halabala mailto:tomas.halabala®ulace.org 2010-10-06 ++[Ingersoll_Rand_Inc] Ingersoll Rand, Inc. mailto:john.taylor&irco.com 2011-09-28 ++[Ingo_Franzki] Ingo Franzki mailto:ifranzki&de.ibm.com ++[Insider_Software] Insider Software http://www.insidersoftware.com ++[Insist] Insist mailto:support&isticky.net ++[Intel] Intel mailto:joshua.boelter&intel.com 2011-10-18 ++[Ira_McDonald] Ira McDonald mailto:imcdonald&sharplabs.com 2005-12 ++[Isaack_Rasmussen] Isaack Rasmussen mailto:isaack&pictua.com ++[Israel_Beniaminy] Israel Beniaminy mailto:israel.beniaminy&clickservice.com ++[Israel_Shainert] Israel Shainert mailto:israels&209.88.177.2 ++[Itai_Greenberg] Itai Greenberg mailto:itaigµsoft.com 2004-11 ++[Itaru_Kimura] Itaru Kimura mailto:kimura&kel.fujitsu.co.jp ++[Ivan_Berardinelli] Ivan Berardinelli mailto:ivan&gestweb.com ++[Ivana_Cuozzo] Ivana Cuozzo mailto:Ivana.Cuozzo&tivoli.com ++[Ivo_Timmermans] Ivo Timmermans mailto:itimmermans&bigfoot.com ++[JF_Huard] JF Huard mailto:jfhuard&netuitive.com ++[J_A_Sever] J. A. (Tony) Sever mailto:J.A.Sever&bra0119.wins.icl.co.uk ++[J_C_Canessa] J. C. Canessa mailto:jccanessa&mmm.com ++[J_Gabriel_Foster] J. Gabriel Foster mailto:fop&gwha.com ++[J_H_Hermans] J.H. Hermans mailto:j.h.hermans&hiscom.nl ++[J_J_Ekstrom] J.J. Ekstrom ++[J_S_Greenfield] J. S. Greenfield mailto:greeny&raleigh.ibm.com ++[J_S_Greenfield_2] J.S. Greenfield mailto:greeny&us.ibm.com ++[Jack_Baker] Jack Baker mailto:Jack.Baker&l-3com.com 2006-02 ++[Jack_Haverty] Jack Haverty mailto:jhaverty&oracle.com ++[Jack_ONeil] Jack O'Neil ++[Jack_Waller_III] Jack Waller III mailto:jack&tomatosprings.com ++[Jack_Wilson] Jack Wilson mailto:JackW&travsoft.com ++[Jackie_Lau] Jackie Lau mailto:jackie.lau&compaq.com ++[Jackie_Wu] Jackie Wu mailto:jackiew&infoseek.com ++[Jaco_Botha] Jaco Botha mailto:jaco.botha&trispen.com 2004-11 ++[Jacob_Feisley] Jacob Feisley mailto:jacob&hydralabs.com 2009-01-21 ++[Jacob_Godwin_Jones] Jacob Godwin-Jones mailto:jacob&likethought.com ++[Jacob_Gsoedl] Jacob Gsoedl mailto:jgsoedl&pinnaclesys.com ++[Jacob_Ulmert] Jacob Ulmert mailto:Jacob.Ulmert&se.abb.com ++[Jae_Woo_Lee] Jae Woo Lee mailto:jae&cs.columbia.edu ++[Jaime_Antolin] Jaime Antolin mailto:jaime.antolin&ie.abb.com 2008-09-25 ++[Jakob_Kaivo] Jakob Kaivo mailto:jkaivo&nodomainname.net ++[Jakob_Oestergaard] Jakob Oestergaard mailto:joe&sysorb.com 2002-02 ++[Jakob_Spies] Jakob Spies mailto:Jakob.Spies&genius.de ++[Jakob_Steen_Hansen] Jakob Steen Hansen mailto:jsh&dk.damgaard.com ++[James_A_Brewster] James A. Brewster mailto:jimbrew&answersoft.com ++[James_Anson] James Anson mailto:janson&bigpond.com 2009-02-12 ++[James_Bottomley] James Bottomley mailto:James.Bottomley&steeleye.com 2006-02 ++[James_Brown] James Brown mailto:ender&admdev.com ++[James_Caza] James Caza mailto:jcaza&e-builder.net 2006-12 ++[James_Cox] James Cox mailto:jocox&view.com 2002-02 ++[James_Crosby] James Crosby softthere.com mailto:james&softthere.com 2011-10-17 ++[James_Dabbs] James Dabbs mailto:jdabbs&tga.com ++[James_Darnall] James Darnall mailto:james_r_darnall&sbcglobal.net ++[James_David_Fisher] James David Fisher mailto:jfisher1&avaya.com ++[James_E_Housley] James E. Housley mailto:jim&thehousleys.net ++[James_E_King_III] James E. King, III mailto:James_E_K&dell.com 2010-06-24 ++[James_Falkner] James Falkner mailto:james.falkner&sun.com ++[James_Figgins] James Figgins mailto:james.figgins&durodata.co.uk 2006-07 ++[James_Gettys] James Gettys mailto:jg&w3.org ++[James_Goddard] James Goddard mailto:jamesg&taglim.com 2005-08 ++[James_Greenfiel] James Greenfiel mailto:jim&pa.confluent.com ++[James_Irwin] James Irwin mailto:jimi&travsoft.com ++[James_J_Diaz] James J. Diaz mailto:JDiaz&emprisecorporation.com 2002-08 ++[James_Juhasz] James Juhasz mailto:james.juhasz&ni.com ++[James_Kennedy] James Kennedy mailto:james&tritium.com.au 2011-02-15 ++[James_King_III] James King III mailto:jking&ariessys.com ++[James_Kirkwood] James Kirkwood mailto:james.kirkwood&controltechniques.com 2005-06 ++[James_Kou] James Kou mailto:Jamesk&versatek.com ++[James_Kunz] James Kunz mailto:jkunz&earlhaig.com ++[James_Marsh] James Marsh mailto:James_T_Marsh&hotmail.com ++[James_McCartney] James McCartney mailto:jmccartney&apple.com ++[James_Mealey] James Mealey mailto:jymealey&yahoo.com 2002-10 ++[James_Moore] James Moore mailto:jam&wirerimmed.com ++[James_Nikolai] James Nikolai mailto:jamesnikolai&rpm-psi.com ++[James_Overby] James Overby ++[James_Paul_Duncan] James Paul Duncan mailto:pduncan&beaconcrm.com ++[James_Pinkerton] James Pinkerton mailto:jpinkµsoft.com 2003-11 ++[James_Powell] James Powell mailto:james&mailhost.unidata.com ++[James_Powell_2] James Powell mailto:james&enghp.unidata.comp ++[James_Rice] James Rice mailto:RICE&sumex-aim.stanford.edu ++[James_Tavares] James Tavares Log On America mailto:krontor&loa.com ++[James_W_Walker] James W. Walker mailto:jamesw&frameforge3d.com ++[James_Wilkinson] James Wilkinson mailto:jwilkinson&doubletake.com 2006-04 ++[James_Wilkinson2] James Wilkinson Vision Solutions, mailto:james.wilkinson&visionsolutions.com 2012-06-06 ++ Inc. ++[James_Yonan] James Yonan mailto:jim&yonan.net 2004-11 ++[Jamie_Halmick] Jamie Halmick mailto:jamie&tinkerbuilt.com ++[Jamie_Lokier] Jamie Lokier mailto:jamie&jlokier.co.uk 2006-05 ++[Jan_Dirven] Jan Dirven mailto:jan.dirven&agfa.com 2007-12-13 ++[Jan_Friedel] Jan Friedel mailto:Jan.Friedel&sun.com 2009-05-07 ++[Jan_Rutger_Voorhorst] Jan Rutger Voorhorst mailto:janrutger&roadware.nl 2006-10 ++[Jan_Vrsinsky] Jan Vrsinsky mailto:jan.vrsinsky&illusionsoftworks.com 2002-09 ++[Jane_Dashevsky] Jane Dashevsky mailto:jane.dashevsky&intel.com ++[Jane_Porter] Jane Porter mailto:janeporter&uk.ibm.com ++[Janna_Chang] Janna Chang mailto:janna&pmc.philips.com ++[Janos_Lerch] Janos Lerch mailto:lerch&softic.hu 2006-02 ++[Jarkko_Oikarinen] Jarkko Oikarinen mailto:jto&tolsun.oulu.fi ++[Jarrod_Sayers] Jarrod Sayers mailto:jarrod&downtools.com.au 2009-04-07 ++[Jason_Aiken] Jason Aiken mailto:jasona&corelcomputer.com ++[Jason_Aubain] Jason Aubain mailto:jaubain&kjt.com ++[Jason_Case] Jason Case mailto:jason.case&ni.com 2002-08 ++[Jason_Cater] Jason Cater mailto:jason&ncsmags.com ++[Jason_Dzubak] Jason Dzubak mailto:dzubak&byu.edu 2008-03-17 ++[Jason_Hamilton] Jason Hamilton mailto:JHamilton&griddatasecurity.com 2006-06 ++[Jason_Howard] Jason Howard mailto:jason&spectsoft.com 2006-01 ++[Jason_Hunter] Jason Hunter mailto:jthunter&invino.com ++[Jason_Ko] Jason Ko mailto:jason_ko&hp.com 2002-07 ++[Jason_Leupen] Jason Leupen mailto:Jleupen&aol.com ++[Jason_Lockett] Jason Lockett mailto:Jay.Lockett&quest.com 2008-12-16 ++[Jason_McManus] Jason McManus mailto:jasonm&neoinformatics.com ++[Jason_McManus_2] Jason McManus mailto:jasonm&sleepdep.net ++[Jason_Reskin] Jason Reskin mailto:iana&unistellar.com 2007-03 ++[Jason_Rohrer] Jason Rohrer mailto:rohrer&cse.ucsc.edu 2002-10 ++[Jason_Santos] Jason Santos mailto:jason.santos&megaslow.net 2002-04 ++[Jason_Schoon] Jason Schoon mailto:jason.schoon&intermec.com 2002-10 ++[Jason_Schoon_2] Jason Schoon mailto:jason.schoon&intermec.com ++[Jason_Spence] Jason Spence mailto:jspence&lightconsulting.com 2008-01-22 ++[Jason_Szabo] Jason Szabo mailto:jason.szabo&vexcel.com 2003-10 ++[Jason_Thorpe] Jason Thorpe mailto:thorpej&apple.com ++[Jason_Volk] Jason Volk mailto:jason&teknidude.com ++[Jason_van_Zyl] Jason van Zyl mailto:jvanzyl&zenplex.com 2002-03 ++[Jauvane_C_de_Olivei] Jauvane C. de Oliveira mailto:jauvane&acm.org ++[Javier_Jimenez] Javier Jimenez ++[Javier_Jiminez] Javier Jiminez mailto:javier_l_jimenez&dell.com ++[Javier_Nigro] Javier Nigro Arrow Bit SL mailto:support&arrowbit.com 2012-04-26 ++[Jay_Beavers] Jay Beavers mailto:Jay.Beaversµsoft.com 2006-02 ++[Jay_Cotton] Jay Cotton mailto:JAY&calc.vet.uga.edu ++[Jay_Eckles] Jay Eckles mailto:ecklesweb&yahoo.com 2002-02 ++[Jay_Farhat] Jay Farhat mailto:jfarhat&ipass.com ++[Jay_Slupesky] Jay Slupesky mailto:js&vina-tech.com ++[Jay_Weber] Jay Weber mailto:weber&vfi.com ++[Jay_Whitney] Jay Whitney mailto:jw&powercenter.com ++[Jayakumar_Ramalingam] Jayakumar Ramalingam mailto:jayakumar&novell.com ++[Jayasooriah] Jayasooriah mailto:jayasooriah&cast.com.au 2008-02-22 ++[Jean_A_Ames] Jean A. Ames mailto:engr-admin&flipside.com ++[Jean-Charles_Boude] Jean-Charles Boude Gangsta Ltd. mailto:jc&gangstamedia.com 2011-10-17 ++[Jean_Christophe_Desi] Jean-Christophe Desire mailto:Jean-Christophe_Desire&nms-europe.com ++[Jean_Francois_Rabass] Jean-Francois Rabasse mailto:jfr&idps.org 2003-07 ++[Jean_Louis_Barbut] Jean-Louis Barbut mailto:etebac5&gsit.fr ++[Jean_Marc_Frailong] Jean-Marc Frailong mailto:jmf&freegate.net ++[Jean_Michel_URSCH] Jean-Michel URSCH mailto:ursch&taec.enet.dec.com ++[Jean_Olivier_Lanctot] Jean-Olivier Lanctot-D. mailto:jolivierld&clichesw.com ++[Jean_Paul_Lemaire] Jean-Paul Lemaire mailto:jean-paul.lemaire&univ-paris-diderot.fr 2007-07-05 ++[Jean_Paul_Moreaux] Jean-Paul Moreaux mailto:jean-paul.moreaux&airbus.com ++[Jean_Pierre_Garcia] Jean-Pierre Garcia mailto:jp.garcia&netia.net 2003-04 ++[Jean_Pierre_Garcia_2] Jean-Pierre Garcia mailto:jp.garcia&netia.com 2009-10-28 ++[Jean_Serge_Gagnon] Jean-Serge Gagnon mailto:jean-serge.gagnon&newlix.com ++[Jean_Serge_Gagnon_2] Jean-Serge Gagnon mailto:jsg&newlix.com ++[Jeannie_Burleson] Jeannie Burleson mailto:jeannie&cambertx.com ++[Jeff_Albouze] Jeff Albouze mailto:foup&apple.com ++[Jeff_Burch] Jeff Burch mailto:jeff.burch&amx.com ++[Jeff_Burdette] Jeff Burdette mailto:support&digitalenvoy.net ++[Jeff_Busma] Jeff Busma mailto:busma&echogent.com ++[Jeff_Conrad] Jeff Conrad mailto:jeff_conrad&hp.com ++[Jeff_Dillabough] Jeff Dillabough Teradici mailto:jdillabough&teradici.com 2012-03-06 ++[Jeff_Douglass] Jeff Douglass mailto:ist&att.net 2002-09 ++[Jeff_Eaton] Jeff Eaton mailto:jeaton&intermec.com ++[Jeff_Garbers] Jeff Garbers mailto:FJG030&email.mot.com ++[Jeff_Garbers_2] Jeff Garbers mailto:jgarbers&netcom.com ++[Jeff_Grossman] Jeff Grossman mailto:jagrossm&andrew.cmu.edu ++[Jeff_Haynes] Jeff Haynes mailto:haynes&chistech.com ++[Jeff_Heisz] Jeff Heisz mailto:jeff.heisz&xkoto.com 2006-02 ++[Jeff_Hoffman] Jeff Hoffman mailto:jeffh&facsys.com ++[Jeff_Holmbeck] Jeff Holmbeck mailto:Jeff.Holmbeck&veritas.com ++[Jeff_Hughes] Jeff Hughes mailto:Jeff.Hughes&columbiasc.ncr.com ++[Jeff_Jones] Jeff Jones mailto:Jeff.Jones&routematch.com 2005-11 ++[Jeff_King] Jeff King mailto:jking&wave3software.com 2002-09 ++[Jeff_Looman] Jeff Looman mailto:jeff&looman.org ++[Jeff_M_Michaud] Jeff M.Michaud mailto:michaud&zk3.dec.com ++[Jeff_Mangasarian] Jeff Mangasarian mailto:jeffrey_mangasarian&nai.com ++[Jeff_Moffatt] Jeff Moffatt mailto:jeff&taurus.com ++[Jeff_Roberts] Jeff Roberts mailto:jrobertsµsoft.com 2005-11 ++[Jeff_Rosenthal] Jeff Rosenthal mailto:jrosenthal&quad-sys.com ++[Jeff_Skaistis] Jeff Skaistis mailto:jskaistis&connectship.com 2005-08 ++[Jeff_Stewart] Jeff Stewart mailto:jstewart&netscape.com ++[Jeff_Wood] Jeff Wood mailto:jw&cqg.com ++[Jeffery_Chiao] Jeffery Chiao tel:+714-768-401 ++[Jeffrey_C_Byrd] Jeffrey C. Byrd mailto:admin&vspacegroup.com ++[Jeffrey_Chiao] Jeffrey Chiao mailto:chiaoj&netsoft.com ++[Jeffrey_Daniel_Koftinoff] Jeffrey Daniel Koftinoff IEEE-1722.1 mailto:jeff.koftinoff&ieee.com 2011-11-01 ++[Jeffrey_Hill] Jeffrey Hill mailto:johill&lanl.gov 2002-08 ++[Jeffrey_J_Peters] Jeffrey J. Peters mailto:jpeters&tivo.com 2002-08 ++[Jeffrey_J_Walls] Jeffrey J. Walls mailto:jeff.walls&hp.com ++[Jeffrey_Millman] Jeffrey Millman mailto:jcm&dbstar.com ++[Jeffrey_Pilch] Jeffrey Pilch mailto:jpilch&us.ibm.com ++[Jeffrey_Sadeli] Jeffrey Sadeli mailto:jeffrey&sadeli.com ++[Jeffrey_Szczepanski] Jeffrey Szczepanski mailto:jrs&inscitek.com 2005-02 ++[Jeffrey_Zinkerman] Jeffrey Zinkerman mailto:jeff&zinknet.com ++[Jeffry_Dwight] Jeffry Dwight mailto:jeffryd&greyware.com ++[Jem_Treadwell] Jem Treadwell mailto:Jem.Treadwell&compaq.com ++[Jenish_Amin] Jenish Amin Motorola Solutions, mailto:jenish&motorolasolutions.com 2012-03-14 ++ Inc. ++[Jennifer_Grace] Jennifer Grace mailto:Jennifer_Grace&3com.com ++[Jens_Alfke] Jens Alfke mailto:jens&apple.com ++[Jens_Edlund] Jens Edlund mailto:edlund&speech.kth.se 2005-08 ++[Jens_Kilian] Jens Kilian mailto:jensk&hpbeo82.bbn.hp.com ++[Jens_Klose] Jens Klose mailto:jklose&intercope.com ++[Jens_Nilsson] Jens Nilsson mailto:jens&rockstorm.se ++[Jered_Floyd] Jered Floyd mailto:jered&permabit.com 2004-06 ++[Jeremy_Elson] Jeremy Elson mailto:jelson&isi.edu ++[Jeremy_Freeman] Jeremy Freeman mailto:jeremy&rxnetworks.ca 2008-02-14 ++[Jeremy_Gilbert] Jeremy Gilbert mailto:J.Gilbert&ma30.bull.com ++[Jeremy_Gilliat] Jeremy Gilliat mailto:jeremy.gilliat&geac.com ++[Jeremy_Maiden] Jeremy Maiden mailto:jeremy&komarr.demon.co.uk ++[Jeremy_McClintock] Jeremy McClintock mailto:jeremy&tridsys.com 2005-08 ++[Jeremy_Siegel] Jeremy Siegel mailto:jzs&nsd.3com.com ++[Jeroen_Massar] Jeroen Massar mailto:jeroen&unfix.org 2005-08 ++[Jeroen_Massar_2] Jeroen Massar mailto:jma&zurich.ibm.com 2008-08-21 ++[Jeroen_Massar_3] Jeroen Massar mailto:jeroen&unfix.org ++[Jerome_AERTS] Jerome AERTS mailto:info&pcsoft.fr 2010-11-30 ++[Jerome_Albin] Jerome Albin mailto:albin&taec.enet.dec.com ++[Jerome_Dusautois] Jerome Dusautois mailto:jdusautois&scrypto.fr 2002-03 ++[Jerome_FOLLUT] Jerome FOLLUT COPALP mailto:jf&copalp.com 2012-03-01 ++[Jerome_Forissier] Jerome Forissier mailto:Jerome.Forissier&hp.com 2005-12 ++[Jerome_Grimbert] Jerome Grimbert mailto:jerome.grimbert&atosorigin.com ++[Jerome_Laheurte] Jerome Laheurte mailto:fraca7&users.sourceforge.net ++[Jerome_Seydoux] Jerome Seydoux mailto:jerome&ctmdev.com ++[Jerrilynn_Okamura] Jerrilynn Okamura ++[Jerry_Whitaker] Jerry Whitaker mailto:jwhitaker&atsc.org 2008-10-27 ++[Jesse_McKay] Jesse McKay mailto:jesse&spandata.com ++[Jesse_Ursery] Jesse Ursery mailto:jesse.ursery&ametek.com 2010-11-22 ++[Jesse_W_Towner] Jesse W. Towner mailto:jwtowner&dsmedialabs.com ++[Jessica_Yan] Jessica Yan mailto:jessica.yan2&t-mobile.com 2008-02-19 ++[Jesus_David_Rodrigue] Jesus David Rodriguez mailto:jesusdavid&magaya.com 2003-02 ++[Jesus_De_Meyer] Jesus De Meyer mailto:jesus&edot-studios.com ++[Jesus_Ortiz] Jesus Ortiz mailto:jesus_ortiz&emotion.com ++[Jesus_Ortiz_2] Jesus Ortiz mailto:Jesus_A._Ortiz¬es.emotion.com ++[Jeurgen_Broesamle] Jeurgen Broesamle mailto:juergb&bbn.hp.com ++[JG_Heithcock] JG Heithcock Retrospect, Inc. mailto:JG.Heithcock&retrospect.com 2012-02-02 ++[Jian_Fan] Jian Fan mailto:fjian&dmfsys.com 2002-02 ++[Jilles_Oldenbeuving] Jilles Oldenbeuving mailto:ojilles&hotmail.com 2002-06 ++[Jim_Baldridge] Jim Baldridge mailto:jimb&rpower.com ++[Jim_Battin] Jim Battin mailto:battin&tro.com ++[Jim_Binkley] Jim Binkley mailto:jrb&cs.pdx.edu 2002-06 ++[Jim_Bound] Jim Bound mailto:bound&zk3.dec.com ++[Jim_Cleppe] Jim Cleppe mailto:clep13&hotmail.com ++[Jim_Davis] Jim Davis mailto:jim.davis&wbemsolutions.com 2007-06 ++[Jim_DeLisle] Jim DeLisle mailto:jdelisle&swellsoftware.com 2002-08 ++[Jim_Dillon] Jim Dillon mailto:jed&apri.com ++[Jim_Dixon] Jim Dixon mailto:jim&lambda.com ++[Jim_Flaherty] Jim Flaherty mailto:jim.flaherty&seagatesoftware.com ++[Jim_Flaherty_2] Jim Flaherty mailto:jim_e_flaherty¬es.seagate.com ++[Jim_Gettys] Jim Gettys mailto:jg&crl.dec.com ++[Jim_Harlan] Jim Harlan mailto:jimh&infowest.com ++[Jim_Herman] Jim Herman mailto:jherman&homelogic.com 2005-08 ++[Jim_Hill] Jim Hill mailto:jhill&symantec.com ++[Jim_Humphreys] Jim Humphreys mailto:jhumphre&ciena.com 2008-01-29 ++[Jim_Irwin] Jim Irwin mailto:jirwin&n2h2.com 2002-02 ++[Jim_Jennings] Jim Jennings tel:+1-708-538-7241 ++[Jim_Johnston] Jim Johnston mailto:jjohnston&databeam.com ++[Jim_Kanzler] Jim Kanzler mailto:jim.kanzler&meta5.com ++[Jim_Kateley] Jim Kateley mailto:asr-dev&group.apple.com 2006-01 ++[Jim_Kingdon] Jim Kingdon mailto:kingdon&harvey.cyclic.com ++[Jim_Lyle] Jim Lyle mailto:jim.lyle&siliconimage.com 2005-11 ++[Jim_Lyle_2] Jim Lyle mailto:jim.lyle&siliconimage.com ++[Jim_Lyon] Jim Lyon mailto:JimLyonµsoft.com 2005-11 ++[Jim_McDonald] Jim McDonald mailto:Jim.McDonald&sysdm.com 2003-04 ++[Jim_McDonald_2] Jim McDonald mailto:jim.mcdonald&sysdm.com 2003-11 ++[Jim_Mertz] Jim Mertz mailto:JMertz+RV09&rvdc.unisys.com ++[Jim_Musgrave] Jim Musgrave mailto:jimm&tarantella.com 2002-08 ++[Jim_Perreault] Jim Perreault mailto:jim.perreault&emc.com 2010-06-04 ++[Jim_Pettinato] Jim Pettinato mailto:jim_pettinato&fmcti.com 2007-04 ++[Jim_Philippou] Jim Philippou mailto:jphilippou&newoak.com ++[Jim_Robanske] Jim Robanske mailto:jimr&cray.com 2006-05 ++[Jim_Rogers] Jim Rogers mailto:trane!jimbo&pacbell.com ++[Jim_Sermersheim] Jim Sermersheim mailto:jims&fusionio.com 2010-01-15 ++[Jim_Stabile] Jim Stabile mailto:jstabile&talarian.com ++[Jim_Susoy] Jim Susoy mailto:jim.susoy&p6r.com 2010-01-21 ++[Jim_Taylor] Jim Taylor mailto:taylor&heart.epps.kodak.com ++[Jim_Teague] Jim Teague mailto:teague&zso.dec.com ++[Jim_Thompson] Jim Thompson mailto:jim.thompson&powerware.com ++[Jim_Toga] Jim Toga mailto:jtoga&ideal.jf.intel.com ++[Jim_Toga_2] Jim Toga mailto:jtoga&ibeam.jf.intel.com ++[Jim_Trek] Jim Trek mailto:jtrek&rochester.rr.com ++[Jim_Trocki] Jim Trocki mailto:trockij&transmeta.com ++[Jim_Turner] Jim Turner mailto:Jim.Turner&asg.com ++[Jim_Vlcek] Jim Vlcek mailto:jvlcek&veeco.com ++[Jim_Wallace] Jim Wallace mailto:jim&cs.dal.ca ++[Jim_White] Jim White mailto:Jim_White&spiderisland.com ++[Jim_Youll] Jim Youll mailto:jim&media.mit.edu ++[Jimmy_Olsen] Jimmy Olsen mailto:jo&redpill-linpro.com 2010-12-24 ++[Jimmy_Talbot] Jimmy Talbot mailto:jtalbot&vizible.com ++[Jindra_Ryvola] Jindra Ryvola mailto:jryvola&ledalite.com ++[Joachim_Kluemper] Joachim Kluemper mailto:ports&raikosoft.com 2008-03-19 ++[Joakim_Johansson] Joakim Johansson mailto:joakim.johansson&tbricks.com ++[Joan_Linck] Joan Linck mailto:jlinck&lanovation.com ++[Jochen_Hansmeyer] Jochen Hansmeyer mailto:cjh&krypton.de ++[Joe_Devlin] Joe Devlin mailto:Joe.Devlin&rocketsoftware.com 2002-03 ++[Joe_Elliott] Joe Elliott mailto:joe&inetd.com 2002-06 ++[Joe_Graham] Joe Graham mailto:joe&edaconsulting.com ++[Joe_Groff] Joe Groff mailto:arcata&gmail.com ++[Joe_Haver] Joe Haver mailto:joe.haver&jdsu.com 2010-05-28 ++[Joe_McCollough] Joe McCollough mailto:joe&cadkey.com ++[Joe_Mueller] Joe Mueller mailto:joe_mueller&agilent.com 2010-01-11 ++[Joe_Pato] Joe Pato mailto:pato&apollo.hp.com ++[Joe_Purcell] Joe Purcell mailto:jpurcell&ensuretech.com 2003-01 ++[Joe_Senner] Joe Senner mailto:jsenner&buildforge.com 2005-08 ++[Joe_Senner_2] Joe Senner mailto:support&buildforge.com ++[Joe_Touch] Joe Touch mailto:touch&isi.edu ++[Joe_Wesley] Joe Wesley mailto:joe.wesley&east.sun.com ++[Joel_Dolisy] Joel Dolisy mailto:joel.dolisy&solarwinds.com 2008-09-10 ++[Joel_E_Steiger] Joel E. Steiger mailto:jsteiger&eic-us.com 2004-02 ++[Joel_Karafin] Joel Karafin mailto:jkarafin&infotrieve.com ++[Joel_Palsson] Joel Palsson HMS Industrial mailto:ianacontact&hms.se 2002-02 ++ Networks AB ++[Joerg_Heuer] Joerg Heuer mailto:Joerg.Heuer&siemens.com 2006-02 ++[Joerg_Niehoff] Joerg Niehoff mailto:joerg.niehoff&alcatel-ke.de ++[Joerg_Paulus] Joerg Paulus mailto:tech&nicetec.de ++[Joerg_Schneider] Joerg Schneider mailto:joerg.s.schneider&daimler.com 2011-01-26 ++[Johan_Deleu] Johan Deleu mailto:johan.deleu&alcatel.be 2002-02 ++[Johan_Eriksson] Johan Eriksson mailto:johan&marimba.com 2002-04 ++[Johan_Kool] Johan Kool mailto:johan&koolistov.net ++[Johan_Mjones] Johan Mjones mailto:johan&nollbit.com ++[Johann_Arnold] Johann Arnold mailto:johann.arnold&siemens.com 2004-10 ++[Johann_Deutinger] Johann Deutinger mailto:deutinger&ferrari-electronic.de ++[Johannes_Skov_Frands] Johannes Skov Frandsen mailto:joe&42tools.com 2008-02-28 ++[John_Aquilino] John Aquilino mailto:john.aquilino&maryville.com ++[John_Barnes] John Barnes mailto:jbarnes&crl.com ++[John_Birrell] John Birrell mailto:birjo99&cai.com ++[John_Border] John Border mailto:border&hns.com 2003-01 ++[John_Britton] John Britton mailto:johnb&peakaudio.com ++[John_C_Horton] John C. Horton mailto:jch&unirsvl.rsvl.unisys.com ++[John_C_Klensin] John C. Klensin mailto:klensin&jck.com 2004-07 ++[John_Calcote] John Calcote mailto:jcalcote&users.sourceforge.net 2007-11-06 ++[John_Calcote_2] John Calcote mailto:jcalcote&novell.com 2006-10 ++[John_Catherino] John Catherino mailto:cajo&dev.java.net 2005-08 ++[John_Chiong] John Chiong mailto:jchiong&a10networks.com 2007-07-02 ++[John_Clifford] John Clifford mailto:John.Clifford&veritas.com ++[John_Coll] John Coll mailto:john&csoft.co.uk ++[John_Croft] John Croft mailto:john.croft&calista.demon.co.uk ++[John_Daniel_Bonamico] John Daniel Bonamico mailto:jbonamico&symantec.com ++[John_Dziadosz] John Dziadosz Honwywell Security mailto:john.dziadosz&honeywell.com 2012-04-09 ++ Group ++[John_E_Dickey] John E. Dickey mailto:jdickey&talarinetworks.com 2007-09-27 ++[John_Fake] John Fake mailto:fake&us.ibm.com ++[John_Fayos] John Fayos mailto:john.fayos&criticallink.com 2002-03 ++[John_Feiler] John Feiler mailto:relief!jjfeiler&uu2.psi.com ++[John_Flowers] John Flowers mailto:jf&gigamediaaccess.com ++[John_Fox] John Fox ++[John_Graham_Cumming] John Graham-Cumming CloudFlare, Inc. mailto:jgc&cloudflare.com 2012-03-09 ++[John_Hadjioannou] John Hadjioannou mailto:john&minster.co.uk ++[John_Harvey] John Harvey mailto:johnbob&austin.ibm.com ++[John_Hasselkus] John Hasselkus mailto:Jhasselkus&visualnetworks.com ++[John_Havard] John Havard mailto:jh&hxe.us 2003-11 ++[John_Hinsdale] John Hinsdale mailto:hin&alma.com ++[John_Hogg] John Hogg mailto:it&discoverysoftware.com ++[John_Ioannidis] John Ioannidis mailto:ji&close.cs.columbia.ed ++[John_Jackson] John Jackson mailto:jrj&gandalf.cc.purdue.edu ++[John_Jobe] John Jobe mailto:jjobe&cylink.com ++[John_Kane] John Kane mailto:johnkanµsoft.com ++[John_Keaveney] John Keaveney mailto:johnkeaveney&targusinfo.com ++[John_Kelly] John Kelly mailto:johnk&bellhow.com ++[John_Kozlowski] John Kozlowski ShofarNexus.com mailto:John.Kozlowski&ShofarNexus.com 2012-02-20 ++[John_Legh_Page] John Legh-Page mailto:john.legh-page&argis.com ++[John_Light] John Light mailto:johnl&gssc.gss.com ++[John_Linn] John Linn mailto:jlinn&securitydynamics.com ++[John_Lisek] John Lisek mailto:jl&gotodevice.com 2006-01 ++[John_Lombardo] John Lombardo mailto:johnl&picksys.com ++[John_Lowery] John Lowery NetPro Computing mailto:jlowery&netpro.com 2008-08-21 ++[John_M_Baird] John M. Baird mailto:jbaird&e-watch.com 2003-07 ++[John_MacMullin] John MacMullin mailto:john.macmullin&cox.net ++[John_Marland] John Marland mailto:jmarland&dean.openport.com ++[John_McCann] John McCann mailto:jmccann&visualclick.com 2006-12 ++[John_McCormack] John McCormack mailto:jmac&cisco.com ++[John_McKernan] John McKernan mailto:John.McKernan&sun.com ++[John_Meredith] John Meredith mailto:John.Meredith&etsi.org 2009-09-08 ++[John_Mertus] John Mertus mailto:mertus&mathtech.com ++[John_Mitchell] John Mitchell Found Software, Inc. mailto:john&foundapp.com 2012-04-11 ++[John_Morton] John Morton mailto:j.morton&hp.com 2004-11 ++[John_Murphy] John Murphy mailto:john.m.murphy&mci.com ++[John_Muth] John Muth mailto:muth¶scale.com 2010-01-21 ++[John_Myers] John Myers mailto:jgm+&cmu.edu ++[John_Parello] John Parello mailto:jparello&cisco.com 2009-05-19 ++[John_Payne] John Payne mailto:jpayne&lotus.com ++[John_Payson] John Payson mailto:john&circad.com 2007-10-22 ++[John_R_Chawner] John R. Chawner tel:+1-817-354-1004 ++[John_R_Deuel] John R. Deuel mailto:kink&netops.com ++[John_Rainford] John Rainford mailto:jrainford&passgo.com ++[John_Rainford_2] John Rainford mailto:john.rainford&passgo.com ++[John_Reynolds] John Reynolds mailto:John.Reynolds&datacoresl.com 2012-04-17 ++[John_Richardson] John Richardson Citrix Systems ++[John_Richmond] John Richmond mailto:developers&securitydesigners.com 2002-03 ++[John_Richmond_2] John Richmond mailto:john&ndl.co.uk ++[John_Ryan] John Ryan mailto:john&cybertrace.com ++[John_Scalo] John Scalo mailto:scalo&apple.com ++[John_Schilling] John Schilling mailto:john&jschilling.net ++[John_Skidmore] John Skidmore mailto:JSkidmore&vicon-cctv.com 2002-07 ++[John_Stephen] John Stephen mailto:iana&mundocani.com 2002-07 ++[John_T_McCann] John T. McCann mailto:jmccann&softwaremetering.com 2003-10 ++[John_Tafoya] John Tafoya mailto:johntµsoft.com ++[John_Taylor] John Taylor Ingersoll Rand, Inc. mailto:john.taylor&irco.com 2011-09-28 ++[John_Tintor] John Tintor mailto:jt&yo.net ++[John_Tokash] John Tokash mailto:jtokash&homestead.com ++[John_Trudeau] John Trudeau mailto:jtrudeau&cup.hp.com ++[John_Wallace] John Wallace mailto:john&nowsoftware.com ++[John_Wendt] John Wendt tel:+1-614-261-2000 ++[John_Williams] John Williams mailto:John.H.Williams&hp.com 2007-06 ++[John_Willis] John Willis mailto:jwillis&arielusa.com 2002-09 ++[John_Wood] John Wood mailto:John.Wood&netiq.com ++[John_Yeager] John Yeager mailto:johnyeager&avaya.com ++[Johnnie_Walker] Johnnie Walker mailto:mrwalker&randomsequence.com ++[Johnny_C_Norris_II] Johnny C. Norris II mailto:jnorris&uiuc.edu ++[Johnny_Zweig] Johnny Zweig mailto:zweig&netwave-wireless.com ++[Johnson_Davis] Johnson Davis mailto:johnsond&opteamasoft.com ++[Johnson_Luo] Johnson Luo mailto:johnson_luo&mail.sercomm.com.tw ++[Jon_A_Christopher] Jon A. Christopher mailto:jac8792&tamu.edu ++[Jon_Bolen] Jon Bolen mailto:jon.bolen&westec.net 2009-03-18 ++[Jon_Ingi_Ingimundars] Jon Ingi Ingimundarson mailto:jii&oz.com 2003-03 ++[Jon_March] Jon March mailto:jon.march&paget-analyst-services.co.uk 2006-09 ++[Jon_Postel] Jon Postel mailto:postel&isi.edu ++[Jon_Press] Jon Press mailto:IANA.Registions&ca.com 2005-09 ++[Jon_Robertson] Jon Robertson mailto:jmrobertson&medevolve.com 2008-10-24 ++[Jon_Rosarky] Jon Rosarky mailto:JRosarky&symantec.com ++[Jon_S_Kyle] Jon S. Kyle mailto:JKyle&speedwaysoftware.com ++[Jon_Saperia] Jon Saperia mailto:saperia&bgs.com ++[Jon_Walker] Jon Walker mailto:jwalker&miramarsys.com ++[Jon_Xu] Jon Xu mailto:jonxuµsoft.com 2005-08 ++[Jonas_Ahlqvist] Jonas Ahlqvist mailto:jonas.a&informationssystem.se 2005-08 ++[Jonas_Bovin] Jonas Bovin mailto:jonas.bovin&quickobjects.com ++[Jonas_Gyllensvaan] Jonas Gyllensvaan mailto:jonas&conceivium.com 2009-04-27 ++[Jonas_Krogell] Jonas Krogell mailto:jonas.krogell&netadmin.se 2007-07-10 ++[Jonas_Oberg] Jonas Oberg mailto:jonas&coyote.org ++[Jonas_Salling] Jonas Salling mailto:jonas&salling.com ++[Jonathan] Jonathan mailto:jonathan&mugginsoft.com ++[Jonathan_A_Zdziaras] Jonathan A. Zdziaraski mailto:jonathan&nuclearelephant.com 2004-11 ++[Jonathan_A_Zdziarsk] Jonathan A. Zdziarski mailto:johathan&networkdweebs.com 2002-11 ++[Jonathan_Bastnagel] Jonathan Bastnagel mailto:jonthebagel&gmail.com 2007-09-17 ++[Jonathan_Custance] Jonathan Custance mailto:jevc&camrivox.com 2006-07 ++[Jonathan_Downes] Jonathan Downes mailto:jonno&activ.net.au ++[Jonathan_Leffler] Jonathan Leffler mailto:jleffler&us.ibm.com 2005-12 ++[Jonathan_Mergy] Jonathan Mergy mailto:mergy&natus.com ++[Jonathan_Mitchell] Jonathan Mitchell mailto:jonathan&mugginsoft.com 2008-09-08 ++[Jonathan_S_Shapiro] Jonathan S. Shapiro mailto:registrar&eros-os.org 2002-03 ++[Jonathan_Schaaf] Jonathan Schaaf mailto:j.schaaf&astronautics.com 2010-02-10 ++[Jonathan_Wenocur] Jonathan Wenocur mailto:jhw&shiva.com ++[Joon_Radley] Joon Radley mailto:jradley&csir.co.za ++[Joon_Radley_2] Joon Radley mailto:joon&toltec.co.za 2008-10-21 ++ mailto:support&toltec.co.za ++[Jordan_Hrycaj] Jordan Hrycaj mailto:jordan&mjh.teddy-net.com ++[Jordi_Lisbona] Jordi Lisbona mailto:jlisbona&tango04.net ++[Jorg_Hoffmann] Joerg Hoffmann mailto:electronicc_rd&wago.com ++[Jorg_Laschke] Jorg Laschke mailto:laschke&hinz.de ++[Jorge_Aldana] Jorge Aldana mailto:operator&foresyte.com ++[Jorgen_Loland] Jorgen Loland mailto:jorgen.loland&sun.com 2008-02-27 ++[Jorn_Sierwald] Jorn Sierwald mailto:joern.sierwald&datafellows.com ++[Jose_A_Sesin] Jose A. Sesin mailto:sesin&vaultbase.com ++[Jose_Luis] Jose Luis mailto:73374.313&compuserve.com ++[Jose_Luis_Martin_Pei] Jose Luis Martin Peinado mailto:jooe&wifree-project.net 2006-03 ++[Josef_Spillner] Josef Spillner mailto:admin&ggzgamingzone.org 2003-01 ++[Joseph_Di_Pol] Joseph Di Pol mailto:joe.dipol&sun.com 2002-04 ++[Joseph_Dziedzic] Joseph Dziedzic mailto:tony.dziedzic&oracle.com 2008-06-06 ++[Joseph_Geer] Joseph Geer mailto:jgeer&peapod.com ++[Joseph_Gray] Joseph Gray mailto:gray&interwise.co.il ++[Joseph_Hauk] Joseph Hauk mailto:joseph.hauk&alphatech.com ++[Joseph_Hines] Joseph Hines mailto:jhines&webmethods.com ++[Joseph_Krebs] Joseph Krebs mailto:joek&caps.com ++[Joseph_LoPilato] Joseph LoPilato mailto:Joseph_M_LoPilato¬es.seagate.com ++[Joseph_M_Newcomer] Joseph M. Newcomer mailto:newcomer&flounder.com ++[Joseph_Mathew] Joseph Mathew mailto:mjoseph&dosa.cisco.com ++[Joseph_Sickel] Joseph Sickel mailto:joe&ozate.com 2011-10-12 ++[Joseph_Swaminathan] Joseph Swaminathan mailto:jswamina&cisco.com 2009-04-01 ++[Joseph_T_Savarese] Joseph T Savarese mailto:joesa&nmwco.com 2007-06 ++[Joseph_Weihs] Joseph Weihs mailto:yossi&bandwiz.com ++[Joshua_Boelter] Joshua Boelter Intel mailto:joshua.boelter&intel.com 2011-10-18 ++[Joshua_Graessley] Joshua Graessley mailto:jgraessley&apple.com 2004-12 ++[Joshua_Hawkins] Joshua Hawkins mailto:joshua.hawkins&hp.com 2003-11 ++[Joshua_Prewitt] Joshua Prewitt National Instruments mailto:joshua.prewitt&ni.com 2011-10-24 ++[Josip_Medved] Josip Medved mailto:jmedved&jmedved.com 2010-10-20 ++[Josse_van_Dobben_de] Josse van Dobben de Bruyn mailto:jossedobben&hotmail.com 2009-07-01 ++[Jost_Faganel] Jost Faganel mailto:jost.faganel&hermes.si ++[Josyula_R_Rao] Josyula R. Rao mailto:jrrao&watson.ibm.com ++[Joyce_K_Reynolds] Joyce K. Reynolds mailto:jkrey&isi.edu ++[Juan_Carlos_Luciani] Juan Carlos Luciani mailto:jluciani&novell.com ++[Juan_Carlos_Olivares] Juan Carlos Olivares mailto:jcolivares04c&cenidet.edu.mx 2006-03 ++ Rojas ++[Jude_George] Jude George mailto:jude&nas.nasa.gov ++[Juergen_Edelhaeuser] Juergen Edelhaeuser mailto:Juergen.Edelhaeuser&locanis.com 2002-08 ++[Juergen_Fischbach] Juergen Fischbach mailto:juergen.fischbach&philips.com ++[Jugaari] Jugaari mailto:support&jugaari.com ++[Juho_Herttua] Juho Vaehae-Herttua mailto:juhovh&iki.fi 2009-04-14 ++[Julian_Biddle] Julian Biddle mailto:julian_biddle&technologyonecorp.com ++[Julian_Mehnle] Julian Mehnle mailto:julian&mehnle.net ++[Julian_Satran] Julian Satran mailto:Julian_Satran&il.ibm.com ++[Julian_Smith] Julian Smith mailto:jsmith&undo-software.com 2010-04-19 ++[Juliana_Hsu] Juliana Hsu mailto:jhsu&ca.ibm.com ++[Julien_Danjou] Julien Danjou mailto:acid&debian.org 2006-07 ++[Julien_Robert] Julien Robert mailto:jul&abyssoft.com ++[Julien_VALIENTE] Julien VALIENTE mailto:j.valiente&objectif-software.com 2006-05 ++[Jun_Nakamura] Jun Nakamura mailto:jnakamur&cp10.es.xerox.com ++[Jun_Yoshii] Jun Yoshii mailto:yoshii&ael.fujitsu.co.jp ++[Juraj_Zopp] Juraj Zopp mailto:juraj.zopp&pianoforce.com ++[Justin_Cepelak] Justin Cepelak mailto:jcepelak&splashdata.com ++[Justin_Huff] Justin Huff mailto:justin.huff&blueviewtech.com 2005-11 ++[Justin_Ko] Justin Ko Apple mailto:justin.ko&apple.com 2011-10-20 ++[Justin_Paupore] Justin Paupore mailto:jpaupore&blueshiftlabs.net 2007-08-16 ++[Justin_R_Bendich] Justin R. Bendich mailto:jbendich&us.ibm.com ++[Justin_Vegso] Justin Vegso mailto:jvegso&quantapoint.com 2010-07-01 ++[Justin_Yu] Justin Yu mailto:yyu&mitre.org 2011-05-25 ++[Justine_Higgins] Justine Higgins mailto:iana&corsof.com ++[Jyri_J_Virkki] Jyri J. Virkki mailto:jyri.virkki&sun.com 2005-12 ++[K_Arvind] K. Arvind mailto:arvind&tenornetworks.com ++[K_K_Ho] K. K Ho mailto:kk.ho&afe-solutions.com 2004-04 ++[Kade_Hansson] Kade Hansson mailto:kade_fh&postoffice.utas.edu.au ++[Kai_Kretschmann] Kai Kretschmann mailto:K.Kretschmann&security-gui.de 2002-03 ++[Kang_Lee] Kang Lee I&M Society TC-9 mailto:kang.lee&nist.gov 2010-07-27 ++[Kannan_Alagappan] Kannan Alagappan mailto:kannan&sejour.enet.dec.com ++[Kannan_Alagappan_2] Kannan Alagappan mailto:kannan&sejour.lkg.dec.com ++[Karelia_Software] Karelia Software ++[Karen_Burns] Karen Burns ++[Karl_Edwall] Karl Edwall mailto:karl&magicnotes.com ++[Karl_Feind] Karl Feind mailto:kaf&sgi.com 2005-10 ++[Karl_Forster] Karl Forster mailto:kforster&lockstep.com ++[Karl_Norrman] Karl Norrman mailto:karl.norrman&ericsson.com 2004-12 ++[Karl_Olafsson] Karl Olafsson mailto:Karl.Olafsson&covariant-systems.com 2008-10-24 ++[Karl_Palsson] Karl Palsson mailto:karl_p&danfoss.com 2004-11 ++[Karl_Rousseau] Karl Rousseau mailto:kr&netfusion.co.uk ++[Karl_Schendel_Jr] Karl Schendel, Jr. mailto:wiz&telesis.com ++[Karl_Timmermann] Karl Timmermann mailto:timmerk&gmail.com ++[Katherine_Wattwood] Katherine Wattwood mailto:katherine.wattwood&veritas.com 2002-06 ++[Kathy_Huber] Kathy Huber mailto:khuber&bbn.com ++[Kathy_Tafel] Kathy Tafel Corpus Collusion mailto:kt&corpuscollusion.com 2011-08-23 ++[Katsuaki_Naoi] Katsuaki Naoi mailto:naoi&pfu.co.jp ++[Katsuhiko_Abe] Katsuhiko Abe mailto:kabe&hst.fujitsu.co.jp ++[Katsuhito_Muroi] Katsuhito Muroi mailto:muroi&pfu.co.jp ++[Katsumi_Oomuro] Katsumi Oomuro mailto:NAE01421&niftyserve.or.jp ++[Katy_Lynn_McCullough] Katy Lynn McCullough mailto:KatyM&laplink.com ++[Kaushik_Biswas] Kaushik Biswas mailto:kbiswas&cisco.com 2006-03 ++[Kay_Roepke] Kay Roepke mailto:Kay.Roepke&sun.com 2009-04-22 ++[Kay_T_Labinsky] Kay T. Labinsky mailto:Kay.Labinsky&sandlab.de 2010-05-03 ++[Kaynam_Hedayat] Kaynam Hedayat mailto:khedayat&roadrunner.pictel.com ++[Kaz_Kylheku] Kaz Kylheku mailto:kkylheku&infowave.com ++[Kaz_Ozawa] Kaz Ozawa mailto:k.ozawa&cablelabs.com ++[Kazuhiro_Koide] Kazuhiro Koide mailto:kaz&pfu.co.jp ++[Kazuhito_Gassho] Kazuhito Gassho mailto:Gassho.Kasuhito&exc.epson.co.jp ++[Kazuya_Ogata] Kazuya Ogata mailto:info&sepv.jp ++[Kedar_Mhaswade] Kedar Mhaswade mailto:kedar.Mhaswade&sun.com 2004-11 ++[Keiji_Michine] Keiji Michine mailto:michine&net.paso.fujitsu.co.jp ++[Keiji_Okuma] Keiji Okuma mailto:okuma&silex.jp 2005-08 ++[Keisokugiken_Corp] Keisokugiken Corp. mailto:adda&kgc.co.jp ++[Keith_Ansell] Keith Ansell mailto:KeithA&fastfreenet.com ++[Keith_Ashman] Keith Ashman mailto:sciana&sculptor.co.uk 2005-12 ++[Keith_Boyce] Keith Boyce ++[Keith_Evans] Keith Evans mailto:keith&loc252.tandem.com ++[Keith_Fligg] Keith Fligg mailto:keith&projtech.com 2002-09 ++[Keith_J_Alphonso] Keith J. Alphonso mailto:alphonso&ncs-ssc.com ++[Keith_Kilroy] Keith Kilroy mailto:Keith.Kilroy&novarcontrols.com 2006-02 ++[Keith_McCloghrie] Keith McCloghrie mailto:kzm&cisco.com ++[Keith_Moore] Keith Moore mailto:moore&cs.utk.edu ++[Keith_Morley] Keith Morley mailto:keith&ndl.co.uk ++[Keith_Paulsen] Keith Paulsen mailto:kpaulsen&phobos.com ++[Keith_Petley] Keith Petley mailto:keithp&sco.com ++[Keith_Rhodes] Keith Rhodes tel:+1-810-559-5955 ++[Keith_Ryden] Keith Ryden mailto:kryden&esri.com 2006-07 ++[Keith_Thompson] Keith Thompson mailto:keith.thompson&sun.com ++[Keith_Trummel] Keith Trummel mailto:ktrummel&autodesk.com ++[Keith_Wood] Keith Wood mailto:keith.wood&epid.eurotherm.co.uk ++[Keith_Wright] Keith Wright mailto:kwright&sensatronics.com 2003-08 ++[Keith_Yarbrough] Keith Yarbrough mailto:kyarbro&windtraveller.com ++[Kelli_Watson] Kelli Watson mailto:kwatson&ci3software.com ++[Kelly_Green] Kelly Green mailto:green&compaq.com ++[Kelly_Sims] Kelly Sims mailto:kellys&garnet.wv.tek.com ++[Kelvin_Lawson] Kelvin Lawson AD Holdings mailto:klawson&ad-holdings.co.uk 2011-10-11 ++[Ken_Anderson] Ken Anderson mailto:kanderso&kleber.ics.uci.edu ++[Ken_Bailey] Ken Bailey mailto:kbailey&rockettalk.com ++[Ken_Blackwell] Ken Blackwell mailto:kenb&bristol.com ++[Ken_Chapman] Ken Chapman mailto:kchapman&isis.com ++[Ken_Crocker] Ken Crocker mailto:kcrockerµsoft.com ++[Ken_Greer] Ken Greer mailto:kg&elan.com ++[Ken_Hearn] Ken Hearn mailto:hearn&hpindacx.cup.hp.com ++[KEN_ICHI_FUJII] Ken'ichi FUJII Canon Inc. mailto:fujii.ken-ichi149&canon.co.jp 2011-10-10 ++[Ken_Jibiki] Ken Jibiki mailto:ken&kenjij.com ++[Ken_Ksiazek] Ken Ksiazek mailto:kksiazek&maytag.com ++[Ken_Lagarec] Ken Lagarec mailto:klagarec&fibics.com 2009-04-17 ++[Ken_Lin] Ken Lin mailto:klin&us.ibm.com ++[Ken_McDonell] Ken McDonell mailto:kenj&internode.on.net 2010-12-20 ++[Ken_Moore] Ken Moore mailto:kmoore&groove.net ++[Ken_Nelson] Ken Nelson mailto:nelson&toplayer.com ++[Ken_Oliver] Ken Oliver mailto:koliver02&yahoo.com ++[Ken_Richard] Ken Richard mailto:kenr&aeseducation.com ++[Ken_Sarno] Ken Sarno mailto:kensarno&insightbb.com 2005-08 ++[Ken_Wittmer] Ken Wittmer mailto:kenneth.m.wittmer&accenture.com ++[Kenji_Tetsuyama] Kenji Tetsuyama mailto:kenji&onkyo.co.jp 2002-11 ++[Kenneth_B_Ocheltree] Kenneth B. Ocheltree mailto:kennetho&us.ibm.com 2008-01-07 ++[Kenneth_Flynn] Kenneth Flynn mailto:flynnk&darkcornersoftware.com 2009-10-14 ++[Kenneth_Vaughn] Kenneth Vaughn mailto:kvaughn&mail.viggen.com ++[Kern_Sibbald] Kern Sibbald mailto:kern&sibbald.com 2002-01 ++[Kerry_Hazelgren] Kerry Hazelgren mailto:hazelgren&facespan.com ++[Ketul_Patel] Ketul Patel mailto:ketulp76&yahoo.com 2006-10 ++[Kev_George] Kev George mailto:Kev.George&smiths-aerospace.com 2006-09 ++[Kevin_Arnold] Kevin Arnold mailto:imlucid&apple.com ++[Kevin_Bentley] Kevin Bentley mailto:Kevin&outrage.com ++[Kevin_Birch] Kevin Birch mailto:kbirch&pobox.com ++[Kevin_Bond] Kevin Bond mailto:kevin.bond&ca.com 2004-11 ++[Kevin_Bruckert] Kevin Bruckert mailto:kbruckert&idpco.com ++[Kevin_Brunner] Kevin Brunner mailto:brunner&tivo.com 2003-07 ++[Kevin_C_Barber] Kevin C. Barber mailto:kevin.c.barber&saic.com 2009-01-13 ++[Kevin_Calman] Kevin Calman mailto:postmaster&journee.com ++[Kevin_Collins] Kevin Collins mailto:kevinc@.cnd.hp.com ++[Kevin_Collins_2] Kevin Collins mailto:kevinc&cnd.hp.com ++[Kevin_Copas] Kevin Copas mailto:Kevin.Copas&lsi.com 2008-02-07 ++[Kevin_DeVault] Kevin DeVault ++[Kevin_Ediger] Kevin Ediger Software LI-COR mailto:kevin.ediger&licor.com 2011-10-18 ++ Biosciences ++[Kevin_Frender] Kevin Frender mailto:kbf&ngdc.noaa.gov ++[Kevin_Green] Kevin Green mailto:Kevin_Green&tds.com ++[Kevin_Kuhns] Kevin Kuhns mailto:kkuhns&opto22.com ++[Kevin_Leacock] Kevin Leacock mailto:kevin&itchycode.com ++[Kevin_Lu] Kevin Lu mailto:kevinluµmethod.com 2005-08 ++[Kevin_Madden] Kevin Madden mailto:Kevin&emailxtras.com ++[Kevin_Massey] Kevin Massey mailto:massey&aspentec.com ++[Kevin_Mooney] Kevin Mooney mailto:kevinm&bfs.unibol.com ++[Kevin_Murphy] Kevin Murphy mailto:murphy&sevens.lkg.dec.com ++[Kevin_Murphy_2] Kevin Murphy mailto:kevin.murphy&networkengines.com 2003-10 ++[Kevin_Nakagawa] Kevin Nakagawa mailto:nakagawa&sigsci.com ++[Kevin_Osborn] Kevin Osborn mailto:kosborn&snapappliance.com ++[Kevin_Rushforth] Kevin Rushforth mailto:kevin.rushforth&sun.com 2003-08 ++[Kevin_Teiskoetter] Kevin Teiskoetter mailto:kevint&metacreations.com ++[Kevin_Wellwood] Kevin Wellwood mailto:wellwood&jeol.com 2008-04-17 ++[Kevin_Welton] Kevin Welton mailto:Kevin.Welton&armltd.co.uk ++[Khelben_Blackstaff] Khelben Blackstaff mailto:khelben&gmx.at ++[Khiem_Tran] Khiem Tran mailto:Khiem.Tran&andrew.com 2007-11-06 ++[Kim_Alan_Waggoner] Kim Alan Waggoner mailto:kimw&weatherbank.com 2006-11 ++[Kim_Hancock] Kim Hancock mailto:registry&dragondex.com 2007-10-24 ++[Kim_Moraros] Kim Moraros mailto:moraros&via.enet.dec.com ++[Kim_Scott] Kim Scott mailto:kims&cup.hp.com ++[Kimberly_Gibbs] Kimberly Gibbs mailto:kimgib&ccgate-ut.axent.com ++[Kimmo_Kymalainen] Kimmo Kymalainen mailto:kimmo.kymalainen&etsi.org 2010-06-04 ++[Kin_Chan] Kin Chan mailto:kchan&shiva.com ++[Kin_Chan_2] Kin Chan mailto:kchan&net2net.com ++[Kipp_E_B_Hickman] Kipp E.B. Hickman mailto:kipp&mcom.com ++[Kipp_E_B_Hickman_2] Kipp E.B. Hickman mailto:kipp&netscape.com ++[Kiren_Sekar] Kiren Sekar mailto:kiren&apple.com 2005-08 ++[Kiren_Sekar_2] Kiren Sekar mailto:kiren&apple.com ++[Kirk_Lougheed] Kirk Lougheed mailto:LOUGHEED&mathom.cisco.com ++[Kirk_MacLean] Kirk MacLean mailto:kmaclean&ea.com ++[Kit_Haskins] Kit Haskins mailto:kit&ka0wuc.org ++[Kit_Smithers] Kit Smithers mailto:ksmithers&argogroup.com ++[Kit_Sturgeon] Kit Sturgeon mailto:Kit&remotecontrolsextoys.com ++[Klas_Malmborg] Klas Malmborg FLIR Systems AB mailto:Klas.Malmborg&flir.se 2011-10-20 ++[Klaus_Fellner] Klaus Fellner mailto:webmaster&segue.com ++ mailto:kfellner&segue.com ++[Klaus_Schmidinger] Klaus Schmidinger mailto:Klaus.Schmidinger&tvdr.de 2010-03-31 ++[Klaus_Warth] Klaus Warth mailto:Klaus.Warth&heitec.de 2011-08-01 ++[Klaus_Wolf] Klaus Wolf mailto:wolf&cobrow.com ++[Koen_Schoofs] Koen Schoofs mailto:schoofs_koen&emc.com 2003-01 ++[Koich_Nakamura] Koich Nakamura mailto:naka&case.nm.fujitsu.co.jp ++[Konstantin_Iavid] Konstantin Iavid mailto:kiavid&highcriteria.com ++[Konstantin_Schauweck] Konstantin Schauwecker mailto:hi&konstantin-schauwecker.de 2007-02 ++[Konstantin_V_Vyazni] Konstantin V. Vyaznikov mailto:kv&ssm6000.samsung.ru ++[Konstantinos_Kostis] Konstantinos Kostis mailto:netdb&kostis.net ++[Kord_Campbell] Kord Campbell mailto:kord&grub.org ++[Kory_Hamzeh] Kory Hamzeh mailto:kory&ascend.com ++[Kouichi_Takeda] Kouichi Takeda mailto:KHBO5271&nifty.com ++[Kouichi_Takeda_2] Kouichi Takeda mailto:KHB05271&nifty.com ++[Kouji_Sugisawa] Kouji Sugisawa mailto:sugisawa.kouji&soft.fujitsu.com 2003-01 ++[Kristean_Heisler] Kristean Heisler mailto:kh&rib.de ++[Kristean_Heisler_2] Kristean Heisler mailto:Kristean.Heisler&rib-software.com 2009-12-16 ++[Kristian_A_Bognaes] Kristian A. Bognaes mailto:kbo&norman.no 2007-11-06 ++[Kristina_Sten] Kristina Sten mailto:kristina.sten&axis.com ++[Kristoffer_Lawson] Kristoffer Lawson mailto:setok&scred.com ++[Kristoffer_Nilsson] Kristoffer Nilsson mailto:kristoffer.nilsson&hutchison3g.com 2002-02 ++[Kunihiko_Morota] Kunihiko Morota mailto:morota.kunihiko&jp.panasonic.com 2005-08 ++[Kurt_Haubner] Kurt Haubner mailto:haubner&ibm.net ++[Kurt_Nissen] Kurt Nissen mailto:kn&proces-data.com 2004-02 ++[Kyle_Lussier] Kyle Lussier mailto:klussier&autonoc.com 2005-12 ++[Kyle_Unice] Kyle Unice mailto:kyle&midnighttech.com ++ LJK Software, ++[LJK] Cambridge, mailto:support&ljk.com ++ Massachusetts ++[Ladislav_Baranyay] Ladislav Baranyay mailto:identcod&identcode.sk ++[Lai_Zit_Seng] Lai Zit Seng mailto:lzs&pobox.com ++[Laird_Popkin] Laird Popkin mailto:laird&pando.com 2008-02-27 ++[Lal_Samuel_Varghese] Lal Samuel Varghese mailto:lalsam&hp.com 2005-08 ++[Lance_Kind] Lance Kind mailto:lance_kind&hp.com ++[Lance_M_Steenson] Lance M. Steenson mailto:lance&transactionwarehouse.net 2009-09-18 ++[Larry_A_Young] Larry A. Young mailto:Larry.A.Young&mail.sprint.com 2005-08 ++[Larry_A_Young_2] Larry A. Young mailto:Larry.A.Young&sprint.com 2006-02 ++[Larry_Atkin] Larry Atkin mailto:latkin&commongrnd.com ++[Larry_Atkin_2] Larry Atkin mailto:shasta&qsatoolworks.com ++[Larry_Barnes] Larry Barnes mailto:barnes&broke.enet.dec.com ++[Larry_Emlich] Larry Emlich mailto:larry.emlich&compaq.com ++[Larry_Gerhardstein] Larry Gerhardstein mailto:lh_gerhardstein&pnl.gov ++[Larry_Lipstone] Larry Lipstone mailto:lrl&interdyn.com ++[Larry_Peterson] Larry Peterson mailto:llp&arizona.edu ++[Larry_Schwartz] Larry Schwartz mailto:lrs&cup.hp.com ++[Larry_Scott] Larry Scott mailto:scott&zk3.dec.com ++[Larry_Stone] Larry Stone mailto:lcs&icad.com ++[Larry_Traylor] Larry Traylor mailto:larry&arium.com ++[Larry_Tusoni] Larry Tusoni mailto:larry&goldrush.com ++[Larry_Zarou] Larry Zarou mailto:zarla01&cbsits.com 2006-10 ++[Lars_Bohn] Lars Bohn mailto:Lars.Bohn&nokia.com ++[Lars_Eilebrecht] Lars Eilebrecht mailto:le+iana&leogic.com 2003-10 ++[Lars_Goran_Magnusson] Lars-Goran Magnusson mailto:lars-goran.magnusson&seisy.mail.abb.com ++[Lars_Mattsson] Lars Mattsson mailto:lars.mattsson®in.se 2008-12-24 ++[Lars_Struwe_Christen] Lars Struwe Christensen mailto:lsc&giritech.com 2004-01 ++[Laurence_Flath] Laurence Flath mailto:lflath&luxsolis.com ++[Laurent_Charmet] Laurent Charmet mailto:laurent.charmet&atempo.com ++[Laurent_Domenech] Laurent Domenech Opalis mailto:ldomenech&opalis.com ++[Laurent_Mihalkovic] Laurent Mihalkovic mailto:ljp_m&mac.com ++[Laurie_Charlwood] Laurie Charlwood mailto:laurie.charlwood&printsoft.com 2007-08-22 ++[Laurie_Lindsey] Laurie Lindsey mailto:llindsey&novell.com ++[Lawrence_J_Dickson] Lawrence J. Dickson Land-5 Corporation mailto:ldickson&land-5.com 2002-03 ++[Lawrence_Lebahn] Lawrence Lebahn mailto:DIA3&paxrv-nes.navy.mil ++[Lawrence_R_Bulduc] Lawrence R. Bulduc mailto:LBulduc&attglobal.net 2006-10 ++[Lawrence_Tarbox] Lawrence Tarbox mailto:ltarbox&scr.siemens.com ++[Lawrence_W_Dunn] Lawrence W. Dunn mailto:larrydunn&aptcomp.com 2003-04 ++[Laxman_C_Marathe] Laxman C. Marathe mailto:lcmarathe&thomsonpress.com 2006-12 ++[Layered_Logic] Layered Logic, Inc. mailto:brooks&layeredlogic.com 2012-01-04 ++[Lech_Lakomy] Lech Lakomy mailto:llakomy&apwi.com 2009-02-12 ++[Lech_Laskowski] Lech Laskowski mailto:lech_laskowski&moldflow.com ++[Lecuivre_J] Lecuivre J mailto:software.team&mgeups.com 2005-08 ++[Lee_Barton] Lee Barton mailto:barton&star.enet.dec.com ++[Lee_Breisacher] Lee Breisacher mailto:lbreisacher&seagullsw.com ++[Lee_Dolson] Lee Dolson mailto:dolson&f-net.co.kr 2006-01 ++[Lee_Griffiths] Lee Griffiths mailto:lg&dataconnection.com 2004-11 ++[Lee_Howard] Lee Howard mailto:iana&hylafax.org 2002-03 ++[Lee_VanTine] Lee VanTine mailto:lvantine&infiniswitc.com 2002-09 ++[Lee_Wheat] Lee Wheat mailto:wheat&wg.com ++[Lefteris_Kalamaras] Lefteris Kalamaras mailto:lefteris&ebi.com ++[Lehpaner_Sasa] Lehpaner Sasa mailto:lsasa&visel.it ++[Leif_Ekblad] Leif Ekblad mailto:leif&rdos.net ++[Leif_Hedstrom] Leif Hedstrom mailto:leif&propel.com 2002-04 ++[Leif_Jakob] Leif Jakob mailto:leif+iana&cube.ch 2006-01 ++[Leland_Wallace] Leland Wallace mailto:randall&apple.com ++[Len_Wanger] Len Wanger mailto:lrw&sdsc.edu ++[Len_Zuvela] Len Zuvela IM Unified Coalition mailto:imu-comments&egroups.com ++[Len_Zuvela_2] Len Zuvela mailto:lenzµsoft.com ++[Leo_Hourvitz] Leo Hourvitz mailto:leo&next.com ++[Leo_Lesage] Leo Lesage mailto:leo.lesage&adp.nl 2006-04 ++[Leo_Martins] Leo Martins mailto:leo&talarian.com ++[Leo_Moesgaard] Leo Moesgaard mailto:leo_moesgaard&dk.ibm.com ++[Leo_Rathnayake] Leo Rathnayake mailto:leo&perlnet.com ++[Leonhard_Diekmann] Leonhard Diekmann mailto:diekmann&04.mstr02.telekom400.dbp.de ++[Les_Enstone] Les Enstone mailto:lenstone&lanner.co.uk ++[Les_Klein] Les Klein mailto:sgy&cix.compulink.co.uk ++[Les_Mather] Les Mather mailto:lm&remsdaq.com 2005-12 ++[Leslie_Lincoln] Leslie Lincoln mailto:leslie_lincoln&valisys.com ++[Lewis_Donzis] Lewis Donzis mailto:ldonzis&nortelnetworks.com ++[Lewis_Wolfgang] Lewis Wolfgang mailto:wolfgang&kencast.com 2006-05 ++[Liam_Merwick] Liam Merwick mailto:ldoms-iana-ports&sun.com 2009-01-16 ++[Libor_Sykora] Libor Sykora mailto:libor.sykora&st.com 2002-05 ++[Libratone_AS] Libratone A/S mailto:info&libratone.com 2011-10-27 ++[libravatar_org] libravatar.org mailto:francois&libravatar.org 2011-10-11 ++[Lilian_Rudenco] Lilian Rudenco mailto:info&xpanel.com 2009-03-04 ++[Liming_Wei] Liming Wei mailto:lwei&cisco.com ++[Linda_Lin] Linda Lin mailto:llin&sonusnet.com 2006-08 ++[Lindsay_Morris] Lindsay Morris mailto:lmorris&servergraph.com ++[Linus_Torvalds] Linus Torvalds mailto:torvalds&osdl.org 2005-09 ++[Lisa_Tomita] Lisa Tomita ++[Lisa_Zhong] Lisa Zhong mailto:lzhong&cup.hp.com ++[Lisp_Support] Lisp Support mailto:lisp-support&xanalys.com ++[Liu_Changchun] Liu Changchun mailto:blzhang&infospark.cn 2008-11-05 ++[Lloyd_Wood] Lloyd Wood mailto:lwood&cisco.com 2007-05 ++[Logan_Bruns] Logan Bruns mailto:logan&andromedia.com ++[Loren_Barr] Loren Barr mailto:lbarr&extensis.com 2006-12 ++[Lori_Tassin] Lori Tassin mailto:Ramsey&network-1.com ++[Lou_Berger] Lou Berger mailto:lberger&movaz.com 2004-11 ++[Lou_Harris] Lou Harris mailto:lharris&outlx.bandl.com ++[Lou_Seitchik] Lou Seitchik mailto:lou&alliedelectronics.com 2005-08 ++[Louis_E_Simard] Louis E. Simard mailto:76400.3371&compuserve.com ++[Louis_Lu] Louis Lu mailto:LouisL&bristol.com ++[Louis_Mamakos] Louis Mamakos mailto:louie&sayshell.umd.edu ++[Louis_Mamakos_2] Louis Mamakos mailto:louie&uu.net ++[Louis_Olszyk] Louis Olszyk mailto:lolszyk&10fold.com ++[Louis_Slothouber] Louis Slothouber mailto:lpslot&biap.com 2005-08 ++[Louis_Sun] Louis Sun mailto:lysun&ambarella.com ++[Lucas_Alonso] Lucas Alonso mailto:luke&demiurgestudios.com 2002-02 ++[Luis_Zugasti] Luis Zugasti mailto:lzugasti&fagorautomation.es 2003-11 ++[Luke_Bowen] Luke Bowen mailto:leb&tfn.com ++[Luke_Dion] Luke Dion mailto:ldion&tapeware.com 2004-04 ++[Luke_Steffen] Luke Steffen mailto:lukesteffen&deusty.com ++[Luma_Code] Luma Code mailto:support&lumacode.com ++[Lumis] Lumis mailto:rterra&lumis.com.br 2011-10-24 ++[Lutz_Karras] Lutz Karras mailto:karras&zeiss.de ++[Lyndon_Nerenberg] Lyndon Nerenberg mailto:lyndon&execmail.ca ++[Lyndon_Ong] Lyndon Ong mailto:LyOng&ciena.com ++[Lyndon_Ong_2] Lyndon Ong mailto:Lyong&ciena.com ++[Lynn_Carter] Lynn Carter mailto:carterl&execpc.com ++[MPITech_Support] MPITech Support mailto:morten.christensen&i-data.com ++[M_Flemming] M Flemming mailto:mflemming&aol.com ++[Madhan_Kanagavel] Madhan Kanagavel mailto:madhan&codelathe.com 2008-07-18 ++[Madhav_Karhade] Madhav Karhade mailto:madhav.karhade&wibhu.com 2003-08 ++[Madhukar_N_Thakur] Madhukar N. Thakur mailto:mthakur&interbase.com ++[Mads_Peter_Back] Mads Peter Back mailto:iana-contact&webhouse.dk 2002-06 ++[Maggie_Brinsford] Maggie Brinsford mailto:mjb&concurrent.co.uk ++[Magnus_Nystrom] Magnus Nystrom mailto:magnus&dynas.se ++[Makoto_Ikeyama] Makoto Ikeyama mailto:ikeyama&ael.fujitsu.co.jp ++[Makoto_Mita] Makoto Mita mailto:mita&ssdev.ksp.fujixerox.co.jp ++[Makoto_Watanabe] Makoto Watanabe mailto:makoto&saint.nm.fujitsu.co.jp ++[Makoto_Zukawa] Makoto Zukawa mailto:zukawa&jp.fujitsu.com 2010-10-15 ++[Mala_Bhat] Mala Bhat mailto:bmala&ssdi.sharp.co.in 2005-08 ++[Malcolm_Crowe] Malcolm Crowe mailto:malcolm.crowe&paisley.ac.uk 2005-11 ++[Malcolm_Graham] Malcolm Graham mailto:Malcolm_Graham&cyborg.com ++[Malcolm_McLean] Malcolm McLean mailto:malcolmm&zieto.co.za 2007-07-19 ++[Mamoru_Ito] Mamoru Ito mailto:Ito&pcnet.ks.pfu.co.jp ++[Man_Shuen_Cheung] Man Shuen Cheung mailto:man_shuen_cheung&wamnet.co.uk ++[Manabu_Makino] Manabu Makino mailto:m-makino&ael.fujitsu.co.jp ++[Mandar_Joshi] Mandar Joshi mailto:mandar.joshi&lsi.com 2009-02-09 ++[Mandos_Maintainers] Mandos Maintainers mailto:mandos&fukt.bsnet.se ++[Manfred_Randelzofer] Manfred Randelzofer mailto:manfred.randelzofer&fujitsu-siemens.com ++[Manickam_R_Sridhar] Manickam R.Sridhar mailto:msridhar&sitaranetworks.com ++[Marazzi] Marazzi mailto:fmarazzi&ideetique.com ++[Marc_Andre_Lemburg] Marc-Andre Lemburg mailto:mal&egenix.com 2009-11-13 ++[Marc_Bailey] Marc Bailey mailto:marc&objective.com ++[Marc_Baudoin] Marc Baudoin mailto:babafou&babafou.eu.org ++[Marc_Binstock] Marc Binstock mailto:marc.binstock&citrix.com 2008-01-29 ++[Marc_Blanchet] Marc Blanchet mailto:marc.blanchet&viagenie.ca 2003-01 ++[Marc_Castelluccio] Marc Castelluccio mailto:mcastell&areanetworks.net 2005-08 ++[Marc_Diamante] Marc Diamante mailto:pgmp&pgmpsolutions.com ++[Marc_Donner] Marc Donner mailto:mail&poweraudio.de 2009-01-16 ++[Marc_Epard] Marc Epard mailto:marc&netopia.com ++[Marc_Gauthier] Marc Gauthier mailto:mgau&kastenchase.com ++[Marc_Goossens] Marc Goossens mailto:mgoossens&eiba.com 2003-01 ++[Marc_Horowitz] Marc Horowitz mailto:marc&mit.edu ++[Marc_Krochmal] Marc Krochmal mailto:marc&apple.com ++[Marc_Krochmal_2] Marc Krochmal Apple Inc. mailto:marc&apple.com 2012-03-02 ++[Marc_Majka] Marc Majka mailto:majka&apple.com 2002-08 ++[Marc_Manthey] Marc Manthey mailto:codewarrior&cuseeme.de 2006-07 ++[Marc_Manthey_2] Marc Manthey mailto:marc&let.de ++[Marc_McClure] Marc McClure mailto:marcmccµsoft.com 2007-08-07 ++[Marc_Morin] Marc Morin mailto:mmorin&sdlintl.com 2002-04 ++[Marc_Prud_hommeaux] Marc Prud'hommeaux mailto:support&lexcycle.com ++[Marcel_Dube] Marcel Dube mailto:marceldube&videotron.ca 2004-11 ++[Marcel_Hofstetter] Marcel Hofstetter mailto:marcel.hofstetter&jomasoft.ch 2003-01 ++[Marcel_Ruff] Marcel Ruff mailto:mr&marcelruff.info 2002-02 ++[Marcelo_Einhorn] Marcelo Einhorn mailto:KGUNE%25HUJIVM1.bitnet@taunivm.tau.ac.il ++[Marcelo_Einhorn_2] Marcelo Einhorn mailto:marcelo&eshbel.com ++[Marcin_Gozdalik] Marcin Gozdalik mailto:gozdal&gadu-gadu.pl 2006-05 ++[Marco_Bambini] Marco Bambini mailto:marco&realsoftware.com 2008-08-28 ++[Marco_Casole] Marco Casole mailto:marco.casole&ericsson.com 2003-04 ++[Marco_Marcucci] Marco Marcucci mailto:mmarcucci.amtec&interbusiness.it ++[Marco_Mascitto] Marco Mascitto mailto:mmascitto&accedian.com 2011-06-28 ++[Marco_Piovanelli] Marco Piovanelli mailto:support&ovolab.com ++[Marcos_Della] Marcos Della mailto:mdella&peerme.com 2005-08 ++[Marcus_Leufgen] Marcus Leufgen mailto:leufgen&ipcas.de 2002-05 ++[Marcus_Mueller] Marcus Mueller mailto:marcus&irtrans.de 2004-11 ++[Marek_Buchler] Marek Buchler mailto:Marek.Buchler&entrust.com ++[Margaret_Wasserman] Margaret Wasserman mailto:margaret&thingmagic.com 2006-11 ++[Marie_France_Dubreui] Marie-France Dubreuil mailto:Marie-France.Dubreuil&evidian.com 2002-11 ++[Marie_Pierre_Belange] Marie-Pierre Belanger mailto:belanger_marie&emc.com ++[Mario_Bonin] Mario Bonin mailto:boninmµtempus.com ++[Mario_Leboute] Mario Leboute mailto:leboute&pro.via-rs.com.br ++[Mario_Poerner] Mario Poerner Mediatap GbR mailto:mario.poerner&googlemail.com 2011-10-11 ++[Maris_Bormanis] Maris Bormanis mailto:info&febooti.com 2011-06-10 ++[Marius_Matioc] Marius Matioc mailto:marius&lavenir.com ++[Mark_Ainsley] Mark Ainsley mailto:ianaportmaster&unify.com ++[Mark_Armstrong] Mark Armstrong mailto:Mark.Armstrong&soleratec.com 2005-12 ++[Mark_B_Hurst] Mark B. Hurst mailto:mhurst&aspenres.com ++[Mark_Bailon] Mark Bailon mailto:mark.bailon&ericsson.com ++[Mark_Beyer] Mark Beyer mailto:mbeyer&freegate.com ++[Mark_Bocko] Mark Bocko mailto:bocko&ece.rochester.edu ++[Mark_Boler] Mark Boler mailto:markb&ttgsoftware.com ++[Mark_Burgess] Mark Burgess mailto:mark.burgess&iu.hioslo.no ++[Mark_Caldwell] Mark Caldwell mailto:development&caldsoft.co.uk 2011-08-12 ++[Mark_Cavage] Mark Cavage mailto:mcavage&us.ibm.com 2002-07 ++[Mark_Ciskey] Mark Ciskey mailto:mlciskey&plato.com ++[Mark_Crispin] Mark Crispin mailto:MRC&panda.com ++[Mark_Crispin_2] Mark Crispin mailto:MRC&cac.washington.edu ++[Mark_Crother] Mark Crother mailto:mark&eis.calstate.edu ++[Mark_Davidson] Mark Davidson mailto:mark_davidson&filemaker.com 2010-10-06 ++[Mark_Doyle] Mark Doyle mailto:mark&engagecom.com ++[Mark_E_Fogle] Mark E. Fogle mailto:mefogle&xantel.com ++[Mark_Ericksen] Mark Ericksen mailto:mark&jiiva.com ++[Mark_Ethan_Trostler] Mark Ethan Trostler mailto:mark&zzo.com 2011-11-23 ++[Mark_Farlin] Mark Farlin mailto:mfarlin&peerlogic.com ++[Mark_Fox] Mark Fox mailto:markf&uplanet.com ++[Mark_Gamble] Mark Gamble mailto:mark.gamble&sage.com 2003-02 ++[Mark_Garti] Mark Garti mailto:mgarti&sonusnet.com ++[Mark_H_David] Mark H. David mailto:mhd&gensym.com ++[Mark_H_Needleman] Mark H. Needleman mailto:markn&sirsi.com ++[Mark_Hankin] Mark Hankin ++[Mark_Hanson] Mark Hanson mailto:markh&intersys.com ++[Mark_Harrison] Mark Harrison mailto:Mark&xapautomation.org 2002-11 ++[Mark_Hendricks] Mark Hendricks mailto:markah&copper.net 2003-03 ++[Mark_Hodapp] Mark Hodapp mailto:mark.hodapp&sun.com ++[Mark_Hurst] Mark Hurst mailto:mhurst&inconnect.com ++[Mark_Itzcovitz] Mark Itzcovitz mailto:mji&vistacomp.com ++[Mark_Jackson] Mark Jackson Nuance mailto:Mark.Jackson&nuance.com 2011-10-27 ++ Communications, Inc. ++[Mark_Killgore] Mark Killgore mailto:MKillgore&novell.com ++[Mark_Kosters] Mark Kosters mailto:markk&internic.net ++[Mark_L_Lambert] Mark L. Lambert mailto:markl&ptt.lcs.mit.edu ++[Mark_Lewandowski] Mark Lewandowski mailto:mlewan0&us.ibm.com ++[Mark_Lewis] Mark Lewis mailto:Mark_Lewis&ccm.jf.intel.com ++[Mark_Lewis_2] Mark Lewis mailto:mark.h.lewis&intel.com ++[Mark_Lewis_3] Mark Lewis mailto:mark&surveillus.com ++[Mark_Lipford] Mark Lipford mailto:mark.a.lipford&sprint.com 2006-07 ++[Mark_Lottor] Mark Lottor mailto:MKL&nisc.sri.com ++[Mark_Lyall] Mark Lyall mailto:mark.lyall&madge.com ++[Mark_McCahill] Mark McCahill mailto:mpm&boombox.micro.umn.edu ++[Mark_McNamara] Mark McNamara mailto:markm&research.canon.com.au ++[Mark_Miller] Mark Miller mailto:markm&caplet.com ++[Mark_Miller_2] Mark Miller mailto:mmillerµsoft.com ++[Mark_Morris] Mark Morris mailto:mim&ermuk.com ++[Mark_Morwood] Mark Morwood mailto:markm&sentillion.com ++[Mark_Nijmeijer] Mark Nijmeijer mailto:Mark.Nijmeijer&citrix.com 2009-04-17 ++[Mark_O_Connell] Mark O'Connell mailto:oconnell_marka&emc.com 2008-12-04 ++[Mark_Parenti] Mark Parenti mailto:map&ntc.adaptec.com ++[Mark_Pearce] Mark Pearce mailto:Mark_A.._Pearce/AXON_Networks_Inc..@notes.axon.com ++[Mark_R_Ludwig] Mark R. Ludwig mailto:Mark-Ludwig&uai.com ++[Mark_S_Edwards] Mark S. Edwards mailto:marke&firefox.co.uk ++[Mark_Sapp] Mark Sapp mailto:mark.sapp&aionex.com 2006-04 ++[Mark_Sapsford] Mark Sapsford mailto:Mark_Sapsford&taligent.com ++[Mark_Schertler] Mark Schertler mailto:mjs&tycho.ncsc.mil ++[Mark_Schmatz] Mark Schmatz mailto:ditrios&markschmatz.de ++[Mark_Seuffert] Mark Seuffert mailto:captain2004&pirate.de 2004-11 ++[Mark_Simpson] Mark Simpson mailto:simpson¢erline.com ++[Mark_Stapp] Mark Stapp mailto:mjs&cisco.com 2006-01 ++[Mark_Stevens] Mark Stevens mailto:mstevens&ellacoya.com ++[Mark_Tim_Junghanns] Mark-Tim Junghanns mailto:mjunghanns&vangerow.de 2003-07 ++[Mark_Tirschwell] Mark Tirschwell mailto:mark.tirschwell&wallstreetsystems.com 2006-01 ++[Mark_Trostler] Mark Trostler mailto:trostler&juniper.net ++[Mark_Valence] Mark Valence mailto:kurash&sassafras.com ++[Mark_Wahl] Mark Wahl mailto:mark.wahl&informed-control.com 2005-11 ++[Mark_Windrim] Mark Windrim mailto:mark.windrim&infobright.com 2009-07-23 ++[Mark_Wood] Mark Wood mailto:mark.d.wood&kodak.com ++[Mark_Wooding] Mark Wooding mailto:mdw&distorted.org.uk 2007-07-10 ++[Mark_Zang] Mark Zang mailto:mark&zang.com ++[Mark_de_Rooi] Mark de Rooi mailto:derooi&xs4all.nl 2004-12 ++[Mark_mayernick] Mark mayernick mailto:Mark.Mayernick&thomson.net 2003-03 ++[Markku_Viima] Markku Viima mailto:markku.viima&team.icl.se ++[Marko_Bjelac] Marko Bjelac mailto:marko.bjelac&elma.hr 2010-06-10 ++[Marko_Kreen] Marko Kreen mailto:markokr&gmail.com 2009-02-13 ++[Markus_Brand] Markus Brand mailto:address-o-sync&slamslash.com ++[Markus_Loeffler] Markus Loeffler mailto:markus.loeffler&thomson.net 2009-02-17 ++[Markus_Michels] Markus Michels mailto:mmi&pmsmicado.com ++[Markus_Michels_2] Markus Michels mailto:mmi&cedros.com ++[Markus_Michels_3] Markus Michels mailto:markus.michels&cedros.com 2006-10 ++[Markus_Nix] Markus Nix mailto:mnix&docuverse.de 2005-08 ++[Markus_Sabadello] Markus Sabadello mailto:sabadello&startron.org ++[Markus_Sabadello_2] Markus Sabadello mailto:sabadello&starbot.org ++[Markus_Treinen] Markus Treinen mailto:markus.treinen&siemens.com 2006-02 ++[Marnus_Freeman] Marnus Freeman mailto:marnus&swistgroup.com 2006-02 ++[Marshall_Anschutz] Marshall Anschutz mailto:dnssd.tcode&icehousepro.us ++[Marshall_Rose] Marshall Rose mailto:mrose&dbc.mtview.ca.us ++[Martha_Crisson] Martha Crisson mailto:CRISSON&ralvm12.vnet.ibm.com ++[Martin_Bestmann] Martin Bestmann mailto:martin&datawatch.de ++[Martin_Bestmann_2] Martin Bestmann mailto:martin&no.netopia.com 2004-03 ++[Martin_Bestmann_3] Martin Bestmann mailto:martin&poleposition-sw.com 2005-08 ++[Martin_Burnicki] Martin Burnicki mailto:martin.burnicki&meinberg.de 2002-08 ++[Martin_Daly] Martin Daly mailto:martin.daly&cadcorp.com 2006-11 ++[Martin_Ellis] Martin Ellis mailto:martin&clanleagues.net 2004-11 ++[Martin_Forssen] Martin Forssen mailto:maf&appgate.com 2004-11 ++[Martin_Freiss] Martin Freiss mailto:freiss.pad&sni.de ++[Martin_Freiss_2] Martin Freiss mailto:freiss.pad@sni. ++[Martin_Hamilton] Martin Hamilton mailto:martin&mrrl.lut.as.uk ++[Martin_Kirk] Martin Kirk mailto:m.kirk&opengroup.org ++[Martin_Kochanski] Martin Kochanski mailto:martin&cardbox.co.uk ++[Martin_Leitner] Martin Leitner mailto:info&anton-paar.com 2004-06 ++[Martin_Lichtin] Martin Lichtin mailto:lichtin&oanda.com ++[Martin_Norman] Martin Norman mailto:martin&ndl.co.uk ++[Martin_Picard] Martin Picard ++[Martin_Pool] Martin Pool mailto:mbp&samba.org 2002-11 ++[Martin_Pool_2] Martin Pool mailto:mbp&canonical.com 2007-02 ++[Martin_Redington] Martin Redington mailto:mildm8nnered&gmail.com ++[Martin_Rostan] Martin Rostan mailto:m.rostan&beckhoff.com 2003-11 ++[Martin_Shoemaker] Martin Shoemaker mailto:shoemakerml&rapistan.com ++[Martin_Sustrik] Martin Sustrik mailto:sustrik&imatix.com 2007-03 ++[Martin_Technology] Martin Technology mailto:support&martian.com ++[Martin_Wehlou] J. Martin Wehlou Man In The Middle AB mailto:martin&mitm.se 2011-10-18 ++[Martin_West] Martin West mailto:Martin.West&spirit-soft.com ++[Martin_Ziskind] Martin Ziskind mailto:ziskind&us.ibm.com 2008-08-21 ++[Martine_Marchand] Martine Marchand tel:+16-1-46-59-24-84 ++[Marty_Batchelder] Marty Batchelder mailto:marty&capres.com ++[Marty_Borden] Marty Borden mailto:mborden&tollbridgetech.com ++[Marty_Campbell] Marty Campbell mailto:martycðosinfo.com 2011-06-10 ++[Marty_Lyons] Marty Lyons mailto:marty&aol.com ++[Marty_Schoffstahl] Marty Schoffstahl mailto:schoff&nisc.nyser.net ++[Martyn_Thomas] Martyn Thomas ++[Marvin_Shin] Marvin Shin mailto:president&medialingo.com ++[Marvin_Sirbu] Marvin Sirbu mailto:sirbu+&andrew.cmu.edu ++[Marvin_Solomon] Marvin Solomon mailto:solomon&cs.wisc.edu ++[Marvin_Toungate] Marvin Toungate mailto:toungate&austin.ibm.com ++[Mary_Ann_Burt] Mary Ann Burt mailto:bytex!ws054!maryann&uunet.uu.net ++[Mary_Holstage] Mary Holstage mailto:holstege&firstfloor.com ++[Mary_Holstege] Mary Holstege mailto:holstege&firstfloor.com ++[Masahiro_Koiwai] Masahiro Koiwai mailto:Koiwai.Masahiro&exc.epson.co.jp 2006-10 ++[Masakatsu_Matsuo] Masakatsu Matsuo mailto:masa&sdsft.kme.mei.co.jp ++[Masakuni_Okada] Masakuni Okada mailto:masakuni&jp.ibm.com ++[Masao_Iwai] Masao Iwai mailto:iwai&kel.fujitsu.co.jp ++[Masashi_Suzaki] Masashi Suzaki mailto:susakim&noa.nttdata.jp ++[Masato_Sato] Masato Sato mailto:satou203&oki.com 2006-05 ++[Massimiliano_Ribuoli] Massimiliano Ribuoli and mailto:support&address-o-matic.com ++ Marco Stefani ++[Massimo_Cafaro] Massimo Cafaro mailto:massimo.cafaro&unile.it 2004-11 ++[Massive_Flow_Product] Massive Flow Productions mailto:info&massiveflow.de ++[Matahari_Project] Matahari Project mailto:matahari&lists.fedorahosted.org 2011-08-31 ++[Matej_Sekoranja] Matej Sekoranja mailto:matej.sekoranja&cosylab.com 2012-03-23 ++[Math_Game_House_Soft] Math Game House Software mailto:mathgamehouse&mac.com ++[Mathew_Pitchforth] Mathew Pitchforth mailto:mathew&adinstruments.co.nz 2005-08 ++[Mathieu_Garcia] Mathieu Garcia mailto:mathieu.garcia&intua.net ++[Mat_Henshall] Mat Henshall Square Connect, Inc. mailto:mat&squareconnect.com 2011-10-07 ++[Mats_Nilsson] Mats Nilsson mailto:mats.nilsson&xware.se 2002-02 ++[Matt_Bendiksen] Matt Bendiksen mailto:matt&perceptiveautomation.com 2004-11 ++[Matt_Cecile] Matt Cecile mailto:mattc&metrics.com ++[Matt_Christiano] Matt Christiano mailto:globes@matt&oliveb.atc.olivetti.com ++[Matt_Christiano_2] Matt Christiano mailto:matt&reprisesoftware.com 2008-07-28 ++[Matt_Craig] Matt Craig mailto:matt&luxology.com ++[Matt_Craighead] Matt Craighead mailto:matt.craighead&conifersystems.com 2008-09-11 ++[Matt_Eagar] Matt Eagar mailto:matt.eagar&thinkflood.com ++[Matt_Hammond] Matt Hammond mailto:matt_hammond&four-sight.co.uk ++[Matt_Jensen] Matt Jensen mailto:mattj&newsblip.com ++[Matt_King] Matt King mailto:m&manyone.net 2002-04 ++[Matt_Lachance] Matt Lachance mailto:matt&cs-live.com ++[Matt_Nowicki] Matt Nowicki mailto:nowickim&iasdirect.com 2003-10 ++[Matt_Patenaude] Matt Patenaude mailto:MattPat&mattpat.net ++[Matt_Rogers] Matt Rogers mailto:mrogers&firescope.com 2008-10-16 ++[Matt_Rollins] Matt Rollins mailto:matt&anybusiness.com ++[Matt_Timmermans] Matt Timmermans ++[Matthew_Asham] Matthew Asham mailto:matthewa&bcwireless.net ++[Matthew_Baker] Matthew Baker mailto:matt.baker&intermec.com ++[Matthew_Darwin] Matthew Darwin mailto:matthew.darwin&hp.com 2005-08 ++[Matthew_Ford] Matthew Ford mailto:Matthew.Ford&forward.com.au 2003-03 ++[Matthew_Gast] Matthew Gast Aerohive Networks mailto:mgast&aerohive.com 2012-05-31 ++[Matthew_Horoschun] Matthew Horoschun mailto:mhoroschun&canprint.com.au ++[Matthew_Lloyd] Matthew Lloyd mailto:mlloyd&google.com 2010-04-26 ++[Matthew_MacKenzie] Matthew MacKenzie mailto:mattm&adobe.com ++[Matthew_Orzen] Matthew Orzen mailto:standards&starquest.com ++[Matthew_Strange] Matthew Strange mailto:matt&qsatoolworks.com 2009-03-06 ++[Matthew_Thomas] Matthew Thomas mailto:mrthom&essex.ac.uk 2008-01-07 ++[Matthew_Whited] Matthew Whited mailto:matt&thedotnetfactory.com 2008-01-16 ++[Matthew_Williams] Matthew Williams mailto:SPCsd_MWDD&hotmail.com ++[Matthias_Burghardt] Matthias Burghardt mailto:m.burghardt&x-on.de ++[Matthias_Riese] Matthias Riese mailto:Matthias.Riese&b-novative.de ++[Matthias_Schroer] Matthias Schroer mailto:matthias.schroer&invision.de ++[Matthias_Trute] Matthias Trute mailto:mtrute&web.de 2007-01 ++[Matthieu_Lachance] Matthieu Lachance mailto:matthieu.lachance&openwave.com ++[Matti_Salmi] Matti Salmi mailto:matti.salmi&nokia.com 2002-08 ++[Maurice_R_Turcotte] Maurice R. Turcotte mailto:mailrus!uflorida!rm1!dnmrt%25rmatl@uunet.uu.net ++[Max_Fudim] Max Fudim mailto:fudim&virtue3d.com ++[Max_Magliaro] Max Magliaro mailto:mmagliaro&bnisolutions.com 2004-11 ++[Max_Masyutin] Max Masyutin mailto:max&ritlabs.com ++[Max_Morris] Max Morris mailto:maxmµsoft.com ++[Maxim_Tseitlin] Maxim Tseitlin mailto:mtseitlin&iname.com ++[Maxime_Belanger] Maxime Belanger mailto:R173&hec.ca ++[Maxime_Deputter] Maxime Deputter mailto:m.deputter&ionixhosting.com 2006-04 ++[Maxine_Yuen] Maxine Yuen mailto:maxine&hq.ncube.com ++[Maya_Zimerman] Maya Zimerman mailto:mayaz&radware.co.il ++[Mayank_Vasa] Mayank Vasa mailto:mayank_vasa&symantec.com 2008-04-03 ++[Maziar_Tamadon] Maziar Tamadon mailto:maziar.tamadon&emulex.com 2007-11-06 ++[Mediatap_GbR] Mediatap GbR mailto:info&audiotapapp.com 2011-10-11 ++[MegaZone] MegaZone mailto:megazone&paycash.us 2005-08 ++[Megan_Woods] Megan Woods mailto:meganwoods&datafast.net.au ++[Meggie_Garica_Woodru] Meggie Garica-Woodruff mailto:ipulse&ericsson.com ++[Mehrdad_Ashtiani] Mehrdad Ashtiani mailto:mashtiani&ieeinc.com 2009-10-19 ++[Meindert_Sprang] Meindert Sprang mailto:ms&customware.nl 2009-02-18 ++[Mel_Oyler] Mel Oyler mailto:mel&novell.com ++[Melanie_Kacerek] Melanie Kacerek mailto:melanie.kacerek&quest.com 2008-12-16 ++[Melinda_Shore] Melinda Shore mailto:mshore&cisco.com 2006-05 ++[Melinda_Tsao] Melinda Tsao mailto:melinda&tpe1.sercomm.com.tw ++[Melinda_Tsao_2] Melinda Tsao mailto:melinda_tsao&mail.sercomm.com.tw ++[Menno_Zweistra] Menno Zweistra mailto:m.zweistra&metatude.com ++[Micha_Ben_Efraim] Micha Ben-Efraim mailto:benmi07&ca.com 2008-01-07 ++[Micha_Ben_Efraim_2] Micha Ben-Efraim mailto:micha&metalix.net 2011-01-31 ++[Micha_Ben_Efraim_3] Micha Ben-Efraim mailto:micha.ben-efraim&ca.com 2010-02-18 ++[Michael_Agishtein] Michael Agishtein mailto:misha&unx.dec.com ++[Michael_Alyn_Miller] Michael Alyn Miller mailto:iana&aeolon.com ++[Michael_Andre] Michael Andre mailto:mandre>s-tkts.com ++[Michael_Andre_2] Michael Andre mailto:mandre&gatewayticketing.com 2007-10-04 ++[Michael_Battilana] Michael Battilana mailto:mcb-iana&cloanto.net 2010-04-30 ++[Michael_Benz] Michael Benz mailto:michael.benz&lsi.com 2010-08-06 ++[Michael_Berg] Michael Berg mailto:mike&dataapples.com 2005-08 ++[Michael_Bishop] Michael Bishop mailto:mbishop&fishnetsecurity.com ++[Michael_Boyle] Michael Boyle mailto:michaelboyle&smarttech.com ++[Michael_Cahill] Michael Cahill mailto:Michael.Cahill&bullant.net ++[Michael_Chapman] Michael Chapman mailto:mchapman&fortresstech.com 2004-11 ++[Michael_Chirila] Michael Chirila mailto:Michael.Chirila&softwareag.com 2006-01 ++[Michael_Collins] Michael Collins mailto:UBMCollins&aol.com ++[Michael_Coon] Michael Coon mailto:michael&thecube.com ++[Michael_Crawford] Michael Crawford mailto:MichaelC&dev.travsoft.com ++[Michael_Crawford_2] Michael Crawford mailto:michaelc&travsoft.com ++[Michael_Dalpiaz] Michael Dalpiaz mailto:Michael.Dalpiaz&sirona.com ++[Michael_Daniele] Michael Daniele mailto:michael.daniele&syamsoftware.com 2003-11 ++[Michael_Dasenbrock] Michael Dasenbrock mailto:dasenbro&apple.com ++[Michael_DeMoney] Michael DeMoney mailto:demoney&eng.sun.com ++[Michael_Demmer] Michael Demmer mailto:demmer&cs.berkeley.edu 2006-11 ++[Michael_Dodge] Michael Dodge mailto:sarge¢erspan.com ++[Michael_Douglass] Michael Douglass mailto:mikedoug&datafoundry.net ++[Michael_Durrant] Michael Durrant Arcturus Networks mailto:mdurrant&arcturusnetworks.com 2011-10-20 ++ Inc. ++[Michael_Elizarov] Michael Elizarov mailto:Michael.Elizarovµsoft.com 2007-01 ++[Michael_Fischer] Michael Fischer mailto:otterley&pass.com ++[Michael_Fischer_2] Michael Fischer tel:+49-531-21-13-0 ++[Michael_Friedman] Michael Friedman mailto:mfr1&worldnet.att.net ++[Michael_Ginn] Michael Ginn mailto:ginn&tyxar.com ++[Michael_Gleicher] Michael Gleicher mailto:mgleicher&comcast.net ++[Michael_Haeuptle] Michael Haeuptle mailto:Michael_Haeuptle&hp.com ++[Michael_Hunter] Michael Hunter mailto:mphunter&qnx.com ++[Michael_J_Hoy] Michael J Hoy mailto:mhoy&canberra-abq.com ++[Michael_J_Primeaux] Michael J Primeaux mailto:michael.primeaux&renkara.com ++[Michael_Karagosian] Michael Karagosian mailto:michael.karagosian&mkpe.com 2008-09-04 ++[Michael_Khalandovsky] Michael Khalandovsky mailto:mlk&epicon.com ++[Michael_King] Michael King mailto:mike.king&pvxplus.com 2006-07 ++[Michael_Lacher] Michael Lacher HLW Software mailto:michael.lacher&hlw.co.at 2011-10-11 ++ Development GmbH ++[Michael_Landwehr] Michael Landwehr mailto:mikel&precisesoft.co.il ++[Michael_Lanzetta] Michael Lanzetta mailto:hagbard&ultimatech.com ++[Michael_Lekias] Michael Lekias mailto:admin&psdesign.com.au ++[Michael_Levy] Michael Levy mailto:ml&nh.ca ++[Michael_Lyle] Michael Lyle mailto:protocols&translattice.com 2009-11-03 ++[Michael_Marking] Michael Marking mailto:marking&tatanka.com ++[Michael_Marks] Michael Marks mailto:marks_michael&emc.com ++[Michael_McDaniels] Michael McDaniels Extreme Networks Inc mailto:mmcdaniels&extremenetworks.com 2008-05-01 ++[Michael_McNabb] Michael McNabb mailto:michael&aquaminds.com 2005-10 ++[Michael_Mealling] Michael Mealling mailto:michaelm&netsol.com ++[Michael_Mealling_2] Michael Mealling mailto:michael&refactored-networks.com 2005-08 ++[Michael_Melio] Michael Melio mailto:meliomd&comcast.net 2003-10 ++[Michael_Mester] Michael Mester mailto:mmester&cymtec.com ++[Michael_Monasterio] Michael Monasterio mailto:michael&wmsoftware.com ++[Michael_Muth] Michael Muth mailto:m.muth&tec5.com 2009-05-11 ++[Michael_O_Brien] Michael O'Brien mailto:mobrien02&comcast.net 2003-03 ++[Michael_O_Connor] Michael O'Connor mailto:moconnor&adobe.com ++[Michael_Paddon] Michael Paddon mailto:michael.paddon&activesky.com 2002-07 ++[Michael_Padrezas] Michael Padrezas mailto:mpaderzas&bluelance.com ++[Michael_Purser] Michael Purser mailto:mrp&mincom.com 2006-06 ++[Michael_R_Pizolato] Michael R. Pizolato mailto:michael&afs.com ++[Michael_R_Young] Michael R. Young mailto:michael.young&tor.sunpub.com ++[Michael_Rathmann] Michael Rathmann mailto:rathmann_ia&milesinfo.com ++[Michael_Richardson] Michael Richardson mailto:mcr&sandelman.ca 2011-02-08 ++[Michael_S_Amirault] Michael S Amirault mailto:ambi&world.std.com ++[Michael_S_Bogovich] Michael S. Bogovich mailto:info&burnthebox.us ++[Michael_S_Greenberg] Michael S. Greenberg mailto:arnoff&ftp.com ++[Michael_Scarito] Michael Scarito mailto:ms&mit.edu 2007-02 ++[Michael_Schmidt] Michael Schmidt mailto:mmaass&us.ibm.com ++[Michael_Schonborn] Michael Schoenborn T-Mobile mailto:michael.schoenborn&t-mobile.net 2009-09-11 ++ International AG ++[Michael_Settles] Michael Settles mailto:michael.settles&verizon.net 2002-03 ++[Michael_Sharpe] Michael Sharpe mailto:iana-ports&netiq.com 2010-09-14 ++[Michael_Shearson] Michael Shearson mailto:mshearson&peerglobal.com ++[Michael_Shearson_2] Michael Shearson mailto:mikes&softsys-inc.com ++[Michael_Sparks] Michael Sparks mailto:msparks&telequiplabs.com 2002-06 ++[Michael_Spratte] Michael Spratte mailto:michael.spratte&compaq.com ++[Michael_Stein] Michael Stein mailto:mvs&apple.com ++[Michael_Swan] Michael Swan mailto:swan&neon.com 2004-04 ++[Michael_Sweet] Michael Sweet mailto:msweet&ctr.nawcad.navy.mil ++[Michael_Tennefoss] Michael Tennefoss mailto:mtennefoss&echelon.com ++[Michael_Thesing] Michael Thesing mailto:michael.thesing&acsatlanta.com ++[Michael_Thomason] Michael Thomason mailto:mthomason&gmail.com ++[Michael_Toth] Michael Toth mailto:iana&spiralcraft.com 2002-03 ++[Michael_Ubell] Michael Ubell mailto:michael&montage.com ++[Michael_Walsh] Michael Walsh mailto:mww&warwick.net ++[Michael_Werski] Michael Werski mailto:michael.werski&azeti.net 2010-02-18 ++[Michael_Whiteley] Michael Whiteley mailto:michael&whiteley.com 2003-04 ++[Michael_Wood] Michael Wood mailto:wood&althea.hks.com ++[Michael_Yip] Michael Yip mailto:Michael.Yip&alcatel.com ++[Michael_Yun] Michael Yun mailto:cinnanda&gmail.com 2007-10-24 ++[Michael_Zirpel] Michael Zirpel mailto:mbz&rvscom.com ++[Michael_Zunke] Michael Zunke mailto:michael.zunke&ealaddin.com 2010-07-23 ++[Michael_Zunke_2] Michael Zunke mailto:Michael.Zunke&ealaddin.com 2010-07-23 ++[Michaela_Vanderveen] Michaela Vanderveen mailto:mvandervn&yahoo.com 2007-02 ++[Michel_Bourget] Michel Bourget mailto:michel&sgi.com 2009-01-06 ++[Michel_Stam] Michel Stam HaloteC Instruments mailto:michel.stam&halotec.com 2012-02-07 ++ B.V. ++[Micromat] Micromat mailto:supportµmat.com ++[Microsoft_Corporation] Microsoft Corporation mailto:pratsharµsoft.com 2011-08-04 ++[Microsoft_Corporation_2] Microsoft Corporation mailto:stdsreqµsoft.com 2012-03-15 ++[Microtec_Informatique] Microtec Informatique mailto:raphµtec.fr 2012-03-15 ++[MIDI_Manufacturers_Assoc_Inc] MIDI Manufacturers mailto:info&midi.org 2011-11-14 ++ Assoc Inc ++[Miguel_Angel_Fernand] Miguel Angel Fernandez mailto:mafg&tid.es ++[Miguel_Angel_Garcia] Miguel Angel Garcia mailto:Miguel.A.Garcia&ericsson.com ++[Mike_Accetta] Mike Accetta mailto:MIKE.ACCETTA&cmu-cs-a.edu ++[Mike_Alexander] Mike Alexander mailto:mta&um.cc.umich.edu ++[Mike_Balch] Mike Balch mailto:mbalch&teltone.com ++[Mike_Barthelemy] Mike Barthelemy mailto:msb&chromagrafx.com ++[Mike_Bello] Mike Bello mailto:mbello&zarak.com ++[Mike_Bernadett] Mike Bernadett mailto:mjbernadett&sbcglobal.net 2010-06-03 ++[Mike_Berrow] Mike Berrow ++[Mike_Bert] Mike Bert mailto:BERG_MIKE&tandem.com ++[Mike_Bombich] Mike Bombich mailto:bombich&apple.com ++[Mike_Brady] Mike Brady mailto:brady&cs.tcd.ie ++[Mike_Bush] Mike Bush mailto:mike.bush&allenvanguard.com ++[Mike_Clise] Mike Clise mailto:mikec&instantservice.com ++[Mike_Colagrosso] Mike Colagrosso mailto:ciao&ciaoapp.com 2011-10-24 ++[Mike_Cooper] Mike Cooper mailto:mcooper&magnicomp.com 2003-03 ++[Mike_Courterier] Mike Courterier mailto:mikec&deerfield.com ++[Mike_Craft] Mike Craft mailto:mcraft&cerner.com 2008-01-29 ++[Mike_Delgrosso] Mike Delgrosso mailto:mdelgros&tripplite.com 2003-01 ++[Mike_Delgrosso_2] Mike Delgrosso mailto:Mike_Delgrosso&tripplite.com 2007-07-02 ++[Mike_Dolan] Mike Dolan mailto:MDolan&ihcmail.ih.lucent.com ++[Mike_Dyslin] Mike Dyslin mailto:mike.dyslin&hp.com 2006-08 ++[Mike_Flemming] Mike Flemming mailto:mf&xnet.com ++[Mike_Gagle] Mike Gagle mailto:MikeG&inter-intelli.com ++[Mike_Gagle_2] Mike Gagle mailto:mikeg&inin.com 2006-05 ++[Mike_Goddard] Mike Goddard mailto:mike.goddard&ardent.com.au ++[Mike_Gossett] Mike Gossett mailto:mike&omnibond.com 2002-04 ++[Mike_Gregory] Mike Gregory mailto:Gregory_Mike&msmail.iipo.gtegsc.com ++[Mike_Harris] Mike Harris Adobe Systems Inc. mailto:mikeharr&adobe.com 2012-04-17 ++[Mike_Heins] Mike Heins mailto:mike&minivend.com ++[Mike_Horowitz] Mike Horowitz mailto:mah&shiva.com ++[Mike_Hudack] Mike Hudack mailto:mike&mhudack.com ++[Mike_Irani] Mike Irani mailto:irani_mike&bah.com 2002-10 ++[Mike_Irani_2] Mike Irani mailto:irani&spawar.navy.mil 2003-06 ++[Mike_Jackson] Mike Jackson mailto:mhjack&tscnet.com ++[Mike_King] Mike King mailto:mike.king&pvxplus.com 2009-11-09 ++[Mike_Klein] Mike Klein mailto:m.klein&motorla.com 2002-02 ++[Mike_Little] Mike Little mailto:mike.little&gdc4s.com ++[Mike_Marshburn] Mike Marshburn mailto:paul&softarc.com ++[Mike_McCauley] Mike McCauley mailto:mikem&open.com.au 2005-05 ++[Mike_Morgan] Mike Morgan mailto:mmorgan&lucent.com ++[Mike_Morris] Mike Morris mailto:mike.morris&amx.com ++[Mike_Nuss] Mike Nuss mailto:mike&terascala.com ++[Mike_O_Brien] Mike O'Brien mailto:mike&mobrien.com 2004-11 ++[Mike_Pontillo] Mike Pontillo mailto:pontillo&hp.com 2003-08 ++[Mike_Rieker] Mike Rieker mailto:mikea&sp32.com ++[Mike_Rodbell] Mike Rodbell mailto:mrodbell&ciena.com ++[Mike_Sherrill] Mike Sherrill mailto:sherrill&commvault.com ++[Mike_Spitzer] Mike Spitzer mailto:mjs&polyserve.com 2005-08 ++[Mike_St_Johns] Mike St. Johns mailto:stjohns&arpa.mil ++[Mike_Turley] Mike Turley mailto:turley&symplex.com ++[Mike_Velten] Mike Velten mailto:Mike_Velten&liebert.com ++[Mike_Velten_2] Mike Velten mailto:mike.Velten&liebert.com 2002-03 ++[Mike_Wray] Mike Wray mailto:mjw&hplb.hpl.hp.com ++[Mike_Wright] Mike Wright DIFUSI, Inc. mailto:mike&adnodes.co 2011-11-07 ++[Mike_Yenco] Mike Yenco mailto:mike¥co.com ++[Mike_Young] Mike Young mailto:myong&netattach.com ++[Mikhail_Belov] Mikhail Belov mailto:mikhail&imrgold.com 2002-02 ++[Mikhail_Kruk] Mikhail Kruk mailto:mkruk&biscom.com ++[Milton_E_Sagen] Milton E. Sagen mailto:msagen&extensis.com ++[Milton_Pulis] Milton Pulis mailto:toothpic&fastq.com ++[Milton_Sagen] Milton Sagen mailto:msagen&extensis.com ++[MINDARRAY_SYSTEMS] MINDARRAY SYSTEMS (P) mailto:info&mindarraysystems.com 2011-10-25 ++ LTD. ++[Ming_Jen_Chen] Ming-Jen Chen mailto:mjchen&trendchip.com.tw 2002-09 ++[Ming_Poon] Ming Poon mailto:mingp&corel.ca ++[Ming_Xu] Ming Xu mailto:ming&veritas.com ++[Ming_Zhang] Ming Zhang mailto:mzhang&cisco.com 2010-02-04 ++[Minoru_Ozaki] Minoru Ozaki mailto:Minoru.Ozaki&rdmg.mgcs.mei.co.jp ++[Mircea_Neacsu] Mircea Neacsu mailto:mircea&hypack.com 2011-10-27 ++[Miriam_Wohlgelernter] Miriam Wohlgelernter mailto:miriamw&adirtech.com ++[Mitch_Kaufman] Mitch Kaufman mailto:mk&weconnectyou.com ++[Mitchell_Bass] Mitchell Bass mailto:mitch&integrasolv.com 2005-08 ++[MITM] Man In The Middle AB mailto:martin&mitm.se 2011-10-18 ++[Mitra] Mitra mailto:mitra&earth.path.net ++[Mitsuji_Toda] Mitsuji Toda mailto:toda&mmedia.mci.mei.co.jp ++[Mitsuo_Kodama] Mitsuo Kodama mailto:kodama&jbmia.or.jp 2005-06 ++[Miva_Corporation] Miva Corporation mailto:jwoods&miva.com.au ++[Mohsen_Banan] Mohsen Banan mailto:mohsen&rostam.neda.com ++[Mohsen_Banan_2] Mohsen Banan mailto:mohsen&neda.com ++[Moises_E_Hernandez] Moises E. Hernandez mailto:moises&accugraph.com ++[Montgomery_Zukowski] Montgomery Zukowski mailto:monty&nextnorth.acs.ohio-state.edu ++[Monty] Monty mailto:monty&analytikerna.se ++[Moon_Ho_Chung] Moon Ho Chung mailto:mchung&esps.com ++[Morgan_Doyle] Morgan Doyle mailto:morgan&mpt.ie ++[Morgan_Jones] Morgan Jones mailto:mwj&cyasolutions.com ++[Moritz_Schmale] Moritz Schmale mailto:narrow.m&gmail.com 2011-10-07 ++[Morten_Christensen] Morten Christensen mailto:mjc&exbit.dk ++[Morten_Mertner] Morten Mertner mailto:mm&audiojuggler.com 2002-11 ++[Morteza_Kalhour] Morteza Kalhour mailto:Morteza.Kalhour&nokia.com 2002-02 ++[Mosha_Pasumansky] Mosha Pasumansky mailto:moshapµsoft.com ++[Moshe_Beeri] Moshe Beeri mailto:moshe&whale-com.com ++[Moshe_Leibovitch] Moshe Leibovitch mailto:moshe&softlinkusa.com ++[Moshe_Livne] Moshe Livne mailto:moshe&softlinkusa.com ++[Motorola_Solutions_Inc] Motorola Solutions, mailto:jenish&motorolasolutions.com 2012-03-14 ++ Inc. ++[Murali_Ranganathan] Murali Ranganathan mailto:murali_ranganathan&quickmail.apple.com ++[Murray_Freeman] Murray Freeman mailto:murray&officedomain.com ++[Murthy_Parthasarathi] Murthy Parthasarathi mailto:pvmurthy&effigent.com ++[Murthy_Srinivas] Murthy Srinivas mailto:murthy&novell.com ++[Muscarella_Fabrizio] Muscarella Fabrizio mailto:fabrizio.muscarella&sap.com 2006-04 ++[Muse_Communications] Muse Communications mailto:howard&muse3d.com ++ Corporation ++[Myk_Willis] Myk Willis mailto:myk.willis&citrix.com ++[Myron_Hattig] Myron Hattig mailto:Myron_Hattig&ccm.jf.intel.com ++[NLnet_Labs_Support] NLnet Labs Support NLnet Labs mailto:support&nlnetlabs.nl 2011-07-11 ++[Nancy_Davoust] Nancy Davoust mailto:n.davoust&cablelabs.com ++[Nand_Kumar] Nand Kumar mailto:nkumar&triquest-da.com ++[Naoki_Hayashi] Naoki Hayashi mailto:ha&fjh.se.fujitsu.co.jp ++[Narain_Jagathesan] Narain Jagathesan mailto:narain.jagathesan&oracle.com 2003-11 ++[Narasimha_Rao_N] Narasimha Rao N. mailto:nnarasimharao&novell.com ++[Narayanan_Raju] Narayanan Raju mailto:narayanan.raju&hp.com 2009-02-05 ++[Natarajan_Balasundar] Natarajan Balasundara mailto:rajan&ipanoramii.com ++[Nate_Rivard] Nate Rivard mailto:nrivard&cc.gatech.edu ++[Nathan_Hammond] Nathan Hammond mailto:nathan.hammond&stonebranch.com 2005-10 ++[Nathan_Sadia] Nathan Sadia mailto:sadia&maincontrol.com ++[National_Instruments] National Instruments mailto:joshua.prewitt&ni.com 2011-10-24 ++ National Marine ++[National_Marine_Electronics_Association] Electronics mailto:sspitzer&nmea.org 2011-09-15 ++ Association ++[Neal_Taylor] Neal Taylor mailto:ianareg&apani.com ++[Nedelcho_Stanev] Nedelcho Stanev mailto:nstanev&csoft.bg ++[Nedelcho_Stanev_2] Nedelcho Stanev mailto:decho&csoft.bg ++[Nedelcho_Stanev_3] Nedelcho Stanev mailto:decho&iname.com ++[Neel_A_Bhatt] Neel A. Bhatt Symantec Corp mailto:neel_bhatt&symantec.com 2012-01-03 ++[Neer_Kleinman] Neer Kleinman mailto:neer&qsr.co.il ++[Neil_Coggins] Neil Coggins mailto:neil.coggins&6thsight.com 2006-07 ++[Neil_Salter] Neil Salter mailto:neil&indigo2.mvel.demon.co.uk ++[Nestor_A_Diaz] Nestor A. Diaz mailto:nestor&tiendalinux.com 2009-05-12 ++[NetOp_Technical_Supp] NetOp Technical Support mailto:support&danware.dk ++[Nevil_Brownlee] Nevil Brownlee mailto:n.brownlee&auckland.ac.nz 2006-10 ++[NexStor_India_Limite] NexStor India Limited mailto:next&nda.vsnl.net.in ++[NextDay_Aps] NextDay Aps mailto:nextday&infinite-loop.dk 2012-04-24 ++[Niall_Hogg] Niall Hogg mailto:niall.hogg&interamics.com 2011-10-25 ++[Niall_Murphy] Niall Murphy mailto:niallm&orca.ucd.ie ++[Nic_Catrambone] Nic Catrambone mailto:ncatramb&us.ibm.com 2003-01 ++[Nicholas_Chua] Nicholas Chua mailto:nick&sendit.se ++[Nicholas_Davies] Nicholas Davies mailto:N.Davies&globalcomm.co.uk ++[Nicholas_J_Howes] Nicholas J Howes mailto:nick&ghostwood.org ++[Nicholas_Stowfis] Nicholas Stowfis mailto:nstowfis&esps.com ++[Nicholas_Young] Nicholas Young mailto:ntchkd&gmail.com 2008-07-10 ++[Nick_Austin] Nick Austin mailto:ogmion&ogmium.com ++[Nick_Barendt] Nick Barendt mailto:nbarendt&vxitech.com 2005-08 ++[Nick_Barendt_2] Nick Barendt mailto:nbarendt&vxitech.com ++[Nick_Barendt_3] Nick Barendt mailto:nbarendt&vxitech.com ++[Nick_Brosnahan] Nick Brosnahan mailto:nbrosnahan&apple.com ++[Nick_Connor] Nick Connor mailto:nickc&assuria.com 2010-06-30 ++[Nick_Emery] Nick Emery mailto:Nick.Emery&altavista.digital.com ++[Nick_Holt] Nick Holt mailto:nickh&purenetworks.com 2005-08 ++[Nick_Plante] Nick Plante mailto:nplante&dmod.com ++[Nick_Shipman] Nick Shipman mailto:Nick.Shipman&mrmog.reo.dec.com ++[Nick_Stephen] Nick Stephen mailto:nick.stephen&sun.com 2005-08 ++[Nick_Straguzzi] Nick Straguzzi mailto:Nick_Straguzzi&akbs.com ++[Nick_Warrington] Nick Warrington mailto:nick.warrington&paconsulting.com 2006-03 ++[Nick_Woronuk] Nick Woronuk mailto:nick.woronuk&megasys.com ++[Nick_de_Smith] Nick de Smith mailto:nick&desmith.net ++[Nicola_J_Howarth] Nicola J. Howarth mailto:njh&ansa.co.uk ++[Nicolas_Bouilleaud] Nicolas Bouilleaud mailto:nbouilleaud&lacie.com ++[Nicolas_Payette] Nicolas Payette mailto:payetten&trivialtechnology.com ++[Nicolas_Williams] Nicolas Williams mailto:Nicolas.Williams&oracle.com 2010-08-09 ++[Nicole_C_Ouellette] Nicole C. Ouellette mailto:nouellette&connected.com 2004-02 ++[Niels_Castle] Niels Castle mailto:castle&castleandersen.dk ++[Niels_Christiansen] Niels Christiansen mailto:nchris&austin.ibm.com ++[Nigel_Groves] Nigel Groves mailto:nigel.groves&ca.com 2006-06 ++[Nigel_Stephens] Nigel Stephens mailto:nigel&algor.co.uk ++[Nigel_Warren] Nigel Warren mailto:info&flyobjectspace.com 2009-02-12 ++[Niklas_Weiss] Niklas Weiss mailto:n.weiss&d-trust.net 2004-11 ++[Nikolaus_Gerteis] Nikolaus Gerteis mailto:ngerteis&apple.com ++[Nimrod_Diamant] Nimrod Diamant mailto:nimrod.diamant&intel.com 2005-02 ++[Nine_Technology_LLC] Nine Technology, LLC mailto:astoev&ninetechnology.com 2011-08-01 ++[Nir_Baroz] Nir Baroz mailto:nbaroz&encore.com ++[Nitin_Gupta] Nitin Gupta mailto:nguptµsoft.com 2008-12-24 ++[Nitza_Steinberg] Nitza Steinberg mailto:nitza&isd.3com.com ++[Nitzan_Daube] Nitzan Daube mailto:nitzan&brm.com ++[Noah_Paul] Noah Paul mailto:noahp&altavista.net ++[Noah_Paul_2] Noah Paul mailto:noahp&ultranet.com ++[Noah_Slater] Noah Slater mailto:nslater&bytesexual.org 2007-11-27 ++[Noam_Rimon] Noam Rimon mailto:noam.rimon&playstation.sony.com 2004-12 ++[Noor_Chowdhury] Noor Chowdhury mailto:noor&hypercom.com ++[Norbert_Kintzler] Norbert Kintzler mailto:NKintzler&easy-soft-dresden.de 2004-11 ++[Norbert_Sendetzky] Norbert Sendetzky mailto:norbert&linuxnetworks.de ++[Norival_Figueira] Norival Figueira mailto:nfigueir&brocade.com 2010-04-07 ++[Norm_Freedman] Norm Freedman mailto:normfree&san.rr.com 2003-08 ++[Norm_Freedman_2] Norm Freedman mailto:normfree&worldnet.att.net ++[Norm_Lunde] Norm Lunde mailto:norm&commvault.com 2004-11 ++[Norman_Brie] Norman Brie mailto:norm_brie&sns.ca ++[Norman_Wilson] Norman Wilson mailto:nwilson&programmar.com 2010-10-06 ++[Northon_Rodrigues] Northon Rodrigues mailto:northon.rodrigues&thomson.net 2004-02 ++[Notable_Solutions_Inc] Notable Solutions, mailto:dev&nsius.com 2011-09-01 ++ Inc. ++[NovaWiz_LTD] NovaWiz LTD mailto:Moshe&novawiz.com ++[Nuance_Communications_Inc] Nuance mailto:Mark.Jackson&nuance.com 2011-10-27 ++ Communications, Inc. ++[OASIS_KMIP_Technical_Committee] OASIS KMIP Technical mailto:robin&oasis-open.org 2011-07-25 ++ Committee ++[OC] OC mailto:ocs&ocs.cz ++[Object_Matrix] Object Matrix mailto:support&object-matrix.com ++[Objective_Decision] Objective Decision mailto:od4contact&objective-decision.com ++[Odo_Maletzki] Odo Maletzki mailto:Odo.Maletzki&ioag.de ++[Oishi_Toshiaki] Oishi Toshiaki SEIKO EPSON mailto:Oishi.Toshiaki&exc.epson.co.jp 2002-02 ++ Corporation ++[Ola_Sandstrom] Ola Sandstrom mailto:ola.sandstrom&anoto.com 2003-03 ++[Ola_Strandberg] Ola Strandberg mailto:Ola.Strandberg&pharmasoft.se ++[Ole_Hellevik] Ole Hellevik mailto:oleh&interlinq.com ++[Ole_Morten_Duesund] Ole-Morten Duesund mailto:ole-morten.duesund&bbvisuals.no ++[Oleg_Noskov] Oleg Noskov mailto:olegn&corelcomputer.com ++[Oleksandr_Zakharchuk] Oleksandr Zakharchuk mailto:zakharchuk&dialogtech.com ++[Oliver_Anan] Oliver Anan mailto:oliver&ananit.de 2010-09-02 ++[Oliver_Bailey] Oliver Bailey mailto:zzf66jjlm&time-lines.com 2003-01 ++[Oliver_Heinz] Oliver Heinz mailto:heinz&arago.de 2005-08 ++[Oliver_Korfmacher] Oliver Korfmacher mailto:okorf&netcs.com ++[Oliver_Lewis] Oliver Lewis mailto:o.lewis&icerobotics.co.uk 2006-08 ++[Oliver_Thulke] Oliver Thulke mailto:oth&ratio.de ++[Olivier_Delecluse] Olivier Delecluse mailto:odelecluse&intego.com ++[Olivier_Guezenec] Olivier Guezenec mailto:olivier.guezenec&cogilab.com 2006-12 ++[Olivier_Mascia] Olivier Mascia mailto:om&tipgroup.com ++[One_Laptop_per_Child] One Laptop per mailto:devel&lists.laptop.org ++ Child/Collabora Ltd. ++[Open_Mobile_Alliance] Open Mobile Alliance mailto:Technical-Comments&mail.openmobilealliance.org 2011-08-19 ++ Open Mobile Alliance ++[Open_Mobile_Alliance_Device_Management_DM_Working_Group] Device Management (DM) mailto:Technical-Comments&mail.openmobilealliance.org 2011-08-19 ++ Working Group ++[OpenMail_Encyclopedi] OpenMail Encyclopedia mailto:opencyc&hpopd.pwd.hp.com ++[OPNET_Technologies_Inc] OPNET Technologies mailto:tmacomber&opnet.com 2011-09-21 ++ Inc ++[Oracle] Oracle Corporation mailto:Devjani.Ray&oracle.com 2012-04-20 ++[Oran_Davis] Oran Davis mailto:oran&8x8.com ++[Orazio_Granato] Orazio Granato mailto:og&wsbgrd01.italy.hp.com ++[Oren_Hurvitz] Oren Hurvitz mailto:oren&omnisky.com ++[Oren_Trutner] Oren Trutner mailto:orentrutµsoft.com 2003-08 ++[Ori_Yosefi] Ori Yosefi mailto:Ori.Yosefiµsoft.com 2009-05-04 ++[Oriol_Ferrer_Mesia] Oriol Ferrer Mesia mailto:tm05788&salleurl.edu ++[Orion_Reblitz_Richar] Orion Reblitz-Richardson mailto:orionr&rakket.com ++[Osamu_Masuda] Osamu Masuda ++[Oskar_Persano] Oskar Persano ims Info Management mailto:ope&ims-info.ch 2011-10-20 ++ Systems AG ++[Owen_Sullivan] Owen Sullivan mailto:owen.sullivan&aldiscon.ie ++[Ozate_Inc] Ozate Inc. mailto:joe&ozate.com 2011-10-12 ++[POV_Team_Co_ordinato] POV-Team Co-ordinator mailto:iana-port.remove-spamguard&povray.org ++[PV_Shivkumar] PV Shivkumar mailto:p.shivkumar&oracle.com 2003-10 ++[P_T_K_Farrar] P.T.K. Farrar mailto:farrarp&teccon.co.uk ++[P_V_Shivkumar] P.V.Shivkumar mailto:PSHIVKUM&us.oracle.com ++[Panic_Ride] Panic Ride mailto:panicride&hao.org ++[Paolo_Desii] Paolo Desii POWERSOFT S.R.L. mailto:paolo.desii&powersoft.it 2012-01-03 ++[Pat_Calhoun] Pat Calhoun mailto:CALHOUN&admin.eicon.qc.ca ++[Pat_Galvin] Pat Galvin mailto:pgalvin&databeam.com ++[Pat_Mcgowan] Pat Mcgowan mailto:pmcgowan&folio.com ++[Pat_Richard] Pat Richard mailto:patr&xcert.com ++[Pat_Tovo] Pat Tovo mailto:pat.tovo&veritas.com 2004-12 ++[Patrick_Chipman] Patrick Chipman mailto:pchipman&memphis.edu ++[Patrick_Cipiere] Patrick Cipiere mailto:Patrick.Cipiere&udcast.com ++[Patrick_Ferriter] Patrick Ferriter mailto:Patrick.Ferriter&zultys.com 2003-06 ++[Patrick_Fisher] Patrick Fisher mailto:pfisher&hns.com 2004-12 ++[Patrick_Furlong] Patrick Furlong mailto:pfurlong&darkknight.ca 2003-01 ++[Patrick_H_Piper] Patrick H. Piper mailto:ppiper&netlinxinc.com 2009-03-06 ++[Patrick_Kara] Patrick Kara mailto:Patrick&eba.net ++[Patrick_Lee] Patrick Lee mailto:leecotechnologies&comcast.net 2008-03-10 ++[Patrick_M_McNeal] Patrick M McNeal mailto:mcneal&umich.edu 2006-03 ++[Patrick_McNamee] Patrick McNamee ++[Patrick_Moore] Patrick Moore mailto:pcmoore&sandia.gov ++[Patrick_Noffke] Patrick Noffke mailto:patrick.noffke&adpro.com.au ++[Patrick_Robinson] Patrick Robinson mailto:probinson&plosive.com ++[Patrick_Stein] Patrick Stein mailto:Patrick.Stein&jinx.eu 2011-10-24 ++[Patrick_Verbeek] Patrick Verbeek mailto:p.verbeek&scottygroup.com 2007-05 ++[Patti_Jo_Newsom] Patti Jo Newsom mailto:pjn&mcsdallas.com ++[Patty_Ho] Patty Ho mailto:rimf&core.rose.hp.com 2007-05 ++[Paul_A_Suhler] Paul A. Suhler mailto:paul.suhler&quantum.com 2009-02-06 ++[Paul_Alfille] Paul Alfille mailto:paul.alfille&gmail.com 2007-01 ++[Paul_Amsden] Paul Amsden mailto:amsden@.ctron.com ++[Paul_Anderson] Paul Anderson mailto:paul.anderson&ip-cs.com 2003-04 ++[Paul_Annala] Paul Annala mailto:paa&bull.se ++[Paul_Applegate] Paul Applegate mailto:p.applegate2&genie.geis.com ++[Paul_Austin] Paul Austin mailto:paul.austin&natinst.com ++[Paul_B_Finley] Paul B. Finley mailto:pfinley&us.ibm.com 2003-10 ++[Paul_Ballew] Paul Ballew mailto:ballew&projtech.com ++[Paul_Blacknell] Paul Blacknell mailto:paul&insitu.com ++[Paul_Bohm] Paul Bohm mailto:paul&dropbox.com 2010-01-21 ++[Paul_Breed] Paul Breed mailto:paul&netburner.com 2003-11 ++[Paul_Breslin] Paul Breslin mailto:phb&sidefx.com ++[Paul_Brown] Paul Brown mailto:pbrown&spcontrols.com 2011-04-27 ++[Paul_Bunn] Paul Bunn mailto:iana&ultrabac.com ++[Paul_Cadarette] Paul Cadarette mailto:pcadaret&us.ibm.com 2007-01 ++[Paul_Carmichael] Paul Carmichael mailto:paulcarmichael&indx.net ++[Paul_Chinn] Paul Chinn Apple mailto:pchinn&apple.com 2011-10-20 ++[Paul_Clark] Paul Clark mailto:paul&xmill.com 2006-02 ++[Paul_Cope] Paul Cope mailto:prc&auto-graphics.com 2003-11 ++[Paul_Denning] Paul Denning mailto:pauld&mitre.org ++[Paul_Dietrich] Paul Dietrich mailto:registrar&impinj.com ++[Paul_Dollemore] Paul Dollemore mailto:pauld&anthonydata.com ++[Paul_Fonte] Paul Fonte mailto:paul_fonte&mediastation.com ++[Paul_Ford_Hutchinson] Paul Ford-Hutchinson mailto:paulfordh&uk.ibm.com 2003-01 ++[Paul_Funk] Paul Funk mailto:paul&funk.com ++[Paul_Glaubitz] Paul Glaubitz mailto:Paul.Glaubitz&mt.com ++[Paul_Greenfield] Paul Greenfield mailto:paul.greenfield&unisys.com ++[Paul_Groarke] Paul Groarke mailto:paulg&quay.ie ++[Paul_Guyot] Paul Guyot mailto:pguyot&kallisys.net 2003-01 ++[Paul_H_Alfille] Paul H Alfille mailto:paul.alfille&gmail.com ++[Paul_Harrison] Paul Harrison mailto:paulh&idonix.co.uk ++[Paul_Hodara] Paul Hodara mailto:phodara&netwave.com 2005-11 ++[Paul_Hoffman] Paul Hoffman mailto:phoffman&imc.org ++[Paul_Ignatius] Paul Ignatius mailto:paul.ignatius&scentric.com 2006-03 ++[Paul_Johnson] Paul Johnson mailto:paul.johnson&raima.com 2011-05-02 ++[Paul_K_Peterson] Paul K. Peterson mailto:paul&tribal.com ++[Paul_Kraus] Paul Kraus mailto:paul.kraus&veritas.com 2002-06 ++[Paul_Leach] Paul Leach mailto:paulleµsoft.com ++[Paul_Lesurf] Paul Lesurf mailto:paul.lesurf&vpltd.com ++[Paul_M_Franceus] Paul M Franceus mailto:paul&blueiris.us ++[Paul_McEntire] Paul McEntire mailto:paul.mcentire&columbiasc.ncr.com ++[Paul_McGinnis] Paul McGinnis mailto:pmcginnis&server.stmi.com ++[Paul_McGough] Paul McGough mailto:pmcgough&2factor.com 2007-02 ++[Paul_Mclachlan] Paul Mclachlan mailto:pmclachlan&mercury.com 2005-11 ++[Paul_Mockapetris] Paul Mockapetris mailto:PVM&isi.edu ++[Paul_Moore] Paul Moore mailto:paul.moore¢rify.com 2009-10-28 ++[Paul_Nelson] Paul Nelson mailto:paul&ioc-sea.com ++[Paul_Pyck] Paul Pyck mailto:papy&telindus.be ++[Paul_Reddy] Paul Reddy mailto:preddy&pharos.com ++[Paul_Reddy_2] Paul Reddy mailto:support&igo-incognito.com 2002-02 ++[Paul_Roberts] Paul Roberts mailto:PaulRoberts&engineer.com ++[Paul_Sanders] Paul Sanders mailto:p.sanders&dial.pipex.com ++[Paul_Sanders_2] Paul Sanders mailto:pe77&dial.pipex.com ++[Paul_Santinelli_Jr] Paul Santinelli Jr. mailto:psantinelli&narrative.com ++[Paul_Schilling] Paul Schilling mailto:PaulS&synapsis.com ++[Paul_Snook] Paul Snook mailto:paul.snook&itheon.com ++[Paul_Stephen_Borlie] Paul Stephen Borlie mailto:paul&icona.it ++[Paul_Sterk] Paul Sterk mailto:paul.sterk&sun.com 2006-03 ++[Paul_Streatch] Paul Streatch mailto:pstreatch&marchnetworks.com 2004-06 ++[Paul_Suhler] Paul Suhler mailto:paul.suhler&quantum.com 2008-02-15 ++[Paul_Tam] Paul Tam mailto:ianaportmaster&onbase.com 2004-12 ++[Paul_Tokarchuk] Paul Tokarchuk mailto:ptokarch&alias.com 2004-11 ++[Paul_Vixie] Paul Vixie mailto:paul&vix.com ++[Paul_W_Nelson] Paul W. Nelson mailto:nelson&thursby.com ++[Paul_Whittemore] Paul Whittemore mailto:paul&softarc.com ++[Paul_Wissenbach] Paul Wissenbach mailto:paulwi&vnd.tek.com ++[Paul_Wissmiller] Paul Wissmiller mailto:Paul.Wissmiller&ca.com ++[Paul_Wren] Paul Wren mailto:Paul.Wren¯o4.com ++[Paul_Zander] Paul Zander Philips CFT mailto:p.j.zander&philips.com 2004-03 ++[Pavel_Mendl] Pavel Mendl mailto:pavel_mendl¢rum.cz 2007-03 ++[Pavlin_Ivanov_Radosl] Pavlin Ivanov Radoslavov mailto:pavlin&catarina.usc.edu ++[Pearson] Pearson mailto:chad.smith&pearson.com 2008-01-17 ++[Pedro_A_Rodriguez] Pedro A Rodriguez mailto:pedro.rdz&eaxtechnologies.com.mx 2008-08-06 ++[Pedro_Alpedrinha] Pedro Alpedrinha mailto:pedro.alpedrinha&redevirtual.com 2006-02 ++[Pekka_Riikonen] Pekka Riikonen mailto:priikone&poseidon.pspt.fi ++[Pekka_Takaranta] Pekka Takaranta mailto:pekka.takaranta&tellabs.fi ++[Per_Cederqvist] Per Cederqvist mailto:ceder&lysator.liu.se ++[Per_Fahlberg] Per Fahlberg mailto:support&remograph.com 2009-01-21 ++[Per_Hellberg] Per Hellberg mailto:phellberg&isogon.com 2002-02 ++[Per_Sahlqvist] Per Sahlqvist mailto:psahlqvi&sw.seisy.abb.se ++[Per_Schroeder] Per Schroeder mailto:Per.Schroder&mimer.se ++[Pete_Camble] Pete Camble mailto:pete.camble&hp.com 2008-12-24 ++[Pete_Loeffen] Pete Loeffen President at Digital mailto:peterl&digitalrowing.com 2006-10 ++ Rowing Inc. ++[Pete_Moscatelli] Pete Moscatelli mailto:moscat&hprdstl0.rose.hp.com ++[Pete_Wong] Pete Wong mailto:petewongµsoft.com ++[Peter_Amstutz] Peter Amstutz mailto:tetron&interreality.org ++[Peter_Anvelt] Peter Anvelt mailto:panvelt&xnai.com ++[Peter_Aronson] Peter Aronson mailto:paronson&esri.com ++[Peter_Beahan] Peter Beahan mailto:peter_beahan&technologyonecorp.com 2004-11 ++[Peter_Berger] Peter Berger mailto:peterb&panasas.com ++[Peter_Boers] Peter Boers mailto:boers&isisglobal.nl 2002-05 ++[Peter_Boucher] Peter Boucher mailto:pboucher&senforce.com ++[Peter_Carlson] Peter Carlson mailto:pcarlson&tier2.com ++[Peter_Caswell] Peter Caswell mailto:pfc&pacvax.pacersoft.com ++[Peter_Ciuffetti] Peter Ciuffetti mailto:petec&silverplatter.com ++[Peter_Dennis_Bartok] Peter Dennis Bartok mailto:peter&novonyx.com ++[Peter_E_Williams] Peter E Williams mailto:peter.williams&smallworld-us.com ++[Peter_Egli] Peter Egli mailto:peter.egli&inalp.com ++[Peter_Egli_2] Peter Egli mailto:peter.egli&mail.inalp.com ++[Peter_Eriksson] Peter Eriksson mailto:pen&lysator.liu.se ++[Peter_Fernandez] Peter Fernandez mailto:fernandez&omnisec.ch 2002-03 ++[Peter_Frankenberg] Peter Frankenberg mailto:pcfberg&ibm.net ++[Peter_G_L_Potgiese] Peter G. L. Potgieser mailto:p.g.l.potgieser&interpay.nl 2003-07 ++[Peter_Gabriel] Peter Gabriel mailto:peter.gabriel&ims.fraunhofer.de 2006-01 ++[Peter_Gad] Peter Gad mailto:peter&bmc.uu.se ++[Peter_Hallenbeck] Peter Hallenbeck mailto:pete&consumertechnologiesgroup.com 2005-08 ++[Peter_Higginson] Peter Higginson mailto:higginson&mail.dec.com ++[Peter_Hombach] Peter Hombach mailto:p.hombach&osorno.ca 2011-03-16 ++[Peter_Hussey] Peter Hussey mailto:peterhusµsoft.com ++[Peter_Hyde] Peter Hyde mailto:peter&spis.co.nz ++[Peter_Ijkhout] Peter Ijkhout mailto:peter&deltasolutions.nl ++[Peter_Jacobs] Peter Jacobs mailto:pjacobs&tullib.com ++[Peter_Johnson] Peter Johnson mailto:peter&commlinx.com.au 2004-11 ++[Peter_Kaever] Peter Kaever mailto:kaever.peter&westfalia.com 2005-08 ++[Peter_King] Peter King mailto:king&uplanet.com ++[Peter_Kollath] Peter Kollath mailto:peter.kollath&canex.sk 2002-08 ++[Peter_Krueger] Peter Krueger mailto:krueger&appss.de 2003-10 ++[Peter_Laschtowitz] Peter Laschtowitz mailto:pl&pq-computers.de 2009-09-15 ++[Peter_Lepeska] Peter Lepeska mailto:peter.lepeska&viasat.com 2010-09-10 ++[Peter_Lipp] Peter Lipp mailto:Peter.Lipp&iaik.at ++[Peter_Liu] Peter Liu ++[Peter_Loveday] Peter Loveday mailto:peter&eyeonline.com 2006-01 ++[Peter_MacAvock] Peter MacAvock mailto:macavock&dvb.org ++[Peter_Maher] Peter Maher mailto:quest_iana&oz.quest.com 2003-11 ++[Peter_Morrison] Peter Morrison mailto:peter_morrison&sydney.sterling.com ++[Peter_Moylan] Peter Moylan mailto:peter&ee.newcastle.edu.au 2002-08 ++[Peter_Phaal] Peter Phaal mailto:peter.phaal&inmon.com 2003-06 ++[Peter_Povinec] Peter Povinec mailto:peter.povinec&oracle.com 2010-04-13 ++[Peter_Pramberger] Peter Pramberger mailto:peter.pramberger&telering.co.at 2004-11 ++[Peter_Rocca] Peter Rocca mailto:rocca&multiboard.com 2002-10 ++[Peter_Saint_Andre] Peter Saint-Andre mailto:stpeter&stpeter.im 2009-11-25 ++[Peter_Sandstrom] Peter Sandstrom mailto:peter.sandstrom&tassen.fi ++[Peter_Santoro] Peter Santoro mailto:peter&pscomp.com ++[Peter_Schafer] Peter Schaefer mailto:p.schaefer&nospam.atc-systeme.de 2004-02 ++[Peter_Schoenberger] Peter Schoenberger mailto:ps&teles.de ++[Peter_Schow] Peter Schow mailto:Peter.Schow&sun.com 2007-01 ++[Peter_Steiner] Peter Steiner mailto:steiner&telecomsoftware.com 2011-02-22 ++[Peter_Teeuwen] Peter Teeuwen mailto:ptee&oce.nl ++[Peter_Verdon] Peter Verdon mailto:bess&dcs.warwick.ac.uk 2005-08 ++[Peter_Viscarola] Peter Viscarola mailto:PeterGV&osr.com ++[Peter_Wenzel] Peter Wenzel mailto:Peter.Wenzel&profibus.com 2004-11 ++[Peter_Weyman] Peter Weyman mailto:pjweyman&noblenet.com ++[Peter_White] Peter White mailto:peter_white&3com.com 2004-11 ++[Peter_Whittaker] Peter Whittaker mailto:pww&entrust.com ++[Peter_Zurich] Peter Zurich mailto:pbz&lowpft.com ++[Peter_de_Laval] Peter de Laval mailto:pdl§ra.se ++[Peter_van_Dijk] Peter van Dijk mailto:peter&xlshosting.nl 2011-01-10 ++[Petr_Chardin] Petr Chardin mailto:petr&mysql.com 2004-12 ++[Petri_Rauhala] Petri Rauhala mailto:petri.rauhala&nokia.com 2005-08 ++[Petronel_Bigioi] Petronel Bigioi mailto:petronel&fotonation.com 2004-11 ++[Phil_Abercrombie] Phil Abercrombie mailto:phil.abercrombie&appiq.com 2005-08 ++[Phil_Barrett] Phil Barrett mailto:support&cambridgeanimation.com ++[Phil_Braham] Phil Braham mailto:phil&braham.net ++[Phil_Davidson] Phil Davidson mailto:p.davidson&reftek.com ++[Phil_Frisbie] Phil Frisbie mailto:phil&hawksoft.com ++[Phil_Kerr] Phil Kerr mailto:phil&plus24.com 2002-02 ++[Phil_Lapsley] Phil Lapsley mailto:phil&ucbarpa.berkeley.edu ++[Phil_Maker] Phil Maker mailto:pjm&gnu.org 2008-06-18 ++[Phil_May] Phil May mailto:pm&datcon.co.uk ++[Phil_Piwonka] Phil Piwonka mailto:wnka&users.sourceforge.net ++[Phil_Servita] Phil Servita mailto:meister&ftp.com ++[Phil_Tolson] Phil Tolson mailto:philtolson&eaton.com 2010-01-21 ++[Phil_Willis] Phil Willis mailto:phil.willis&prism-uk.com 2003-08 ++[Phil_Willoughby] Phil Willoughby mailto:phil.willoughby&strawberrycat.com ++[Philip_Budne] Philip Budne mailto:budne&auroratech.com ++[Philip_N_Bergstress] Philip N. Bergstresser mailto:phil&bergstresser.org ++[Philip_Stephenson] Philip Stephenson mailto:Philip.stephenson&oracle.com 2005-08 ++[Philipp_Dreiss] Philipp Dreiss mailto:dreiss&isparx.de ++[Philipp_Marcel_Albre] Philipp Marcel Albrecht mailto:phipi&gmx.ch 2009-07-06 ++[Philippe_Binet] Philippe Binet mailto:phbinet&vnet.ibm.com ++[Philippe_Detournay] Philippe Detournay mailto:philippe.detournay&acrosoft.be 2007-11-12 ++[Philippe_Gilbert] Philippe Gilbert mailto:pgilbert&cal.fr ++[Phill_Goeckler] Phill Goeckler mailto:pgoeckler&cequint.com 2007-08-20 ++[Phillip_Dillinger] Phillip Dillinger mailto:Phillip.Dillinger&sealabs.com ++[Phillip_Heil] Phillip Heil mailto:phil.heil&dvtsensors.com 2002-02 ++[Phillip_Magson] Phillip Magson mailto:philm&extro.ucc.su.oz.au ++[Phivos_Aristides] Phivos Aristides mailto:phivos&opendesign.com ++[Photosmith] Photosmith mailto:ckhorne&photosmithapp.com 2011-10-27 ++[Pierre_Arnaud] Pierre Arnaud mailto:pierre.arnaud&iname.com ++[Pierre_Couderc] Pierre Couderc mailto:pcouderc&tol.fr 2006-03 ++[Pierre_Frisch] Pierre Frisch mailto:Pierre.Frisch&spearway.com ++[Pierre_Frisch_2] Pierre Frisch mailto:pierre.frisch&spearway.com ++[Piers_Scannell] Piers Scannell mailto:iana-form&lot105.com ++[Piers_Scannell_2] Piers Scannell mailto:piers&globecastne.com ++[Pieter_Ditmars] Pieter Ditmars mailto:pditmars&bbn.com ++[Pieter_Hintjens] Pieter Hintjens mailto:ph&imatix.com 2006-01 ++[Pim_van_Riezen] Pim van Riezen mailto:registries&panelsix.com 2006-07 ++[Piotr_Parlewicz] Piotr Parlewicz mailto:pparlewicz&queryobject.com ++[Pisharath_Krishnan] Pisharath Krishnan mailto:krishnan&axis-inc.com ++[Pit_Vetterick] Pit Vetterick mailto:pit&3dgo.com 2002-05 ++[PLASA] PLASA mailto:standards.na&plasa.org 2012-06-01 ++[Portnoy_Boxman] Portnoy Boxman mailto:portnoy_boxman&bmc.com 2005-01 ++[Portnoy_Boxman_2] Portnoy Boxman mailto:Portnoy_Boxman&bmc.com 2006-09 ++[POWERSOFT_SRL] POWERSOFT S.R.L. mailto:claudio.lastrucci&powersoft.it 2012-01-03 ++[Prabu_Ambravaneswara] Prabu Ambravaneswaran mailto:prambravµsoft.com 2009-10-29 ++[Pradeep_Bahl] Pradeep Bahl mailto:pradeepbµsoft.com ++[Prakash_Banthia] Prakash Banthia mailto:prakash_banthia&3com.com ++[Prakash_Iyer] Prakash Iyer mailto:prakash.iyer&intel.com 2009-08-10 ++[Pranay_Varma] Pranay Varma mailto:pran&veritas.com ++[Prashant_Dholakia] Prashant Dholakia mailto:prashant&semaphorecom.com ++[Prateek_Sharma] Prateek Sharma mailto:pratsharµsoft.com 2011-08-04 ++[Prathibha_Nagvar] Prathibha Nagvar ++[Pratik_Wadher] Pratik Wadher mailto:pratik&datadomain.com 2007-05 ++[Predrag_Filipovic] Predrag Filipovic mailto:pfilipovic&digital5.com 2002-11 ++[Prem_Tirilok] Prem Tirilok mailto:Prem.Tirilok&tellabs.com ++[Preston_Bannister] Preston Bannister mailto:pbannister&quests.com ++[Prima_Designs_System] Prima Designs Systems mailto:info&prima.com.hk ++ Ltd. ++[Primark_Corporation] Primark Corporation mailto:joe.boone&primark.com ++[Pritham_Shetty] Pritham Shetty mailto:pritham¯omedia.com ++[Pritham_Shetty_2] Pritham Shetty mailto:pritham&andromedia.com ++[ProControl_Technolog] ProControl Technology AB mailto:info&pctworld.com 2004-12 ++[Professor_Paul_S_Wa] Professor Paul S. Wang mailto:pwang&cs.kent.edu 2002-07 ++[Qdea] Qdea mailto:support&qdea.com ++[Qentin_Neill] Qentin Neill mailto:quentin&columbiasc.ncr.com ++[Qiang_Zhang] Qiang Zhang mailto:qzhang&iwncomm.com 2006-10 ++[Qiang_Zhang_2] Qiang Zhang mailto:iad&iwncomm.com 2006-10 ++[Qualcomm_Innovation_Center] Qualcomm Innovation mailto:cdowell&quicinc.com 2011-12-21 ++ Center, Inc. ++[Quang_Thoi] Quang Thoi mailto:quang_thoi&symantec.com 2006-11 ++[Quentin_Brown] Quentin Brown mailto:ndldev&ndl.co.uk 2002-03 ++[Quest_Software] Quest Software mailto:iana.quest-disc&quest.com 2012-04-09 ++[Quinton_Tormanen] Quinton Tormanen mailto:quinton&deltacompsys.com ++[R_L_Meyering] R. L. Meyering mailto:RLMEYERING&biivax.dp.beckman.com ++[R_Thirumurthy] R. Thirumurthy mailto:rtm&banyannetworks.com ++[Rackspace_Hosting] Rackspace Hosting mailto:ziad.sawalha&rackspace.com 2011-08-15 ++[Radware_LTD] Radware LTD. mailto:samuelb&radware.com 2011-08-05 ++[Rafael_Zimberoff] Rafael Zimberoff mailto:rafael&zfirmllc.com 2003-11 ++[Raghurama_Bhat] Raghurama Bhat mailto:raghu&quintus.com ++[Raimond_Diederik] Raimond Diederik mailto:rdiederik&descartes.com ++[Rajeev_Verma] Rajeev Verma mailto:rajeev_verma&symantec.com 2006-02 ++[Rajesh_Akkineni] Rajesh Akkineni mailto:rajesh&vimukti.com 2007-01 ++[Rajesh_D] Rajesh Dav SQRT(c) mailto:rajdaveµsoft.com 2009-02-03 ++[Rajesh_Nandyalam] Rajesh Nandyalam mailto:rnandyal&emc.com ++[Rajesh_Srinivasaragh] Rajesh Srinivasaraghavan mailto:srajesh&cup.hp.com ++[Rajiv_Aaron_Manglani] Rajiv Aaron Manglani mailto:rajivmanglani&mmm.com ++[Rakesh_Mahajan] Rakesh Mahajan mailto:rmahajan&netaphor-software.com ++[Ralf_Allrutz] Ralf Allrutz mailto:R.Allrutz&science-computing.de 2002-02 ++[Ralf_Bensmann] Ralf Bensmann mailto:iana&1ci.de ++[Ralf_Doewich] Ralf Doewich mailto:ralf.doewich&optimatele.com ++[Ralf_Muckenhirn] Ralf Muckenhirn tel:+49-7622-3980 ++ tel:+49-7622-398200 ++[Ralph_Campbell] Ralph Campbell mailto:ralph.campbell&xasystems.com 2002-11 ++[Ralph_Droms] Ralph Droms mailto:rdroms&nri.reston.va.us ++[Ralph_Kammerlander] Ralph Kammerlander mailto:ralph.kammerlander&khe.siemens.de ++[Ram_Golla] Ram Golla mailto:rgolla&cisco.com ++[Ram_Iyer] Ram Iyer mailto:ram&aaccorp.com ++[Ram_Sudama] Ram Sudama mailto:rsudama&on.com ++[Ramakrishna_Nadendla] Ramakrishna Nadendla mailto:rama_nadendla&agilent.com 2002-08 ++[Ramana_Kovi] Ramana Kovi mailto:ramana&kovi.com ++[Ramesh_Gupta] Ramesh Gupta mailto:ramesh&guptas.net 2012-02-21 ++[Rami_Rubin] Rami Rubin mailto:rami&hybrid.com ++[Ramindur_Singh] Ramindur Singh mailto:Ramindur.Singh&blackcrowsoftware.com 2008-12-04 ++[Ramiro_Sarmiento] Ramiro Sarmiento mailto:ramiro&kabira.com ++[Ramy_Zaarour] Ramy Zaarour mailto:ramy&lumos.com ++[Ranchero_Software] Ranchero Software mailto:info&ranchero.com ++[Randall_Atkinson] Randall Atkinson mailto:rja&home.net ++[Randall_Atkinson_2] Randall Atkinson mailto:rja&inet.org ++[Randall_Dow] Randall Dow mailto:rand&randix.net ++[Randall_Gellens] Randall Gellens mailto:randy&qualcomm.com ++[Randall_Stewart] Randall Stewart IETF TSVWG mailto:rrs&lakerest.net ++[Randall_Stewart_2] Randall Stewart mailto:rrs&lakerest.net 2011-10-24 ++[Randy_Armstrong] Randy Armstrong mailto:randy.armstrong&opcfoundation.org 2006-09 ++[Randy_Cassidy] Randy Cassidy mailto:randy.cassidy&iracing.com 2007-08-30 ++[Randy_Epstein] Randy Epstein mailto:repstein&hostleasing.net ++[Randy_Hudgens] Randy Hudgens mailto:rhh&nmail.holditch.com ++[Randy_Leonard] Randy Leonard mailto:randy&oceansoft.com ++[Randy_Lomnes] Randy Lomnes mailto:rlomnes&faronics.com 2004-11 ++[Randy_Maas] Randy Maas mailto:randym&xiotech.com ++[Randy_Martin] Randy Martin mailto:exlmoc&clemson.edu ++[Randy_Thompson] Randy Thompson mailto:thompr&earthlink.net 2002-08 ++[Raphael_Neve] Raphael Neve Microtec Informatique mailto:raphµtec.fr 2012-03-15 ++[Ralph_Greenwell] Ralph Greenwell mailto:iana&cognima.com 2012-03-15 ++[Ratnadeep_Bhattachar] Ratnadeep Bhattacharjee mailto:ratnadeep.bhattacharjee&sun.com 2002-11 ++[Ravi_Gokhale] Ravi Gokhale mailto:rgokhale&bindview.com 2002-10 ++[Ravi_Kollipara] Ravi Kollipara mailto:ravi.kollipara&actifio.com 2010-06-18 ++[Ravi_Tavakely] Ravi Tavakely mailto:ravi.tavakley&veritas.com 2002-02 ++[Ray_Caruso] Ray Caruso mailto:ray.caruso&netvion.com 2002-06 ++[Ray_Gwinn] Ray Gwinn mailto:p00321&psilink.com ++[Ray_Jantz] Ray Jantz mailto:ray.jantz&lsil.com ++[Ray_Ozzie] Ray Ozzie mailto:ray&rocks.net ++[Rayan_Zachariassen] Rayan Zachariassen mailto:rayan&ai.toronto.edu ++[Raymarine_UK_Limited] Raymarine UK Limited mailto:Geoff.Beer&raymarine.com 2012-05-24 ++[Raymond_A_Diedrichs] Raymond A. Diedrichs mailto:rayd&slu.tr.unisys.com ++[Raymond_Chaw] Raymond Chaw mailto:Raymond&esecutech.com 2007-05 ++[Raymond_J_Young] Raymond J. Young mailto:Raymond.Young&ca.com 2002-04 ++[Razmik_Abnous] Razmik Abnous mailto:abnous&documentum.com ++[RealNetworks] RealNetworks mailto:macplayer&real.com ++[Reed_Copsey_Jr] Reed Copsey Jr. mailto:reedc&ctech.com ++[Reed_Hedges] Reed Hedges mailto:reed&interreality.org ++[Rehan_Mahmood] Rehan Mahmood mailto:rehan&matrixmultimedia.co.uk 2009-03-18 ++[Reid_B_Ligon] Reid B. Ligon mailto:reid.ligon&pscnet.com ++[Reid_Ligon] Reid Ligon mailto:reid&connectrf.com ++[Reinhard_Doelz] Reinhard Doelz mailto:doelz&comp.bioz.unibas.ch ++[Reinhard_Wolf] Reinhard Wolf Adsoft AG mailto:adsoft&vtxmail.ch 2010-08-19 ++[Reinier_Post_and_Pau] Reinier Post and Paul mailto:freeciv&freeciv.org 2006-01 ++ Zastoupil ++[Remi_Lefebvre] Remi Lefebvre mailto:remi&debian.org ++[Rene_Fontaine] Rene Fontaine mailto:fontaine_rene&emc.com ++[Rene_Jager] Rene Jager mailto:renej&frog.nl ++[Rene_Kurt] Rene Kurt mailto:rene.kurt&adasoft.ch 2005-08 ++[Resource_Allocation] Resource Allocation Team mailto:resources&littlehall.com 2010-09-27 ++[Retrospect_Inc] Retrospect, Inc. mailto:JG.Heithcock&retrospect.com 2012-02-02 ++[Reuven_Harrison] Reuven Harrison mailto:rnd_ana&checkpoint.com ++[Reuven_Harrison_2] Reuven Harrison mailto:rharrison&checkpoint.com 2003-01 ++[Reyk_Floeter] Reyk Floeter mailto:reyk&vantronix.net 2008-02-27 ++[Reza_Bagherian] Reza Bagherian mailto:bagherian_reza&emc.com 2007-07-19 ++[RGB_Spectrum] RGB Spectrum mailto:shershey&rgb.com 2011-10-10 ++[Riaz_Zolfonoon] Riaz Zolfonoon mailto:rzolfonoon&securitydynamics.com ++[Riccardo_Facchetti] Riccardo Facchetti mailto:riccardo&inetcosmos.org 2002-07 ++[Rich_Blomseth] Rich Blomseth mailto:rich&echelon.com ++[Rich_Kilmer] Rich Kilmer mailto:rich&infoether.com ++[Rich_Neswold] Rich Neswold mailto:neswold&fnal.gov 2007-02 ++[Rich_Thompson] Rich Thompson mailto:richt&watson.ibm.com ++[Richard_Alan_Johnson] Richard Alan Johnson mailto:raj&cisco.com ++[Richard_Bassous] Richard Bassous mailto:rbassous&yahoo.com ++[Richard_Corn] Richard Corn mailto:rac&racc.com ++[Richard_Dickins] Richard Dickins mailto:rad&specview.com 2002-02 ++[Richard_Farnham] Richard Farnham mailto:rfarnham&salient.com ++[Richard_Fife] Richard Fife mailto:richardf&lucasarts.com ++[Richard_Fleming] Richard Fleming mailto:richard&apoapsis.com 2002-08 ++[Richard_Foss] Richard Foss mailto:r.foss&ru.ac.za 2011-02-10 ++[Richard_Frith_Macdon] Richard Frith-Macdonald mailto:richard&brainstorm.co.uk ++[Richard_Harriss] Richard Harriss mailto:richard.harriss&halcyonsoftware.com 2005-05 ++[Richard_Harwell] Richard Harwell mailto:richardcharwell&eaton.com 2006-02 ++[Richard_Hodges] Richard Hodges mailto:rh&matriplex.com ++[Richard_Hodges_2] Richard Hodges mailto:rh&source.net ++[Richard_Hodges_3] Richard Hodges mailto:rhodges&prismiq.com 2003-01 ++[Richard_J_Williams] Richard J. Williams mailto:RJW1&trpo4.tr.unisys.com ++[Richard_Jones] Richard Jones ++[Richard_Jones_2] Richard Jones mailto:richard_jones1&symantec.com 2009-05-26 ++[Richard_Lamb] Richard Lamb mailto:rlambµsoft.com ++[Richard_McDonald] Richard McDonald mailto:ve3nvm&spamcop.net 2006-01 ++[Richard_Mills] Richard Mills mailto:ramills&us.ibm.com 2002-02 ++[Richard_Minner] Richard Minner http://xippix.com ++[Richard_Nabavi] Richard Nabavi mailto:nabaviµapl.co.uk 2006-02 ++[Richard_Olsen] Richard Olsen mailto:olsen.richard&yahoo.com ++[Richard_S_Conto] Richard S. Conto mailto:rsc&merit.edu ++[Richard_Snider] Richard Snider mailto:rsnider&sounds.com ++[Richard_Spartz] Richard Spartz mailto:rspartz&alliancetechnical.com ++[Richard_Steiger] Richard Steiger mailto:steiger&ensemblesoft.com ++[Richard_Thurman] Richard Thurman mailto:richt&fireking.com 2003-04 ++[Richard_Walters] Richard Walters mailto:walters&cs.ucdavis.edu ++[Richard_Warren] Richard Warren mailto:richard&cambridgepixel.com 2008-09-17 ++[Richard_de_Mornay] Richard de Mornay mailto:rdemornay&norton-lambert.com ++[Rick_Adams] Rick Adams mailto:rick&uunet.uu.net ++[Rick_Carlos] Rick Carlos mailto:rick&ticipa.csc.ti.com ++[Rick_LaBanca] Rick LaBanca mailto:rel&mesasys.com ++[Rick_Macchio] Rick Macchio mailto:rmacchio&juniper.net 2006-11 ++[Rick_Pugh] Rick Pugh mailto:rick&bilmillennium.com ++[Rick_Russell] Rick Russell mailto:rrussell&accessdata.com ++[Rick_Stefanik] Rick Stefanik mailto:r.stefanik&gatelinx.com 2002-05 ++[Rick_Troth] Rick Troth mailto:troth&rice.edu ++[Rick_Yazwinski] Rick Yazwinski mailto:ricky&solect.com ++[Rickard_Schoultz] Rickard Schoultz mailto:schoultz&sunet.se ++[Ricky_Sharp] Ricky Sharp mailto:rsharp&instantinteractive.com ++[Rieko_Asai] Rieko Asai mailto:asai&isl.mei.co.jp ++[Rik_Ditter] Rik Ditter mailto:managers&generationtechnologies.com 2006-02 ++[Rik_Faith] Rik Faith mailto:faith&cs.unc.edu ++[Rina_Nethaniel] Rina Nethaniel ++[Ritsuto_Sako] Ritsuto Sako mailto:sakou.ritsuto&canon.co.jp 2009-05-04 ++[Ritu_Bahl] Ritu Bahl mailto:ritubµsoft.com ++[Rituparna_Agrawal] Rituparna Agrawal mailto:riagrawa&cisco.com 2005-09 ++[Rob_Bradford] Rob Bradford mailto:rob&o-hand.com ++[Rob_Chandhok] Rob Chandhok mailto:chandhok&gnome.cs.cmu.edu ++[Rob_Chandhok_2] Rob Chandhok mailto:chandhok&within.com ++[Rob_Cosgrove] Rob Cosgrove mailto:rob&alice.net ++[Rob_Graber] Rob Graber mailto:r.graber&austinlane.com 2006-01 ++[Rob_Griffin] Rob Griffin mailto:quest_iana&oz.quest.com 2002-07 ++[Rob_Griffin_2] Rob Griffin mailto:rob.gri55in&gmail.com 2010-09-13 ++[Rob_Isaac] Rob Isaac mailto:rob&automagic.org 2003-07 ++[Rob_Janssen] Rob Janssen mailto:rob&sys3.pe1chl.ampr.org ++[Rob_Jonson] Rob Jonson mailto:rob&hobbyistsoftware.com ++[Rob_Juergens] Rob Juergens mailto:robj&vsi.com ++[Rob_Lanphier] Rob Lanphier mailto:robla&prognet.com ++[Rob_Lehew] Rob Lehew mailto:rlehewµsoft.com 2003-06 ++[Rob_Lockhart] Rob Lockhart mailto:rob.lockhart&mot.com ++[Rob_MacGregor] Rob MacGregor mailto:rob.macgregor&sympatico.ca ++[Rob_Minerick] Rob Minerick mailto:rob&vortimac.com 2004-11 ++[Rob_Newberry] Rob Newberry mailto:rnewberry&apple.com ++[Rob_Rix] Rob Rix DEVONtechnologies, mailto:rrix&devontechnologies.com 2011-10-18 ++ LLC ++[Rob_Robertson] Rob Robertson mailto:rob&gangrene.berkeley.edu ++[Rob_Scott] Rob Scott mailto:rscott&rs.com 2007-05 ++[Rob_Versluis] Rob Versluis mailto:r.j.versluis&rocrail.net 2011-05-23 ++[Rob_Ward] Rob Ward mailto:RobWardµsoft.com 2008-05-02 ++[Rob_Williams] Rob Williams mailto:rob.williamsµsoft.com 2009-02-17 ++[Robby_Simpson] Robby Simpson, PhD mailto:rsimpson&gmail.com ++[Robby_Walker] Robby Walker mailto:webmaster&cd-lab.com ++[Robert_A_Kukura] Robert A. Kukura mailto:kukura&apollo.hp.com ++[Robert_Armes] Robert Armes mailto:rarmes&axarte.com ++[Robert_Armington] Robert Armington mailto:rarmington&lipsinc.com ++[Robert_Baldwin] Robert Baldwin mailto:baldwin&plusfive.com 2004-11 ++[Robert_Ball] Robert Ball mailto:rob.ball&ge.com 2008-03-26 ++[Robert_Banfill] Robert Banfill mailto:robert&banfill.net 2003-04 ++[Robert_Bosch_GmbH] Thomas Beck Robert Bosch GmbH mailto:Thomas.Beck8&bosch.com 2011-08-01 ++[Robert_Boudrie] Robert Boudrie mailto:boudrie_rob&emc.com 2008-06-09 ++[Robert_Byrne] Robert Byrne mailto:robert.byrne&ie.abb.com 2006-09 ++[Robert_C_Henningsga] Robert C. Henningsgard mailto:rhenn_iana&laptwo.com ++[Robert_Ciochon] Robert Ciochon mailto:robert.ciochon&ca.com 2006-08 ++[Robert_D_Vincent] Robert D. Vincent mailto:bert&willowpond.com ++[Robert_Dye] Robert Dye mailto:rob&natinst.com ++[Robert_E_Johnson_II] Robert E. Johnson III mailto:johnson.robert&cimcor.com 2003-04 ++[Robert_E_Minnear] Robert E. Minnear mailto:minnear&ipsilon.com ++[Robert_Eden] Robert Eden mailto:reden&sieglertech.com 2003-03 ++[Robert_Ellman] Robert Ellman mailto:rellman&calicotech.com ++[Robert_Erl] Robert Erl mailto:roerl&web.de 2003-04 ++[Robert_Ford] Robert Ford mailto:robert&intrinsa.com ++[Robert_Frazier] Robert Frazier mailto:BobF&mrp3.com ++[Robert_Goodyear] Robert Goodyear mailto:robg&brand-up.com ++[Robert_Gordon] Robert Gordon mailto:rbg&austin.ibm.com ++[Robert_Grant] Robert Grant mailto:rob&grantedsw.com ++[Robert_Harvey] Robert Harvey mailto:robert&officetoolspro.com 2006-01 ++[Robert_Helton] Robert Helton mailto:bob_helton&medimage.com 2003-10 ++[Robert_Hodgson] Robert Hodgson mailto:rrh&gxt.com ++[Robert_Hodgson_2] Robert Hodgson mailto:robert¶tek.co.uk ++[Robert_Hufsky] Robert Hufsky mailto:rhufsky&csesys.co.at ++[Robert_J_Chansler] Robert J. Chansler mailto:robert.chansler&mcdata.com ++[Robert_J_Scott] Robert J. Scott mailto:rob&hpcmo.hpc.mil 2005-08 ++[Robert_John_Churchil] Robert John Churchill mailto:rjc&rjcdb.com 2006-01 ++[Robert_Kevin_Breton] Robert Kevin Breton mailto:BOBBRETON&hotmail.com ++[Robert_M_Mackowiak] Robert M. Mackowiak mailto:rmackowiak&quest.com 2002-02 ++[Robert_M_Moore] Robert M. Moore mailto:robert.moore&tunstall.co.uk ++[Robert_Marinelli] Robert Marinelli mailto:bob&sychron.com 2003-03 ++[Robert_Monat] Robert Monat mailto:jerand&jerand.com ++[Robert_Orr] Robert Orr mailto:rorr&teltone.com ++[Robert_Parks] Robert Parks mailto:robert_parks&filemaker.com 2010-05-12 ++[Robert_Porter] Robert Porter mailto:rob&gradecam.com 2009-09-24 ++[Robert_Reimiller] Robert Reimiller mailto:bob&certsoft.com ++[Robert_Ripberger] Robert Ripberger mailto:rip&lan-aces.com ++[Robert_Shaffer] Robert Shaffer mailto:bob.shaffer&micmod.com 2006-02 ++[Robert_Stabl] Robert Stabl mailto:stabl&informatik.uni-muenchen.de ++[Robert_Thomas] Robert Thomas mailto:BThomas&f.bbn.com ++[Robert_Ullmann] Robert Ullmann mailto:ariel&world.std.com ++[Robert_Ullmann_2] Robert Ullmann mailto:Robert_Ullmann/CAM/Lotus.LOTUS@crd.lotus.com ++[Robert_Vincent] Robert Vincent mailto:bert&mck.com ++[Robert_W_Hodges] Robert W Hodges mailto:iana&precdata.com 2005-01 ++[Robert_W_Scheifler] Robert W. Scheifler mailto:RWS&xx.lcs.mit.edu ++[Robert_Waters] Robert Waters mailto:bobtek&hotmail.com ++[Robert_Watson] Robert Watson mailto:robert&cyrus.watson.org ++[Robert_Wetzold] Robert Wetzold mailto:robert.wetzold&fibotrader.com 2006-01 ++[Robert_Wiebe] Robert Wiebe mailto:crw010&email.mot.com ++[Robert_Wright] Robert Wright, Founder Audio Precision Inc. mailto:ianaports&ap.com 2006-05 ++ and Principal Engineer ++[Robert_Zuccherato] Robert Zuccherato mailto:robert.zuccherato&entrust.com ++[Roberto_De_Ioris] Roberto De Ioris mailto:info&unbit.it ++[Roberto_Garcia] Roberto Garcia mailto:garcia&apple.com ++[Roberto_Jorge_Dino] Roberto Jorge Dino mailto:roberto.dino&autotrac.com.br ++[Robin_Cover] Robin Cover OASIS KMIP Technical mailto:robin&oasis-open.org 2011-07-25 ++ Committee ++[Robin_Felix] Robin Felix mailto:zarkov_port&zarkov.com ++[Robin_Findley] Robin Findley mailto:rfindley&usa.net 2007-05 ++[Robin_Giese] Robin Giese mailto:rgiese&peddie.org ++[Robin_Johnston] Robin Johnston mailto:robinj&learningtree.com ++[Robin_Kar] Robin Kar mailto:Robin_Kar&ccm.hf.intel.com ++[Robin_Lewis] Robin Lewis mailto:robin.lewis&lanyon.com ++[Robin_Perkins] Robin Perkins mailto:robin.perkins&internode.on.net ++[Robin_Uyeshiro] Robin Uyeshiro mailto:robin_u&adtech-inc.com ++[Rod_Waltermann] Rod Waltermann mailto:walterma&us.lenovo.com 2006-02 ++[Rod_Ward] Rod Ward mailto:RWard&vaccmel1.telstra.com.au ++[Roderick_Mann] Roderick Mann mailto:rmann&latencyzero.com 2011-10-20 ++[Rodney_Iwashina] Rodney Iwashina mailto:rodney&cyclone.rfx.com ++[Rodrigo_Ormonde] Rodrigo Ormonde mailto:ormonde&aker.com.br ++[Rodrigo_Terra] Rodrigo Terra Lumis mailto:rterra&lumis.com.br 2011-10-24 ++[Roel_Harbers] Roel Harbers mailto:r.harbers&ict-control.com 2005-08 ++[Roger_Binns] Roger Binns mailto:rogerb&sco.com ++[Roger_Huebner] Roger Huebner mailto:iana-ports&netiq.com 2010-08-25 ++[Roger_Kay] Roger Kay mailto:r.kay&nz.dialogic.com ++[Roger_Klorese] Roger Klorese mailto:roger&xensource.com 2006-06 ++[Roger_Knobbe] Roger Knobbe mailto:RogerK&wonderware.com ++[Roger_Kumpf] Roger Kumpf mailto:kumpf&cup.hp.com ++[Roger_Lemberg] Roger Lemberg mailto:rlemberg&uswi.com ++[Roger_Matthias] Roger Matthias mailto:rogermatthias&yahoo.co.uk 2009-08-24 ++[Roger_Meli] Roger Meli mailto:rmmeli%25winvmd@vnet.ibm.com ++[Roger_Pantos] Roger Pantos mailto:rpantos&apple.com ++[Roger_Pao] Roger Pao mailto:rpao&corder-eng.com ++[Roger_Ward] Roger Ward mailto:roger.ward&ger911.com 2009-09-25 ++[Rogue_Amoeba] Rogue Amoeba mailto:earphoria&rogueamoeba.com ++[Rogue_Amoeba_2] Rogue Amoeba mailto:nicecast&rogueamoeba.com ++[Rohan_Story] Rohan Story mailto:rohan&aurema.com ++[Rohit_Garg] Rohit Garg mailto:rohit.garg&eng.sun.com ++[Rohit_Garg_2] Rohit Garg mailto:rohit&objectscape.com ++[Roland_Hedberg] Roland Hedberg mailto:Roland.Hedberg&umdac.umu.se ++[Roland_Hedberg_2] Roland Hedberg mailto:roland&catalogix.se 2005-08 ++[Roland_Rupp] Roland Rupp mailto:r.rupp&pilz.de 2006-11 ++[Roland_Schneider] Roland Schneider mailto:rsch&nicherms.com 2003-10 ++[Roland_van_der_Veen] Roland van der Veen mailto:rvdveen&aqualectra.nl 2010-06-17 ++[Roman_Kriis] Roman Kriis mailto:roman&previo.ee ++[Roman_Oliynyk] Roman Oliynyk mailto:romano&netinst.com ++[Roman_Oliynyk_2] Roman Oliynyk mailto:roman&netinst.com 2007-08-30 ++[Roman_Stepanek] Roman Stepanek SODATSW spol. s r.o. mailto:roman.stepanek&sodatsw.cz 2012-05-31 ++[Romeo_Kasanwidjojo] Romeo Kasanwidjojo mailto:romeoµcomgroup.com ++[Ron_Achin] Ron Achin mailto:RAchin&genscan.com ++[Ron_Barber] Ron Barber mailto:ron.barber&amx.com 2003-11 ++[Ron_Capwell] Ron Capwell mailto:ron&artifactsoftware.com 2002-06 ++[Ron_Ehli] Ron Ehli mailto:ron&itinternet.net ++[Ron_Folk] Ron Folk mailto:rfolkes&avl.com ++[Ron_Frederick] Ron Frederick mailto:frederick&parc.xerox.com ++[Ron_Herardian] Ron Herardian mailto:rherardi&gssnet.com 2002-03 ++[Ron_Kuris] Ron Kuris mailto:rk&unify.com 2006-05 ++[Ron_Lawson] Ron Lawson mailto:ronaldl&hpindacx.cup.hp.com ++[Ron_Lussier] Ron Lussier mailto:coyote&likeminds.com ++[Ron_Minnich] Ron Minnich mailto:rminnich&acl.lanl.gov ++[Ron_Minnich_2] Ron Minnich mailto:rminnich&sarnoff.com ++[Ron_Muellerschoen] Ron Muellerschoen mailto:rjm&cobra.jpl.nasa.gov ++[Ron_Passerini] Ron Passerini mailto:rpasserini&vmware.com 2010-04-27 ++[Ron_Steed] Ron Steed mailto:rsteed&cemaphore.com 2003-11 ++[Ron_Thornton] Ron Thornton mailto:thornton&qm7501.genrad.com ++[Ron_Vaughn] Ron Vaughn mailto:rv&intellistor.com ++[Ron_Zalkind] Ron Zalkind mailto:ron&aprigo.com 2010-05-28 ++[Ron_Zuckerman] Ron Zuckerman mailto:ron.zuckerman&lsi.com 2007-08-30 ++[Ronald_Jimmink] Ronald Jimmink mailto:Ronald.Jimmink&chipper.nl ++[Ronald_R_Ohmer] Ronald R. Ohmer mailto:rohmer&aisconsulting.net 2004-02 ++[Ronald_Snyder] Ronald Snyder mailto:pugaroni&sssnet.com 2006-03 ++[Ronen_Shaul] Ronen Shaul mailto:ronen&arnetsystems.com 2003-10 ++[Ronen_Vainish] Ronen Vainish mailto:ronen&digitalfountain.com ++[Ronen_Zoran] Ronen Zoran mailto:ronenz&cyber-ark.com ++[Rong_Yu] Rong Yu mailto:rongyuµsoft.com 2010-08-10 ++[Roni_Even] Roni Even mailto:roni_e&accord.co.il ++[Roni_Moshitzky] Roni Moshitzky mailto:rmosh&checkpoint.com ++[Ronnie_De_Giorgio] Ronnie De Giorgio Silverstring Ltd. mailto:rdegiorgio&silverstring.com 2011-09-15 ++[Ronnie_Sahlberg] Ronnie Sahlberg mailto:ronniesahlberg&gmail.com 2007-07-05 ++[Ronny_Bremer] Ronny Bremer mailto:rbremer&almanid.com ++[Rory_McClure] Rory McClure mailto:mcclurert&hotmail.com ++[Rory_McGuire] Rory McGuire mailto:rlpm&apple.com 2010-09-24 ++[Rory_McGuire_2] Rory McGuire mailto:rlpm&apple.com ++[Ross_E_Greinke] Ross E. Greinke mailto:greinker&execpc.com ++[Ross_Swithenbank] Ross Swithenbank mailto:iana&ncode.co.uk 2006-09 ++[Ross_Williams] Ross Williams mailto:ross&rocksoft.com ++[Roustem_Karimov] Roustem Karimov mailto:roustem&agilewebsolutions.com ++[Rowan_Daniell] Rowan Daniell mailto:rowan&cognito.co.nz ++[Roy_Chastain] Roy Chastain mailto:roy&kmsys.com ++[Roy_Davies] Roy Davies mailto:rdavies&daq.net 2005-08 ++[Roy_Reapor] Roy Reapor mailto:rreapor&wyatt.com ++[Royal_King] Royal King mailto:royal.king&compaq.com 2002-02 ++[Ruben_Beltran] Ruben Beltran del Rio www.nsovocal.com mailto:ben&nsovocal.com 2011-10-18 ++[Rudi_Chiarito] Rudi Chiarito mailto:nutello&sweetness.com ++[Rudi_Martin] Rudi Martin mailto:movies::martin%22@movies.enet.dec.com ++[Rudi_Martin_2] Rudi Martin mailto:Rudi.Martin&edo.mts.dec.com ++[Rudi_Visser] Rudi Visser mailto:rudi.visser&ljund.eu 2011-07-07 ++[Rudolf_Cardinal] Rudolf Cardinal mailto:rudolf&pobox.com 2002-02 ++[Rudolph_Balaz] Rudolph Balaz mailto:rudolphbµsoft.com ++[Ruediger_Wald] Ruediger Wald mailto:wald&ez-darmstadt.telekom.de ++[Rumiko_Kikuta] Rumiko Kikuta mailto:kiku&nd.net.fujitsu.co.jp ++[Russ_Allbery] Russ Allbery mailto:rra&stanford.edu 2007-08-30 ++[Russ_Ferriday] Russ Ferriday mailto:russf&topia.com ++[Russ_Olivant] Russ Olivant mailto:russ.olivant&metrica.co.uk ++[Russ_Thrasher] Russ Thrasher mailto:Russell.Thrasher&veritas.com ++[Russell_Crook] Russell Crook mailto:rmc&sni.ca ++[Russell_Kroll] Russell Kroll mailto:nut-iana&exploits.org 2002-05 ++[Russell_M_Taylor_II] Russell M. Taylor II mailto:taylor&cs.unc.edu 2003-10 ++[Russell_P_Holsclaw] Russell P. Holsclaw Fast Data Technology mailto:rholsclaw&fastdatatech.com 2006-03 ++ Inc. ++[Russell_Thrasher] Russell Thrasher mailto:rthrashe&veritas.com ++[Ruth_Slater] Ruth Slater mailto:ruth.slater&ideagen.co.uk ++[Ruwan_Linton] Ruwan Linton mailto:ruwan&wso2.com 2008-08-20 ++[Ryan_Bolz] Ryan Bolz mailto:ryanboµsoft.com ++[Ryan_Columbus] Ryan Columbus mailto:IANA_Contact&agilent.com 2002-10 ++[Ryan_Finnie] Ryan Finnie mailto:ryan&finnie.org 2010-10-06 ++[Ryan_Mack] Ryan Mack mailto:rmackµsoft.com 2009-04-29 ++[Ryan_Melville] Ryan Melville mailto:ryan_melville&soniqcast.com 2004-01 ++[Ryan_Rubley] Ryan Rubley mailto:root&ark.dyn.ml.org ++[Ryan_Smith] Ryan Smith mailto:ryans&nstor.com 2006-07 ++[Ryan_Werber] Ryan Werber mailto:ryan&ncxti.com 2006-06 ++[Ryoichi_Shinohara] Ryoichi Shinohara mailto:shinohara&vnet.ibm.com ++[Ryozo_Furutani] Ryozo Furutani mailto:furutani&np.lps.cs.fujitsu.co.jp ++[Ryuichi_Horie] Ryuichi Horie mailto:horie&spad.sysrap.cs.fujitsu.co.jp ++[Ryuichi_Suzuki] Ryuichi Suzuki mailto:SCI00376&niftyserve.or.jp ++[Ryusuke_Okuhara] Ryusuke Okuhara Canon Inc. mailto:okuhara.ryuusuke&canon.co.jp 2012-06-08 ++ SEGGER ++[SEGGER] Microcontroller GmbH mailto:info&segger.com 2009-01-16 ++ & Co. KG ++[SEIKO_EPSON] SEIKO EPSON mailto:APD.admin&exc.epson.co.jp 2006-06 ++[SEIKO_EPSON_2] SEIKO EPSON mailto:Ishida.Hitoshi&exc.epson.co.jp ++[SEIKO_EPSON_3] SEIKO EPSON mailto:Sato.Minoru3&exc.epson.co.jp 2002-10 ++[SEIKO_EPSON_4] SEIKO EPSON mailto:ProjectorSoft&exc.epson.co.jp 2008-11-17 ++[SMA_Solar_Techology] SMA Solar Techology AG mailto:thomas.weber&sma.de 2011-03-08 ++[SONET_Internetworkin] SONET Internetworking mailto:bwarijsman&lucent.com ++ Forum (SIF) ++[SYSTEMS_MANAGER] SYSTEMS MANAGER mailto:systems-manager&scientia.com ++[Saar_Wilf] Saar Wilf mailto:saar&trivnet.com ++[Sabri_Berisha] Sabri Berisha mailto:sabri&cluecentral.net 2003-06 ++[Sabu_Das] Sabu Das mailto:sabud&zicomsecure.com 2003-06 ++[Sachin_Desai] Sachin Desai mailto:sachin&clairmail.com ++[Sailalong_Software] Sailalong Software mailto:CustomerService&sailalong.com ++[Salvo_Nassisi] Salvo Nassisi mailto:sdtech&tin.it ++[Sam_Borman] Sam Borman mailto:sam_borman&uk.ibm.com ++[Sam_Bretheim] Sam Bretheim mailto:info&opensigint.org 2009-01-08 ++[Sam_Carleton] Sam Carleton mailto:scarleton&miltonstreet.com ++[Sam_Carleton_2] Sam Carleton AccuMed Services mailto:scarleton&accu-med.com 2011-10-20 ++[Sam_Osa] Sam Osa mailto:pristine&mailcity.com ++[Sam_Vaughan] Sam Vaughan mailto:samv&blackmagic-design.com 2011-03-01 ++[Sameer_Deokule] Sameer Deokule mailto:sameer.deokule&veritas.com 2002-03 ++[Samppa_Lahtinen] Samppa Lahtinen mailto:samppa.lahtinen&motivesys.com 2004-06 ++[Samuel_Bercovici] Samuel Bercovici mailto:samuelb&radware.com 2011-08-05 ++[Samuele_Sequi] Samuele Sequi mailto:samuelesequi&defcom.it 2004-02 ++[Sanchaita_Datta] Sanchaita Datta mailto:sdatta&ragula.com ++[Sancho_Lerena] Sancho Lerena mailto:slerena&artica.es 2009-06-02 ++[Sandeep_K_Singhal] Sandeep K. Singhal mailto:singhal&cs.stanford.edu ++[Sandeep_Singhal] Sandeep Singhal mailto:sandeep&reefedge.com ++[Sandra_Frulloni] Sandra Frulloni mailto:frulloni.amtec&interbusiness.it ++[Sandra_Vargas] Sandra Vargas mailto:Sandramaµsoft.com 2003-03 ++[Sandy_Kronenberg] Sandy Kronenberg mailto:sandy&netarx.com 2008-04-03 ++[Sanford_Selznick] Sanford Selznick mailto:sanford-srvtype&selznick.com ++[Sanjay_Parekh] Sanjay Parekh mailto:spot&digitalenvoy.net ++[Sanjay_Radia] Sanjay Radia mailto:srradia&kasumbi.eng.sun.com ++[Santa_Dasu] Santa Dasu mailto:Santa_Dasu&quickeagle.com ++[Santorini_LLC] Santorini, LLC mailto:cameron&santorinillc.com 2011-10-25 ++[Sarah_Allen] Sarah Allen mailto:sallen¯omedia.com ++[Sarah_Thompson] Sarah Thompson mailto:sarah&telergy.com ++[Sarene_Caiazza] Sarene Caiazza mailto:scaiazza&proquesys.com 2010-04-27 ++[Sascha_Kuemmel] Sascha Kuemmel mailto:kuemmel&vidsoft.de ++[Satoshi_Matsumoto] Satoshi Matsumoto mailto:satoshi&artman21.co.jp ++[Saugata_Guha] Saugata Guha mailto:sguha&veritas.com 2004-05 ++[Scott_A_Kramer] Scott A. Kramer mailto:sk&tleilaxu.sde.hp.com ++[Scott_Anderson] Scott Anderson mailto:sanderso&workingmachines.com ++[Scott_Bellew] Scott Bellew mailto:smb&cs.purdue.edu ++[Scott_Blachowicz] Scott Blachowicz mailto:scott&statsci.com ++[Scott_Dale] Scott Dale mailto:scott&replicase.com ++[Scott_Dale_2] Scott Dale mailto:scott&tioga.com ++[Scott_Dawson] Scott Dawson mailto:sdawson&arbor.net 2011-07-01 ++[Scott_Engel] Scott Engel mailto:ScottX_Engel&ccm.jf.intel.com ++[Scott_Godlew] Scott Godlew mailto:Scott&godlew.com ++[Scott_Grau] Scott Grau mailto:sgrau&stonefalls.com ++[Scott_Griepentrog] Scott Griepentrog mailto:griepentrogs&atlinks.com 2002-10 ++[Scott_Guthery] Scott Guthery mailto:sguthery&mobile-mind.com 2002-05 ++[Scott_Guthery_2] Scott Guthery mailto:sguthery&hidcorp.com 2008-08-25 ++[Scott_Halberg] Scott Halberg mailto:eng&calypsosystems.com 2009-06-02 ++[Scott_Harris] Scott Harris mailto:Scott&xramp.com 2003-02 ++[Scott_Herscher] Scott Herscher mailto:scott&porchdogsoft.com 2005-08 ++[Scott_Herscher_2] Scott Herscher mailto:scott&strixsystems.com ++[Scott_Hollenbeck] Scott Hollenbeck mailto:shollenb&netsol.com ++[Scott_Howard] Scott Howard mailto:scott&byressecurity.com 2009-10-13 ++[Scott_Jann] Scott Jann Tightrope Media mailto:sjann&trms.com 2011-10-17 ++ Systems, Inc. ++[Scott_Kramer] Scott Kramer mailto:scottk&truebluesoftware.com ++[Scott_Levin] Scott Levin mailto:scott.levin&hp.com 2009-03-19 ++[Scott_Libert] Scott Libert mailto:scott.libert&thomson.net 2008-01-29 ++[Scott_Mager] Scott Mager mailto:Scott.Mager&cerner.com 2006-10 ++[Scott_Miller] Scott Miller mailto:scott&opentrac.org 2003-08 ++[Scott_Narveson] Scott Narveson mailto:sjn&cray.com ++[Scott_Petrack] Scott Petrack mailto:Scott_Petrack&vocaltec.com ++[Scott_Powell] Scott Powell mailto:spowell&openhorizon.com ++[Scott_Shaffer] Scott Shaffer mailto:scott.shaffer&hp.com ++[Scott_Shattuck] Scott Shattuck mailto:ss&dbsa.com ++[Scott_Southard] Scott Southard mailto:iana-ports&netiq.com 2010-08-25 ++[Scott_St_Clair] Scott St. Clair mailto:stclair&ntc.adaptec.com ++[Scott_Tarone] Scott Tarone mailto:starone&proactivethought.com 2003-04 ++[Scott_Tooker] Scott Tooker mailto:tooker&apple.com ++[Sean_Adams] Sean Adams mailto:sean&slimdevices.com 2002-05 ++[Sean_D_Solle] Sean D. Solle VSN International mailto:sean&vsni.co.uk 2011-09-28 ++ Ltd. ++[Sean_MacGuire] Sean MacGuire mailto:sean&maclawran.ca ++[Sean_Ni] Sean Ni mailto:seanni&digitalinstinct.com.tw 2006-02 ++[Seb_Ibis] Seb Ibis mailto:seb_ibis&pkworld.com ++[Sebastian_Kiesel] Sebastian Kiesel mailto:kiesel&ikr.uni-stuttgart.de 2006-01 ++[Sebastien_Bury] Sebastien Bury WAP Forum mailto:sebastien.bury&art.alcatel.fr ++[Sebastien_Hinderer] Sebastien Hinderer mailto:Sebastien.Hinderer&ens-lyon.org 2006-03 ++[Sebastien_Lambla] Sebastien Lambla mailto:lambla&bouygtel.com ++[Seiko_Epson] Seiko Epson mailto:Ishida.Hitoshi&exc.epson.co.jp ++[Semantix] Semantix mailto:xsSupport&semantix.com ++[Senthil_Ponnuswamy] Senthil Ponnuswamy mailto:senthil&veritas.com ++[Serge_DE_LUCA] Serge DE LUCA mailto:sdeluca&lacie.com ++[Serge_Vacquier] Serge Vacquier mailto:vacquier&systar.fr 2009-05-20 ++[Sergei_Ivanov] Sergei Ivanov mailto:sergeiµsoft.com 2003-10 ++[Sergei_Zjaikin] Sergei Zjaikin mailto:serge&previo.ee 2002-02 ++[Sergey_Bolshedvorsky] Sergey Bolshedvorsky Smart Apps LTD mailto:info&smartapps.co 2011-10-11 ++[Sergey_Burnevsky] Sergey Burnevsky mailto:sergey.burnevsky&nokia.com 2006-08 ++[Sergio_Heker] Sergio Heker mailto:heker&jvncc.csc.org ++[Sergio_Luis] Sergio Luis Dias Lima mailto:slgramacho&gmail.com 2012-02-27 ++ Gramacho ++[Serguei_Osokine] Serguei Osokine mailto:osokin¶graph.com ++[Serguei_Tevs] Serguei Tevs mailto:STevs&ivecon.com 2002-02 ++[Service_Desk_Product] Service Desk Product mailto:info&hp.com 2006-05 ++ Manager ++[Shahriar_Pourazin] Shahriar Pourazin mailto:pourazin&sepehrs.com 2008-12-02 ++[Shai_Herzog] Shai Herzog mailto:herzog&iphighway.com ++[Shailesh_S_Bavadeka] Shailesh S. Bavadekar mailto:shailesh.bavadekar&sun.com 2002-04 ++[Shams_Naqi] Shams Naqi mailto:SSNAQVI&aol.com ++[Shane_Dick] Shane Dick mailto:shane.dick&amx.com 2005-08 ++[Shane_McRoberts] Shane McRoberts mailto:mcroberts&miteksys.com ++[Shane_O_Donnell] Shane O'Donnell mailto:shane&opennms.org ++[Shane_Roberts] Shane Roberts mailto:shane&shaneroberts.com 2002-07 ++[Shankar_Prasad] Shankar Prasad mailto:Shankar.Prasad&honeywell.com ++[Shankar_Prasad_2] Shankar Prasad mailto:shankar.prasad&honeywell.com ++[Shannon_Yeh] Shannon Yeh mailto:yeh&netix.com ++[Shantonu_Sen] Shantonu Sen mailto:ssen&apple.com ++[Shaun_Byrne] Shaun Byrne mailto:s_byrne&tunstall.co.uk 2009-08-18 ++[Shaun_Wexler] Shaun Wexler mailto:dev&macfoh.com ++[Shawn_Casey] Shawn Casey mailto:Shawn.Casey&matrixone.com ++[Sheila_Devins] Sheila Devins mailto:sheila_devins&vnet.ibm.com ++[Shekar_Pasumarthi] Shekar Pasumarthi mailto:shekarp&firstfloor.com ++[Shigenaka_Kanemitsu] Shigenaka Kanemitsu mailto:Shigenaka_Kanemitsu&ypd.kyocera.co.jp ++[Shingo_Kimura] Shingo Kimura mailto:Shingo.Kimura&jp.sony.com 2005-08 ++[Shinji_Yamanaka] Shinji Yamanaka mailto:syamanaka&jci.co.jp ++[Shinya_Abe] Shinya Abe mailto:abeabe&pfu.co.jp ++[Shiro_Tamoto] Shiro Tamoto mailto:tamoto.shiro&jp.panasonic.com 2003-10 ++[Shivakumar_S_Govind] Shivakumar S. mailto:shivak&eng.sun.com ++ Govindarajapuram ++[Shivaun_Albright] Shivaun Albright mailto:shivaun_albright&hp.com 2002-04 ++[ShofarNexus] ShofarNexus.com mailto:John.Kozlowski&ShofarNexus.com 2012-02-20 ++[Shoichi_Tachibana] Shoichi Tachibana mailto:tatibana&yk.fujitsu.co.jp ++[Shree_Murthy] Shree Murthy mailto:shree&cisco.com 2009-10-29 ++[Shu_Wei_Tan] Shu-Wei Tan mailto:stan&omnicomtech.com 2003-03 ++[Shue_Lin_Kuo] Shue-Lin Kuo mailto:shuelin&mdk.sanjose.vlsi.com ++[Shuji_Okubo] Shuji Okubo mailto:okubo&yk.fujitsu.co.jp ++[Shuvayu_Kanjilal] Shuvayu Kanjilal ++[Si_Becker] Si Becker mailto:71362.22&compuserve.com ++[Sierra_Photonics_Inc] Sierra Photonics, mailto:support&sierraphotonics.com 2011-10-20 ++ Inc. ++[Siew_Sim] Siew Sim mailto:ssim&asempra.com 2005-08 ++[Sigfus_Magnusson] Sigfus Magnusson mailto:sigfusm&menandmice.com ++[Sigma_Designs_Inc] Sigma Designs, Inc. mailto:anders_brandt&sigmadesigns.com 2011-10-03 ++[Signwave_Networking] Signwave Networking mailto:mail&signwave.co.uk ++ Development Team ++[Silvano_Maffeis] Silvano Maffeis mailto:maffeis&softwired.ch ++[Silvano_Maffeis_2] Silvano Maffeis mailto:maffeis&acm.org 2008-01-16 ++[Silverstring_Ltd] Silverstring Ltd. mailto:rdegiorgio&silverstring.com 2011-09-15 ++[Simon_Baldwin] Simon Baldwin mailto:simonb&sco.com ++[Simon_Barber] Simon Barber mailto:simon.barber&parc.com 2009-09-29 ++[Simon_Butcher] Simon Butcher mailto:simonb&alien.net.au ++[Simon_Chinnick] Simon Chinnick mailto:support&cogsys.co.uk ++[Simon_Edwards] Simon Edwards ++[Simon_Haertel] Simon Haertel mailto:simonhaertel&web.de ++[Simon_Hovell] Simon Hovell mailto:simonh&brandcomms.com ++[Simon_J_Gerraty] Simon J. Gerraty mailto:sjg&quick.com.au ++[Simon_Jolly] Simon Jolly mailto:simon.jolly&origin-data.co.uk 2002-07 ++[Simon_Newton] Simon Newton mailto:simon&nomis52.net 2012-06-01 ++[Simon_P_Jackson] Simon P Jackson mailto:jacko&kring.co.uk ++[Simon_Parker] Simon Parker mailto:simon.j.parker&philips.com ++[Simon_Phipps] Simon Phipps mailto:sphipps&vnet.ibm.com ++[Simon_Robillard] Simon Robillard mailto:RobillardS&actresearch.com ++[Simon_Skaria] Simon Skaria mailto:simonskµsoft.com 2006-01 ++[Simon_Wunderlich] Simon Wunderlich mailto:siwu&hrz.tu-chemnitz.de 2007-08-30 ++[Simone_Molendini] Simone Molendini mailto:simone.molendini&unile.it 2003-11 ++[Simson_L_Garfinkel] Simson L. Garfinkel mailto:simsong&next.cambridge.ma.us ++[Sinnadurai_Dharshan] Sinnadurai Dharshan mailto:sinnadurai.dharshan&ni.com 2002-07 ++[Siva_Poobalasingam] Siva Poobalasingam mailto:siva&towersoft.com.au 2006-03 ++[Siva_Poobalasingam_2] Siva Poobalasingam mailto:Siva.Poobalasingam&towersoft.com.au 2007-02 ++[Skip_Booth] Skip Booth mailto:sbooth&vnet.ibm.com ++[Skip_Levens] Skip Levens mailto:skip&activestoragelabs.com ++[Sky_Schulz] Sky Schulz mailto:sky&edgeofreality.com 2011-05-09 ++[Slava_Monich] Slava Monich mailto:Slava.Monich&nokia.com 2003-01 ++[Slawomir_Krzesinski] Slawomir Krzesinski mailto:slavek&optiwave.com ++[Smart_Apps_LTD] Smart Apps LTD mailto:info&smartapps.co 2011-10-11 ++[Smith_Micro] Smith Micro mailto:cs&smithmicro.com ++[Smith_Micro_Software_Inc] Smith Micro Software, mailto:dsperling&smithmicro.com 2011-10-10 ++ Inc. ++[SODATSW_spol] SODATSW spol. s r.o. mailto:info&sodatsw.cz 2012-05-31 ++[softthere_com] softthere.com mailto:technical&softthere.com 2011-10-17 ++[Software_Horizons_In] Software Horizons mailto:oi2000&shorizons.com ++ Inc. ++[Software_LI-COR_Biosciences] Software LI-COR mailto:kevin.ediger&licor.com 2011-10-18 ++ Biosciences ++[Song_Jian] Song Jian mailto:info&vatata.com 2008-09-15 ++[Songlin_Ren] Songlin Ren mailto:ren&veritas.com ++[Songwon_Chi] Songwon Chi mailto:swchi&daou.co.kr ++[Sonzea] Sonzea, LLC mailto:support&sonzea.com ++[Sophie_Deng] Sophie Deng mailto:Sophie.Deng&eng.sun.com ++[Soren_Weber] Soren Weber mailto:sw&ditec-gmbh.de ++[Soumitra_Sarkar] Soumitra Sarkar mailto:sarkar&vnet.ibm.com ++[Spencer_Teran] Spencer Teran mailto:steran&dotalot.com 2005-08 ++[Spencer_Teran_2] Spencer Teran mailto:steran&ars.com 2004-11 ++[Sphera_Software] Sphera Software mailto:contact&sphera-soft.com ++[SpinetiX_S_A] SpinetiX S.A. mailto:Diego.SantaCruz&spinetix.com 2011-10-18 ++[Squadra_Technologies] Squadra Technologies mailto:anthony&squadratechnologies.com 2012-03-14 ++[Square_Connect_Inc] Square Connect, Inc. mailto:mat&squareconnect.com 2011-10-07 ++[Squee_Application_Development] Squee! Application mailto:tristan&squee.co 2011-07-19 ++ Development ++[Srdjan_Holovac] Srdjan Holovac mailto:srdjan&empress.com ++[Sreenivas_Bagalkote] Sreenivas Bagalkote mailto:sreenib&lsil.com 2002-08 ++[Sreeram_Duvvuru] Sreeram Duvvuru mailto:sduv&sfbay.sun.com 2002-04 ++[Sri_Subramaniam] Sri Subramaniam mailto:sri&radiance.com ++[Sridhar_Krishnamurth] Sridhar Krishnamurthy mailto:Sridhar_Krishnamurthy&intuit.com 2008-02-15 ++[Srinivas_N_Mogalapa] Srinivas N. Mogalapalli mailto:srinivas&proxim.com ++[Srinivas_Reddy] Srinivas Reddy mailto:sreddy&vitalsigns.com ++[Srinivasa_Nayudu] Srinivasa Nayudu mailto:sn156n&att.com 2009-07-06 ++[Stacy_Kenworthy] Stacy Kenworthy mailto:skenworthy&applianceware.com ++[Stanislaw_Skowronek] Stanislaw Skowronek mailto:thesis&elementary.pl ++[Stanley_Knutson] Stanley Knutson mailto:Stanley.Knutson&ktiworld.com ++[Stefan_Auweiler] Stefan Auweiler mailto:stefan.auweiler&saitc.de 2009-11-16 ++[Stefan_Daun] Stefan Daun mailto:secretariat&cip4.org ++[Stefan_Ekenberg] Stefan Ekenberg mailto:stefan.ekenberg&stericsson.com ++[Stefan_Eriksson] Stefan Eriksson mailto:contact-iana&axis.com ++[Stefan_Hochuli] Stefan Hochuli mailto:iana.org&dunes.ch 2003-12 ++[Stefan_Pantke] Stefan Pantke mailto:sales&turingart.com ++[Stefan_Siebert] Stefan Siebert mailto:ssiebert&dcs.de ++[Stefan_Winkel] Stefan Winkel mailto:stefan&veritas.com 2004-04 ++[Steffen_Schilke] Steffen Schilke ++[Stein_Roger_Skaflott] Stein Roger Skaflotten mailto:skaflotten&gmail.com 2011-07-06 ++[Sten_H_Danielsen] Sten H. Danielsen mailto:shd&kopek.net 2002-07 ++[Stepan_Riha] Stepan Riha mailto:stepan.riha&hand.com ++[Stepehen_Campbell] Stepehen Campbell mailto:campbell&uniprise.com ++[Stephane_Clavel] Stephane Clavel Atomix Productions mailto:stephane.clavel&atomixproductions.com 2011-10-12 ++[Stephane_Beaulieu] Stephane Beaulieu mailto:stephane&cisco.com 2002-02 ++[Stephane_Bourque] Stephane Bourque mailto:stephb&incognito.com ++[Stephane_Bourque_2] Stephane Bourque mailto:sbourque&arilia.com ++[Stephane_MONS] Stephane MONS mailto:stephane.mons&free.fr 2005-09 ++[Stephane_Touizer] Stephane Touizer mailto:touizerµcaptrade.com 2006-05 ++[Stephen_Aikins] Stephen Aikins mailto:stephen.aikins&embarcadero.com ++[Stephen_Casner] Stephen Casner mailto:casner&precpt.com ++[Stephen_Casner_2] Stephen Casner mailto:casner&precept.com ++[Stephen_Cipolli] Stephen Cipolli mailto:scipolli&radvision.com ++[Stephen_Dunne] Stephen Dunne mailto:sdun&isma.co.uk ++[Stephen_Egbert] Stephen Egbert mailto:egbert&ra.timeplex.com ++[Stephen_Gildea] Stephen Gildea mailto:gildea&lcs.mit.edu ++[Stephen_Gold] Stephen Gold mailto:stephen_gold&hp.com 2003-01 ++[Stephen_Hanna] Stephen Hanna mailto:hanna&world.std.com ++[Stephen_Hanna_2] Stephen Hanna mailto:steve.hanna&sun.com ++[Stephen_Harrison] Stephen Harrison mailto:sharrison&nimbusdb.com 2011-01-24 ++[Stephen_Hemminger] Stephen Hemminger mailto:shemminger&passedge.com ++[Stephen_Johnson] Stephen Johnson mailto:sjohnson&mindspring.com ++[Stephen_LaValley] Stephen LaValley mailto:lavalley&lucent.com ++[Stephen_M_Webb] Stephen M. Webb mailto:stephenw&xandros.com 2007-05 ++[Stephen_McCrea] Stephen McCrea mailto:smccrea&etlelectronique.com 2002-03 ++[Stephen_Misel] Stephen Misel mailto:steve.misel&interpath.net ++[Stephen_Misel_2] Stephen Misel mailto:steve&satelnet.org ++[Stephen_R_Whiteley] Stephen R. Whiteley mailto:stevew&wrcad.com 2010-10-07 ++[Stephen_Reed] Stephen Reed mailto:reed&cyc.com 2003-01 ++[Stephen_Reed_2] Stephen Reed mailto:stephenreed&yahoo.com 2010-06-17 ++[Stephen_Reid] Stephen Reid mailto:sreid&ti.com ++[Stephen_Tsun] Stephen Tsun mailto:stsun&jetstream.com ++[Stephen_Tsun_2] Stephen Tsun mailto:stsun&calient.net 2002-02 ++[Steve_Bannister] Steve Bannister mailto:sbannister&stratacache.com ++[Steve_Barton] Steve Barton mailto:steveb&pacom.com 2002-03 ++[Steve_Beigel] Steve Beigel mailto:ublueb!steve&uunet.uu.net ++[Steve_Benoit] Steve Benoit mailto:sbenoi01&eng.eds.com ++[Steve_Britt] Steve Britt mailto:steve_britt&hp.com ++[Steve_Casner] Steve Casner mailto:Casner&isi.edu ++[Steve_Davis] Steve Davis mailto:sdavis&optum-inc.com ++[Steve_Dekorte] Steve Dekorte mailto:steve&dekorte.com ++[Steve_Dellutri] Steve Dellutri ++[Steve_Dellutri_2] Steve Dellutri mailto:sdellutri&cosmocom.com 2006-07 ++[Steve_Dobson] Steve Dobson mailto:sdobson&allstor.com ++[Steve_Dorner] Steve Dorner mailto:s-dorner&uiuc.edu ++[Steve_Favor] Steve Favor mailto:sfavor&tigger.intecom.com ++[Steve_Glassman] Steve Glassman mailto:steveg&pa.dec.com ++[Steve_Gums] Steve Gums Tenir Software mailto:sgums&tenirsoftware.com 2011-10-27 ++[Steve_Halverson] Steve Halverson mailto:shalver&us.ibm.com ++[Steve_Hay] Steve Hay mailto:SteveHay&planit.com 2008-06-13 ++[Steve_Hershey] Steve Hershey RGB Spectrum mailto:shershey&rgb.com 2011-10-10 ++[Steve_Husak] Steve Husak mailto:portmaster&cruisetech.com ++[Steve_Kellogg] Steve Kellogg mailto:stevekellogg&mezzogmr.com ++[Steve_Kille] Steve Kille mailto:S.Kille&isode.com ++[Steve_Kirsch] Steve Kirsch mailto:stk&infoseek.com ++[Steve_Kneizys] Steve Kneizys mailto:skneizys&erpdata.com 2006-11 ++[Steve_Laitinen] Steve Laitinen mailto:laitinen&brutus.aa.ab.com ++[Steve_McKinty] Steve McKinty mailto:steve.mckinty&sun.com 2005-11 ++[Steve_Meyer_Sr] Steve Meyer Sr. mailto:stevem&avanti-tech.com 2007-02 ++[Steve_Olson] Steve Olson mailto:solson&cognex.com ++[Steve_Polishinski] Steve Polishinski mailto:spolishinski&etcconnect.com ++[Steve_Qi] Steve Qi mailto:steve.qi&dyn-site.com 2003-11 ++[Steve_Quintana] Steve Quintana mailto:steve&icgresearch.com ++[Steve_Ravida] Steve Ravida mailto:steve.ravida&nebulaholdings.com ++[Steve_Read] Steve Read mailto:sread&ridgeway-sys.com ++[Steve_Ryckman] Steve Ryckman mailto:iana&simsware.com ++[Steve_Scherf] Steve Scherf mailto:steve&moonsoft.com ++[Steve_Spataro] Steve Spataro mailto:spataro_steve&emc.com ++ National Marine ++[Steve_Spitzer] Steve Spitzer Electronics mailto:sspitzer&nmea.org 2011-09-15 ++ Association ++[Steve_Splonskowski] Steve Splonskowski mailto:splons&splons.com ++[Steve_Sweeney] Steve Sweeney mailto:Steven_Sweeney&3mail.3com.com ++[Steve_T_Chiang] Steve T. Chiang mailto:schiang&cisco.com ++[Steve_Tuecke] Steve Tuecke mailto:tuecke&mcs.anl.gov ++[Steve_Van_Duser] Steve Van Duser mailto:steve.vanduser&bestpower.gensig.com ++[Steve_Zellers] Steve Zellers mailto:zellers&apple.com ++[Steven_B_Cliff] Steven B. Cliff mailto:scliff&remotec-andros.com 2003-07 ++ The University ++[Steven_Emmerson] Steven Emmerson Corporation for mailto:emmerson&ucar.edu 2012-05-07 ++ Atmospheric Research ++ The University ++[Steven_Emmerson2] Steven Emmerson Corporation for mailto:support-ldm&unidata.ucar.edu 2012-05-18 ++ Atmospheric Research ++[Steven_Fields] Steven Fields mailto:sfields&identix.com 2002-02 ++[Steven_Frare] Steven Frare mailto:stevefr&mosaix.com ++[Steven_G_Loughner] Steven G. Loughner mailto:stevengloughner&eaton.com 2007-03 ++[Steven_Gerhardt] Steven Gerhardt mailto:sgerhardt&ixiononline.com 2004-02 ++[Steven_Grigsby] Steven Grigsby mailto:sgrigsby&austin.eent.com ++[Steven_Holtsberg] Steven Holtsberg mailto:steveh&continuus.com ++[Steven_Kelly] Steven Kelly mailto:stevek&metacase.com 2007-11-12 ++[Steven_Kilby] Steven Kilby mailto:steven.kilby&kofax.com 2011-04-25 ++[Steven_Klein] Steven Klein mailto:stevek&ionetworks.com 2002-02 ++[Steven_Loomis] Steven Loomis mailto:srl&taligent.com ++[Steven_M_Forrester] Steven M. Forrester mailto:StevenF&capsuletech.com ++[Steven_Pelletier] Steven Pelletier mailto:stevep&availant.com ++[Steven_Ritland] Steven Ritland mailto:srr&us.ibm.com ++[Steven_Sawkins] Steven Sawkins mailto:ssawkins&symantec.com ++[Steven_Sweeting] Steven Sweeting mailto:ssweeting&sls-technology.com 2008-01-28 ++[Steven_W_Clark] Steven W. Clark mailto:steven.clark&avocent.com ++[Steven_W_Clark_2] Steven W. Clark mailto:sclark&equinox.com ++[Stoneware_Inc] Stoneware Inc. mailto:coby.gurr&stone-ware.com 2012-05-18 ++[StorMagic_Ltd] StorMagic Ltd mailto:chris_farey&stormagic.com 2011-12-16 ++[Stu_Mark] Stu Mark mailto:fordii&j51.com ++[Stuart_Allen] Stuart Allen mailto:stuart&jacl.animats.net 2002-02 ++[Stuart_Button] Stuart Button mailto:button&promis.com ++[Stuart_Cheshire] Stuart Cheshire mailto:cheshire&apple.com 2007-12-03 ++[Stuart_Cheshire_3] Stuart Cheshire mailto:mdnsresponder-ipc&multicastdns.org 2004-06 ++[Stuart_Cheshire_4] Stuart Cheshire mailto:pdl-datastream&apple.com 2002-09 ++[Stuart_Cheshire_5] Stuart Cheshire mailto:cheshire&apple.com ++[Stuart_J_Kerry] Stuart J. Kerry Chair IEEE 802.11 WG mailto:stuart&ok-brit.com 2002-05 ++[Stuart_Lynne] Stuart Lynne mailto:sl&wimsey.com ++[Stuart_Schaefer] Stuart Schaefer mailto:sschaefer&softricity.com ++[Subroto_Datta] Subroto Datta mailto:subrotod&altera.com ++[Sudhakar_Rajamannar] Sudhakar Rajamannar mailto:mobius1&cerfnet.com ++[Sudhir_Menon] Sudhir Menon mailto:sudhir¢erspan.com ++[Sudhir_Shetty] Sudhir Shetty mailto:Sudhir_Shetty&dell.com ++[Sue_Barnhill] Sue Barnhill mailto:snb&oc.com ++[Sufyan_Almajali] Sufyan Almajali mailto:sufyan.almajali&sdrlive.com 2008-06-27 ++[Sugih_Jamim] Sugih Jamim mailto:jamin&eecs.umich.edu ++[Sukanta_Ganguly] Sukanta Ganguly mailto:sganguly&kineticnetworks.com ++[Sulistio_Muljadi] Sulistio Muljadi ++[Sumit_Arora] Sumit Arora mailto:sumit.arora&sun.com 2007-06 ++[Sumitake_kobayashi] Sumitake kobayashi mailto:kobayashi&np.lps.cs.fujitsu.co.jp ++[Sundar_Srinivasan] Sundar Srinivasan mailto:sundarsµsoft.com 2006-05 ++[Sung_U_Ro] Sung U. Ro mailto:ePortalSupport&unisys.com 2006-01 ++[Support] Support mailto:support&officetime.net ++[Support_Staff] Support Staff Sierra Photonics, mailto:support&sierraphotonics.com 2011-10-20 ++ Inc. ++[Support_Team] Support Team mailto:support&eucalyptus.com ++[Susan_Hinrichs] Susan Hinrichs mailto:shinrich&cisco.com ++[Susan_Sauter] Susan Sauter mailto:ssauter&cisco.com 2006-07 ++[Sushil_Thomas] Sushil Thomas mailto:iana-comm&3par.com 2008-03-10 ++[Susie_Armstrong] Susie Armstrong mailto:Armstrong.wbst128@xerox ++[Susie_Armstrong_2] Susie Armstrong mailto:Armstrong.wbst128&xerox.com ++[Susie_Snitzer] Susie Snitzer ++[Suzanne_Lorrin] Suzanne Lorrin mailto:suzanne.lorrin&ansys.com ++[Suzanne_Lorrin_2] Suzanne Lorrin mailto:sml&ansyspo.ansys.com ++[Sven_Kopacz] Sven Kopacz mailto:s.kopacz&controllerware.com 2010-09-01 ++[Sven_S_Porst] Sven-S. Porst mailto:ssp-web&earthlingsoft.net ++[Sven_Slezak] Sven Slezak mailto:sunny&mezzo.net ++[Sylvain_Demongeot] Sylvain Demongeot mailto:sylvain.demongeot&wildbits.com 2005-08 ++[Sylvain_Pedneault] Sylvain Pedneault mailto:sylvain&sypecom.qc.ca 2003-03 ++[Sylvain_Robert] Sylvain Robert mailto:sylvain.robert&datadis.com 2008-02-14 ++[Sylvia_Ross] Sylvia Ross mailto:sross&codimatech.com ++[Sylvia_Scheuren] Sylvia Scheuren mailto:schsy02&cai.com ++[Sylvia_Siu] Sylvia Siu mailto:Sylvia_Siu&novell.co ++[Sylvia_Siu_2] Sylvia Siu mailto:ssiu&svnetworks.com ++[Symantec_Corp] Symantec Corp mailto:neel_bhatt&symantec.com 2012-01-03 ++[Symantec_Corp2] Symantec mailto:info&symantec.com 2012-05-07 ++[System_Administrator] System Administrator mailto:sysadmin&silvaco.com 2003-06 ++[TAKEDA_Hiroyuki] TAKEDA Hiroyuki mailto:takeda&atashi.net 2003-01 ++[Taha_Paksu] Taha Paksu mailto:tahapaksu&mavili.com.tr 2009-12-21 ++[Takashi_Aihara] Takashi Aihara mailto:aiharat&sm.sony.co.jp 2003-08 ++[Takashi_Hoshino] Takashi Hoshino mailto:hoshino&miya.fujifilm.co.jp ++[Takashi_Kubota] Takashi Kubota mailto:kubota.takashi&pfu.fugitsu.com 2003-06 ++[Takashi_Okazawa] Takashi Okazawa mailto:okazawa.takashi&canon.co.jp 2003-04 ++[Takashi_Sahara] Takashi Sahara mailto:sahara&jdl.co.jp 2006-09 ++[Takayuki_Ito] Takayuki Ito mailto:yuki&euc.jp ++[Takenori_Miyahara] Takenori Miyahara mailto:miyahara&pfu.co.jp ++[Takeo_Sato] Takeo Sato mailto:ts-iana&cloanto.net 2010-04-30 ++[Takeshi_Nishizawa] Takeshi Nishizawa mailto:takeshi&cp10.es.xerox.com ++[Takeshi_Ohmura] Takeshi Ohmura mailto:ohmura&isl.mei.co.jp ++[Takeshi_Sahara] Takeshi Sahara mailto:sahara&jdl.co.jp ++[Takeshi_Saito] Takeshi Saito mailto:takeshi.saito&toshiba.co.jp 2002-09 ++[Talkative_AB] Talkative AB mailto:support&talkative.se ++[Tamara_Baker] Tamara Baker mailto:tbaker&ecolor.com ++[Tamir_Zegman] Tamir Zegman mailto:zegman&checkpoint.com ++[Tarek_Nabhan] Tarek Nabhan mailto:standards&itworx.com 2003-02 ++[Tatham_Oddie] Tatham Oddie mailto:tatham&e-oddie.com 2002-09 ++[Tatsuhiko_Sakai] Tatsuhiko Sakai Canon Inc. mailto:sakai.tatsuhiko&canon.co.jp 2011-10-03 ++[Tatsuya_Igarashi] Tatsuya Igarashi mailto:Tatsuya.Igarashi&jp.sony.com 2002-07 ++[Tatsuya_Ueda] Tatsuya Ueda mailto:tatsu&ist.fujitsu.com 2003-10 ++[Tatu_Ylonen] Tatu Ylonen mailto:ylo&cs.hut.fi ++[Tav_Espian] Tav Espian mailto:tav&espians.com 2010-08-10 ++[Ted_Hess] Ted Hess mailto:thess&livevault.com ++[Ted_Hoshi] Ted Hoshi mailto:tetsuo.hoshi&jp.yokogawa.com 2004-06 ++[Ted_J_Socolofsky] Ted J. Socolofsky mailto:Teds&spider.co.uk ++[Ted_McFadden] Ted McFadden mailto:mcfadden&dstc.edu.au ++[Ted_Power] Ted Power mailto:tedp&hpinpcb.cup.hp.com ++[Ted_Ross] Ted Ross mailto:ross&toplayer.com ++[Ted_Ross_2] Ted Ross mailto:tross&redhat.com 2008-03-26 ++[Ted_Schroeder] Ted Schroeder mailto:tschroeder&freehandsystems.com ++[Ted_Schroeder_2] Ted Schroeder Vidder, Inc. mailto:ted&vidder.com 2011-10-24 ++[Ted_Tronson] Ted Tronson mailto:ttronson&novell.com ++[Ted_Woodward] Ted Woodward mailto:ted&metrowerks.com ++[Teijo_Mustonen] Teijo Mustonen mailto:Teijo.Mustonen&f-secure.com 2002-03 ++ TeleConsult GmbH, ++[TeleConsult] 76275 Ettlingen, mailto:teleconsult&t-online.de ++ Germany ++[TeleTrusT_Deutschlan] TeleTrusT Deutschland mailto:info&teletrust.de 2006-04 ++ e.V. ++[Telepathy_project] Telepathy project mailto:telepathy&lists.freedesktop.org ++[Tenir_Software] Tenir Software mailto:sgums&tenirsoftware.com 2011-10-27 ++[Teradici] Teradici mailto:jdillabough&teradici.com 2012-03-06 ++[Terrence_J_Talbot] Terrence J. Talbot mailto:lexcube!tjt&bu.edu ++[Terry_Eldridge] Terry Eldridge mailto:Terry.Eldridge&6pointn.com 2006-08 ++[Terry_Gin] Terry Gin mailto:terry_gin&inter-tel.com 2003-02 ++[Terry_Lim] Terry Lim mailto:tkl&pentek.com ++[Terry_Smyth] Terry Smyth mailto:terry&sgluk.com 2004-11 ++[Terumasa_Yoneda] Terumasa Yoneda mailto:yonedat&pfu.co.jp ++[Tetsuharu_Hanada] Tetsuharu Hanada mailto:hanada&pfu.fujitsu.com ++[Tetsuya_Shioda] Tetsuya Shioda mailto:tetsuya&saint.nm.fujitsu.co.jp ++[Tex_Hull] Tex Hull mailto:tex&spss.com ++[Thaddeus_Perala] Thaddeus Perala mailto:trperala&emaden.com ++[Thaddeus_Ternes] Thaddeus Ternes mailto:thaddeus.ternes&intermec.com ++[TheCodingMonkeys] TheCodingMonkeys mailto:monkeys&codingmonkeys.de ++[The_Omni_Group] The Omni Group mailto:info&omnigroup.com ++[Theo_Nijssen] Theo Nijssen mailto:theon&nijssen.nl ++[Theo_Schlossnagle] Theo Schlossnagle mailto:jesus&omniti.com 2009-05-19 ++[Theodore_Ts_o] Theodore Ts'o mailto:tytso&mit.edu ++[Therese_Hunt] Therese Hunt mailto:hunt&marcam.com ++[Thierry_Turletti] Thierry Turletti mailto:Thierry.Turletti&sophia.inria.fr ++[Thom_McGrath] Thom McGrath mailto:thom&thezaz.com ++[Thomas_Boerkel] Thomas Boerkel mailto:tbo&ap-ag.com 2008-06-06 ++[Thomas_Boutell] Thomas Boutell mailto:boutell&boutell.com ++[Thomas_Clausen] Thomas Clausen mailto:thomas.clausen&inria.fr ++[Thomas_Dannemiller] Thomas Dannemiller mailto:tom.dannemiller&rolls-royce.com 2003-04 ++[Thomas_Driemeyer] Thomas Driemeyer mailto:thomas&bitrot.de ++[Thomas_E_Ludwig] Thomas E. Ludwig mailto:tom.ludwig&zetera.com 2004-02 ++[Thomas_Efer] Thomas Efer mailto:mail&thomasefer.de 2006-03 ++[Thomas_Erskine] Thomas Erskine mailto:erskine&sourceworks.com ++[Thomas_Fiege] Thomas Fiege mailto:tfiege&us.ibm.com 2004-02 ++[Thomas_Fok] Thomas Fok mailto:thomas&melody-soft.com 2004-11 ++[Thomas_Geisel] Thomas Geisel mailto:tgeisel&symax.de 2003-01 ++[Thomas_Guth] Thomas Guth mailto:t.guth&zeiss.de 2006-01 ++[Thomas_Hennessy] Thomas Hennessy mailto:thennessy&manageiq.com 2007-10-04 ++[Thomas_J_Klehr] Thomas J. Klehr mailto:tklehr&telcordia.com ++[Thomas_J_Pinkl] Thomas J. Pinkl mailto:tom&pinkl.com 2003-02 ++[Thomas_K_Fischer] Thomas K. Fischer mailto:thomas.fischer&interservices.de ++[Thomas_Kanngieser] Thomas Kanngieser mailto:thomas.kanngieser&arcor.de 2006-01 ++[Thomas_Keller] Thomas Keller mailto:me&thomaskeller.biz 2010-12-22 ++[Thomas_Kemmer] Thomas Kemmer EFKON AG mailto:t.kemmer&efkon.com 2011-10-20 ++[Thomas_Kerkau] Thomas Kerkau mailto:Thomas.Kerkau&io-software.com ++[Thomas_Kjoernes] Thomas Kjoernes mailto:thomas&ipv.no 2010-06-22 ++[Thomas_Klose] Thomas Klose mailto:thomas.klose&hiperscan.com 2009-12-15 ++[Thomas_Koell] Thomas Koell mailto:info&sf.com ++[Thomas_Kuiper] Thomas Kuiper mailto:tkuiper&inxsoft.net ++[Thomas_L_Johnson] Thomas L. Johnson mailto:tjohnson&broadcom.com ++[Thomas_Lindeman] Thomas Lindeman mailto:tlindeµsoft.com 2002-11 ++[Thomas_M_Smith] Thomas M. Smith mailto:Thomas.M.Smith&lmco.com ++[Thomas_Martin] Thomas Martin mailto:thomas&datus-usa.com ++[Thomas_McCabe] Thomas McCabe mailto:tmcca&westell.com ++[Thomas_Obermair] Thomas Obermair mailto:tommy&inlab.m.eunet.de ++[Thomas_Ruchti] Thomas Ruchti mailto:thomasmruchti&eaton.com 2003-06 ++[Thomas_Russell] Thomas Russell mailto:trussell&scte.org 2005-05 ++[Thomas_Schleu] Thomas Schleu mailto:tschleu&canto.de ++[Thomas_Schmidt] Thomas Schmidt mailto:ts&bintec.de ++[Thomas_Scholl] Thomas Scholl mailto:tscholl&spf.is-is.ca 2006-03 ++[Thomas_Sciorilli] Thomas Sciorilli Wi-Fi Alliance mailto:tsciorilli&wi-fi.org 2012-04-09 ++[Thomas_Soerensen] Thomas Soerensen mailto:thomassoerensen&stofanet.dk 2002-04 ++[Thomas_Soranno] Thomas Soranno mailto:tom_soranno&cipartners.com ++[Thomas_Weise] Thomas Weise mailto:weise&vs.uni-kassel.de 2006-04 ++[Thomas_Zwick] Thomas Zwick mailto:thomas.zwick&tz-software.de 2011-10-12 ++[Thor_Olson] Thor Olson mailto:Thor&terabase.com ++[Thorvald_Natvig] Thorvald Natvig mailto:thorvald&natvig.com ++[ThreeGPP2] 3GPP2 mailto:lizhiming&huawei.com 2012-01-11 ++[Tiago_Bittencourt_Si] Tiago Bittencourt Silva mailto:tiagobs&ufpr.br 2005-08 ++[Tightrope_Media_Systems] Tightrope Media mailto:sjann&trms.com 2011-10-17 ++ Systems, Inc. ++[Tim_Addington] Tim Addington mailto:Tim.Addington&sciatl.com ++[Tim_Behne] Tim Behne mailto:timothybµwavenetworks.com 2003-06 ++[Tim_Berners_Lee] Tim Berners-Lee mailto:timbl&w3.org ++[Tim_Boldt] Tim Boldt mailto:timb&vytalnet.com ++[Tim_Boyle] Tim Boyle mailto:tboyle&dataviz.com ++[Tim_Brown] Tim Brown mailto:timb&openvas.org 2008-12-24 ++[Tim_Burgess] Tim Burgess mailto:tim&hotu.com 2002-04 ++[Tim_Coppernoll] Tim Coppernoll mailto:Tim_Coppernoll&ccm.jf.intel.com ++[Tim_Dawson] Tim Dawson mailto:tdawson%25mspboss@uunet.uu.net ++[Tim_DeBaillie] Tim DeBaillie mailto:debaillie&ciholas.com 2006-12 ++[Tim_Farley] Tim Farley mailto:Tim.Farley&xcellenet.com ++[Tim_Hahn] Tim Hahn mailto:hahnt&us.ibm.com 2006-03 ++[Tim_Howard] Tim Howard mailto:timothygh&hotmail.com ++[Tim_Howes] Tim Howes mailto:Tim.Howes&terminator.cc.umich.edu ++[Tim_Hunnewell] Tim Hunnewell mailto:thunnewell&pinna.com ++[Tim_Jacobs] Tim Jacobs ++[Tim_Jobling] Tim Jobling mailto:tim&cambridgeimaging.co.uk ++[Tim_Jowers] Tim Jowers mailto:Tim.Jowers&columbiasc.ncr.com ++[Tim_Kenyon] Tim Kenyon mailto:Tim_Kenyon&csicontrols.com ++[Tim_Lawrence] Tim Lawrence mailto:lawrence&tao-group.com ++[Tim_Maloney] Tim Maloney mailto:tim.maloney&allianceconsultingllc.com 2005-08 ++[Tim_McGranaghan] Tim McGranaghan mailto:tim_mcgranaghan&mech.disa.mil ++[Tim_Morgan] Tim Morgan mailto:timm&surfcontrol.com 2004-11 ++[Tim_Morgan_2] Tim Morgan mailto:tmorgan&filenet.com 2005-11 ++[Tim_Rance] Tim Rance mailto:trance&lionhead.co.uk ++[Tim_Riker] Tim Riker mailto:tim&rikers.org 2003-07 ++[Tim_Riley] Tim Riley mailto:rileyt&saic.com 2009-07-31 ++[Tim_Schmidt] Tim Schmidt mailto:Tim.Schmidt&veritas.com ++[Tim_Sent] Tim Sent mailto:tim.sent&systemsarchitects.com ++[Tim_Serong] Tim Serong mailto:tserong&novell.com 2010-03-31 ++[Tim_Simms] Tim Simms mailto:tsimms&plethoratech.com 2002-04 ++[Tim_Stevenson] Tim Stevenson mailto:tes&ncd.com ++[Tim_Walsh] Tim Walsh mailto:tim&ultrex.com ++[Tim_Wiegand] Tim Wiegand mailto:tim.wiegand&navisworks.com 2003-02 ++[Tim_Wilson] Tim Wilson mailto:tim.wilson&motorola.com 2003-08 ++[Tim_Young] Tim Young mailto:timyoung&elevatesoft.com 2009-05-06 ++[Timo_Sivonen] Timo Sivonen mailto:timo.sivonen&ccmail.dowjones.com ++[Timothy_J_Wood] Timothy J. Wood mailto:tjw&omnigroup.com ++[Timothy_Parry] Timothy Parry mailto:tim&lumenergi.com 2011-02-15 ++[Timothy_Wayper] Timothy Wayper mailto:timmy&wunderbear.com ++[TiVo_Inc] TiVo Inc. mailto:devsupport&tivo.com 2011-10-18 ++[Tobias_Erichsen] Tobias Erichsen mailto:erichsen&te-systems.de ++[Tobias_Wegner] Tobias Wegner mailto:wegner&novagate.de ++[Tobin_Schuster] Tobin Schuster mailto:tobin.j.schuster&jci.com ++[Toby_Hosterman] Toby Hosterman mailto:root&netspeak.com ++[Toby_Smith] Toby Smith mailto:dns&idlehands.net ++[Tod_Landis] Tod Landis mailto:tlandis&inprise.com ++[Todd_Barker] Todd Barker mailto:toddba&attachmate.com ++[Todd_Cooper] Todd Cooper mailto:todd&do11073.com 2003-01 ++[Todd_Glassey] Todd Glassey mailto:todd.glassey&att.net ++[Todd_Guay] Todd Guay mailto:todd.guay&oracle.com 2005-08 ++[Todd_Moyer] Todd Moyer mailto:tsm&unx.dec.com ++[Todd_Pichler] Todd Pichler mailto:todd.pichler&stagesoft.com 2010-03-26 ++[Todd_Picquelle] Todd Picquelle mailto:todd&picquelle.com ++[Todd_Scallan] Todd Scallan mailto:tscallan&interwoven.com 2005-08 ++[Todd_Tannenbaum] Todd Tannenbaum mailto:tannenba&cs.wisc.edu 2008-04-03 ++[Todd_Wichers] Todd Wichers mailto:twichers&csn.org ++[Toerless_Eckert] Toerless Eckert mailto:eckert&cisco.com ++[Tohru_Mori] Tohru Mori mailto:tmori&vnet.ibm.com ++[Tom_Bereiter] Tom Bereiter ++[Tom_Bougan] Tom Bougan mailto:tomb&apptechsys.com ++[Tom_Boyle] Tom Boyle mailto:tboyle&vormetric.com 2005-06 ++[Tom_Emberson] Tom Emberson mailto:tom&lanworks.com ++[Tom_Findley] Tom Findley mailto:tom.findley&networksciences.net ++[Tom_Friend] Tom Friend mailto:tomfrµsoft.com ++[Tom_Haapanen] Tom Haapanen mailto:tomh&metrics.com ++[Tom_Haapanen_2] Tom Haapanen mailto:tomh&equitrac.com 2007-07-11 ++[Tom_Hawkins] Tom Hawkins mailto:tom1&launchbird.com 2003-04 ++[Tom_Hawkins_2] Tom Hawkins mailto:tomahawkins&gmail.com 2006-02 ++[Tom_Hennessy] Tom Hennessy mailto:thenn&novadigm.com ++[Tom_Kee] Tom Kee mailto:t.kee&f5.com ++[Tom_Lake] Tom Lake mailto:tlake&m-ware.com ++[Tom_Lane] Tom Lane mailto:tgl&sss.pgh.pa.us ++[Tom_Lemaire] Tom Lemaire mailto:toml&banyan.com ++[Tom_Liu] Tom Liu mailto:ssc&sc.stk.com.cn ++[Tom_Maaswinkel] Tom Maaswinkel mailto:tom.maaswinkel&publiqare.nl 2011-02-07 ++[Tom_Markson] Tom Markson mailto:markson&osmosys.incog.com ++[Tom_Mayo] Tom Mayo mailto:tmayo1&rochester.rr.com 2003-01 ++[Tom_Nys] Tom Nys mailto:tom.nys.tn&belgium.agfa.com ++[Tom_Pusateri] Tom Pusateri mailto:pusateri&juniper.net 2004-12 ++[Tom_Quinlan] Tom Quinlan mailto:tquinlan&digitechinc.com ++[Tom_R_Zavisca] Tom R. Zavisca Green Hills Software mailto:iana-contact&ghs.com 2012-02-07 ++[Tom_Snauwaert] Tom Snauwaert mailto:tom.snauwaert&st-electronics.be ++[Tom_Spidell] Tom Spidell mailto:spidell&persoft.com ++[Tom_Strack] Tom Strack mailto:TSTRACK&advnw.com ++[Tom_Talpey] Tom Talpey Microsoft Corporation mailto:ttalpeyµsoft.com 2012-03-15 ++[Tom_Taylor] Tom Taylor mailto:Tom.Taylor&unisys.com ++[Tom_Taylor_2] Tom Taylor mailto:taylor&nortelnetworks.com ++[Tom_Taylor_3] Tom Taylor mailto:taylor&nortel.com 2006-09 ++[Tom_White] Tom White MIDI Manufacturers mailto:info&midi.org 2011-11-14 ++ Assoc Inc ++[Tom_Whittaker] Tom Whittaker mailto:tomw&ssec.wisc.edu ++[Tomas_Rajcan] Tomas Rajcan mailto:trajcan&ipesoft.sk ++[Tomas_Svoboda] Tomas Svoboda mailto:svoboda&infima.cz 2004-12 ++[Tomer_Shain] Tomer Shain mailto:tshain&precise.com 2002-09 ++[Tommy_van_der_Vorst] Tommy van der Vorst mailto:tommy&pixelspark.nl ++[Tomoji_Koike] Tomoji Koike mailto:koike&ael.fujitsu.co.jp ++[Tomokazu_Asai] Tomokazu Asai mailto:asai.tomokazu&pfu.fujitsu.com 2003-11 ++[Tomoo_Fujita] Tomoo Fujita mailto:tf&arc.bs1.fc.nec.co.jp ++[Ton_Voon] Ton Voon mailto:ton.voon&opsera.com 2008-09-26 ++[Tong_Ming_Lee] Tong-Ming Lee mailto:tmlee&us.oracle.com ++[Tongji_University] Tongji University mailto:neo.gui&gmail.com ++[Tonio_Pirotta] Tonio Pirotta mailto:tonio&tpis.com.au ++[Tony_Amundson] Tony Amundson mailto:tony&blueatlasbroker.com ++[Tony_Arcieri] Tony Arcieri mailto:bascule&gmail.com 2006-03 ++[Tony_Ballardie] Tony Ballardie mailto:A.Ballardie&cs.ucl.ac.uk ++[Tony_Bushnell] Tony Bushnell mailto:tony_bushnell&four-sight.co.uk ++[Tony_Cleveland] Tony Cleveland mailto:tony.cleveland&jacobus.com ++[Tony_Diodato] Tony Diodato mailto:tdiodato&cyprx.com 2005-08 ++[Tony_Fountain] Tony Fountain mailto:tfountain&ucsd.edu ++[Tony_Gibbs] Tony Gibbs mailto:tony.gibbs&europe.simoco.com ++[Tony_Gulino] Tony Gulino mailto:astaregod&hotmail.com 2003-08 ++[Tony_Hoffman] Tony Hoffman mailto:ajh&unx.dec.com ++[Tony_Lubrano] Tony Lubrano mailto:tlubrano&neonsys.com ++[Tony_Matthews] Tony Matthews mailto:tmatthews&triomotion.com 2002-02 ++[Tony_Sawyer] Tony Sawyer mailto:tonys&gemtech.com ++[Tony_Scamurra] Tony Scamurra mailto:Tony&desktoppaging.com ++[Tony_Sowter] Tony Sowter mailto:ts&datcon.co.uk ++[Tony_Splaver] Tony Splaver mailto:tony&cpdi.com 2002-09 ++[Tony_Walker] Tony Walker mailto:tony&cryptocard.com ++[Tony_de_Rijk] Tony de Rijk mailto:idotechnology&mac.com ++[Tor_Slettnes] Tor Slettnes mailto:slettntn&appliedbiosystems.com ++[Tore_Skaug] Tore Skaug Versile AS mailto:tore.skaug&versile.com 2012-02-01 ++[Torsten_Rendelmann] Torsten Rendelmann mailto:torsten.rendelmann&procos.com ++[Torsten_Scheffler] Torsten Scheffler mailto:pdnetadmin&pdnet.info ++[Toru_Murai] Toru Murai mailto:murai&saint.nm.fujitsu.co.jp ++[Toru_Tachibana] Toru Tachibana mailto:tatibana&exs.ts.fujitsu.co.jp ++[Toshikatsu_Ito] Toshikatsu Ito mailto:ito-t&pfu.co.jp ++[Toshio_Watanabe] Toshio Watanabe mailto:watanabe&godzilla.rsc.spdd.ricoh.co.jp ++[TransAct_Futures_Dev] TransAct Futures mailto:1869info&transactfutures.com ++ Development Team ++[Trevor_Bell] Trevor Bell mailto:Trevor&iguana.iosoftware.com ++[Trevor_Perkes] Trevor Perkes mailto:trevor.perkes&landesk.com 2010-02-01 ++[Tristan_Richardson] Tristan Richardson mailto:iana&realvnc.com 2006-03 ++[Tristan_Seifert] Tristan Seifert mailto:admin&247server.net 2011-01-31 ++[Tristan_Seifert_2] Tristan Seifert Squee! Application mailto:tristan&squee.co 2011-07-19 ++ Development ++[Trond_Borsting] Trond Bo/rsting mailto:Trond.Borsting&snota.no ++[Trond_Norbye] Trond Norbye mailto:trond.norbye&sun.com 2009-02-09 ++[Troy_Bergstrand] Troy Bergstrand mailto:troy.bergstrand&hp.com ++[Troy_Gau] Troy Gau mailto:troy&zyxel.com ++[Troy_Morrison] Troy Morrison mailto:troy&graphon.com ++[Troy_Rollo] Troy Rollo mailto:troy&kroll.corvu.com.au ++[Trung_Huu_Tran] Trung Huu Tran mailto:trung.tran&navy.mil 2007-03 ++[Tsutomu_Fujinami] Tsutomu Fujinami mailto:tsutomu.fujinami&hp.com 2005-08 ++[Tung_Nguyen] Tung Nguyen mailto:dash&ricochet.net ++[Tuomo_Makinen] Tuomo Makinen mailto:tmakinen&pp.htv.fi 2002-02 ++[Ty_Ellis] Ty Ellis mailto:tellis&novell.com 2006-05 ++[Tzvika_Chumash] Tzvika Chumash mailto:tzvikac&netvision.net.il ++[UPnP_Forum] UPnP Forum mailto:upnpadmin&forum.upnp.org ++[Udi_Nir] Udi Nir mailto:udi_nir&ncc.co.il ++[Uffe_Harksen] Uffe Harksen mailto:uh&uhcommunications.com 2005-08 ++[Ulaganathan_Sriramul] Ulaganathan Sriramulu mailto:ulag&effigent.com ++[Ulli_Horlacher] Ulli Horlacher mailto:framstag&rus.uni-stuttgart.de ++[Ulrich_Kortenkamp] Ulrich Kortenkamp mailto:kortenkamp&cinderella.de 2003-06 ++[Ulysses_G_Smith_Jr] Ulysses G. Smith Jr. mailto:ugsmith&cesi.com ++ The University ++[University_Corporation_for_Atmospheric_Research] Corporation for mailto:support&unidata.ucar.edu 2012-05-07 ++ Atmospheric Research ++ The University ++[University_Corporation_for_Atmospheric_Research2] Corporation for mailto:support-ldm&unidata.ucar.edu 2012-05-18 ++ Atmospheric Research ++[Urban_Fosseus] Urban Fosseus mailto:urban.fosseus®in.se 2008-12-24 ++[Urbis_Net_Ltd] Urbis.Net Ltd mailto:postmaster&urbis.net ++[Uri_Blank] Uri Blank mailto:uri&quosa.com 2006-09 ++[Uri_Doron] Uri Doron mailto:uri&il.netect.com ++[Uri_Resnitzky] Uri Resnitzky mailto:info&arx.com ++[Uri_Sarid] Uri Sarid mailto:uri&aptana.com 2008-01-22 ++[Uriy_Makasjuk] Uriy Makasjuk mailto:racer&bfpg.ru ++[Urs_Bertschinger] Urs Bertschinger mailto:urs&netmosphere.com ++[Uwe_Holz] Uwe Holz mailto:uwe.holz&azeti.net 2009-11-09 ++[Uwe_Honermann] Uwe Honermann mailto:u.honermann&windream.com ++[Uwe_Ziegler] Uwe Ziegler Goepel electronic mailto:u.ziegler&goepel.com ++ GmbH ++[VR_Satish] VR Satish mailto:vr_satish&symantec.com 2007-08-16 ++[V_A_Brauner] V. A. Brauner mailto:info&datamedia.fr ++[V_Balaji] V. Balaji mailto:balaji&aspec.com ++[Vacquier_Serge] Vacquier Serge mailto:vacquier&systar.fr 2009-02-12 ++[Vadim_Maslov] Vadim Maslov mailto:vm&siber.com 2010-10-06 ++[Vadym_Kargin] Vadym Kargin mailto:vkargin&markem.com 2005-08 ++[Vaibhav_Kumar] Vaibhav Kumar mailto:vakumar&hns.com 2003-07 ++[Valery_Fremaux] Valery Fremaux mailto:vf&eisti.fr ++[Van_Jacobson] Van Jacobson mailto:van&ee.lbl.gov ++[Van_Jacobson_2] Van Jacobson mailto:van&parc.com 2009-09-29 ++[Varma_Bhupatiraju] Varma Bhupatiraju mailto:varma&calient.net ++[Varun_Santosh] Varun Santosh mailto:varun.santosh&hughes.com 2010-10-20 ++[Vasu_Murthy] Vasu Murthy mailto:vmurthy&datascaler.com 2010-02-08 ++[Vaughan_Wesson] Vaughan Wesson mailto:vaughanw&rtunet.com 2006-10 ++[Vaughn_Amann] Vaughn Amann mailto:vamann&aol.com ++[Veizades] mailto:veizades&ftp.com ++[Velneo] Velneo mailto:velneo&velneo.com ++[Venkat_Rangan] Venkat Rangan mailto:venkatr&vitalsigns.com ++[Venkata_Krishna] Venkata Krishna mailto:VenkataKrishna.Bezawada&ca.com 2010-02-24 ++[Venky_Nagar] Venky Nagar mailto:venky&fafner.stanford.edu ++[Ventureforth_Inc] Ventureforth Inc. mailto:support&ventureforth.com 2011-11-03 ++[Vera_Heinau] Vera Heinau mailto:heinau&fu-berlin.de ++[Verek] Verek mailto:info&verek.com ++[Versile_AS] Versile AS mailto:contact&versile.com 2012-02-01 ++[Vick_Keshishian] Vick Keshishian mailto:vickenK&192.219.82.71 ++[Victor_Galis] Victor Galis mailto:galis&satchmo.virtualprototypes.ca ++[Victor_Griswold] Victor Griswold mailto:vgris&aironet.com ++[Victor_H_Farrace] Victor H. Farrace mailto:vfarrace&eaglept.com 2002-10 ++[Victor_Kirhenshtein] Victor Kirhenshtein mailto:victor&opticom.lv 2006-07 ++[Vidder_Inc] Vidder, Inc. mailto:ted&vidder.com 2011-10-24 ++[Videte_IT] Videte IT mailto:info&videte.com ++[Vikas] Vikas mailto:vikas&graycell.com ++[Vikki_Yin_Wei] Vikki Yin Wei mailto:vikki&ipdynamics.com 2003-01 ++[Ville_Laurikari] Ville Laurikari mailto:vlaurika&ssh.com 2005-08 ++[Ville_Pekka_Vahteala] Ville-Pekka Vahteala mailto:ville-pekka.vahteala&bitcomp.fi 2008-06-05 ++[Vinay_Badami] Vinay Badami mailto:VinayBµsoft.com 2006-05 ++[Vinay_Gupta] Vinay Gupta mailto:vinay.gupta&hp.com 2003-08 ++[Vince_Re] Vince Re mailto:Vincent.Re&cai.com ++[Vincent_Gaudeul] Vincent Gaudeul mailto:technique&auriga.fr 2006-02 ++[Vinh_Nguyn] Vinh Nguyn mailto:vinh&sportvision.com ++[Vipul_Ved_Prakash] Vipul Ved Prakash mailto:mail&vipul.net 2002-07 ++[Virgilio_Lattanzi] Virgilio Lattanzi mailto:virgilio&harpax.com 2002-07 ++[Vishal_Dharmadhikari] Vishal Dharmadhikari Hall Research mailto:vishal&hallresearch.com 2011-11-29 ++[Vishnu_Varadaraj] Vishnu Varadaraj mailto:vishnuv¶bay.com ++[Vishwas_Lele] Vishwas Lele mailto:Vishwas_Lele&appliedis.com ++[Vision_Solutions] Vision Solutions, mailto:james.wilkinson&visionsolutions.com 2012-06-06 ++ Inc. ++[Vitali_Fomine] Vitali Fomine mailto:info&winpopup-lan-messenger.com 2005-11 ++[Vitaly_Revsin] Vitaly Revsin mailto:vitaly&webmanage.com ++[Vitaly_Revsin_2] Vitaly Revsin mailto:vitaly&netapp.com ++[Vladimir_Bickov] Vladimir Bickov mailto:vbickov&coderebel.com 2007-08-20 ++[Vladimir_Legalov] Vladimir Legalov mailto:legalov&sgi.com ++[Vladimir_Legalov_2] Vladimir Legalov mailto:vlegalov&riverbed.com 2007-09-04 ++[Voiko_Loukanov] Voiko Loukanov mailto:v.loukanov&dvelectronics.com 2003-10 ++[Volker_Wiegand] Volker Wiegand mailto:volker.wiegand&t-online.de 2007-07-10 ++[Von_Welch] Von Welch mailto:vwelch&ncsa.uiuc.edu ++[VSN_International_Ltd] VSN International mailto:sean&vsni.co.uk 2011-09-28 ++ Ltd. ++[WAP_Forum] WAP Forum mailto:wap-feedback&mail.wapforum.org ++ mailto:pg&uplanet.com ++[W_Jordan_Fitzhugh] W. Jordan Fitzhugh mailto:jfitz&pcare.com ++[Wade_Richards] Wade Richards mailto:wade.richards&sap.com 2008-05-05 ++[Waiki_Wright] Waiki Wright mailto:waiki&us.ibm.com ++[Wally_Pratt_Jr] Wally Pratt Jr mailto:wallyp&hartcomm.org 2010-03-02 ++[Walt_Modic] Walt Modic mailto:Walt.Modic&dionex.com ++[Walter_G_Giroir] Walter G. Giroir mailto:walt_giroir&bmc.com 2003-07 ++[Walter_Goodwin] Walter Goodwin mailto:wpgoodwin&asna.com ++[Walter_K_Eichelburg] Walter K. Eichelburg mailto:walter.eichelburg&sat-automation.com ++[Walter_Poxon] Walter Poxon mailto:wdp&ironwood.cray.com ++[Walter_Underwood] Walter Underwood mailto:wunder&infoseek.com ++[Ward_Silver] Ward Silver mailto:hwardsil&wolfenet.com ++[Warren_Alexander] Warren Alexander mailto:warren&chameleon-creative.co.uk ++[Wayne_Barlow] Wayne Barlow mailto:web&unx.dec.com ++[Wayne_Morrow] Wayne Morrow mailto:wmorrow&starfieldcorp.com 2003-10 ++[Wayne_Schroeder] Wayne Schroeder mailto:schroeder&sds.sdsc.edu ++[Wei_Gao] Wei Gao mailto:wei&mylex.com ++[Wei_Wang] Wei Wang mailto:Wei_Wang&intuit.com 2005-11 ++[Weibao_Wu] Weibao Wu mailto:weibao_wu&symantec.com 2006-04 ++[Weldon_J_Showalter] Weldon J. Showalter mailto:Gamma&mintaka.dca.mil ++[Weng_Chin_Yung] Weng Chin (Winson) Yung mailto:Winson_Yung&3com.com ++[Werner_Almesberger] Werner Almesberger mailto:Werner.Almesberger&epfl.ch ++[Werner_Guertler] Werner Guertler mailto:werner.guertler&ts.fujitsu.com 2009-05-11 ++[Wes_Doonan] Wes Doonan ++[Wes_Peters] Wes Peters mailto:wes&softweyr.com 2007-04 ++[Wes_Wilson] Wes Wilson mailto:wwilson&iss.net 2003-10 ++[Westell] Westell, Inc. mailto:jronk&westell.com ++[Whamb] Whamb mailto:support&whamb.com ++[Widgetschmie_de] Widgetschmie.de ++[Wi-Fi_Alliance] Wi-Fi Alliance mailto:certifications&wi-fi.org 2012-04-09 ++[Wilken_GmbH] Wilken GmbH mailto:fy&wilken.de ++[Will_Dere] Will Dere mailto:will&wrs.com ++[Will_Golson] Will Golson mailto:golson&fc.hp.com ++[Will_Lahr] Will Lahr mailto:will&disruptivegroup.com ++[Will_MacDonald] Will MacDonald mailto:will&codian.com ++[William_Bain] William Bain mailto:bbainµsoft.com ++[William_Benner] William Benner mailto:William_Benner&msn.com ++[William_Benner_2] William Benner mailto:bill&pangolin.com 2002-03 ++[William_D_Wisner] William D. Wisner mailto:wisner&hayes.fai.alaska.edu ++[William_David] William David mailto:william.david&lmco.com ++[William_Dillon] William Dillon mailto:wdillon&coas.oregonstate.edu ++[William_Egge] William Egge mailto:begge&emagisoft.com ++[William_Fernando_Mat] William Fernando Maton mailto:wfms&acm.org 2005-01 ++ Sotomayor ++[William_Fisher] William Fisher mailto:william.w.fisher&intermapper.com 2011-05-09 ++[William_Lai] William Lai mailto:wlaiµsoft.com ++[William_LePera] William LePera mailto:lepera&us.ibm.com 2008-06-18 ++[William_McDonald] William McDonald mailto:billmc&atc.boeing.com ++[William_Mullaney] William Mullaney mailto:mullanwi&usa.net ++[William_Orme] William Orme mailto:bill&repliweb.com ++[William_Phelps] William Phelps mailto:william&meier-phelps.com 2010-03-22 ++[William_Polites] William Polites mailto:wpolites&mitre.org ++[William_R_Bishop] William R Bishop mailto:wrb&world.std.com ++[William_R_Lear] William R. Lear mailto:william.lear&xerox.com 2008-03-06 ++[William_R_Lear_2] William R. Lear mailto:wlear&phlexible.com 2008-10-23 ++[William_Randolph_Roy] William Randolph Royere mailto:william&royere.net ++ III ++[William_Scheding] William Scheding mailto:wls&wls.org ++[William_Schmidt] William Schmidt mailto:info&eclipseaviation.com 2006-03 ++[William_Shipley] William Shipley mailto:wjs&me.com ++[William_Stoye] William Stoye mailto:wstoye&atml.co.uk ++[Willie_Jan_Bons] Willie Jan Bons mailto:WillieJan.Bons&nds.eu 2011-03-10 ++[Willie_Wu] Willie Wu mailto:willie&mds.com ++[Wilson_Kwan] Wilson Kwan mailto:wilsonk%25toronto@zip.atm.com ++[Winston_Chou] Winston Chou mailto:wichou&cisco.com 2011-02-08 ++[Winston_Hetherington] Winston Hetherington ++[Winzig_LLC] Winzig LLC mailto:aroundsound&winzig.com 2011-10-20 ++[Wire_IANA_Contact] 2Wire IANA Contact mailto:iana&2wire.com 2002-04 ++[Wo_o_Ideafarm] Wo'o Ideafarm mailto:b85f3c23.9ad6f42c&ideafarm.com ++[Wolfgang_Adler] Wolfgang Adler mailto:electronicc_rd&wago.com 2006-04 ++[Wolfgang_Rupprecht] Wolfgang Rupprecht mailto:wolfgang&wsrcc.com ++[Wolfgang_Voelker] Wolfgang Voelker mailto:wolfgang.voelker&wibu.com 2007-06 ++[Wolfgang_Weidner] Wolfgang Weidner mailto:ww&citcom.de 2005-12 ++[Wongyu_Cho] Wongyu Cho mailto:wgcho&dialpad.com ++[World_DAB] World DAB mailto:worlddab_irc&worlddab.org ++[World_Fusion] World Fusion mailto:net&worldfusion.com ++[Wouter_Verhelst] Wouter Verhelst mailto:w&uter.be 2010-08-02 ++[www_nsovocal_com] www.nsovocal.com mailto:ben&nsovocal.com 2011-10-18 ++[Wyatt_Williams] Wyatt Williams mailto:wyattw&icall.com ++[Xavier_Roques] Xavier Roques mailto:xroques&infovista.fr ++[Xnet_Communications] Xnet Communications mailto:croco&xdsnet.de ++[XuiS_Software_Ltd] XuiS Software Ltd. mailto:100322.2376&compuserve.com ++[XMPP_Registrar] XMPP Registrar mailto:registrar&xmpp.org ++[Y_Ohiwa] Y. Ohiwa mailto:y-ohiwa&ael.fujitsu.co.jp ++[Y_Y_Goland] Y. Y. Goland mailto:yarongµsoft.com ++[Yakov_Rekhter] Yakov Rekhter mailto:Yakov&ibm.com ++[Yanick_Pouffary] Yanick Pouffary mailto:pouffary&taec.enet.dec.com ++[Yannick_Fortin] Yannick Fortin mailto:fortiny&ca.objectiflune.com 2006-02 ++[Yariv_Kaplan] Yariv Kaplan mailto:yarivk&gilat.com ++[Yasunari_Gon_Yamasit] Yasunari Gon Yamasita mailto:yamasita&omronsoft.co.jp ++[Yasunari_Yamashita] Yasunari Yamashita mailto:yamasita&omronsoft.co.jp 2003-04 ++[Yazsoft] Yazsoft mailto:info&yazsoft.com ++[Yen_Lee] Yen Lee mailto:YenL&bsquare.com ++[Yiftach_Ravid] Yiftach Ravid mailto:yiftach&haifa.vnet.ibm.com ++[Yih_Wu_Wang] Yih-Wu Wang mailto:sstsys&ix.netcom.com ++[Yilei_Jia] Yilei Jia mailto:yjia&navcomtech.com 2009-03-18 ++[Yin_Ki_Lau] Yin Ki Lau mailto:xdt_software&oodot.com ++[Ying_Da_Lee] Ying-Da Lee mailto:ylee&syl.dl.nec.com ++[Yingchun_Xu] Yingchun Xu mailto:Yingchun_Xu&3com.com ++[Yoann_Vandoorselaere] Yoann Vandoorselaere mailto:yoann&prelude-ids.org 2005-08 ++[Yochai_Cohen] Yochai Cohen mailto:yochai&combox.co.il ++[Yogesh_P_Gajjar] Yogesh P. Gajjar mailto:yogesh&cytel.com ++[Yoneda_Terumasa] Yoneda Terumasa mailto:yonedat&pfu.co.jp ++[Yong_Cai] Yong Cai mailto:ycai&emc.com ++[YoonSoo_Kim] YoonSoo Kim mailto:ys71.kim&samsung.com 2006-05 ++[Yoshiaki_Tokumoto] Yoshiaki Tokumoto mailto:toku&pfu.co.jp ++[Yoshihiro_Yamazaki] Yoshihiro Yamazaki mailto:yamazaki&ael.fujitsu.co.jp ++[Yoshikazu_Watanabe] Yoshikazu Watanabe mailto:nabe&sm.sony.co.jp ++[Yoshinobu_Inoue] Yoshinobu Inoue ++[Yoshinobu_Nakamura] Yoshinobu Nakamura mailto:nakamura&np.lps.cs.fujitsu.co.jp ++[Yoshinori_Nakayama] Yoshinori Nakayama mailto:yoshinori_nakayama&komatsu-trilink.jp ++[Yosi_Mass] Yosi Mass mailto:yosimass&haifa.vnet.ibm.com ++[Yossi_Appleboum] Yossi Appleboum mailto:yossia&magicom.co.il ++[Yossi_Appleboum_2] Yossi Appleboum mailto:yossia&web-silicon.com 2005-08 ++[Yossi_Cohen_Shahar] Yossi Cohen-Shahar mailto:yossi&proxy.co.il ++[Yossi_Gal] Yossi Gal mailto:yossi&gilat.com ++[Yuichi_Ohiwa] Yuichi Ohiwa mailto:y-ohiwa&ael.fujitsu.co.jp ++[Yuji_Kuwabara] Yuji Kuwabara mailto:HHG01200&niftyserve.or.jp ++[Yuji_Sasaki] Yuji Sasaki mailto:sasaki&silex.jp ++[Yukihiko_Sakurai] Yukihiko Sakurai mailto:y-sakurai&ael.fujitsu.co.jp ++[Yuri_Machkasov] Yuri Machkasov mailto:yuri&ptc.com ++[Yuri_Machkasov_2] Yuri Machkasov mailto:ymachkasov&servigistics.com 2006-08 ++[Yusuke_Asai] Yusuke Asai mailto:yasai&nw1.file.fc.nec.co.jp ++[Yutaka_Ono] Yutaka Ono mailto:ono&saint.nm.fujitsu.co.jp ++[Yuval_Hager] Yuval Hager mailto:yuval&avramzon.net 2006-01 ++[Yves_Gattegno] Yves Gattegno mailto:iana&qualystem.org 2004-12 ++[Yvon_Marineau] Yvon Marineau mailto:yvon&simware.com ++[Zach_Metzinger] Zach Metzinger mailto:zach.metzinger&maxim-ic.com ++[Zach_Nies] Zach Nies mailto:znies&creo.com 2002-09 ++[Zachary_Gramana] Zachary Gramana mailto:contactus&excitabyte.com ++[Zan_Oliphant] Zan Oliphant mailto:zan&accessone.com ++[Zane_Bitter] Zane Bitter mailto:zbitter&redhat.com 2011-08-31 ++[Zdenek_Kolba] Zdenek Kolba mailto:zdenek.kolba&id-karta.cz ++[Zenon_Fortuna] Zenon Fortuna mailto:zenon&mips.com 2007-02 ++[Zhengli] Zhengli mailto:std&iwncomm.com 2010-06-28 ++[Zhiming_Li] Zhiming Li 3GPP2 mailto:lizhiming&huawei.com 2012-01-11 ++[Zhizhong_Zhuang] Zhizhong Zhuang mailto:ZZhuang&optellios.com 2006-12 ++[Zia_Bhatti] Zia Bhatti mailto:zia&netright.com ++[Ziad_Sawalha] Ziad Sawalha Rackspace Hosting mailto:ziad.sawalha&rackspace.com 2011-08-15 ++[Zygmunt_Wiercioch] Zygmunt Wiercioch mailto:zyg&jetform.com ++[admin] admin mailto:iana&sightlinesystems.com ++[base_t_Interactive] 10base-t Interactive mailto:support&10base-t.com ++[brockman] mailto:brockman&ccmail.com ++[ddt] mailto:ddt&idcube.idsoftware.com ++[equinux] equinux mailto:mediacentral&equinux.comdu ++[flanne] flanne@vnet.IBM.COM ++[gary] mailto:gary&airsoft.com ++[gdeinsta] gdeinsta mailto:gdeinsta&jetform.com ++[gilmer] mailto:gilmer&gandalf.ca ++[gunner] mailto:gunner&ibeam.intel.com ++[iOS_Software] iOS Software mailto:ios&free.fr ++[iThink_Software] iThink Software mailto:contact&ithinksw.com ++[mackin] mailto:mackin&us.oracle.com ++[naonao] mailto:naonao&kikaku.mmp.fujitsu.co.jp ++[sn_w_of_renegade_lab] sn0w of renegade labs mailto:sn0w&devious.tsongkie.com 2003-11 ++ ++ Footnote ++ ++ [1] It is only appropriate to use these values in explicitly- ++ configured experiments; they MUST NOT be shipped as defaults in ++ implementations. See RFC 3692 for details. +diff -Naur iana-etc-2.30.orig/protocol-numbers.dist iana-etc-2.30/protocol-numbers.dist +--- iana-etc-2.30.orig/protocol-numbers.dist 2012-06-10 10:24:26.651533631 +0000 ++++ iana-etc-2.30/protocol-numbers.dist 2012-06-10 10:25:04.052544441 +0000 +@@ -1,519 +1,275 @@ +-(last updated 2008-02-27) ++ Last Updated ++ 2011-11-01 + +-Registries included below: +-- Assigned Internet Protocol Numbers ++ This registry is also available in plain text. + +-Registry Name: Assigned Internet Protocol Numbers +-Reference: [RFC5237] +-Registration Procedures: IESG Approval or Standards Action +-Note: In the Internet Protocol version 4 (IPv4) [RFC791] there is a field +-called "Protocol" to identify the next level protocol. This is an 8 +-bit field. In Internet Protocol version 6 (IPv6) [RFC1883], this field +-is called the "Next Header" field. ++ Registry included below + +-Registry: +-Decimal Keyword Protocol References +---------- ---------- --------------------------------------- ---------- +- 0 HOPOPT IPv6 Hop-by-Hop Option [RFC1883] +- 1 ICMP Internet Control Message [RFC792] +- 2 IGMP Internet Group Management [RFC1112] +- 3 GGP Gateway-to-Gateway [RFC823] +- 4 IP IP in IP (encapsulation) [RFC2003] +- 5 ST Stream [RFC1190][RFC1819] +- 6 TCP Transmission Control [RFC793] +- 7 CBT CBT [Ballardie] +- 8 EGP Exterior Gateway Protocol [RFC888][DLM1] +- 9 IGP any private interior gateway [IANA] +- (used by Cisco for their IGRP) +- 10 BBN-RCC-MON BBN RCC Monitoring [SGC] +- 11 NVP-II Network Voice Protocol [RFC741,SC3] +- 12 PUP PUP [PUP,XEROX] +- 13 ARGUS ARGUS [RWS4] +- 14 EMCON EMCON [BN7] +- 15 XNET Cross Net Debugger [IEN158,JFH2] +- 16 CHAOS Chaos [NC3] +- 17 UDP User Datagram [RFC768,JBP] +- 18 MUX Multiplexing [IEN90,JBP] +- 19 DCN-MEAS DCN Measurement Subsystems [DLM1] +- 20 HMP Host Monitoring [RFC869,RH6] +- 21 PRM Packet Radio Measurement [ZSU] +- 22 XNS-IDP XEROX NS IDP [ETHERNET,XEROX] +- 23 TRUNK-1 Trunk-1 [BWB6] +- 24 TRUNK-2 Trunk-2 [BWB6] +- 25 LEAF-1 Leaf-1 [BWB6] +- 26 LEAF-2 Leaf-2 [BWB6] +- 27 RDP Reliable Data Protocol [RFC908,RH6] +- 28 IRTP Internet Reliable Transaction [RFC938,TXM] +- 29 ISO-TP4 ISO Transport Protocol Class 4 [RFC905,RC77] +- 30 NETBLT Bulk Data Transfer Protocol [RFC969,DDC1] +- 31 MFE-NSP MFE Network Services Protocol [MFENET,BCH2] +- 32 MERIT-INP MERIT Internodal Protocol [HWB] +- 33 DCCP Datagram Congestion Control Protocol [RFC4340] +- 34 3PC Third Party Connect Protocol [SAF3] +- 35 IDPR Inter-Domain Policy Routing Protocol [MXS1] +- 36 XTP XTP [GXC] +- 37 DDP Datagram Delivery Protocol [WXC] +- 38 IDPR-CMTP IDPR Control Message Transport Proto [MXS1] +- 39 TP++ TP++ Transport Protocol [DXF] +- 40 IL IL Transport Protocol [Presotto] +- 41 IPv6 Ipv6 [Deering] +- 42 SDRP Source Demand Routing Protocol [DXE1] +- 43 IPv6-Route Routing Header for IPv6 [Deering] +- 44 IPv6-Frag Fragment Header for IPv6 [Deering] +- 45 IDRP Inter-Domain Routing Protocol [Sue Hares] +- 46 RSVP Reservation Protocol [Bob Braden] +- 47 GRE General Routing Encapsulation [Tony Li] +- 48 DSR Dynamic Source Routing Protocol [RFC4728] +- 49 BNA BNA [Gary Salamon] +- 50 ESP Encap Security Payload [RFC2406] +- 51 AH Authentication Header [RFC2402] +- 52 I-NLSP Integrated Net Layer Security TUBA [GLENN] +- 53 SWIPE IP with Encryption [JI6] +- 54 NARP NBMA Address Resolution Protocol [RFC1735] +- 55 MOBILE IP Mobility [Perkins] +- 56 TLSP Transport Layer Security Protocol [Oberg] +- using Kryptonet key management +- 57 SKIP SKIP [Markson] +- 58 IPv6-ICMP ICMP for IPv6 [RFC1883] +- 59 IPv6-NoNxt No Next Header for IPv6 [RFC1883] +- 60 IPv6-Opts Destination Options for IPv6 [RFC1883] +- 61 any host internal protocol [IANA] +- 62 CFTP CFTP [CFTP,HCF2] +- 63 any local network [IANA] +- 64 SAT-EXPAK SATNET and Backroom EXPAK [SHB] +- 65 KRYPTOLAN Kryptolan [PXL1] +- 66 RVD MIT Remote Virtual Disk Protocol [MBG] +- 67 IPPC Internet Pluribus Packet Core [SHB] +- 68 any distributed file system [IANA] +- 69 SAT-MON SATNET Monitoring [SHB] +- 70 VISA VISA Protocol [GXT1] +- 71 IPCV Internet Packet Core Utility [SHB] +- 72 CPNX Computer Protocol Network Executive [DXM2] +- 73 CPHB Computer Protocol Heart Beat [DXM2] +- 74 WSN Wang Span Network [VXD] +- 75 PVP Packet Video Protocol [SC3] +- 76 BR-SAT-MON Backroom SATNET Monitoring [SHB] +- 77 SUN-ND SUN ND PROTOCOL-Temporary [WM3] +- 78 WB-MON WIDEBAND Monitoring [SHB] +- 79 WB-EXPAK WIDEBAND EXPAK [SHB] +- 80 ISO-IP ISO Internet Protocol [MTR] +- 81 VMTP VMTP [DRC3] +- 82 SECURE-VMTP SECURE-VMTP [DRC3] +- 83 VINES VINES [BXH] +- 84 TTP TTP [JXS] +- 85 NSFNET-IGP NSFNET-IGP [HWB] +- 86 DGP Dissimilar Gateway Protocol [DGP,ML109] +- 87 TCF TCF [GAL5] +- 88 EIGRP EIGRP [CISCO,GXS] +- 89 OSPFIGP OSPFIGP [RFC1583,JTM4] +- 90 Sprite-RPC Sprite RPC Protocol [SPRITE,BXW] +- 91 LARP Locus Address Resolution Protocol [BXH] +- 92 MTP Multicast Transport Protocol [SXA] +- 93 AX.25 AX.25 Frames [BK29] +- 94 IPIP IP-within-IP Encapsulation Protocol [JI6] +- 95 MICP Mobile Internetworking Control Pro. [JI6] +- 96 SCC-SP Semaphore Communications Sec. Pro. [HXH] +- 97 ETHERIP Ethernet-within-IP Encapsulation [RFC3378] +- 98 ENCAP Encapsulation Header [RFC1241,RXB3] +- 99 any private encryption scheme [IANA] +- 100 GMTP GMTP [RXB5] +- 101 IFMP Ipsilon Flow Management Protocol [Hinden] +- 102 PNNI PNNI over IP [Callon] +- 103 PIM Protocol Independent Multicast [Farinacci] +- 104 ARIS ARIS [Feldman] +- 105 SCPS SCPS [Durst] +- 106 QNX QNX [Hunter] +- 107 A/N Active Networks [Braden] +- 108 IPComp IP Payload Compression Protocol [RFC2393] +- 109 SNP Sitara Networks Protocol [Sridhar] +- 110 Compaq-Peer Compaq Peer Protocol [Volpe] +- 111 IPX-in-IP IPX in IP [Lee] +- 112 VRRP Virtual Router Redundancy Protocol [RFC3768] +- 113 PGM PGM Reliable Transport Protocol [Speakman] +- 114 any 0-hop protocol [IANA] +- 115 L2TP Layer Two Tunneling Protocol [Aboba] +- 116 DDX D-II Data Exchange (DDX) [Worley] +- 117 IATP Interactive Agent Transfer Protocol [Murphy] +- 118 STP Schedule Transfer Protocol [JMP] +- 119 SRP SpectraLink Radio Protocol [Hamilton] +- 120 UTI UTI [Lothberg] +- 121 SMP Simple Message Protocol [Ekblad] +- 122 SM SM [Crowcroft] +- 123 PTP Performance Transparency Protocol [Welzl] +- 124 ISIS over IPv4 [Przygienda] +- 125 FIRE [Partridge] +- 126 CRTP Combat Radio Transport Protocol [Sautter] +- 127 CRUDP Combat Radio User Datagram [Sautter] +- 128 SSCOPMCE [Waber] +- 129 IPLT [Hollbach] +- 130 SPS Secure Packet Shield [McIntosh] +- 131 PIPE Private IP Encapsulation within IP [Petri] +- 132 SCTP Stream Control Transmission Protocol [Stewart] +- 133 FC Fibre Channel [Rajagopal] +- 134 RSVP-E2E-IGNORE [RFC3175] +- 135 Mobility Header [RFC3775] +- 136 UDPLite [RFC3828] +- 137 MPLS-in-IP [RFC4023] +- 138 manet MANET Protocols [RFC-ietf-manet-iana-07.txt] +- 139 HIP Host Identity Protocol [RFC-ietf-hip-base-10.txt] +- 140-252 Unassigned [IANA] +- 253 Use for experimentation and testing [RFC3692] +- 254 Use for experimentation and testing [RFC3692] +- 255 Reserved [IANA] +- +- +-References +----------- +-[CFTP] Forsdick, H., "CFTP", Network Message, Bolt Beranek and +- Newman, January 1982. +- +-[CISCO] Cisco Systems, "Gateway Server Reference Manual", Manual +- Revision B, January 10, 1988. +- +-[DDN] Feinler, E., Editor, "DDN Protocol Handbook", Network +- Information Center, SRI International, December 1985. +- +-[DGP] M/A-COM Government Systems, "Dissimilar Gateway Protocol +- Specification, Draft Version", Contract no. CS901145, +- November 16, 1987. +- +-[ETHERNET] "The Ethernet, A Local Area Network: Data Link Layer and +- Physical Layer Specification", AA-K759B-TK, Digital +- Equipment Corporation, Maynard, MA. Also as: "The +- Ethernet - A Local Area Network", Version 1.0, Digital +- Equipment Corporation, Intel Corporation, Xerox +- Corporation, September 1980. And: "The Ethernet, A Local +- Area Network: Data Link Layer and Physical Layer +- Specifications", Digital, Intel and Xerox, November 1982. +- And: XEROX, "The Ethernet, A Local Area Network: Data Link +- Layer and Physical Layer Specification", X3T51/80-50, +- Xerox Corporation, Stamford, CT., October 1980. +- +-[IEN90] Cohen, D. and J. Postel, "Multiplexing Protocol", IEN 90, +- USC/Information Sciences Institute, May 1979. +- +-[IEN119] Forgie, J., "ST - A Proposed Internet Stream Protocol", +- IEN 119, MIT Lincoln Laboratory, September 1979. +- +-[IEN158] Haverty, J., "XNET Formats for Internet Protocol Version 4", +- IEN 158, October 1980. +- +-[MFENET] Shuttleworth, B., "A Documentary of MFENet, a National +- Computer Network", UCRL-52317, Lawrence Livermore Labs, +- Livermore, California, June 1977. +- +-[PUP] Boggs, D., J. Shoch, E. Taft, and R. Metcalfe, "PUP: An +- Internetwork Architecture", XEROX Palo Alto Research Center, +- CSL-79-10, July 1979; also in IEEE Transactions on +- Communication, Volume COM-28, Number 4, April 1980. +- +-[SPRITE] Welch, B., "The Sprite Remote Procedure Call System", +- Technical Report, UCB/Computer Science Dept., 86/302, +- University of California at Berkeley, June 1986. +- +-[RFC741] Cohen, D., "Specifications for the Network Voice Protocol", +- RFC 741, ISI/RR 7539, USC/Information Sciences Institute, +- March 1976. +- +-[RFC768] Postel, J., "User Datagram Protocol", STD 6, RFC 768, +- USC/Information Sciences Institute, August 1980. +- +-[RFC791] Postel, J., "Internet Protocol - DARPA Internet Prnogram +- Protocol Specification", STD 5, RFC 791, DARPA, September +- 1981. +- +-[RFC792] Postel, J., "Internet Control Message Protocol - DARPA +- Internet Program Protocol Specification", STD 5, RFC 792, +- USC/Information Sciences Institute, September 1981. +- +-[RFC793] Postel, J., "Transmission Control Protocol - DARPA +- Internet Program Protocol Specification", STD 7, RFC 793, +- USC/Information Sciences Institute, September 1981. +- +-[RFC823] Hinden, R., and A. Sheltzer, "The DARPA Internet Gateway", +- RFC 823, BBN, September 1982. +- +-[RFC869] Hinden, R., "A Host Monitoring Protocol", RFC 869, +- Bolt Beranek and Newman, December 1983. +- +-[RFC888] Seamonson, L., and E. Rosen, "STUB" Exterior Gateway +- Protocol", RFC 888, BBN Communications Corporation, +- January 1984. +- +-[RFC905] International Standards Organization, "ISO Transport Protocol +- Specification - ISO DP 8073", RFC 905, April 1984. +- +-[RFC908] Velten, D., R. Hinden, and J. Sax, "Reliable Data Protocol", +- RFC 908, BBN Communications Corporation, July 1984. +- +-[RFC938] Miller, T., "Internet Reliable Transaction Protocol", RFC 938, +- ACC, February 1985. +- +-[RFC969] Clark, D., M. Lambert, and L. Zhang, "NETBLT: A Bulk Data +- Transfer Protocol", RFC 969, MIT Laboratory for Computer +- Science, December 1985. +- +-[RFC1112] Deering, S., "Host Extensions for IP Multicasting", +- STD 5, RFC 1112, Stanford University, August 1989. +- +-[RFC1190] Topolcic, C., Editor, "Experimental Internet Stream +- Protocol, Version 2 (ST-II)", RFC 1190, CIP Working Group, +- October 1990. +- +-[RFC1241] Woodburn, W., and D. Mills, " A Scheme for an Internet +- Encapsulation Protocol: Version 1", RFC 1241, SAIC, +- University of Delaware, July 1991. +- +-[RFC1583] Moy, J., "The OSPF Specification", RFC 1583, Proteon, +- March 1994. +- +-[RFC1735] Heinanen, J., and R. Govindan, " NBMA Address Resolution +- Protocol (NARP)", RFC 1735, Telecom Finland and USC/ISI, +- December 1994. +- +-[RFC1819] L. Delgrossi, L. Berger, and ST2 Working Group, "Internet +- Stream Protocol Version 2 (ST2) Protocol Specification +- - Version ST2+", RFC 1819, August 1995. +- +-[RFC1883] Deering, S., and R. Hinden, "Internet Protocol, Version 6 +- (IPv6) Specification", RFC 1883, Xerox PARC, Ipsilon +- Networks, December 1995. +- +-[RFC2003] Perkins, C., "IP Encapsulation within IP", RFC 2003, IBM, +- September 1996. +- +-[RFC2393] Shacham, A., and R. Monsour, R. Pereira, M. Thomas, "IP +- Payload Compression Protocol (IPComp)", RFC 2393, Cisco, +- Hi/fn, TimeStep, AltaVista Internt, December 1998. +- +-[RFC2402] S. Kent and R. Atkinson, "IP Authentication Header", +- RFC 2402, November 1998. +- +-[RFC2406] S. Kent and R. Atkinson, "IP Encapsulating Security Payload (ESP)", +- RFC 2406, November 1998. +- +-[RFC3175] F. Baker, C. Iturralde, F. Le Faucheur, B. Davie, +- "Aggregation of RSVP for IPv4 and IPv6 Reservations", +- RFC 3175, September 2001. +- +-[RFC3378] R. Housley and S. Hollenbeck, "EtherIP: Tunneling Ethernet +- Frames in IP Datagrams", RFC 3378, September 2002. +- +-[RFC3692] T. Narten, "Assigning Experimental and Testing Numbers Considered +- Useful", RFC 3692, January 2004. +- +-[RFC3768] R. Hinden, Ed., "Virtual Router Redundancy Protocol (VRRP)", +- RFC 3768, April 2004. +- +-[RFC3775] D. Johnson, C. Perkins, and J. Arkko, "Mobility Support in IPv6", +- RFC 3775, June 2004. +- +-[RFC3828] L-A. Larzon, M. Degermark, S. Pink, L-E. Jonsson Ed., and +- G. Fairhurst, Ed., "The UDP-Lite Protocol", RFC 3828, July 2004. +- +-[RFC4023] T. Worster, Y. Rekhter, and E. Rosen, Ed., "Encapsulating MPLS in +- IP or Generic Routing Encapsulation (GRE)", RFC 4023, March 2005. +- +-[RFC4340] E. Kohler, M. Handley and S. Floyd, "Datagram Congestion +- Control Protocol (DCCP)", RFC 4340, March 2006. +- +-[RFC4728] D.B. Johnson, D.A. Maltz and Y-C. Hu, "The Dynamic Source Routing Protocol +- for Mobile Ad Hoc Networks (DSR)", RFC 4728, February 2007. +- +-[RFC-ietf-manet-iana-07.txt] +- I. Chakeres, "IANA Allocations for MANET Protocols", RFC XXXX, +- Month Year. +- +-[RFC-ietf-hip-base-10.txt] +- R. Moskowitz, P. Nikander, P. Jokela, Ed., T. Henderson, "Host Identity +- Protocol", RFC XXXX, Month Year. +- +-[RFC5237] J. Arkko, S. Bradner, "IANA Allocation Guidelines for the Protocol Field", +- RFC 5237, February 2008. +- +-People +------- +-[Aboba] Bernard Aboba <bernardaµsoft.com>, April 1998. +- +-[Ballardie] Tony Ballardie <A.Ballardie&cs.ucl.ac.uk> +- +-[BCH2] Barry Howard <Howard&NMFECC.LLNL.GOV> +- +-[BK29] Brian Kantor <brian&UCSD.EDU> +- +-[BN7] <mystery contact> +- +-[Braden] Bob Braden, <braden&isi.edu>, July 1997. +- +-[BWB6] Barry Boehm <boehm&ARPA.MIL> +- +-[BXH] Brian Horn <---none---> +- +-[BXW] Bruce Willins <---none---> +- +-[Callon] Ross Callon, <rcallon&baynetworks.com>, December 1995. +- +-[Carpenter] Brian Carpenter, <brian&dxcoms.cern.ch>, January 1995. +- +-[Crowcroft] Jon Crowcroft <jon&cs.ucl.ac.uk>, June 1999. +- +-[DDC1] David Clark <ddc&LCS.MIT.EDU> +- +-[DLM1] David Mills <Mills&HUEY.UDEL.EDU> +- +-[DRC3] Dave Cheriton <cheriton&PESCADERO.STANFORD.EDU> +- +-[Deering] Steve Deering, <deering&parc.xerox.com>, March 1995. +- +-[Doraswamy] Naganand Doraswamy, <naganand&BayNetworks.com>, September 1997. +- +-[Durst] Robert Durst, <durst&mitre.org>, March 1997. +- +-[DXE1] Deborah Estrin <estrin&usc.edu> +- +-[Farinacci] Dino Farinacci, <dino&cisco.com>, March 1996. +- +-[Feldman] Nancy Feldman <nkf&vnet.ibm.com> January 1997. +- +-[DXF] Dirk Fromhein <df&watershed.com> +- +-[DXM2] David Mittnacht <---none---> +- +-[Ekblad] Leif Ekblad <leif.ekblad&eslov.mail.telia.com>, March 1999. +- +-[GAL5] Guillermo A. Loyola <LOYOLA&IBM.COM> +- +-[GLENN] K. Robert Glenn <glenn&osi.ncsl.nist.gov> +- +-[GXC] Greg Chesson <Greg&SGI.COM> +- +-[GXS] Guenther Schreiner <snmp-admin&ira.uka.de> +- +-[GXT1] Gene Tsudik <tsudik&USC.EDU> +- +-[Hamilton] Mark Hamilton <mah&spectralink.com>, November 1998. +- +-[HCF2] Harry Forsdick <Forsdick&BBN.COM> +- +-[Hinden] Bob Hinden, <hinden&ipsilon.com>, November 1995, 1997. +- +-[Hunter] Michael Hunter, <mphunter&qnx.com>, July 1997. +- +-[HWB] Hans-Werner Braun <HWB&MCR.UMICH.EDU> +- +-[HXH] Howard Hart <hch&hybrid.com> +- +-[IANA] Internet Assigned Numbers Authority, <iana&iana.org>, June 1995. +- +-[JBP] Jon Postel <postel&isi.edu> +- +-[JMP] Jean-Michel Pittet, <jmp&gandalf.engr.sgi.com>, November 1998. +- +-[JC120] <mystery contact> +- +-[JFH2] Jack Haverty <jhaverty&ORACLE.COM> +- +-[JI6] John Ioannidis <ji&CS.COLUMBIA.EDU> +- +-[JTM4] John Moy <jmoy&PROTEON.COM> +- +-[JWF] Jim Forgie <FORGIE&XN.LL.MIT.EDU> +- +-[JXS] Jim Stevens <Stevens&ISI.EDU> +- +-[KATZ] Dave Katz <dkatz&cisco.com> +- +-[Lee] CJ Lee, <cj_lee&novell.com>, October 1997. +- +-[Lothberg] Peter Lothberg <roll&stupi.se>, March 1999. +- +-[Markson] Tom Markson, <markson&osmosys.ingog.com>, September 1995. +- +-[MB] Mike Brescia <Brescia&CCV.BBN.COM> +- +-[MBG] Michael Greenwald <Greenwald&SCRC-STONY-BROOK.SYMBOLICS.COM> +- +-[McIntosh] Bill McIntosh <BMcIntosh&fortresstech.com> +- +-[ML109] Mike Little <little&MACOM4.ARPA> +- +-[MTR] Marshall T. Rose <mrose&dbc.mtview.ca.us> +- +-[Murphy] John Murphy <john.m.murphy&mci.com>, October 1998. +- +-[MXS1] Martha Steenstrup <MSteenst&BBN.COM> +- +-[NC3] J. Noel Chiappa <JNC&XX.LCS.MIT.EDU> +- +-[Oberg] Christer Oberg <chg&bull.se> October 1994. +- +-[Partridge] Criag Partridge <craig&bbn.com>, August 1999. +- +-[Perkins] Charlie Perkins <perk&watson.ibm.com>, October 1994. +- +-[Petri] Bernhard Petri <bernhard.petri&nsn.com>, March 2000. +- +-[Presotto] Dave Presotto <presotto&plan9.att.com>, July 1995. +- +-[Przygienda] Tony Przygienda <prz&siara.com>, August 1999. +- +-[PXL1] Paul Liu <---none---> +- +-[Rajagopal] Murali Rajagopal, <murali&gadzoox.com>, May 2000. +- +-[RH6] Robert Hinden <Hinden&ENG.SUN.COM> +- +-[RTB3] Bob Braden <braden&isi.edu> +- +-[RC77] <mystery contact> +- +-[RDH1] Russ Housley <rhousley&rsasecurity.com> +- +-[RWS4] Robert W. Scheifler <RWS&XX.LCS.MIT.EDU> +- +-[RXB3] Robert Woodburn <woody&cseic.saic.com> +- +-[Sautter] Robert Sautter <rsautter&acdnj.itt.com>, August 1999. +- +-[SAF3] Stuart A. Friedberg <stuart&CS.WISC.EDU> +- +-[SC3] Steve Casner <casner&isi.edu +- +-[SGC] Steve Chipman Chipman&F.BBN.COM> +- +-[SHB] Steven Blumenthal <BLUMENTHAL&VAX.BBN.COM> +- +-[Speakman] Tony Speakman <speakman&cisco.com>, January 1998. +- +-[Sridhar] Manickam R.Sridhar <msridhar&sitaranetworks.com>, September 1997. +- +-[Stewart] Randall R. Stewart <rrs&cisco.com>, April 2000. +- +-[Sue Hares] Sue Hares <skh&merit.edu> +- +-[SXA] Susie Armstrong <Armstrong.wbst128&XEROX.COM> +- +-[SXD] Steve Deering <deering&PARC.XEROX.COM> +- +-[Tony Li] Tony Li <tli&cisco.com> +- +-[TXM] Trudy Miller <Trudy&ACC.COM> +- +-[Volpe] Victor Volpe <vvolpe&smtp.microcom.com>, October 1997. +- +-[VXD] Victor Dafoulas <---none---> +- +-[Waber] Kurt Waber <kurt.waber&swisscom.com>, August 1999. +- +-[Welzl] Michael Welzl <michael&tk.uni-linz.ac.at>, August 1999. +- +-[WM3] William Melohn <Melohn&SUN.COM> +- +-[WXC] Wesley Craig <Wesley.Craig&terminator.cc.umich.edu> +- +-[Worley] John Worley <worley&milehigh.net>, June 1998. +- +-[ZSU] Zaw-Sing Su <ZSu&TSCA.ISTC.SRI.> +- +-[] ++ * Assigned Internet Protocol Numbers + ++Assigned Internet Protocol Numbers ++ ++ Registration Procedures ++ ++ IESG Approval or Standards Action ++ ++ Reference ++ [RFC5237] ++ ++ Note ++ ++ In the Internet Protocol version 4 (IPv4) [RFC791] there is a field ++ called "Protocol" to identify the next level protocol. This is an 8 ++ bit field. In Internet Protocol version 6 (IPv6) [RFC2460], this field ++ is called the "Next Header" field. ++ ++ Decimal Keyword Protocol Reference ++ 0 HOPOPT IPv6 Hop-by-Hop Option [RFC2460] ++ 1 ICMP Internet Control Message [RFC792] ++ 2 IGMP Internet Group Management [RFC1112] ++ 3 GGP Gateway-to-Gateway [RFC823] ++ 4 IPv4 IPv4 encapsulation [RFC2003] ++ 5 ST Stream [RFC1190][RFC1819] ++ 6 TCP Transmission Control [RFC793] ++ 7 CBT CBT [Tony_Ballardie] ++ 8 EGP Exterior Gateway Protocol [RFC888][David_Mills] ++ 9 IGP any private interior gateway (used by [Internet_Assigned_Numbers_Authority] ++ Cisco for their IGRP) ++ 10 BBN-RCC-MON BBN RCC Monitoring [Steve_Chipman] ++ 11 NVP-II Network Voice Protocol [RFC741][Steve_Casner] ++ [Boggs, D., J. Shoch, E. Taft, and R. Metcalfe, "PUP: An Internetwork ++ 12 PUP PUP Architecture", XEROX Palo Alto Research Center, CSL-79-10, July 1979; also in IEEE ++ Transactions on Communication, Volume COM-28, Number 4, April 1980.][[XEROX]] ++ 13 ARGUS ARGUS [Robert_W_Scheifler] ++ 14 EMCON EMCON [<mystery contact>] ++ 15 XNET Cross Net Debugger [Haverty, J., "XNET Formats for Internet Protocol Version 4", IEN 158, October ++ 1980.][Jack_Haverty] ++ 16 CHAOS Chaos [J_Noel_Chiappa] ++ 17 UDP User Datagram [RFC768][Jon_Postel] ++ 18 MUX Multiplexing [Cohen, D. and J. Postel, "Multiplexing Protocol", IEN 90, USC/Information ++ Sciences Institute, May 1979.][Jon_Postel] ++ 19 DCN-MEAS DCN Measurement Subsystems [David_Mills] ++ 20 HMP Host Monitoring [RFC869][Robert_Hinden] ++ 21 PRM Packet Radio Measurement [Zaw_Sing_Su] ++ ["The Ethernet, A Local Area Network: Data Link Layer and Physical Layer ++ Specification", AA-K759B-TK, Digital Equipment Corporation, Maynard, MA. Also as: ++ "The Ethernet - A Local Area Network", Version 1.0, Digital Equipment Corporation, ++ 22 XNS-IDP XEROX NS IDP Intel Corporation, Xerox Corporation, September 1980. And: "The Ethernet, A Local ++ Area Network: Data Link Layer and Physical Layer Specifications", Digital, Intel ++ and Xerox, November 1982. And: XEROX, "The Ethernet, A Local Area Network: Data ++ Link Layer and Physical Layer Specification", X3T51/80-50, Xerox Corporation, ++ Stamford, CT., October 1980.][[XEROX]] ++ 23 TRUNK-1 Trunk-1 [Barry_Boehm] ++ 24 TRUNK-2 Trunk-2 [Barry_Boehm] ++ 25 LEAF-1 Leaf-1 [Barry_Boehm] ++ 26 LEAF-2 Leaf-2 [Barry_Boehm] ++ 27 RDP Reliable Data Protocol [RFC908][Robert_Hinden] ++ 28 IRTP Internet Reliable Transaction [RFC938][Trudy_Miller] ++ 29 ISO-TP4 ISO Transport Protocol Class 4 [RFC905][<mystery contact>] ++ 30 NETBLT Bulk Data Transfer Protocol [RFC969][David_Clark] ++ [Shuttleworth, B., "A Documentary of MFENet, a National Computer Network", ++ 31 MFE-NSP MFE Network Services Protocol UCRL-52317, Lawrence Livermore Labs, Livermore, California, June ++ 1977.][Barry_Howard] ++ 32 MERIT-INP MERIT Internodal Protocol [Hans_Werner_Braun] ++ 33 DCCP Datagram Congestion Control Protocol [RFC4340] ++ 34 3PC Third Party Connect Protocol [Stuart_A_Friedberg] ++ 35 IDPR Inter-Domain Policy Routing Protocol [Martha_Steenstrup] ++ 36 XTP XTP [Greg_Chesson] ++ 37 DDP Datagram Delivery Protocol [Wesley_Craig] ++ 38 IDPR-CMTP IDPR Control Message Transport Proto [Martha_Steenstrup] ++ 39 TP++ TP++ Transport Protocol [Dirk_Fromhein] ++ 40 IL IL Transport Protocol [Dave_Presotto] ++ 41 IPv6 IPv6 encapsulation [RFC2473] ++ 42 SDRP Source Demand Routing Protocol [Deborah_Estrin] ++ 43 IPv6-Route Routing Header for IPv6 [Steve_Deering] ++ 44 IPv6-Frag Fragment Header for IPv6 [Steve_Deering] ++ 45 IDRP Inter-Domain Routing Protocol [Sue_Hares] ++ 46 RSVP Reservation Protocol [RFC2205][RFC3209][Bob_Braden] ++ 47 GRE General Routing Encapsulation [RFC1701][Tony_Li] ++ 48 DSR Dynamic Source Routing Protocol [RFC4728] ++ 49 BNA BNA [Gary Salamon] ++ 50 ESP Encap Security Payload [RFC4303] ++ 51 AH Authentication Header [RFC4302] ++ 52 I-NLSP Integrated Net Layer Security TUBA [K_Robert_Glenn] ++ 53 SWIPE IP with Encryption [John_Ioannidis] ++ 54 NARP NBMA Address Resolution Protocol [RFC1735] ++ 55 MOBILE IP Mobility [Charlie_Perkins] ++ 56 TLSP Transport Layer Security Protocol [Christer_Oberg] ++ using Kryptonet key management ++ 57 SKIP SKIP [Tom_Markson] ++ 58 IPv6-ICMP ICMP for IPv6 [RFC2460] ++ 59 IPv6-NoNxt No Next Header for IPv6 [RFC2460] ++ 60 IPv6-Opts Destination Options for IPv6 [RFC2460] ++ 61 any host internal protocol [Internet_Assigned_Numbers_Authority] ++ 62 CFTP CFTP [Forsdick, H., "CFTP", Network Message, Bolt Beranek and Newman, January ++ 1982.][Harry_Forsdick] ++ 63 any local network [Internet_Assigned_Numbers_Authority] ++ 64 SAT-EXPAK SATNET and Backroom EXPAK [Steven_Blumenthal] ++ 65 KRYPTOLAN Kryptolan [Paul Liu] ++ 66 RVD MIT Remote Virtual Disk Protocol [Michael_Greenwald] ++ 67 IPPC Internet Pluribus Packet Core [Steven_Blumenthal] ++ 68 any distributed file system [Internet_Assigned_Numbers_Authority] ++ 69 SAT-MON SATNET Monitoring [Steven_Blumenthal] ++ 70 VISA VISA Protocol [Gene_Tsudik] ++ 71 IPCV Internet Packet Core Utility [Steven_Blumenthal] ++ 72 CPNX Computer Protocol Network Executive [David Mittnacht] ++ 73 CPHB Computer Protocol Heart Beat [David Mittnacht] ++ 74 WSN Wang Span Network [Victor Dafoulas] ++ 75 PVP Packet Video Protocol [Steve_Casner] ++ 76 BR-SAT-MON Backroom SATNET Monitoring [Steven_Blumenthal] ++ 77 SUN-ND SUN ND PROTOCOL-Temporary [William_Melohn] ++ 78 WB-MON WIDEBAND Monitoring [Steven_Blumenthal] ++ 79 WB-EXPAK WIDEBAND EXPAK [Steven_Blumenthal] ++ 80 ISO-IP ISO Internet Protocol [Marshall_T_Rose] ++ 81 VMTP VMTP [Dave_Cheriton] ++ 82 SECURE-VMTP SECURE-VMTP [Dave_Cheriton] ++ 83 VINES VINES [Brian Horn] ++ 84 TTP TTP [Jim_Stevens] ++ 84 IPTM Protocol Internet Protocol Traffic [Jim_Stevens] ++ Manager ++ 85 NSFNET-IGP NSFNET-IGP [Hans_Werner_Braun] ++ 86 DGP Dissimilar Gateway Protocol [M/A-COM Government Systems, "Dissimilar Gateway Protocol Specification, Draft ++ Version", Contract no. CS901145, November 16, 1987.][Mike_Little] ++ 87 TCF TCF [Guillermo_A_Loyola] ++ 88 EIGRP EIGRP [Cisco Systems, "Gateway Server Reference Manual", Manual Revision B, January 10, ++ 1988.][Guenther_Schreiner] ++ 89 OSPFIGP OSPFIGP [RFC1583][RFC2328][RFC5340][John_Moy] ++ [Welch, B., "The Sprite Remote Procedure Call System", Technical Report, ++ 90 Sprite-RPC Sprite RPC Protocol UCB/Computer Science Dept., 86/302, University of California at Berkeley, June ++ 1986.][Bruce Willins] ++ 91 LARP Locus Address Resolution Protocol [Brian Horn] ++ 92 MTP Multicast Transport Protocol [Susie_Armstrong] ++ 93 AX.25 AX.25 Frames [Brian_Kantor] ++ 94 IPIP IP-within-IP Encapsulation Protocol [John_Ioannidis] ++ 95 MICP Mobile Internetworking Control Pro. [John_Ioannidis] ++ 96 SCC-SP Semaphore Communications Sec. Pro. [Howard_Hart] ++ 97 ETHERIP Ethernet-within-IP Encapsulation [RFC3378] ++ 98 ENCAP Encapsulation Header [RFC1241][Robert_Woodburn] ++ 99 any private encryption scheme [Internet_Assigned_Numbers_Authority] ++ 100 GMTP GMTP [[RXB5]] ++ 101 IFMP Ipsilon Flow Management Protocol [Bob_Hinden][November 1995, 1997.] ++ 102 PNNI PNNI over IP [Ross_Callon] ++ 103 PIM Protocol Independent Multicast [RFC4601][Dino_Farinacci] ++ 104 ARIS ARIS [Nancy_Feldman] ++ 105 SCPS SCPS [Robert_Durst] ++ 106 QNX QNX [Michael_Hunter] ++ 107 A/N Active Networks [Bob_Braden] ++ 108 IPComp IP Payload Compression Protocol [RFC2393] ++ 109 SNP Sitara Networks Protocol [Manickam_R_Sridhar] ++ 110 Compaq-Peer Compaq Peer Protocol [Victor_Volpe] ++ 111 IPX-in-IP IPX in IP [CJ_Lee] ++ 112 VRRP Virtual Router Redundancy Protocol [RFC5798] ++ 113 PGM PGM Reliable Transport Protocol [Tony_Speakman] ++ 114 any 0-hop protocol [Internet_Assigned_Numbers_Authority] ++ 115 L2TP Layer Two Tunneling Protocol [RFC3931][Bernard_Aboba] ++ 116 DDX D-II Data Exchange (DDX) [John_Worley] ++ 117 IATP Interactive Agent Transfer Protocol [John_Murphy] ++ 118 STP Schedule Transfer Protocol [Jean_Michel_Pittet] ++ 119 SRP SpectraLink Radio Protocol [Mark_Hamilton] ++ 120 UTI UTI [Peter_Lothberg] ++ 121 SMP Simple Message Protocol [Leif_Ekblad] ++ 122 SM SM [Jon_Crowcroft] ++ 123 PTP Performance Transparency Protocol [Michael_Welzl] ++ 124 ISIS over IPv4 [Tony_Przygienda] ++ 125 FIRE [Criag_Partridge] ++ 126 CRTP Combat Radio Transport Protocol [Robert_Sautter] ++ 127 CRUDP Combat Radio User Datagram [Robert_Sautter] ++ 128 SSCOPMCE [Kurt_Waber] ++ 129 IPLT [[Hollbach]] ++ 130 SPS Secure Packet Shield [Bill_McIntosh] ++ 131 PIPE Private IP Encapsulation within IP [Bernhard_Petri] ++ 132 SCTP Stream Control Transmission Protocol [Randall_R_Stewart] ++ 133 FC Fibre Channel [Murali_Rajagopal][RFC6172] ++ 134 RSVP-E2E-IGNORE [RFC3175] ++ 135 Mobility Header [RFC6275] ++ 136 UDPLite [RFC3828] ++ 137 MPLS-in-IP [RFC4023] ++ 138 manet MANET Protocols [RFC5498] ++ 139 HIP Host Identity Protocol [RFC5201] ++ 140 Shim6 Shim6 Protocol [RFC5533] ++ 141 WESP Wrapped Encapsulating Security [RFC5840] ++ Payload ++ 142 ROHC Robust Header Compression [RFC5858] ++ 143-252 Unassigned [Internet_Assigned_Numbers_Authority] ++ 253 Use for experimentation and testing [RFC3692] ++ 254 Use for experimentation and testing [RFC3692] ++ 255 Reserved [Internet_Assigned_Numbers_Authority] ++ ++ People ++ ++ ID Name Contact URI Last Updated ++ [Barry_Boehm] Barry Boehm mailto:boehm&arpa.mil ++ [Barry_Howard] Barry Howard mailto:Howard&nmfecc.llnl.gov ++ [Bernard_Aboba] Bernard Aboba mailto:bernardaµsoft.com 1998-04 ++ [Bernhard_Petri] Bernhard Petri mailto:bernhard.petri&nsn.com 2000-03 ++ [Bill_McIntosh] Bill McIntosh mailto:BMcIntosh&fortresstech.com ++ [Bob_Braden] Bob Braden mailto:braden&isi.edu 1997-07 ++ [Bob_Hinden] Bob Hinden mailto:hinden&ipsilon.com ++ [Brian_Kantor] Brian Kantor mailto:brian&ucsd.edu ++ [CJ_Lee] CJ Lee mailto:cj_lee&novell.com 1997-10 ++ [Charlie_Perkins] Charlie Perkins mailto:perk&watson.ibm.com 1994-10 ++ [Christer_Oberg] Christer Oberg mailto:chg&bull.se 1994-10 ++ [Criag_Partridge] Criag Partridge mailto:craig&bbn.com 1999-08 ++ [Dave_Cheriton] Dave Cheriton mailto:cheriton&pescadero.stanford.edu ++ [Dave_Presotto] Dave Presotto mailto:presotto&plan9.att.com 1995-07 ++ [David_Clark] David Clark mailto:ddc&lcs.mit.edu ++ [David_Mills] David Mills mailto:Mills&huey.udel.edu ++ [Deborah_Estrin] Deborah Estrin mailto:estrin&usc.edu ++ [Dino_Farinacci] Dino Farinacci mailto:dino&cisco.com 1996-03 ++ [Dirk_Fromhein] Dirk Fromhein mailto:df&watershed.com ++ [Gene_Tsudik] Gene Tsudik mailto:tsudik&usc.edu ++ [Greg_Chesson] Greg Chesson mailto:Greg&sgi.com ++ [Guenther_Schreiner] Guenther Schreiner mailto:snmp-admin&ira.uka.de ++ [Guillermo_A_Loyola] Guillermo A. Loyola mailto:LOYOLA&ibm.com ++ [Hans_Werner_Braun] Hans-Werner Braun mailto:HWB&mcr.umich.edu ++ [Harry_Forsdick] Harry Forsdick mailto:Forsdick&bbn.com ++ [Howard_Hart] Howard Hart mailto:hch&hybrid.com ++ [Internet_Assigned_Numbers_Authority] Internet Assigned Numbers Authority mailto:iana&iana.org 1995-06 ++ [J_Noel_Chiappa] J. Noel Chiappa mailto:JNC&xx.lcs.mit.edu ++ [Jack_Haverty] Jack Haverty mailto:jhaverty&oracle.com ++ [Jean_Michel_Pittet] Jean-Michel Pittet mailto:jmp&gandalf.engr.sgi.com 1998-11 ++ [Jim_Stevens] Jim Stevens mailto:jasteven&rockwellcollins.com 2011-01-26 ++ [John_Ioannidis] John Ioannidis mailto:ji&cs.columbia.edu ++ [John_Moy] John Moy mailto:jmoy&proteon.com ++ [John_Murphy] John Murphy mailto:john.m.murphy&mci.com 1998-10 ++ [John_Worley] John Worley mailto:worley&milehigh.net 1998-06 ++ [Jon_Crowcroft] Jon Crowcroft mailto:jon&cs.ucl.ac.uk 1999-06 ++ [Jon_Postel] Jon Postel mailto:postel&isi.edu ++ [K_Robert_Glenn] K. Robert Glenn mailto:glenn&osi.ncsl.nist.gov ++ [Kurt_Waber] Kurt Waber mailto:kurt.waber&swisscom.com 1999-08 ++ [Leif_Ekblad] Leif Ekblad mailto:leif.ekblad&eslov.mail.telia.com 1999-03 ++ [Manickam_R_Sridhar] Manickam R. Sridhar mailto:msridhar&sitaranetworks.com 1997-09 ++ [Mark_Hamilton] Mark Hamilton mailto:mah&spectralink.com 1998-11 ++ [Marshall_T_Rose] Marshall T. Rose mailto:mrose&dbc.mtview.ca.us ++ [Martha_Steenstrup] Martha Steenstrup mailto:MSteenst&bbn.com ++ [Michael_Greenwald] Michael Greenwald mailto:Greenwald&scrc-stony-brook.symbolics.com ++ [Michael_Hunter] Michael Hunter mailto:mphunter&qnx.com 1997-07 ++ [Michael_Welzl] Michael Welzl mailto:michael&tk.uni-linz.ac.at 1999-08 ++ [Mike_Little] Mike Little mailto:little&macom4.arpa ++ [Murali_Rajagopal] Murali Rajagopal mailto:murali&gadzoox.com 2000-05 ++ [Nancy_Feldman] Nancy Feldman mailto:nkf&vnet.ibm.com 1997-01 ++ [Peter_Lothberg] Peter Lothberg mailto:roll&stupi.se 1999-03 ++ [Randall_R_Stewart] Randall R. Stewart mailto:rrs&lakerest.net 2000-04 ++ [Robert_Durst] Robert Durst mailto:durst&mitre.org 1997-03 ++ [Robert_Hinden] Robert Hinden mailto:Hinden&eng.sun.com ++ [Robert_Sautter] Robert Sautter mailto:rsautter&acdnj.itt.com 1999-08 ++ [Robert_W_Scheifler] Robert W. Scheifler mailto:RWS&xx.lcs.mit.edu ++ [Robert_Woodburn] Robert Woodburn mailto:woody&cseic.saic.com ++ [Ross_Callon] Ross Callon mailto:rcallon&baynetworks.com 1995-12 ++ [Steve_Casner] Steve Casner mailto:casner&isi.edu ++ [Steve_Chipman] Steve Chipman mailto:Chipman&f.bbn.com ++ [Steve_Deering] Steve Deering mailto:deering&parc.xerox.com 1995-03 ++ [Steven_Blumenthal] Steven Blumenthal mailto:BLUMENTHAL&vax.bbn.com ++ [Stuart_A_Friedberg] Stuart A. Friedberg mailto:stuart&cs.wisc.edu ++ [Sue_Hares] Sue Hares mailto:skh&merit.edu ++ [Susie_Armstrong] Susie Armstrong mailto:Armstrong.wbst128&xerox.com ++ [Tom_Markson] Tom Markson mailto:markson&osmosys.ingog.com 1995-09 ++ [Tony_Ballardie] Tony Ballardie mailto:A.Ballardie&cs.ucl.ac.uk ++ [Tony_Li] Tony Li mailto:tli&cisco.com ++ [Tony_Przygienda] Tony Przygienda mailto:prz&siara.com 1999-08 ++ [Tony_Speakman] Tony Speakman mailto:speakman&cisco.com 1998-01 ++ [Trudy_Miller] Trudy Miller mailto:Trudy&acc.com ++ [Victor_Volpe] Victor Volpe mailto:vvolpe&smtp.microcom.com 1997-10 ++ [Wesley_Craig] Wesley Craig mailto:Wesley.Craig&terminator.cc.umich.edu ++ [William_Melohn] William Melohn mailto:Melohn&sun.com ++ [Zaw_Sing_Su] Zaw-Sing Su mailto:ZSu&tsca.istc.sri. diff --git a/stage2/patches/common/iproute2-3.3.0-libdir-1.patch b/stage2/patches/common/iproute2-3.3.0-libdir-1.patch new file mode 100644 index 0000000..462e24c --- /dev/null +++ b/stage2/patches/common/iproute2-3.3.0-libdir-1.patch @@ -0,0 +1,53 @@ +Submitted By: Joe Ciccone <jciccone@gmail.com> +Date: 14-06-2010 +Initial Package Version: 2.6.18 +Upstream Status: Unknown +Origin: Joe Ciccone +Description: This patch gives the ability to change the libdir. + Updated for Iproute2-2.6.28 by Jim Gifford + Updated for Iproute2-2.6.34 by Joe Ciccone + Updated for Iproute2-2.6.37 by Joe Ciccone + Renamed for Iproute2-2.6.38 by Jonathan Norman + Renamed for Iproute2-3.3.0 by William Harrington + +diff -Naur iproute2-2.6.37.orig/Makefile iproute2-2.6.37/Makefile +--- iproute2-2.6.37.orig/Makefile 2011-01-07 12:54:30.000000000 -0500 ++++ iproute2-2.6.37/Makefile 2011-01-08 19:22:59.954895722 -0500 +@@ -12,7 +12,7 @@ + + SHARED_LIBS = y + +-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" ++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\" + ifneq ($(SHARED_LIBS),y) + DEFINES+= -DNO_SHARED_LIBS + endif +diff -Naur iproute2-2.6.37.orig/include/iptables.h iproute2-2.6.37/include/iptables.h +--- iproute2-2.6.37.orig/include/iptables.h 2011-01-07 12:54:30.000000000 -0500 ++++ iproute2-2.6.37/include/iptables.h 2011-01-08 19:22:59.954895722 -0500 +@@ -4,8 +4,12 @@ + #include "iptables_common.h" + #include "libiptc/libiptc.h" + ++#ifndef LIBDIR ++#define LIBDIR "/usr/lib" ++#endif ++ + #ifndef IPT_LIB_DIR +-#define IPT_LIB_DIR "/usr/local/lib/iptables" ++#define IPT_LIB_DIR LIBDIR "/iptables" + #endif + + #ifndef IPPROTO_SCTP +diff -Naur iproute2-2.6.37.orig/misc/arpd.c iproute2-2.6.37/misc/arpd.c +--- iproute2-2.6.37.orig/misc/arpd.c 2011-01-07 12:54:30.000000000 -0500 ++++ iproute2-2.6.37/misc/arpd.c 2011-01-08 19:22:59.954895722 -0500 +@@ -40,7 +40,7 @@ + int resolve_hosts; + + DB *dbase; +-char *dbname = "/var/lib/arpd/arpd.db"; ++char *dbname = ARPDDIR "/arpd.db"; + + int ifnum; + int *ifvec; diff --git a/stage2/patches/common/kbd-1.15.3-backspace-1.patch b/stage2/patches/common/kbd-1.15.3-backspace-1.patch new file mode 100644 index 0000000..8fec171 --- /dev/null +++ b/stage2/patches/common/kbd-1.15.3-backspace-1.patch @@ -0,0 +1,250 @@ +Submitted By: Matt Burgess +Date: 2008-12-06 +Initial Package Version: 1.15 +Upstream Status: Not submitted, possibly incomplete +Description: Makes Backspace and Delete keys consistent in all i386 keymaps. +Makes the Backspace key send character code 127, and Delete send a well known +escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. + +Original patch for 1.12 by Alexander Patrakov. +Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, +ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. +Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. + +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = three numbersign + keycode 12 = two at + keycode 13 = one exclam +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = slash question + keycode 12 = bracketleft braceleft + keycode 13 = bracketright braceright +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 +@@ -51,7 +51,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 +@@ -205,7 +205,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -506,7 +506,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 +@@ -204,7 +204,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -505,7 +505,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 +@@ -3,7 +3,7 @@ + # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no> + include "linux-with-alt-and-altgr" + plain keycode 83 = KP_Comma +- plain keycode 111 = Delete # "Remove" originally, weird... ++ plain keycode 111 = Remove + strings as usual + + keycode 1 = Escape +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 +@@ -143,8 +143,8 @@ + + # The keycode "0xFF" is too dangerous for many programs (including emacs). + # So let it be bracket instead of Hard Sign. +-# altgr keycode 27 = +0xDF +-# altgr shift keycode 27 = +0xFF ++altgr keycode 27 = +0xDF ++altgr shift keycode 27 = +0xFF + control keycode 27 = Control_bracketright + altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 +@@ -46,7 +46,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 +@@ -39,7 +39,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace ++ keycode 14 = Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 +@@ -89,8 +89,8 @@ + altgr alt keycode 13 = Meta_equal + shift alt keycode 13 = Meta_plus + altgr shift alt keycode 13 = Meta_plus +- keycode 14 = BackSpace BackSpace BackSpace BackSpace +-# keycode 14 = Delete Delete Delete Delete ++# keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + altgr alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 +@@ -42,7 +42,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 +@@ -345,7 +345,7 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot + +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 +@@ -374,6 +374,6 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 +@@ -49,7 +49,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 +@@ -249,7 +249,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 +@@ -250,7 +250,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace diff --git a/stage2/patches/common/kbd-1.15.3-es.po_fix-1.patch b/stage2/patches/common/kbd-1.15.3-es.po_fix-1.patch new file mode 100644 index 0000000..d90ce3f --- /dev/null +++ b/stage2/patches/common/kbd-1.15.3-es.po_fix-1.patch @@ -0,0 +1,18 @@ +Submitted By: Jonathan Norman <jonathan dot bluesquarelinux.co.uk> +Date: 2011-05-17 +Initial Package Version: 1.15.3 +Origin: Arch Linux +Upstream Status: Unknown +Description: Fixes mistake in es.po file. + +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 +@@ -1363,7 +1363,7 @@ + #: src/setfont.c:682 + #, c-format + msgid "Saved %d-char %dx%d font file on %s\n" +-msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" ++msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" + + #: src/setkeycodes.c:21 + #, c-format diff --git a/stage2/patches/common/kbd-1.15.3-upstream_fixes-1.patch b/stage2/patches/common/kbd-1.15.3-upstream_fixes-1.patch new file mode 100644 index 0000000..b1d170d --- /dev/null +++ b/stage2/patches/common/kbd-1.15.3-upstream_fixes-1.patch @@ -0,0 +1,66 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2012-05-01 +Initial Package Version: 1.15.3 +Upstream Status: Applied +Origin: Upstream, commit:83f0743c1fed872d80a0dd31924575d9bf9c2770 +Description: + +loadkeys from 1.15.3 introduced a regression where it doesnât default to +reading from stdin when started without a filename argument. + +--- + src/loadkeys.y | 33 +++++++++++++++++++++------------ + 1 files changed, 21 insertions(+), 12 deletions(-) + +Index: devel/src/loadkeys.y +=================================================================== +--- devel.orig/src/loadkeys.y 2011-07-22 19:06:52.000000000 +0200 ++++ devel/src/loadkeys.y 2011-07-22 19:07:10.000000000 +0200 +@@ -1035,6 +1035,22 @@ + ; + %% + ++static void parse_keymap(FILE *fd) { ++ if (!quiet && !optm) ++ fprintf(stdout, _("Loading %s\n"), pathname); ++ ++ stack_push(fd, 0, pathname); ++ ++ if (yyparse()) { ++ fprintf(stderr, _("syntax error in map file\n")); ++ ++ if (!optm) ++ fprintf(stderr, ++ _("key bindings not changed\n")); ++ exit(EXIT_FAILURE); ++ } ++} ++ + int main(int argc, char *argv[]) + { + const char *short_opts = "abcC:dhmsuqvV"; +@@ -1180,19 +1196,12 @@ + } + + gotf: +- if (!quiet && !optm) +- fprintf(stdout, _("Loading %s\n"), pathname); +- +- stack_push(f, 0, pathname); +- +- if (yyparse()) { +- fprintf(stderr, _("syntax error in map file\n")); ++ parse_keymap(f); ++ } + +- if (!optm) +- fprintf(stderr, +- _("key bindings not changed\n")); +- exit(EXIT_FAILURE); +- } ++ if (optind == argc) { ++ strcpy(pathname, "<stdin>"); ++ parse_keymap(stdin); + } + + do_constant(); diff --git a/stage2/patches/common/libffi-3.0.11-includedir-1.patch b/stage2/patches/common/libffi-3.0.11-includedir-1.patch new file mode 100644 index 0000000..bd6c448 --- /dev/null +++ b/stage2/patches/common/libffi-3.0.11-includedir-1.patch @@ -0,0 +1,34 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-03-29 +Initial Package Version: 3.0.10 +Upstream Status: Not Submitted +Origin: Self +Description: Makes package install headers into /usr/include instead + of /usr/lib/libffi-3.0.10/include + +--- libffi.orig/include/Makefile.in 2011-08-23 16:28:35.000000000 +0200 ++++ libffi/include/Makefile.in 2012-03-29 19:57:53.919343783 +0200 +@@ -221,7 +221,7 @@ + AUTOMAKE_OPTIONS = foreign + DISTCLEANFILES = ffitarget.h + EXTRA_DIST = ffi.h.in ffi_common.h +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includesdir = $(includedir) + nodist_includes_HEADERS = ffi.h ffitarget.h + all: all-am + +--- libffi.orig/libffi.pc.in 2011-08-22 20:38:12.000000000 +0200 ++++ libffi/libffi.pc.in 2012-03-29 19:57:18.263549738 +0200 +@@ -1,10 +1,10 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lffi +-Cflags: -I${includedir} ++Cflags: diff --git a/stage2/patches/common/make-3.82-fixes-1.patch b/stage2/patches/common/make-3.82-fixes-1.patch new file mode 120000 index 0000000..e9d2de3 --- /dev/null +++ b/stage2/patches/common/make-3.82-fixes-1.patch @@ -0,0 +1 @@ +../../../stage1/patches/common/make-3.82-fixes-1.patch \ No newline at end of file diff --git a/stage2/patches/common/mpfr-3.1.2-fixes-3.patch b/stage2/patches/common/mpfr-3.1.2-fixes-3.patch new file mode 120000 index 0000000..f58c659 --- /dev/null +++ b/stage2/patches/common/mpfr-3.1.2-fixes-3.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/mpfr-3.1.2-fixes-3.patch \ No newline at end of file diff --git a/stage2/patches/common/ncurses-5.9-bash_fix-1.patch b/stage2/patches/common/ncurses-5.9-bash_fix-1.patch new file mode 120000 index 0000000..a68d51b --- /dev/null +++ b/stage2/patches/common/ncurses-5.9-bash_fix-1.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ncurses-5.9-bash_fix-1.patch \ No newline at end of file diff --git a/stage2/patches/common/ncurses-5.9-branch_update-4.patch b/stage2/patches/common/ncurses-5.9-branch_update-4.patch new file mode 120000 index 0000000..3960404 --- /dev/null +++ b/stage2/patches/common/ncurses-5.9-branch_update-4.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ncurses-5.9-branch_update-4.patch \ No newline at end of file diff --git a/stage2/patches/common/perl-5.14.2-Configure_multilib-1.patch b/stage2/patches/common/perl-5.14.2-Configure_multilib-1.patch new file mode 100644 index 0000000..cefca6b --- /dev/null +++ b/stage2/patches/common/perl-5.14.2-Configure_multilib-1.patch @@ -0,0 +1,42 @@ +Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au> +Date: 2010-08-01 +Initial Package Version: 5.8.8 +Origin: Ryan Oliver +Upstream Status: Unknown +Description: This patch allows perl to be installed in /usr/lib32 + or /usr/lib64 instead of /usr/lib. + +Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30 + Against 5.10.1 By Jim Gifford on 2009-08-25 + Against 5.12.1 By Joe Ciccone on 2010-08-01 + +diff -Naur perl-5.12.1.orig/Configure perl-5.12.1/Configure +--- perl-5.12.1.orig/Configure 2010-05-13 18:01:07.000000000 -0400 ++++ perl-5.12.1/Configure 2010-08-01 18:18:19.614326794 -0400 +@@ -6254,6 +6254,8 @@ + : The default "style" setting is made in installstyle.U + case "$installstyle" in + *lib/perl5*) set dflt privlib lib/$package/$version ;; ++*lib32/perl5*) set dflt privlib lib32/$package/$version ;; ++*lib64/perl5*) set dflt privlib lib64/$package/$version ;; + *) set dflt privlib lib/$version ;; + esac + eval $prefixit +@@ -6502,6 +6504,8 @@ + case "$sitelib" in + '') case "$installstyle" in + *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; ++ *lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;; ++ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;; + *) dflt=$siteprefix/lib/site_$prog/$version ;; + esac + ;; +@@ -7020,6 +7024,8 @@ + prog=`echo $package | $sed 's/-*[0-9.]*$//'` + case "$installstyle" in + *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;; ++ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;; ++ *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;; + *) dflt=$vendorprefix/lib/vendor_$prog/$version ;; + esac + ;; diff --git a/stage2/patches/common/perl-5.14.2-libc-1.patch b/stage2/patches/common/perl-5.14.2-libc-1.patch new file mode 100644 index 0000000..37a3766 --- /dev/null +++ b/stage2/patches/common/perl-5.14.2-libc-1.patch @@ -0,0 +1,31 @@ +Submitted By: Matt Burgess <matthew at linuxfromscratch dot org> +Date: 2009-08-25 +Initial Package Version: 5.10.1 +Origin: Not Submitted - LFS Specific +Description: This patch adapts some hard-wired paths to the C library. + It uses the $prefix variable to locate the correct libc. + +diff -Naur perl-5.14.1.orig/hints/linux.sh perl-5.14.1/hints/linux.sh +--- perl-5.14.1.orig/hints/linux.sh 2011-06-09 15:04:29.000000000 -0500 ++++ perl-5.14.1/hints/linux.sh 2011-06-25 16:42:12.000000000 -0500 +@@ -63,9 +63,9 @@ + # We don't use __GLIBC__ and __GLIBC_MINOR__ because they + # are insufficiently precise to distinguish things like + # libc-2.0.6 and libc-2.0.7. +-if test -L /lib/libc.so.6; then ++if test -L ${prefix}/lib/libc.so.6; then + libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` +- libc=/lib/$libc ++ libc=${prefix}/lib/$libc + fi + + # Configure may fail to find lstat() since it's a static/inline +@@ -461,3 +461,8 @@ + libswanted="$libswanted pthread" + ;; + esac ++ ++locincpth="" ++loclibpth="" ++glibpth="${prefix}/lib" ++usrinc="${prefix}/include" diff --git a/stage2/patches/common/perl-5.14.2-security_fix-1.patch b/stage2/patches/common/perl-5.14.2-security_fix-1.patch new file mode 100644 index 0000000..125af5d --- /dev/null +++ b/stage2/patches/common/perl-5.14.2-security_fix-1.patch @@ -0,0 +1,22 @@ +Submitted by: Matt Burgess <matthew at linuxfromscratch dot org> +Date: 2011-11-25 +Inital Package Version: 5.14.2 +Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2011-3597 +Upstream Status: From Upstream +Description: Fixed an arbitrary code execution vulnerability in Perl's Digest + module + +diff -Naur perl-5.14.2.orig/cpan/Digest/Digest.pm perl-5.14.2/cpan/Digest/Digest.pm +--- perl-5.14.2.orig/cpan/Digest/Digest.pm 2010-12-30 02:07:15.000000000 +0000 ++++ perl-5.14.2/cpan/Digest/Digest.pm 2011-11-20 20:22:27.306414256 +0000 +@@ -35,7 +35,9 @@ + ($class, @args) = @$class if ref($class); + no strict 'refs'; + unless (exists ${"$class\::"}{"VERSION"}) { +- eval "require $class"; ++ my $pm_file = $class . ".pm"; ++ $pm_file =~ s{::}{/}g; ++ eval { require $pm_file }; + if ($@) { + $err ||= $@; + next; diff --git a/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch new file mode 120000 index 0000000..8715724 --- /dev/null +++ b/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch @@ -0,0 +1 @@ +../../../stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch \ No newline at end of file diff --git a/stage2/patches/common/procps-3.2.8-fix_HZ_errors-1.patch b/stage2/patches/common/procps-3.2.8-fix_HZ_errors-1.patch new file mode 100644 index 0000000..287d2ac --- /dev/null +++ b/stage2/patches/common/procps-3.2.8-fix_HZ_errors-1.patch @@ -0,0 +1,54 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2010-09-20 +Initial Package Version: 3.2.8 +Origin: Debian 30_sysinfo_7numbers.patch +Upstream Status: Submitted +Description: Fixes "unknown HZ value (##)" errors in procps utils. + +diff -Naurp procps-3.2.8-orig//proc/sysinfo.c procps-3.2.8//proc/sysinfo.c +--- procps-3.2.8-orig//proc/sysinfo.c 2008-03-23 23:33:43.000000000 -0500 ++++ procps-3.2.8//proc/sysinfo.c 2010-09-20 01:13:36.000000000 -0500 +@@ -124,24 +124,25 @@ int uptime(double *restrict uptime_secs, + unsigned long long Hertz; + + static void old_Hertz_hack(void){ +- unsigned long long user_j, nice_j, sys_j, other_j; /* jiffies (clock ticks) */ ++ unsigned long long user_j, nice_j, sys_j, other_j, wait_j, hirq_j, sirq_j, stol_j; /* jiffies (clock ticks) */ + double up_1, up_2, seconds; + unsigned long long jiffies; + unsigned h; + char *restrict savelocale; + ++ wait_j = hirq_j = sirq_j = stol_j = 0; + savelocale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); + do{ + FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); + /* uptime(&up_1, NULL); */ + FILE_TO_BUF(STAT_FILE,stat_fd); +- sscanf(buf, "cpu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j); ++ sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", &user_j, &nice_j, &sys_j, &other_j, &wait_j, &hirq_j, &sirq_j, &stol_j); + FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_2); + /* uptime(&up_2, NULL); */ + } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ + setlocale(LC_NUMERIC, savelocale); +- jiffies = user_j + nice_j + sys_j + other_j; ++ jiffies = user_j + nice_j + sys_j + other_j + wait_j + hirq_j + sirq_j + stol_j ; + seconds = (up_1 + up_2) / 2; + h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); + /* actual values used by 2.4 kernels: 32 64 100 128 1000 1024 1200 */ +@@ -221,12 +222,13 @@ static void init_libproc(void){ + // _SC_NPROCESSORS_ONLN returns 1, which should work OK + smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN); + if(smp_num_cpus<1) smp_num_cpus=1; /* SPARC glibc is buggy */ +- ++#ifdef __linux__ + if(linux_version_code > LINUX_VERSION(2, 4, 0)){ + Hertz = find_elf_note(AT_CLKTCK); + if(Hertz!=NOTE_NOT_FOUND) return; + fputs("2.4+ kernel w/o ELF notes? -- report this\n", stderr); + } ++#endif + old_Hertz_hack(); + } + diff --git a/stage2/patches/common/procps-3.2.8-ps_cgroup-1.patch b/stage2/patches/common/procps-3.2.8-ps_cgroup-1.patch new file mode 100644 index 0000000..fb51448 --- /dev/null +++ b/stage2/patches/common/procps-3.2.8-ps_cgroup-1.patch @@ -0,0 +1,81 @@ +Submitted By: Joe Ciccone <jciccone@gmail.com> +Date: 2011-01-30 +Initial Package Version: 3.2.7 +Origin: Fedora Git + http://pkgs.fedoraproject.org/gitweb/?p=procps.git;a=blob_plain;f=procps-3.2.7-ps-cgroup.patch;h=b638c4f9a826040099f10e9282aad0d31ec5f03f;hb=HEAD + http://pkgs.fedoraproject.org/gitweb/?p=procps.git;a=blob_plain;f=procps-3.2.8-ps-cgroup-suppress-root-group.patch;h=4b192c1fb4aa7684b7e57606713ca68690d77845;hb=HEAD +Upstream Status: Unknown +Description: Adds the ability for ps to output process(es) cgroups. + +diff -Naur procps-3.2.8.orig/ps/output.c procps-3.2.8/ps/output.c +--- procps-3.2.8.orig/ps/output.c 2009-05-10 15:24:50.000000000 -0400 ++++ procps-3.2.8/ps/output.c 2011-01-30 12:58:30.530497002 -0500 +@@ -1099,6 +1099,46 @@ + return snprintf(outbuf, COLWID, "*"); + } + ++static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ ++ char filename[48]; ++ FILE *fd; ++ int counter = 0, last_begin = 0, slash = 0; ++ int c; ++ int is_cgroup = 0; ++ ++ outbuf[0]='\0'; ++ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid); ++ fd = fopen(filename, "r"); ++ if (likely(fd == NULL)) goto fail; ++ while (( (c = fgetc(fd)) != EOF) && (counter<665)) { ++ if (is_cgroup == 0) { ++ if (c == ':') { ++ is_cgroup = 1; ++ slash = 0; ++ if (counter>0) ++ outbuf[counter++]=';'; ++ } ++ }else ++ if ((c == '\n') || (c == '\0')){ ++ if (slash) /* if the last char was a / this process is in the root cgroup which we should suppress */ ++ counter = last_begin; ++ else ++ last_begin = counter; ++ is_cgroup = 0; ++ } else { ++ slash = c == '/'; ++ outbuf[counter++]=c; ++ } ++ } ++ outbuf[counter]='\0'; ++ close(fd); ++ if (counter>0) ++ return counter; ++fail: ++ outbuf[0] = '-'; ++ outbuf[1] = '\0'; ++ return 1; ++} + + /****************** FLASK & seLinux security stuff **********************/ + // move the bulk of this to libproc sometime +@@ -1293,6 +1333,7 @@ + {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, + {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, + {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ ++{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/ + {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, + {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ + {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, +diff -Naur procps-3.2.8.orig/ps/ps.1 procps-3.2.8/ps/ps.1 +--- procps-3.2.8.orig/ps/ps.1 2009-05-10 15:38:17.000000000 -0400 ++++ procps-3.2.8/ps/ps.1 2011-01-30 12:58:08.382497001 -0500 +@@ -904,6 +904,10 @@ + displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR). + T} + ++cgroup CGROUP T{ ++display control groups to which the process belonges. ++T} ++ + class CLS T{ + scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR). + Field's possible values are: diff --git a/stage2/patches/common/procps-3.2.8-watch_unicode-1.patch b/stage2/patches/common/procps-3.2.8-watch_unicode-1.patch new file mode 100644 index 0000000..bfc78d3 --- /dev/null +++ b/stage2/patches/common/procps-3.2.8-watch_unicode-1.patch @@ -0,0 +1,148 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2009-05-11 +Initial Package Version: 3.2.8 +Upstream Status: Submitted +Origin: http://wiki.linuxfromscratch.org/lfs/ticket/2113 +Description: Fixes a unicode related bug in the watch program + +diff -Naur procps-3.2.8.orig/Makefile procps-3.2.8/Makefile +--- procps-3.2.8.orig/Makefile 2009-05-10 18:50:48.000000000 +0000 ++++ procps-3.2.8/Makefile 2009-05-12 19:06:50.000000000 +0000 +@@ -67,7 +67,7 @@ + # plus the top-level Makefile to make it work stand-alone. + _TARFILES := Makefile + +-CURSES := -lncurses ++CURSES := -lncursesw + + # This seems about right for the dynamic library stuff. + # Something like this is probably needed to make the SE Linux +diff -Naur procps-3.2.8.orig/watch.c procps-3.2.8/watch.c +--- procps-3.2.8.orig/watch.c 2007-05-28 03:13:23.000000000 +0000 ++++ procps-3.2.8/watch.c 2009-05-12 19:17:25.000000000 +0000 +@@ -25,6 +25,8 @@ + #include <termios.h> + #include <locale.h> + #include "proc/procps.h" ++#include <wchar.h> ++#include <wctype.h> + + #ifdef FORCE_8BIT + #undef isprint +@@ -134,6 +136,27 @@ + } + } + ++static wint_t ++readwc(FILE *stream, mbstate_t *mbs) ++{ ++ for (;;) { ++ int chr; ++ char c; ++ wchar_t wc; ++ size_t len; ++ ++ chr = getc(stream); ++ if (chr == EOF) ++ return WEOF; ++ c = chr; ++ len = mbrtowc(&wc, &c, 1, mbs); ++ if (len == (size_t)-1) ++ memset(mbs, 0, sizeof(*mbs)); ++ else if (len != (size_t)-2) ++ return wc; ++ } ++} ++ + int + main(int argc, char *argv[]) + { +@@ -239,6 +262,7 @@ + FILE *p; + int x, y; + int oldeolseen = 1; ++ mbstate_t mbs; + + if (screen_size_changed) { + get_terminal_size(); +@@ -266,49 +290,65 @@ + do_exit(2); + } + ++ memset(&mbs, 0, sizeof(mbs)); + for (y = show_title; y < height; y++) { + int eolseen = 0, tabpending = 0; + for (x = 0; x < width; x++) { +- int c = ' '; +- int attr = 0; ++ wint_t c = L' '; ++ int attr = 0, c_width; ++ cchar_t cc; ++ wchar_t wstr[2]; + + if (!eolseen) { + /* if there is a tab pending, just spit spaces until the + next stop instead of reading characters */ + if (!tabpending) + do +- c = getc(p); +- while (c != EOF && !isprint(c) +- && c != '\n' +- && c != '\t'); +- if (c == '\n') ++ c = readwc(p, &mbs); ++ while (c != WEOF && !iswprint(c) ++ && c != L'\n' ++ && c != L'\t'); ++ if (c == L'\n') + if (!oldeolseen && x == 0) { + x = -1; + continue; + } else + eolseen = 1; +- else if (c == '\t') ++ else if (c == L'\t') + tabpending = 1; +- if (c == EOF || c == '\n' || c == '\t') +- c = ' '; ++ if (c == WEOF || c == L'\n' || c == L'\t') ++ c = L' '; + if (tabpending && (((x + 1) % 8) == 0)) + tabpending = 0; + } ++ wstr[0] = c; ++ wstr[1] = 0; ++ setcchar (&cc, wstr, 0, 0, NULL); + move(y, x); + if (option_differences) { +- chtype oldch = inch(); +- char oldc = oldch & A_CHARTEXT; ++ cchar_t oldc; ++ wchar_t oldwstr[2]; ++ attr_t attrs; ++ short colors; ++ ++ in_wch(&oldc); ++ getcchar(&oldc, oldwstr, &attrs, &colors, NULL); + attr = !first_screen +- && ((char)c != oldc ++ && (wstr[0] != oldwstr[0] + || + (option_differences_cumulative +- && (oldch & A_ATTRIBUTES))); ++ && attrs)); + } + if (attr) + standout(); +- addch(c); ++ add_wch(&cc); ++ + if (attr) + standend(); ++ c_width = wcwidth(c); ++ if (c_width > 1) ++ x += c_width - 1; ++ + } + oldeolseen = eolseen; + } diff --git a/stage2/patches/common/readline-6.2-branch_update-3.patch b/stage2/patches/common/readline-6.2-branch_update-3.patch new file mode 100644 index 0000000..343d89e --- /dev/null +++ b/stage2/patches/common/readline-6.2-branch_update-3.patch @@ -0,0 +1,157 @@ +Submitted By: William Harrington (kb0iic at cross-lfs dot org) +Date: 2012-11-01 +Initial Package Version: 6.2 +Origin: Upstream +Upstream Status: Applied +Description: Contains all upstream patches up to 6.2-004 + +diff -Naur readline-6.2.orig/callback.c readline-6.2/callback.c +--- readline-6.2.orig/callback.c 2010-06-06 16:18:58.000000000 +0000 ++++ readline-6.2/callback.c 2012-11-01 20:14:01.000000000 +0000 +@@ -148,6 +148,9 @@ + eof = _rl_vi_domove_callback (_rl_vimvcxt); + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } + #endif +diff -Naur readline-6.2.orig/input.c readline-6.2/input.c +--- readline-6.2.orig/input.c 2010-05-30 22:33:01.000000000 +0000 ++++ readline-6.2/input.c 2012-11-01 20:14:01.000000000 +0000 +@@ -409,7 +409,7 @@ + int + rl_read_key () + { +- int c; ++ int c, r; + + rl_key_sequence_length++; + +@@ -429,14 +429,18 @@ + { + while (rl_event_hook) + { +- if (rl_gather_tyi () < 0) /* XXX - EIO */ ++ if (rl_get_char (&c) != 0) ++ break; ++ ++ if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */ + { + rl_done = 1; + return ('\n'); + } ++ else if (r == 1) /* read something */ ++ continue; ++ + RL_CHECK_SIGNALS (); +- if (rl_get_char (&c) != 0) +- break; + if (rl_done) /* XXX - experimental */ + return ('\n'); + (*rl_event_hook) (); +diff -Naur readline-6.2.orig/patchlevel readline-6.2/patchlevel +--- readline-6.2.orig/patchlevel 2010-01-14 15:15:52.000000000 +0000 ++++ readline-6.2/patchlevel 2012-11-01 20:14:01.000000000 +0000 +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-1 ++4 +diff -Naur readline-6.2.orig/support/shobj-conf readline-6.2/support/shobj-conf +--- readline-6.2.orig/support/shobj-conf 2009-10-28 13:20:21.000000000 +0000 ++++ readline-6.2/support/shobj-conf 2012-11-01 20:14:01.000000000 +0000 +@@ -157,7 +157,7 @@ + ;; + + # Darwin/MacOS X +-darwin[89]*|darwin10*) ++darwin[89]*|darwin1[012]*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported + +@@ -186,7 +186,7 @@ + SHLIB_LIBSUFF='dylib' + + case "${host_os}" in +- darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' ++ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + *) SHOBJ_LDFLAGS='-dynamic' +diff -Naur readline-6.2.orig/vi_mode.c readline-6.2/vi_mode.c +--- readline-6.2.orig/vi_mode.c 2010-11-21 00:51:39.000000000 +0000 ++++ readline-6.2/vi_mode.c 2012-11-01 20:14:01.000000000 +0000 +@@ -1114,7 +1114,7 @@ + rl_beg_of_line (1, c); + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +- return (0); ++ return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) + /* XXX - these need to handle rl_universal_argument bindings */ +@@ -1234,11 +1234,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } +- else if (vi_redoing) ++ else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `dd' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { +@@ -1316,11 +1324,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } +- else if (vi_redoing) ++ else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */ + { + _rl_vimvcxt->motion = _rl_vi_last_motion; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing) /* handle redoing `cc' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { +@@ -1377,6 +1393,19 @@ + _rl_vimvcxt->motion = '$'; + r = rl_domove_motion_callback (_rl_vimvcxt); + } ++ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ r = rl_domove_motion_callback (_rl_vimvcxt); ++ } ++ else if (vi_redoing) /* handle redoing `yy' here */ ++ { ++ _rl_vimvcxt->motion = _rl_vi_last_motion; ++ rl_mark = rl_end; ++ rl_beg_of_line (1, key); ++ RL_UNSETSTATE (RL_STATE_VIMOTION); ++ r = vidomove_dispatch (_rl_vimvcxt); ++ } + #if defined (READLINE_CALLBACKS) + else if (RL_ISSTATE (RL_STATE_CALLBACK)) + { diff --git a/stage2/patches/common/sysklogd-1.5-fix-udp-warning.patch b/stage2/patches/common/sysklogd-1.5-fix-udp-warning.patch new file mode 100644 index 0000000..9ece29c --- /dev/null +++ b/stage2/patches/common/sysklogd-1.5-fix-udp-warning.patch @@ -0,0 +1,59 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2012-09-05 +Initial Package Version: 1.5 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Prevent error message when no network forwarding or remote logging + is desired and port 514 is disabled in /etc/services. +diff -ur sysklogd-1.5.orig/syslogd.c sysklogd-1.5.new/syslogd.c +--- sysklogd-1.5.orig/syslogd.c 2007-07-04 15:04:01.000000000 -0400 ++++ sysklogd-1.5.new/syslogd.c 2012-09-05 22:29:57.000000000 -0400 +@@ -779,7 +779,7 @@ + char *emptystring = ""; + int InetInuse = 0; /* non-zero if INET sockets are being used */ + int finet = -1; /* Internet datagram socket */ +-int LogPort; /* port number for INET connections */ ++int LogPort = 0; /* port number for INET connections */ + int Initialized = 0; /* set when we have initialized ourselves */ + int MarkInterval = 20 * 60; /* interval between marks in seconds */ + int MarkSeq = 0; /* mark sequence number */ +@@ -2298,19 +2298,6 @@ + #endif + struct servent *sp; + +- sp = getservbyname("syslog", "udp"); +- if (sp == NULL) { +- if (errno == ENOENT) { +- errno = 0; +- logerror("The file /etc/services does not seem exist."); +- } +- errno = 0; +- logerror("network logging disabled (syslog/udp service unknown)."); +- logerror("see syslogd(8) for details of whether and how to enable it."); +- LogPort = 0; +- } else +- LogPort = sp->s_port; +- + /* + * Close all open log files and free log descriptor array. + */ +@@ -2443,6 +2430,19 @@ + + #ifdef SYSLOG_INET + if (Forwarding || AcceptRemote) { ++ sp = getservbyname("syslog", "udp"); ++ if (sp == NULL) { ++ if (errno == ENOENT) { ++ errno = 0; ++ logerror("The file /etc/services does not seem exist."); ++ } ++ errno = 0; ++ logerror("network logging disabled (syslog/udp service unknown)."); ++ logerror("see syslogd(8) for details of whether and how to enable it."); ++ LogPort = 0; ++ } else ++ LogPort = sp->s_port; ++ + if (finet < 0) { + finet = create_inet_socket(); + if (finet >= 0) { diff --git a/stage2/patches/common/tar-1.26-man-1.patch b/stage2/patches/common/tar-1.26-man-1.patch new file mode 120000 index 0000000..e1d8096 --- /dev/null +++ b/stage2/patches/common/tar-1.26-man-1.patch @@ -0,0 +1 @@ +../../../stage1/patches/common/tar-1.26-man-1.patch \ No newline at end of file diff --git a/stage2/patches/common/texinfo-4.13a-new_compressors-1.patch b/stage2/patches/common/texinfo-4.13a-new_compressors-1.patch new file mode 100644 index 0000000..6a3dd06 --- /dev/null +++ b/stage2/patches/common/texinfo-4.13a-new_compressors-1.patch @@ -0,0 +1,68 @@ +Submitted By: Jim Gifford <jim at cross-lfs dot org> +Date: 2009-02-21 +Initial Package Version: 4.13a +Upstream Status: Unknown +Origin: Jim Gifford +Description: For using xz compression + +diff -Naur texinfo-4.13.orig/doc/texinfo.txi texinfo-4.13/doc/texinfo.txi +--- texinfo-4.13.orig/doc/texinfo.txi 2008-09-18 11:31:57.000000000 -0700 ++++ texinfo-4.13/doc/texinfo.txi 2009-02-22 19:41:37.874296689 -0800 +@@ -16488,6 +16488,7 @@ + + @cindex Compressed dir files, reading + @cindex Bzipped dir files, reading ++@cindex XZ-compressed dir files, reading + @cindex LZMA-compressed dir files, reading + @cindex Dir files, compressed + If any input file is compressed with @code{gzip} (@pxref{Top,,,gzip, +@@ -16495,8 +16496,8 @@ + for reading. And if @var{dir-file} is compressed, @code{install-info} + also automatically leaves it compressed after writing any changes. + If @var{dir-file} itself does not exist, @code{install-info} tries to +-open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, and +-@file{@var{dir-file}.lzma}, in that order. ++open @file{@var{dir-file}.gz}, @file{@var{dir-file}.bz2}, ++@file{@var{dir-file}.xz} and @file{@var{dir-file}.lzma}, in that order. + + Options: + +diff -Naur texinfo-4.13.orig/info/filesys.c texinfo-4.13/info/filesys.c +--- texinfo-4.13.orig/info/filesys.c 2008-06-12 05:39:20.000000000 -0700 ++++ texinfo-4.13/info/filesys.c 2009-02-22 19:41:37.874296689 -0800 +@@ -55,6 +55,7 @@ + static COMPRESSION_ALIST compress_suffixes[] = { + { ".gz", "gunzip" }, + { ".bz2", "bunzip2" }, ++ { ".xz", "unxz" }, + { ".lzma", "unlzma" }, + { ".z", "gunzip" }, + { ".Z", "uncompress" }, +diff -Naur texinfo-4.13.orig/install-info/install-info.c texinfo-4.13/install-info/install-info.c +--- texinfo-4.13.orig/install-info/install-info.c 2008-05-22 05:11:33.000000000 -0700 ++++ texinfo-4.13/install-info/install-info.c 2009-02-22 19:41:37.874296689 -0800 +@@ -739,15 +739,20 @@ + #else + *compression_program = "bzip"; + #endif ++ else if (data[0] == '\xFD' && data[1] == '7' && data[2] == 'z' ++ && data[3] == 'X' && data[4] == 'Z' && data[5] == 0x00) ++#ifndef STRIP_DOT_EXE ++ *compression_program = "xz.exe"; ++#else ++ *compression_program = "xz"; ++#endif + /* We (try to) match against old lzma format (which lacks proper +- header, two first matches), as well as the new format (last match). */ ++ header, two first matches). */ + else if ((data[9] == 0x00 && data[10] == 0x00 && data[11] == 0x00 + && data[12] == 0x00) + || (data[5] == '\xFF' && data[6] == '\xFF' && data[7] == '\xFF' + && data[8] == '\xFF' && data[9] == '\xFF' && data[10] == '\xFF' +- && data[11] == '\xFF' && data[12] == '\xFF') +- || (data[0] == '\xFF' && data[1] == 'L' && data[2] == 'Z' +- && data[3] == 'M' && data[4] == 'A' && data[5] == 0x00)) ++ && data[11] == '\xFF' && data[12] == '\xFF')) + #ifndef STRIP_DOT_EXE + *compression_program = "lzma.exe"; + #else diff --git a/stage2/patches/x86_64/gcc-4.6.3-pure64-1.patch b/stage2/patches/x86_64/gcc-4.6.3-pure64-1.patch new file mode 100644 index 0000000..c686d59 --- /dev/null +++ b/stage2/patches/x86_64/gcc-4.6.3-pure64-1.patch @@ -0,0 +1,194 @@ +Submitted By: Joe Ciccone <jciccone@gmail.com> +Date: 04-16-2011 +Initial Package Version: 3.4.6 +Origin: Idea originally developed by Ryan Oliver and Greg Schafer for + the Pure LFS project. +Upstream Status: Not Applied - CLFS Specific +Description: This patch makes changes to the paths for pure64, eg 64bit libs + in /usr/lib, 32bit in /usr/lib32. + + Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se> + Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com> + +diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h +--- gcc-4.6.0.orig/gcc/config/i386/linux64.h 2011-03-02 17:35:36.000000000 -0500 ++++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:49:02.335213604 -0400 +@@ -62,8 +62,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #if TARGET_64BIT_DEFAULT + #define SPEC_32 "m32" +diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64 +--- gcc-4.6.0.orig/gcc/config/i386/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:49:02.335213604 -0400 +@@ -25,7 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib +diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h +--- gcc-4.6.0.orig/gcc/config/linux.h 2011-01-12 09:29:14.000000000 -0500 ++++ gcc-4.6.0/gcc/config/linux.h 2011-04-16 15:49:02.335213604 -0400 +@@ -75,7 +75,7 @@ + GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets + supporting both 32-bit and 64-bit compilation. */ + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" ++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" + #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" +diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h +--- gcc-4.6.0.orig/gcc/config/mips/linux64.h 2011-01-19 15:39:09.000000000 -0500 ++++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:50:00.807213626 -0400 +@@ -35,10 +35,10 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1" ++#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64 +--- gcc-4.6.0.orig/gcc/config/mips/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:49:02.335213604 -0400 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h +--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h 2011-03-07 02:50:23.000000000 -0500 ++++ gcc-4.6.0/gcc/config/rs6000/linux64.h 2011-04-16 15:49:02.335213604 -0400 +@@ -372,9 +372,9 @@ + #undef LINK_OS_DEFAULT_SPEC + #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" +-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" ++#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" + #if DEFAULT_LIBC == LIBC_UCLIBC + #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" +diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64 +--- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 2009-04-21 15:03:23.000000000 -0400 ++++ gcc-4.6.0/gcc/config/rs6000/t-linux64 2011-04-16 15:49:02.335213604 -0400 +@@ -36,7 +36,7 @@ + MULTILIB_EXTRA_OPTS = fPIC mstrict-align + MULTILIB_EXCEPTIONS = m64/msoft-float + MULTILIB_EXCLUSIONS = m64/!m32/msoft-float +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof ++MULTILIB_OSDIRNAMES = ../lib ../lib32 nof + MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) + + softfp_wrap_start := '\#ifndef __powerpc64__' +diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h +--- gcc-4.6.0.orig/gcc/config/s390/linux.h 2010-12-09 08:27:07.000000000 -0500 ++++ gcc-4.6.0/gcc/config/s390/linux.h 2011-04-16 15:49:02.335213604 -0400 +@@ -72,7 +72,7 @@ + #define MULTILIB_DEFAULTS { "m31" } + #endif + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" + + #undef LINK_SPEC +diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64 +--- gcc-4.6.0.orig/gcc/config/s390/t-linux64 2010-10-04 12:51:59.000000000 -0400 ++++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:49:02.335213604 -0400 +@@ -7,4 +7,4 @@ + + MULTILIB_OPTIONS = m64/m31 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux.h 2011-01-26 15:30:12.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux.h 2011-04-16 15:49:02.335213604 -0400 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h +--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h 2011-02-17 08:57:21.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/linux64.h 2011-04-16 15:49:02.335213604 -0400 +@@ -101,8 +101,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" + + #ifdef SPARC_BI_ARCH + +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64 +--- gcc-4.6.0.orig/gcc/config/sparc/t-linux64 2011-01-03 15:52:22.000000000 -0500 ++++ gcc-4.6.0/gcc/config/sparc/t-linux64 2011-04-16 15:49:02.335213604 -0400 +@@ -26,7 +26,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib64 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc index 75add25..c1c28c3 100644 --- a/stage2/pkg/gcc +++ b/stage2/pkg/gcc @@ -23,23 +23,6 @@ hvconfig_pre() sed -i 's/install_to_$(INSTALL_DEST) //' ${LFS_TMP}/${PACKAGE}/libiberty/Makefile.in } -hvpatch() -{ - # Manually applying patches if specified - if [ -n "${GCC_PATCHES}" ]; then - for p in ${GCC_PATCHES}; do - apply_patch ${PACKAGE}-${p}.patch ${PACKAGE} - done - fi - - case "${HVL_TARGET}" in - "x86_64") - # Apply the following patch so that GCC links to /lib instead of /lib64: - apply_patch ${PACKAGE}-pure64-1.patch ${PACKAGE} - ;; - esac -} - hvconfig_post() { unset CC diff --git a/stage3/patches/common/alsa-plugins-1.0.25-ffmpeg-1.patch b/stage3/patches/common/alsa-plugins-1.0.25-ffmpeg-1.patch new file mode 100644 index 0000000..a0c655a --- /dev/null +++ b/stage3/patches/common/alsa-plugins-1.0.25-ffmpeg-1.patch @@ -0,0 +1,40 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-06-11 +Initial Package Version: 1.0.25 +Upstream Status: Unknown +Origin: Archlinux +Description: Fixes building against FFMpeg 0.11.1. + +--- alsa-plugins.orig/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 ++++ alsa-plugins/a52/pcm_a52.c 2012-06-11 19:37:16.703490336 +0200 +@@ -441,7 +441,21 @@ + #else + rec->avctx->sample_fmt = SAMPLE_FMT_S16; + #endif +-#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) ++#if (LIBAVCODEC_VERSION_MAJOR >= 54) ++ switch (io->channels) { ++ case 2: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; ++ break; ++ case 4: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; ++ break; ++ case 6: ++ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; ++ break; ++ default: ++ break; ++ } ++#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) + switch (io->channels) { + case 2: + rec->avctx->channel_layout = CH_LAYOUT_STEREO; +@@ -702,7 +716,6 @@ + rec->channels = channels; + rec->format = format; + +- avcodec_init(); + avcodec_register_all(); + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/stage3/patches/common/alsa-utils-1.0.25-no_xmlto-1.patch b/stage3/patches/common/alsa-utils-1.0.25-no_xmlto-1.patch new file mode 100644 index 0000000..2165f6a --- /dev/null +++ b/stage3/patches/common/alsa-utils-1.0.25-no_xmlto-1.patch @@ -0,0 +1,431 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2008-11-27 +Initial Package Version: 1.0.18 +Upstream Status: Not submitted (LFS Specific) +Origin: Self +Description: Eliminates dependency on xmlto (and the entire + dockbook stack) by providing pregenerated man page. + +diff -Naur alsa-utils-1.0.24.2.orig/alsactl/Makefile.am alsa-utils-1.0.24.2/alsactl/Makefile.am +--- alsa-utils-1.0.24.2.orig/alsactl/Makefile.am 2011-01-31 08:19:55.000000000 -0600 ++++ alsa-utils-1.0.24.2/alsactl/Makefile.am 2011-12-13 12:51:12.000000000 -0600 +@@ -55,5 +55,3 @@ + alsa-restore.service \ + 90-alsa-restore.rules + +-%.7: %.xml +- xmlto man $? +diff -Naur alsa-utils-1.0.24.2.orig/alsactl/Makefile.in alsa-utils-1.0.24.2/alsactl/Makefile.in +--- alsa-utils-1.0.24.2.orig/alsactl/Makefile.in 2011-01-31 08:26:45.000000000 -0600 ++++ alsa-utils-1.0.24.2/alsactl/Makefile.in 2011-12-13 12:51:28.000000000 -0600 +@@ -922,9 +922,6 @@ + 90-alsa-restore.rules: 90-alsa-restore.rules.in + $(edit) + +-%.7: %.xml +- xmlto man $? +- + # 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 -Naur alsa-utils-1.0.24.2.orig/alsactl/alsactl_init.7 alsa-utils-1.0.24.2/alsactl/alsactl_init.7 +--- alsa-utils-1.0.24.2.orig/alsactl/alsactl_init.7 1969-12-31 18:00:00.000000000 -0600 ++++ alsa-utils-1.0.24.2/alsactl/alsactl_init.7 2011-12-13 12:52:06.000000000 -0600 +@@ -0,0 +1,397 @@ ++.\" Title: alsactl_init ++.\" Author: ++.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/> ++.\" Date: July 2008 ++.\" Manual: alsactl init ++.\" Source: alsactl ++.\" ++.TH "ALSACTL_INIT" "7" "July 2008" "alsactl" "alsactl init" ++.\" disable hyphenation ++.nh ++.\" disable justification (adjust text to left margin only) ++.ad l ++.SH "NAME" ++alsactl init \- alsa control management \- initialization ++.SH "DESCRIPTION" ++.PP ++"alsactl init" provides soundcard specific initialization. ++.SH "CONFIGURATION" ++.PP ++All "alsactl init" configuration files are placed in ++\fI/usr/share/alsa/init/\fR ++directory. The top level configuration file is ++\fI/usr/share/alsa/init/00main\fR. The default top\-level file can be also specified using \-i or \-\-initfile parameter for the alsactl tool. Every file consists of a set of lines of text. All empty lines or lines beginning with '#' will be ignored. ++.SS "Rules files" ++.PP ++The "alsactl init" rules are read from the files located in the ++\fI/usr/share/alsa/init/*\fR. The top level configuration file is ++\fI/usr/share/alsa/init/00main\fR. Every line in the rules file contains at least one key value pair. There are two kind of keys, match and assignment keys. If all match keys are matching against its value, the rule gets applied and the assign keys get the specified value assigned. ++.PP ++A rule may consists of a list of one or more key value pairs separated by a comma. Each key has a distinct operation, depending on the used operator. Valid operators are: ++.PP ++\fB==\fR ++.RS 4 ++Compare for equality. ++.RE ++.PP ++\fB!=\fR ++.RS 4 ++Compare for non\-equality. ++.RE ++.PP ++\fB=\fR ++.RS 4 ++Assign a value to a key. Keys that represent a list, are reset and only this single value is assigned. ++.RE ++.PP ++\fB+=\fR ++.RS 4 ++Add the value to a key that holds a list of entries. ++.RE ++.PP ++\fB:=\fR ++.RS 4 ++Assign a value to a key finally; disallow any later changes, which may be used to prevent changes by any later rules. ++.RE ++.PP ++The following key names can be used to match against device properties: ++.PP ++\fBCARDINDEX\fR ++.RS 4 ++Match the card index of the ALSA driver. ++.RE ++.PP ++\fBCTL{\fR\fB\fIattribute\fR\fR\fB}\fR ++.RS 4 ++Set or test universal control attribute. Possible attributes: ++.RS 4 ++.PP ++\fBnumid\fR ++.RS 4 ++Numeric control identification. ++.RE ++.PP ++\fBiface\fR, \fBinterface\fR ++.RS 4 ++Control interface name (CARD, HWEDEP, MIXER, PCM, RAWMIDI, TIMER, SEQUENCER) ++.RE ++.PP ++\fBsubdev\fR, \fBsubdevice\fR ++.RS 4 ++Subdevice number. ++.RE ++.PP ++\fBname\fR ++.RS 4 ++Control name ++.RE ++.PP ++\fBindex\fR ++.RS 4 ++Control index ++.RE ++.PP ++\fBtype\fR ++.RS 4 ++Control type (BOOLEAN, INTEGER, INTEGER64, ENUMERATED, BYTES, IEC958) ++.RE ++.PP ++\fBattr\fR, \fBattribute\fR ++.RS 4 ++Attributes (stored in a string \- use match characters * and ?): ++.RS 4 ++.PP ++\fBr\fR ++.RS 4 ++control is readable ++.RE ++.PP ++\fBw\fR ++.RS 4 ++control is writable ++.RE ++.PP ++\fBv\fR ++.RS 4 ++control is volatile ++.RE ++.PP ++\fBi\fR ++.RS 4 ++control is inactive ++.RE ++.PP ++\fBl\fR ++.RS 4 ++control is locked ++.RE ++.PP ++\fBR\fR ++.RS 4 ++control is TLV readable ++.RE ++.PP ++\fBW\fR ++.RS 4 ++control is TLV writable ++.RE ++.PP ++\fBC\fR ++.RS 4 ++control is TLV commandable ++.RE ++.PP ++\fBo\fR ++.RS 4 ++process is owner of this control ++.RE ++.PP ++\fBu\fR ++.RS 4 ++control created in user space ++.RE ++.RE ++.RE ++.PP ++\fBowner\fR ++.RS 4 ++Control owner process PID number ++.RE ++.PP ++\fBcount\fR ++.RS 4 ++Control count of values ++.RE ++.PP ++\fBmin\fR ++.RS 4 ++Value range \- minimum value ++.RE ++.PP ++\fBmax\fR ++.RS 4 ++Value range \- maximum value ++.RE ++.PP ++\fBstep\fR ++.RS 4 ++Value range \- step value ++.RE ++.PP ++\fBdBmin\fR ++.RS 4 ++Value range \- minimum dB value ++.RE ++.PP ++\fBdBmax\fR ++.RS 4 ++Value range \- maximum dB value ++.RE ++.PP ++\fBitems\fR ++.RS 4 ++Enumerated value \- number of text items ++.RE ++.PP ++\fBenums\fR ++.RS 4 ++Enumerated value \- list of text names stored between '|' character ++.RE ++.PP ++\fBvalue\fR ++.RS 4 ++Value of control stored to a string delimited by comma (,). ++.RE ++.RE ++.RE ++.PP ++\fBCONFIG{sysfs_device}\fR ++.RS 4 ++The relative path to sysfs subsystem specifying the root directory of a soundcard device. Usually, it should be set to "/class/sound/controlC$cardinfo{card}/device". ++.RE ++.PP ++\fBATTR{\fR\fB\fIfilename\fR\fR\fB}\fR ++.RS 4 ++Match sysfs attribute values of the soundcard device. The relative path to sysfs tree must be defined by CONFIG{sysfs_device} key. Trailing whitespace in the attribute values is ignored, if the specified match value does not contain trailing whitespace itself. Depending on the type of operator, this key is also used to set the value of a sysfs attribute. ++.RE ++.PP ++\fBENV{\fR\fB\fIkey\fR\fR\fB}\fR ++.RS 4 ++Match against the value of an environment variable. Up to five ++\fBENV\fR ++keys can be specified per rule. Depending on the type of operator, this key is also used to export a variable to the environment. ++.RE ++.PP ++\fBPROGRAM\fR ++.RS 4 ++Execute external program. The key is true, if the program returns without exit code zero. The whole event environment is available to the executed program. The program's output printed to stdout is available for the RESULT key. ++.sp ++Several buildin commands are available: ++.RS 4 ++.PP ++\fB__ctl_search\fR ++.RS 4 ++Search for a control. The CTL{name} key might contain match characters * and ?. An control index might be specified as first argument starting from zero (e.g. PROGRAM="__ctl_search 2"). ++.RE ++.PP ++\fB__ctl_count\fR ++.RS 4 ++Search for a controls and return total count of matched ones. The CTL{name} key might contain match characters * and ?. ++.RE ++.RE ++.RE ++.PP ++\fBRESULT\fR ++.RS 4 ++Match the returned string of the last PROGRAM call. This key can be used in the same or in any later rule after a PROGRAM call. ++.RE ++.PP ++Most of the fields support a shell style pattern matching. The following pattern characters are supported: ++.PP ++\fB*\fR ++.RS 4 ++Matches zero, or any number of characters. ++.RE ++.PP ++\fB?\fR ++.RS 4 ++Matches any single character. ++.RE ++.PP ++\fB[]\fR ++.RS 4 ++Matches any single character specified within the brackets. For example, the pattern string 'tty[SR]' would match either 'ttyS' or 'ttyR'. Ranges are also supported within this match with the '\-' character. For example, to match on the range of all digits, the pattern [0\-9] would be used. If the first character following the '[' is a '!', any characters not enclosed are matched. ++.RE ++.PP ++The following keys can get values assigned: ++.PP ++\fBCTL{numid}\fR, \fBCTL{iface}\fR, \fBCTL{device}\fR, \fBCTL{subdev}\fR, \fBCTL{name}\fR, \fBCTL{index}\fR, ++.RS 4 ++Select universal control element. ++.RE ++.PP ++\fBCTL{value}\fR ++.RS 4 ++Value is set (written) also to soundcard's control device and RESULT key is set to errno code. The result of set operation is always true (it means continue with next key on line). ++.RE ++.PP ++\fBCTL{values}\fR ++.RS 4 ++Value is set (written) also to soundcard's control device (all control values are set to specified value) and RESULT key is set to errno code. The result of set operation is always true (it means continue with next key on line). ++.RE ++.PP ++\fBENV{\fR\fB\fIkey\fR\fR\fB}\fR ++.RS 4 ++Export a variable to the environment. Depending on the type of operator, this key is also to match against an environment variable. ++.RE ++.PP ++\fBRESULT\fR ++.RS 4 ++Set RESULT variable. Note that PROGRAM also sets this variable, but setting this variable manually might be useful to change code execution order (included files). ++.RE ++.PP ++\fBLABEL\fR ++.RS 4 ++Named label where a GOTO can jump to. ++.RE ++.PP ++\fBGOTO\fR ++.RS 4 ++Jumps to the next LABEL with a matching name ++.RE ++.PP ++\fBINCLUDE\fR ++.RS 4 ++Include specified filename or all files in specified directory ++.RE ++.PP ++\fBACCESS\fR ++.RS 4 ++Check if specified file or directory exists ++.RE ++.PP ++\fBCONFIG{sysfs_device}\fR ++.RS 4 ++The relative path to sysfs subsystem specifying the root directory of a soundcard device. Usually, it should be set to "/class/sound/controlC$cardinfo{card}/device". ++.RE ++.PP ++\fBPRINT\fR ++.RS 4 ++PRINT value to stdout. ++.RE ++.PP ++\fBERROR\fR ++.RS 4 ++PRINT value to stderr. ++.RE ++.PP ++\fBEXIT\fR ++.RS 4 ++Exit immediately and set program exit code to value (should be integer). If value is "return" string, parser leaves current included file and returns to parent configuration file. ++.RE ++.PP ++The ++\fBPROGRAM\fR, ++\fBRESULT\fR, ++\fBCTL{value}\fR, ++\fBPRINT\fR, ++\fBERROR\fR, ++\fBEXIT\fR, ++\fBCONFIG{}\fR ++fields support simple printf\-like string substitutions. It allows the use of the complete environment set by earlier matching rules. For all other fields, substitutions are applied while the individual rule is being processed. The available substitutions are: ++.PP ++\fB$cardinfo{\fR\fB\fIattribute\fR\fR\fB}\fR, \fB%i{\fR\fB\fIattribute\fR\fR\fB}\fR ++.RS 4 ++See CARDINFO{} for more details. ++.RE ++.PP ++\fB$ctl{\fR\fB\fIattribute\fR\fR\fB}\fR, \fB%C{\fR\fB\fIattribute\fR\fR\fB}\fR ++.RS 4 ++See CTL{} for more details. ++.RE ++.PP ++\fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR ++.RS 4 ++The value of a sysfs attribute found at the device, where all keys of the rule have matched. If the attribute is a symlink, the last element of the symlink target is returned as the value. ++.RE ++.PP ++\fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR ++.RS 4 ++The value of an environment variable. ++.RE ++.PP ++\fB$result\fR, \fB%c\fR ++.RS 4 ++The string returned by the external program requested with PROGRAM. A single part of the string, separated by a space character may be selected by specifying the part number as an attribute: ++\fB%c{N}\fR. If the number is followed by the '+' char this part plus all remaining parts of the result string are substituted: ++\fB%c{N+}\fR ++.RE ++.PP ++\fB$sysfsroot\fR, \fB%r\fR ++.RS 4 ++Root directory where sysfs file\-system is mounted. Ususally, this value is just "/sys". ++.RE ++.PP ++\fB%%\fR ++.RS 4 ++The '%' character itself. ++.RE ++.PP ++\fB$$\fR ++.RS 4 ++The '$' character itself. ++.RE ++.PP ++The count of characters to be substituted may be limited by specifying the format length value. For example, '%3s{file}' will only insert the first three characters of the sysfs attribute ++.SH "AUTHOR" ++.PP ++Written by Jaroslav Kysela ++<perex@perex.cz> ++.PP ++Some portions are written by Greg Kroah\-Hartman ++<greg@kroah.com> ++and Kay Sievers ++<kay.sievers@vrfy.org>. ++.SH "SEE ALSO" ++.PP ++\fBalsactl\fR(1) diff --git a/stage3/patches/common/bind-9.9.1-P2-use_iproute2-1.patch b/stage3/patches/common/bind-9.9.1-P2-use_iproute2-1.patch new file mode 100644 index 0000000..0f22ed1 --- /dev/null +++ b/stage3/patches/common/bind-9.9.1-P2-use_iproute2-1.patch @@ -0,0 +1,40 @@ +Submitted By: Bruce Dubbs <bdubbs_AT_linuxfromscratch_DOT_org> +Date: 2011-11-16 +Origin: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Initial Package Version: 9.8.1-P1 +Description: allow use of ip command instead of ifconfig for test suite +Upstream Status: Not applicable + +diff -Naur bind-9.8.1-P1.orig/bin/tests/system/ifconfig.sh bind-9.8.1-P1/bin/tests/system/ifconfig.sh +--- bind-9.8.1-P1.orig/bin/tests/system/ifconfig.sh 2010-06-11 18:46:49.000000000 -0500 ++++ bind-9.8.1-P1/bin/tests/system/ifconfig.sh 2011-11-16 21:13:32.000000000 -0600 +@@ -97,9 +97,11 @@ + fi + ;; + *-*-linux*) +- ifconfig lo:$int 10.53.0.$ns up netmask 255.255.255.0 +- ifconfig lo inet6 add fd92:7065:b8e:ffff::$ns/64 +- ;; ++ #ifconfig lo:$int 10.53.0.$ns up netmask 255.255.255.0 ++ #ifconfig lo inet6 add fd92:7065:b8e:ffff::$ns/64 ++ ip addr add 10.53.0.$ns/24 label lo:$int dev lo ++ ip addr add fd92:7065:b8e:ffff::$ns/64 label lo:$int6 dev lo ++ ;; + *-unknown-freebsd*) + ifconfig lo0 10.53.0.$ns alias netmask 0xffffffff + ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns alias +@@ -172,9 +174,11 @@ + fi + ;; + *-*-linux*) +- ifconfig lo:$int 10.53.0.$ns down +- ifconfig lo inet6 del fd92:7065:b8e:ffff::$ns/64 +- ;; ++ #ifconfig lo:$int 10.53.0.$ns down ++ #ifconfig lo inet6 del fd92:7065:b8e:ffff::$ns/64 ++ ip addr del 10.53.0.$ns/24 label lo:$int dev lo ++ ip addr del fd92:7065:b8e:ffff::$ns/64 label lo:$int6 dev lo ++ ;; + *-unknown-freebsd*) + ifconfig lo0 10.53.0.$ns delete + ifconfig lo0 inet6 fd92:7065:b8e:ffff::$ns delete diff --git a/stage3/patches/common/cdparanoia-III-10.2-gcc_fixes-1.patch b/stage3/patches/common/cdparanoia-III-10.2-gcc_fixes-1.patch new file mode 100644 index 0000000..812a90e --- /dev/null +++ b/stage3/patches/common/cdparanoia-III-10.2-gcc_fixes-1.patch @@ -0,0 +1,586 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2008-12-03 +Initial Package Version: III-10.2 +Upstream Status: unknown +Origin: gentoo, who describe it as a gcc-4.3 patch +Description: Renames a variable from 'private' to 'private_data'. This is +apparently intended to allow the package to be compiled with gcc-4.3 and later. +The header file cdda_interface.h is used by c++ code in kdemultimedia-4.1.2 +which barfs on the use of private _even_in_g++-4.2.2_. + +diff -urp cdparanoia-III-10.2.orig/interface/cdda_interface.h cdparanoia-III-10.2/interface/cdda_interface.h +--- cdparanoia-III-10.2.orig/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-25 00:18:02.000000000 +0100 +@@ -84,7 +84,7 @@ typedef struct cdrom_drive{ + int is_atapi; + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *private_data; + void *reserved; + unsigned char inqbytes[4]; + +diff -urp cdparanoia-III-10.2.orig/interface/cooked_interface.c cdparanoia-III-10.2/interface/cooked_interface.c +--- cdparanoia-III-10.2.orig/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2/interface/cooked_interface.c 2008-09-25 00:19:21.000000000 +0100 +@@ -13,13 +13,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +diff -urp cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c +--- cdparanoia-III-10.2.orig/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2/interface/interface.c 2008-09-25 00:19:47.000000000 +0100 +@@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){ + if(d->drive_model)free(d->drive_model); + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + + free(d); +@@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, voi + } + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->private_data->last_milliseconds; + return(sectors); + } + +diff -urp cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c +--- cdparanoia-III-10.2.orig/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2/interface/scan_devices.c 2008-09-25 00:20:35.000000000 +0100 +@@ -264,11 +264,11 @@ cdrom_drive *cdda_identify_cooked(const + d->interface=COOKED_IOCTL; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); + return(d); +@@ -674,15 +674,15 @@ cdrom_drive *cdda_identify_scsi(const ch + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ + version=verify_SG_version(d,messagedest,messages); +@@ -696,8 +696,8 @@ cdrom_drive *cdda_identify_scsi(const ch + } + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + } + + { +@@ -772,9 +772,9 @@ cdda_identify_scsi_fail: + if(i_fd!=-1)close(i_fd); + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + free(d); + } +@@ -821,7 +821,7 @@ cdrom_drive *cdda_identify_test(const ch + d->interface=TEST_INTERFACE; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); + +diff -urp cdparanoia-III-10.2.orig/interface/scsi_interface.c cdparanoia-III-10.2/interface/scsi_interface.c +--- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 ++++ cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-25 00:22:40.000000000 +0100 +@@ -15,13 +15,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +@@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive + static void clear_garbage(cdrom_drive *d){ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + int flag=0; + + /* clear out any possibly preexisting garbage */ +@@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + struct timespec tv2; + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + + /* generic scsi device services */ +@@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; + sg_hd->reply_len = SG_OFF + out_size; +@@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + tell if the command failed. Scared yet? */ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ + writebytes+=(out_size-in_size); +@@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + } + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->private_data->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); + +@@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + } + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->private_data->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); +@@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri + if(bytecheck && in_size+cmd_len<out_size){ + long i,flag=0; + for(i=in_size;i<out_size;i++) +- if(d->private->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -326,9 +326,9 @@ static int sg2_handle_scsi_cmd(cdrom_dri + + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); + } +@@ -347,7 +347,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr + + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; + hdr.cmd_len = cmd_len; +@@ -355,7 +355,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr + hdr.mx_sb_len = SG_MAX_SENSE; + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->private_data->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + + /* scary buffer fill hack */ +@@ -400,7 +400,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr + if(bytecheck && in_size<out_size){ + long i,flag=0; + for(i=in_size;i<out_size;i++) +- if(d->private->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -412,7 +412,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr + } + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->private_data->last_milliseconds = hdr.duration; */ + + errno = 0; + return 0; +@@ -445,9 +445,9 @@ static int test_unit_ready(cdrom_drive * + + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->private_data->sg_buffer[2] & 0xf; ++ ASC = d->private_data->sg_buffer[12]; ++ ASCQ = d->private_data->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; + return 1; +@@ -492,7 +492,7 @@ static int mode_sense_atapi(cdrom_drive + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->private_data->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ + +@@ -604,8 +604,8 @@ static int mode_select(cdrom_drive *d,in + static unsigned int get_orig_sectorsize(cdrom_drive *d){ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->private_data->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); + } + + /* switch CDROM scsi drives to given sector size */ +@@ -664,8 +664,8 @@ static int scsi_read_toc (cdrom_drive *d + return(-4); + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->private_data->sg_buffer[2]; ++ last=d->private_data->sg_buffer[3]; + tracks=last-first+1; + + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { +@@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d + return(-5); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=i; +@@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d + return(-2); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=0xAA; +@@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive * + } + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->private_data->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); + return(-3); +@@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive * + return(-5); + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | ++ (d->private_data->sg_buffer[7]<<16)| ++ (d->private_data->sg_buffer[8]<<8)| ++ (d->private_data->sg_buffer[9])))); + + + d->cd_extra = FixupTOC(d,tracks+1); +@@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, vo + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, vo + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d, + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, vo + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, vo + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, v + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d, + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, v + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d, + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d, + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, voi + static int count_2352_bytes(cdrom_drive *d){ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + + return(0); +@@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive + static int verify_nonzero(cdrom_drive *d){ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->private_data->sg_buffer[i]!=0){ + flag=1; + break; + } +@@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){ + d->is_mmc=0; + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->private_data->sg_buffer; + b+=b[3]+4; + + if((b[0]&0x3F)==0x2A){ +@@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive + cderror(d,"008: Unable to identify CDROM model\n"); + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->private_data->sg_buffer); + } + + int scsi_init_drive(cdrom_drive *d){ +@@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){ + check_cache(d); + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + d->report_all=1; + return(0); + } +diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.2/interface/test_interface.c +--- cdparanoia-III-10.2.orig/interface/test_interface.c 2008-09-11 21:33:30.000000000 +0100 ++++ cdparanoia-III-10.2/interface/test_interface.c 2008-09-25 00:22:46.000000000 +0100 +@@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, vo + if(!fd)fd=fdopen(d->cdda_fd,"r"); + + if(begin<lastread) +- d->private->last_milliseconds=20; ++ d->private_data->last_milliseconds=20; + else +- d->private->last_milliseconds=sectors; ++ d->private_data->last_milliseconds=sectors; + + #ifdef CDDA_TEST_UNDERRUN + sectors-=1; diff --git a/stage3/patches/common/colordiff-1.0.10-inst-prefix.patch b/stage3/patches/common/colordiff-1.0.10-inst-prefix.patch new file mode 100644 index 0000000..0a671af --- /dev/null +++ b/stage3/patches/common/colordiff-1.0.10-inst-prefix.patch @@ -0,0 +1,24 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2011-09-09 +Initial Package Version: 1.0.9 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Allow Makefile installation prefix to be set instead of + being hardcoded like this: + PREFIX=/usr make install + +diff -Naur colordiff-1.0.9.orig/Makefile colordiff-1.0.9.patched/Makefile +--- colordiff-1.0.9.orig/Makefile 2009-04-21 14:55:47.000000000 -0400 ++++ colordiff-1.0.9.patched/Makefile 2011-09-10 17:23:28.000000000 -0400 +@@ -1,5 +1,9 @@ +-INSTALL_DIR=/usr/local/bin +-MAN_DIR=/usr/local/man/man1 ++ifndef PREFIX ++PREFIX=/usr/local ++endif ++ ++INSTALL_DIR=$(PREFIX)/bin ++MAN_DIR=$(PREFIX)/man/man1 + ETC_DIR=/etc + VERSION=1.0.9 + DIST_FILES=COPYING INSTALL Makefile README \ diff --git a/stage3/patches/common/cyrus-sasl-2.1.25-fixes-1.patch b/stage3/patches/common/cyrus-sasl-2.1.25-fixes-1.patch new file mode 100644 index 0000000..79d8b00 --- /dev/null +++ b/stage3/patches/common/cyrus-sasl-2.1.25-fixes-1.patch @@ -0,0 +1,368 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-04-01 +Initial Package Version: 2.1.25 +Upstream Status: Unknown +Origin: Debian +Description: Various package fixes, including BDB 5.x build fix, LDAPDB and GSSAPI build + fixes, plugin loading fixes, documentation typos, dovecot authentification fixes + and shadow authentification fix. + +--- cyrus-sasl.orig/lib/checkpw.c 2009-12-03 20:07:01.000000000 +0100 ++++ cyrus-sasl/lib/checkpw.c 2012-04-01 12:30:31.124336510 +0200 +@@ -587,16 +587,14 @@ + /* Timeout. */ + errno = ETIMEDOUT; + return -1; +- case +1: +- if (FD_ISSET(fd, &rfds)) { +- /* Success, file descriptor is readable. */ +- return 0; +- } +- return -1; + case -1: + if (errno == EINTR || errno == EAGAIN) + continue; + default: ++ if (FD_ISSET(fd, &rfds)) { ++ /* Success, file descriptor is readable. */ ++ return 0; ++ } + /* Error catch-all. */ + return -1; + } +--- cyrus-sasl.orig/lib/common.c 2011-09-02 14:58:01.000000000 +0200 ++++ cyrus-sasl/lib/common.c 2012-04-01 12:27:52.893087046 +0200 +@@ -818,7 +818,7 @@ + result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init); + if(result != SASL_OK) return result; + +- if (!free_mutex) { ++ if (!free_mutex || free_mutex == 0x1) { + free_mutex = sasl_MUTEX_ALLOC(); + } + if (!free_mutex) return SASL_FAIL; +@@ -838,6 +838,11 @@ + + /* serialize disposes. this is necessary because we can't + dispose of conn->mutex if someone else is locked on it */ ++ ++ if (!free_mutex || free_mutex == 0x1) ++ free_mutex = sasl_MUTEX_ALLOC(); ++ if (!free_mutex) return SASL_FAIL; ++ + result = sasl_MUTEX_LOCK(free_mutex); + if (result!=SASL_OK) return; + +--- cyrus-sasl.orig/lib/dlopen.c 2009-12-03 20:07:01.000000000 +0100 ++++ cyrus-sasl/lib/dlopen.c 2012-04-01 12:29:44.564379243 +0200 +@@ -247,105 +247,6 @@ + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); +--- cyrus-sasl.orig/plugins/gssapi.c 2011-05-11 21:25:55.000000000 +0200 ++++ cyrus-sasl/plugins/gssapi.c 2012-04-01 12:30:17.442055118 +0200 +@@ -370,7 +370,7 @@ + } + + if (output_token->value && output) { +- unsigned char * p = (unsigned char *) text->encode_buf; ++ int len; + + ret = _plug_buf_alloc(text->utils, + &(text->encode_buf), +@@ -384,11 +384,8 @@ + return ret; + } + +- p[0] = (output_token->length>>24) & 0xFF; +- p[1] = (output_token->length>>16) & 0xFF; +- p[2] = (output_token->length>>8) & 0xFF; +- p[3] = output_token->length & 0xFF; +- ++ len = htonl(output_token->length); ++ memcpy(text->encode_buf, &len, 4); + memcpy(text->encode_buf + 4, output_token->value, output_token->length); + } + +@@ -1480,10 +1477,10 @@ + } + + /* Setup req_flags properly */ +- req_flags = GSS_C_INTEG_FLAG; ++ req_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; + if (params->props.max_ssf > params->external_ssf) { + /* We are requesting a security layer */ +- req_flags |= GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG; ++ req_flags |= GSS_C_INTEG_FLAG; + /* Any SSF bigger than 1 is confidentiality. */ + /* Let's check if the client of the API requires confidentiality, + and it wasn't already provided by an external layer */ +--- cyrus-sasl.orig/plugins/ldapdb.c 2011-05-11 21:25:55.000000000 +0200 ++++ cyrus-sasl/plugins/ldapdb.c 2012-04-01 12:29:19.622866806 +0200 +@@ -251,6 +251,8 @@ + + #if defined(LDAP_PROXY_AUTHZ_FAILURE) + case LDAP_PROXY_AUTHZ_FAILURE: ++#elif defined(LDAP_X_PROXY_AUTHZ_FAILURE) ++ case LDAP_X_PROXY_AUTHZ_FAILURE: + #endif + case LDAP_INAPPROPRIATE_AUTH: + case LDAP_INVALID_CREDENTIALS: +--- cyrus-sasl.orig/saslauthd/auth_rimap.c 2009-12-03 20:07:03.000000000 +0100 ++++ cyrus-sasl/saslauthd/auth_rimap.c 2012-04-01 12:30:31.123336490 +0200 +@@ -1,3 +1,4 @@ ++ + /* MODULE: auth_rimap */ + + /* COPYRIGHT +@@ -367,6 +368,30 @@ + alarm(NETWORK_IO_TIMEOUT); + rc = read(s, rbuf, sizeof(rbuf)); + alarm(0); ++ if ( rc>0 ) { ++ /* check if there is more to read */ ++ fd_set perm; ++ int fds, ret; ++ struct timeval timeout; ++ ++ FD_ZERO(&perm); ++ FD_SET(s, &perm); ++ fds = s +1; ++ ++ timeout.tv_sec = 1; ++ timeout.tv_usec = 0; ++ while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) { ++ if ( FD_ISSET(s, &perm) ) { ++ ret = read(s, rbuf+rc, sizeof(rbuf)-rc); ++ if ( ret<0 ) { ++ rc = ret; ++ break; ++ } else { ++ rc += ret; ++ } ++ } ++ } ++ } + if (rc == -1) { + syslog(LOG_WARNING, "auth_rimap: read (banner): %m"); + (void) close(s); +@@ -456,6 +481,30 @@ + alarm(NETWORK_IO_TIMEOUT); + rc = read(s, rbuf, sizeof(rbuf)); + alarm(0); ++ if ( rc>0 ) { ++ /* check if there is more to read */ ++ fd_set perm; ++ int fds, ret; ++ struct timeval timeout; ++ ++ FD_ZERO(&perm); ++ FD_SET(s, &perm); ++ fds = s +1; ++ ++ timeout.tv_sec = 1; ++ timeout.tv_usec = 0; ++ while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) { ++ if ( FD_ISSET(s, &perm) ) { ++ ret = read(s, rbuf+rc, sizeof(rbuf)-rc); ++ if ( ret<0 ) { ++ rc = ret; ++ break; ++ } else { ++ rc += ret; ++ } ++ } ++ } ++ } + (void) close(s); /* we're done with the remote */ + if (rc == -1) { + syslog(LOG_WARNING, "auth_rimap: read (response): %m"); +--- cyrus-sasl.orig/saslauthd/auth_shadow.c 2009-12-03 20:07:03.000000000 +0100 ++++ cyrus-sasl/saslauthd/auth_shadow.c 2012-04-01 12:28:24.619737694 +0200 +@@ -36,6 +36,7 @@ + + #ifdef AUTH_SHADOW + ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + # include <unistd.h> +--- cyrus-sasl.orig/saslauthd/saslauthd.mdoc 2009-12-03 20:07:03.000000000 +0100 ++++ cyrus-sasl/saslauthd/saslauthd.mdoc 2012-04-01 12:26:58.090964382 +0200 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO +--- cyrus-sasl.orig/sasldb/db_berkeley.c 2011-09-02 14:58:02.000000000 +0200 ++++ cyrus-sasl/sasldb/db_berkeley.c 2012-04-01 12:29:02.720519690 +0200 +@@ -101,7 +101,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- cyrus-sasl.orig/utils/dbconverter-2.c 2003-02-13 20:56:17.000000000 +0100 ++++ cyrus-sasl/utils/dbconverter-2.c 2012-04-01 12:29:02.722519730 +0200 +@@ -214,7 +214,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/stage3/patches/common/docbook-utils-0.6.14-grep_fix-1.patch b/stage3/patches/common/docbook-utils-0.6.14-grep_fix-1.patch new file mode 100644 index 0000000..f966697 --- /dev/null +++ b/stage3/patches/common/docbook-utils-0.6.14-grep_fix-1.patch @@ -0,0 +1,33 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2011-01-01 +Initial Package Version: 0.6.14 +Upstream Status: unknown +Origin: fedora +Description: Grep-2.7 errors out on the 'space' syntax, causing +docbook2html to fail. Fixed up by hand (the fedora version depends +on a different patch which adds --color=never). + +diff -Naur docbook-utils-0.6.14.orig/bin/jw.in docbook-utils-0.6.14//bin/jw.in +--- docbook-utils-0.6.14.orig/bin/jw.in 2003-04-30 17:21:49.000000000 +0100 ++++ docbook-utils-0.6.14//bin/jw.in 2011-01-01 18:43:21.558959786 +0000 +@@ -80,9 +80,9 @@ + SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then +- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' + SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` +- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' + SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` + fi + +@@ -312,7 +312,7 @@ + SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG + else + SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog` +- SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :` ++ SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :` + fi + ;; + no) SGML_CATALOG_FILES="" diff --git a/stage3/patches/common/faac-1.28-glibc_fixes-1.patch b/stage3/patches/common/faac-1.28-glibc_fixes-1.patch new file mode 100644 index 0000000..3bc3be3 --- /dev/null +++ b/stage3/patches/common/faac-1.28-glibc_fixes-1.patch @@ -0,0 +1,25 @@ +Submitted By: Guy Dalziel <gdalziel at linuxfromscratch dot org> +Date: 2009-08-04 +Initial Package Version: 1.28 +Origin: Guy Dalziel +Upstream Status: Not submitted. +Description: Fixes a function conflict between FAAC and Glibc. + +diff -Naur faac-1.28-orig/common/mp4v2/mpeg4ip.h faac-1.28/common/mp4v2/mpeg4ip.h +--- faac-1.28-orig/common/mp4v2/mpeg4ip.h 2009-01-26 22:42:35.000000000 +0000 ++++ faac-1.28/common/mp4v2/mpeg4ip.h 2009-08-04 13:45:47.728062591 +0100 +@@ -120,14 +120,6 @@ + #endif + #include <sys/param.h> + +-#ifdef __cplusplus +-extern "C" { +-#endif +-char *strcasestr(const char *haystack, const char *needle); +-#ifdef __cplusplus +-} +-#endif +- + #define OPEN_RDWR O_RDWR + #define OPEN_CREAT O_CREAT + #define OPEN_RDONLY O_RDONLY diff --git a/stage3/patches/common/faad2-2.7-mp4ff-1.patch b/stage3/patches/common/faad2-2.7-mp4ff-1.patch new file mode 100644 index 0000000..09aef5f --- /dev/null +++ b/stage3/patches/common/faad2-2.7-mp4ff-1.patch @@ -0,0 +1,19 @@ +Submitted By: Igor ŽivkoviÄ <contact at igor hyphen zivkovic dot from dot hr> +Date: 2013-07-28 +Initial Package Version: 2.7 +Upstream Status: Fixed +Origin: Debian +Description: Prevents installation of mp4ff header and library files + as its usage outside FAAD is discouraged. + +diff -Naur faad2-2.7.orig/common/mp4ff/Makefile.am faad2-2.7/common/mp4ff/Makefile.am +--- faad2-2.7.orig/common/mp4ff/Makefile.am 2009-02-06 15:24:21.000000000 +0100 ++++ faad2-2.7/common/mp4ff/Makefile.am 2013-07-28 15:08:46.363310961 +0200 +@@ -1,5 +1,5 @@ +-lib_LIBRARIES = libmp4ff.a +-include_HEADERS = mp4ff.h mp4ffint.h ++noinst_LIBRARIES = libmp4ff.a ++noinst_HEADERS = mp4ff.h mp4ffint.h + + libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 + diff --git a/stage3/patches/common/iptables-1.4.15-missing-includes-1.patch b/stage3/patches/common/iptables-1.4.15-missing-includes-1.patch new file mode 100644 index 0000000..35a2e89 --- /dev/null +++ b/stage3/patches/common/iptables-1.4.15-missing-includes-1.patch @@ -0,0 +1,82 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-08-14 +Initial Package Version: 1.4.15 +Upstream Status: Fixed upstream +Origin: Upstream +Description: Fixes building with Linux 3.5+ + +--- iptables.orig/include/linux/netfilter_ipv4/ip_queue.h 1970-01-01 01:00:00.000000000 +0100 ++++ iptables/include/linux/netfilter_ipv4/ip_queue.h 2012-08-14 13:02:33.968768833 +0200 +@@ -0,0 +1,72 @@ ++/* ++ * This is a module which is used for queueing IPv4 packets and ++ * communicating with userspace via netlink. ++ * ++ * (C) 2000 James Morris, this code is GPL. ++ */ ++#ifndef _IP_QUEUE_H ++#define _IP_QUEUE_H ++ ++#ifdef __KERNEL__ ++#ifdef DEBUG_IPQ ++#define QDEBUG(x...) printk(KERN_DEBUG ## x) ++#else ++#define QDEBUG(x...) ++#endif /* DEBUG_IPQ */ ++#else ++#include <net/if.h> ++#endif /* ! __KERNEL__ */ ++ ++/* Messages sent from kernel */ ++typedef struct ipq_packet_msg { ++ unsigned long packet_id; /* ID of queued packet */ ++ unsigned long mark; /* Netfilter mark value */ ++ long timestamp_sec; /* Packet arrival time (seconds) */ ++ long timestamp_usec; /* Packet arrvial time (+useconds) */ ++ unsigned int hook; /* Netfilter hook we rode in on */ ++ char indev_name[IFNAMSIZ]; /* Name of incoming interface */ ++ char outdev_name[IFNAMSIZ]; /* Name of outgoing interface */ ++ __be16 hw_protocol; /* Hardware protocol (network order) */ ++ unsigned short hw_type; /* Hardware type */ ++ unsigned char hw_addrlen; /* Hardware address length */ ++ unsigned char hw_addr[8]; /* Hardware address */ ++ size_t data_len; /* Length of packet data */ ++ unsigned char payload[0]; /* Optional packet data */ ++} ipq_packet_msg_t; ++ ++/* Messages sent from userspace */ ++typedef struct ipq_mode_msg { ++ unsigned char value; /* Requested mode */ ++ size_t range; /* Optional range of packet requested */ ++} ipq_mode_msg_t; ++ ++typedef struct ipq_verdict_msg { ++ unsigned int value; /* Verdict to hand to netfilter */ ++ unsigned long id; /* Packet ID for this verdict */ ++ size_t data_len; /* Length of replacement data */ ++ unsigned char payload[0]; /* Optional replacement packet */ ++} ipq_verdict_msg_t; ++ ++typedef struct ipq_peer_msg { ++ union { ++ ipq_verdict_msg_t verdict; ++ ipq_mode_msg_t mode; ++ } msg; ++} ipq_peer_msg_t; ++ ++/* Packet delivery modes */ ++enum { ++ IPQ_COPY_NONE, /* Initial mode, packets are dropped */ ++ IPQ_COPY_META, /* Copy metadata */ ++ IPQ_COPY_PACKET /* Copy metadata + packet (range) */ ++}; ++#define IPQ_COPY_MAX IPQ_COPY_PACKET ++ ++/* Types of messages */ ++#define IPQM_BASE 0x10 /* standard netlink messages below this */ ++#define IPQM_MODE (IPQM_BASE + 1) /* Mode request from peer */ ++#define IPQM_VERDICT (IPQM_BASE + 2) /* Verdict from peer */ ++#define IPQM_PACKET (IPQM_BASE + 3) /* Packet from kernel */ ++#define IPQM_MAX (IPQM_BASE + 4) ++ ++#endif /*_IP_QUEUE_H*/ diff --git a/stage3/patches/common/libart_lgpl-2.3.21-upstream_fixes-1.patch b/stage3/patches/common/libart_lgpl-2.3.21-upstream_fixes-1.patch new file mode 100644 index 0000000..ade480e --- /dev/null +++ b/stage3/patches/common/libart_lgpl-2.3.21-upstream_fixes-1.patch @@ -0,0 +1,406 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2012-01-06 +Initial Package Version: 2.3.21 +Upstream Status: In upstream CVS +Origin: Upstream +Description: Fixes errors identified upstream + +From: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: Thu, 08 Dec 2011 00:30:03 +0000 +Subject: Fix a number of problems + +--- +diff --git a/ChangeLog b/ChangeLog +index 6861cf3..e274c9c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,5 @@ ++*** PLEASE SEE THE GIT COMMIT LOG FOR NEWER CHANGES *** ++ + 2009-01-14 Fridrich Strba <fridrich.strba@bluewin.ch> + + * gen_art_config.c: remove +diff --git a/README b/README +index 882527e..a88ec40 100644 +--- a/README ++++ b/README +@@ -17,3 +17,17 @@ For more information about libart, see the web page: + There's also a libart tutorial available at + http://www.gnome.org/~mathieu/libart/libart.html + ++====================================================================== ++ ++NOTE: The TDE project has take over maintinance of this library, ++starting with the sources from the final upstream release v2.3.21. ++ ++This allows the TDE project to resolve remaining issues that cause ++problems or crashes within TDE. ++ ++This patched library is only available under the terms of the ++GPL/LGPL, and is NOT for sale by the original author as mentioned ++above, as patch copyright has NOT been transferred to the original ++author and we have no plans to do so. ++ ++====================================================================== +diff --git a/art_config.h b/art_config.h +index 2954e55..0e4c948 100644 +--- a/art_config.h ++++ b/art_config.h +@@ -1,5 +1,8 @@ + /* Automatically generated by gen_art_config */ + ++#ifndef _ART_CONFIG_H_ ++#define _ART_CONFIG_H_ ++ + #define ART_SIZEOF_CHAR 1 + #define ART_SIZEOF_SHORT 2 + #define ART_SIZEOF_INT 4 +@@ -8,3 +11,6 @@ + typedef unsigned char art_u8; + typedef unsigned short art_u16; + typedef unsigned int art_u32; ++ ++#endif /* _ART_CONFIG_H_ */ ++ +diff --git a/art_render_gradient.c b/art_render_gradient.c +index bf93c6f..008d61a 100644 +--- a/art_render_gradient.c ++++ b/art_render_gradient.c +@@ -30,7 +30,9 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> ++#if 0 + #include <assert.h> ++#endif + + /* Hack to find out how to define alloca on different platforms. + * Modified version of glib/galloca.h. +@@ -203,7 +205,9 @@ calc_color_at (ArtGradientStop *stops, + } + + printf ("WARNING! bad ix %d in calc_color_at() [internal error]\n", ix); ++#if 0 + assert (0); ++#endif + } + + static void +@@ -331,6 +335,7 @@ art_render_gradient_linear_render_8 (ArtRenderCallback *self, + printf ("Initial ix: %d\n", ix); + #endif + ++#if 0 + assert (ix > 0); + assert (ix < n_stops); + assert ((stops[ix-1].offset <= offset_fraction + EPSILON) || +@@ -344,6 +349,17 @@ art_render_gradient_linear_render_8 (ArtRenderCallback *self, + assert ((offset_fraction != stops[ix].offset) || + (d_offset <= 0.0)); + */ ++#else ++ if (!( (ix > 0) && (ix < n_stops) ++ && ((stops[ix-1].offset <= offset_fraction + EPSILON) || ++ ((stops[ix].offset > (1.0 - EPSILON)) ++ && (offset_fraction < EPSILON /* == 0.0*/))) ++ && (offset_fraction <= stops[ix].offset))) ++ { ++ printf ("art_render_gradient.c:%d: Old assert() failed!\n", __LINE__); ++ return; ++ } ++#endif + + while (width > 0) + { +@@ -663,6 +679,18 @@ art_render_gradient_radial_render (ArtRenderCallback *self, ArtRender *render, + z = b_a + sqrt (rad); + else + z = b_a; ++ ++ if (gradient->spread == ART_GRADIENT_PAD) ++ z = z; ++ else if (gradient->spread == ART_GRADIENT_REPEAT) ++ z = z - floor (z); ++ else /* (gradient->spread == ART_GRADIENT_REFLECT) */ ++ { ++ double tmp; ++ ++ tmp = z - 2 * floor (0.5 * z); ++ z = tmp > 1 ? 2 - tmp : tmp; ++ } + art_render_gradient_setpix (render, bufp, n_stops, stops, z); + bufp += pixstride; + b_a += db_a; +diff --git a/art_render_gradient.h b/art_render_gradient.h +index ef5da95..d0806a4 100644 +--- a/art_render_gradient.h ++++ b/art_render_gradient.h +@@ -60,6 +60,7 @@ struct _ArtGradientLinear { + struct _ArtGradientRadial { + double affine[6]; /* transforms user coordinates to unit circle */ + double fx, fy; /* focal point in unit circle coords */ ++ ArtGradientSpread spread; + int n_stops; + ArtGradientStop *stops; + }; +diff --git a/art_vpath_bpath.c b/art_vpath_bpath.c +index 3f9afe7..2459f23 100644 +--- a/art_vpath_bpath.c ++++ b/art_vpath_bpath.c +@@ -123,18 +123,6 @@ art_vpath_render_bez (ArtVpath **p_vpath, int *pn, int *pn_max, + double x3, double y3, + double flatness) + { +- double x3_0, y3_0; +- double z3_0_dot; +- double z1_dot, z2_dot; +- double z1_perp, z2_perp; +- double max_perp_sq; +- +- double x_m, y_m; +- double xa1, ya1; +- double xa2, ya2; +- double xb1, yb1; +- double xb2, yb2; +- + /* It's possible to optimize this routine a fair amount. + + First, once the _dot conditions are met, they will also be met in +@@ -157,70 +145,79 @@ art_vpath_render_bez (ArtVpath **p_vpath, int *pn, int *pn_max, + just that I have this undying quest for more speed... + + */ +- +- x3_0 = x3 - x0; +- y3_0 = y3 - y0; +- +- /* z3_0_dot is dist z0-z3 squared */ +- z3_0_dot = x3_0 * x3_0 + y3_0 * y3_0; +- +- if (z3_0_dot < 0.001) ++ do + { +- /* if start and end point are almost identical, the flatness tests +- * don't work properly, so fall back on testing whether both of +- * the other two control points are the same as the start point, +- * too. +- */ +- if (hypot(x1 - x0, y1 - y0) < 0.001 +- && hypot(x2 - x0, y2 - y0) < 0.001) +- goto nosubdivide; +- else +- goto subdivide; +- } ++ /* don't subdivide inside this */ ++ double x3_0, y3_0; ++ double z3_0_dot; ++ double z1_dot, z2_dot; ++ double z1_perp, z2_perp; ++ double max_perp_sq; + +- /* we can avoid subdivision if: ++ x3_0 = x3 - x0; ++ y3_0 = y3 - y0; + +- z1 has distance no more than flatness from the z0-z3 line ++ /* z3_0_dot is dist z0-z3 squared */ ++ z3_0_dot = x3_0 * x3_0 + y3_0 * y3_0; + +- z1 is no more z0'ward than flatness past z0-z3 ++ if (z3_0_dot > 0.001) ++ { ++ /* we can avoid subdivision if: + +- z1 is more z0'ward than z3'ward on the line traversing z0-z3 ++ z1 has distance no more than flatness from the z0-z3 line + +- and correspondingly for z2 */ ++ z1 is no more z0'ward than flatness past z0-z3 + +- /* perp is distance from line, multiplied by dist z0-z3 */ +- max_perp_sq = flatness * flatness * z3_0_dot; ++ z1 is more z0'ward than z3'ward on the line traversing z0-z3 + +- z1_perp = (y1 - y0) * x3_0 - (x1 - x0) * y3_0; +- if (z1_perp * z1_perp > max_perp_sq) +- goto subdivide; ++ and correspondingly for z2 */ + +- z2_perp = (y3 - y2) * x3_0 - (x3 - x2) * y3_0; +- if (z2_perp * z2_perp > max_perp_sq) +- goto subdivide; ++ /* perp is distance from line, multiplied by dist z0-z3 */ ++ max_perp_sq = flatness * flatness * z3_0_dot; + +- z1_dot = (x1 - x0) * x3_0 + (y1 - y0) * y3_0; +- if (z1_dot < 0 && z1_dot * z1_dot > max_perp_sq) +- goto subdivide; ++ z1_perp = (y1 - y0) * x3_0 - (x1 - x0) * y3_0; ++ if (z1_perp * z1_perp > max_perp_sq) ++ break; + +- z2_dot = (x3 - x2) * x3_0 + (y3 - y2) * y3_0; +- if (z2_dot < 0 && z2_dot * z2_dot > max_perp_sq) +- goto subdivide; ++ z2_perp = (y3 - y2) * x3_0 - (x3 - x2) * y3_0; ++ if (z2_perp * z2_perp > max_perp_sq) ++ break; + +- if (z1_dot + z1_dot > z3_0_dot) +- goto subdivide; ++ z1_dot = (x1 - x0) * x3_0 + (y1 - y0) * y3_0; ++ if (z1_dot < 0 && z1_dot * z1_dot > max_perp_sq) ++ break; + +- if (z2_dot + z2_dot > z3_0_dot) +- goto subdivide; ++ if (z1_dot + z1_dot > z3_0_dot) ++ break; + +- +- nosubdivide: +- /* don't subdivide */ +- art_vpath_add_point (p_vpath, pn, pn_max, +- ART_LINETO, x3, y3); +- return; ++ z2_dot = (x3 - x2) * x3_0 + (y3 - y2) * y3_0; ++ if (z2_dot < 0 && z2_dot * z2_dot > max_perp_sq) ++ break; + +- subdivide: ++ if (z2_dot + z2_dot > z3_0_dot) ++ break; ++ } ++ else ++ { ++ /* if start and end point are almost identical, the flatness tests ++ * don't work properly, so fall back on testing whether both of ++ * the other two control points are the same as the start point, ++ * too. ++ */ ++ if (hypot(x1 - x0, y1 - y0) > 0.001 ++ || hypot(x2 - x0, y2 - y0) > 0.001) ++ break; ++ } ++ ++ art_vpath_add_point (p_vpath, pn, pn_max, ++ ART_LINETO, x3, y3); ++ return; ++ } while (0); ++ double x_m, y_m; ++ double xa1, ya1; ++ double xa2, ya2; ++ double xb1, yb1; ++ double xb2, yb2; + + xa1 = (x0 + x1) * 0.5; + ya1 = (y0 + y1) * 0.5; +diff --git a/gen_art_config.sh.in b/gen_art_config.sh.in +index 79843bc..8c525bd 100644 +--- a/gen_art_config.sh.in ++++ b/gen_art_config.sh.in +@@ -8,6 +8,9 @@ + + echo "/* Automatically generated by gen_art_config */" + echo ++echo "#ifndef _ART_CONFIG_H_" ++echo "#define _ART_CONFIG_H_" ++echo + echo "#define ART_SIZEOF_CHAR @ART_SIZEOF_CHAR@" + echo "#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@" + echo "#define ART_SIZEOF_INT @ART_SIZEOF_INT@" +@@ -39,5 +42,8 @@ else + fi + fi + ++echo ++echo "#endif /* _ART_CONFIG_H_ */" ++ + exit 0 + } +diff --git a/libart-config.in b/libart-config.in +index 0a2f3a9..e32f010 100644 +--- a/libart-config.in ++++ b/libart-config.in +@@ -3,6 +3,8 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + exec_prefix_set=no ++libs="" ++output_libs=no + + usage="\ + Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]" +@@ -43,8 +45,11 @@ while test $# -gt 0; do + echo $includes + ;; + --libs) +- libdirs=-L@libdir@ +- echo $libdirs -lart_lgpl_2 -lm ++ libs="$libs -L@libdir@ -lart_lgpl_2" ++ output_libs=yes ++ ;; ++ --static) ++ libs="$libs -lm" + ;; + *) + echo "${usage}" 1>&2 +@@ -54,3 +59,7 @@ while test $# -gt 0; do + shift + done + ++if test $output_libs = yes ; then ++ echo $libs ++fi ++ +diff --git a/testart.c b/testart.c +index f20b292..994c7ba 100644 +--- a/testart.c ++++ b/testart.c +@@ -228,6 +228,7 @@ make_testpat (void) + art_free (vpath3); + #else + svp2 = art_svp_from_vpath (vpath2); ++ art_free (vpath2); + #endif + + #if 1 +@@ -361,6 +362,7 @@ test_dist (void) + 4, + 0.5); + #endif ++ art_free (vpath); + + art_rgb_svp_aa (svp, 0, 0, 512, 512, + 0xffe0a0, 0x100040, +@@ -431,10 +433,12 @@ test_render_gradient (art_u8 *buf) + + vpath = randstar (50); + svp = art_svp_from_vpath (vpath); ++ art_free (vpath); + + render = art_render_new (0, 0, 512, 512, buf, 512 * 3, 3, 8, ART_ALPHA_NONE, + NULL); + art_render_svp (render, svp); ++ art_svp_free (svp); + art_render_gradient_linear (render, &gradient, ART_FILTER_NEAREST); + art_render_invoke (render); + +@@ -467,6 +471,7 @@ test_render_rad_gradient (art_u8 *buf) + + vpath = randstar (50); + svp = art_svp_from_vpath (vpath); ++ art_free (vpath); + + render = art_render_new (0, 0, 512, 512, buf, 512 * 3, 3, 8, ART_ALPHA_NONE, + NULL); +@@ -489,6 +494,7 @@ test_gradient (void) + + vpath = randstar (50); + svp = art_svp_from_vpath (vpath); ++ art_free (vpath); + + for (i = 0; i < n_iter; i++) + { +-- +cgit v0.9.0.2-39-g756e diff --git a/stage3/patches/common/libmad-0.15.1b-fixes-1.patch b/stage3/patches/common/libmad-0.15.1b-fixes-1.patch new file mode 100644 index 0000000..aa40881 --- /dev/null +++ b/stage3/patches/common/libmad-0.15.1b-fixes-1.patch @@ -0,0 +1,91 @@ +Submitted By: Igor ŽivkoviÄ <contact at igor hyphen zivkovic dot from dot hr> +Date: 2013-07-04 +Initial Package Version: 0.15.1b +Upstream Status: Reported +Origin: Arch Linux packages repository +Description: Fixes compilation on x86-64 and optimization issues. + +diff -Naur libmad-0.15.1b.orig/configure.ac libmad-0.15.1b/configure.ac +--- libmad-0.15.1b.orig/configure.ac 2004-01-23 10:41:32.000000000 +0100 ++++ libmad-0.15.1b/configure.ac 2013-07-04 15:55:09.323764417 +0200 +@@ -124,71 +124,7 @@ + + if test "$GCC" = yes + then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac ++ optimize="-O2" + fi + + case "$host" in +@@ -297,6 +233,7 @@ + then + case "$host" in + i?86-*) FPM="INTEL" ;; ++ x86_64*) FPM="64BIT" ;; + arm*-*) FPM="ARM" ;; + mips*-*) FPM="MIPS" ;; + sparc*-*) FPM="SPARC" ;; diff --git a/stage3/patches/common/libmad-0.15.1b-gcc44.patch b/stage3/patches/common/libmad-0.15.1b-gcc44.patch new file mode 100644 index 0000000..e9d43a4 --- /dev/null +++ b/stage3/patches/common/libmad-0.15.1b-gcc44.patch @@ -0,0 +1,11 @@ +diff -Naur libmad-0.15.1b.orig/configure libmad-0.15.1b.new/configure +--- libmad-0.15.1b.orig/configure 2004-02-05 04:34:07.000000000 -0500 ++++ libmad-0.15.1b.new/configure 2010-02-09 22:42:07.000000000 -0500 +@@ -19099,7 +19099,6 @@ + case "$optimize" in + -O|"-O "*) + optimize="-O" +- optimize="$optimize -fforce-mem" + optimize="$optimize -fforce-addr" + : #x optimize="$optimize -finline-functions" + : #- optimize="$optimize -fstrength-reduce" diff --git a/stage3/patches/common/libpng-1.6.3-apng.patch b/stage3/patches/common/libpng-1.6.3-apng.patch new file mode 100644 index 0000000..ece9249 --- /dev/null +++ b/stage3/patches/common/libpng-1.6.3-apng.patch @@ -0,0 +1,1702 @@ +diff -Naru libpng-1.6.3.org/png.h libpng-1.6.3/png.h +--- libpng-1.6.3.org/png.h 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/png.h 2013-07-20 04:33:18.000000000 +0900 +@@ -440,6 +440,10 @@ + # include "pnglibconf.h" + #endif + ++#define PNG_APNG_SUPPORTED ++#define PNG_READ_APNG_SUPPORTED ++#define PNG_WRITE_APNG_SUPPORTED ++ + #ifndef PNG_VERSION_INFO_ONLY + /* Machine specific configuration. */ + # include "pngconf.h" +@@ -530,6 +534,17 @@ + * See pngconf.h for base types that vary by machine/system + */ + ++#ifdef PNG_APNG_SUPPORTED ++/* dispose_op flags from inside fcTL */ ++#define PNG_DISPOSE_OP_NONE 0x00 ++#define PNG_DISPOSE_OP_BACKGROUND 0x01 ++#define PNG_DISPOSE_OP_PREVIOUS 0x02 ++ ++/* blend_op flags from inside fcTL */ ++#define PNG_BLEND_OP_SOURCE 0x00 ++#define PNG_BLEND_OP_OVER 0x01 ++#endif /* PNG_APNG_SUPPORTED */ ++ + /* This triggers a compiler error in png.c, if png.c and png.h + * do not agree upon the version number. + */ +@@ -849,6 +864,10 @@ + #define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */ + #define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */ + #define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */ ++#ifdef PNG_APNG_SUPPORTED ++#define PNG_INFO_acTL 0x10000 ++#define PNG_INFO_fcTL 0x20000 ++#endif + + /* This is used for the transformation routines, as some of them + * change these values for the row. It also should enable using +@@ -886,6 +905,10 @@ + #ifdef PNG_PROGRESSIVE_READ_SUPPORTED + typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); + typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop)); ++#ifdef PNG_APNG_SUPPORTED ++typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp, ++ png_uint_32)); ++#endif + + /* The following callback receives png_uint_32 row_number, int pass for the + * png_bytep data of the row. When transforming an interlaced image the +@@ -3288,6 +3311,74 @@ + /******************************************************************************* + * END OF HARDWARE OPTIONS + ******************************************************************************/ ++#ifdef PNG_APNG_SUPPORTED ++PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); ++ ++PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); ++ ++PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr, ++ png_infop info_ptr)); ++ ++PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr, ++ png_infop info_ptr)); ++ ++PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL, ++ (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, ++ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, ++ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, ++ png_byte *blend_op)); ++ ++PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL, ++ (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, ++ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); ++ ++PNG_EXPORT(251, png_uint_32, png_get_next_frame_width, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(252, png_uint_32, png_get_next_frame_height, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(259, png_byte, png_get_first_frame_is_hidden, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(260, png_uint_32, png_set_first_frame_is_hidden, ++ (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++PNG_EXPORT(261, void, png_read_frame_head, (png_structp png_ptr, ++ png_infop info_ptr)); ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++PNG_EXPORT(262, void, png_set_progressive_frame_fn, (png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn)); ++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++PNG_EXPORT(263, void, png_write_frame_head, (png_structp png_ptr, ++ png_infop info_ptr, png_bytepp row_pointers, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); ++ ++PNG_EXPORT(264, void, png_write_frame_tail, (png_structp png_ptr, ++ png_infop info_ptr)); ++#endif /* PNG_WRITE_APNG_SUPPORTED */ ++#endif /* PNG_APNG_SUPPORTED */ + + /* Maintainer: Put new public prototypes here ^, in libpng.3, and project + * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt +@@ -3298,7 +3389,11 @@ + * scripts/symbols.def as well. + */ + #ifdef PNG_EXPORT_LAST_ORDINAL ++#ifdef PNG_APNG_SUPPORTED ++ PNG_EXPORT_LAST_ORDINAL(264); ++#else + PNG_EXPORT_LAST_ORDINAL(244); ++#endif /* PNG_APNG_SUPPORTED */ + #endif + + #ifdef __cplusplus +diff -Naru libpng-1.6.3.org/pngget.c libpng-1.6.3/pngget.c +--- libpng-1.6.3.org/pngget.c 2013-07-20 04:14:38.000000000 +0900 ++++ libpng-1.6.3/pngget.c 2013-07-20 04:33:18.000000000 +0900 +@@ -1174,4 +1174,166 @@ + # endif + #endif + ++#ifdef PNG_APNG_SUPPORTED ++png_uint_32 PNGAPI ++png_get_acTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 *num_frames, png_uint_32 *num_plays) ++{ ++ png_debug1(1, "in %s retrieval function", "acTL"); ++ ++ if (png_ptr != NULL && info_ptr != NULL && ++ (info_ptr->valid & PNG_INFO_acTL) && ++ num_frames != NULL && num_plays != NULL) ++ { ++ *num_frames = info_ptr->num_frames; ++ *num_plays = info_ptr->num_plays; ++ return (1); ++ } ++ ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_num_frames(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_num_frames()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->num_frames); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_num_plays(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_num_plays()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->num_plays); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 *width, png_uint_32 *height, ++ png_uint_32 *x_offset, png_uint_32 *y_offset, ++ png_uint_16 *delay_num, png_uint_16 *delay_den, ++ png_byte *dispose_op, png_byte *blend_op) ++{ ++ png_debug1(1, "in %s retrieval function", "fcTL"); ++ ++ if (png_ptr != NULL && info_ptr != NULL && ++ (info_ptr->valid & PNG_INFO_fcTL) && ++ width != NULL && height != NULL && ++ x_offset != NULL && y_offset != NULL && ++ delay_num != NULL && delay_den != NULL && ++ dispose_op != NULL && blend_op != NULL) ++ { ++ *width = info_ptr->next_frame_width; ++ *height = info_ptr->next_frame_height; ++ *x_offset = info_ptr->next_frame_x_offset; ++ *y_offset = info_ptr->next_frame_y_offset; ++ *delay_num = info_ptr->next_frame_delay_num; ++ *delay_den = info_ptr->next_frame_delay_den; ++ *dispose_op = info_ptr->next_frame_dispose_op; ++ *blend_op = info_ptr->next_frame_blend_op; ++ return (1); ++ } ++ ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_width()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_width); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_height()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_height); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_x_offset()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_x_offset); ++ return (0); ++} ++ ++png_uint_32 PNGAPI ++png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_y_offset()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_y_offset); ++ return (0); ++} ++ ++png_uint_16 PNGAPI ++png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_delay_num()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_delay_num); ++ return (0); ++} ++ ++png_uint_16 PNGAPI ++png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_delay_den()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_delay_den); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_dispose_op()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_dispose_op); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_get_next_frame_blend_op()"); ++ ++ if (png_ptr != NULL && info_ptr != NULL) ++ return (info_ptr->next_frame_blend_op); ++ return (0); ++} ++ ++png_byte PNGAPI ++png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_first_frame_is_hidden()"); ++ ++ if (png_ptr != NULL) ++ return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN); ++ ++ PNG_UNUSED(info_ptr) ++ ++ return 0; ++} ++#endif /* PNG_APNG_SUPPORTED */ + #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +diff -Naru libpng-1.6.3.org/pnginfo.h libpng-1.6.3/pnginfo.h +--- libpng-1.6.3.org/pnginfo.h 2013-07-20 04:14:38.000000000 +0900 ++++ libpng-1.6.3/pnginfo.h 2013-07-20 04:33:18.000000000 +0900 +@@ -256,5 +256,18 @@ + png_bytepp row_pointers; /* the image bits */ + #endif + ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 num_frames; /* including default image */ ++ png_uint_32 num_plays; ++ png_uint_32 next_frame_width; ++ png_uint_32 next_frame_height; ++ png_uint_32 next_frame_x_offset; ++ png_uint_32 next_frame_y_offset; ++ png_uint_16 next_frame_delay_num; ++ png_uint_16 next_frame_delay_den; ++ png_byte next_frame_dispose_op; ++ png_byte next_frame_blend_op; ++#endif ++ + }; + #endif /* PNGINFO_H */ +diff -Naru libpng-1.6.3.org/pngpread.c libpng-1.6.3/pngpread.c +--- libpng-1.6.3.org/pngpread.c 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/pngpread.c 2013-07-20 04:33:18.000000000 +0900 +@@ -217,6 +217,109 @@ + + chunk_name = png_ptr->chunk_name; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->num_frames_read > 0 && ++ png_ptr->num_frames_read < info_ptr->num_frames) ++ { ++ if (chunk_name == png_IDAT) ++ { ++ /* Discard trailing IDATs for the first frame */ ++ if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "out of place IDAT"); ++ ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ else if (chunk_name == png_fdAT) ++ { ++ if (png_ptr->buffer_size < 4) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_ensure_sequence_number(png_ptr, 4); ++ ++ if (!(png_ptr->mode & PNG_HAVE_fcTL)) ++ { ++ /* Discard trailing fdATs for frames other than the first */ ++ if (png_ptr->num_frames_read < 2) ++ png_error(png_ptr, "out of place fdAT"); ++ ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ ++ else ++ { ++ /* frame data follows */ ++ png_ptr->idat_size = png_ptr->push_length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ png_ptr->process_mode = PNG_READ_IDAT_MODE; ++ ++ return; ++ } ++ } ++ ++ else if (chunk_name == png_fcTL) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_read_reset(png_ptr); ++ png_ptr->mode &= ~PNG_HAVE_fcTL; ++ ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); ++ ++ if (!(png_ptr->mode & PNG_HAVE_fcTL)) ++ png_error(png_ptr, "missing required fcTL chunk"); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ png_progressive_read_reset(png_ptr); ++ ++ if (png_ptr->frame_info_fn != NULL) ++ (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read); ++ ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ ++ return; ++ } ++ ++ else ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_push_crc_skip(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ ++ return; ++ } ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + if (chunk_name == png_IDAT) + { + if (png_ptr->mode & PNG_AFTER_IDAT) +@@ -299,6 +402,9 @@ + + else if (chunk_name == png_IDAT) + { ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_have_info(png_ptr, info_ptr); ++#endif + png_ptr->idat_size = png_ptr->push_length; + png_ptr->process_mode = PNG_READ_IDAT_MODE; + png_push_have_info(png_ptr, info_ptr); +@@ -530,6 +636,31 @@ + } + + #endif ++#ifdef PNG_READ_APNG_SUPPORTED ++ else if (chunk_name == png_acTL) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length); ++ } ++ ++ else if (chunk_name == png_fcTL) ++ { ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); ++ } ++ ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + else + { + if (png_ptr->push_length + 4 > png_ptr->buffer_size) +@@ -731,7 +862,11 @@ + png_byte chunk_tag[4]; + + /* TODO: this code can be commoned up with the same code in push_read */ ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->buffer_size < 12) ++#else + if (png_ptr->buffer_size < 8) ++#endif + { + png_push_save_buffer(png_ptr); + return; +@@ -744,17 +879,64 @@ + png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); + png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0) ++ { ++ if (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) ++ { ++ png_ptr->process_mode = PNG_READ_CHUNK_MODE; ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); ++ png_ptr->num_frames_read++; ++ return; ++ } ++ else ++ { ++ if (png_ptr->chunk_name == png_IEND) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_ptr->push_length + 4 > png_ptr->buffer_size) ++ { ++ png_push_save_buffer(png_ptr); ++ return; ++ } ++ png_warning(png_ptr, "Skipping (ignoring) a chunk between " ++ "APNG chunks"); ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ } ++ else ++#endif ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->chunk_name != png_IDAT && png_ptr->num_frames_read == 0) ++#else + if (png_ptr->chunk_name != png_IDAT) ++#endif + { + png_ptr->process_mode = PNG_READ_CHUNK_MODE; + + if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) + png_error(png_ptr, "Not enough compressed data"); + ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); ++ png_ptr->num_frames_read++; ++#endif ++ + return; + } + + png_ptr->idat_size = png_ptr->push_length; ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->num_frames_read > 0) ++ { ++ png_ensure_sequence_number(png_ptr, 4); ++ png_ptr->idat_size -= 4; ++ } ++#endif + } + + if (png_ptr->idat_size && png_ptr->save_buffer_size) +@@ -832,6 +1014,15 @@ + if (!(buffer_length > 0) || buffer == NULL) + png_error(png_ptr, "No IDAT data (internal error)"); + ++#ifdef PNG_READ_APNG_SUPPORTED ++ /* If the app is not APNG-aware, decode only the first frame */ ++ if (!(png_ptr->apng_flags & PNG_APNG_APP) && png_ptr->num_frames_read > 0) ++ { ++ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; ++ return; ++ } ++#endif ++ + /* This routine must process all the data it has been given + * before returning, calling the row callback as required to + * handle the uncompressed results. +@@ -1280,6 +1471,18 @@ + png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); + } + ++#ifdef PNG_READ_APNG_SUPPORTED ++void PNGAPI ++png_set_progressive_frame_fn(png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn) ++{ ++ png_ptr->frame_info_fn = frame_info_fn; ++ png_ptr->frame_end_fn = frame_end_fn; ++ png_ptr->apng_flags |= PNG_APNG_APP; ++} ++#endif ++ + png_voidp PNGAPI + png_get_progressive_ptr(png_const_structrp png_ptr) + { +diff -Naru libpng-1.6.3.org/pngpriv.h libpng-1.6.3/pngpriv.h +--- libpng-1.6.3.org/pngpriv.h 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/pngpriv.h 2013-07-20 04:47:13.000000000 +0900 +@@ -502,6 +502,10 @@ + #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ + /* 0x4000 (unused) */ + #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ ++#ifdef PNG_APNG_SUPPORTED ++#define PNG_HAVE_acTL 0x10000 ++#define PNG_HAVE_fcTL 0x20000 ++#endif + + /* Flags for the transformations the PNG library does on the image data */ + #define PNG_BGR 0x0001 +@@ -723,6 +727,16 @@ + #define png_tRNS PNG_U32(116, 82, 78, 83) + #define png_zTXt PNG_U32(122, 84, 88, 116) + ++#ifdef PNG_APNG_SUPPORTED ++#define png_acTL PNG_U32( 97, 99, 84, 76) ++#define png_fcTL PNG_U32(102, 99, 84, 76) ++#define png_fdAT PNG_U32(102, 100, 65, 84) ++ ++/* For png_struct.apng_flags: */ ++#define PNG_FIRST_FRAME_HIDDEN 0x0001 ++#define PNG_APNG_APP 0x0002 ++#endif ++ + /* The following will work on (signed char*) strings, whereas the get_uint_32 + * macro will fail on top-bit-set values because of the sign extension. + */ +@@ -1538,6 +1552,47 @@ + */ + #endif + ++#ifdef PNG_APNG_SUPPORTED ++PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op), PNG_EMPTY); ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_ensure_sequence_number,(png_structp png_ptr, ++ png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr, ++ png_infop info_ptr),PNG_EMPTY); ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY); ++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_fcTL,(png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_fdAT,(png_structp png_ptr, ++ png_const_bytep data, png_size_t length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY); ++#endif /* PNG_WRITE_APNG_SUPPORTED */ ++#endif /* PNG_APNG_SUPPORTED */ ++ + /* Added at libpng version 1.4.0 */ + #ifdef PNG_COLORSPACE_SUPPORTED + /* These internal functions are for maintaining the colorspace structure within +diff -Naru libpng-1.6.3.org/pngread.c libpng-1.6.3/pngread.c +--- libpng-1.6.3.org/pngread.c 2013-07-20 04:14:38.000000000 +0900 ++++ libpng-1.6.3/pngread.c 2013-07-20 04:33:18.000000000 +0900 +@@ -158,6 +158,9 @@ + + else if (chunk_name == png_IDAT) + { ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_have_info(png_ptr, info_ptr); ++#endif + png_ptr->idat_size = length; + break; + } +@@ -247,6 +250,17 @@ + png_handle_iTXt(png_ptr, info_ptr, length); + #endif + ++#ifdef PNG_READ_APNG_SUPPORTED ++ else if (chunk_name == png_acTL) ++ png_handle_acTL(png_ptr, info_ptr, length); ++ ++ else if (chunk_name == png_fcTL) ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ ++ else if (chunk_name == png_fdAT) ++ png_handle_fdAT(png_ptr, info_ptr, length); ++#endif ++ + else + png_handle_unknown(png_ptr, info_ptr, length, + PNG_HANDLE_CHUNK_AS_DEFAULT); +@@ -254,6 +268,72 @@ + } + #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ + ++#ifdef PNG_READ_APNG_SUPPORTED ++void PNGAPI ++png_read_frame_head(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */ ++ ++ png_debug(0, "Reading frame head"); ++ ++ if (!(png_ptr->mode & PNG_HAVE_acTL)) ++ png_error(png_ptr, "attempt to png_read_frame_head() but " ++ "no acTL present"); ++ ++ /* do nothing for the main IDAT */ ++ if (png_ptr->num_frames_read == 0) ++ return; ++ ++ png_read_reset(png_ptr); ++ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; ++ png_ptr->mode &= ~PNG_HAVE_fcTL; ++ ++ have_chunk_after_DAT = 0; ++ for (;;) ++ { ++ png_uint_32 length = png_read_chunk_header(png_ptr); ++ ++ if (png_ptr->chunk_name == png_IDAT) ++ { ++ /* discard trailing IDATs for the first frame */ ++ if (have_chunk_after_DAT || png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "png_read_frame_head(): out of place IDAT"); ++ png_crc_finish(png_ptr, length); ++ } ++ ++ else if (png_ptr->chunk_name == png_fcTL) ++ { ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ have_chunk_after_DAT = 1; ++ } ++ ++ else if (png_ptr->chunk_name == png_fdAT) ++ { ++ png_ensure_sequence_number(png_ptr, length); ++ ++ /* discard trailing fdATs for frames other than the first */ ++ if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1) ++ png_crc_finish(png_ptr, length - 4); ++ else if(png_ptr->mode & PNG_HAVE_fcTL) ++ { ++ png_ptr->idat_size = length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ ++ break; ++ } ++ else ++ png_error(png_ptr, "png_read_frame_head(): out of place fdAT"); ++ } ++ else ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_crc_finish(png_ptr, length); ++ } ++ } ++} ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + /* Optional call to update the users info_ptr structure */ + void PNGAPI + png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) +diff -Naru libpng-1.6.3.org/pngrutil.c libpng-1.6.3/pngrutil.c +--- libpng-1.6.3.org/pngrutil.c 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/pngrutil.c 2013-07-20 04:33:18.000000000 +0900 +@@ -821,6 +821,11 @@ + filter_type = buf[11]; + interlace_type = buf[12]; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_ptr->first_frame_width = width; ++ png_ptr->first_frame_height = height; ++#endif ++ + /* Set internal variables */ + png_ptr->width = width; + png_ptr->height = height; +@@ -2695,6 +2700,179 @@ + } + #endif + ++#ifdef PNG_READ_APNG_SUPPORTED ++void /* PRIVATE */ ++png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[8]; ++ png_uint_32 num_frames; ++ png_uint_32 num_plays; ++ png_uint_32 didSet; ++ ++ png_debug(1, "in png_handle_acTL"); ++ ++ if (!(png_ptr->mode & PNG_HAVE_IHDR)) ++ { ++ png_error(png_ptr, "Missing IHDR before acTL"); ++ } ++ else if (png_ptr->mode & PNG_HAVE_IDAT) ++ { ++ png_warning(png_ptr, "Invalid acTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (png_ptr->mode & PNG_HAVE_acTL) ++ { ++ png_warning(png_ptr, "Duplicate acTL skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (length != 8) ++ { ++ png_warning(png_ptr, "acTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ ++ png_crc_read(png_ptr, data, 8); ++ png_crc_finish(png_ptr, 0); ++ ++ num_frames = png_get_uint_31(png_ptr, data); ++ num_plays = png_get_uint_31(png_ptr, data + 4); ++ ++ /* the set function will do error checking on num_frames */ ++ didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays); ++ if(didSet) ++ png_ptr->mode |= PNG_HAVE_acTL; ++} ++ ++void /* PRIVATE */ ++png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[22]; ++ png_uint_32 width; ++ png_uint_32 height; ++ png_uint_32 x_offset; ++ png_uint_32 y_offset; ++ png_uint_16 delay_num; ++ png_uint_16 delay_den; ++ png_byte dispose_op; ++ png_byte blend_op; ++ ++ png_debug(1, "in png_handle_fcTL"); ++ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ if (!(png_ptr->mode & PNG_HAVE_IHDR)) ++ { ++ png_error(png_ptr, "Missing IHDR before fcTL"); ++ } ++ else if (png_ptr->mode & PNG_HAVE_IDAT) ++ { ++ /* for any frames other then the first this message may be misleading, ++ * but correct. PNG_HAVE_IDAT is unset before the frame head is read ++ * i can't think of a better message */ ++ png_warning(png_ptr, "Invalid fcTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ else if (png_ptr->mode & PNG_HAVE_fcTL) ++ { ++ png_warning(png_ptr, "Duplicate fcTL within one frame skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ else if (length != 26) ++ { ++ png_warning(png_ptr, "fcTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ ++ png_crc_read(png_ptr, data, 22); ++ png_crc_finish(png_ptr, 0); ++ ++ width = png_get_uint_31(png_ptr, data); ++ height = png_get_uint_31(png_ptr, data + 4); ++ x_offset = png_get_uint_31(png_ptr, data + 8); ++ y_offset = png_get_uint_31(png_ptr, data + 12); ++ delay_num = png_get_uint_16(data + 16); ++ delay_den = png_get_uint_16(data + 18); ++ dispose_op = data[20]; ++ blend_op = data[21]; ++ ++ if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0)) ++ { ++ png_warning(png_ptr, "fcTL for the first frame must have zero offset"); ++ return; ++ } ++ ++ if (info_ptr != NULL) ++ { ++ if (png_ptr->num_frames_read == 0 && ++ (width != info_ptr->width || height != info_ptr->height)) ++ { ++ png_warning(png_ptr, "size in first frame's fcTL must match " ++ "the size in IHDR"); ++ return; ++ } ++ ++ /* The set function will do more error checking */ ++ png_set_next_frame_fcTL(png_ptr, info_ptr, width, height, ++ x_offset, y_offset, delay_num, delay_den, ++ dispose_op, blend_op); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ ++ png_ptr->mode |= PNG_HAVE_fcTL; ++ } ++} ++ ++void /* PRIVATE */ ++png_have_info(png_structp png_ptr, png_infop info_ptr) ++{ ++ if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL)) ++ { ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ info_ptr->num_frames++; ++ } ++} ++ ++void /* PRIVATE */ ++png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ /* This function is only called from png_read_end(), png_read_info(), ++ * and png_push_read_chunk() which means that: ++ * - the user doesn't want to read this frame ++ * - or this is an out-of-place fdAT ++ * in either case it is safe to ignore the chunk with a warning */ ++ png_warning(png_ptr, "ignoring fdAT chunk"); ++ png_crc_finish(png_ptr, length - 4); ++ PNG_UNUSED(info_ptr) ++} ++ ++void /* PRIVATE */ ++png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length) ++{ ++ png_byte data[4]; ++ png_uint_32 sequence_number; ++ ++ if (length < 4) ++ png_error(png_ptr, "invalid fcTL or fdAT chunk found"); ++ ++ png_crc_read(png_ptr, data, 4); ++ sequence_number = png_get_uint_31(png_ptr, data); ++ ++ if (sequence_number != png_ptr->next_seq_num) ++ png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence " ++ "number found"); ++ ++ png_ptr->next_seq_num++; ++} ++#endif /* PNG_READ_APNG_SUPPORTED */ ++ + #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED + /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ + static int +@@ -3949,7 +4127,38 @@ + { + uInt avail_in; + png_bytep buffer; ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_uint_32 bytes_to_skip = 0; ++ ++ while (png_ptr->idat_size == 0 || bytes_to_skip != 0) ++ { ++ png_crc_finish(png_ptr, bytes_to_skip); ++ bytes_to_skip = 0; + ++ png_ptr->idat_size = png_read_chunk_header(png_ptr); ++ if (png_ptr->num_frames_read == 0) ++ { ++ if (png_ptr->chunk_name != png_IDAT) ++ png_error(png_ptr, "Not enough image data"); ++ } ++ else ++ { ++ if (png_ptr->chunk_name == png_IEND) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_ptr->chunk_name != png_fdAT) ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ bytes_to_skip = png_ptr->idat_size; ++ continue; ++ } ++ ++ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); ++ ++ png_ptr->idat_size -= 4; ++ } ++ } ++#else + while (png_ptr->idat_size == 0) + { + png_crc_finish(png_ptr, 0); +@@ -3961,7 +4170,7 @@ + if (png_ptr->chunk_name != png_IDAT) + png_error(png_ptr, "Not enough image data"); + } +- ++#endif /* PNG_READ_APNG_SUPPORTED */ + avail_in = png_ptr->IDAT_read_size; + + if (avail_in > png_ptr->idat_size) +@@ -4024,6 +4233,9 @@ + + png_ptr->mode |= PNG_AFTER_IDAT; + png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_ptr->num_frames_read++; ++#endif + + if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) + png_chunk_benign_error(png_ptr, "Extra compressed data"); +@@ -4469,4 +4681,80 @@ + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++/* This function is to be called after the main IDAT set has been read and ++ * before a new IDAT is read. It resets some parts of png_ptr ++ * to make them usable by the read functions again */ ++void /* PRIVATE */ ++png_read_reset(png_structp png_ptr) ++{ ++ png_ptr->mode &= ~PNG_HAVE_IDAT; ++ png_ptr->mode &= ~PNG_AFTER_IDAT; ++ png_ptr->row_number = 0; ++ png_ptr->pass = 0; ++} ++ ++void /* PRIVATE */ ++png_read_reinit(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_ptr->width = info_ptr->next_frame_width; ++ png_ptr->height = info_ptr->next_frame_height; ++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width); ++ png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, ++ png_ptr->width); ++ if (png_ptr->prev_row) ++ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); ++} ++ ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++/* same as png_read_reset() but for the progressive reader */ ++void /* PRIVATE */ ++png_progressive_read_reset(png_structp png_ptr) ++{ ++#ifdef PNG_READ_INTERLACING_SUPPORTED ++ /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ ++ ++ /* Start of interlace block */ ++ const int png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; ++ ++ /* Offset to next interlace block */ ++ const int png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; ++ ++ /* Start of interlace block in the y direction */ ++ const int png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; ++ ++ /* Offset to next interlace block in the y direction */ ++ const int png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; ++ ++ if (png_ptr->interlaced) ++ { ++ if (!(png_ptr->transformations & PNG_INTERLACE)) ++ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - ++ png_pass_ystart[0]) / png_pass_yinc[0]; ++ else ++ png_ptr->num_rows = png_ptr->height; ++ ++ png_ptr->iwidth = (png_ptr->width + ++ png_pass_inc[png_ptr->pass] - 1 - ++ png_pass_start[png_ptr->pass]) / ++ png_pass_inc[png_ptr->pass]; ++ } ++ else ++#endif /* PNG_READ_INTERLACING_SUPPORTED */ ++ { ++ png_ptr->num_rows = png_ptr->height; ++ png_ptr->iwidth = png_ptr->width; ++ } ++ png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED; ++ if (inflateReset(&(png_ptr->zstream)) != Z_OK) ++ png_error(png_ptr, "inflateReset failed"); ++ png_ptr->zstream.avail_in = 0; ++ png_ptr->zstream.next_in = 0; ++ png_ptr->zstream.next_out = png_ptr->row_buf; ++ png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth, ++ png_ptr->iwidth) + 1; ++} ++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ ++#endif /* PNG_READ_APNG_SUPPORTED */ + #endif /* PNG_READ_SUPPORTED */ +diff -Naru libpng-1.6.3.org/pngset.c libpng-1.6.3/pngset.c +--- libpng-1.6.3.org/pngset.c 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/pngset.c 2013-07-20 04:36:15.000000000 +0900 +@@ -239,6 +239,11 @@ + info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); + + info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); ++ ++#ifdef PNG_APNG_SUPPORTED ++ /* for non-animated png. this may be overwritten from an acTL chunk later */ ++ info_ptr->num_frames = 1; ++#endif + } + + #ifdef PNG_oFFs_SUPPORTED +@@ -1065,6 +1070,147 @@ + } + #endif /* PNG_sPLT_SUPPORTED */ + ++#ifdef PNG_APNG_SUPPORTED ++png_uint_32 PNGAPI ++png_set_acTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays) ++{ ++ png_debug1(1, "in %s storage function", "acTL"); ++ ++ if (png_ptr == NULL || info_ptr == NULL) ++ { ++ png_warning(png_ptr, ++ "Call to png_set_acTL() with NULL png_ptr " ++ "or info_ptr ignored"); ++ return (0); ++ } ++ if (num_frames == 0) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_frames zero"); ++ return (0); ++ } ++ if (num_frames > PNG_UINT_31_MAX) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_frames > 2^31-1"); ++ return (0); ++ } ++ if (num_plays > PNG_UINT_31_MAX) ++ { ++ png_warning(png_ptr, ++ "Ignoring attempt to set acTL with num_plays " ++ "> 2^31-1"); ++ return (0); ++ } ++ ++ info_ptr->num_frames = num_frames; ++ info_ptr->num_plays = num_plays; ++ ++ info_ptr->valid |= PNG_INFO_acTL; ++ ++ return (1); ++} ++ ++/* delay_num and delay_den can hold any 16-bit values including zero */ ++png_uint_32 PNGAPI ++png_set_next_frame_fcTL(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op) ++{ ++ png_debug1(1, "in %s storage function", "fcTL"); ++ ++ if (png_ptr == NULL || info_ptr == NULL) ++ { ++ png_warning(png_ptr, ++ "Call to png_set_fcTL() with NULL png_ptr or info_ptr " ++ "ignored"); ++ return (0); ++ } ++ ++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ if (blend_op == PNG_BLEND_OP_OVER) ++ { ++ if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) && ++ !(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) ++ { ++ png_warning(png_ptr, "PNG_BLEND_OP_OVER is meaningless " ++ "and wasteful for opaque images, ignored"); ++ blend_op = PNG_BLEND_OP_SOURCE; ++ } ++ } ++ ++ info_ptr->next_frame_width = width; ++ info_ptr->next_frame_height = height; ++ info_ptr->next_frame_x_offset = x_offset; ++ info_ptr->next_frame_y_offset = y_offset; ++ info_ptr->next_frame_delay_num = delay_num; ++ info_ptr->next_frame_delay_den = delay_den; ++ info_ptr->next_frame_dispose_op = dispose_op; ++ info_ptr->next_frame_blend_op = blend_op; ++ ++ info_ptr->valid |= PNG_INFO_fcTL; ++ ++ return (1); ++} ++ ++void /* PRIVATE */ ++png_ensure_fcTL_is_valid(png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op) ++{ ++ if (width > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid width in fcTL (> 2^31-1)"); ++ if (height > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid height in fcTL (> 2^31-1)"); ++ if (x_offset > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)"); ++ if (y_offset > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)"); ++ if (width + x_offset > png_ptr->first_frame_width || ++ height + y_offset > png_ptr->first_frame_height) ++ png_error(png_ptr, "dimensions of a frame are greater than" ++ "the ones in IHDR"); ++ ++ if (dispose_op != PNG_DISPOSE_OP_NONE && ++ dispose_op != PNG_DISPOSE_OP_BACKGROUND && ++ dispose_op != PNG_DISPOSE_OP_PREVIOUS) ++ png_error(png_ptr, "invalid dispose_op in fcTL"); ++ ++ if (blend_op != PNG_BLEND_OP_SOURCE && ++ blend_op != PNG_BLEND_OP_OVER) ++ png_error(png_ptr, "invalid blend_op in fcTL"); ++ ++ PNG_UNUSED(delay_num) ++ PNG_UNUSED(delay_den) ++} ++ ++png_uint_32 PNGAPI ++png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr, ++ png_byte is_hidden) ++{ ++ png_debug(1, "in png_first_frame_is_hidden()"); ++ ++ if (png_ptr == NULL) ++ return 0; ++ ++ if (is_hidden) ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ else ++ png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN; ++ ++ PNG_UNUSED(info_ptr) ++ ++ return 1; ++} ++#endif /* PNG_APNG_SUPPORTED */ ++ + #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED + static png_byte + check_location(png_const_structrp png_ptr, int location) +diff -Naru libpng-1.6.3.org/pngstruct.h libpng-1.6.3/pngstruct.h +--- libpng-1.6.3.org/pngstruct.h 2013-07-20 04:14:39.000000000 +0900 ++++ libpng-1.6.3/pngstruct.h 2013-07-20 04:33:18.000000000 +0900 +@@ -409,6 +409,27 @@ + png_byte filter_type; + #endif + ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 apng_flags; ++ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ ++ png_uint_32 first_frame_width; ++ png_uint_32 first_frame_height; ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_uint_32 num_frames_read; /* incremented after all image data of */ ++ /* a frame is read */ ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ ++ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ ++#endif ++#endif ++ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_uint_32 num_frames_to_write; ++ png_uint_32 num_frames_written; ++#endif ++#endif /* PNG_APNG_SUPPORTED */ ++ + /* New members added in libpng-1.2.0 */ + + /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ +diff -Naru libpng-1.6.3.org/pngtest.c libpng-1.6.3/pngtest.c +--- libpng-1.6.3.org/pngtest.c 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/pngtest.c 2013-07-20 04:33:18.000000000 +0900 +@@ -838,6 +838,10 @@ + png_uint_32 width, height; + int num_pass, pass; + int bit_depth, color_type; ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 num_frames; ++ png_uint_32 num_plays; ++#endif + + row_buf = NULL; + error_parameters.file_name = inname; +@@ -1288,6 +1292,20 @@ + } + } + #endif ++#ifdef PNG_APNG_SUPPORTED ++ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) ++ { ++ if (png_get_acTL(read_ptr, read_info_ptr, &num_frames, &num_plays)) ++ { ++ png_byte is_hidden; ++ pngtest_debug2("Handling acTL chunks (frames %ld, plays %ld)", ++ num_frames, num_plays); ++ png_set_acTL(write_ptr, write_info_ptr, num_frames, num_plays); ++ is_hidden = png_get_first_frame_is_hidden(read_ptr, read_info_ptr); ++ png_set_first_frame_is_hidden(write_ptr, write_info_ptr, is_hidden); ++ } ++ } ++#endif + #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED + { + png_unknown_chunkp unknowns; +@@ -1353,6 +1371,89 @@ + t_misc += (t_stop - t_start); + t_start = t_stop; + #endif ++#ifdef PNG_APNG_SUPPORTED ++ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) ++ { ++ png_uint_32 frame; ++ for (frame = 0; frame < num_frames; frame++) ++ { ++ png_uint_32 frame_width; ++ png_uint_32 frame_height; ++ png_uint_32 x_offset; ++ png_uint_32 y_offset; ++ png_uint_16 delay_num; ++ png_uint_16 delay_den; ++ png_byte dispose_op; ++ png_byte blend_op; ++ png_read_frame_head(read_ptr, read_info_ptr); ++ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_fcTL)) ++ { ++ png_get_next_frame_fcTL(read_ptr, read_info_ptr, ++ &frame_width, &frame_height, ++ &x_offset, &y_offset, ++ &delay_num, &delay_den, ++ &dispose_op, &blend_op); ++ } ++ else ++ { ++ frame_width = width; ++ frame_height = height; ++ x_offset = 0; ++ y_offset = 0; ++ delay_num = 1; ++ delay_den = 1; ++ dispose_op = PNG_DISPOSE_OP_NONE; ++ blend_op = PNG_BLEND_OP_SOURCE; ++ } ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_write_frame_head(write_ptr, write_info_ptr, (png_bytepp)&row_buf, ++ frame_width, frame_height, ++ x_offset, y_offset, ++ delay_num, delay_den, ++ dispose_op, blend_op); ++#endif ++ for (pass = 0; pass < num_pass; pass++) ++ { ++ pngtest_debug1("Writing row data for pass %d", pass); ++ for (y = 0; y < frame_height; y++) ++ { ++#ifndef SINGLE_ROWBUF_ALLOC ++ pngtest_debug2("Allocating row buffer (pass %d, y = %ld)...", pass, y); ++ row_buf = (png_bytep)png_malloc(read_ptr, ++ png_get_rowbytes(read_ptr, read_info_ptr)); ++ pngtest_debug2("0x%08lx (%ld bytes)", (unsigned long)row_buf, ++ png_get_rowbytes(read_ptr, read_info_ptr)); ++#endif /* !SINGLE_ROWBUF_ALLOC */ ++ png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1); ++ ++#ifdef PNG_WRITE_SUPPORTED ++#ifdef PNGTEST_TIMING ++ t_stop = (float)clock(); ++ t_decode += (t_stop - t_start); ++ t_start = t_stop; ++#endif ++ png_write_rows(write_ptr, (png_bytepp)&row_buf, 1); ++#ifdef PNGTEST_TIMING ++ t_stop = (float)clock(); ++ t_encode += (t_stop - t_start); ++ t_start = t_stop; ++#endif ++#endif /* PNG_WRITE_SUPPORTED */ ++ ++#ifndef SINGLE_ROWBUF_ALLOC ++ pngtest_debug2("Freeing row buffer (pass %d, y = %ld)", pass, y); ++ png_free(read_ptr, row_buf); ++ row_buf = NULL; ++#endif /* !SINGLE_ROWBUF_ALLOC */ ++ } ++ } ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_write_frame_tail(write_ptr, write_info_ptr); ++#endif ++ } ++ } ++ else ++#endif + for (pass = 0; pass < num_pass; pass++) + { + pngtest_debug1("Writing row data for pass %d", pass); +diff -Naru libpng-1.6.3.org/pngwrite.c libpng-1.6.3/pngwrite.c +--- libpng-1.6.3.org/pngwrite.c 2013-07-20 04:14:51.000000000 +0900 ++++ libpng-1.6.3/pngwrite.c 2013-07-20 04:33:18.000000000 +0900 +@@ -127,6 +127,10 @@ + * application continues writing the PNG. So check the 'invalid' flag here + * too. + */ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if (info_ptr->valid & PNG_INFO_acTL) ++ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); ++#endif + #ifdef PNG_GAMMA_SUPPORTED + # ifdef PNG_WRITE_gAMA_SUPPORTED + if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && +@@ -357,6 +361,11 @@ + png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); + #endif + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written != png_ptr->num_frames_to_write) ++ png_error(png_ptr, "Not enough frames written"); ++#endif ++ + /* See if user wants us to write information chunks */ + if (info_ptr != NULL) + { +@@ -1560,6 +1569,43 @@ + } + #endif + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++void PNGAPI ++png_write_frame_head(png_structp png_ptr, png_infop info_ptr, ++ png_bytepp row_pointers, png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op) ++{ ++ png_debug(1, "in png_write_frame_head"); ++ ++ /* there is a chance this has been set after png_write_info was called, ++ * so it would be set but not written. is there a way to be sure? */ ++ if (!(info_ptr->valid & PNG_INFO_acTL)) ++ png_error(png_ptr, "png_write_frame_head(): acTL not set"); ++ ++ png_write_reset(png_ptr); ++ ++ png_write_reinit(png_ptr, info_ptr, width, height); ++ ++ if ( !(png_ptr->num_frames_written == 0 && ++ (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) ) ++ png_write_fcTL(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ PNG_UNUSED(row_pointers) ++} ++ ++void PNGAPI ++png_write_frame_tail(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_debug(1, "in png_write_frame_tail"); ++ ++ png_ptr->num_frames_written++; ++ ++ PNG_UNUSED(info_ptr) ++} ++#endif /* PNG_WRITE_APNG_SUPPORTED */ + + #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED + #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */ +diff -Naru libpng-1.6.3.org/pngwutil.c libpng-1.6.3/pngwutil.c +--- libpng-1.6.3.org/pngwutil.c 2013-07-20 04:14:39.000000000 +0900 ++++ libpng-1.6.3/pngwutil.c 2013-07-20 04:33:18.000000000 +0900 +@@ -898,6 +898,11 @@ + /* Write the chunk */ + png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_ptr->first_frame_width = width; ++ png_ptr->first_frame_height = height; ++#endif ++ + if (!(png_ptr->do_filter)) + { + if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || +@@ -1076,7 +1081,14 @@ + optimize_cmf(data, png_image_size(png_ptr)); + # endif + ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++# endif + png_write_complete_chunk(png_ptr, png_IDAT, data, size); ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++# endif /* PNG_WRITE_APNG_SUPPORTED */ + png_ptr->mode |= PNG_HAVE_IDAT; + + png_ptr->zstream.next_out = data; +@@ -1122,7 +1134,15 @@ + optimize_cmf(data, png_image_size(png_ptr)); + # endif + ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++# endif + png_write_complete_chunk(png_ptr, png_IDAT, data, size); ++# ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++# endif /* PNG_WRITE_APNG_SUPPORTED */ ++ + png_ptr->zstream.avail_out = 0; + png_ptr->zstream.next_out = NULL; + png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; +@@ -1934,6 +1954,82 @@ + } + #endif + ++#ifdef PNG_WRITE_APNG_SUPPORTED ++void /* PRIVATE */ ++png_write_acTL(png_structp png_ptr, ++ png_uint_32 num_frames, png_uint_32 num_plays) ++{ ++ png_byte buf[8]; ++ ++ png_debug(1, "in png_write_acTL"); ++ ++ png_ptr->num_frames_to_write = num_frames; ++ ++ if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ++ num_frames--; ++ ++ png_save_uint_32(buf, num_frames); ++ png_save_uint_32(buf + 4, num_plays); ++ ++ png_write_complete_chunk(png_ptr, png_acTL, buf, (png_size_t)8); ++} ++ ++void /* PRIVATE */ ++png_write_fcTL(png_structp png_ptr, png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op) ++{ ++ png_byte buf[26]; ++ ++ png_debug(1, "in png_write_fcTL"); ++ ++ if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0)) ++ png_error(png_ptr, "x and/or y offset for the first frame aren't 0"); ++ if (png_ptr->num_frames_written == 0 && ++ (width != png_ptr->first_frame_width || ++ height != png_ptr->first_frame_height)) ++ png_error(png_ptr, "width and/or height in the first frame's fcTL " ++ "don't match the ones in IHDR"); ++ ++ /* more error checking */ ++ png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ png_save_uint_32(buf, png_ptr->next_seq_num); ++ png_save_uint_32(buf + 4, width); ++ png_save_uint_32(buf + 8, height); ++ png_save_uint_32(buf + 12, x_offset); ++ png_save_uint_32(buf + 16, y_offset); ++ png_save_uint_16(buf + 20, delay_num); ++ png_save_uint_16(buf + 22, delay_den); ++ buf[24] = dispose_op; ++ buf[25] = blend_op; ++ ++ png_write_complete_chunk(png_ptr, png_fcTL, buf, (png_size_t)26); ++ ++ png_ptr->next_seq_num++; ++} ++ ++void /* PRIVATE */ ++png_write_fdAT(png_structp png_ptr, ++ png_const_bytep data, png_size_t length) ++{ ++ png_byte buf[4]; ++ ++ png_write_chunk_header(png_ptr, png_fdAT, (png_uint_32)(4 + length)); ++ ++ png_save_uint_32(buf, png_ptr->next_seq_num); ++ png_write_chunk_data(png_ptr, buf, 4); ++ ++ png_write_chunk_data(png_ptr, data, length); ++ ++ png_write_chunk_end(png_ptr); ++ ++ png_ptr->next_seq_num++; ++} ++#endif /* PNG_WRITE_APNG_SUPPORTED */ ++ + /* Initializes the row writing capability of libpng */ + void /* PRIVATE */ + png_write_start_row(png_structrp png_ptr) +@@ -3020,4 +3116,39 @@ + } + #endif + } ++ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++void /* PRIVATE */ ++png_write_reset(png_structp png_ptr) ++{ ++ png_ptr->row_number = 0; ++ png_ptr->pass = 0; ++ png_ptr->mode &= ~PNG_HAVE_IDAT; ++} ++ ++void /* PRIVATE */ ++png_write_reinit(png_structp png_ptr, png_infop info_ptr, ++ png_uint_32 width, png_uint_32 height) ++{ ++ if (png_ptr->num_frames_written == 0 && ++ (width != png_ptr->first_frame_width || ++ height != png_ptr->first_frame_height)) ++ png_error(png_ptr, "width and/or height in the first frame's fcTL " ++ "don't match the ones in IHDR"); ++ if (width > png_ptr->first_frame_width || ++ height > png_ptr->first_frame_height) ++ png_error(png_ptr, "width and/or height for a frame greater than" ++ "the ones in IHDR"); ++ ++ png_set_IHDR(png_ptr, info_ptr, width, height, ++ info_ptr->bit_depth, info_ptr->color_type, ++ info_ptr->interlace_type, info_ptr->compression_type, ++ info_ptr->filter_type); ++ ++ png_ptr->width = width; ++ png_ptr->height = height; ++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width); ++ png_ptr->usr_width = png_ptr->width; ++} ++#endif /* PNG_WRITE_APNG_SUPPORTED */ + #endif /* PNG_WRITE_SUPPORTED */ +diff -Naru libpng-1.6.3.org/scripts/symbols.def libpng-1.6.3/scripts/symbols.def +--- libpng-1.6.3.org/scripts/symbols.def 2013-07-20 04:16:56.000000000 +0900 ++++ libpng-1.6.3/scripts/symbols.def 2013-07-20 04:33:18.000000000 +0900 +@@ -249,3 +249,23 @@ + png_set_check_for_invalid_index @242 + png_get_palette_max @243 + png_set_option @244 ++ png_get_acTL @245 ++ png_set_acTL @246 ++ png_get_num_frames @247 ++ png_get_num_plays @248 ++ png_get_next_frame_fcTL @249 ++ png_set_next_frame_fcTL @250 ++ png_get_next_frame_width @251 ++ png_get_next_frame_height @252 ++ png_get_next_frame_x_offset @253 ++ png_get_next_frame_y_offset @254 ++ png_get_next_frame_delay_num @255 ++ png_get_next_frame_delay_den @256 ++ png_get_next_frame_dispose_op @257 ++ png_get_next_frame_blend_op @258 ++ png_get_first_frame_is_hidden @259 ++ png_set_first_frame_is_hidden @260 ++ png_read_frame_head @261 ++ png_set_progressive_frame_fn @262 ++ png_write_frame_head @263 ++ png_write_frame_tail @264 diff --git a/stage3/patches/common/libtheora-1.1.1-png16.patch b/stage3/patches/common/libtheora-1.1.1-png16.patch new file mode 100644 index 0000000..d74497f --- /dev/null +++ b/stage3/patches/common/libtheora-1.1.1-png16.patch @@ -0,0 +1,22 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2014-05-19 +Initial Package Version: 1.1.1 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Fix compile error with libpng-1.6 + +diff -Naur libtheora-1.1.1.orig/examples/png2theora.c libtheora-1.1.1.new/examples/png2theora.c +--- libtheora-1.1.1.orig/examples/png2theora.c 2009-08-22 14:14:04.000000000 -0400 ++++ libtheora-1.1.1.new/examples/png2theora.c 2014-05-19 19:32:31.851987654 -0400 +@@ -462,9 +462,9 @@ + png_set_strip_alpha(png_ptr); + + row_data = (png_bytep)png_malloc(png_ptr, +- 3*height*width*png_sizeof(*row_data)); ++ 3*height*width*sizeof(*row_data)); + row_pointers = (png_bytep *)png_malloc(png_ptr, +- height*png_sizeof(*row_pointers)); ++ height*sizeof(*row_pointers)); + for(y = 0; y < height; y++) { + row_pointers[y] = row_data + y*(3*width); + } diff --git a/stage3/patches/common/libtirpc-0.2.2-remove-nis-2.patch b/stage3/patches/common/libtirpc-0.2.2-remove-nis-2.patch new file mode 100644 index 0000000..b532e27 --- /dev/null +++ b/stage3/patches/common/libtirpc-0.2.2-remove-nis-2.patch @@ -0,0 +1,40 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2011-11-19 +Initial Package Version: 0.2.2 +Upstream Status: Not submitted +Origin: Upstream and LFS +Description: This patch contains removes nis references that + have been removed from glibc. + +diff -Naur libtirpc-0.2.2.orig/src/Makefile.am libtirpc-0.2.2/src/Makefile.am +--- libtirpc-0.2.2.orig/src/Makefile.am 2011-05-02 07:10:40.000000000 -0500 ++++ libtirpc-0.2.2/src/Makefile.am 2011-11-19 19:43:59.000000000 -0600 +@@ -50,7 +50,7 @@ + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ + svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c des_crypt.c ++ auth_time.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c +diff -Naur libtirpc-0.2.2.orig/src/rpc_soc.c libtirpc-0.2.2/src/rpc_soc.c +--- libtirpc-0.2.2.orig/src/rpc_soc.c 2011-05-02 07:10:40.000000000 -0500 ++++ libtirpc-0.2.2/src/rpc_soc.c 2011-11-19 19:46:22.000000000 -0600 +@@ -519,6 +519,7 @@ + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). + */ ++#ifdef NEVER + AUTH * + authdes_create(servername, window, syncaddr, ckey) + char *servername; /* network name of server */ +@@ -546,6 +547,7 @@ + dummy = authdes_seccreate(servername, window, NULL, ckey); + return (dummy); + } ++#endif + + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() + diff --git a/stage3/patches/common/mysql-5.5.28-embedded_library_shared-1.patch b/stage3/patches/common/mysql-5.5.28-embedded_library_shared-1.patch new file mode 100644 index 0000000..2b2c9aa --- /dev/null +++ b/stage3/patches/common/mysql-5.5.28-embedded_library_shared-1.patch @@ -0,0 +1,51 @@ +Submitted By: Ragnar Thomsen (rthomsen at linuxfromscratch dot org) +Date: 2012-03-21 +Initial Package Version: 5.5.17 +Origin: Gentoo Git +Description: Fixes mysql to build a shared version of the embedded server library (libmysqld.so) used by amarok2 + +=== modified file 'cmake/libutils.cmake' +--- a/cmake/libutils.cmake 2010-01-26 12:47:34 +0000 ++++ b/cmake/libutils.cmake 2010-03-04 21:19:38 +0000 +@@ -268,6 +268,16 @@ MACRO(MERGE_LIBRARIES) + MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) + ENDIF() + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") ++ ++ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) ++ # Do not allow undefined symbols in shared libraries ++ GET_TARGET_PROPERTY(TARGET_LINK_FLAGS ${TARGET} LINK_FLAGS) ++ IF(NOT TARGET_LINK_FLAGS) ++ SET(TARGET_LINK_FLAGS) ++ ENDIF() ++ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ++ "${TARGET_LINK_FLAGS} ${LINK_FLAG_NO_UNDEFINED}") ++ ENDIF() + ENDMACRO() + + FUNCTION(GET_DEPENDEND_OS_LIBS target result) + +=== modified file 'libmysqld/CMakeLists.txt' +--- a/libmysqld/CMakeLists.txt 2010-02-20 19:40:03 +0000 ++++ b/libmysqld/CMakeLists.txt 2010-03-04 21:19:38 +0000 +@@ -138,7 +138,17 @@ IF(MSVC) + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) + ENDIF() + +-IF(MSVC AND NOT DISABLE_SHARED) +- MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT Embedded) ++IF(NOT DISABLE_SHARED) ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}) ++ IF(UNIX) ++ # Name the shared library, handle versioning (provides same api as client library ++ # hence the same version) ++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES ++ OUTPUT_NAME mysqld ++ VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0" ++ SOVERSION "${SHARED_LIB_MAJOR_VERSION}") ++ # Clean direct output flags, as 2 targets have the same base name (libmysqld) ++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ ENDIF() + ENDIF() diff --git a/stage3/patches/common/mysql-5.5.28-fix_client_only-1.patch b/stage3/patches/common/mysql-5.5.28-fix_client_only-1.patch new file mode 100644 index 0000000..b87ab7f --- /dev/null +++ b/stage3/patches/common/mysql-5.5.28-fix_client_only-1.patch @@ -0,0 +1,23 @@ +Submitted By: Ragnar Thomsen (rthomsen at linuxfromscratch dot org) +Date: 2012-08-15 +Initial Package Version: 5.5.27 +Origin: MySQL Bugzilla +Description: Fixes building MySQL with the -DWITHOUT_SERVER=ON option + +--- mysql/CMakeLists.txt 2012-08-03 16:37:52.234629566 -0400 ++++ mysql.new/CMakeLists.txt 2012-08-03 16:35:47.797340969 -0400 +@@ -320,6 +320,13 @@ + IF(UNIX) + ADD_SUBDIRECTORY(man) + ENDIF() ++ELSE() ++ ADD_SUBDIRECTORY(client) ++ ADD_SUBDIRECTORY(sql/share) ++ ADD_SUBDIRECTORY(scripts) ++ IF(UNIX) ++ ADD_SUBDIRECTORY(man) ++ ENDIF() + ENDIF() + + INCLUDE(cmake/abi_check.cmake) + diff --git a/stage3/patches/common/openjade-1.3.2-gcc_4.6-1.patch b/stage3/patches/common/openjade-1.3.2-gcc_4.6-1.patch new file mode 100644 index 0000000..63e32d6 --- /dev/null +++ b/stage3/patches/common/openjade-1.3.2-gcc_4.6-1.patch @@ -0,0 +1,113 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2011-03-30 +Initial Package Version: 1.3.2 +Upstream Status: Not submitted +Origin: Matt Burgess +Description: Fixes compilation issues with GCC-4.6.0. + +diff -Naur openjade-1.3.2.orig/jade/TeXFOTBuilder.cxx openjade-1.3.2/jade/TeXFOTBuilder.cxx +--- openjade-1.3.2.orig/jade/TeXFOTBuilder.cxx 2002-01-15 10:35:37.000000000 +0000 ++++ openjade-1.3.2/jade/TeXFOTBuilder.cxx 2011-03-30 09:39:46.000000000 +0000 +@@ -75,6 +75,7 @@ + virtual void end(TeXFOTBuilder &) const = 0; + }; + class PageFloatFlowObj : public TeXCompoundExtensionFlowObj { ++ public: + void start(TeXFOTBuilder &fotb, const NodePtr &) const { + fotb.startPageFloat(nic_); + } +@@ -88,12 +89,14 @@ + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; + StringC placement; + }; + class PageFootnoteFlowObj : public TeXCompoundExtensionFlowObj { ++ public: + void start(TeXFOTBuilder &fotb, const NodePtr &) const { + fotb.startPageFootnote(); + } +@@ -101,6 +104,7 @@ + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// +diff -Naur openjade-1.3.2.orig/jade/TransformFOTBuilder.cxx openjade-1.3.2/jade/TransformFOTBuilder.cxx +--- openjade-1.3.2.orig/jade/TransformFOTBuilder.cxx 2002-12-01 14:55:51.000000000 +0000 ++++ openjade-1.3.2/jade/TransformFOTBuilder.cxx 2011-03-30 09:38:48.000000000 +0000 +@@ -51,6 +51,7 @@ + value.convertString(name_); + } + ExtensionFlowObj *copy() const { return new EntityRefFlowObj(*this); } ++ EntityRefFlowObj() {} + private: + StringC name_; + }; +@@ -66,10 +67,12 @@ + value.convertString(data_); + } + ExtensionFlowObj *copy() const { return new ProcessingInstructionFlowObj(*this); } ++ ProcessingInstructionFlowObj() {} + private: + StringC data_; + }; + class EmptyElementFlowObj : public TransformExtensionFlowObj { ++ public: + void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const { + if (nic_.gi.size() > 0) + fotb.emptyElement(nic_); +@@ -98,10 +101,12 @@ + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; + class ElementFlowObj : public TransformCompoundExtensionFlowObj { ++ public: + void start(TransformFOTBuilder &fotb, const NodePtr &nd) const { + if (nic_.gi.size() > 0) + fotb.startElement(nic_); +@@ -133,10 +138,12 @@ + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; + class EntityFlowObj : public TransformCompoundExtensionFlowObj { ++ public: + void start(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.startEntity(systemId_); + } +@@ -150,10 +157,12 @@ + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ EntityFlowObj() {} + private: + StringC systemId_; + }; + class DocumentTypeFlowObj : public TransformExtensionFlowObj { ++ public: + void atomic(TransformFOTBuilder &fotb, const NodePtr &nd) const { + fotb.documentType(nic_); + } +@@ -174,6 +183,7 @@ + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; + diff --git a/stage3/patches/common/openjade-1.3.2-perl-fix.patch b/stage3/patches/common/openjade-1.3.2-perl-fix.patch new file mode 100644 index 0000000..bbff5a2 --- /dev/null +++ b/stage3/patches/common/openjade-1.3.2-perl-fix.patch @@ -0,0 +1,22 @@ +diff -ur openjade-1.3.2.orig/msggen.pl openjade-1.3.2.new/msggen.pl +--- openjade-1.3.2.orig/msggen.pl 2002-10-20 17:47:23.000000000 -0400 ++++ openjade-1.3.2.new/msggen.pl 2012-09-09 12:20:32.827758524 -0400 +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,8 @@ + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++ ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + diff --git a/stage3/patches/common/openssl-1.0.1c-fix_manpages-1.patch b/stage3/patches/common/openssl-1.0.1c-fix_manpages-1.patch new file mode 100644 index 0000000..0a300f3 --- /dev/null +++ b/stage3/patches/common/openssl-1.0.1c-fix_manpages-1.patch @@ -0,0 +1,1920 @@ +Submitted By: Robert Connolly <robert at linuxfromscratch dot org> +Date: 2005-11-13 +Initial Package Version: 0.9.8a +Upstream Status: Submitted upstream +Origin: Anderson Lizardo +Description: This patch fixes conflicts between man pages + installed by OpenSSL and those found on other + packages (particulary Shadow, Perl, and + Man-pages). It also fixes syntax errors on some + POD files that generates slightly broken man + pages. Rediffed for 1.0.0a by Ken Moffat + +diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c +--- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000 ++++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100 +@@ -196,7 +196,7 @@ + int do_not_lock; + + /* +- * (Based on the rand(3) manpage) ++ * (Based on the openssl_rand(3) manpage) + * + * The input is chopped up into units of 20 bytes (or less for + * the last block). Each of these blocks is run through the hash +@@ -361,7 +361,7 @@ + num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2); + + /* +- * (Based on the rand(3) manpage:) ++ * (Based on the openssl_rand(3) manpage) + * + * For each group of 10 bytes (or less), we do the following: + * +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod +--- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -0,0 +1,82 @@ ++=pod ++ ++=head1 NAME ++ ++openssl-passwd - compute password hashes ++ ++=head1 SYNOPSIS ++ ++B<openssl passwd> ++[B<-crypt>] ++[B<-1>] ++[B<-apr1>] ++[B<-salt> I<string>] ++[B<-in> I<file>] ++[B<-stdin>] ++[B<-noverify>] ++[B<-quiet>] ++[B<-table>] ++{I<password>} ++ ++=head1 DESCRIPTION ++ ++The B<passwd> command computes the hash of a password typed at ++run-time or the hash of each password in a list. The password list is ++taken from the named file for option B<-in file>, from stdin for ++option B<-stdin>, or from the command line, or from the terminal otherwise. ++The Unix standard algorithm B<crypt> and the MD5-based BSD password ++algorithm B<1> and its Apache variant B<apr1> are available. ++ ++=head1 OPTIONS ++ ++=over 4 ++ ++=item B<-crypt> ++ ++Use the B<crypt> algorithm (default). ++ ++=item B<-1> ++ ++Use the MD5 based BSD password algorithm B<1>. ++ ++=item B<-apr1> ++ ++Use the B<apr1> algorithm (Apache variant of the BSD algorithm). ++ ++=item B<-salt> I<string> ++ ++Use the specified salt. ++When reading a password from the terminal, this implies B<-noverify>. ++ ++=item B<-in> I<file> ++ ++Read passwords from I<file>. ++ ++=item B<-stdin> ++ ++Read passwords from B<stdin>. ++ ++=item B<-noverify> ++ ++Don't verify when reading a password from the terminal. ++ ++=item B<-quiet> ++ ++Don't output warnings when passwords given at the command line are truncated. ++ ++=item B<-table> ++ ++In the output list, prepend the cleartext password and a TAB character ++to each password hash. ++ ++=back ++ ++=head1 EXAMPLES ++ ++B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>. ++ ++B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>. ++ ++B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. ++ ++=cut +diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod +--- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000 ++++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -163,7 +163,7 @@ + + Online Certificate Status Protocol utility. + +-=item L<B<passwd>|passwd(1)> ++=item L<B<passwd>|openssl-passwd(1)> + + Generation of hashed passwords. + +@@ -401,7 +401,7 @@ + L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>, + L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>, + L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, +-L<passwd(1)|passwd(1)>, ++L<openssl-passwd(1)|openssl-passwd(1)>, + L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, + L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, + L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, +diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod +--- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100 ++++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 +@@ -1,82 +0,0 @@ +-=pod +- +-=head1 NAME +- +-passwd - compute password hashes +- +-=head1 SYNOPSIS +- +-B<openssl passwd> +-[B<-crypt>] +-[B<-1>] +-[B<-apr1>] +-[B<-salt> I<string>] +-[B<-in> I<file>] +-[B<-stdin>] +-[B<-noverify>] +-[B<-quiet>] +-[B<-table>] +-{I<password>} +- +-=head1 DESCRIPTION +- +-The B<passwd> command computes the hash of a password typed at +-run-time or the hash of each password in a list. The password list is +-taken from the named file for option B<-in file>, from stdin for +-option B<-stdin>, or from the command line, or from the terminal otherwise. +-The Unix standard algorithm B<crypt> and the MD5-based BSD password +-algorithm B<1> and its Apache variant B<apr1> are available. +- +-=head1 OPTIONS +- +-=over 4 +- +-=item B<-crypt> +- +-Use the B<crypt> algorithm (default). +- +-=item B<-1> +- +-Use the MD5 based BSD password algorithm B<1>. +- +-=item B<-apr1> +- +-Use the B<apr1> algorithm (Apache variant of the BSD algorithm). +- +-=item B<-salt> I<string> +- +-Use the specified salt. +-When reading a password from the terminal, this implies B<-noverify>. +- +-=item B<-in> I<file> +- +-Read passwords from I<file>. +- +-=item B<-stdin> +- +-Read passwords from B<stdin>. +- +-=item B<-noverify> +- +-Don't verify when reading a password from the terminal. +- +-=item B<-quiet> +- +-Don't output warnings when passwords given at the command line are truncated. +- +-=item B<-table> +- +-In the output list, prepend the cleartext password and a TAB character +-to each password hash. +- +-=back +- +-=head1 EXAMPLES +- +-B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>. +- +-B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>. +- +-B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. +- +-=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -90,7 +90,7 @@ + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)> ++L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod +--- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -167,7 +167,7 @@ + =head1 SEE ALSO + + L<bn_internal(3)|bn_internal(3)>, +-L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>, + L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>, + L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>, +diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -45,7 +45,7 @@ + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -37,7 +37,7 @@ + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, +-L<CONF_modules_load_file(3), CONF_modules_load_file(3)> ++L<CONF_modules_load_file(3)|CONF_modules_load_file(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -51,7 +51,7 @@ + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, +-L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)> ++L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod +--- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -46,7 +46,7 @@ + + =item AUXILIARY FUNCTIONS + +-L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> + + =item INPUT/OUTPUT, DATA ENCODING +diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod +--- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -115,7 +115,7 @@ + the key; it is used to speed the encryption process. + + DES_random_key() generates a random key. The PRNG must be seeded +-prior to using this function (see L<rand(3)|rand(3)>). If the PRNG ++prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG + could not generate a secure key, 0 is returned. + + Before a DES key can be used, it must be converted into the +@@ -317,7 +317,7 @@ + + =head1 SEE ALSO + +-crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)> ++crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -40,7 +40,7 @@ + + =head1 SEE ALSO + +-L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)> ++L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -59,7 +59,7 @@ + + =head1 SEE ALSO + +-L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DH_free(3)|DH_free(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod +--- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -67,8 +67,8 @@ + + =head1 SEE ALSO + +-L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>, +-L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, ++L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, + L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, + L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, + L<DH_generate_parameters(3)|DH_generate_parameters(3)>, +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -36,7 +36,7 @@ + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_SIG_new(3)|DSA_SIG_new(3)>, + L<DSA_sign(3)|DSA_sign(3)> + +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -24,7 +24,7 @@ + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_generate_parameters(3)|DSA_generate_parameters(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -90,7 +90,7 @@ + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_free(3)|DSA_free(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod +--- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -100,7 +100,7 @@ + + =head1 SEE ALSO + +-L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, ++L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>, + L<DSA_new(3)|DSA_new(3)>, + L<DSA_size(3)|DSA_size(3)>, +diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod +--- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100 +@@ -55,7 +55,7 @@ + + =head1 SEE ALSO + +-L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, ++L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<DSA_do_sign(3)|DSA_do_sign(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod +--- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -594,6 +594,6 @@ + + =head1 SEE ALSO + +-L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)> ++L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -20,7 +20,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -60,7 +60,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, + L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, + L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> + L<ERR_print_errors(3)|ERR_print_errors(3)> +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -61,7 +61,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, + L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -41,7 +41,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -35,7 +35,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -43,7 +43,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod +--- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 +@@ -1,187 +0,0 @@ +-=pod +- +-=head1 NAME +- +-err - error codes +- +-=head1 SYNOPSIS +- +- #include <openssl/err.h> +- +- unsigned long ERR_get_error(void); +- unsigned long ERR_peek_error(void); +- unsigned long ERR_get_error_line(const char **file, int *line); +- unsigned long ERR_peek_error_line(const char **file, int *line); +- unsigned long ERR_get_error_line_data(const char **file, int *line, +- const char **data, int *flags); +- unsigned long ERR_peek_error_line_data(const char **file, int *line, +- const char **data, int *flags); +- +- int ERR_GET_LIB(unsigned long e); +- int ERR_GET_FUNC(unsigned long e); +- int ERR_GET_REASON(unsigned long e); +- +- void ERR_clear_error(void); +- +- char *ERR_error_string(unsigned long e, char *buf); +- const char *ERR_lib_error_string(unsigned long e); +- const char *ERR_func_error_string(unsigned long e); +- const char *ERR_reason_error_string(unsigned long e); +- +- void ERR_print_errors(BIO *bp); +- void ERR_print_errors_fp(FILE *fp); +- +- void ERR_load_crypto_strings(void); +- void ERR_free_strings(void); +- +- void ERR_remove_state(unsigned long pid); +- +- void ERR_put_error(int lib, int func, int reason, const char *file, +- int line); +- void ERR_add_error_data(int num, ...); +- +- void ERR_load_strings(int lib,ERR_STRING_DATA str[]); +- unsigned long ERR_PACK(int lib, int func, int reason); +- int ERR_get_next_error_library(void); +- +-=head1 DESCRIPTION +- +-When a call to the OpenSSL library fails, this is usually signalled +-by the return value, and an error code is stored in an error queue +-associated with the current thread. The B<err> library provides +-functions to obtain these error codes and textual error messages. +- +-The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to +-access error codes. +- +-Error codes contain information about where the error occurred, and +-what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to +-extract this information. A method to obtain human-readable error +-messages is described in L<ERR_error_string(3)|ERR_error_string(3)>. +- +-L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the +-error queue. +- +-Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to +-avoid memory leaks when threads are terminated. +- +-=head1 ADDING NEW ERROR CODES TO OPENSSL +- +-See L<ERR_put_error(3)> if you want to record error codes in the +-OpenSSL error system from within your application. +- +-The remainder of this section is of interest only if you want to add +-new error codes to OpenSSL or add error codes from external libraries. +- +-=head2 Reporting errors +- +-Each sub-library has a specific macro XXXerr() that is used to report +-errors. Its first argument is a function code B<XXX_F_...>, the second +-argument is a reason code B<XXX_R_...>. Function codes are derived +-from the function names; reason codes consist of textual error +-descriptions. For example, the function ssl23_read() reports a +-"handshake failure" as follows: +- +- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE); +- +-Function and reason codes should consist of upper case characters, +-numbers and underscores only. The error file generation script translates +-function codes into function names by looking in the header files +-for an appropriate function name, if none is found it just uses +-the capitalized form such as "SSL23_READ" in the above example. +- +-The trailing section of a reason code (after the "_R_") is translated +-into lower case and underscores changed to spaces. +- +-When you are using new function or reason codes, run B<make errors>. +-The necessary B<#define>s will then automatically be added to the +-sub-library's header file. +- +-Although a library will normally report errors using its own specific +-XXXerr macro, another library's macro can be used. This is normally +-only done when a library wants to include ASN1 code which must use +-the ASN1err() macro. +- +-=head2 Adding new libraries +- +-When adding a new sub-library to OpenSSL, assign it a library number +-B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its +-name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add +-C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function +-(in B<crypto/err/err_all.c>). Finally, add an entry +- +- L XXX xxx.h xxx_err.c +- +-to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile. +-Running B<make errors> will then generate a file B<xxx_err.c>, and +-add all error codes used in the library to B<xxx.h>. +- +-Additionally the library include file must have a certain form. +-Typically it will initially look like this: +- +- #ifndef HEADER_XXX_H +- #define HEADER_XXX_H +- +- #ifdef __cplusplus +- extern "C" { +- #endif +- +- /* Include files */ +- +- #include <openssl/bio.h> +- #include <openssl/x509.h> +- +- /* Macros, structures and function prototypes */ +- +- +- /* BEGIN ERROR CODES */ +- +-The B<BEGIN ERROR CODES> sequence is used by the error code +-generation script as the point to place new error codes, any text +-after this point will be overwritten when B<make errors> is run. +-The closing #endif etc will be automatically added by the script. +- +-The generated C error code file B<xxx_err.c> will load the header +-files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the +-header file must load any additional header files containing any +-definitions it uses. +- +-=head1 USING ERROR CODES IN EXTERNAL LIBRARIES +- +-It is also possible to use OpenSSL's error code scheme in external +-libraries. The library needs to load its own codes and call the OpenSSL +-error code insertion script B<mkerr.pl> explicitly to add codes to +-the header file and generate the C error code file. This will normally +-be done if the external library needs to generate new ASN1 structures +-but it can also be used to add more general purpose error code handling. +- +-TBA more details +- +-=head1 INTERNALS +- +-The error queues are stored in a hash table with one B<ERR_STATE> +-entry for each pid. ERR_get_state() returns the current thread's +-B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error +-codes. When more error codes are added, the old ones are overwritten, +-on the assumption that the most recent errors are most important. +- +-Error strings are also stored in hash table. The hash tables can +-be obtained by calling ERR_get_err_state_table(void) and +-ERR_get_string_table(void) respectively. +- +-=head1 SEE ALSO +- +-L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>, +-L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>, +-L<ERR_get_error(3)|ERR_get_error(3)>, +-L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>, +-L<ERR_clear_error(3)|ERR_clear_error(3)>, +-L<ERR_error_string(3)|ERR_error_string(3)>, +-L<ERR_print_errors(3)|ERR_print_errors(3)>, +-L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, +-L<ERR_remove_state(3)|ERR_remove_state(3)>, +-L<ERR_put_error(3)|ERR_put_error(3)>, +-L<ERR_load_strings(3)|ERR_load_strings(3)>, +-L<SSL_get_error(3)|SSL_get_error(3)> +- +-=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -38,7 +38,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, ++L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, + L<ERR_get_error(3)|ERR_get_error(3)>, + L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, + L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -34,7 +34,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> ++L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod +--- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -25,7 +25,7 @@ + + =head1 SEE ALSO + +-L<err(3)|err(3)> ++L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -59,7 +59,7 @@ + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -54,7 +54,7 @@ + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, + L<EVP_SealInit(3)|EVP_SealInit(3)> + +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100 +@@ -74,7 +74,7 @@ + + =head1 SEE ALSO + +-L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, ++L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, + L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, + L<EVP_OpenInit(3)|EVP_OpenInit(3)> + +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -89,7 +89,7 @@ + =head1 SEE ALSO + + L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, +-L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, ++L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, + L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, + L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, + L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> +diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod +--- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -80,7 +80,7 @@ + + L<evp(3)|evp(3)>, + L<EVP_SignInit(3)|EVP_SignInit(3)>, +-L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, ++L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, + L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, + L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, + L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> +diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod +--- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -73,7 +73,7 @@ + =head1 SEE ALSO + + L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>, +-L<CONF_modules_free(3),CONF_modules_free(3)> ++L<CONF_modules_free(3)|CONF_modules_free(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -0,0 +1,187 @@ ++=pod ++ ++=head1 NAME ++ ++openssl_err - error codes ++ ++=head1 SYNOPSIS ++ ++ #include <openssl/err.h> ++ ++ unsigned long ERR_get_error(void); ++ unsigned long ERR_peek_error(void); ++ unsigned long ERR_get_error_line(const char **file, int *line); ++ unsigned long ERR_peek_error_line(const char **file, int *line); ++ unsigned long ERR_get_error_line_data(const char **file, int *line, ++ const char **data, int *flags); ++ unsigned long ERR_peek_error_line_data(const char **file, int *line, ++ const char **data, int *flags); ++ ++ int ERR_GET_LIB(unsigned long e); ++ int ERR_GET_FUNC(unsigned long e); ++ int ERR_GET_REASON(unsigned long e); ++ ++ void ERR_clear_error(void); ++ ++ char *ERR_error_string(unsigned long e, char *buf); ++ const char *ERR_lib_error_string(unsigned long e); ++ const char *ERR_func_error_string(unsigned long e); ++ const char *ERR_reason_error_string(unsigned long e); ++ ++ void ERR_print_errors(BIO *bp); ++ void ERR_print_errors_fp(FILE *fp); ++ ++ void ERR_load_crypto_strings(void); ++ void ERR_free_strings(void); ++ ++ void ERR_remove_state(unsigned long pid); ++ ++ void ERR_put_error(int lib, int func, int reason, const char *file, ++ int line); ++ void ERR_add_error_data(int num, ...); ++ ++ void ERR_load_strings(int lib,ERR_STRING_DATA str[]); ++ unsigned long ERR_PACK(int lib, int func, int reason); ++ int ERR_get_next_error_library(void); ++ ++=head1 DESCRIPTION ++ ++When a call to the OpenSSL library fails, this is usually signalled ++by the return value, and an error code is stored in an error queue ++associated with the current thread. The B<err> library provides ++functions to obtain these error codes and textual error messages. ++ ++The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to ++access error codes. ++ ++Error codes contain information about where the error occurred, and ++what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to ++extract this information. A method to obtain human-readable error ++messages is described in L<ERR_error_string(3)|ERR_error_string(3)>. ++ ++L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the ++error queue. ++ ++Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to ++avoid memory leaks when threads are terminated. ++ ++=head1 ADDING NEW ERROR CODES TO OPENSSL ++ ++See L<ERR_put_error(3)> if you want to record error codes in the ++OpenSSL error system from within your application. ++ ++The remainder of this section is of interest only if you want to add ++new error codes to OpenSSL or add error codes from external libraries. ++ ++=head2 Reporting errors ++ ++Each sub-library has a specific macro XXXerr() that is used to report ++errors. Its first argument is a function code B<XXX_F_...>, the second ++argument is a reason code B<XXX_R_...>. Function codes are derived ++from the function names; reason codes consist of textual error ++descriptions. For example, the function ssl23_read() reports a ++"handshake failure" as follows: ++ ++ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE); ++ ++Function and reason codes should consist of upper case characters, ++numbers and underscores only. The error file generation script translates ++function codes into function names by looking in the header files ++for an appropriate function name, if none is found it just uses ++the capitalized form such as "SSL23_READ" in the above example. ++ ++The trailing section of a reason code (after the "_R_") is translated ++into lower case and underscores changed to spaces. ++ ++When you are using new function or reason codes, run B<make errors>. ++The necessary B<#define>s will then automatically be added to the ++sub-library's header file. ++ ++Although a library will normally report errors using its own specific ++XXXerr macro, another library's macro can be used. This is normally ++only done when a library wants to include ASN1 code which must use ++the ASN1err() macro. ++ ++=head2 Adding new libraries ++ ++When adding a new sub-library to OpenSSL, assign it a library number ++B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its ++name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add ++C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function ++(in B<crypto/err/err_all.c>). Finally, add an entry ++ ++ L XXX xxx.h xxx_err.c ++ ++to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile. ++Running B<make errors> will then generate a file B<xxx_err.c>, and ++add all error codes used in the library to B<xxx.h>. ++ ++Additionally the library include file must have a certain form. ++Typically it will initially look like this: ++ ++ #ifndef HEADER_XXX_H ++ #define HEADER_XXX_H ++ ++ #ifdef __cplusplus ++ extern "C" { ++ #endif ++ ++ /* Include files */ ++ ++ #include <openssl/bio.h> ++ #include <openssl/x509.h> ++ ++ /* Macros, structures and function prototypes */ ++ ++ ++ /* BEGIN ERROR CODES */ ++ ++The B<BEGIN ERROR CODES> sequence is used by the error code ++generation script as the point to place new error codes, any text ++after this point will be overwritten when B<make errors> is run. ++The closing #endif etc will be automatically added by the script. ++ ++The generated C error code file B<xxx_err.c> will load the header ++files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the ++header file must load any additional header files containing any ++definitions it uses. ++ ++=head1 USING ERROR CODES IN EXTERNAL LIBRARIES ++ ++It is also possible to use OpenSSL's error code scheme in external ++libraries. The library needs to load its own codes and call the OpenSSL ++error code insertion script B<mkerr.pl> explicitly to add codes to ++the header file and generate the C error code file. This will normally ++be done if the external library needs to generate new ASN1 structures ++but it can also be used to add more general purpose error code handling. ++ ++TBA more details ++ ++=head1 INTERNALS ++ ++The error queues are stored in a hash table with one B<ERR_STATE> ++entry for each pid. ERR_get_state() returns the current thread's ++B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error ++codes. When more error codes are added, the old ones are overwritten, ++on the assumption that the most recent errors are most important. ++ ++Error strings are also stored in hash table. The hash tables can ++be obtained by calling ERR_get_err_state_table(void) and ++ERR_get_string_table(void) respectively. ++ ++=head1 SEE ALSO ++ ++L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>, ++L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>, ++L<ERR_get_error(3)|ERR_get_error(3)>, ++L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>, ++L<ERR_clear_error(3)|ERR_clear_error(3)>, ++L<ERR_error_string(3)|ERR_error_string(3)>, ++L<ERR_print_errors(3)|ERR_print_errors(3)>, ++L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, ++L<ERR_remove_state(3)|ERR_remove_state(3)>, ++L<ERR_put_error(3)|ERR_put_error(3)>, ++L<ERR_load_strings(3)|ERR_load_strings(3)>, ++L<SSL_get_error(3)|SSL_get_error(3)> ++ ++=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -0,0 +1,175 @@ ++=pod ++ ++=head1 NAME ++ ++openssl_rand - pseudo-random number generator ++ ++=head1 SYNOPSIS ++ ++ #include <openssl/rand.h> ++ ++ int RAND_set_rand_engine(ENGINE *engine); ++ ++ int RAND_bytes(unsigned char *buf, int num); ++ int RAND_pseudo_bytes(unsigned char *buf, int num); ++ ++ void RAND_seed(const void *buf, int num); ++ void RAND_add(const void *buf, int num, int entropy); ++ int RAND_status(void); ++ ++ int RAND_load_file(const char *file, long max_bytes); ++ int RAND_write_file(const char *file); ++ const char *RAND_file_name(char *file, size_t num); ++ ++ int RAND_egd(const char *path); ++ ++ void RAND_set_rand_method(const RAND_METHOD *meth); ++ const RAND_METHOD *RAND_get_rand_method(void); ++ RAND_METHOD *RAND_SSLeay(void); ++ ++ void RAND_cleanup(void); ++ ++ /* For Win32 only */ ++ void RAND_screen(void); ++ int RAND_event(UINT, WPARAM, LPARAM); ++ ++=head1 DESCRIPTION ++ ++Since the introduction of the ENGINE API, the recommended way of controlling ++default implementations is by using the ENGINE API functions. The default ++B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by ++RAND_get_rand_method(), is only used if no ENGINE has been set as the default ++"rand" implementation. Hence, these two functions are no longer the recommened ++way to control defaults. ++ ++If an alternative B<RAND_METHOD> implementation is being used (either set ++directly or as provided by an ENGINE module), then it is entirely responsible ++for the generation and management of a cryptographically secure PRNG stream. The ++mechanisms described below relate solely to the software PRNG implementation ++built in to OpenSSL and used by default. ++ ++These functions implement a cryptographically secure pseudo-random ++number generator (PRNG). It is used by other library functions for ++example to generate random keys, and applications can use it when they ++need randomness. ++ ++A cryptographic PRNG must be seeded with unpredictable data such as ++mouse movements or keys pressed at random by the user. This is ++described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file ++(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the ++seeding process whenever the application is started. ++ ++L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the ++PRNG. ++ ++=head1 INTERNALS ++ ++The RAND_SSLeay() method implements a PRNG based on a cryptographic ++hash function. ++ ++The following description of its design is based on the SSLeay ++documentation: ++ ++First up I will state the things I believe I need for a good RNG. ++ ++=over 4 ++ ++=item 1 ++ ++A good hashing algorithm to mix things up and to convert the RNG 'state' ++to random numbers. ++ ++=item 2 ++ ++An initial source of random 'state'. ++ ++=item 3 ++ ++The state should be very large. If the RNG is being used to generate ++4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum). ++If your RNG state only has 128 bits, you are obviously limiting the ++search space to 128 bits, not 2048. I'm probably getting a little ++carried away on this last point but it does indicate that it may not be ++a bad idea to keep quite a lot of RNG state. It should be easier to ++break a cipher than guess the RNG seed data. ++ ++=item 4 ++ ++Any RNG seed data should influence all subsequent random numbers ++generated. This implies that any random seed data entered will have ++an influence on all subsequent random numbers generated. ++ ++=item 5 ++ ++When using data to seed the RNG state, the data used should not be ++extractable from the RNG state. I believe this should be a ++requirement because one possible source of 'secret' semi random ++data would be a private key or a password. This data must ++not be disclosed by either subsequent random numbers or a ++'core' dump left by a program crash. ++ ++=item 6 ++ ++Given the same initial 'state', 2 systems should deviate in their RNG state ++(and hence the random numbers generated) over time if at all possible. ++ ++=item 7 ++ ++Given the random number output stream, it should not be possible to determine ++the RNG state or the next random number. ++ ++=back ++ ++The algorithm is as follows. ++ ++There is global state made up of a 1023 byte buffer (the 'state'), a ++working hash value ('md'), and a counter ('count'). ++ ++Whenever seed data is added, it is inserted into the 'state' as ++follows. ++ ++The input is chopped up into units of 20 bytes (or less for ++the last block). Each of these blocks is run through the hash ++function as follows: The data passed to the hash function ++is the current 'md', the same number of bytes from the 'state' ++(the location determined by in incremented looping index) as ++the current 'block', the new key data 'block', and 'count' ++(which is incremented after each use). ++The result of this is kept in 'md' and also xored into the ++'state' at the same locations that were used as input into the ++hash function. I ++believe this system addresses points 1 (hash function; currently ++SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash ++function and xor). ++ ++When bytes are extracted from the RNG, the following process is used. ++For each group of 10 bytes (or less), we do the following: ++ ++Input into the hash function the local 'md' (which is initialized from ++the global 'md' before any bytes are generated), the bytes that are to ++be overwritten by the random bytes, and bytes from the 'state' ++(incrementing looping index). From this digest output (which is kept ++in 'md'), the top (up to) 10 bytes are returned to the caller and the ++bottom 10 bytes are xored into the 'state'. ++ ++Finally, after we have finished 'num' random bytes for the caller, ++'count' (which is incremented) and the local and global 'md' are fed ++into the hash function and the results are kept in the global 'md'. ++ ++I believe the above addressed points 1 (use of SHA-1), 6 (by hashing ++into the 'state' the 'old' data from the caller that is about to be ++overwritten) and 7 (by not using the 10 bytes given to the caller to ++update the 'state', but they are used to update 'md'). ++ ++So of the points raised, only 2 is not addressed (but see ++L<RAND_add(3)|RAND_add(3)>). ++ ++=head1 SEE ALSO ++ ++L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, ++L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>, ++L<RAND_bytes(3)|RAND_bytes(3)>, ++L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, ++L<RAND_cleanup(3)|RAND_cleanup(3)> ++ ++=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod +--- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -0,0 +1,175 @@ ++=pod ++ ++=head1 NAME ++ ++CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks, ++CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, ++CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, ++CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support ++ ++=head1 SYNOPSIS ++ ++ #include <openssl/crypto.h> ++ ++ void CRYPTO_set_locking_callback(void (*locking_function)(int mode, ++ int n, const char *file, int line)); ++ ++ void CRYPTO_set_id_callback(unsigned long (*id_function)(void)); ++ ++ int CRYPTO_num_locks(void); ++ ++ ++ /* struct CRYPTO_dynlock_value needs to be defined by the user */ ++ struct CRYPTO_dynlock_value; ++ ++ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value * ++ (*dyn_create_function)(char *file, int line)); ++ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function) ++ (int mode, struct CRYPTO_dynlock_value *l, ++ const char *file, int line)); ++ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function) ++ (struct CRYPTO_dynlock_value *l, const char *file, int line)); ++ ++ int CRYPTO_get_new_dynlockid(void); ++ ++ void CRYPTO_destroy_dynlockid(int i); ++ ++ void CRYPTO_lock(int mode, int n, const char *file, int line); ++ ++ #define CRYPTO_w_lock(type) \ ++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) ++ #define CRYPTO_w_unlock(type) \ ++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) ++ #define CRYPTO_r_lock(type) \ ++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) ++ #define CRYPTO_r_unlock(type) \ ++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) ++ #define CRYPTO_add(addr,amount,type) \ ++ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) ++ ++=head1 DESCRIPTION ++ ++OpenSSL can safely be used in multi-threaded applications provided ++that at least two callback functions are set. ++ ++locking_function(int mode, int n, const char *file, int line) is ++needed to perform locking on shared data structures. ++(Note that OpenSSL uses a number of global data structures that ++will be implicitly shared whenever multiple threads use OpenSSL.) ++Multi-threaded applications will crash at random if it is not set. ++ ++locking_function() must be able to handle up to CRYPTO_num_locks() ++different mutex locks. It sets the B<n>-th lock if B<mode> & ++B<CRYPTO_LOCK>, and releases it otherwise. ++ ++B<file> and B<line> are the file number of the function setting the ++lock. They can be useful for debugging. ++ ++id_function(void) is a function that returns a thread ID, for example ++pthread_self() if it returns an integer (see NOTES below). It isn't ++needed on Windows nor on platforms where getpid() returns a different ++ID for each thread (see NOTES below). ++ ++Additionally, OpenSSL supports dynamic locks, and sometimes, some parts ++of OpenSSL need it for better performance. To enable this, the following ++is required: ++ ++=over 4 ++ ++=item * ++Three additional callback function, dyn_create_function, dyn_lock_function ++and dyn_destroy_function. ++ ++=item * ++A structure defined with the data that each lock needs to handle. ++ ++=back ++ ++struct CRYPTO_dynlock_value has to be defined to contain whatever structure ++is needed to handle locks. ++ ++dyn_create_function(const char *file, int line) is needed to create a ++lock. Multi-threaded applications might crash at random if it is not set. ++ ++dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line) ++is needed to perform locking off dynamic lock numbered n. Multi-threaded ++applications might crash at random if it is not set. ++ ++dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is ++needed to destroy the lock l. Multi-threaded applications might crash at ++random if it is not set. ++ ++CRYPTO_get_new_dynlockid() is used to create locks. It will call ++dyn_create_function for the actual creation. ++ ++CRYPTO_destroy_dynlockid() is used to destroy locks. It will call ++dyn_destroy_function for the actual destruction. ++ ++CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield ++describing what should be done with the lock. n is the number of the ++lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined ++from the following values. These values are pairwise exclusive, with ++undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE ++should not be used together): ++ ++ CRYPTO_LOCK 0x01 ++ CRYPTO_UNLOCK 0x02 ++ CRYPTO_READ 0x04 ++ CRYPTO_WRITE 0x08 ++ ++=head1 RETURN VALUES ++ ++CRYPTO_num_locks() returns the required number of locks. ++ ++CRYPTO_get_new_dynlockid() returns the index to the newly created lock. ++ ++The other functions return no values. ++ ++=head1 NOTES ++ ++You can find out if OpenSSL was configured with thread support: ++ ++ #define OPENSSL_THREAD_DEFINES ++ #include <openssl/opensslconf.h> ++ #if defined(OPENSSL_THREADS) ++ // thread support enabled ++ #else ++ // no thread support ++ #endif ++ ++Also, dynamic locks are currently not used internally by OpenSSL, but ++may do so in the future. ++ ++Defining id_function(void) has it's own issues. Generally speaking, ++pthread_self() should be used, even on platforms where getpid() gives ++different answers in each thread, since that may depend on the machine ++the program is run on, not the machine where the program is being ++compiled. For instance, Red Hat 8 Linux and earlier used ++LinuxThreads, whose getpid() returns a different value for each ++thread. Red Hat 9 Linux and later use NPTL, which is ++Posix-conformant, and has a getpid() that returns the same value for ++all threads in a process. A program compiled on Red Hat 8 and run on ++Red Hat 9 will therefore see getpid() returning the same value for ++all threads. ++ ++There is still the issue of platforms where pthread_self() returns ++something other than an integer. This is a bit unusual, and this ++manual has no cookbook solution for that case. ++ ++=head1 EXAMPLES ++ ++B<crypto/threads/mttest.c> shows examples of the callback functions on ++Solaris, Irix and Win32. ++ ++=head1 HISTORY ++ ++CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are ++available in all versions of SSLeay and OpenSSL. ++CRYPTO_num_locks() was added in OpenSSL 0.9.4. ++All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. ++ ++=head1 SEE ALSO ++ ++L<crypto(3)|crypto(3)> ++ ++=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -65,7 +65,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, + L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -38,7 +38,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, + L<RAND_add(3)|RAND_add(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -20,7 +20,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)> ++L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -72,7 +72,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, + L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -43,7 +43,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> ++L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod +--- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100 +@@ -1,175 +0,0 @@ +-=pod +- +-=head1 NAME +- +-rand - pseudo-random number generator +- +-=head1 SYNOPSIS +- +- #include <openssl/rand.h> +- +- int RAND_set_rand_engine(ENGINE *engine); +- +- int RAND_bytes(unsigned char *buf, int num); +- int RAND_pseudo_bytes(unsigned char *buf, int num); +- +- void RAND_seed(const void *buf, int num); +- void RAND_add(const void *buf, int num, int entropy); +- int RAND_status(void); +- +- int RAND_load_file(const char *file, long max_bytes); +- int RAND_write_file(const char *file); +- const char *RAND_file_name(char *file, size_t num); +- +- int RAND_egd(const char *path); +- +- void RAND_set_rand_method(const RAND_METHOD *meth); +- const RAND_METHOD *RAND_get_rand_method(void); +- RAND_METHOD *RAND_SSLeay(void); +- +- void RAND_cleanup(void); +- +- /* For Win32 only */ +- void RAND_screen(void); +- int RAND_event(UINT, WPARAM, LPARAM); +- +-=head1 DESCRIPTION +- +-Since the introduction of the ENGINE API, the recommended way of controlling +-default implementations is by using the ENGINE API functions. The default +-B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by +-RAND_get_rand_method(), is only used if no ENGINE has been set as the default +-"rand" implementation. Hence, these two functions are no longer the recommened +-way to control defaults. +- +-If an alternative B<RAND_METHOD> implementation is being used (either set +-directly or as provided by an ENGINE module), then it is entirely responsible +-for the generation and management of a cryptographically secure PRNG stream. The +-mechanisms described below relate solely to the software PRNG implementation +-built in to OpenSSL and used by default. +- +-These functions implement a cryptographically secure pseudo-random +-number generator (PRNG). It is used by other library functions for +-example to generate random keys, and applications can use it when they +-need randomness. +- +-A cryptographic PRNG must be seeded with unpredictable data such as +-mouse movements or keys pressed at random by the user. This is +-described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file +-(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the +-seeding process whenever the application is started. +- +-L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the +-PRNG. +- +-=head1 INTERNALS +- +-The RAND_SSLeay() method implements a PRNG based on a cryptographic +-hash function. +- +-The following description of its design is based on the SSLeay +-documentation: +- +-First up I will state the things I believe I need for a good RNG. +- +-=over 4 +- +-=item 1 +- +-A good hashing algorithm to mix things up and to convert the RNG 'state' +-to random numbers. +- +-=item 2 +- +-An initial source of random 'state'. +- +-=item 3 +- +-The state should be very large. If the RNG is being used to generate +-4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum). +-If your RNG state only has 128 bits, you are obviously limiting the +-search space to 128 bits, not 2048. I'm probably getting a little +-carried away on this last point but it does indicate that it may not be +-a bad idea to keep quite a lot of RNG state. It should be easier to +-break a cipher than guess the RNG seed data. +- +-=item 4 +- +-Any RNG seed data should influence all subsequent random numbers +-generated. This implies that any random seed data entered will have +-an influence on all subsequent random numbers generated. +- +-=item 5 +- +-When using data to seed the RNG state, the data used should not be +-extractable from the RNG state. I believe this should be a +-requirement because one possible source of 'secret' semi random +-data would be a private key or a password. This data must +-not be disclosed by either subsequent random numbers or a +-'core' dump left by a program crash. +- +-=item 6 +- +-Given the same initial 'state', 2 systems should deviate in their RNG state +-(and hence the random numbers generated) over time if at all possible. +- +-=item 7 +- +-Given the random number output stream, it should not be possible to determine +-the RNG state or the next random number. +- +-=back +- +-The algorithm is as follows. +- +-There is global state made up of a 1023 byte buffer (the 'state'), a +-working hash value ('md'), and a counter ('count'). +- +-Whenever seed data is added, it is inserted into the 'state' as +-follows. +- +-The input is chopped up into units of 20 bytes (or less for +-the last block). Each of these blocks is run through the hash +-function as follows: The data passed to the hash function +-is the current 'md', the same number of bytes from the 'state' +-(the location determined by in incremented looping index) as +-the current 'block', the new key data 'block', and 'count' +-(which is incremented after each use). +-The result of this is kept in 'md' and also xored into the +-'state' at the same locations that were used as input into the +-hash function. I +-believe this system addresses points 1 (hash function; currently +-SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash +-function and xor). +- +-When bytes are extracted from the RNG, the following process is used. +-For each group of 10 bytes (or less), we do the following: +- +-Input into the hash function the local 'md' (which is initialized from +-the global 'md' before any bytes are generated), the bytes that are to +-be overwritten by the random bytes, and bytes from the 'state' +-(incrementing looping index). From this digest output (which is kept +-in 'md'), the top (up to) 10 bytes are returned to the caller and the +-bottom 10 bytes are xored into the 'state'. +- +-Finally, after we have finished 'num' random bytes for the caller, +-'count' (which is incremented) and the local and global 'md' are fed +-into the hash function and the results are kept in the global 'md'. +- +-I believe the above addressed points 1 (use of SHA-1), 6 (by hashing +-into the 'state' the 'old' data from the caller that is about to be +-overwritten) and 7 (by not using the 10 bytes given to the caller to +-update the 'state', but they are used to update 'md'). +- +-So of the points raised, only 2 is not addressed (but see +-L<RAND_add(3)|RAND_add(3)>). +- +-=head1 SEE ALSO +- +-L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, +-L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>, +-L<RAND_bytes(3)|RAND_bytes(3)>, +-L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, +-L<RAND_cleanup(3)|RAND_cleanup(3)> +- +-=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod +--- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -67,7 +67,7 @@ + + =head1 SEE ALSO + +-L<rand(3)|rand(3)>, L<engine(3)|engine(3)> ++L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -34,7 +34,7 @@ + + =head1 SEE ALSO + +-L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)> ++L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100 +@@ -59,7 +59,7 @@ + + =head1 SEE ALSO + +-L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<RSA_free(3)|RSA_free(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod +--- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100 +@@ -108,7 +108,7 @@ + =head1 SEE ALSO + + L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, +-L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, + L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>, + L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>, + L<RSA_generate_key(3)|RSA_generate_key(3)>, +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000 ++++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -73,7 +73,7 @@ + + =head1 SEE ALSO + +-L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, ++L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, + L<RSA_size(3)|RSA_size(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod +--- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -48,7 +48,7 @@ + =head1 SEE ALSO + + L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, +-L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, ++L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, + L<RSA_verify(3)|RSA_verify(3)> + + =head1 HISTORY +diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod +--- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100 +@@ -1,210 +0,0 @@ +-=pod +- +-=head1 NAME +- +-CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback, +-CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy, +-CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks, +-CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, +-CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, +-CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support +- +-=head1 SYNOPSIS +- +- #include <openssl/crypto.h> +- +- /* Don't use this structure directly. */ +- typedef struct crypto_threadid_st +- { +- void *ptr; +- unsigned long val; +- } CRYPTO_THREADID; +- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */ +- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); +- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); +- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); +- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); +- void CRYPTO_THREADID_current(CRYPTO_THREADID *id); +- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, +- const CRYPTO_THREADID *b); +- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, +- const CRYPTO_THREADID *src); +- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id); +- +- int CRYPTO_num_locks(void); +- +- /* struct CRYPTO_dynlock_value needs to be defined by the user */ +- struct CRYPTO_dynlock_value; +- +- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value * +- (*dyn_create_function)(char *file, int line)); +- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function) +- (int mode, struct CRYPTO_dynlock_value *l, +- const char *file, int line)); +- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function) +- (struct CRYPTO_dynlock_value *l, const char *file, int line)); +- +- int CRYPTO_get_new_dynlockid(void); +- +- void CRYPTO_destroy_dynlockid(int i); +- +- void CRYPTO_lock(int mode, int n, const char *file, int line); +- +- #define CRYPTO_w_lock(type) \ +- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) +- #define CRYPTO_w_unlock(type) \ +- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) +- #define CRYPTO_r_lock(type) \ +- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) +- #define CRYPTO_r_unlock(type) \ +- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) +- #define CRYPTO_add(addr,amount,type) \ +- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) +- +-=head1 DESCRIPTION +- +-OpenSSL can safely be used in multi-threaded applications provided +-that at least two callback functions are set, locking_function and +-threadid_func. +- +-locking_function(int mode, int n, const char *file, int line) is +-needed to perform locking on shared data structures. +-(Note that OpenSSL uses a number of global data structures that +-will be implicitly shared whenever multiple threads use OpenSSL.) +-Multi-threaded applications will crash at random if it is not set. +- +-locking_function() must be able to handle up to CRYPTO_num_locks() +-different mutex locks. It sets the B<n>-th lock if B<mode> & +-B<CRYPTO_LOCK>, and releases it otherwise. +- +-B<file> and B<line> are the file number of the function setting the +-lock. They can be useful for debugging. +- +-threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing +-thread's identifier into B<id>. The implementation of this callback should not +-fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread +-IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based. +-If the application does not register such a callback using +-CRYPTO_THREADID_set_callback(), then a default implementation is used - on +-Windows and BeOS this uses the system's default thread identifying APIs, and on +-all other platforms it uses the address of B<errno>. The latter is satisfactory +-for thread-safety if and only if the platform has a thread-local error number +-facility. +- +-Once threadid_func() is registered, or if the built-in default implementation is +-to be used; +- +-=over 4 +- +-=item * +-CRYPTO_THREADID_current() records the currently-executing thread ID into the +-given B<id> object. +- +-=item * +-CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie. +-the same semantics as memcmp()). +- +-=item * +-CRYPTO_THREADID_cpy() duplicates a thread ID value, +- +-=item * +-CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This +-is usually the exact numeric or pointer-based thread ID used internally, however +-this also handles the unusual case where pointers are larger than 'long' +-variables and the platform's thread IDs are pointer-based - in this case, mixing +-is done to attempt to produce a unique numeric value even though it is not as +-wide as the platform's true thread IDs. +- +-=back +- +-Additionally, OpenSSL supports dynamic locks, and sometimes, some parts +-of OpenSSL need it for better performance. To enable this, the following +-is required: +- +-=over 4 +- +-=item * +-Three additional callback function, dyn_create_function, dyn_lock_function +-and dyn_destroy_function. +- +-=item * +-A structure defined with the data that each lock needs to handle. +- +-=back +- +-struct CRYPTO_dynlock_value has to be defined to contain whatever structure +-is needed to handle locks. +- +-dyn_create_function(const char *file, int line) is needed to create a +-lock. Multi-threaded applications might crash at random if it is not set. +- +-dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line) +-is needed to perform locking off dynamic lock numbered n. Multi-threaded +-applications might crash at random if it is not set. +- +-dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is +-needed to destroy the lock l. Multi-threaded applications might crash at +-random if it is not set. +- +-CRYPTO_get_new_dynlockid() is used to create locks. It will call +-dyn_create_function for the actual creation. +- +-CRYPTO_destroy_dynlockid() is used to destroy locks. It will call +-dyn_destroy_function for the actual destruction. +- +-CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield +-describing what should be done with the lock. n is the number of the +-lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined +-from the following values. These values are pairwise exclusive, with +-undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE +-should not be used together): +- +- CRYPTO_LOCK 0x01 +- CRYPTO_UNLOCK 0x02 +- CRYPTO_READ 0x04 +- CRYPTO_WRITE 0x08 +- +-=head1 RETURN VALUES +- +-CRYPTO_num_locks() returns the required number of locks. +- +-CRYPTO_get_new_dynlockid() returns the index to the newly created lock. +- +-The other functions return no values. +- +-=head1 NOTES +- +-You can find out if OpenSSL was configured with thread support: +- +- #define OPENSSL_THREAD_DEFINES +- #include <openssl/opensslconf.h> +- #if defined(OPENSSL_THREADS) +- // thread support enabled +- #else +- // no thread support +- #endif +- +-Also, dynamic locks are currently not used internally by OpenSSL, but +-may do so in the future. +- +-=head1 EXAMPLES +- +-B<crypto/threads/mttest.c> shows examples of the callback functions on +-Solaris, Irix and Win32. +- +-=head1 HISTORY +- +-CRYPTO_set_locking_callback() is +-available in all versions of SSLeay and OpenSSL. +-CRYPTO_num_locks() was added in OpenSSL 0.9.4. +-All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. +-B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0 +-to replace (actually, deprecate) the previous CRYPTO_set_id_callback(), +-CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed +-thread IDs to always be represented by 'unsigned long'. +- +-=head1 SEE ALSO +- +-L<crypto(3)|crypto(3)> +- +-=cut +diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod +--- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100 ++++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100 +@@ -65,7 +65,7 @@ + =head1 SEE ALSO + + L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>, +-L<OBJ_nid2obj(3),OBJ_nid2obj(3)> ++L<OBJ_nid2obj(3)|OBJ_nid2obj(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100 +@@ -105,7 +105,7 @@ + + =head1 SEE ALSO + +-L<ssl(3)|ssl(3)>, L<err(3)|err(3)> ++L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)> + + =head1 HISTORY + +diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod +--- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100 ++++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100 +@@ -72,6 +72,6 @@ + + =head1 SEE ALSO + +-L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> ++L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> + + =cut +diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ +--- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100 ++++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100 +@@ -724,7 +724,7 @@ + CRYPTO_set_id_callback(), for all versions of OpenSSL up to and + including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() + and associated APIs are deprecated by CRYPTO_THREADID_set_callback() +-and friends. This is described in the threads(3) manpage. ++and friends. This is described in the openssl_threads(3) manpage. + + * I've compiled a program under Windows and it crashes: why? + diff --git a/stage3/patches/common/pa_stable_v19_20111121-audacity-portmixer.patch b/stage3/patches/common/pa_stable_v19_20111121-audacity-portmixer.patch new file mode 100644 index 0000000..29f7e07 --- /dev/null +++ b/stage3/patches/common/pa_stable_v19_20111121-audacity-portmixer.patch @@ -0,0 +1,312 @@ +Description: Add features needed to make portmixer work with audacity. +Author: Audacity Team +Last-Update: 2010-02-21 + +--- a/include/pa_win_ds.h ++++ b/include/pa_win_ds.h +@@ -91,6 +91,21 @@ + + }PaWinDirectSoundStreamInfo; + ++/** Retrieve the GUID of the input device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ); ++ ++/** Retrieve the GUID of the output device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ); + + + #ifdef __cplusplus +--- a/include/portaudio.h ++++ b/include/portaudio.h +@@ -1121,6 +1121,15 @@ + signed long Pa_GetStreamWriteAvailable( PaStream* stream ); + + ++/** Retrieve the host type handling an open stream. ++ ++ @return Returns a non-negative value representing the host API type ++ handling an open stream or, a PaErrorCode (which are always negative) ++ if PortAudio is not initialized or an error is encountered. ++*/ ++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream ); ++ ++ + /* Miscellaneous utilities */ + + +--- /dev/null ++++ b/include/pa_unix_oss.h +@@ -0,0 +1,104 @@ ++#ifndef PA_UNIX_OSS_H ++#define PA_UNIX_OSS_H ++ ++/* ++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $ ++ * PortAudio Portable Real-Time Audio Library ++ * OSS-specific extensions ++ * ++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk ++ * ++ * 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. ++ * ++ * Any person wishing to distribute modifications to the Software is ++ * requested to send the modifications to the original developer so that ++ * they can be incorporated into the canonical version. ++ * ++ * 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 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. ++ * ++ */ ++ ++/** @file ++ * OSS-specific PortAudio API extension header file. ++ */ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++const char *PaOSS_GetStreamInputDevice( PaStream *s ); ++ ++const char *PaOSS_GetStreamOutputDevice( PaStream *s ); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif ++#ifndef PA_UNIX_OSS_H ++#define PA_UNIX_OSS_H ++ ++/* ++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $ ++ * PortAudio Portable Real-Time Audio Library ++ * OSS-specific extensions ++ * ++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk ++ * ++ * 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. ++ * ++ * Any person wishing to distribute modifications to the Software is ++ * requested to send the modifications to the original developer so that ++ * they can be incorporated into the canonical version. ++ * ++ * 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 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. ++ * ++ */ ++ ++/** @file ++ * OSS-specific PortAudio API extension header file. ++ */ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++const char *PaOSS_GetStreamInputDevice( PaStream *s ); ++ ++const char *PaOSS_GetStreamOutputDevice( PaStream *s ); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +--- a/src/common/pa_front.c ++++ b/src/common/pa_front.c +@@ -1199,8 +1199,10 @@ + hostApiInputParametersPtr, hostApiOutputParametersPtr, + sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); + +- if( result == paNoError ) ++ if( result == paNoError ) { + AddOpenStream( *stream ); ++ PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type; ++ } + + + PA_LOGAPI(("Pa_OpenStream returned:\n" )); +@@ -1712,6 +1714,32 @@ + return result; + } + ++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream ) ++{ ++ PaError error = PaUtil_ValidateStreamPointer( stream ); ++ PaHostApiTypeId result; ++ ++#ifdef PA_LOG_API_CALLS ++ PaUtil_DebugPrint("Pa_GetStreamHostApiType called:\n" ); ++ PaUtil_DebugPrint("\tPaStream* stream: 0x%p\n", stream ); ++#endif ++ ++ if( error == paNoError ) ++ { ++ result = PA_STREAM_REP(stream)->hostApiType; ++ } ++ else ++ { ++ result = (PaHostApiTypeId) error; ++ } ++ ++#ifdef PA_LOG_API_CALLS ++ PaUtil_DebugPrint("Pa_GetStreamHostApiType returned:\n" ); ++ PaUtil_DebugPrint("\tPaError: %d ( %s )\n\n", result, Pa_GetErrorText( result ) ); ++#endif ++ ++ return result; ++} + + PaError Pa_GetSampleSize( PaSampleFormat format ) + { +--- a/src/common/pa_stream.c ++++ b/src/common/pa_stream.c +@@ -93,6 +93,8 @@ + streamRepresentation->streamInfo.inputLatency = 0.; + streamRepresentation->streamInfo.outputLatency = 0.; + streamRepresentation->streamInfo.sampleRate = 0.; ++ ++ streamRepresentation->hostApiType = 0; + } + + +--- a/src/common/pa_stream.h ++++ b/src/common/pa_stream.h +@@ -152,6 +152,7 @@ + PaStreamFinishedCallback *streamFinishedCallback; + void *userData; + PaStreamInfo streamInfo; ++ PaHostApiTypeId hostApiType; + } PaUtilStreamRepresentation; + + +--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c ++++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c +@@ -66,6 +66,9 @@ + #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS + # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) + # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) ) ++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 ++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b ) ++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b ) + #else + # include <libkern/OSAtomic.h> + #endif +--- a/src/hostapi/alsa/pa_linux_alsa.c ++++ b/src/hostapi/alsa/pa_linux_alsa.c +@@ -607,6 +607,7 @@ + StreamDirection streamDir; + + snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */ ++ int card; + } PaAlsaStreamComponent; + + /* Implementation specific stream structure */ +@@ -1802,6 +1803,7 @@ + { + PaError result = paNoError; + PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError; ++ snd_pcm_info_t* pcmInfo; + assert( params->channelCount > 0 ); + + /* Make sure things have an initial value */ +@@ -1822,6 +1824,9 @@ + self->device = params->device; + + PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) ); ++ ++ snd_pcm_info_alloca( &pcmInfo ); ++ self->card = snd_pcm_info_get_card( pcmInfo ); + self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm ); + + PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) ); +@@ -4514,9 +4519,7 @@ + /* XXX: More descriptive error? */ + PA_UNLESS( stream->capture.pcm, paDeviceUnavailable ); + +- alsa_snd_pcm_info_alloca( &pcmInfo ); +- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) ); +- *card = alsa_snd_pcm_info_get_card( pcmInfo ); ++ *card = stream->capture.card; + + error: + return result; +@@ -4532,9 +4535,7 @@ + /* XXX: More descriptive error? */ + PA_UNLESS( stream->playback.pcm, paDeviceUnavailable ); + +- alsa_snd_pcm_info_alloca( &pcmInfo ); +- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) ); +- *card = alsa_snd_pcm_info_get_card( pcmInfo ); ++ *card = stream->playback.card; + + error: + return result; +--- a/src/hostapi/oss/pa_unix_oss.c ++++ b/src/hostapi/oss/pa_unix_oss.c +@@ -2028,3 +2028,26 @@ + #endif + } + ++const char *PaOSS_GetStreamInputDevice( PaStream* s ) ++{ ++ PaOssStream *stream = (PaOssStream*)s; ++ ++ if( stream->capture ) ++ { ++ return stream->capture->devName; ++ } ++ ++ return NULL; ++} ++ ++const char *PaOSS_GetStreamOutputDevice( PaStream* s ) ++{ ++ PaOssStream *stream = (PaOssStream*)s; ++ ++ if( stream->playback ) ++ { ++ return stream->playback->devName; ++ } ++ ++ return NULL; ++} diff --git a/stage3/patches/common/sgml-common-0.6.3-manpage-1.patch b/stage3/patches/common/sgml-common-0.6.3-manpage-1.patch new file mode 100644 index 0000000..c3773d1 --- /dev/null +++ b/stage3/patches/common/sgml-common-0.6.3-manpage-1.patch @@ -0,0 +1,14 @@ +Submitted By: Thomas Pegg <lnxfreak123 at insightbb dot com> +Date: 2003-11-18 +Initial Package Version: 0.6.3 +Origin: Thomas Pegg +Description: Fixes syntax of Makefile.am for installation of man pages, +for use with current automake versions 1.7.8 and higher. + +diff -Naur sgml-common-0.6.3.orig/doc/man/Makefile.am sgml-common-0.6.3/doc/man/Makefile.am +--- sgml-common-0.6.3.orig/doc/man/Makefile.am 2001-01-30 14:42:22.000000000 +0000 ++++ sgml-common-0.6.3/doc/man/Makefile.am 2003-11-18 16:48:47.000000000 +0000 +@@ -1,2 +1 @@ +-man8dir = $(mandir)/man8 +-man8_DATA = *.8 ++man_MANS = install-catalog.8 diff --git a/stage3/patches/common/subversion-1.7.6-build_fixes-1.patch b/stage3/patches/common/subversion-1.7.6-build_fixes-1.patch new file mode 100644 index 0000000..f2b9051 --- /dev/null +++ b/stage3/patches/common/subversion-1.7.6-build_fixes-1.patch @@ -0,0 +1,40 @@ +Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org) +Date: 2012-08-21 +Initial Package Version: 1.7.6 +Origin: Fernando de Oliveira +Upstream Status: Unknown +Description: Fix build aux files + +diff -Naur build-outputs.mk build-outputs.mk +--- a/build-outputs.mk 2012-08-08 16:21:32.000000000 +0200 ++++ b/build-outputs.mk 2012-08-16 09:22:09.000000000 +0200 +@@ -825,7 +825,7 @@ + # Section 6: Install-Group build targets + ######################################## + +-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la ++apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la + + bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + +@@ -877,7 +877,7 @@ + + test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) + +-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) ++tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) + + + ######################################## +diff -Naur build.conf build.conf +--- a/build.conf 2012-08-02 06:02:59.000000000 +0200 ++++ b/build.conf 2012-08-16 09:22:24.000000000 +0200 +@@ -367,7 +367,7 @@ + path = tools/server-side/mod_dontdothat + nonlibs = mod_dav_svn apr aprutil + libs = libsvn_subr xml +-install = tools ++install = apache-mod + msvc-libs = libhttpd.lib + + # ---------------------------------------------------------------------------- diff --git a/stage3/patches/common/tcp_wrappers_7.6-shared_lib_plus_plus-1.patch b/stage3/patches/common/tcp_wrappers_7.6-shared_lib_plus_plus-1.patch new file mode 100644 index 0000000..9a5b20c --- /dev/null +++ b/stage3/patches/common/tcp_wrappers_7.6-shared_lib_plus_plus-1.patch @@ -0,0 +1,1035 @@ +Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org> +Date: 2003-10-04 +Initial Package Version: 7.6 +Origin: http://archives.linuxfromscratch.org/mail-archives/blfs-dev/2003-January/001960.html +Description: The patch was created from the tcp_wrappers modified package by Mark Heerdink. +This patch provides the following improvements: + * Install libwrap.so along with libwrap.a. + * Create an install target for tcp_wrappers. + * Compilation and security fixes. + * Documentation fixes. +diff -Naur tcp_wrappers_7.6/Makefile tcp_wrappers_7.6.gimli/Makefile +--- tcp_wrappers_7.6/Makefile 1997-03-21 12:27:21.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/Makefile 2002-07-15 16:07:21.000000000 -0500 +@@ -1,5 +1,10 @@ ++GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h) ++ + # @(#) Makefile 1.23 97/03/21 19:27:20 + ++# unset the HOSTNAME environment variable ++HOSTNAME = ++ + what: + @echo + @echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:" +@@ -19,7 +24,7 @@ + @echo " generic (most bsd-ish systems with sys5 compatibility)" + @echo " 386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543" + @echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix" +- @echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211" ++ @echo " linux gnu machten mips(untested) ncrsvr4 netbsd next osf power_unix_211" + @echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4" + @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2" + @echo " uts215 uxp" +@@ -43,8 +48,8 @@ + # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx + #REAL_DAEMON_DIR=/usr/etc + # +-# SysV.4 Solaris 2.x OSF AIX +-#REAL_DAEMON_DIR=/usr/sbin ++# SysV.4 Solaris 2.x OSF AIX Linux ++REAL_DAEMON_DIR=/usr/sbin + # + # BSD 4.4 + #REAL_DAEMON_DIR=/usr/libexec +@@ -141,10 +146,21 @@ + LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \ + EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all + ++ifneq ($(GLIBC),0) ++MYLIB=-lnsl ++endif ++ + linux: + @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ +- LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \ +- NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all ++ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ ++ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \ ++ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT" ++ ++gnu: ++ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ ++ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \ ++ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \ ++ EXTRA_CFLAGS="-DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT" + + # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. + hpux hpux8 hpux9 hpux10: +@@ -391,7 +407,7 @@ + # the ones provided with this source distribution. The environ.c module + # implements setenv(), getenv(), and putenv(). + +-AUX_OBJ= setenv.o ++#AUX_OBJ= setenv.o + #AUX_OBJ= environ.o + #AUX_OBJ= environ.o strcasecmp.o + +@@ -454,7 +470,8 @@ + # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work + # around this. The workaround does no harm on other Solaris versions. + +-BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK ++BUGS = ++#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK + #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG + #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG + +@@ -464,7 +481,7 @@ + # If your system supports NIS or YP-style netgroups, enable the following + # macro definition. Netgroups are used only for host access control. + # +-#NETGROUP= -DNETGROUP ++NETGROUP= -DNETGROUP + + ############################################################### + # System dependencies: whether or not your system has vsyslog() +@@ -491,7 +508,7 @@ + # Uncomment the next definition to turn on the language extensions + # (examples: allow, deny, banners, twist and spawn). + # +-#STYLE = -DPROCESS_OPTIONS # Enable language extensions. ++STYLE = -DPROCESS_OPTIONS # Enable language extensions. + + ################################################################ + # Optional: Changing the default disposition of logfile records +@@ -514,7 +531,7 @@ + # + # The LOG_XXX names below are taken from the /usr/include/syslog.h file. + +-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use ++FACILITY= LOG_DAEMON # LOG_MAIL is what most sendmail daemons use + + # The syslog priority at which successful connections are logged. + +@@ -610,7 +627,7 @@ + # Paranoid mode implies hostname lookup. In order to disable hostname + # lookups altogether, see the next section. + +-PARANOID= -DPARANOID ++#PARANOID= -DPARANOID + + ######################################## + # Optional: turning off hostname lookups +@@ -623,7 +640,7 @@ + # In order to perform selective hostname lookups, disable paranoid + # mode (see previous section) and comment out the following definition. + +-HOSTNAME= -DALWAYS_HOSTNAME ++#HOSTNAME= -DALWAYS_HOSTNAME + + ############################################# + # Optional: Turning on host ADDRESS checking +@@ -649,28 +666,46 @@ + # source-routed traffic in the kernel. Examples: 4.4BSD derivatives, + # Solaris 2.x, and Linux. See your system documentation for details. + # +-# KILL_OPT= -DKILL_IP_OPTIONS ++KILL_OPT= -DKILL_IP_OPTIONS + + ## End configuration options + ############################ + + # Protection against weird shells or weird make programs. + ++CC = gcc + SHELL = /bin/sh +-.c.o:; $(CC) $(CFLAGS) -c $*.c ++.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c ++ ++SOMAJOR = 0 ++SOMINOR = 7.6 ++ ++LIB = libwrap.a ++SHLIB = shared/libwrap.so.$(SOMAJOR).$(SOMINOR) ++SHLIBSOMAJ= shared/libwrap.so.$(SOMAJOR) ++SHLIBSO = shared/libwrap.so ++SHLIBFLAGS = -Lshared -lwrap + +-CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ ++shared/%.o: %.c ++ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@ ++ ++CFLAGS = -O2 -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ + $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ + -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ + -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ + $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ + $(VSYSLOG) $(HOSTNAME) + ++SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS) ++SHCFLAGS = -fPIC -shared -D_REENTRANT ++ + LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ + hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ + $(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \ + update.o misc.o diag.o percent_m.o myvsyslog.o + ++SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ)); ++ + FROM_OBJ= fromhost.o + + KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ +@@ -684,46 +719,80 @@ + refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ + scaffold.h tcpdmatch.8 README.NIS + +-LIB = libwrap.a +- +-all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk ++all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB) + + # Invalidate all object files when the compiler options (CFLAGS) have changed. + + config-check: + @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; } +- @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \ +- if cmp cflags /tmp/cflags.$$$$ ; \ +- then rm /tmp/cflags.$$$$ ; \ +- else mv /tmp/cflags.$$$$ cflags ; \ ++ @set +e; echo $(CFLAGS) >cflags.new ; \ ++ if cmp cflags cflags.new ; \ ++ then rm cflags.new ; \ ++ else mv cflags.new cflags ; \ + fi >/dev/null 2>/dev/null ++ @if [ ! -d shared ]; then mkdir shared; fi + + $(LIB): $(LIB_OBJ) + rm -f $(LIB) + $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ) + -$(RANLIB) $(LIB) + +-tcpd: tcpd.o $(LIB) +- $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS) ++$(SHLIB): $(SHLIB_OBJ) ++ rm -f $(SHLIB) ++ $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ) ++ ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ) ++ ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) ++ ++tcpd: tcpd.o $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS) + +-miscd: miscd.o $(LIB) +- $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS) ++miscd: miscd.o $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS) + +-safe_finger: safe_finger.o $(LIB) +- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS) ++safe_finger: safe_finger.o $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS) + + TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o + +-tcpdmatch: $(TCPDMATCH_OBJ) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS) ++tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) + +-try-from: try-from.o fakelog.o $(LIB) +- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS) ++try-from: try-from.o fakelog.o $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS) + + TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o + +-tcpdchk: $(TCPDCHK_OBJ) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS) ++tcpdchk: $(TCPDCHK_OBJ) $(SHLIB) ++ $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS) ++ ++install: install-lib install-bin install-dev ++ ++install-lib: ++ install -o root -g root -m 0755 $(SHLIB) ${DESTDIR}/usr/lib/ ++ ln -sf $(notdir $(SHLIB)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSOMAJ)) ++ ln -sf $(notdir $(SHLIBSOMAJ)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSO)) ++ ++install-bin: ++ install -o root -g root -m 0755 tcpd ${DESTDIR}/usr/sbin/ ++ install -o root -g root -m 0755 tcpdchk ${DESTDIR}/usr/sbin/ ++ install -o root -g root -m 0755 tcpdmatch ${DESTDIR}/usr/sbin/ ++ install -o root -g root -m 0755 try-from ${DESTDIR}/usr/sbin/ ++ install -o root -g root -m 0755 safe_finger ${DESTDIR}/usr/sbin/ ++ install -o root -g root -m 0644 tcpd.8 ${DESTDIR}/usr/share/man/man8/ ++ install -o root -g root -m 0644 tcpdchk.8 ${DESTDIR}/usr/share/man/man8/ ++ install -o root -g root -m 0644 try-from.8 ${DESTDIR}/usr/share/man/man8/ ++ install -o root -g root -m 0644 tcpdmatch.8 ${DESTDIR}/usr/share/man/man8/ ++ install -o root -g root -m 0644 safe_finger.8 ${DESTDIR}/usr/share/man/man8/ ++ install -o root -g root -m 0644 hosts_access.5 ${DESTDIR}/usr/share/man/man5/ ++ install -o root -g root -m 0644 hosts_options.5 ${DESTDIR}/usr/share/man/man5/ ++ ++install-dev: ++ install -o root -g root -m 0644 hosts_access.3 ${DESTDIR}/usr/share/man/man3/ ++ install -o root -g root -m 0644 tcpd.h ${DESTDIR}/usr/include/ ++ install -o root -g root -m 0644 $(LIB) ${DESTDIR}/usr/lib/ ++ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/hosts_ctl.3 ++ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_init.3 ++ ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_set.3 + + shar: $(KIT) + @shar $(KIT) +@@ -739,7 +808,8 @@ + + clean: + rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ +- cflags ++ cflags libwrap*.so* ++ rm -rf shared + + tidy: clean + chmod -R a+r . +@@ -885,5 +955,6 @@ + update.o: mystdarg.h + update.o: tcpd.h + vfprintf.o: cflags ++weak_symbols.o: tcpd.h + workarounds.o: cflags + workarounds.o: tcpd.h +diff -Naur tcp_wrappers_7.6/fix_options.c tcp_wrappers_7.6.gimli/fix_options.c +--- tcp_wrappers_7.6/fix_options.c 1997-04-07 19:29:19.000000000 -0500 ++++ tcp_wrappers_7.6.gimli/fix_options.c 2002-01-07 08:50:19.000000000 -0600 +@@ -35,7 +35,12 @@ + #ifdef IP_OPTIONS + unsigned char optbuf[BUFFER_SIZE / 3], *cp; + char lbuf[BUFFER_SIZE], *lp; ++#if !defined(__GLIBC__) + int optsize = sizeof(optbuf), ipproto; ++#else /* __GLIBC__ */ ++ size_t optsize = sizeof(optbuf); ++ int ipproto; ++#endif /* __GLIBC__ */ + struct protoent *ip; + int fd = request->fd; + unsigned int opt; +diff -Naur tcp_wrappers_7.6/hosts_access.3 tcp_wrappers_7.6.gimli/hosts_access.3 +--- tcp_wrappers_7.6/hosts_access.3 1996-02-11 10:01:27.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/hosts_access.3 2002-01-07 08:50:19.000000000 -0600 +@@ -3,7 +3,7 @@ + hosts_access, hosts_ctl, request_init, request_set \- access control library + .SH SYNOPSIS + .nf +-#include "tcpd.h" ++#include <tcpd.h> + + extern int allow_severity; + extern int deny_severity; +diff -Naur tcp_wrappers_7.6/hosts_access.5 tcp_wrappers_7.6.gimli/hosts_access.5 +--- tcp_wrappers_7.6/hosts_access.5 1995-01-30 12:51:47.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/hosts_access.5 2002-01-07 08:50:19.000000000 -0600 +@@ -8,9 +8,9 @@ + impatient reader is encouraged to skip to the EXAMPLES section for a + quick introduction. + .PP +-An extended version of the access control language is described in the +-\fIhosts_options\fR(5) document. The extensions are turned on at +-program build time by building with -DPROCESS_OPTIONS. ++The extended version of the access control language is described in the ++\fIhosts_options\fR(5) document. \fBNote that this language supersedes ++the meaning of \fIshell_command\fB as documented below.\fR + .PP + In the following text, \fIdaemon\fR is the the process name of a + network daemon process, and \fIclient\fR is the name and/or address of +@@ -40,7 +40,7 @@ + character. This permits you to break up long lines so that they are + easier to edit. + .IP \(bu +-Blank lines or lines that begin with a `#\' character are ignored. ++Blank lines or lines that begin with a `#' character are ignored. + This permits you to insert comments and whitespace so that the tables + are easier to read. + .IP \(bu +@@ -69,26 +69,33 @@ + .SH PATTERNS + The access control language implements the following patterns: + .IP \(bu +-A string that begins with a `.\' character. A host name is matched if ++A string that begins with a `.' character. A host name is matched if + the last components of its name match the specified pattern. For +-example, the pattern `.tue.nl\' matches the host name +-`wzv.win.tue.nl\'. ++example, the pattern `.tue.nl' matches the host name ++`wzv.win.tue.nl'. + .IP \(bu +-A string that ends with a `.\' character. A host address is matched if ++A string that ends with a `.' character. A host address is matched if + its first numeric fields match the given string. For example, the +-pattern `131.155.\' matches the address of (almost) every host on the ++pattern `131.155.' matches the address of (almost) every host on the + Eind\%hoven University network (131.155.x.x). + .IP \(bu +-A string that begins with an `@\' character is treated as an NIS ++A string that begins with an `@' character is treated as an NIS + (formerly YP) netgroup name. A host name is matched if it is a host + member of the specified netgroup. Netgroup matches are not supported + for daemon process names or for client user names. + .IP \(bu +-An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a +-`net/mask\' pair. A host address is matched if `net\' is equal to the +-bitwise AND of the address and the `mask\'. For example, the net/mask +-pattern `131.155.72.0/255.255.254.0\' matches every address in the +-range `131.155.72.0\' through `131.155.73.255\'. ++An expression of the form `n.n.n.n/m.m.m.m' is interpreted as a ++`net/mask' pair. A host address is matched if `net' is equal to the ++bitwise AND of the address and the `mask'. For example, the net/mask ++pattern `131.155.72.0/255.255.254.0' matches every address in the ++range `131.155.72.0' through `131.155.73.255'. ++.IP \(bu ++A string that begins with a `/' character is treated as a file ++name. A host name or address is matched if it matches any host name ++or address pattern listed in the named file. The file format is ++zero or more lines with zero or more host name or address patterns ++separated by whitespace. A file name pattern can be used anywhere ++a host name or address pattern can be used. + .SH WILDCARDS + The access control language supports explicit wildcards: + .IP ALL +@@ -115,19 +122,19 @@ + .ne 6 + .SH OPERATORS + .IP EXCEPT +-Intended use is of the form: `list_1 EXCEPT list_2\'; this construct ++Intended use is of the form: `list_1 EXCEPT list_2'; this construct + matches anything that matches \fIlist_1\fR unless it matches + \fIlist_2\fR. The EXCEPT operator can be used in daemon_lists and in + client_lists. The EXCEPT operator can be nested: if the control +-language would permit the use of parentheses, `a EXCEPT b EXCEPT c\' +-would parse as `(a EXCEPT (b EXCEPT c))\'. ++language would permit the use of parentheses, `a EXCEPT b EXCEPT c' ++would parse as `(a EXCEPT (b EXCEPT c))'. + .br + .ne 6 + .SH SHELL COMMANDS + If the first-matched access control rule contains a shell command, that + command is subjected to %<letter> substitutions (see next section). + The result is executed by a \fI/bin/sh\fR child process with standard +-input, output and error connected to \fI/dev/null\fR. Specify an `&\' ++input, output and error connected to \fI/dev/null\fR. Specify an `&' + at the end of the command if you do not want to wait until it has + completed. + .PP +@@ -159,7 +166,7 @@ + .IP %u + The client user name (or "unknown"). + .IP %% +-Expands to a single `%\' character. ++Expands to a single `%' character. + .PP + Characters in % expansions that may confuse the shell are replaced by + underscores. +@@ -243,9 +250,9 @@ + less trustworthy. It is possible for an intruder to spoof both the + client connection and the IDENT lookup, although doing so is much + harder than spoofing just a client connection. It may also be that +-the client\'s IDENT server is lying. ++the client's IDENT server is lying. + .PP +-Note: IDENT lookups don\'t work with UDP services. ++Note: IDENT lookups don't work with UDP services. + .SH EXAMPLES + The language is flexible enough that different types of access control + policy can be expressed with a minimum of fuss. Although the language +@@ -285,7 +292,7 @@ + .br + ALL: .foobar.edu EXCEPT terminalserver.foobar.edu + .PP +-The first rule permits access from hosts in the local domain (no `.\' ++The first rule permits access from hosts in the local domain (no `.' + in the host name) and from members of the \fIsome_netgroup\fP + netgroup. The second rule permits access from all hosts in the + \fIfoobar.edu\fP domain (notice the leading dot), with the exception of +@@ -322,8 +329,8 @@ + /etc/hosts.deny: + .in +3 + .nf +-in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\ +- /usr/ucb/mail -s %d-%h root) & ++in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\ ++ /usr/bin/mail -s %d-%h root) & + .fi + .PP + The safe_finger command comes with the tcpd wrapper and should be +@@ -349,7 +356,7 @@ + capacity of an internal buffer; when an access control rule is not + terminated by a newline character; when the result of %<letter> + expansion would overflow an internal buffer; when a system call fails +-that shouldn\'t. All problems are reported via the syslog daemon. ++that shouldn't. All problems are reported via the syslog daemon. + .SH FILES + .na + .nf +diff -Naur tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.gimli/hosts_access.c +--- tcp_wrappers_7.6/hosts_access.c 1997-02-11 19:13:23.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/hosts_access.c 2002-01-07 08:50:19.000000000 -0600 +@@ -240,6 +240,26 @@ + } + } + ++/* hostfile_match - look up host patterns from file */ ++ ++static int hostfile_match(path, host) ++char *path; ++struct hosts_info *host; ++{ ++ char tok[BUFSIZ]; ++ int match = NO; ++ FILE *fp; ++ ++ if ((fp = fopen(path, "r")) != 0) { ++ while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host))) ++ /* void */ ; ++ fclose(fp); ++ } else if (errno != ENOENT) { ++ tcpd_warn("open %s: %m", path); ++ } ++ return (match); ++} ++ + /* host_match - match host name and/or address against pattern */ + + static int host_match(tok, host) +@@ -267,6 +287,8 @@ + tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */ + return (NO); + #endif ++ } else if (tok[0] == '/') { /* /file hack */ ++ return (hostfile_match(tok, host)); + } else if (STR_EQ(tok, "KNOWN")) { /* check address and name */ + char *name = eval_hostname(host); + return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name)); +diff -Naur tcp_wrappers_7.6/hosts_options.5 tcp_wrappers_7.6.gimli/hosts_options.5 +--- tcp_wrappers_7.6/hosts_options.5 1994-12-28 10:42:29.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/hosts_options.5 2002-01-07 08:50:19.000000000 -0600 +@@ -58,12 +58,12 @@ + Execute, in a child process, the specified shell command, after + performing the %<letter> expansions described in the hosts_access(5) + manual page. The command is executed with stdin, stdout and stderr +-connected to the null device, so that it won\'t mess up the ++connected to the null device, so that it won't mess up the + conversation with the client host. Example: + .sp + .nf + .ti +3 +-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) & ++spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) & + .fi + .sp + executes, in a background child process, the shell command "safe_finger +diff -Naur tcp_wrappers_7.6/options.c tcp_wrappers_7.6.gimli/options.c +--- tcp_wrappers_7.6/options.c 1996-02-11 10:01:32.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/options.c 2002-01-07 08:50:19.000000000 -0600 +@@ -473,6 +473,9 @@ + #ifdef LOG_CRON + "cron", LOG_CRON, + #endif ++#ifdef LOG_FTP ++ "ftp", LOG_FTP, ++#endif + #ifdef LOG_LOCAL0 + "local0", LOG_LOCAL0, + #endif +diff -Naur tcp_wrappers_7.6/percent_m.c tcp_wrappers_7.6.gimli/percent_m.c +--- tcp_wrappers_7.6/percent_m.c 1994-12-28 10:42:37.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/percent_m.c 2002-01-07 08:50:19.000000000 -0600 +@@ -13,7 +13,7 @@ + #include <string.h> + + extern int errno; +-#ifndef SYS_ERRLIST_DEFINED ++#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR) + extern char *sys_errlist[]; + extern int sys_nerr; + #endif +@@ -29,11 +29,15 @@ + + while (*bp = *cp) + if (*cp == '%' && cp[1] == 'm') { ++#ifdef HAVE_STRERROR ++ strcpy(bp, strerror(errno)); ++#else + if (errno < sys_nerr && errno > 0) { + strcpy(bp, sys_errlist[errno]); + } else { + sprintf(bp, "Unknown error %d", errno); + } ++#endif + bp += strlen(bp); + cp += 2; + } else { +diff -Naur tcp_wrappers_7.6/rfc931.c tcp_wrappers_7.6.gimli/rfc931.c +--- tcp_wrappers_7.6/rfc931.c 1995-01-02 09:11:34.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/rfc931.c 2002-01-07 08:50:19.000000000 -0600 +@@ -33,7 +33,7 @@ + + int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */ + +-static jmp_buf timebuf; ++static sigjmp_buf timebuf; + + /* fsocket - open stdio stream on top of socket */ + +@@ -62,7 +62,7 @@ + static void timeout(sig) + int sig; + { +- longjmp(timebuf, sig); ++ siglongjmp(timebuf, sig); + } + + /* rfc931 - return remote user name, given socket structures */ +@@ -99,7 +99,7 @@ + * Set up a timer so we won't get stuck while waiting for the server. + */ + +- if (setjmp(timebuf) == 0) { ++ if (sigsetjmp(timebuf,1) == 0) { + signal(SIGALRM, timeout); + alarm(rfc931_timeout); + +diff -Naur tcp_wrappers_7.6/safe_finger.8 tcp_wrappers_7.6.gimli/safe_finger.8 +--- tcp_wrappers_7.6/safe_finger.8 1969-12-31 18:00:00.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/safe_finger.8 2002-01-07 08:50:19.000000000 -0600 +@@ -0,0 +1,34 @@ ++.TH SAFE_FINGER 8 "21th June 1997" Linux "Linux Programmer's Manual" ++.SH NAME ++safe_finger \- finger client wrapper that protects against nasty stuff ++from finger servers ++.SH SYNOPSIS ++.B safe_finger [finger_options] ++.SH DESCRIPTION ++The ++.B safe_finger ++command protects against nasty stuff from finger servers. Use this ++program for automatic reverse finger probes from the ++.B tcp_wrapper ++.B (tcpd) ++, not the raw finger command. The ++.B safe_finger ++command makes sure that the finger client is not run with root ++privileges. It also runs the finger client with a defined PATH ++environment. ++.B safe_finger ++will also protect you from problems caused by the output of some ++finger servers. The problem: some programs may react to stuff in ++the first column. Other programs may get upset by thrash anywhere ++on a line. File systems may fill up as the finger server keeps ++sending data. Text editors may bomb out on extremely long lines. ++The finger server may take forever because it is somehow wedged. ++.B safe_finger ++takes care of all this badness. ++.SH SEE ALSO ++.BR hosts_access (5), ++.BR hosts_options (5), ++.BR tcpd (8) ++.SH AUTHOR ++Wietse Venema, Eindhoven University of Technology, The Netherlands. ++ +diff -Naur tcp_wrappers_7.6/safe_finger.c tcp_wrappers_7.6.gimli/safe_finger.c +--- tcp_wrappers_7.6/safe_finger.c 1994-12-28 10:42:42.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/safe_finger.c 2002-01-07 08:50:19.000000000 -0600 +@@ -26,21 +26,24 @@ + #include <stdio.h> + #include <ctype.h> + #include <pwd.h> ++#include <syslog.h> + + extern void exit(); + + /* Local stuff */ + +-char path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin"; ++char path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin"; + + #define TIME_LIMIT 60 /* Do not keep listinging forever */ + #define INPUT_LENGTH 100000 /* Do not keep listinging forever */ + #define LINE_LENGTH 128 /* Editors can choke on long lines */ + #define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */ + #define UNPRIV_NAME "nobody" /* Preferred privilege level */ +-#define UNPRIV_UGID 32767 /* Default uid and gid */ ++#define UNPRIV_UGID 65534 /* Default uid and gid */ + + int finger_pid; ++int allow_severity = SEVERITY; ++int deny_severity = LOG_WARNING; + + void cleanup(sig) + int sig; +diff -Naur tcp_wrappers_7.6/scaffold.c tcp_wrappers_7.6.gimli/scaffold.c +--- tcp_wrappers_7.6/scaffold.c 1997-03-21 12:27:24.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/scaffold.c 2002-01-07 08:50:19.000000000 -0600 +@@ -180,10 +180,12 @@ + + /* ARGSUSED */ + +-void rfc931(request) +-struct request_info *request; ++void rfc931(rmt_sin, our_sin, dest) ++struct sockaddr_in *rmt_sin; ++struct sockaddr_in *our_sin; ++char *dest; + { +- strcpy(request->user, unknown); ++ strcpy(dest, unknown); + } + + /* check_path - examine accessibility */ +diff -Naur tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.gimli/socket.c +--- tcp_wrappers_7.6/socket.c 1997-03-21 12:27:25.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/socket.c 2002-01-07 08:50:19.000000000 -0600 +@@ -76,7 +76,11 @@ + { + static struct sockaddr_in client; + static struct sockaddr_in server; ++#if !defined (__GLIBC__) + int len; ++#else /* __GLIBC__ */ ++ size_t len; ++#endif /* __GLIBC__ */ + char buf[BUFSIZ]; + int fd = request->fd; + +@@ -224,7 +228,11 @@ + { + char buf[BUFSIZ]; + struct sockaddr_in sin; ++#if !defined(__GLIBC__) + int size = sizeof(sin); ++#else /* __GLIBC__ */ ++ size_t size = sizeof(sin); ++#endif /* __GLIBC__ */ + + /* + * Eat up the not-yet received datagram. Some systems insist on a +diff -Naur tcp_wrappers_7.6/tcpd.8 tcp_wrappers_7.6.gimli/tcpd.8 +--- tcp_wrappers_7.6/tcpd.8 1996-02-21 09:39:16.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/tcpd.8 2002-01-07 08:50:19.000000000 -0600 +@@ -94,7 +94,7 @@ + .PP + The example assumes that the network daemons live in /usr/etc. On some + systems, network daemons live in /usr/sbin or in /usr/libexec, or have +-no `in.\' prefix to their name. ++no `in.' prefix to their name. + .SH EXAMPLE 2 + This example applies when \fItcpd\fR expects that the network daemons + are left in their original place. +@@ -110,26 +110,26 @@ + becomes: + .sp + .ti +5 +-finger stream tcp nowait nobody /some/where/tcpd in.fingerd ++finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd + .sp + .fi + .PP + The example assumes that the network daemons live in /usr/etc. On some + systems, network daemons live in /usr/sbin or in /usr/libexec, the +-daemons have no `in.\' prefix to their name, or there is no userid ++daemons have no `in.' prefix to their name, or there is no userid + field in the inetd configuration file. + .PP + Similar changes will be needed for the other services that are to be +-covered by \fItcpd\fR. Send a `kill -HUP\' to the \fIinetd\fR(8) ++covered by \fItcpd\fR. Send a `kill -HUP' to the \fIinetd\fR(8) + process to make the changes effective. AIX users may also have to +-execute the `inetimp\' command. ++execute the `inetimp' command. + .SH EXAMPLE 3 + In the case of daemons that do not live in a common directory ("secret" + or otherwise), edit the \fIinetd\fR configuration file so that it + specifies an absolute path name for the process name field. For example: + .nf + .sp +- ntalk dgram udp wait root /some/where/tcpd /usr/local/lib/ntalkd ++ ntalk dgram udp wait root /usr/sbin/tcpd /usr/sbin/in.ntalkd + .sp + .fi + .PP +diff -Naur tcp_wrappers_7.6/tcpd.h tcp_wrappers_7.6.gimli/tcpd.h +--- tcp_wrappers_7.6/tcpd.h 1996-03-19 09:22:25.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/tcpd.h 2002-01-07 08:50:19.000000000 -0600 +@@ -4,6 +4,25 @@ + * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. + */ + ++#ifndef _TCPWRAPPERS_TCPD_H ++#define _TCPWRAPPERS_TCPD_H ++ ++/* someone else may have defined this */ ++#undef __P ++ ++/* use prototypes if we have an ANSI C compiler or are using C++ */ ++#if defined(__STDC__) || defined(__cplusplus) ++#define __P(args) args ++#else ++#define __P(args) () ++#endif ++ ++/* Need definitions of struct sockaddr_in and FILE. */ ++#include <netinet/in.h> ++#include <stdio.h> ++ ++__BEGIN_DECLS ++ + /* Structure to describe one communications endpoint. */ + + #define STRING_LENGTH 128 /* hosts, users, processes */ +@@ -25,10 +44,10 @@ + char pid[10]; /* access via eval_pid(request) */ + struct host_info client[1]; /* client endpoint info */ + struct host_info server[1]; /* server endpoint info */ +- void (*sink) (); /* datagram sink function or 0 */ +- void (*hostname) (); /* address to printable hostname */ +- void (*hostaddr) (); /* address to printable address */ +- void (*cleanup) (); /* cleanup function or 0 */ ++ void (*sink) __P((int)); /* datagram sink function or 0 */ ++ void (*hostname) __P((struct host_info *)); /* address to printable hostname */ ++ void (*hostaddr) __P((struct host_info *)); /* address to printable address */ ++ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ + struct netconfig *config; /* netdir handle */ + }; + +@@ -61,25 +80,30 @@ + /* Global functions. */ + + #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) +-extern void fromhost(); /* get/validate client host info */ ++extern void fromhost __P((struct request_info *)); /* get/validate client host info */ + #else + #define fromhost sock_host /* no TLI support needed */ + #endif + +-extern int hosts_access(); /* access control */ +-extern void shell_cmd(); /* execute shell command */ +-extern char *percent_x(); /* do %<char> expansion */ +-extern void rfc931(); /* client name from RFC 931 daemon */ +-extern void clean_exit(); /* clean up and exit */ +-extern void refuse(); /* clean up and exit */ +-extern char *xgets(); /* fgets() on steroids */ +-extern char *split_at(); /* strchr() and split */ +-extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ ++extern void shell_cmd __P((char *)); /* execute shell command */ ++extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */ ++extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ ++extern void clean_exit __P((struct request_info *)); /* clean up and exit */ ++extern void refuse __P((struct request_info *)); /* clean up and exit */ ++extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ ++extern char *split_at __P((char *, int)); /* strchr() and split */ ++extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ + + /* Global variables. */ + ++#ifdef HAVE_WEAKSYMS ++extern int allow_severity __attribute__ ((weak)); /* for connection logging */ ++extern int deny_severity __attribute__ ((weak)); /* for connection logging */ ++#else + extern int allow_severity; /* for connection logging */ + extern int deny_severity; /* for connection logging */ ++#endif ++ + extern char *hosts_allow_table; /* for verification mode redirection */ + extern char *hosts_deny_table; /* for verification mode redirection */ + extern int hosts_access_verbose; /* for verbose matching mode */ +@@ -92,9 +116,14 @@ + */ + + #ifdef __STDC__ ++extern int hosts_access(struct request_info *request); ++extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, ++ char *client_user); + extern struct request_info *request_init(struct request_info *,...); + extern struct request_info *request_set(struct request_info *,...); + #else ++extern int hosts_access(); ++extern int hosts_ctl(); + extern struct request_info *request_init(); /* initialize request */ + extern struct request_info *request_set(); /* update request structure */ + #endif +@@ -117,27 +146,31 @@ + * host_info structures serve as caches for the lookup results. + */ + +-extern char *eval_user(); /* client user */ +-extern char *eval_hostname(); /* printable hostname */ +-extern char *eval_hostaddr(); /* printable host address */ +-extern char *eval_hostinfo(); /* host name or address */ +-extern char *eval_client(); /* whatever is available */ +-extern char *eval_server(); /* whatever is available */ ++extern char *eval_user __P((struct request_info *)); /* client user */ ++extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ ++extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ ++extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ ++extern char *eval_client __P((struct request_info *)); /* whatever is available */ ++extern char *eval_server __P((struct request_info *)); /* whatever is available */ + #define eval_daemon(r) ((r)->daemon) /* daemon process name */ + #define eval_pid(r) ((r)->pid) /* process id */ + + /* Socket-specific methods, including DNS hostname lookups. */ + +-extern void sock_host(); /* look up endpoint addresses */ +-extern void sock_hostname(); /* translate address to hostname */ +-extern void sock_hostaddr(); /* address to printable address */ ++/* look up endpoint addresses */ ++extern void sock_host __P((struct request_info *)); ++/* translate address to hostname */ ++extern void sock_hostname __P((struct host_info *)); ++/* address to printable address */ ++extern void sock_hostaddr __P((struct host_info *)); ++ + #define sock_methods(r) \ + { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } + + /* The System V Transport-Level Interface (TLI) interface. */ + + #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) +-extern void tli_host(); /* look up endpoint addresses etc. */ ++extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ + #endif + + /* +@@ -178,7 +211,7 @@ + * behavior. + */ + +-extern void process_options(); /* execute options */ ++extern void process_options __P((char *, struct request_info *)); /* execute options */ + extern int dry_run; /* verification flag */ + + /* Bug workarounds. */ +@@ -217,3 +250,7 @@ + #define strtok my_strtok + extern char *my_strtok(); + #endif ++ ++__END_DECLS ++ ++#endif /* tcpd.h */ +diff -Naur tcp_wrappers_7.6/tcpdchk.c tcp_wrappers_7.6.gimli/tcpdchk.c +--- tcp_wrappers_7.6/tcpdchk.c 1997-02-11 19:13:25.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/tcpdchk.c 2002-01-07 08:50:19.000000000 -0600 +@@ -350,6 +350,8 @@ + { + if (pat[0] == '@') { + tcpd_warn("%s: daemon name begins with \"@\"", pat); ++ } else if (pat[0] == '/') { ++ tcpd_warn("%s: daemon name begins with \"/\"", pat); + } else if (pat[0] == '.') { + tcpd_warn("%s: daemon name begins with dot", pat); + } else if (pat[strlen(pat) - 1] == '.') { +@@ -382,6 +384,8 @@ + { + if (pat[0] == '@') { /* @netgroup */ + tcpd_warn("%s: user name begins with \"@\"", pat); ++ } else if (pat[0] == '/') { ++ tcpd_warn("%s: user name begins with \"/\"", pat); + } else if (pat[0] == '.') { + tcpd_warn("%s: user name begins with dot", pat); + } else if (pat[strlen(pat) - 1] == '.') { +@@ -402,8 +406,13 @@ + static int check_host(pat) + char *pat; + { ++ char buf[BUFSIZ]; + char *mask; + int addr_count = 1; ++ FILE *fp; ++ struct tcpd_context saved_context; ++ char *cp; ++ char *wsp = " \t\r\n"; + + if (pat[0] == '@') { /* @netgroup */ + #ifdef NO_NETGRENT +@@ -422,6 +431,21 @@ + tcpd_warn("netgroup support disabled"); + #endif + #endif ++ } else if (pat[0] == '/') { /* /path/name */ ++ if ((fp = fopen(pat, "r")) != 0) { ++ saved_context = tcpd_context; ++ tcpd_context.file = pat; ++ tcpd_context.line = 0; ++ while (fgets(buf, sizeof(buf), fp)) { ++ tcpd_context.line++; ++ for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp)) ++ check_host(cp); ++ } ++ tcpd_context = saved_context; ++ fclose(fp); ++ } else if (errno != ENOENT) { ++ tcpd_warn("open %s: %m", pat); ++ } + } else if (mask = split_at(pat, '/')) { /* network/netmask */ + if (dot_quad_addr(pat) == INADDR_NONE + || dot_quad_addr(mask) == INADDR_NONE) +diff -Naur tcp_wrappers_7.6/try-from.8 tcp_wrappers_7.6.gimli/try-from.8 +--- tcp_wrappers_7.6/try-from.8 1969-12-31 18:00:00.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/try-from.8 2002-01-07 08:50:19.000000000 -0600 +@@ -0,0 +1,28 @@ ++.TH TRY-FROM 8 "21th June 1997" Linux "Linux Programmer's Manual" ++.SH NAME ++try-from \- test program for the tcp_wrapper ++.SH SYNOPSIS ++.B try-from ++.SH DESCRIPTION ++The ++.B try-from ++command can be called via a remote shell command to find out ++if the hostname and address are properly recognized ++by the ++.B tcp_wrapper ++library, if username lookup works, and (SysV only) if the TLI ++on top of IP heuristics work. Diagnostics are reported through ++.BR syslog (3) ++and redirected to stderr. ++ ++Example: ++ ++rsh host /some/where/try-from ++ ++.SH SEE ALSO ++.BR hosts_access (5), ++.BR hosts_options (5), ++.BR tcpd (8) ++.SH AUTHOR ++Wietse Venema, Eindhoven University of Technology, The Netherlands. ++ +diff -Naur tcp_wrappers_7.6/weak_symbols.c tcp_wrappers_7.6.gimli/weak_symbols.c +--- tcp_wrappers_7.6/weak_symbols.c 1969-12-31 18:00:00.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/weak_symbols.c 2002-01-07 08:50:19.000000000 -0600 +@@ -0,0 +1,11 @@ ++ /* ++ * @(#) weak_symbols.h 1.5 99/12/29 23:50 ++ * ++ * Author: Anthony Towns <ajt@debian.org> ++ */ ++ ++#ifdef HAVE_WEAKSYMS ++#include <syslog.h> ++int deny_severity = LOG_WARNING; ++int allow_severity = SEVERITY; ++#endif +diff -Naur tcp_wrappers_7.6/workarounds.c tcp_wrappers_7.6.gimli/workarounds.c +--- tcp_wrappers_7.6/workarounds.c 1996-03-19 09:22:26.000000000 -0600 ++++ tcp_wrappers_7.6.gimli/workarounds.c 2002-01-07 08:50:19.000000000 -0600 +@@ -163,7 +163,11 @@ + int fix_getpeername(sock, sa, len) + int sock; + struct sockaddr *sa; ++#if !defined(__GLIBC__) + int *len; ++#else /* __GLIBC__ */ ++size_t *len; ++#endif /* __GLIBC__ */ + { + int ret; + struct sockaddr_in *sin = (struct sockaddr_in *) sa; diff --git a/stage3/patches/common/xinetd-2.3.15-libtirpc-fixes.patch b/stage3/patches/common/xinetd-2.3.15-libtirpc-fixes.patch new file mode 100644 index 0000000..80b699e --- /dev/null +++ b/stage3/patches/common/xinetd-2.3.15-libtirpc-fixes.patch @@ -0,0 +1,44 @@ +diff -ur xinetd-2.3.15.orig/xinetd/Makefile.in xinetd-2.3.15.new/xinetd/Makefile.in +--- xinetd-2.3.15.orig/xinetd/Makefile.in 2005-03-30 18:15:28.000000000 -0500 ++++ xinetd-2.3.15.new/xinetd/Makefile.in 2012-09-08 22:54:43.315784175 -0400 +@@ -40,7 +40,7 @@ + + INSTALL_CMD = @INSTALL@ + +-LIBS = -lsio -lmisc -lxlog -lportable -lstr -lpset @LIBS@ ++LIBS = -lsio -lmisc -lxlog -lportable -lstr -lpset -ltirpc @LIBS@ + + INCLUDEDIR = -I../libs/include + LIBDIR = -L../libs/lib +diff -ur xinetd-2.3.15.orig/xinetd/itox.c xinetd-2.3.15.new/xinetd/itox.c +--- xinetd-2.3.15.orig/xinetd/itox.c 2007-09-20 13:13:24.000000000 -0400 ++++ xinetd-2.3.15.new/xinetd/itox.c 2012-09-08 22:54:43.329785955 -0400 +@@ -31,8 +31,8 @@ + int line_count ; + static void print_line( const char *name, const char *value ); + static char *next_word( const char *description ); +-static char *make_string_cat( register unsigned count, ... ); +-static char *make_pathname( register unsigned count, ... ); ++static char *make_string_cat( unsigned count, ... ); ++static char *make_pathname( unsigned count, ... ); + + + /* +@@ -219,7 +219,7 @@ + return( word ) ; + } + +-static char *make_string_cat( register unsigned count, ... ) ++static char *make_string_cat( unsigned count, ... ) + { + va_list ap ; + register unsigned i ; +@@ -268,7 +268,7 @@ + return newstring ; + } + +-static char *make_pathname( register unsigned count, ... ) ++static char *make_pathname( unsigned count, ... ) + { + va_list ap ; + register unsigned i ; diff --git a/stage4/patches/common/MesaLib-8.0.4-add_xdemos-3.patch b/stage4/patches/common/MesaLib-8.0.4-add_xdemos-3.patch new file mode 100644 index 0000000..44c2353 --- /dev/null +++ b/stage4/patches/common/MesaLib-8.0.4-add_xdemos-3.patch @@ -0,0 +1,2248 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-08-14 +Initial Package Version: 8.0.4 +Upstream Status: Not applicable +Origin: Based on dj's original patch. +Description: This patch adds two GL demos, glxinfo and glxgears. + It is based on dj's original patch, with refreshed demos + from upstream git repository, with fixed compiling when + shared libglapi is present and fixed installation process + that won't run install -c on DESTDIR/usr/bin if directory + exists. + +--- Mesa.orig/Makefile 2012-07-10 17:12:50.000000000 +0200 ++++ Mesa/Makefile 2012-08-14 14:57:46.490218691 +0200 +@@ -2,7 +2,7 @@ + + TOP = . + +-SUBDIRS = src ++SUBDIRS = src xdemos + + + # The git command below generates an empty string when we're not +--- Mesa.orig/xdemos/glxgears.c 1970-01-01 01:00:00.000000000 +0100 ++++ Mesa/xdemos/glxgears.c 2012-08-14 14:59:29.000000000 +0200 +@@ -0,0 +1,804 @@ ++/* ++ * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. ++ * ++ * 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 ++ * BRIAN PAUL 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. ++ */ ++ ++/* ++ * This is a port of the infamous "gears" demo to straight GLX (i.e. no GLUT) ++ * Port by Brian Paul 23 March 2001 ++ * ++ * See usage() below for command line options. ++ */ ++ ++ ++#include <math.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <string.h> ++#include <X11/Xlib.h> ++#include <X11/keysym.h> ++#include <GL/gl.h> ++#include <GL/glx.h> ++#include <GL/glxext.h> ++ ++#ifndef GLX_MESA_swap_control ++#define GLX_MESA_swap_control 1 ++typedef int (*PFNGLXGETSWAPINTERVALMESAPROC)(void); ++#endif ++ ++ ++#define BENCHMARK ++ ++#ifdef BENCHMARK ++ ++/* XXX this probably isn't very portable */ ++ ++#include <sys/time.h> ++#include <unistd.h> ++ ++/* return current time (in seconds) */ ++static double ++current_time(void) ++{ ++ struct timeval tv; ++#ifdef __VMS ++ (void) gettimeofday(&tv, NULL ); ++#else ++ struct timezone tz; ++ (void) gettimeofday(&tv, &tz); ++#endif ++ return (double) tv.tv_sec + tv.tv_usec / 1000000.0; ++} ++ ++#else /*BENCHMARK*/ ++ ++/* dummy */ ++static double ++current_time(void) ++{ ++ /* update this function for other platforms! */ ++ static double t = 0.0; ++ static int warn = 1; ++ if (warn) { ++ fprintf(stderr, "Warning: current_time() not implemented!!\n"); ++ warn = 0; ++ } ++ return t += 1.0; ++} ++ ++#endif /*BENCHMARK*/ ++ ++ ++ ++#ifndef M_PI ++#define M_PI 3.14159265 ++#endif ++ ++ ++/** Event handler results: */ ++#define NOP 0 ++#define EXIT 1 ++#define DRAW 2 ++ ++static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0; ++static GLint gear1, gear2, gear3; ++static GLfloat angle = 0.0; ++ ++static GLboolean fullscreen = GL_FALSE; /* Create a single fullscreen window */ ++static GLboolean stereo = GL_FALSE; /* Enable stereo. */ ++static GLint samples = 0; /* Choose visual with at least N samples. */ ++static GLboolean animate = GL_TRUE; /* Animation */ ++static GLfloat eyesep = 5.0; /* Eye separation. */ ++static GLfloat fix_point = 40.0; /* Fixation point distance. */ ++static GLfloat left, right, asp; /* Stereo frustum params. */ ++ ++ ++/* ++ * ++ * Draw a gear wheel. You'll probably want to call this function when ++ * building a display list since we do a lot of trig here. ++ * ++ * Input: inner_radius - radius of hole at center ++ * outer_radius - radius at center of teeth ++ * width - width of gear ++ * teeth - number of teeth ++ * tooth_depth - depth of tooth ++ */ ++static void ++gear(GLfloat inner_radius, GLfloat outer_radius, GLfloat width, ++ GLint teeth, GLfloat tooth_depth) ++{ ++ GLint i; ++ GLfloat r0, r1, r2; ++ GLfloat angle, da; ++ GLfloat u, v, len; ++ ++ r0 = inner_radius; ++ r1 = outer_radius - tooth_depth / 2.0; ++ r2 = outer_radius + tooth_depth / 2.0; ++ ++ da = 2.0 * M_PI / teeth / 4.0; ++ ++ glShadeModel(GL_FLAT); ++ ++ glNormal3f(0.0, 0.0, 1.0); ++ ++ /* draw front face */ ++ glBegin(GL_QUAD_STRIP); ++ for (i = 0; i <= teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5); ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5); ++ if (i < teeth) { ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5); ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ width * 0.5); ++ } ++ } ++ glEnd(); ++ ++ /* draw front sides of teeth */ ++ glBegin(GL_QUADS); ++ da = 2.0 * M_PI / teeth / 4.0; ++ for (i = 0; i < teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5); ++ glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5); ++ glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), ++ width * 0.5); ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ width * 0.5); ++ } ++ glEnd(); ++ ++ glNormal3f(0.0, 0.0, -1.0); ++ ++ /* draw back face */ ++ glBegin(GL_QUAD_STRIP); ++ for (i = 0; i <= teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5); ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5); ++ if (i < teeth) { ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ -width * 0.5); ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5); ++ } ++ } ++ glEnd(); ++ ++ /* draw back sides of teeth */ ++ glBegin(GL_QUADS); ++ da = 2.0 * M_PI / teeth / 4.0; ++ for (i = 0; i < teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ -width * 0.5); ++ glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), ++ -width * 0.5); ++ glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5); ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5); ++ } ++ glEnd(); ++ ++ /* draw outward faces of teeth */ ++ glBegin(GL_QUAD_STRIP); ++ for (i = 0; i < teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), width * 0.5); ++ glVertex3f(r1 * cos(angle), r1 * sin(angle), -width * 0.5); ++ u = r2 * cos(angle + da) - r1 * cos(angle); ++ v = r2 * sin(angle + da) - r1 * sin(angle); ++ len = sqrt(u * u + v * v); ++ u /= len; ++ v /= len; ++ glNormal3f(v, -u, 0.0); ++ glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), width * 0.5); ++ glVertex3f(r2 * cos(angle + da), r2 * sin(angle + da), -width * 0.5); ++ glNormal3f(cos(angle), sin(angle), 0.0); ++ glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), ++ width * 0.5); ++ glVertex3f(r2 * cos(angle + 2 * da), r2 * sin(angle + 2 * da), ++ -width * 0.5); ++ u = r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da); ++ v = r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da); ++ glNormal3f(v, -u, 0.0); ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ width * 0.5); ++ glVertex3f(r1 * cos(angle + 3 * da), r1 * sin(angle + 3 * da), ++ -width * 0.5); ++ glNormal3f(cos(angle), sin(angle), 0.0); ++ } ++ ++ glVertex3f(r1 * cos(0), r1 * sin(0), width * 0.5); ++ glVertex3f(r1 * cos(0), r1 * sin(0), -width * 0.5); ++ ++ glEnd(); ++ ++ glShadeModel(GL_SMOOTH); ++ ++ /* draw inside radius cylinder */ ++ glBegin(GL_QUAD_STRIP); ++ for (i = 0; i <= teeth; i++) { ++ angle = i * 2.0 * M_PI / teeth; ++ glNormal3f(-cos(angle), -sin(angle), 0.0); ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), -width * 0.5); ++ glVertex3f(r0 * cos(angle), r0 * sin(angle), width * 0.5); ++ } ++ glEnd(); ++} ++ ++ ++static void ++draw(void) ++{ ++ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); ++ ++ glPushMatrix(); ++ glRotatef(view_rotx, 1.0, 0.0, 0.0); ++ glRotatef(view_roty, 0.0, 1.0, 0.0); ++ glRotatef(view_rotz, 0.0, 0.0, 1.0); ++ ++ glPushMatrix(); ++ glTranslatef(-3.0, -2.0, 0.0); ++ glRotatef(angle, 0.0, 0.0, 1.0); ++ glCallList(gear1); ++ glPopMatrix(); ++ ++ glPushMatrix(); ++ glTranslatef(3.1, -2.0, 0.0); ++ glRotatef(-2.0 * angle - 9.0, 0.0, 0.0, 1.0); ++ glCallList(gear2); ++ glPopMatrix(); ++ ++ glPushMatrix(); ++ glTranslatef(-3.1, 4.2, 0.0); ++ glRotatef(-2.0 * angle - 25.0, 0.0, 0.0, 1.0); ++ glCallList(gear3); ++ glPopMatrix(); ++ ++ glPopMatrix(); ++} ++ ++ ++static void ++draw_gears(void) ++{ ++ if (stereo) { ++ /* First left eye. */ ++ glDrawBuffer(GL_BACK_LEFT); ++ ++ glMatrixMode(GL_PROJECTION); ++ glLoadIdentity(); ++ glFrustum(left, right, -asp, asp, 5.0, 60.0); ++ ++ glMatrixMode(GL_MODELVIEW); ++ ++ glPushMatrix(); ++ glTranslated(+0.5 * eyesep, 0.0, 0.0); ++ draw(); ++ glPopMatrix(); ++ ++ /* Then right eye. */ ++ glDrawBuffer(GL_BACK_RIGHT); ++ ++ glMatrixMode(GL_PROJECTION); ++ glLoadIdentity(); ++ glFrustum(-right, -left, -asp, asp, 5.0, 60.0); ++ ++ glMatrixMode(GL_MODELVIEW); ++ ++ glPushMatrix(); ++ glTranslated(-0.5 * eyesep, 0.0, 0.0); ++ draw(); ++ glPopMatrix(); ++ } ++ else { ++ draw(); ++ } ++} ++ ++ ++/** Draw single frame, do SwapBuffers, compute FPS */ ++static void ++draw_frame(Display *dpy, Window win) ++{ ++ static int frames = 0; ++ static double tRot0 = -1.0, tRate0 = -1.0; ++ double dt, t = current_time(); ++ ++ if (tRot0 < 0.0) ++ tRot0 = t; ++ dt = t - tRot0; ++ tRot0 = t; ++ ++ if (animate) { ++ /* advance rotation for next frame */ ++ angle += 70.0 * dt; /* 70 degrees per second */ ++ if (angle > 3600.0) ++ angle -= 3600.0; ++ } ++ ++ draw_gears(); ++ glXSwapBuffers(dpy, win); ++ ++ frames++; ++ ++ if (tRate0 < 0.0) ++ tRate0 = t; ++ if (t - tRate0 >= 5.0) { ++ GLfloat seconds = t - tRate0; ++ GLfloat fps = frames / seconds; ++ printf("%d frames in %3.1f seconds = %6.3f FPS\n", frames, seconds, ++ fps); ++ fflush(stdout); ++ tRate0 = t; ++ frames = 0; ++ } ++} ++ ++ ++/* new window size or exposure */ ++static void ++reshape(int width, int height) ++{ ++ glViewport(0, 0, (GLint) width, (GLint) height); ++ ++ if (stereo) { ++ GLfloat w; ++ ++ asp = (GLfloat) height / (GLfloat) width; ++ w = fix_point * (1.0 / 5.0); ++ ++ left = -5.0 * ((w - 0.5 * eyesep) / fix_point); ++ right = 5.0 * ((w + 0.5 * eyesep) / fix_point); ++ } ++ else { ++ GLfloat h = (GLfloat) height / (GLfloat) width; ++ ++ glMatrixMode(GL_PROJECTION); ++ glLoadIdentity(); ++ glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0); ++ } ++ ++ glMatrixMode(GL_MODELVIEW); ++ glLoadIdentity(); ++ glTranslatef(0.0, 0.0, -40.0); ++} ++ ++ ++ ++static void ++init(void) ++{ ++ static GLfloat pos[4] = { 5.0, 5.0, 10.0, 0.0 }; ++ static GLfloat red[4] = { 0.8, 0.1, 0.0, 1.0 }; ++ static GLfloat green[4] = { 0.0, 0.8, 0.2, 1.0 }; ++ static GLfloat blue[4] = { 0.2, 0.2, 1.0, 1.0 }; ++ ++ glLightfv(GL_LIGHT0, GL_POSITION, pos); ++ glEnable(GL_CULL_FACE); ++ glEnable(GL_LIGHTING); ++ glEnable(GL_LIGHT0); ++ glEnable(GL_DEPTH_TEST); ++ ++ /* make the gears */ ++ gear1 = glGenLists(1); ++ glNewList(gear1, GL_COMPILE); ++ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, red); ++ gear(1.0, 4.0, 1.0, 20, 0.7); ++ glEndList(); ++ ++ gear2 = glGenLists(1); ++ glNewList(gear2, GL_COMPILE); ++ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, green); ++ gear(0.5, 2.0, 2.0, 10, 0.7); ++ glEndList(); ++ ++ gear3 = glGenLists(1); ++ glNewList(gear3, GL_COMPILE); ++ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, blue); ++ gear(1.3, 2.0, 0.5, 10, 0.7); ++ glEndList(); ++ ++ glEnable(GL_NORMALIZE); ++} ++ ++ ++/** ++ * Remove window border/decorations. ++ */ ++static void ++no_border( Display *dpy, Window w) ++{ ++ static const unsigned MWM_HINTS_DECORATIONS = (1 << 1); ++ static const int PROP_MOTIF_WM_HINTS_ELEMENTS = 5; ++ ++ typedef struct ++ { ++ unsigned long flags; ++ unsigned long functions; ++ unsigned long decorations; ++ long inputMode; ++ unsigned long status; ++ } PropMotifWmHints; ++ ++ PropMotifWmHints motif_hints; ++ Atom prop, proptype; ++ unsigned long flags = 0; ++ ++ /* setup the property */ ++ motif_hints.flags = MWM_HINTS_DECORATIONS; ++ motif_hints.decorations = flags; ++ ++ /* get the atom for the property */ ++ prop = XInternAtom( dpy, "_MOTIF_WM_HINTS", True ); ++ if (!prop) { ++ /* something went wrong! */ ++ return; ++ } ++ ++ /* not sure this is correct, seems to work, XA_WM_HINTS didn't work */ ++ proptype = prop; ++ ++ XChangeProperty( dpy, w, /* display, window */ ++ prop, proptype, /* property, type */ ++ 32, /* format: 32-bit datums */ ++ PropModeReplace, /* mode */ ++ (unsigned char *) &motif_hints, /* data */ ++ PROP_MOTIF_WM_HINTS_ELEMENTS /* nelements */ ++ ); ++} ++ ++ ++/* ++ * Create an RGB, double-buffered window. ++ * Return the window and context handles. ++ */ ++static void ++make_window( Display *dpy, const char *name, ++ int x, int y, int width, int height, ++ Window *winRet, GLXContext *ctxRet) ++{ ++ int attribs[64]; ++ int i = 0; ++ ++ int scrnum; ++ XSetWindowAttributes attr; ++ unsigned long mask; ++ Window root; ++ Window win; ++ GLXContext ctx; ++ XVisualInfo *visinfo; ++ ++ /* Singleton attributes. */ ++ attribs[i++] = GLX_RGBA; ++ attribs[i++] = GLX_DOUBLEBUFFER; ++ if (stereo) ++ attribs[i++] = GLX_STEREO; ++ ++ /* Key/value attributes. */ ++ attribs[i++] = GLX_RED_SIZE; ++ attribs[i++] = 1; ++ attribs[i++] = GLX_GREEN_SIZE; ++ attribs[i++] = 1; ++ attribs[i++] = GLX_BLUE_SIZE; ++ attribs[i++] = 1; ++ attribs[i++] = GLX_DEPTH_SIZE; ++ attribs[i++] = 1; ++ if (samples > 0) { ++ attribs[i++] = GLX_SAMPLE_BUFFERS; ++ attribs[i++] = 1; ++ attribs[i++] = GLX_SAMPLES; ++ attribs[i++] = samples; ++ } ++ ++ attribs[i++] = None; ++ ++ scrnum = DefaultScreen( dpy ); ++ root = RootWindow( dpy, scrnum ); ++ ++ if (fullscreen) { ++ x = 0; y = 0; ++ width = DisplayWidth( dpy, scrnum ); ++ height = DisplayHeight( dpy, scrnum ); ++ } ++ ++ visinfo = glXChooseVisual(dpy, scrnum, attribs); ++ if (!visinfo) { ++ printf("Error: couldn't get an RGB, Double-buffered"); ++ if (stereo) ++ printf(", Stereo"); ++ if (samples > 0) ++ printf(", Multisample"); ++ printf(" visual\n"); ++ exit(1); ++ } ++ ++ /* window attributes */ ++ attr.background_pixel = 0; ++ attr.border_pixel = 0; ++ attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone); ++ attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; ++ /* XXX this is a bad way to get a borderless window! */ ++ mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; ++ ++ win = XCreateWindow( dpy, root, x, y, width, height, ++ 0, visinfo->depth, InputOutput, ++ visinfo->visual, mask, &attr ); ++ ++ if (fullscreen) ++ no_border(dpy, win); ++ ++ /* set hints and properties */ ++ { ++ XSizeHints sizehints; ++ sizehints.x = x; ++ sizehints.y = y; ++ sizehints.width = width; ++ sizehints.height = height; ++ sizehints.flags = USSize | USPosition; ++ XSetNormalHints(dpy, win, &sizehints); ++ XSetStandardProperties(dpy, win, name, name, ++ None, (char **)NULL, 0, &sizehints); ++ } ++ ++ ctx = glXCreateContext( dpy, visinfo, NULL, True ); ++ if (!ctx) { ++ printf("Error: glXCreateContext failed\n"); ++ exit(1); ++ } ++ ++ XFree(visinfo); ++ ++ *winRet = win; ++ *ctxRet = ctx; ++} ++ ++ ++/** ++ * Determine whether or not a GLX extension is supported. ++ */ ++static int ++is_glx_extension_supported(Display *dpy, const char *query) ++{ ++ const int scrnum = DefaultScreen(dpy); ++ const char *glx_extensions = NULL; ++ const size_t len = strlen(query); ++ const char *ptr; ++ ++ if (glx_extensions == NULL) { ++ glx_extensions = glXQueryExtensionsString(dpy, scrnum); ++ } ++ ++ ptr = strstr(glx_extensions, query); ++ return ((ptr != NULL) && ((ptr[len] == ' ') || (ptr[len] == '\0'))); ++} ++ ++ ++/** ++ * Attempt to determine whether or not the display is synched to vblank. ++ */ ++static void ++query_vsync(Display *dpy, GLXDrawable drawable) ++{ ++ int interval = 0; ++ ++#if defined(GLX_EXT_swap_control) ++ if (is_glx_extension_supported(dpy, "GLX_EXT_swap_control")) { ++ unsigned int tmp = -1; ++ glXQueryDrawable(dpy, drawable, GLX_SWAP_INTERVAL_EXT, &tmp); ++ interval = tmp; ++ } else ++#endif ++ if (is_glx_extension_supported(dpy, "GLX_MESA_swap_control")) { ++ PFNGLXGETSWAPINTERVALMESAPROC pglXGetSwapIntervalMESA = ++ (PFNGLXGETSWAPINTERVALMESAPROC) ++ glXGetProcAddressARB((const GLubyte *) "glXGetSwapIntervalMESA"); ++ ++ interval = (*pglXGetSwapIntervalMESA)(); ++ } else if (is_glx_extension_supported(dpy, "GLX_SGI_swap_control")) { ++ /* The default swap interval with this extension is 1. Assume that it ++ * is set to the default. ++ * ++ * Many Mesa-based drivers default to 0, but all of these drivers also ++ * export GLX_MESA_swap_control. In that case, this branch will never ++ * be taken, and the correct result should be reported. ++ */ ++ interval = 1; ++ } ++ ++ ++ if (interval > 0) { ++ printf("Running synchronized to the vertical refresh. The framerate should be\n"); ++ if (interval == 1) { ++ printf("approximately the same as the monitor refresh rate.\n"); ++ } else if (interval > 1) { ++ printf("approximately 1/%d the monitor refresh rate.\n", ++ interval); ++ } ++ } ++} ++ ++/** ++ * Handle one X event. ++ * \return NOP, EXIT or DRAW ++ */ ++static int ++handle_event(Display *dpy, Window win, XEvent *event) ++{ ++ (void) dpy; ++ (void) win; ++ ++ switch (event->type) { ++ case Expose: ++ return DRAW; ++ case ConfigureNotify: ++ reshape(event->xconfigure.width, event->xconfigure.height); ++ break; ++ case KeyPress: ++ { ++ char buffer[10]; ++ int code; ++ code = XLookupKeysym(&event->xkey, 0); ++ if (code == XK_Left) { ++ view_roty += 5.0; ++ } ++ else if (code == XK_Right) { ++ view_roty -= 5.0; ++ } ++ else if (code == XK_Up) { ++ view_rotx += 5.0; ++ } ++ else if (code == XK_Down) { ++ view_rotx -= 5.0; ++ } ++ else { ++ XLookupString(&event->xkey, buffer, sizeof(buffer), ++ NULL, NULL); ++ if (buffer[0] == 27) { ++ /* escape */ ++ return EXIT; ++ } ++ else if (buffer[0] == 'a' || buffer[0] == 'A') { ++ animate = !animate; ++ } ++ } ++ return DRAW; ++ } ++ } ++ return NOP; ++} ++ ++ ++static void ++event_loop(Display *dpy, Window win) ++{ ++ while (1) { ++ int op; ++ while (!animate || XPending(dpy) > 0) { ++ XEvent event; ++ XNextEvent(dpy, &event); ++ op = handle_event(dpy, win, &event); ++ if (op == EXIT) ++ return; ++ else if (op == DRAW) ++ break; ++ } ++ ++ draw_frame(dpy, win); ++ } ++} ++ ++ ++static void ++usage(void) ++{ ++ printf("Usage:\n"); ++ printf(" -display <displayname> set the display to run on\n"); ++ printf(" -stereo run in stereo mode\n"); ++ printf(" -samples N run in multisample mode with at least N samples\n"); ++ printf(" -fullscreen run in fullscreen mode\n"); ++ printf(" -info display OpenGL renderer info\n"); ++ printf(" -geometry WxH+X+Y window geometry\n"); ++} ++ ++ ++int ++main(int argc, char *argv[]) ++{ ++ unsigned int winWidth = 300, winHeight = 300; ++ int x = 0, y = 0; ++ Display *dpy; ++ Window win; ++ GLXContext ctx; ++ char *dpyName = NULL; ++ GLboolean printInfo = GL_FALSE; ++ int i; ++ ++ for (i = 1; i < argc; i++) { ++ if (strcmp(argv[i], "-display") == 0) { ++ dpyName = argv[i+1]; ++ i++; ++ } ++ else if (strcmp(argv[i], "-info") == 0) { ++ printInfo = GL_TRUE; ++ } ++ else if (strcmp(argv[i], "-stereo") == 0) { ++ stereo = GL_TRUE; ++ } ++ else if (i < argc-1 && strcmp(argv[i], "-samples") == 0) { ++ samples = strtod(argv[i+1], NULL ); ++ ++i; ++ } ++ else if (strcmp(argv[i], "-fullscreen") == 0) { ++ fullscreen = GL_TRUE; ++ } ++ else if (i < argc-1 && strcmp(argv[i], "-geometry") == 0) { ++ XParseGeometry(argv[i+1], &x, &y, &winWidth, &winHeight); ++ i++; ++ } ++ else { ++ usage(); ++ return -1; ++ } ++ } ++ ++ dpy = XOpenDisplay(dpyName); ++ if (!dpy) { ++ printf("Error: couldn't open display %s\n", ++ dpyName ? dpyName : getenv("DISPLAY")); ++ return -1; ++ } ++ ++ make_window(dpy, "glxgears", x, y, winWidth, winHeight, &win, &ctx); ++ XMapWindow(dpy, win); ++ glXMakeCurrent(dpy, win, ctx); ++ query_vsync(dpy, win); ++ ++ if (printInfo) { ++ printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER)); ++ printf("GL_VERSION = %s\n", (char *) glGetString(GL_VERSION)); ++ printf("GL_VENDOR = %s\n", (char *) glGetString(GL_VENDOR)); ++ printf("GL_EXTENSIONS = %s\n", (char *) glGetString(GL_EXTENSIONS)); ++ } ++ ++ init(); ++ ++ /* Set initial projection/viewing transformation. ++ * We can't be sure we'll get a ConfigureNotify event when the window ++ * first appears. ++ */ ++ reshape(winWidth, winHeight); ++ ++ event_loop(dpy, win); ++ ++ glDeleteLists(gear1, 1); ++ glDeleteLists(gear2, 1); ++ glDeleteLists(gear3, 1); ++ glXMakeCurrent(dpy, None, NULL); ++ glXDestroyContext(dpy, ctx); ++ XDestroyWindow(dpy, win); ++ XCloseDisplay(dpy); ++ ++ return 0; ++} +--- Mesa.orig/xdemos/glxinfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ Mesa/xdemos/glxinfo.c 2012-08-14 15:00:23.000000000 +0200 +@@ -0,0 +1,1389 @@ ++/* ++ * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. ++ * ++ * 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 ++ * BRIAN PAUL 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. ++ */ ++ ++ ++/* ++ * This program is a work-alike of the IRIX glxinfo program. ++ * Command line options: ++ * -t print wide table ++ * -v print verbose information ++ * -display DisplayName specify the X display to interogate ++ * -b only print ID of "best" visual on screen 0 ++ * -i use indirect rendering connection only ++ * -l print interesting OpenGL limits (added 5 Sep 2002) ++ * ++ * Brian Paul 26 January 2000 ++ */ ++ ++#define GLX_GLXEXT_PROTOTYPES ++#define GL_GLEXT_PROTOTYPES ++ ++#include <assert.h> ++#include <X11/Xlib.h> ++#include <X11/Xutil.h> ++#include <GL/gl.h> ++#include <GL/glx.h> ++#include <stdio.h> ++#include <string.h> ++#include <stdlib.h> ++ ++ ++#ifndef GLX_NONE_EXT ++#define GLX_NONE_EXT 0x8000 ++#endif ++ ++#ifndef GLX_TRANSPARENT_RGB ++#define GLX_TRANSPARENT_RGB 0x8008 ++#endif ++ ++#ifndef GLX_RGBA_BIT ++#define GLX_RGBA_BIT 0x00000001 ++#endif ++ ++#ifndef GLX_COLOR_INDEX_BIT ++#define GLX_COLOR_INDEX_BIT 0x00000002 ++#endif ++ ++typedef enum ++{ ++ Normal, ++ Wide, ++ Verbose ++} InfoMode; ++ ++ ++struct visual_attribs ++{ ++ /* X visual attribs */ ++ int id; /* May be visual ID or FBConfig ID */ ++ int vis_id; /* Visual ID. Only set for FBConfigs */ ++ int klass; ++ int depth; ++ int redMask, greenMask, blueMask; ++ int colormapSize; ++ int bitsPerRGB; ++ ++ /* GL visual attribs */ ++ int supportsGL; ++ int drawableType; ++ int transparentType; ++ int transparentRedValue; ++ int transparentGreenValue; ++ int transparentBlueValue; ++ int transparentAlphaValue; ++ int transparentIndexValue; ++ int bufferSize; ++ int level; ++ int render_type; ++ int doubleBuffer; ++ int stereo; ++ int auxBuffers; ++ int redSize, greenSize, blueSize, alphaSize; ++ int depthSize; ++ int stencilSize; ++ int accumRedSize, accumGreenSize, accumBlueSize, accumAlphaSize; ++ int numSamples, numMultisample; ++ int visualCaveat; ++ int floatComponents; ++ int packedfloatComponents; ++ int srgb; ++}; ++ ++ ++/* ++ * qsort callback for string comparison. ++ */ ++static int ++compare_string_ptr(const void *p1, const void *p2) ++{ ++ return strcmp(* (char * const *) p1, * (char * const *) p2); ++} ++ ++ ++/* ++ * Print a list of extensions, with word-wrapping. ++ */ ++static void ++print_extension_list(const char *ext, Bool singleLine) ++{ ++ char **extensions; ++ int num_extensions; ++ const char *indentString = " "; ++ const int indent = 4; ++ const int max = 79; ++ int width, i, j, k; ++ ++ if (!ext || !ext[0]) ++ return; ++ ++ /* count the number of extensions, ignoring successive spaces */ ++ num_extensions = 0; ++ j = 1; ++ do { ++ if ((ext[j] == ' ' || ext[j] == 0) && ext[j - 1] != ' ') { ++ ++num_extensions; ++ } ++ } while(ext[j++]); ++ ++ /* copy individual extensions to an array */ ++ extensions = malloc(num_extensions * sizeof *extensions); ++ if (!extensions) { ++ fprintf(stderr, "Error: malloc() failed\n"); ++ exit(1); ++ } ++ i = j = k = 0; ++ while (1) { ++ if (ext[j] == ' ' || ext[j] == 0) { ++ /* found end of an extension name */ ++ const int len = j - i; ++ ++ if (len) { ++ assert(k < num_extensions); ++ ++ extensions[k] = malloc(len + 1); ++ if (!extensions[k]) { ++ fprintf(stderr, "Error: malloc() failed\n"); ++ exit(1); ++ } ++ ++ memcpy(extensions[k], ext + i, len); ++ extensions[k][len] = 0; ++ ++ ++k; ++ }; ++ ++ i += len + 1; ++ ++ if (ext[j] == 0) { ++ break; ++ } ++ } ++ j++; ++ } ++ assert(k == num_extensions); ++ ++ /* sort extensions alphabetically */ ++ qsort(extensions, num_extensions, sizeof extensions[0], compare_string_ptr); ++ ++ /* print the extensions */ ++ width = indent; ++ printf("%s", indentString); ++ for (k = 0; k < num_extensions; ++k) { ++ const int len = strlen(extensions[k]); ++ if ((!singleLine) && (width + len > max)) { ++ /* start a new line */ ++ printf("\n"); ++ width = indent; ++ printf("%s", indentString); ++ } ++ /* print the extension name */ ++ printf("%s", extensions[k]); ++ ++ /* either we're all done, or we'll continue with next extension */ ++ width += len + 1; ++ ++ if (singleLine) { ++ printf("\n"); ++ width = indent; ++ printf("%s", indentString); ++ } ++ else { ++ printf(", "); ++ width += 2; ++ } ++ } ++ printf("\n"); ++ ++ for (k = 0; k < num_extensions; ++k) { ++ free(extensions[k]); ++ } ++ free(extensions); ++} ++ ++ ++static void ++print_display_info(Display *dpy) ++{ ++ printf("name of display: %s\n", DisplayString(dpy)); ++} ++ ++ ++/** ++ * Print interesting limits for vertex/fragment programs. ++ */ ++static void ++print_program_limits(GLenum target) ++{ ++#if defined(GL_ARB_vertex_program) || defined(GL_ARB_fragment_program) ++ struct token_name { ++ GLenum token; ++ const char *name; ++ }; ++ static const struct token_name common_limits[] = { ++ { GL_MAX_PROGRAM_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_TEMPORARIES_ARB, "GL_MAX_PROGRAM_TEMPORARIES_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, "GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB" }, ++ { GL_MAX_PROGRAM_PARAMETERS_ARB, "GL_MAX_PROGRAM_PARAMETERS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, "GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB" }, ++ { GL_MAX_PROGRAM_ATTRIBS_ARB, "GL_MAX_PROGRAM_ATTRIBS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB, "GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB" }, ++ { GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB, "GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB, "GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB" }, ++ { GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, "GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB" }, ++ { GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, "GL_MAX_PROGRAM_ENV_PARAMETERS_ARB" }, ++ { (GLenum) 0, NULL } ++ }; ++ static const struct token_name fragment_limits[] = { ++ { GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB, "GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB" }, ++ { GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB" }, ++ { (GLenum) 0, NULL } ++ }; ++ ++ PFNGLGETPROGRAMIVARBPROC GetProgramivARB_func = (PFNGLGETPROGRAMIVARBPROC) ++ glXGetProcAddressARB((GLubyte *) "glGetProgramivARB"); ++ ++ GLint max[1]; ++ int i; ++ ++ if (target == GL_VERTEX_PROGRAM_ARB) { ++ printf(" GL_VERTEX_PROGRAM_ARB:\n"); ++ } ++ else if (target == GL_FRAGMENT_PROGRAM_ARB) { ++ printf(" GL_FRAGMENT_PROGRAM_ARB:\n"); ++ } ++ else { ++ return; /* something's wrong */ ++ } ++ ++ for (i = 0; common_limits[i].token; i++) { ++ GetProgramivARB_func(target, common_limits[i].token, max); ++ if (glGetError() == GL_NO_ERROR) { ++ printf(" %s = %d\n", common_limits[i].name, max[0]); ++ } ++ } ++ if (target == GL_FRAGMENT_PROGRAM_ARB) { ++ for (i = 0; fragment_limits[i].token; i++) { ++ GetProgramivARB_func(target, fragment_limits[i].token, max); ++ if (glGetError() == GL_NO_ERROR) { ++ printf(" %s = %d\n", fragment_limits[i].name, max[0]); ++ } ++ } ++ } ++#endif /* GL_ARB_vertex_program / GL_ARB_fragment_program */ ++} ++ ++ ++/** ++ * Print interesting limits for vertex/fragment shaders. ++ */ ++static void ++print_shader_limits(GLenum target) ++{ ++ struct token_name { ++ GLenum token; ++ const char *name; ++ }; ++#if defined(GL_ARB_vertex_shader) ++ static const struct token_name vertex_limits[] = { ++ { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB" }, ++ { GL_MAX_VARYING_FLOATS_ARB, "GL_MAX_VARYING_FLOATS_ARB" }, ++ { GL_MAX_VERTEX_ATTRIBS_ARB, "GL_MAX_VERTEX_ATTRIBS_ARB" }, ++ { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" }, ++ { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" }, ++ { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" }, ++ { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" }, ++ { (GLenum) 0, NULL } ++ }; ++#endif ++#if defined(GL_ARB_fragment_shader) ++ static const struct token_name fragment_limits[] = { ++ { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" }, ++ { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" }, ++ { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" }, ++ { (GLenum) 0, NULL } ++ }; ++#endif ++ GLint max[1]; ++ int i; ++ ++#if defined(GL_ARB_vertex_shader) ++ if (target == GL_VERTEX_SHADER_ARB) { ++ printf(" GL_VERTEX_SHADER_ARB:\n"); ++ for (i = 0; vertex_limits[i].token; i++) { ++ glGetIntegerv(vertex_limits[i].token, max); ++ if (glGetError() == GL_NO_ERROR) { ++ printf(" %s = %d\n", vertex_limits[i].name, max[0]); ++ } ++ } ++ } ++#endif ++#if defined(GL_ARB_fragment_shader) ++ if (target == GL_FRAGMENT_SHADER_ARB) { ++ printf(" GL_FRAGMENT_SHADER_ARB:\n"); ++ for (i = 0; fragment_limits[i].token; i++) { ++ glGetIntegerv(fragment_limits[i].token, max); ++ if (glGetError() == GL_NO_ERROR) { ++ printf(" %s = %d\n", fragment_limits[i].name, max[0]); ++ } ++ } ++ } ++#endif ++} ++ ++ ++/** Is extension 'ext' supported? */ ++static int ++extension_supported(const char *ext, const char *extensionsList) ++{ ++ const char *p = strstr(extensionsList, ext); ++ if (p) { ++ /* check that next char is a space or end of string */ ++ int extLen = strlen(ext); ++ if (p[extLen] == 0 || p[extLen] == ' ') ++ return 1; ++ } ++ return 0; ++} ++ ++ ++/** ++ * Print interesting OpenGL implementation limits. ++ */ ++static void ++print_limits(const char *extensions) ++{ ++ struct token_name { ++ GLuint count; ++ GLenum token; ++ const char *name; ++ const char *extension; ++ }; ++ static const struct token_name limits[] = { ++ { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES", NULL }, ++ { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH", "GL_ARB_imaging" }, ++ { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES", NULL }, ++ { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES", NULL }, ++ { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER", NULL }, ++ { 1, GL_MAX_LIGHTS, "GL_MAX_LIGHTS", NULL }, ++ { 1, GL_MAX_LIST_NESTING, "GL_MAX_LIST_NESTING", NULL }, ++ { 1, GL_MAX_MODELVIEW_STACK_DEPTH, "GL_MAX_MODELVIEW_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_NAME_STACK_DEPTH, "GL_MAX_NAME_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_PIXEL_MAP_TABLE, "GL_MAX_PIXEL_MAP_TABLE", NULL }, ++ { 1, GL_MAX_PROJECTION_STACK_DEPTH, "GL_MAX_PROJECTION_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_TEXTURE_STACK_DEPTH, "GL_MAX_TEXTURE_STACK_DEPTH", NULL }, ++ { 1, GL_MAX_TEXTURE_SIZE, "GL_MAX_TEXTURE_SIZE", NULL }, ++ { 1, GL_MAX_3D_TEXTURE_SIZE, "GL_MAX_3D_TEXTURE_SIZE", NULL }, ++ { 2, GL_MAX_VIEWPORT_DIMS, "GL_MAX_VIEWPORT_DIMS", NULL }, ++ { 2, GL_ALIASED_LINE_WIDTH_RANGE, "GL_ALIASED_LINE_WIDTH_RANGE", NULL }, ++ { 2, GL_SMOOTH_LINE_WIDTH_RANGE, "GL_SMOOTH_LINE_WIDTH_RANGE", NULL }, ++ { 2, GL_ALIASED_POINT_SIZE_RANGE, "GL_ALIASED_POINT_SIZE_RANGE", NULL }, ++ { 2, GL_SMOOTH_POINT_SIZE_RANGE, "GL_SMOOTH_POINT_SIZE_RANGE", NULL }, ++#if defined(GL_ARB_texture_cube_map) ++ { 1, GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB", "GL_ARB_texture_cube_map" }, ++#endif ++#if defined(GL_NV_texture_rectangle) ++ { 1, GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV", "GL_NV_texture_rectangle" }, ++#endif ++#if defined(GL_ARB_texture_compression) ++ { 1, GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB", "GL_ARB_texture_compression" }, ++#endif ++#if defined(GL_ARB_multitexture) ++ { 1, GL_MAX_TEXTURE_UNITS_ARB, "GL_MAX_TEXTURE_UNITS_ARB", "GL_ARB_multitexture" }, ++#endif ++#if defined(GL_EXT_texture_lod_bias) ++ { 1, GL_MAX_TEXTURE_LOD_BIAS_EXT, "GL_MAX_TEXTURE_LOD_BIAS_EXT", "GL_EXT_texture_lod_bias" }, ++#endif ++#if defined(GL_EXT_texture_filter_anisotropic) ++ { 1, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT", "GL_EXT_texture_filter_anisotropic" }, ++#endif ++#if defined(GL_ARB_draw_buffers) ++ { 1, GL_MAX_DRAW_BUFFERS_ARB, "GL_MAX_DRAW_BUFFERS_ARB", "GL_ARB_draw_buffers" }, ++#endif ++#if defined(GL_ARB_blend_func_extended) ++ { 1, GL_MAX_DUAL_SOURCE_DRAW_BUFFERS, "GL_MAX_DUAL_SOURCE_DRAW_BUFFERS", "GL_ARB_blend_func_extended" }, ++#endif ++#if defined (GL_ARB_framebuffer_object) ++ { 1, GL_MAX_RENDERBUFFER_SIZE, "GL_MAX_RENDERBUFFER_SIZE", "GL_ARB_framebuffer_object" }, ++ { 1, GL_MAX_COLOR_ATTACHMENTS, "GL_MAX_COLOR_ATTACHMENTS", "GL_ARB_framebuffer_object" }, ++ { 1, GL_MAX_SAMPLES, "GL_MAX_SAMPLES", "GL_ARB_framebuffer_object" }, ++#endif ++ { 0, (GLenum) 0, NULL, NULL } ++ }; ++ GLint i, max[2]; ++ ++ printf("OpenGL limits:\n"); ++ for (i = 0; limits[i].count; i++) { ++ if (!limits[i].extension || ++ extension_supported(limits[i].extension, extensions)) { ++ glGetIntegerv(limits[i].token, max); ++ if (glGetError() == GL_NO_ERROR) { ++ if (limits[i].count == 1) ++ printf(" %s = %d\n", limits[i].name, max[0]); ++ else /* XXX fix if we ever query something with more than 2 values */ ++ printf(" %s = %d, %d\n", limits[i].name, max[0], max[1]); ++ } ++ } ++ } ++ ++ /* these don't fit into the above mechanism, unfortunately */ ++ if (extension_supported("GL_ARB_imaging", extensions)) { ++ glGetConvolutionParameteriv(GL_CONVOLUTION_2D, GL_MAX_CONVOLUTION_WIDTH, max); ++ glGetConvolutionParameteriv(GL_CONVOLUTION_2D, GL_MAX_CONVOLUTION_HEIGHT, max+1); ++ printf(" GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]); ++ } ++ ++#if defined(GL_ARB_vertex_program) ++ if (extension_supported("GL_ARB_vertex_program", extensions)) { ++ print_program_limits(GL_VERTEX_PROGRAM_ARB); ++ } ++#endif ++#if defined(GL_ARB_fragment_program) ++ if (extension_supported("GL_ARB_fragment_program", extensions)) { ++ print_program_limits(GL_FRAGMENT_PROGRAM_ARB); ++ } ++#endif ++#if defined(GL_ARB_vertex_shader) ++ if (extension_supported("GL_ARB_vertex_shader", extensions)) { ++ print_shader_limits(GL_VERTEX_SHADER_ARB); ++ } ++#endif ++#if defined(GL_ARB_fragment_shader) ++ if (extension_supported("GL_ARB_fragment_shader", extensions)) { ++ print_shader_limits(GL_FRAGMENT_SHADER_ARB); ++ } ++#endif ++} ++ ++ ++static void ++print_screen_info(Display *dpy, int scrnum, Bool allowDirect, Bool limits, Bool singleLine) ++{ ++ Window win; ++ int attribSingle[] = { ++ GLX_RGBA, ++ GLX_RED_SIZE, 1, ++ GLX_GREEN_SIZE, 1, ++ GLX_BLUE_SIZE, 1, ++ None }; ++ int attribDouble[] = { ++ GLX_RGBA, ++ GLX_RED_SIZE, 1, ++ GLX_GREEN_SIZE, 1, ++ GLX_BLUE_SIZE, 1, ++ GLX_DOUBLEBUFFER, ++ None }; ++ ++ XSetWindowAttributes attr; ++ unsigned long mask; ++ Window root; ++ GLXContext ctx = NULL; ++ XVisualInfo *visinfo; ++ int width = 100, height = 100; ++ ++ root = RootWindow(dpy, scrnum); ++ ++ /* ++ * Find a basic GLX visual. We'll then create a rendering context and ++ * query various info strings. ++ */ ++ visinfo = glXChooseVisual(dpy, scrnum, attribSingle); ++ if (!visinfo) ++ visinfo = glXChooseVisual(dpy, scrnum, attribDouble); ++ ++ if (visinfo) ++ ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect ); ++ ++#ifdef GLX_VERSION_1_3 ++ /* Try glXChooseFBConfig() if glXChooseVisual didn't work. ++ * XXX when would that happen? ++ */ ++ if (!visinfo) { ++ int fbAttribSingle[] = { ++ GLX_RENDER_TYPE, GLX_RGBA_BIT, ++ GLX_RED_SIZE, 1, ++ GLX_GREEN_SIZE, 1, ++ GLX_BLUE_SIZE, 1, ++ GLX_DOUBLEBUFFER, False, ++ None }; ++ int fbAttribDouble[] = { ++ GLX_RENDER_TYPE, GLX_RGBA_BIT, ++ GLX_RED_SIZE, 1, ++ GLX_GREEN_SIZE, 1, ++ GLX_BLUE_SIZE, 1, ++ GLX_DOUBLEBUFFER, True, ++ None }; ++ GLXFBConfig *configs = NULL; ++ int nConfigs; ++ ++ configs = glXChooseFBConfig(dpy, scrnum, fbAttribSingle, &nConfigs); ++ if (!configs) ++ configs = glXChooseFBConfig(dpy, scrnum, fbAttribDouble, &nConfigs); ++ ++ if (configs) { ++ visinfo = glXGetVisualFromFBConfig(dpy, configs[0]); ++ ctx = glXCreateNewContext(dpy, configs[0], GLX_RGBA_TYPE, NULL, allowDirect); ++ XFree(configs); ++ } ++ } ++#endif ++ ++ if (!visinfo) { ++ fprintf(stderr, "Error: couldn't find RGB GLX visual or fbconfig\n"); ++ return; ++ } ++ ++ if (!ctx) { ++ fprintf(stderr, "Error: glXCreateContext failed\n"); ++ XFree(visinfo); ++ return; ++ } ++ ++ attr.background_pixel = 0; ++ attr.border_pixel = 0; ++ attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); ++ attr.event_mask = StructureNotifyMask | ExposureMask; ++ mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; ++ win = XCreateWindow(dpy, root, 0, 0, width, height, ++ 0, visinfo->depth, InputOutput, ++ visinfo->visual, mask, &attr); ++ ++ if (glXMakeCurrent(dpy, win, ctx)) { ++ const char *serverVendor = glXQueryServerString(dpy, scrnum, GLX_VENDOR); ++ const char *serverVersion = glXQueryServerString(dpy, scrnum, GLX_VERSION); ++ const char *serverExtensions = glXQueryServerString(dpy, scrnum, GLX_EXTENSIONS); ++ const char *clientVendor = glXGetClientString(dpy, GLX_VENDOR); ++ const char *clientVersion = glXGetClientString(dpy, GLX_VERSION); ++ const char *clientExtensions = glXGetClientString(dpy, GLX_EXTENSIONS); ++ const char *glxExtensions = glXQueryExtensionsString(dpy, scrnum); ++ const char *glVendor = (const char *) glGetString(GL_VENDOR); ++ const char *glRenderer = (const char *) glGetString(GL_RENDERER); ++ const char *glVersion = (const char *) glGetString(GL_VERSION); ++ const char *glExtensions = (const char *) glGetString(GL_EXTENSIONS); ++ int glxVersionMajor; ++ int glxVersionMinor; ++ char *displayName = NULL; ++ char *colon = NULL, *period = NULL; ++ ++ if (! glXQueryVersion( dpy, & glxVersionMajor, & glxVersionMinor )) { ++ fprintf(stderr, "Error: glXQueryVersion failed\n"); ++ exit(1); ++ } ++ ++ /* Strip the screen number from the display name, if present. */ ++ if (!(displayName = (char *) malloc(strlen(DisplayString(dpy)) + 1))) { ++ fprintf(stderr, "Error: malloc() failed\n"); ++ exit(1); ++ } ++ strcpy(displayName, DisplayString(dpy)); ++ colon = strrchr(displayName, ':'); ++ if (colon) { ++ period = strchr(colon, '.'); ++ if (period) ++ *period = '\0'; ++ } ++ printf("display: %s screen: %d\n", displayName, scrnum); ++ free(displayName); ++ printf("direct rendering: "); ++ if (glXIsDirect(dpy, ctx)) { ++ printf("Yes\n"); ++ } ++ else { ++ if (!allowDirect) { ++ printf("No (-i specified)\n"); ++ } ++ else if (getenv("LIBGL_ALWAYS_INDIRECT")) { ++ printf("No (LIBGL_ALWAYS_INDIRECT set)\n"); ++ } ++ else { ++ printf("No (If you want to find out why, try setting " ++ "LIBGL_DEBUG=verbose)\n"); ++ } ++ } ++ printf("server glx vendor string: %s\n", serverVendor); ++ printf("server glx version string: %s\n", serverVersion); ++ printf("server glx extensions:\n"); ++ print_extension_list(serverExtensions, singleLine); ++ printf("client glx vendor string: %s\n", clientVendor); ++ printf("client glx version string: %s\n", clientVersion); ++ printf("client glx extensions:\n"); ++ print_extension_list(clientExtensions, singleLine); ++ printf("GLX version: %u.%u\n", glxVersionMajor, glxVersionMinor); ++ printf("GLX extensions:\n"); ++ print_extension_list(glxExtensions, singleLine); ++ printf("OpenGL vendor string: %s\n", glVendor); ++ printf("OpenGL renderer string: %s\n", glRenderer); ++ printf("OpenGL version string: %s\n", glVersion); ++#ifdef GL_VERSION_2_0 ++ if (glVersion[0] >= '2' && glVersion[1] == '.') { ++ char *v = (char *) glGetString(GL_SHADING_LANGUAGE_VERSION); ++ printf("OpenGL shading language version string: %s\n", v); ++ } ++#endif ++ ++ printf("OpenGL extensions:\n"); ++ print_extension_list(glExtensions, singleLine); ++ if (limits) ++ print_limits(glExtensions); ++ } ++ else { ++ fprintf(stderr, "Error: glXMakeCurrent failed\n"); ++ } ++ ++ glXDestroyContext(dpy, ctx); ++ XFree(visinfo); ++ XDestroyWindow(dpy, win); ++} ++ ++ ++static const char * ++visual_class_name(int cls) ++{ ++ switch (cls) { ++ case StaticColor: ++ return "StaticColor"; ++ case PseudoColor: ++ return "PseudoColor"; ++ case StaticGray: ++ return "StaticGray"; ++ case GrayScale: ++ return "GrayScale"; ++ case TrueColor: ++ return "TrueColor"; ++ case DirectColor: ++ return "DirectColor"; ++ default: ++ return ""; ++ } ++} ++ ++static const char * ++visual_drawable_type(int type) ++{ ++ static char buffer[256], *p; ++ const static struct { int bit; const char *name; } bits[] = { ++ { GLX_WINDOW_BIT, "window" }, ++ { GLX_PIXMAP_BIT, "pixmap" }, ++ { GLX_PBUFFER_BIT, "pbuffer" } ++ }; ++ int i; ++ ++ strcpy(buffer, "(none)"); ++ p = buffer; ++ for (i = 0; i < 3; i++) { ++ if (type & bits[i].bit) { ++ if (p > buffer) ++ *p++ = ','; ++ strcpy(p, bits[i].name); ++ p += strlen(bits[i].name); ++ } ++ } ++ ++ return buffer; ++} ++ ++static const char * ++visual_class_abbrev(int cls) ++{ ++ switch (cls) { ++ case StaticColor: ++ return "sc"; ++ case PseudoColor: ++ return "pc"; ++ case StaticGray: ++ return "sg"; ++ case GrayScale: ++ return "gs"; ++ case TrueColor: ++ return "tc"; ++ case DirectColor: ++ return "dc"; ++ default: ++ return ""; ++ } ++} ++ ++static const char * ++visual_render_type_name(int type) ++{ ++ switch (type) { ++ case GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT: ++ return "ufloat"; ++ case GLX_RGBA_FLOAT_BIT_ARB: ++ return "float"; ++ case GLX_RGBA_BIT: ++ return "rgba"; ++ case GLX_COLOR_INDEX_BIT: ++ return "ci"; ++ case GLX_RGBA_BIT | GLX_COLOR_INDEX_BIT: ++ return "rgba|ci"; ++ default: ++ return ""; ++ } ++} ++ ++static const char * ++caveat_string(int caveat) ++{ ++ switch (caveat) { ++#ifdef GLX_EXT_visual_rating ++ case GLX_SLOW_VISUAL_EXT: ++ return "Slow"; ++ case GLX_NON_CONFORMANT_VISUAL_EXT: ++ return "Ncon"; ++ case GLX_NONE_EXT: ++ /* fall-through */ ++#endif ++ case 0: ++ /* fall-through */ ++ default: ++ return "None"; ++ } ++} ++ ++ ++static Bool ++get_visual_attribs(Display *dpy, XVisualInfo *vInfo, ++ struct visual_attribs *attribs) ++{ ++ const char *ext = glXQueryExtensionsString(dpy, vInfo->screen); ++ int rgba; ++ ++ memset(attribs, 0, sizeof(struct visual_attribs)); ++ ++ attribs->id = vInfo->visualid; ++#if defined(__cplusplus) || defined(c_plusplus) ++ attribs->klass = vInfo->c_class; ++#else ++ attribs->klass = vInfo->class; ++#endif ++ attribs->depth = vInfo->depth; ++ attribs->redMask = vInfo->red_mask; ++ attribs->greenMask = vInfo->green_mask; ++ attribs->blueMask = vInfo->blue_mask; ++ attribs->colormapSize = vInfo->colormap_size; ++ attribs->bitsPerRGB = vInfo->bits_per_rgb; ++ ++ if (glXGetConfig(dpy, vInfo, GLX_USE_GL, &attribs->supportsGL) != 0 || ++ !attribs->supportsGL) ++ return False; ++ glXGetConfig(dpy, vInfo, GLX_BUFFER_SIZE, &attribs->bufferSize); ++ glXGetConfig(dpy, vInfo, GLX_LEVEL, &attribs->level); ++ glXGetConfig(dpy, vInfo, GLX_RGBA, &rgba); ++ if (rgba) ++ attribs->render_type = GLX_RGBA_BIT; ++ else ++ attribs->render_type = GLX_COLOR_INDEX_BIT; ++ ++ glXGetConfig(dpy, vInfo, GLX_DRAWABLE_TYPE, &attribs->drawableType); ++ glXGetConfig(dpy, vInfo, GLX_DOUBLEBUFFER, &attribs->doubleBuffer); ++ glXGetConfig(dpy, vInfo, GLX_STEREO, &attribs->stereo); ++ glXGetConfig(dpy, vInfo, GLX_AUX_BUFFERS, &attribs->auxBuffers); ++ glXGetConfig(dpy, vInfo, GLX_RED_SIZE, &attribs->redSize); ++ glXGetConfig(dpy, vInfo, GLX_GREEN_SIZE, &attribs->greenSize); ++ glXGetConfig(dpy, vInfo, GLX_BLUE_SIZE, &attribs->blueSize); ++ glXGetConfig(dpy, vInfo, GLX_ALPHA_SIZE, &attribs->alphaSize); ++ glXGetConfig(dpy, vInfo, GLX_DEPTH_SIZE, &attribs->depthSize); ++ glXGetConfig(dpy, vInfo, GLX_STENCIL_SIZE, &attribs->stencilSize); ++ glXGetConfig(dpy, vInfo, GLX_ACCUM_RED_SIZE, &attribs->accumRedSize); ++ glXGetConfig(dpy, vInfo, GLX_ACCUM_GREEN_SIZE, &attribs->accumGreenSize); ++ glXGetConfig(dpy, vInfo, GLX_ACCUM_BLUE_SIZE, &attribs->accumBlueSize); ++ glXGetConfig(dpy, vInfo, GLX_ACCUM_ALPHA_SIZE, &attribs->accumAlphaSize); ++ ++ /* get transparent pixel stuff */ ++ glXGetConfig(dpy, vInfo,GLX_TRANSPARENT_TYPE, &attribs->transparentType); ++ if (attribs->transparentType == GLX_TRANSPARENT_RGB) { ++ glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_RED_VALUE, &attribs->transparentRedValue); ++ glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_GREEN_VALUE, &attribs->transparentGreenValue); ++ glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_BLUE_VALUE, &attribs->transparentBlueValue); ++ glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_ALPHA_VALUE, &attribs->transparentAlphaValue); ++ } ++ else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) { ++ glXGetConfig(dpy, vInfo, GLX_TRANSPARENT_INDEX_VALUE, &attribs->transparentIndexValue); ++ } ++ ++ /* multisample attribs */ ++#ifdef GLX_ARB_multisample ++ if (ext && strstr(ext, "GLX_ARB_multisample")) { ++ glXGetConfig(dpy, vInfo, GLX_SAMPLE_BUFFERS_ARB, &attribs->numMultisample); ++ glXGetConfig(dpy, vInfo, GLX_SAMPLES_ARB, &attribs->numSamples); ++ } ++#endif ++ else { ++ attribs->numSamples = 0; ++ attribs->numMultisample = 0; ++ } ++ ++#if defined(GLX_EXT_visual_rating) ++ if (ext && strstr(ext, "GLX_EXT_visual_rating")) { ++ glXGetConfig(dpy, vInfo, GLX_VISUAL_CAVEAT_EXT, &attribs->visualCaveat); ++ } ++ else { ++ attribs->visualCaveat = GLX_NONE_EXT; ++ } ++#else ++ attribs->visualCaveat = 0; ++#endif ++ ++#if defined(GLX_EXT_framebuffer_sRGB) ++ if (ext && strstr(ext, "GLX_EXT_framebuffer_sRGB")) { ++ glXGetConfig(dpy, vInfo, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, &attribs->srgb); ++ } ++#endif ++ ++ return True; ++} ++ ++#ifdef GLX_VERSION_1_3 ++ ++static int ++glx_token_to_visual_class(int visual_type) ++{ ++ switch (visual_type) { ++ case GLX_TRUE_COLOR: ++ return TrueColor; ++ case GLX_DIRECT_COLOR: ++ return DirectColor; ++ case GLX_PSEUDO_COLOR: ++ return PseudoColor; ++ case GLX_STATIC_COLOR: ++ return StaticColor; ++ case GLX_GRAY_SCALE: ++ return GrayScale; ++ case GLX_STATIC_GRAY: ++ return StaticGray; ++ case GLX_NONE: ++ default: ++ return None; ++ } ++} ++ ++static Bool ++get_fbconfig_attribs(Display *dpy, GLXFBConfig fbconfig, ++ struct visual_attribs *attribs) ++{ ++ const char *ext = glXQueryExtensionsString(dpy, 0); ++ int visual_type; ++ XVisualInfo *vInfo; ++ ++ memset(attribs, 0, sizeof(struct visual_attribs)); ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_FBCONFIG_ID, &attribs->id); ++ ++ vInfo = glXGetVisualFromFBConfig(dpy, fbconfig); ++ ++ if (vInfo != NULL) { ++ attribs->vis_id = vInfo->visualid; ++ attribs->depth = vInfo->depth; ++ attribs->redMask = vInfo->red_mask; ++ attribs->greenMask = vInfo->green_mask; ++ attribs->blueMask = vInfo->blue_mask; ++ attribs->colormapSize = vInfo->colormap_size; ++ attribs->bitsPerRGB = vInfo->bits_per_rgb; ++ } ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_X_VISUAL_TYPE, &visual_type); ++ attribs->klass = glx_token_to_visual_class(visual_type); ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_DRAWABLE_TYPE, &attribs->drawableType); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_BUFFER_SIZE, &attribs->bufferSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_LEVEL, &attribs->level); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_RENDER_TYPE, &attribs->render_type); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_DOUBLEBUFFER, &attribs->doubleBuffer); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_STEREO, &attribs->stereo); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_AUX_BUFFERS, &attribs->auxBuffers); ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_RED_SIZE, &attribs->redSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_GREEN_SIZE, &attribs->greenSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_BLUE_SIZE, &attribs->blueSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_ALPHA_SIZE, &attribs->alphaSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_DEPTH_SIZE, &attribs->depthSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_STENCIL_SIZE, &attribs->stencilSize); ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_RED_SIZE, &attribs->accumRedSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_GREEN_SIZE, &attribs->accumGreenSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_BLUE_SIZE, &attribs->accumBlueSize); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_ACCUM_ALPHA_SIZE, &attribs->accumAlphaSize); ++ ++ /* get transparent pixel stuff */ ++ glXGetFBConfigAttrib(dpy, fbconfig,GLX_TRANSPARENT_TYPE, &attribs->transparentType); ++ if (attribs->transparentType == GLX_TRANSPARENT_RGB) { ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_RED_VALUE, &attribs->transparentRedValue); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_GREEN_VALUE, &attribs->transparentGreenValue); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_BLUE_VALUE, &attribs->transparentBlueValue); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_ALPHA_VALUE, &attribs->transparentAlphaValue); ++ } ++ else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) { ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_TRANSPARENT_INDEX_VALUE, &attribs->transparentIndexValue); ++ } ++ ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_SAMPLE_BUFFERS, &attribs->numMultisample); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_SAMPLES, &attribs->numSamples); ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_CONFIG_CAVEAT, &attribs->visualCaveat); ++ ++#if defined(GLX_NV_float_buffer) ++ if (ext && strstr(ext, "GLX_NV_float_buffer")) { ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_FLOAT_COMPONENTS_NV, &attribs->floatComponents); ++ } ++#endif ++#if defined(GLX_ARB_fbconfig_float) ++ if (ext && strstr(ext, "GLX_ARB_fbconfig_float")) { ++ if (attribs->render_type & GLX_RGBA_FLOAT_BIT_ARB) { ++ attribs->floatComponents = True; ++ } ++ } ++#endif ++#if defined(GLX_EXT_fbconfig_packed_float) ++ if (ext && strstr(ext, "GLX_EXT_fbconfig_packed_float")) { ++ if (attribs->render_type & GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT) { ++ attribs->packedfloatComponents = True; ++ } ++ } ++#endif ++ ++#if defined(GLX_EXT_framebuffer_sRGB) ++ if (ext && strstr(ext, "GLX_EXT_framebuffer_sRGB")) { ++ glXGetFBConfigAttrib(dpy, fbconfig, GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT, &attribs->srgb); ++ } ++#endif ++ return True; ++} ++ ++#endif ++ ++ ++ ++static void ++print_visual_attribs_verbose(const struct visual_attribs *attribs, ++ int fbconfigs) ++{ ++ if (fbconfigs) { ++ printf("FBConfig ID: %x Visual ID=%x depth=%d class=%s, type=%s\n", ++ attribs->id, attribs->vis_id, attribs->depth, ++ visual_class_name(attribs->klass), ++ visual_drawable_type(attribs->drawableType)); ++ } ++ else { ++ printf("Visual ID: %x depth=%d class=%s, type=%s\n", ++ attribs->id, attribs->depth, visual_class_name(attribs->klass), ++ visual_drawable_type(attribs->drawableType)); ++ } ++ printf(" bufferSize=%d level=%d renderType=%s doubleBuffer=%d stereo=%d\n", ++ attribs->bufferSize, attribs->level, ++ visual_render_type_name(attribs->render_type), ++ attribs->doubleBuffer, attribs->stereo); ++ printf(" rgba: redSize=%d greenSize=%d blueSize=%d alphaSize=%d float=%c sRGB=%c\n", ++ attribs->redSize, attribs->greenSize, ++ attribs->blueSize, attribs->alphaSize, ++ attribs->packedfloatComponents ? 'P' : attribs->floatComponents ? 'Y' : 'N', ++ attribs->srgb ? 'Y' : 'N'); ++ printf(" auxBuffers=%d depthSize=%d stencilSize=%d\n", ++ attribs->auxBuffers, attribs->depthSize, attribs->stencilSize); ++ printf(" accum: redSize=%d greenSize=%d blueSize=%d alphaSize=%d\n", ++ attribs->accumRedSize, attribs->accumGreenSize, ++ attribs->accumBlueSize, attribs->accumAlphaSize); ++ printf(" multiSample=%d multiSampleBuffers=%d\n", ++ attribs->numSamples, attribs->numMultisample); ++#ifdef GLX_EXT_visual_rating ++ if (attribs->visualCaveat == GLX_NONE_EXT || attribs->visualCaveat == 0) ++ printf(" visualCaveat=None\n"); ++ else if (attribs->visualCaveat == GLX_SLOW_VISUAL_EXT) ++ printf(" visualCaveat=Slow\n"); ++ else if (attribs->visualCaveat == GLX_NON_CONFORMANT_VISUAL_EXT) ++ printf(" visualCaveat=Nonconformant\n"); ++#endif ++ if (attribs->transparentType == GLX_NONE) { ++ printf(" Opaque.\n"); ++ } ++ else if (attribs->transparentType == GLX_TRANSPARENT_RGB) { ++ printf(" Transparent RGB: Red=%d Green=%d Blue=%d Alpha=%d\n",attribs->transparentRedValue,attribs->transparentGreenValue,attribs->transparentBlueValue,attribs->transparentAlphaValue); ++ } ++ else if (attribs->transparentType == GLX_TRANSPARENT_INDEX) { ++ printf(" Transparent index=%d\n",attribs->transparentIndexValue); ++ } ++} ++ ++ ++static void ++print_visual_attribs_short_header(void) ++{ ++ printf(" visual x bf lv rg d st colorbuffer sr ax dp st accumbuffer ms cav\n"); ++ printf(" id dep cl sp sz l ci b ro r g b a F gb bf th cl r g b a ns b eat\n"); ++ printf("----------------------------------------------------------------------------\n"); ++} ++ ++ ++static void ++print_visual_attribs_short(const struct visual_attribs *attribs) ++{ ++ const char *caveat = caveat_string(attribs->visualCaveat); ++ ++ printf("0x%03x %2d %2s %2d %3d %2d %c%c %c %c %2d %2d %2d %2d %c %c %2d %2d %2d", ++ attribs->id, ++ attribs->depth, ++ visual_class_abbrev(attribs->klass), ++ attribs->transparentType != GLX_NONE, ++ attribs->bufferSize, ++ attribs->level, ++ (attribs->render_type & GLX_RGBA_BIT) ? 'r' : ' ', ++ (attribs->render_type & GLX_COLOR_INDEX_BIT) ? 'c' : ' ', ++ attribs->doubleBuffer ? 'y' : '.', ++ attribs->stereo ? 'y' : '.', ++ attribs->redSize, attribs->greenSize, ++ attribs->blueSize, attribs->alphaSize, ++ attribs->packedfloatComponents ? 'u' : attribs->floatComponents ? 'f' : '.', ++ attribs->srgb ? 's' : '.', ++ attribs->auxBuffers, ++ attribs->depthSize, ++ attribs->stencilSize ++ ); ++ ++ printf(" %2d %2d %2d %2d %2d %1d %s\n", ++ attribs->accumRedSize, attribs->accumGreenSize, ++ attribs->accumBlueSize, attribs->accumAlphaSize, ++ attribs->numSamples, attribs->numMultisample, ++ caveat ++ ); ++} ++ ++ ++static void ++print_visual_attribs_long_header(void) ++{ ++ printf("Vis Vis Visual Trans buff lev render DB ste r g b a s aux dep ste accum buffer MS MS \n"); ++ printf(" ID Depth Type parent size el type reo sz sz sz sz flt rgb buf th ncl r g b a num bufs caveats\n"); ++ printf("--------------------------------------------------------------------------------------------------------------------\n"); ++} ++ ++ ++static void ++print_visual_attribs_long(const struct visual_attribs *attribs) ++{ ++ const char *caveat = caveat_string(attribs->visualCaveat); ++ ++ printf("0x%3x %2d %-11s %2d %3d %2d %4s %3d %3d %3d %3d %3d %3d", ++ attribs->id, ++ attribs->depth, ++ visual_class_name(attribs->klass), ++ attribs->transparentType != GLX_NONE, ++ attribs->bufferSize, ++ attribs->level, ++ visual_render_type_name(attribs->render_type), ++ attribs->doubleBuffer, ++ attribs->stereo, ++ attribs->redSize, attribs->greenSize, ++ attribs->blueSize, attribs->alphaSize ++ ); ++ ++ printf(" %c %c %3d %4d %2d %3d %3d %3d %3d %2d %2d %6s\n", ++ attribs->floatComponents ? 'f' : '.', ++ attribs->srgb ? 's' : '.', ++ attribs->auxBuffers, ++ attribs->depthSize, ++ attribs->stencilSize, ++ attribs->accumRedSize, attribs->accumGreenSize, ++ attribs->accumBlueSize, attribs->accumAlphaSize, ++ attribs->numSamples, attribs->numMultisample, ++ caveat ++ ); ++} ++ ++ ++static void ++print_visual_info(Display *dpy, int scrnum, InfoMode mode) ++{ ++ XVisualInfo theTemplate; ++ XVisualInfo *visuals; ++ int numVisuals, numGlxVisuals; ++ long mask; ++ int i; ++ struct visual_attribs attribs; ++ ++ /* get list of all visuals on this screen */ ++ theTemplate.screen = scrnum; ++ mask = VisualScreenMask; ++ visuals = XGetVisualInfo(dpy, mask, &theTemplate, &numVisuals); ++ ++ numGlxVisuals = 0; ++ for (i = 0; i < numVisuals; i++) { ++ if (get_visual_attribs(dpy, &visuals[i], &attribs)) ++ numGlxVisuals++; ++ } ++ ++ if (numGlxVisuals == 0) ++ return; ++ ++ printf("%d GLX Visuals\n", numGlxVisuals); ++ ++ if (mode == Normal) ++ print_visual_attribs_short_header(); ++ else if (mode == Wide) ++ print_visual_attribs_long_header(); ++ ++ for (i = 0; i < numVisuals; i++) { ++ if (!get_visual_attribs(dpy, &visuals[i], &attribs)) ++ continue; ++ ++ if (mode == Verbose) ++ print_visual_attribs_verbose(&attribs, False); ++ else if (mode == Normal) ++ print_visual_attribs_short(&attribs); ++ else if (mode == Wide) ++ print_visual_attribs_long(&attribs); ++ } ++ printf("\n"); ++ ++ XFree(visuals); ++} ++ ++#ifdef GLX_VERSION_1_3 ++ ++static void ++print_fbconfig_info(Display *dpy, int scrnum, InfoMode mode) ++{ ++ int numFBConfigs = 0; ++ struct visual_attribs attribs; ++ GLXFBConfig *fbconfigs; ++ int i; ++ ++ /* get list of all fbconfigs on this screen */ ++ fbconfigs = glXGetFBConfigs(dpy, scrnum, &numFBConfigs); ++ ++ if (numFBConfigs == 0) { ++ XFree(fbconfigs); ++ return; ++ } ++ ++ printf("%d GLXFBConfigs:\n", numFBConfigs); ++ if (mode == Normal) ++ print_visual_attribs_short_header(); ++ else if (mode == Wide) ++ print_visual_attribs_long_header(); ++ ++ for (i = 0; i < numFBConfigs; i++) { ++ get_fbconfig_attribs(dpy, fbconfigs[i], &attribs); ++ ++ if (mode == Verbose) ++ print_visual_attribs_verbose(&attribs, True); ++ else if (mode == Normal) ++ print_visual_attribs_short(&attribs); ++ else if (mode == Wide) ++ print_visual_attribs_long(&attribs); ++ } ++ printf("\n"); ++ ++ XFree(fbconfigs); ++} ++ ++#endif ++ ++/* ++ * Stand-alone Mesa doesn't really implement the GLX protocol so it ++ * doesn't really know the GLX attributes associated with an X visual. ++ * The first time a visual is presented to Mesa's pseudo-GLX it ++ * attaches ancilliary buffers to it (like depth and stencil). ++ * But that usually only works if glXChooseVisual is used. ++ * This function calls glXChooseVisual() to sort of "prime the pump" ++ * for Mesa's GLX so that the visuals that get reported actually ++ * reflect what applications will see. ++ * This has no effect when using true GLX. ++ */ ++static void ++mesa_hack(Display *dpy, int scrnum) ++{ ++ static int attribs[] = { ++ GLX_RGBA, ++ GLX_RED_SIZE, 1, ++ GLX_GREEN_SIZE, 1, ++ GLX_BLUE_SIZE, 1, ++ GLX_DEPTH_SIZE, 1, ++ GLX_STENCIL_SIZE, 1, ++ GLX_ACCUM_RED_SIZE, 1, ++ GLX_ACCUM_GREEN_SIZE, 1, ++ GLX_ACCUM_BLUE_SIZE, 1, ++ GLX_ACCUM_ALPHA_SIZE, 1, ++ GLX_DOUBLEBUFFER, ++ None ++ }; ++ XVisualInfo *visinfo; ++ ++ visinfo = glXChooseVisual(dpy, scrnum, attribs); ++ if (visinfo) ++ XFree(visinfo); ++} ++ ++ ++/* ++ * Examine all visuals to find the so-called best one. ++ * We prefer deepest RGBA buffer with depth, stencil and accum ++ * that has no caveats. ++ */ ++static int ++find_best_visual(Display *dpy, int scrnum) ++{ ++ XVisualInfo theTemplate; ++ XVisualInfo *visuals; ++ int numVisuals; ++ long mask; ++ int i; ++ struct visual_attribs bestVis; ++ ++ /* get list of all visuals on this screen */ ++ theTemplate.screen = scrnum; ++ mask = VisualScreenMask; ++ visuals = XGetVisualInfo(dpy, mask, &theTemplate, &numVisuals); ++ ++ /* init bestVis with first visual info */ ++ get_visual_attribs(dpy, &visuals[0], &bestVis); ++ ++ /* try to find a "better" visual */ ++ for (i = 1; i < numVisuals; i++) { ++ struct visual_attribs vis; ++ ++ get_visual_attribs(dpy, &visuals[i], &vis); ++ ++ /* always skip visuals with caveats */ ++ if (vis.visualCaveat != GLX_NONE_EXT) ++ continue; ++ ++ /* see if this vis is better than bestVis */ ++ if ((!bestVis.supportsGL && vis.supportsGL) || ++ (bestVis.visualCaveat != GLX_NONE_EXT) || ++ (!(bestVis.render_type & GLX_RGBA_BIT) && (vis.render_type & GLX_RGBA_BIT)) || ++ (!bestVis.doubleBuffer && vis.doubleBuffer) || ++ (bestVis.redSize < vis.redSize) || ++ (bestVis.greenSize < vis.greenSize) || ++ (bestVis.blueSize < vis.blueSize) || ++ (bestVis.alphaSize < vis.alphaSize) || ++ (bestVis.depthSize < vis.depthSize) || ++ (bestVis.stencilSize < vis.stencilSize) || ++ (bestVis.accumRedSize < vis.accumRedSize)) { ++ /* found a better visual */ ++ bestVis = vis; ++ } ++ } ++ ++ XFree(visuals); ++ ++ return bestVis.id; ++} ++ ++ ++static void ++usage(void) ++{ ++ printf("Usage: glxinfo [-v] [-t] [-h] [-i] [-b] [-s] ][-display <dname>]\n"); ++ printf("\t-v: Print visuals info in verbose form.\n"); ++ printf("\t-t: Print verbose table.\n"); ++ printf("\t-display <dname>: Print GLX visuals on specified server.\n"); ++ printf("\t-h: This information.\n"); ++ printf("\t-i: Force an indirect rendering context.\n"); ++ printf("\t-b: Find the 'best' visual and print its number.\n"); ++ printf("\t-l: Print interesting OpenGL limits.\n"); ++ printf("\t-s: Print a single extension per line.\n"); ++} ++ ++ ++int ++main(int argc, char *argv[]) ++{ ++ char *displayName = NULL; ++ Display *dpy; ++ int numScreens, scrnum; ++ InfoMode mode = Normal; ++ Bool findBest = False; ++ Bool limits = False; ++ Bool allowDirect = True; ++ Bool singleLine = False; ++ int i; ++ ++ for (i = 1; i < argc; i++) { ++ if (strcmp(argv[i], "-display") == 0 && i + 1 < argc) { ++ displayName = argv[i + 1]; ++ i++; ++ } ++ else if (strcmp(argv[i], "-t") == 0) { ++ mode = Wide; ++ } ++ else if (strcmp(argv[i], "-v") == 0) { ++ mode = Verbose; ++ } ++ else if (strcmp(argv[i], "-b") == 0) { ++ findBest = True; ++ } ++ else if (strcmp(argv[i], "-i") == 0) { ++ allowDirect = False; ++ } ++ else if (strcmp(argv[i], "-l") == 0) { ++ limits = True; ++ } ++ else if (strcmp(argv[i], "-h") == 0) { ++ usage(); ++ return 0; ++ } ++ else if (strcmp(argv[i], "-s") == 0) { ++ singleLine = True; ++ } ++ else { ++ printf("Unknown option `%s'\n", argv[i]); ++ usage(); ++ return 0; ++ } ++ } ++ ++ dpy = XOpenDisplay(displayName); ++ if (!dpy) { ++ fprintf(stderr, "Error: unable to open display %s\n", XDisplayName(displayName)); ++ return -1; ++ } ++ ++ if (findBest) { ++ int b; ++ mesa_hack(dpy, 0); ++ b = find_best_visual(dpy, 0); ++ printf("%d\n", b); ++ } ++ else { ++ numScreens = ScreenCount(dpy); ++ print_display_info(dpy); ++ for (scrnum = 0; scrnum < numScreens; scrnum++) { ++ mesa_hack(dpy, scrnum); ++ print_screen_info(dpy, scrnum, allowDirect, limits, singleLine); ++ printf("\n"); ++ print_visual_info(dpy, scrnum, mode); ++#ifdef GLX_VERSION_1_3 ++ print_fbconfig_info(dpy, scrnum, mode); ++#endif ++ if (scrnum + 1 < numScreens) ++ printf("\n\n"); ++ } ++ } ++ ++ XCloseDisplay(dpy); ++ ++ return 0; ++} +--- Mesa.orig/xdemos/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ Mesa/xdemos/Makefile 2012-08-14 15:02:05.458705999 +0200 +@@ -0,0 +1,23 @@ ++TOP = .. ++ ++include $(TOP)/configs/current ++XDEMOS_LIBS = -L$(TOP)/$(LIB_DIR) -lGL -lglapi $(X11_LIBS) -lm ++ ++default: glxinfo glxgears ++ ++glxgears: ++ $(CC) -I$(TOP)/include $(XDEMOS_LIBS) -o glxgears glxgears.c ++ ++glxinfo: ++ $(CC) -I$(TOP)/include $(XDEMOS_LIBS) -o glxinfo glxinfo.c ++ ++install: glxgears glxinfo ++ test -e $(DESTDIR)$(INSTALL_DIR)/bin || $(INSTALL) -v -d -m755 $(DESTDIR)$(INSTALL_DIR)/bin ++ $(INSTALL) -v -m755 glxgears $(DESTDIR)$(INSTALL_DIR)/bin ++ $(INSTALL) -v -m755 glxinfo $(DESTDIR)$(INSTALL_DIR)/bin ++ ++clean: ++ rm -f glxgears glxinfo ++ ++.phony: default glxgears glxinfo install clean ++ diff --git a/stage4/patches/common/MesaLib-8.0.4-llvm-3.1-fixes-1.patch b/stage4/patches/common/MesaLib-8.0.4-llvm-3.1-fixes-1.patch new file mode 100644 index 0000000..e906f60 --- /dev/null +++ b/stage4/patches/common/MesaLib-8.0.4-llvm-3.1-fixes-1.patch @@ -0,0 +1,51 @@ +Submitted By: Bruce Dubbs (bdubbs_AT_linuxfromscratch_DOT_org) +Date: 2012-06-04 +Initial Package Version: 8.0.1 +Origin: https://projects.archlinux.org/svntogit/packages.git/plain/trunk/mesa-8.0.3-llvm-3.1-fixes.patch?h=packages/mesa +Upstream Status: Not applicable +Description: Needed to build with LLVM 3.1 + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } diff --git a/stage4/patches/common/WindowMaker-0.95.4-remove-inexistent-icons-path.patch b/stage4/patches/common/WindowMaker-0.95.4-remove-inexistent-icons-path.patch new file mode 100644 index 0000000..6f3e13a --- /dev/null +++ b/stage4/patches/common/WindowMaker-0.95.4-remove-inexistent-icons-path.patch @@ -0,0 +1,24 @@ +diff -Naur WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in +--- WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in 2013-01-09 16:42:39.000000000 -0500 ++++ WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in 2013-06-01 12:14:57.943106756 -0400 +@@ -12,11 +12,9 @@ + "~/GNUstep/Library/Icons", + "#pkgdatadir#/Icons", + "#pkgdatadir#/Pixmaps", +- "/usr/include/X11/pixmaps", + "~/GNUstep/Library/WindowMaker/Pixmaps", + "~/GNUstep/Library/WindowMaker/CachedPixmaps", + "/usr/share/icons", +- "/usr/local/share/pixmaps", + "/usr/share/pixmaps" + ); + PixmapPath = ( +@@ -25,8 +23,6 @@ + "~/GNUstep/Library/WindowMaker/CachedPixmaps", + "#pkgdatadir#/Pixmaps", + "#pkgdatadir#/Backgrounds", +- "/usr/include/X11/pixmaps", +- "/usr/local/share/pixmaps", + "/usr/share/pixmaps" + ); + WindowTitleBalloons = YES; diff --git a/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch b/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch new file mode 100644 index 0000000..6576ea9 --- /dev/null +++ b/stage4/patches/common/lesstif-0.95.2-testsuite_fix-1.patch @@ -0,0 +1,251 @@ +Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org> +Date: 2007-07-15 +Initial Package Version: 0.94.4 +Upstream Status: Not submitted (LFS specific) +Origin: Randy McMurchy +Description: Add minor changes to the testsuite so that something + meaningful can be made by running the tests + +$Id: lesstif-0.95.0-testsuite_fix-1.patch 1848 2007-07-15 20:16:40Z randy $ + +diff -Naur lesstif-0.94.4-orig/test/testall.in lesstif-0.94.4/test/testall.in +--- lesstif-0.94.4-orig/test/testall.in 2001-11-21 12:55:04.000000000 +0000 ++++ lesstif-0.94.4/test/testall.in 2005-04-16 22:43:17.000000000 +0000 +@@ -127,7 +127,7 @@ + if [ $status -ne 0 ] + then + echo "failed $status" +- echo "status" >>failed ++ echo "$dir/$file $status" >>../failed + FAILED=`expr $FAILED + 1` + else + echo "okay" +@@ -156,7 +156,7 @@ + echo "" + diff failed failed.known + else +- echo "No change in the tests" ++ echo "All failed tests were expected" + fi + + # Exiting. Return number of broken tests (?!) + +diff -Naur lesstif-0.94.4-orig/test/Xm/fonts/test3.c lesstif-0.94.4/test/Xm/fonts/test3.c +--- lesstif-0.94.4-orig/test/Xm/fonts/test3.c 2003-08-24 12:55:45.000000000 +0000 ++++ lesstif-0.94.4/test/Xm/fonts/test3.c 2005-04-17 02:27:15.000000000 +0000 +@@ -33,7 +33,7 @@ + + XtRealizeWidget(toplevel); + +- for (i=0; i<100; i++) { ++ for (i=0; i<50; i++) { + fontlist = _XmGetDefaultFontList(label, XmBUTTON_FONTLIST); + XmFontListFree(fontlist); + sleep(1); + +diff -Naur lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c lesstif-0.94.4/test/Xm/pushbutton/test18.c +--- lesstif-0.94.4-orig/test/Xm/pushbutton/test18.c 2004-10-03 13:26:50.000000000 +0000 ++++ lesstif-0.94.4/test/Xm/pushbutton/test18.c 2005-04-17 02:27:58.000000000 +0000 +@@ -72,6 +72,6 @@ + /* End */ + fprintf(stderr, "Finishing up\n"); + +- sleep(300); ++ sleep(10); + exit(0); + } + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test2.c lesstif-0.95.0/test/Xm-2.1/print/test2.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test2.c 2001-03-09 16:20:34.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test2.c 2007-07-15 17:19:11.000000000 +0000 +@@ -180,8 +180,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows + 1; + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test4.c lesstif-0.95.0/test/Xm-2.1/print/test4.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test4.c 2001-03-09 16:20:34.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test4.c 2007-07-15 17:20:26.000000000 +0000 +@@ -170,8 +170,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows + 1; + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test5.c lesstif-0.95.0/test/Xm-2.1/print/test5.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test5.c 2001-01-19 19:17:45.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test5.c 2007-07-15 17:20:46.000000000 +0000 +@@ -256,8 +256,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows; + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test7.c lesstif-0.95.0/test/Xm-2.1/print/test7.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test7.c 2001-01-19 19:17:45.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test7.c 2007-07-15 17:21:19.000000000 +0000 +@@ -147,8 +147,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows + 1; + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test8.c lesstif-0.95.0/test/Xm-2.1/print/test8.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test8.c 2001-01-27 16:36:09.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test8.c 2007-07-15 17:20:59.000000000 +0000 +@@ -135,8 +135,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows + 1; + +diff -Naur lesstif-0.95.0-orig/test/Xm-2.1/print/test9.c lesstif-0.95.0/test/Xm-2.1/print/test9.c +--- lesstif-0.95.0-orig/test/Xm-2.1/print/test9.c 2001-01-27 16:36:09.000000000 +0000 ++++ lesstif-0.95.0/test/Xm-2.1/print/test9.c 2007-07-15 17:22:29.000000000 +0000 +@@ -184,8 +184,9 @@ + /* Get data to calculate number of pages to print */ + XtVaGetValues(tw, + XmNrows, &nrows, +- XmNtotalLines, &nlines, + NULL); ++ /* XmNtotalLines, &nlines,*/ ++ nlines = _XmTextGetTotalLines(tw); + + /* Calculate number of pages to print */ + npages = nlines / nrows + 1; +--- lesstif-0.95.0-orig/test/Xm/failed.known 1970-01-01 00:00:00.000000000 +0000 ++++ lesstif-0.95.0/test/Xm/failed.known 2007-07-15 17:53:39.000000000 +0000 +@@ -0,0 +1,102 @@ ++ ++bulletinboard/test1 1 ++bulletinboard/test2 1 ++bulletinboard/test4 1 ++cascadebutton/test2 1 ++cascadebutton/test6 131 ++cascadebutton/test7 1 ++cascadebuttong/test3 144 ++cascadebuttong/test4 1 ++cascadebuttong/test7 1 ++command/test3 131 ++drawnbutton/test10 1 ++drawnbutton/test6 144 ++filesb/test1 1 ++filesb/test10 1 ++filesb/test13 71 ++filesb/test2 1 ++filesb/test20 1 ++filesb/test3 1 ++filesb/test4 1 ++filesb/test6 1 ++filesb/test8 1 ++filesb/test9 1 ++form/test4 1 ++form/test50 1 ++form/test53 8 ++form/test56 1 ++form/test58 1 ++form/test6 1 ++frame/test10 1 ++frame/test8 2 ++frame/test9 1 ++label/test1 1 ++label/test10 1 ++label/test3 1 ++label/test4 1 ++labelg/test2 1 ++labelg/test4 144 ++list/test16 1 ++list/test21 3 ++mainw/test12 2 ++mainw/test13 1 ++mainw/test17 1 ++mainw/test9 1 ++menushell/test9 1 ++messagebox/test12 1 ++messagebox/test19 2 ++messagebox/test8 1 ++misc/test8 1 ++panedw/test1 1 ++panedw/test6 1 ++panedw/test7 3 ++panedw/test8 1 ++pushbg/test2 1 ++pushbg/test5 1 ++pushbg/test6 1 ++pushbg/test7 1 ++pushbg/test9 144 ++pushbutton/test13 1 ++pushbutton/test2 1 ++pushbutton/test6 1 ++pushbutton/test7 1 ++reptype/test1 2 ++rowcolumn/test18 1 ++rowcolumn/test50 7 ++rowcolumn/test51 99 ++rowcolumn/test58 1 ++rowcolumn/test60 1 ++rowcolumn/test62 1 ++rowcolumn/test63 2 ++rowcolumn/test65 1 ++scale/test17 144 ++scrolledwindow/test1 1 ++scrolledwindow/test13 1 ++scrolledwindow/test19 1 ++scrolledwindow/test20 1 ++scrolledwindow/test21 1 ++selectionbox/test11 1 ++selectionbox/test13 1 ++selectionbox/test9 169 ++text/test1 1 ++text/test10 1 ++text/test13 1 ++text/test16 55 ++text/test2 1 ++text/test22 1 ++text/test23 1 ++text/test7 1 ++text/test8 1 ++textf/test15 1 ++textf/test17 1 ++textf/test2 1 ++textf/test3 1 ++textf/test7 1 ++togglebg/test2 144 ++togglebutton/test7 144 ++tracking/test1 1 ++traversal/test1 1 ++traversal/test4 1 ++vendor/test5 1 ++xmstring/test10 1 ++xmstring/test8 1 diff --git a/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch b/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch new file mode 100644 index 0000000..108aef2 --- /dev/null +++ b/stage4/patches/common/libXft-2.3.1-freetype_fix-1.patch @@ -0,0 +1,30 @@ +Submitted By: Chris Staub <chris at beaker67 dot com> +Date: 2013-11-29 +Initial Package Version: 2.3.1 +Upstream Status: Fixed +Origin: freedesktop wiki +URL: https://trac.macports.org/changeset/114077 +Description: Fixes build with FreeType-2.5.1 + +diff -Naur libXft-2.3.1.orig/src/xftglyphs.c libXft-2.3.1/src/xftglyphs.c + +Index: src/xftglyphs.c +=================================================================== +--- libXft-2.3.1.orig/src/xftglyphs.c 2012-06-02 12:36:35.000000000 -0400 ++++ libXft-2.3.1/src/xftglyphs.c 2013-11-28 23:12:42.000000000 -0500 +@@ -21,10 +21,10 @@ + */ + + #include "xftint.h" +-#include <freetype/ftoutln.h> +-#include <freetype/ftlcdfil.h> +- +-#include <freetype/ftsynth.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_LCD_FILTER_H ++#include FT_SYNTHESIS_H + + /* + * Validate the memory info for a font + diff --git a/stage4/patches/common/llvm-3.1-fix-docdir.patch b/stage4/patches/common/llvm-3.1-fix-docdir.patch new file mode 100644 index 0000000..d28f328 --- /dev/null +++ b/stage4/patches/common/llvm-3.1-fix-docdir.patch @@ -0,0 +1,19 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2013-08-08 +Initial Package Version: 3.1 +Upstream Status: Not sent +Origin: BLFS +Description: Fixes location of the installed documentation. + +diff -Naur llvm-3.1.src.orig/Makefile.config.in llvm-3.1.src.new/Makefile.config.in +--- llvm-3.1.src.orig/Makefile.config.in 2012-05-15 18:06:08.000000000 -0400 ++++ llvm-3.1.src.new/Makefile.config.in 2013-08-08 10:49:51.000000000 -0400 +@@ -96,7 +96,7 @@ + PROJ_bindir := $(PROJ_prefix)/bin + PROJ_libdir := $(PROJ_prefix)/lib + PROJ_datadir := $(PROJ_prefix)/share +-PROJ_docsdir := $(PROJ_prefix)/docs/llvm ++PROJ_docsdir := $(PROJ_prefix)/share/doc/llvm-3.3 + PROJ_etcdir := $(PROJ_prefix)/etc/llvm + PROJ_includedir := $(PROJ_prefix)/include + PROJ_infodir := $(PROJ_prefix)/info diff --git a/stage5/patches/common/abiword-2.8.6-glib.patch b/stage5/patches/common/abiword-2.8.6-glib.patch new file mode 100644 index 0000000..32db934 --- /dev/null +++ b/stage5/patches/common/abiword-2.8.6-glib.patch @@ -0,0 +1,104 @@ +diff -Naur abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6.new/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 09:11:01.000000000 -0400 ++++ abiword-2.8.6.new/src/Makefile.am 2012-08-11 15:35:09.357847411 -0400 +@@ -44,7 +44,7 @@ + + libabiword_2_8_la_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ \ + -avoid-version \ + -export-dynamic + +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ \ + -avoid-version \ + -export-dynamic + +diff -Naur abiword-2.8.6.orig/src/Makefile.in abiword-2.8.6.new/src/Makefile.in +--- abiword-2.8.6.orig/src/Makefile.in 2010-06-13 17:17:56.000000000 -0400 ++++ abiword-2.8.6.new/src/Makefile.in 2012-08-11 15:35:09.382850589 -0400 +@@ -503,7 +503,7 @@ + $(WP_CPPFLAGS) \ + -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\"" + +-libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \ ++libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -avoid-version \ + -export-dynamic $(am__append_6) + libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \ + text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \ +@@ -538,7 +538,7 @@ + + @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \ + @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \ +-@TOOLKIT_COCOA_TRUE@ --no-undefined \ ++@TOOLKIT_COCOA_TRUE@ \ + @TOOLKIT_COCOA_TRUE@ -avoid-version \ + @TOOLKIT_COCOA_TRUE@ -export-dynamic \ + @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names +@@ -554,7 +554,7 @@ + + @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \ + @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \ +-@TOOLKIT_COCOA_FALSE@ --no-undefined \ ++@TOOLKIT_COCOA_FALSE@ \ + @TOOLKIT_COCOA_FALSE@ -avoid-version \ + @TOOLKIT_COCOA_FALSE@ -export-dynamic + +diff -Naur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6.new/src/af/util/xp/ut_go_file.h +--- abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h 2009-08-27 09:27:10.000000000 -0400 ++++ abiword-2.8.6.new/src/af/util/xp/ut_go_file.h 2012-08-11 15:34:43.264531084 -0400 +@@ -31,7 +31,6 @@ + + #include <glib.h> + #include <gsf/gsf.h> +-#include <glib/gerror.h> + #include <time.h> + + G_BEGIN_DECLS +diff -Naur abiword-2.8.6.orig/src/af/util/xp/ut_png.cpp abiword-2.8.6.new/src/af/util/xp/ut_png.cpp +--- abiword-2.8.6.orig/src/af/util/xp/ut_png.cpp 2008-02-23 22:33:07.000000000 -0500 ++++ abiword-2.8.6.new/src/af/util/xp/ut_png.cpp 2012-08-11 15:34:48.994259302 -0400 +@@ -71,7 +71,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL)); +diff -Naur abiword-2.8.6.orig/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp abiword-2.8.6.new/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +--- abiword-2.8.6.orig/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 00:02:04.000000000 -0400 ++++ abiword-2.8.6.new/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-08-11 15:35:02.247943778 -0400 +@@ -185,7 +185,7 @@ + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); diff --git a/stage5/patches/common/agg-2.5-libtool.patch b/stage5/patches/common/agg-2.5-libtool.patch new file mode 100644 index 0000000..cd0eb27 --- /dev/null +++ b/stage5/patches/common/agg-2.5-libtool.patch @@ -0,0 +1,46 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2011-08-25 +Initial Package Version: 2.5 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Fix the following compilation error: + /bin/sh ../../../libtool --tag=CXX --mode=link g++ -I../../../include -I + -pipe -O2 -march=native -fomit-frame-pointer -version-info 2:4:0 -L -o + libaggplatformX11.la -rpath /usr/local/lib + libaggplatformX11_la-agg_platform_support.lo -lX11 + libtool: link: require no space between `-L' and `-o' + +This is caused by an empty variable x_libraries. Added a conditional automake +variable to prevent that. + +diff -Naur agg-2.5.orig/configure.in agg-2.5.new/configure.in +--- agg-2.5.orig/configure.in 2006-10-09 00:06:36.000000000 -0400 ++++ agg-2.5.new/configure.in 2011-08-25 22:49:03.595769037 -0400 +@@ -123,6 +123,10 @@ + AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) + AC_SUBST(x_includes) + AC_SUBST(x_libraries) ++ ++dnl To avoid empty "-L", because libtool doesn't like that. ++AM_CONDITIONAL(EMPTY_X_LIBRAIRIES,[test x$x_libraries = x]) ++ + dnl ############################################### + + dnl Settung up library version +diff -Naur agg-2.5.orig/src/platform/X11/Makefile.am agg-2.5.new/src/platform/X11/Makefile.am +--- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-10 19:59:45.000000000 -0500 ++++ agg-2.5.new/src/platform/X11/Makefile.am 2011-08-25 22:49:15.801769061 -0400 +@@ -1,7 +1,13 @@ + if ENABLE_X11 + lib_LTLIBRARIES = libaggplatformX11.la + ++if EMPTY_X_LIBRAIRIES ++# To avoid empty "-L", because libtool doesn't like that. ++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ ++else + libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ ++endif ++ + libaggplatformX11_la_SOURCES = agg_platform_support.cpp + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ + libaggplatformX11_la_LIBADD = -lX11 diff --git a/stage5/patches/common/bridge-utils-1.5-linux_3.8_fix-1.patch b/stage5/patches/common/bridge-utils-1.5-linux_3.8_fix-1.patch new file mode 100644 index 0000000..292cc83 --- /dev/null +++ b/stage5/patches/common/bridge-utils-1.5-linux_3.8_fix-1.patch @@ -0,0 +1,54 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2013-03-10 +Initial Package Version: 1.5 +Upstream Status: Unknown +Origin: LFS +Description: This patch contains fixes a problem with +the omission of a needed include file in the kernel's linux/if_bridge.h. +It also fixes some autoconf warnings. + + +diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in +--- bridge-utils-1.5.orig/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/Makefile.in 2013-03-10 13:44:41.000000000 -0500 +@@ -9,6 +9,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + distdir = $(PACKAGE)-$(VERSION) + + SUBDIRS=libbridge brctl doc +diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in +--- bridge-utils-1.5.orig/brctl/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/brctl/Makefile.in 2013-03-10 13:44:15.000000000 -0500 +@@ -12,6 +12,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + + INSTALL=@INSTALL@ + +diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in +--- bridge-utils-1.5.orig/doc/Makefile.in 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/doc/Makefile.in 2013-03-10 13:43:39.000000000 -0500 +@@ -9,6 +9,7 @@ + bindir=@bindir@ + sbindir=@sbindir@ + mandir=@mandir@ ++datarootdir=@datarootdir@ + + SUBDIRS=libbridge brctl + +diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h +--- bridge-utils-1.5.orig/libbridge/libbridge.h 2011-03-28 19:52:54.000000000 -0500 ++++ bridge-utils-1.5/libbridge/libbridge.h 2013-03-10 13:46:23.000000000 -0500 +@@ -21,6 +21,7 @@ + + #include <sys/socket.h> + #include <linux/if.h> ++#include <netinet/ip6.h> + #include <linux/if_bridge.h> + + /* defined in net/if.h but that conflicts with linux/if.h... */ diff --git a/stage5/patches/common/cdrdao-1.2.3-missing-stat-include.patch b/stage5/patches/common/cdrdao-1.2.3-missing-stat-include.patch new file mode 100644 index 0000000..51ecad2 --- /dev/null +++ b/stage5/patches/common/cdrdao-1.2.3-missing-stat-include.patch @@ -0,0 +1,17 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2012-08-11 +Initial Package Version: 1.2.3 +Upstream Status: Not sent +Origin: BLFS +Description: Add missing sys/stat.h include. +diff -Naur cdrdao-1.2.3.orig/dao/ScsiIf-linux.cc cdrdao-1.2.3.new/dao/ScsiIf-linux.cc +--- cdrdao-1.2.3.orig/dao/ScsiIf-linux.cc 2009-09-28 06:12:03.000000000 -0400 ++++ cdrdao-1.2.3.new/dao/ScsiIf-linux.cc 2012-08-11 12:38:12.724527907 -0400 +@@ -26,6 +26,7 @@ + #include <string.h> + #include <assert.h> + #include <sys/ioctl.h> ++#include <sys/stat.h> + #include <glob.h> + #include <asm/param.h> + #include <scsi/scsi.h> diff --git a/stage5/patches/common/celestia-1.6.1-fixes.patch b/stage5/patches/common/celestia-1.6.1-fixes.patch new file mode 100644 index 0000000..d7262e2 --- /dev/null +++ b/stage5/patches/common/celestia-1.6.1-fixes.patch @@ -0,0 +1,48 @@ +diff -Naur celestia-1.6.1.orig/src/celengine/image.cpp celestia-1.6.1.patched/src/celengine/image.cpp +--- celestia-1.6.1.orig/src/celengine/image.cpp 2011-06-05 12:11:09.000000000 -0400 ++++ celestia-1.6.1.patched/src/celengine/image.cpp 2013-11-04 18:18:59.784753129 -0500 +@@ -14,6 +14,8 @@ + #define PNG_SUPPORT + #endif + ++#include <string.h> ++ + #ifdef TARGET_OS_MAC + #include <unistd.h> + #include "CGBuffer.h" +diff -Naur celestia-1.6.1.orig/src/celengine/texture.cpp celestia-1.6.1.patched/src/celengine/texture.cpp +--- celestia-1.6.1.orig/src/celengine/texture.cpp 2011-06-05 12:11:09.000000000 -0400 ++++ celestia-1.6.1.patched/src/celengine/texture.cpp 2013-11-04 18:20:46.707748657 -0500 +@@ -12,6 +12,8 @@ + #define PNG_SUPPORT + #endif + ++#include <string.h> ++ + #ifdef TARGET_OS_MAC + #include <unistd.h> + #include "CGBuffer.h" +diff -Naur celestia-1.6.1.orig/src/celengine/timeline.cpp celestia-1.6.1.patched/src/celengine/timeline.cpp +--- celestia-1.6.1.orig/src/celengine/timeline.cpp 2011-06-05 12:11:09.000000000 -0400 ++++ celestia-1.6.1.patched/src/celengine/timeline.cpp 2013-11-04 18:21:24.449747078 -0500 +@@ -10,6 +10,8 @@ + // as published by the Free Software Foundation; either version 2 + // of the License, or (at your option) any later version. + ++#include <string.h> ++ + #include "celengine/timeline.h" + #include "celengine/timelinephase.h" + #include "celengine/frametree.h" +diff -Naur celestia-1.6.1.orig/src/celestia/imagecapture.cpp celestia-1.6.1.patched/src/celestia/imagecapture.cpp +--- celestia-1.6.1.orig/src/celestia/imagecapture.cpp 2011-06-05 12:11:13.000000000 -0400 ++++ celestia-1.6.1.patched/src/celestia/imagecapture.cpp 2013-11-04 18:31:16.891722301 -0500 +@@ -31,6 +31,8 @@ + #include "png.h" + #endif + ++#include <zlib.h> ++ + // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng + #ifndef png_jmpbuf + #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/stage5/patches/common/chordpack-0.8.2-perl-switch.patch b/stage5/patches/common/chordpack-0.8.2-perl-switch.patch new file mode 100644 index 0000000..d0286d0 --- /dev/null +++ b/stage5/patches/common/chordpack-0.8.2-perl-switch.patch @@ -0,0 +1,17 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2011-08-31 +Initial Package Version: 0.8.2 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Fixes the following error when launching chordpack: + Unrecognized switch: -*- Mode:perl -*- + +diff -Naur chordpack-0.8.2.orig/chordpack chordpack-0.8.2.new/chordpack +--- chordpack-0.8.2.orig/chordpack 2003-11-18 20:55:34.000000000 -0500 ++++ chordpack-0.8.2.new/chordpack 2011-08-31 01:01:43.788923813 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w -*- Mode:perl -*- ++#!/usr/bin/perl -w + + # {{{ header and version + # diff --git a/stage5/patches/common/cups-1.4.8-php54.patch b/stage5/patches/common/cups-1.4.8-php54.patch new file mode 100644 index 0000000..0d5efa9 --- /dev/null +++ b/stage5/patches/common/cups-1.4.8-php54.patch @@ -0,0 +1,22 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2013-12-28 +Initial Package Version: 1.4.8 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Fix compile bug with PHP 5.4: + + Compiling phpcups.c... + phpcups.c:43:1: error: unknown type name âfunction_entryâ + +diff -Naur cups-1.4.8.orig/scripting/php/phpcups.c cups-1.4.8.new/scripting/php/phpcups.c +--- cups-1.4.8.orig/scripting/php/phpcups.c 2008-06-09 11:55:04.000000000 -0400 ++++ cups-1.4.8.new/scripting/php/phpcups.c 2013-12-28 15:12:26.901466741 -0500 +@@ -40,7 +40,7 @@ + * PHP function list... + */ + +-function_entry phpcups_functions[] = ++zend_function_entry phpcups_functions[] = + { + PHP_FE(cups_cancel_job, NULL) + PHP_FE(cups_get_dests, NULL) diff --git a/stage5/patches/common/dvd+rw-tools-7.1-limits.patch b/stage5/patches/common/dvd+rw-tools-7.1-limits.patch new file mode 100644 index 0000000..25e4a24 --- /dev/null +++ b/stage5/patches/common/dvd+rw-tools-7.1-limits.patch @@ -0,0 +1,16 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2008-08-19 +Initial Package Version: dvd+rw-tools-7.0 +Description: Fix a compilation error with a missing system include file. + +diff -Naur dvd+rw-tools-7.1.orig/transport.hxx dvd+rw-tools-7.1.patched/transport.hxx +--- dvd+rw-tools-7.1.orig/transport.hxx 2008-03-01 05:34:43.000000000 -0500 ++++ dvd+rw-tools-7.1.patched/transport.hxx 2008-08-19 23:34:17.000000000 -0400 +@@ -7,6 +7,7 @@ + // + + #if defined(__unix) || defined(__unix__) ++#include <limits.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> diff --git a/stage5/patches/common/dvdfs-0.2-gcc44-missing-include.patch b/stage5/patches/common/dvdfs-0.2-gcc44-missing-include.patch new file mode 100644 index 0000000..c119d9b --- /dev/null +++ b/stage5/patches/common/dvdfs-0.2-gcc44-missing-include.patch @@ -0,0 +1,11 @@ +diff -Naur dvdfs-0.2/dvdfs.cpp dvdfs-0.2.new/dvdfs.cpp +--- dvdfs-0.2/dvdfs.cpp 2009-02-09 20:56:03.000000000 -0500 ++++ dvdfs-0.2.new/dvdfs.cpp 2010-04-07 10:04:48.000000000 -0400 +@@ -13,6 +13,7 @@ + #include <stdlib.h> + #include <stddef.h> + #include <unistd.h> ++#include <stdio.h> + #include <signal.h> + #include <time.h> + #include <ctype.h> diff --git a/stage5/patches/common/firefox-22.0-system-cairo.patch b/stage5/patches/common/firefox-22.0-system-cairo.patch new file mode 100644 index 0000000..dbaeed8 --- /dev/null +++ b/stage5/patches/common/firefox-22.0-system-cairo.patch @@ -0,0 +1,43 @@ +--- orig/gfx/thebes/gfxPlatform.cpp 2013-07-30 21:50:32.000000000 -0400 ++++ new/gfx/thebes/gfxPlatform.cpp 2013-07-30 21:48:08.000000000 -0400 +@@ -543,6 +543,7 @@ + delete static_cast<SourceSurfaceUserData*>(srcSurfUD); + } + ++#if MOZ_TREE_CAIRO + void SourceSnapshotDetached(cairo_surface_t *nullSurf) + { + gfxImageSurface* origSurf = +@@ -550,6 +551,13 @@ + + origSurf->SetData(&kSourceSurface, NULL, NULL); + } ++#else ++void SourceSnapshotDetached(void *nullSurf) ++{ ++ gfxImageSurface* origSurf = static_cast<gfxImageSurface*>(nullSurf); ++ origSurf->SetData(&kSourceSurface, NULL, NULL); ++} ++#endif + + RefPtr<SourceSurface> + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) +@@ -662,6 +670,7 @@ + + } + ++#if MOZ_TREE_CAIRO + cairo_surface_t *nullSurf = + cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); + cairo_surface_set_user_data(nullSurf, +@@ -670,6 +679,10 @@ + NULL); + cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); + cairo_surface_destroy(nullSurf); ++#else ++ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", ++ (const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get()); ++#endif + } + + SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData; diff --git a/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch b/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch new file mode 100644 index 0000000..e5bbfae --- /dev/null +++ b/stage5/patches/common/foo2zjs-hvlinux-hp1020.patch @@ -0,0 +1,95 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2013-02-27 +Initial Package Version: +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: + - Remove ex dependency. + - Added automatic unloading of usblp module after firmware download + +diff -Naur foo2zjs.orig/Makefile foo2zjs.new/Makefile +--- foo2zjs.orig/Makefile 2013-02-20 19:05:38.000000000 -0500 ++++ foo2zjs.new/Makefile 2013-02-27 19:30:03.000000000 -0500 +@@ -912,14 +912,6 @@ + # + # Hotplug Installation Dependencies... + # +- @if ! type ex >/dev/null 2>&1; then \ +- echo " ***"; \ +- echo " *** Error: "ex" is not installed!"; \ +- echo " ***"; \ +- echo " *** Install "vim" package(s) for your OS"; \ +- echo " ***"; \ +- exit 1; \ +- fi + @if test -r $(LIBUDEVDIR)/*-printers.rules; then \ + echo " ***"; \ + echo " *** Error: system-config-printer-udev is installed!"; \ +@@ -959,6 +951,8 @@ + rm -f $(LIBUDEVDIR)/*-hplj10xx.rules; \ + if [ -x /sbin/udevd ]; then \ + version=`/sbin/udevd --version 2>/dev/null`; \ ++ elif [ -x /lib/udev/udevd ]; then \ ++ version=`/lib/udev/udevd --version 2>/dev/null`; \ + elif [ -x /usr/lib/udev/udevd ]; then \ + version=`/usr/lib/udev/udevd --version 2>/dev/null`; \ + elif [ -x /usr/lib/systemd/systemd-udevd ]; then \ +diff -Naur foo2zjs.orig/hplj1000 foo2zjs.new/hplj1000 +--- foo2zjs.orig/hplj1000 2013-01-11 11:20:04.000000000 -0500 ++++ foo2zjs.new/hplj1000 2013-02-27 22:59:52.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # hplj1000: + # hplj1005: +@@ -69,7 +69,7 @@ + log() { + echo "$PROGNAME: foo2zjs: $@" + } +-elif [ -x /usr/bin/logger ]; then ++elif [ -x /bin/logger ]; then + # Have logger... + log() { + logger -t "$PROGNAME" -- "foo2zjs: $@" +@@ -176,14 +176,7 @@ + exit + fi + chmod 664 $USERMAP +- ex - $USERMAP <<-EOF +- g/^hplj$MODEL/d +- \$a +- hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +- . +- w +- q +- EOF ++ echo "hplj$MODEL 0x0003 $USB1 $USB2 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000" >> $USERMAP + else + log "I don't know the USB info for this model yet. Please run" + log "usb_printerid on the usb device and send the output to:" +diff -Naur foo2zjs.orig/hplj10xx.rules foo2zjs.new/hplj10xx.rules +--- foo2zjs.orig/hplj10xx.rules 2010-04-09 16:53:09.000000000 -0400 ++++ foo2zjs.new/hplj10xx.rules 2013-02-27 22:36:18.000000000 -0500 +@@ -13,10 +13,21 @@ + KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ + ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \ + SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" ++ + #Own udev rule for HP Laserjet 1020 + KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ + ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ + SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" ++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ ++ SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/bin/sleep 8" ++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ ++ SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/sbin/rmmod usblp" ++KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ ++ SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/rc.d/init.d/cups restart" ++ + #Own udev rule for HP Laserjet P1005 + KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ + ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \ diff --git a/stage5/patches/common/gamin-0.1.10-glib-fix.patch b/stage5/patches/common/gamin-0.1.10-glib-fix.patch new file mode 100644 index 0000000..4205de2 --- /dev/null +++ b/stage5/patches/common/gamin-0.1.10-glib-fix.patch @@ -0,0 +1,54 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2012-08-11 +Initial Package Version: 0.1.10 +Upstream Status: Not sent +Origin: BLFS +Description: Fixes compiling error with Glib 2.32 or greater installed. +diff -Naur gamin-0.1.10.orig/server/gam_node.c gamin-0.1.10.new/server/gam_node.c +--- gamin-0.1.10.orig/server/gam_node.c 2007-07-04 09:36:49.000000000 -0400 ++++ gamin-0.1.10.new/server/gam_node.c 2012-08-11 13:25:56.473495675 -0400 +@@ -122,7 +122,7 @@ + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); +diff -Naur gamin-0.1.10.orig/server/gam_node.h gamin-0.1.10.new/server/gam_node.h +--- gamin-0.1.10.orig/server/gam_node.h 2007-07-04 09:36:49.000000000 -0400 ++++ gamin-0.1.10.new/server/gam_node.h 2012-08-11 13:25:56.478496313 -0400 +@@ -58,7 +58,7 @@ + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + +diff -Naur gamin-0.1.10.orig/server/gam_subscription.c gamin-0.1.10.new/server/gam_subscription.c +--- gamin-0.1.10.orig/server/gam_subscription.c 2007-07-04 09:36:49.000000000 -0400 ++++ gamin-0.1.10.new/server/gam_subscription.c 2012-08-11 13:25:56.485497202 -0400 +@@ -141,7 +141,7 @@ + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) +diff -Naur gamin-0.1.10.orig/server/gam_subscription.h gamin-0.1.10.new/server/gam_subscription.h +--- gamin-0.1.10.orig/server/gam_subscription.h 2007-07-04 09:36:49.000000000 -0400 ++++ gamin-0.1.10.new/server/gam_subscription.h 2012-08-11 13:25:56.489497710 -0400 +@@ -21,7 +21,7 @@ + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + diff --git a/stage5/patches/common/gegl-0.2.0-ffmpeg2-1.patch b/stage5/patches/common/gegl-0.2.0-ffmpeg2-1.patch new file mode 100644 index 0000000..26a97fc --- /dev/null +++ b/stage5/patches/common/gegl-0.2.0-ffmpeg2-1.patch @@ -0,0 +1,55 @@ +Submitted By: Igor ŽivkoviÄ <contact@igor-zivkovic.from.hr> +Date: 2013-10-08 +Initial Package Version: 0.2.0 +Upstream Status: Fixed +Origin: Gentoo +Description: Fixes building against FFmpeg version >= 2.0.0 + +diff -Naur gegl-0.2.0.orig/operations/external/ff-load.c gegl-0.2.0/operations/external/ff-load.c +--- gegl-0.2.0.orig/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200 ++++ gegl-0.2.0/operations/external/ff-load.c 2013-10-08 12:19:33.472272253 +0200 +@@ -137,7 +137,7 @@ + if (p->enc) + avcodec_close (p->enc); + if (p->ic) +- av_close_input_file (p->ic); ++ avformat_close_input(&p->ic); + if (p->lavc_frame) + av_free (p->lavc_frame); + +@@ -216,9 +216,9 @@ + { + do + { +- if (av_read_packet (p->ic, &p->pkt) < 0) ++ if (av_read_frame (p->ic, &p->pkt) < 0) + { +- fprintf (stderr, "av_read_packet failed for %s\n", ++ fprintf (stderr, "av_read_frame failed for %s\n", + o->path); + return -1; + } +@@ -271,12 +271,12 @@ + gint err; + + ff_cleanup (o); +- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); ++ err = avformat_open_input(&p->ic, o->path, NULL, 0); + if (err < 0) + { + print_error (o->path, err); + } +- err = av_find_stream_info (p->ic); ++ err = avformat_find_stream_info (p->ic, NULL); + if (err < 0) + { + g_warning ("ff-load: error finding stream info for %s", o->path); +@@ -312,7 +312,7 @@ + if (p->codec->capabilities & CODEC_CAP_TRUNCATED) + p->enc->flags |= CODEC_FLAG_TRUNCATED; + +- if (avcodec_open (p->enc, p->codec) < 0) ++ if (avcodec_open2 (p->enc, p->codec, NULL) < 0) + { + g_warning ("error opening codec %s", p->enc->codec->name); + return; diff --git a/stage5/patches/common/gnash-0.8.10-CVE-2012-1175-1.patch b/stage5/patches/common/gnash-0.8.10-CVE-2012-1175-1.patch new file mode 100644 index 0000000..e365415 --- /dev/null +++ b/stage5/patches/common/gnash-0.8.10-CVE-2012-1175-1.patch @@ -0,0 +1,62 @@ +Submitted By: Armin K. <krejzi at email dot com> +Date: 2012-07-23 +Initial Package Version: 0.8.10 +Upstream Status: In upstream Git. +Origin: Upstream +Description: Fixes crash in GnashImage.cpp + +diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp +index 11c6956..03a6939 100644 +--- a/libbase/GnashImage.cpp ++++ b/libbase/GnashImage.cpp +@@ -26,6 +26,7 @@ + #include <boost/scoped_array.hpp> + #include <boost/shared_ptr.hpp> + #include <algorithm> ++#include <cassert> + + #ifdef USE_PNG + # include "GnashImagePng.h" +@@ -44,6 +45,21 @@ namespace image { + + namespace { + void processAlpha(GnashImage::iterator imageData, size_t pixels); ++ bool checkValidSize(size_t width, size_t height, size_t channels) { ++ ++ if (width == 0 || height == 0) return false; ++ ++ assert(channels > 0); ++ ++ boost::uint32_t maxSize = std::numeric_limits<boost::int32_t>::max(); ++ if (width >= maxSize || height >= maxSize) return false; ++ ++ maxSize /= channels; ++ maxSize /= width; ++ maxSize /= height; ++ ++ return maxSize > 0; ++ } + } + + GnashImage::GnashImage(iterator data, size_t width, size_t height, +@@ -55,6 +71,8 @@ GnashImage::GnashImage(iterator data, size_t width, size_t height, + _height(height), + _data(data) + { ++ // Callers should check dimensions ++ assert(checkValidSize(_width, _height, channels())); + } + + /// Create an image allocating a buffer of height*pitch bytes +@@ -66,8 +84,9 @@ GnashImage::GnashImage(size_t width, size_t height, ImageType type, + _width(width), + _height(height) + { +- const size_t max = std::numeric_limits<boost::int32_t>::max(); +- if (size() > max) { ++ // Constructed from external input, so restrict dimensions to avoid ++ // overflow in size calculations ++ if (!checkValidSize(_width, _height, channels())) { + throw std::bad_alloc(); + } + _data.reset(new value_type[size()]); diff --git a/stage5/patches/common/gnome-media-2.32.0-no-docs.patch b/stage5/patches/common/gnome-media-2.32.0-no-docs.patch new file mode 100644 index 0000000..1b15f12 --- /dev/null +++ b/stage5/patches/common/gnome-media-2.32.0-no-docs.patch @@ -0,0 +1,44293 @@ +Submitted By: Hugo Villeneuve <hugo at hugovil dot com> +Date: 2011-08-24 +Initial Package Version: 2.32.0 +Upstream Status: Not sent +Origin: Hugo Villeneuve +Description: Disable building of documentation, autoreconf done. + +diff -Naur gnome-media-2.32.0.orig/Makefile.in gnome-media-2.32.0.patched/Makefile.in +--- gnome-media-2.32.0.orig/Makefile.in 2010-09-28 10:49:15.000000000 -0400 ++++ gnome-media-2.32.0.patched/Makefile.in 2011-08-24 22:24:02.000000000 -0400 +@@ -50,12 +50,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(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 \ +@@ -142,13 +140,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = \ +- --disable-scrollkeeper \ +- --enable-more-warnings \ +- --enable-compile-warnings=maximum +- +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -181,7 +172,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -212,7 +202,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -227,8 +216,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -249,8 +236,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -306,6 +291,11 @@ + NULL = + SUBDIRS = po $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) $(am__append_6) ++DISTCHECK_CONFIGURE_FLAGS = \ ++ --disable-scrollkeeper \ ++ --enable-more-warnings \ ++ --enable-compile-warnings=maximum ++ + DIST_SUBDIRS = \ + po \ + profiles \ +diff -Naur gnome-media-2.32.0.orig/aclocal.m4 gnome-media-2.32.0.patched/aclocal.m4 +--- gnome-media-2.32.0.orig/aclocal.m4 2010-09-28 10:49:05.000000000 -0400 ++++ gnome-media-2.32.0.patched/aclocal.m4 2011-08-24 22:23:50.000000000 -0400 +@@ -13,8 +13,8 @@ + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, +-[m4_warning([this file was generated for autoconf 2.66. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, ++[m4_warning([this file was generated for autoconf 2.67. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) +@@ -497,199 +497,6 @@ + fi]) + + +-# gnome-common.m4 +-# +- +-dnl GNOME_COMMON_INIT +- +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +- +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi +- +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) +- +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) +- +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) +- +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) +- +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi +- +- AC_SUBST(DISABLE_DEPRECATED) +-]) +- +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** +- +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) +- +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) +- +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) +- +-dnl For C++, do basically the same thing. +- +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) +- +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac +- +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi +- fi +- AC_MSG_RESULT($warnCXXFLAGS) +- +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) +- +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac +- +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) +- + # nls.m4 serial 5 (gettext-0.18) + dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, + dnl Inc. +@@ -724,7 +531,6 @@ + ]) + + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +-# serial 1 (pkg-config-0.24) + # + # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. + # +@@ -752,10 +558,7 @@ + AC_DEFUN([PKG_PROG_PKG_CONFIG], + [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) + m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +- ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + fi +@@ -768,6 +571,7 @@ + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi ++ + fi[]dnl + ])# PKG_PROG_PKG_CONFIG + +@@ -776,20 +580,21 @@ + # Check to see whether a particular set of modules exists. Similar + # to PKG_CHECK_MODULES(), but does not set variables or print errors. + # +-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +-# only at the first occurence in configure.ac, so if the first place +-# it's called might be skipped (such as if it is within an "if", you +-# have to call PKG_CHECK_EXISTS manually ++# ++# Similar to PKG_CHECK_MODULES, make sure that the first instance of ++# this or PKG_CHECK_MODULES is called, or make sure to call ++# PKG_CHECK_EXISTS manually + # -------------------------------------------------------------- + AC_DEFUN([PKG_CHECK_EXISTS], + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then +- m4_default([$2], [:]) ++ m4_ifval([$2], [$2], [:]) + m4_ifvaln([$3], [else + $3])dnl + fi]) + ++ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +@@ -842,7 +647,6 @@ + See the pkg-config man page for more details.]) + + if test $pkg_failed = yes; then +- AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` +@@ -852,7 +656,7 @@ + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + +- m4_default([$4], [AC_MSG_ERROR( ++ ifelse([$4], , [AC_MSG_ERROR(dnl + [Package requirements ($2) were not met: + + $$1_PKG_ERRORS +@@ -860,24 +664,25 @@ + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT]) +- ]) ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) + elif test $pkg_failed = untried; then +- AC_MSG_RESULT([no]) +- m4_default([$4], [AC_MSG_FAILURE( ++ ifelse([$4], , [AC_MSG_FAILURE(dnl + [The pkg-config script could not be found or is too old. Make sure it + is in your PATH or set the PKG_CONFIG environment variable to the full + path to pkg-config. + + _PKG_TEXT + +-To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) +- ]) ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], ++ [$4]) + else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) +- $3 ++ ifelse([$3], , :, [$3]) + fi[]dnl + ])# PKG_CHECK_MODULES + +@@ -1945,7 +1750,6 @@ + m4_include([m4/as-ac-expand.m4]) + m4_include([m4/as-compiler-flag.m4]) + m4_include([m4/as-version.m4]) +-m4_include([m4/gnome-doc-utils.m4]) + m4_include([m4/intltool.m4]) + m4_include([m4/libtool.m4]) + m4_include([m4/ltoptions.m4]) +diff -Naur gnome-media-2.32.0.orig/autom4te.cache/output.0 gnome-media-2.32.0.patched/autom4te.cache/output.0 +--- gnome-media-2.32.0.orig/autom4te.cache/output.0 1969-12-31 19:00:00.000000000 -0500 ++++ gnome-media-2.32.0.patched/autom4te.cache/output.0 2011-08-24 22:23:49.000000000 -0400 +@@ -0,0 +1,17576 @@ ++@%:@! /bin/sh ++@%:@ Guess values for system-dependent variables and create Makefiles. ++@%:@ Generated by GNU Autoconf 2.67 for gnome-media 2.32.0. ++@%:@ ++@%:@ Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>. ++@%:@ ++@%:@ ++@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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=: ++ # Pre-4.2 versions of Zsh do 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_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in @%:@( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++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.) ++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 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do 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_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1 ++ ++ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO ++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO ++ PATH=/empty FPATH=/empty; export PATH FPATH ++ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ ++ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in @%:@( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++@%:@ as_fn_unset VAR ++@%:@ --------------- ++@%:@ Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++@%:@ as_fn_set_status STATUS ++@%:@ ----------------------- ++@%:@ Set @S|@? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} @%:@ as_fn_set_status ++ ++@%:@ as_fn_exit STATUS ++@%:@ ----------------- ++@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} @%:@ as_fn_exit ++ ++@%:@ as_fn_mkdir_p ++@%:@ ------------- ++@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_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 || ++$as_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" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} @%:@ as_fn_mkdir_p ++@%:@ as_fn_append VAR VALUE ++@%:@ ---------------------- ++@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take ++@%:@ advantage of any shell optimizations that allow amortized linear growth over ++@%:@ repeated appends, instead of the typical quadratic growth present in naive ++@%:@ implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++@%:@ as_fn_arith ARG... ++@%:@ ------------------ ++@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the ++@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments ++@%:@ must be portable across @S|@(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] ++@%:@ ---------------------------------------- ++@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++@%:@ script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} @%:@ as_fn_error ++ ++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 ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# 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 ++ ++ ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # 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" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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 ++} ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in @%:@((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++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 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ 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 ++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='mkdir -p "$as_dir"' ++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'" ++ ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++ ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, old GNU/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=. ++LIB@&t@OBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++ ++# Identity of this package. ++PACKAGE_NAME='gnome-media' ++PACKAGE_TARNAME='gnome-media' ++PACKAGE_VERSION='2.32.0' ++PACKAGE_STRING='gnome-media 2.32.0' ++PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media' ++PACKAGE_URL='' ++ ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include <stdio.h> ++#ifdef HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++#ifdef STDC_HEADERS ++# include <stdlib.h> ++# include <stddef.h> ++#else ++# ifdef HAVE_STDLIB_H ++# include <stdlib.h> ++# endif ++#endif ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include <memory.h> ++# endif ++# include <string.h> ++#endif ++#ifdef HAVE_STRINGS_H ++# include <strings.h> ++#endif ++#ifdef HAVE_INTTYPES_H ++# include <inttypes.h> ++#endif ++#ifdef HAVE_STDINT_H ++# include <stdint.h> ++#endif ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif" ++ ++ac_header_list= ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS ++LIB@&t@OBJS ++AM_BACKSLASH ++AM_DEFAULT_VERBOSITY ++HAVE_GSTMIXER_FALSE ++HAVE_GSTMIXER_TRUE ++GSTMIXER_LIBS ++GSTMIXER_CFLAGS ++HAVE_GSTPROPS_FALSE ++HAVE_GSTPROPS_TRUE ++PROGRAMS_GSTPROPS ++GNOMECC_DESKTOP_DIR ++GSTPROPS_LIBS ++GSTPROPS_CFLAGS ++OTOOL64 ++OTOOL ++LIPO ++NMEDIT ++DSYMUTIL ++RANLIB ++AR ++OBJDUMP ++NM ++ac_ct_DUMPBIN ++DUMPBIN ++LD ++FGREP ++SED ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++LIBTOOL ++MKINSTALLDIRS ++POSUB ++POFILES ++PO_IN_DATADIR_FALSE ++PO_IN_DATADIR_TRUE ++INTLLIBS ++INSTOBJEXT ++GMOFILES ++CATOBJEXT ++CATALOGS ++MSGFMT_OPTS ++GETTEXT_PACKAGE ++GLIB_GENMARSHAL ++GCONF_SCHEMAS_INSTALL_FALSE ++GCONF_SCHEMAS_INSTALL_TRUE ++GCONF_SCHEMA_FILE_DIR ++GCONF_SCHEMA_CONFIG_SOURCE ++GCONFTOOL ++HAVE_GRECORD_FALSE ++HAVE_GRECORD_TRUE ++HAVE_GSTREAMER_FALSE ++HAVE_GSTREAMER_TRUE ++GSR_LIBS ++GSR_CFLAGS ++GST_MAJORMINOR ++GLADEUI_MODULE_DIR ++GLADEUI_CATALOG_DIR ++HAVE_GLADEUI_FALSE ++HAVE_GLADEUI_TRUE ++GLADEUI_LIBS ++GLADEUI_CFLAGS ++HAVE_GMP_FALSE ++HAVE_GMP_TRUE ++GMP_LIBS ++GMP_CFLAGS ++HAVE_PULSEAUDIO ++HAVE_PULSEAUDIO_FALSE ++HAVE_PULSEAUDIO_TRUE ++VOLUME_CONTROL_LIBS ++VOLUME_CONTROL_CFLAGS ++PULSEAUDIO_LIBS ++PULSEAUDIO_CFLAGS ++SOUNDTHEME_LIBS ++SOUNDTHEME_CFLAGS ++HAVE_SOUND_THEME ++HAVE_SOUND_THEME_FALSE ++HAVE_SOUND_THEME_TRUE ++SOUND_THEME_LIBS ++SOUND_THEME_CFLAGS ++PKG_CONFIG ++EGREP ++GREP ++CPP ++LN_S ++DATADIRNAME ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++ALL_LINGUAS ++INTLTOOL_PERL ++GMSGFMT ++MSGFMT ++MSGMERGE ++XGETTEXT ++INTLTOOL_POLICY_RULE ++INTLTOOL_SERVICE_RULE ++INTLTOOL_THEME_RULE ++INTLTOOL_SCHEMAS_RULE ++INTLTOOL_CAVES_RULE ++INTLTOOL_XML_NOMERGE_RULE ++INTLTOOL_XML_RULE ++INTLTOOL_KBD_RULE ++INTLTOOL_XAM_RULE ++INTLTOOL_UI_RULE ++INTLTOOL_SOUNDLIST_RULE ++INTLTOOL_SHEET_RULE ++INTLTOOL_SERVER_RULE ++INTLTOOL_PONG_RULE ++INTLTOOL_OAF_RULE ++INTLTOOL_PROP_RULE ++INTLTOOL_KEYS_RULE ++INTLTOOL_DIRECTORY_RULE ++INTLTOOL_DESKTOP_RULE ++INTLTOOL_EXTRACT ++INTLTOOL_MERGE ++INTLTOOL_UPDATE ++USE_NLS ++MAINT ++MAINTAINER_MODE_FALSE ++MAINTAINER_MODE_TRUE ++PACKAGE_VERSION_MICRO ++PACKAGE_VERSION_MINOR ++PACKAGE_VERSION_MAJOR ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' ++ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_maintainer_mode ++enable_nls ++enable_dependency_tracking ++enable_pulseaudio ++enable_profiles ++enable_grecord ++with_gconf_source ++with_gconf_schema_file_dir ++enable_schemas_install ++enable_shared ++enable_static ++with_pic ++enable_fast_install ++with_gnu_ld ++enable_libtool_lock ++enable_gstprops ++enable_gstmix ++enable_silent_rules ++enable_more_warnings ++' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP ++PKG_CONFIG ++SOUND_THEME_CFLAGS ++SOUND_THEME_LIBS ++PULSEAUDIO_CFLAGS ++PULSEAUDIO_LIBS ++VOLUME_CONTROL_CFLAGS ++VOLUME_CONTROL_LIBS ++GMP_CFLAGS ++GMP_LIBS ++GLADEUI_CFLAGS ++GLADEUI_LIBS ++GSR_CFLAGS ++GSR_LIBS ++GSTPROPS_CFLAGS ++GSTPROPS_LIBS ++GSTMIXER_CFLAGS ++GSTMIXER_LIBS' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= ++# 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= ;; ++ *) 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_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=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_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$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_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; ++ ++ -without-* | --without-*) ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=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 ;; ++ ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" ++ ;; ++ ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; ++ esac ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ ++ *) ++ # FIXME: should be removed in autoconf 3.0. ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ $as_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'` ++ as_fn_error $? "missing argument to $ac_option" ++fi ++ ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. ++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 ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" ++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 ++ $as_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 .` || ++ as_fn_error $? "working directory cannot be determined" ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ as_fn_error $? "pwd does not report name of working directory" ++ ++ ++# 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 -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | ++ 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 .." ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" ++ 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 gnome-media 2.32.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 ++ @<:@@S|@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/gnome-media@:>@ ++ --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 ++ ++System types: ++ --build=BUILD configure for building on BUILD [guessed] ++ --host=HOST cross-compile to build programs to run on HOST [BUILD] ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ case $ac_init_help in ++ short | recursive ) echo "Configuration of gnome-media 2.32.0:";; ++ esac ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --disable-nls do not use Native Language Support ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-pulseaudio Enable PulseAudio support @<:@default=auto@:>@ ++ --enable-profiles enable gnome media profiles ++ --enable-grecord enable gnome sound recorder ++ --disable-schemas-install ++ Disable the schemas installation ++ --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ ++ --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@ ++ --enable-fast-install@<:@=PKGS@:>@ ++ optimize for fast installation @<:@default=yes@:>@ ++ --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-gstprops enable gstreamer properties ++ --enable-gstmix enable gstreamer mixer ++ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0') ++ --enable-more-warnings Maximum compiler warnings ++ ++Optional Packages: ++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-gconf-source=sourceaddress ++ Config database for installing schema files. ++ --with-gconf-schema-file-dir=dir ++ Directory for installing schema files. ++ --with-pic try to use only PIC/non-PIC objects @<:@default=use ++ both@:>@ ++ --with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@ ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ++ nonstandard directory <lib dir> ++ LIBS libraries to pass to the linker, e.g. -l<library> ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if ++ you have headers in a nonstandard directory <include dir> ++ CPP C preprocessor ++ PKG_CONFIG path to pkg-config utility ++ SOUND_THEME_CFLAGS ++ C compiler flags for SOUND_THEME, overriding pkg-config ++ SOUND_THEME_LIBS ++ linker flags for SOUND_THEME, overriding pkg-config ++ PULSEAUDIO_CFLAGS ++ C compiler flags for PULSEAUDIO, overriding pkg-config ++ PULSEAUDIO_LIBS ++ linker flags for PULSEAUDIO, overriding pkg-config ++ VOLUME_CONTROL_CFLAGS ++ C compiler flags for VOLUME_CONTROL, overriding pkg-config ++ VOLUME_CONTROL_LIBS ++ linker flags for VOLUME_CONTROL, overriding pkg-config ++ GMP_CFLAGS C compiler flags for GMP, overriding pkg-config ++ GMP_LIBS linker flags for GMP, overriding pkg-config ++ GLADEUI_CFLAGS ++ C compiler flags for GLADEUI, overriding pkg-config ++ GLADEUI_LIBS ++ linker flags for GLADEUI, overriding pkg-config ++ GSR_CFLAGS C compiler flags for GSR, overriding pkg-config ++ GSR_LIBS linker flags for GSR, overriding pkg-config ++ GSTPROPS_CFLAGS ++ C compiler flags for GSTPROPS, overriding pkg-config ++ GSTPROPS_LIBS ++ linker flags for GSTPROPS, overriding pkg-config ++ GSTMIXER_CFLAGS ++ C compiler flags for GSTMIXER, overriding pkg-config ++ GSTMIXER_LIBS ++ linker flags for GSTMIXER, overriding pkg-config ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>. ++_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" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && 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=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_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 ++ $as_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 ++gnome-media configure 2.32.0 ++generated by GNU Autoconf 2.67 ++ ++Copyright (C) 2010 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 ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++@%:@ ac_fn_c_try_compile LINENO ++@%:@ -------------------------- ++@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_compile ++ ++@%:@ ac_fn_c_try_link LINENO ++@%:@ ----------------------- ++@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_link ++ ++@%:@ ac_fn_c_check_func LINENO FUNC VAR ++@%:@ ---------------------------------- ++@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* 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_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_func ++ ++@%:@ ac_fn_c_try_cpp LINENO ++@%:@ ---------------------- ++@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_cpp ++ ++@%:@ ac_fn_c_try_run LINENO ++@%:@ ---------------------- ++@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes ++@%:@ that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++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 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_run ++ ++@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++@%:@ ------------------------------------------------------- ++@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using ++@%:@ the include files in INCLUDES and setting the cache variable VAR ++@%:@ accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if eval "test \"\${$3+set}\"" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( $as_echo "## -------------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media ## ++## -------------------------------------------------------------------------- ##" ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_header_mongrel ++ ++@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++@%:@ ------------------------------------------------------- ++@%:@ Tests whether HEADER exists and can be compiled using the include files in ++@%:@ INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_header_compile ++ ++@%:@ ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++@%:@ ------------------------------------------- ++@%:@ Tests whether TYPE exists after having included INCLUDES, setting cache ++@%:@ variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_type ++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 gnome-media $as_me 2.32.0, which was ++generated by GNU Autoconf 2.67. 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=. ++ $as_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=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; ++ 2) ++ as_fn_append 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 ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset 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 ++ ++ $as_echo "## ---------------- ## ++## Cache variables. ## ++## ---------------- ##" ++ 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_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; 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 ++ ++ $as_echo "## ----------------- ## ++## Output variables. ## ++## ----------------- ##" ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ $as_echo "## ------------------- ## ++## File substitutions. ## ++## ------------------- ##" ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ $as_echo "## ----------- ## ++## confdefs.h. ## ++## ----------- ##" ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_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'; as_fn_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 ++ ++$as_echo "/* confdefs.h */" > 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 ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in @%:@(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } ++ 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. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++as_fn_append ac_header_list " stdlib.h" ++as_fn_append ac_header_list " unistd.h" ++as_fn_append ac_header_list " sys/param.h" ++# 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,) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_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 ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_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. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## ++ ++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 ++ ++ ++ ++ac_aux_dir= ++for ac_dir in build-aux "$srcdir"/build-aux; 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 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 ++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. ++ ++ ++ ++am__api_version='1.11' ++ ++# 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. ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } ++if test -z "$INSTALL"; then ++if test "${ac_cv_path_install+set}" = set; then : ++ $as_echo_n "(cached) " >&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 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi ++ fi ++ done ++ done ++ ;; ++esac ++ ++ done ++IFS=$as_save_IFS ++ ++rm -rf conftest.one conftest.two conftest.dir ++ ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$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' ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ ++# 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". ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 ++ fi ++ ++ test "$2" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ as_fn_error $? "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "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 $. ++# By default was `s,x,x', remove it if useless. ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` ++ ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++ ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++fi ++ ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++ ++# 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&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" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : ++ $as_echo_n "(cached) " >&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 ++ ++ test -d ./--version && rmdir ./--version ++ 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. ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 ++$as_echo "$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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ 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='gnome-media' ++ VERSION='2.32.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"} ++ ++# 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"} ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 ++$as_echo_n "checking how to create a pax tar archive... " >&6; } ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar pax cpio none' ++_am_tools=${am_cv_prog_tar_pax-$_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 ++ { echo "$as_me:$LINENO: $_am_tar --version" >&5 ++ ($_am_tar --version) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && break ++ done ++ am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=posix -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 pax -w "$$tardir"' ++ am__tar_='pax -L -x pax -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H pax -L' ++ am__tar_='find "$tardir" -print | cpio -o -H pax -L' ++ am__untar='cpio -i -H pax -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_pax}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 ++ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 ++ ($am__untar <conftest.tar) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++if test "${am_cv_prog_tar_pax+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ am_cv_prog_tar_pax=$_am_tool ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 ++$as_echo "$am_cv_prog_tar_pax" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ PACKAGE_VERSION_MAJOR=$(echo 2.32.0 | cut -d'.' -f1) ++ PACKAGE_VERSION_MINOR=$(echo 2.32.0 | cut -d'.' -f2) ++ PACKAGE_VERSION_MICRO=$(echo 2.32.0 | cut -d'.' -f3) ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++ @%:@ Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then : ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ ++ ++if type -p stow > /dev/null && test -d /usr/local/stow ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE}-${VERSION} ***" >&5 ++$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE}-${VERSION} ***" >&6;} ++ ac_default_prefix="/usr/local/stow/${PACKAGE}-${VERSION}" ++fi ++ ++ac_config_headers="$ac_config_headers config.h" ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 ++$as_echo_n "checking whether NLS is requested... " >&6; } ++ @%:@ Check whether --enable-nls was given. ++if test "${enable_nls+set}" = set; then : ++ enableval=$enable_nls; USE_NLS=$enableval ++else ++ USE_NLS=yes ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 ++$as_echo "$USE_NLS" >&6; } ++ ++ ++DEPDIR="${am__leading_dot}deps" ++ ++ac_config_commands="$ac_config_commands depfiles" ++ ++ ++am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 ++$as_echo_n "checking for style of include used by $am_make... " >&6; } ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } ++rm -f confinc confmf ++ ++@%:@ Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then : ++ enableval=$enable_dependency_tracking; ++fi ++ ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++ if test "x$enable_dependency_tracking" != xno; then ++ AMDEP_TRUE= ++ AMDEP_FALSE='#' ++else ++ AMDEP_TRUE='#' ++ AMDEP_FALSE= ++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 ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++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 ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { { ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ ++else ++ ac_file='' ++fi ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } ++ac_exeext=$ac_cv_exeext ++ ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++else ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++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 ++ ++depcc="$CC" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++ ++ ++case "$am__api_version" in ++ 1.01234) ++ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "0.35.0"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 ++$as_echo_n "checking for intltool >= 0.35.0... " >&6; } ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` ++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 ++fi ++ ++# Extract the first word of "intltool-update", so it can be a program name with args. ++set dummy intltool-update; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_UPDATE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE ++if test -n "$INTLTOOL_UPDATE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 ++$as_echo "$INTLTOOL_UPDATE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "intltool-merge", so it can be a program name with args. ++set dummy intltool-merge; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_MERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE ++if test -n "$INTLTOOL_MERGE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 ++$as_echo "$INTLTOOL_MERGE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "intltool-extract", so it can be a program name with args. ++set dummy intltool-extract; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_EXTRACT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT ++if test -n "$INTLTOOL_EXTRACT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 ++$as_echo "$INTLTOOL_EXTRACT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then ++ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check the gettext tools to make sure they are GNU ++# Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $XGETTEXT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XGETTEXT=$ac_cv_path_XGETTEXT ++if test -n "$XGETTEXT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgmerge", so it can be a program name with args. ++set dummy msgmerge; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MSGMERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGMERGE=$ac_cv_path_MSGMERGE ++if test -n "$MSGMERGE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 ++$as_echo "$MSGMERGE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGFMT=$ac_cv_path_MSGFMT ++if test -n "$MSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GMSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT=$ac_cv_path_GMSGFMT ++if test -n "$GMSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 ++fi ++ ++# Extract the first word of "perl", so it can be a program name with args. ++set dummy perl; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_PERL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL ++if test -n "$INTLTOOL_PERL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 ++$as_echo "$INTLTOOL_PERL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$INTLTOOL_PERL"; then ++ as_fn_error $? "perl not found" "$LINENO" 5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 ++$as_echo_n "checking for perl >= 5.8.1... " >&6; } ++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 ++if test $? -ne 0; then ++ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 ++else ++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 ++$as_echo "$IT_PERL_VERSION" >&6; } ++fi ++if test "x" != "xno-xml"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 ++$as_echo_n "checking for XML::Parser... " >&6; } ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 ++$as_echo "ok" >&6; } ++ else ++ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++ ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ DATADIRNAME=share ++else ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ DATADIRNAME=share ++else ++ DATADIRNAME=lib ++fi ++ ++ ;; ++ *) ++ DATADIRNAME=lib ++ ;; ++ esac ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++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 ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++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 ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++else ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++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 ++ ++depcc="$CC" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 ++$as_echo_n "checking for library containing strerror... " >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char strerror (); ++int ++main () ++{ ++return strerror (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_strerror=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_strerror+set}" = set; then : ++ ++else ++ ac_cv_search_strerror=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 ++$as_echo "$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++ ++# Checks for programs. ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 ++$as_echo_n "checking whether ln -s works... " >&6; } ++LN_S=$as_ln_s ++if test "$LN_S" = "ln -s"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++ ++# Checks for header files. ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include <limits.h> ++@%:@else ++@%:@ include <assert.h> ++@%:@endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include <limits.h> ++@%:@else ++@%:@ include <assert.h> ++@%:@endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } ++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 ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$GREP"; then ++ ac_path_GREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++# Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_GREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_GREP"; then ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ if test -z "$EGREP"; then ++ ac_path_EGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++# Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=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 : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#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)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_header in fcntl.h limits.h malloc.h strings.h sys/ioctl.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++for ac_header in sys/sockio.h sys/param.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++# Checks for typedefs, structures, and compiler characteristics. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++if test "${ac_cv_c_const+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset cs; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *pcpcc; ++ char **ppc; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ pcpcc = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; ++ ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_const=yes ++else ++ ac_cv_c_const=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 ++$as_echo "$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then ++ ++$as_echo "@%:@define const /**/" >>confdefs.h ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 ++$as_echo_n "checking for inline... " >&6; } ++if test "${ac_cv_c_inline+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_c_inline=no ++for ac_kw in inline __inline__ __inline; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifndef __cplusplus ++typedef int foo_t; ++static $ac_kw foo_t static_foo () {return 0; } ++$ac_kw foo_t foo () {return 0; } ++#endif ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_inline=$ac_kw ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ test "$ac_cv_c_inline" != no && break ++done ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 ++$as_echo "$ac_cv_c_inline" >&6; } ++ ++case $ac_cv_c_inline in ++ inline | yes) ;; ++ *) ++ case $ac_cv_c_inline in ++ no) ac_val=;; ++ *) ac_val=$ac_cv_c_inline;; ++ esac ++ cat >>confdefs.h <<_ACEOF ++#ifndef __cplusplus ++#define inline $ac_val ++#endif ++_ACEOF ++ ;; ++esac ++ ++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" ++if test "x$ac_cv_type_off_t" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define off_t long int ++_ACEOF ++ ++fi ++ ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define size_t unsigned int ++_ACEOF ++ ++fi ++ ++ ++# Checks for library functions. ++if test $ac_cv_c_compiler_gnu = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 ++$as_echo_n "checking whether $CC needs -traditional... " >&6; } ++if test "${ac_cv_prog_gcc_traditional+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_pattern="Autoconf.*'x'" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <sgtty.h> ++Autoconf TIOCGETP ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++else ++ ac_cv_prog_gcc_traditional=no ++fi ++rm -f conftest* ++ ++ ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <termio.h> ++Autoconf TCGETA ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++fi ++rm -f conftest* ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 ++$as_echo "$ac_cv_prog_gcc_traditional" >&6; } ++ if test $ac_cv_prog_gcc_traditional = yes; then ++ CC="$CC -traditional" ++ fi ++fi ++ ++ ++ ++ ++ for ac_header in $ac_header_list ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_GETPAGESIZE 1 ++_ACEOF ++ ++fi ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc ++ ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. ++ ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ ++ ++#include <fcntl.h> ++#include <sys/mman.h> ++ ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); ++#endif ++ ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf(_SC_PAGESIZE) ++# else /* no _SC_PAGESIZE */ ++# ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ ++ ++#endif /* no HAVE_GETPAGESIZE */ ++ ++int ++main () ++{ ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; ++ ++ pagesize = getpagesize (); ++ ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); ++ ++ /* Next, check that the tail of a page is zero-filled. File must have ++ non-zero length, otherwise we risk SIGBUS for entire page. */ ++ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); ++ if (fd2 < 0) ++ return 4; ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) ++ return 5; ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ if (data2 == MAP_FAILED) ++ return 6; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data2 + i)) ++ return 7; ++ close (fd2); ++ if (munmap (data2, pagesize)) ++ return 8; ++ ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 9; ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 10; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 11; ++ ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 12; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 13; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 14; ++ close (fd); ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes ++else ++ ac_cv_func_mmap_fixed_mapped=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then ++ ++$as_echo "@%:@define HAVE_MMAP 1" >>confdefs.h ++ ++fi ++rm -f conftest.mmap conftest.txt ++ ++ ++# CFLAGS ++GNOME_COMPILE_WARNINGS ++ ++# AS_NANO(GM_RELEASE="yes", GM_RELEASE="no") ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wall" >&5 ++$as_echo_n "checking to see if compiler understands -Wall... " >&6; } ++ ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Wall" ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ flag_ok=yes ++else ++ flag_ok=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ GM_ERROR_CFLAGS="-Wall" ++ true ++ else ++ ++ true ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 ++$as_echo "$flag_ok" >&6; } ++ ++ ++if test "x$GM_RELEASE" = "xno" ++then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 ++$as_echo_n "checking to see if compiler understands -Werror... " >&6; } ++ ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ flag_ok=yes ++else ++ flag_ok=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ GM_ERROR_CFLAGS="$GM_ERROR_CFLAGS -Werror" ++ true ++ else ++ ++ true ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 ++$as_echo "$flag_ok" >&6; } ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Using $GM_ERROR_CFLAGS as error checking CFLAGS" >&5 ++$as_echo "$as_me: Using $GM_ERROR_CFLAGS as error checking CFLAGS" >&6;} ++ ++GLIB_REQUIRED_VERSION=2.18.2 ++GTK_REQUIRED_VERSION=2.18.0 ++GCONF_REQUIRED_VERSION=2.6.1 ++PA_REQUIRED_VERSION=0.9.16 ++CANBERRA_REQUIRED_VERSION=0.13 ++ ++ ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUND_THEME" >&5 ++$as_echo_n "checking for SOUND_THEME... " >&6; } ++ ++if test -n "$SOUND_THEME_CFLAGS"; then ++ pkg_cv_SOUND_THEME_CFLAGS="$SOUND_THEME_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_SOUND_THEME_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$SOUND_THEME_LIBS"; then ++ pkg_cv_SOUND_THEME_LIBS="$SOUND_THEME_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_SOUND_THEME_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ SOUND_THEME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>&1` ++ else ++ SOUND_THEME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$SOUND_THEME_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_soundtheme=no ++elif test $pkg_failed = untried; then ++ have_soundtheme=no ++else ++ SOUND_THEME_CFLAGS=$pkg_cv_SOUND_THEME_CFLAGS ++ SOUND_THEME_LIBS=$pkg_cv_SOUND_THEME_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_soundtheme=yes ++fi ++ ++if test "x$have_soundtheme" = "xyes" ; then ++ ++$as_echo "@%:@define HAVE_SOUND_THEME /**/" >>confdefs.h ++ ++fi ++ if test x$have_soundtheme = xyes; then ++ HAVE_SOUND_THEME_TRUE= ++ HAVE_SOUND_THEME_FALSE='#' ++else ++ HAVE_SOUND_THEME_TRUE='#' ++ HAVE_SOUND_THEME_FALSE= ++fi ++ ++ ++ ++ ++ ++ ++GTK_REQUIRED_VERSION=2.15.1 ++ ++@%:@ Check whether --enable-pulseaudio was given. ++if test "${enable_pulseaudio+set}" = set; then : ++ enableval=$enable_pulseaudio; enable_pulseaudio=$enableval ++else ++ enable_pulseaudio=auto ++fi ++ ++ ++if test "x$enable_pulseaudio" != "xno"; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5 ++$as_echo_n "checking for PULSEAUDIO... " >&6; } ++ ++if test -n "$PULSEAUDIO_CFLAGS"; then ++ pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= \$PA_REQUIRED_VERSION libpulse-mainloop-glib >= \$PA_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$PULSEAUDIO_LIBS"; then ++ pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= \$PA_REQUIRED_VERSION libpulse-mainloop-glib >= \$PA_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>&1` ++ else ++ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$PULSEAUDIO_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_pulseaudio=no ++elif test $pkg_failed = untried; then ++ have_pulseaudio=no ++else ++ PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS ++ PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_pulseaudio=yes ++fi ++ ++ if test "x$enable_pulseaudio" = "xyes" -a "x$have_pulseaudio" = "xno"; then ++ as_fn_error $? "PulseAudio support explicitly requested but dependencies not found" "$LINENO" 5 ++ fi ++ ++ if test "x$have_pulseaudio" = "xyes" ; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_CONTROL" >&5 ++$as_echo_n "checking for VOLUME_CONTROL... " >&6; } ++ ++if test -n "$VOLUME_CONTROL_CFLAGS"; then ++ pkg_cv_VOLUME_CONTROL_CFLAGS="$VOLUME_CONTROL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_VOLUME_CONTROL_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$VOLUME_CONTROL_LIBS"; then ++ pkg_cv_VOLUME_CONTROL_LIBS="$VOLUME_CONTROL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_VOLUME_CONTROL_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ VOLUME_CONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>&1` ++ else ++ VOLUME_CONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$VOLUME_CONTROL_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements (gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ) were not met: ++ ++$VOLUME_CONTROL_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables VOLUME_CONTROL_CFLAGS ++and VOLUME_CONTROL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables VOLUME_CONTROL_CFLAGS ++and VOLUME_CONTROL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ VOLUME_CONTROL_CFLAGS=$pkg_cv_VOLUME_CONTROL_CFLAGS ++ VOLUME_CONTROL_LIBS=$pkg_cv_VOLUME_CONTROL_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++ ++ ++$as_echo "@%:@define HAVE_PULSEAUDIO /**/" >>confdefs.h ++ ++ fi ++else ++ have_pulseaudio=no ++fi ++ if test x$have_pulseaudio = xyes; then ++ HAVE_PULSEAUDIO_TRUE= ++ HAVE_PULSEAUDIO_FALSE='#' ++else ++ HAVE_PULSEAUDIO_TRUE='#' ++ HAVE_PULSEAUDIO_FALSE= ++fi ++ ++ ++ ++ ++ ++ ++have_profiles=no ++ ++@%:@ Check whether --enable-profiles was given. ++if test "${enable_profiles+set}" = set; then : ++ enableval=$enable_profiles; ++else ++ enable_profiles=yes ++fi ++ ++ ++if test "x$enable_profiles" = "xyes"; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP" >&5 ++$as_echo_n "checking for GMP... " >&6; } ++ ++if test -n "$GMP_CFLAGS"; then ++ pkg_cv_GMP_CFLAGS="$GMP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GMP_CFLAGS=`$PKG_CONFIG --cflags " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GMP_LIBS"; then ++ pkg_cv_GMP_LIBS="$GMP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GMP_LIBS=`$PKG_CONFIG --libs " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>&1` ++ else ++ GMP_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GMP_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0) were not met: ++ ++$GMP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GMP_CFLAGS ++and GMP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GMP_CFLAGS ++and GMP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GMP_CFLAGS=$pkg_cv_GMP_CFLAGS ++ GMP_LIBS=$pkg_cv_GMP_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_profiles=yes ++fi ++fi ++ ++ ++ if test x$have_profiles = xyes; then ++ HAVE_GMP_TRUE= ++ HAVE_GMP_FALSE='#' ++else ++ HAVE_GMP_TRUE='#' ++ HAVE_GMP_FALSE= ++fi ++ ++ ++have_gladeui=no ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLADEUI" >&5 ++$as_echo_n "checking for GLADEUI... " >&6; } ++ ++if test -n "$GLADEUI_CFLAGS"; then ++ pkg_cv_GLADEUI_CFLAGS="$GLADEUI_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GLADEUI_CFLAGS=`$PKG_CONFIG --cflags "gladeui-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GLADEUI_LIBS"; then ++ pkg_cv_GLADEUI_LIBS="$GLADEUI_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GLADEUI_LIBS=`$PKG_CONFIG --libs "gladeui-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GLADEUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gladeui-1.0" 2>&1` ++ else ++ GLADEUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "gladeui-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GLADEUI_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_gladeui=no ++elif test $pkg_failed = untried; then ++ have_gladeui=no ++else ++ GLADEUI_CFLAGS=$pkg_cv_GLADEUI_CFLAGS ++ GLADEUI_LIBS=$pkg_cv_GLADEUI_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gladeui=yes ++fi ++ ++ ++ if test x$have_gladeui = xyes; then ++ HAVE_GLADEUI_TRUE= ++ HAVE_GLADEUI_FALSE='#' ++else ++ HAVE_GLADEUI_TRUE='#' ++ HAVE_GLADEUI_FALSE= ++fi ++ ++ ++GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-1.0`" ++ ++ ++GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-1.0`" ++ ++ ++ ++GST_REQ=0.10.23 ++GST_PLUGINS_BASE_REQ=0.10.23 ++GST_MAJORMINOR=0.10 ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GST_MAJORMINOR_QUOTED "$GST_MAJORMINOR" ++_ACEOF ++ ++ ++have_gst=no ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSR" >&5 ++$as_echo_n "checking for GSR... " >&6; } ++ ++if test -n "$GSR_CFLAGS"; then ++ pkg_cv_GSR_CFLAGS="$GSR_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gstreamer-\$GST_MAJORMINOR >= \$GST_REQ ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSR_CFLAGS=`$PKG_CONFIG --cflags " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSR_LIBS"; then ++ pkg_cv_GSR_LIBS="$GSR_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gstreamer-\$GST_MAJORMINOR >= \$GST_REQ ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSR_LIBS=`$PKG_CONFIG --libs " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>&1` ++ else ++ GSR_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSR_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GSR_PKG_ERRORS" >&5 ++$as_echo "$as_me: WARNING: $GSR_PKG_ERRORS" >&2;} ++ PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" ++ ++elif test $pkg_failed = untried; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GSR_PKG_ERRORS" >&5 ++$as_echo "$as_me: WARNING: $GSR_PKG_ERRORS" >&2;} ++ PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" ++ ++else ++ GSR_CFLAGS=$pkg_cv_GSR_CFLAGS ++ GSR_LIBS=$pkg_cv_GSR_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gst=yes ++fi ++ ++have_grecord=no ++grecord_reason="" ++ ++@%:@ Check whether --enable-grecord was given. ++if test "${enable_grecord+set}" = set; then : ++ enableval=$enable_grecord; ++else ++ enable_grecord=yes ++fi ++ ++ ++if test "x$have_profiles" = "xno" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Grecord will be disabled because of disabled profiles" >&5 ++$as_echo "$as_me: WARNING: Grecord will be disabled because of disabled profiles" >&2;} ++ enable_grecord=no ++ have_grecord=no ++ grecord_reason=", gnome media profiles is disabled" ++fi ++ ++if test "x$have_gst" = "xyes" && test "x$enable_grecord" = "xyes"; then ++ have_grecord=yes ++else ++ if test "x$have_gst" = "xno"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need GStreamer installed for the mixer and recorder to work" >&5 ++$as_echo "$as_me: WARNING: You need GStreamer installed for the mixer and recorder to work" >&2;} ++ sleep 5 2>/dev/null ++ fi ++fi ++ ++ ++ ++ if test x$have_gst = xyes; then ++ HAVE_GSTREAMER_TRUE= ++ HAVE_GSTREAMER_FALSE='#' ++else ++ HAVE_GSTREAMER_TRUE='#' ++ HAVE_GSTREAMER_FALSE= ++fi ++ ++ if test x$have_grecord = xyes; then ++ HAVE_GRECORD_TRUE= ++ HAVE_GRECORD_FALSE='#' ++else ++ HAVE_GRECORD_TRUE='#' ++ HAVE_GRECORD_FALSE= ++fi ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GSR_UIDIR_UNINSTALLED "`pwd`/grecord/src" ++_ACEOF ++ ++ ++# Extract the first word of "gconftool-2", so it can be a program name with args. ++set dummy gconftool-2; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GCONFTOOL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GCONFTOOL=$ac_cv_path_GCONFTOOL ++if test -n "$GCONFTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 ++$as_echo "$GCONFTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ ++@%:@ Check whether --with-gconf-source was given. ++if test "${with_gconf_source+set}" = set; then : ++ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ ++@%:@ Check whether --with-gconf-schema-file-dir was given. ++if test "${with_gconf_schema_file_dir+set}" = set; then : ++ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } ++ ++ @%:@ Check whether --enable-schemas-install was given. ++if test "${enable_schemas_install+set}" = set; then : ++ enableval=$enable_schemas_install; case ${enableval} in ++ yes|no) ;; ++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; ++ esac ++fi ++ ++ if test "$enable_schemas_install" != no; then ++ GCONF_SCHEMAS_INSTALL_TRUE= ++ GCONF_SCHEMAS_INSTALL_FALSE='#' ++else ++ GCONF_SCHEMAS_INSTALL_TRUE='#' ++ GCONF_SCHEMAS_INSTALL_FALSE= ++fi ++ ++ ++ ++# Extract the first word of "glib-genmarshal", so it can be a program name with args. ++set dummy glib-genmarshal; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GLIB_GENMARSHAL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL ++if test -n "$GLIB_GENMARSHAL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 ++$as_echo "$GLIB_GENMARSHAL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++GETTEXT_PACKAGE=gnome-media-2.0 ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" ++_ACEOF ++ ++ ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_LOCALE_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ if test $ac_cv_header_locale_h = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 ++$as_echo_n "checking for LC_MESSAGES... " >&6; } ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <locale.h> ++int ++main () ++{ ++return LC_MESSAGES ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_val_LC_MESSAGES=yes ++else ++ am_cv_val_LC_MESSAGES=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 ++$as_echo "$am_cv_val_LC_MESSAGES" >&6; } ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ ++$as_echo "@%:@define HAVE_LC_MESSAGES 1" >>confdefs.h ++ ++ fi ++ fi ++ USE_NLS=yes ++ ++ ++ gt_cv_have_gettext=no ++ ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : ++ gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ # ++ # First check in libc ++ # ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 ++$as_echo_n "checking for ngettext in libc... " >&6; } ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <libintl.h> ++ ++int ++main () ++{ ++return !ngettext ("","", 1) ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_ngettext_libc=yes ++else ++ gt_cv_func_ngettext_libc=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 ++$as_echo "$gt_cv_func_ngettext_libc" >&6; } ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 ++$as_echo_n "checking for dgettext in libc... " >&6; } ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <libintl.h> ++ ++int ++main () ++{ ++return !dgettext ("","") ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_dgettext_libc=yes ++else ++ gt_cv_func_dgettext_libc=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 ++$as_echo "$gt_cv_func_dgettext_libc" >&6; } ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_BIND_TEXTDOMAIN_CODESET 1 ++_ACEOF ++ ++fi ++done ++ ++ fi ++ ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 ++$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char bindtextdomain (); ++int ++main () ++{ ++return bindtextdomain (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_bindtextdomain=yes ++else ++ ac_cv_lib_intl_bindtextdomain=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_ngettext=yes ++else ++ ac_cv_lib_intl_ngettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 ++$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 ++$as_echo_n "checking for dgettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dgettext (); ++int ++main () ++{ ++return dgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dgettext=yes ++else ++ ac_cv_lib_intl_dgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dgettext" >&6; } ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++fi ++ ++fi ++ ++fi ++ ++ ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 ++$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 ++$as_echo "" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_ngettext=yes ++else ++ ac_cv_lib_intl_ngettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 ++$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 ++$as_echo_n "checking for dcgettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dcgettext (); ++int ++main () ++{ ++return dcgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dcgettext=yes ++else ++ ac_cv_lib_intl_dcgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv ++else ++ : ++fi ++ ++else ++ : ++fi ++ ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_BIND_TEXTDOMAIN_CODESET 1 ++_ACEOF ++ ++fi ++done ++ ++ LIBS="$glib_save_LIBS" ++ ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ ++$as_echo "@%:@define HAVE_GETTEXT 1" >>confdefs.h ++ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case "$MSGFMT" in ++ /*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ++ ac_cv_path_MSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ++ ;; ++esac ++fi ++MSGFMT="$ac_cv_path_MSGFMT" ++if test "$MSGFMT" != "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_DCGETTEXT 1 ++_ACEOF ++ ++fi ++done ++ ++ MSGFMT_OPTS= ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 ++$as_echo_n "checking if msgfmt accepts -c... " >&6; } ++ cat >conftest.foo <<_ACEOF ++ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test <foo@bar.xx>\n" ++"Language-Team: C <LL@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++_ACEOF ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++echo "$as_me: failed input was:" >&5 ++sed 's/^/| /' conftest.foo >&5 ++fi ++ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GMSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT=$ac_cv_path_GMSGFMT ++if test -n "$GMSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case "$XGETTEXT" in ++ /*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ++ ;; ++esac ++fi ++XGETTEXT="$ac_cv_path_XGETTEXT" ++if test "$XGETTEXT" != ":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++else ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++else ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++fi ++ ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ++fi ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ ++$as_echo "@%:@define ENABLE_NLS 1" >>confdefs.h ++ ++ fi ++ ++ if test "$XGETTEXT" != ":"; then ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } ++ XGETTEXT=":" ++ fi ++ fi ++ ++ # We need to process the po/ directory. ++ POSUB=po ++ ++ ac_config_commands="$ac_config_commands default-1" ++ ++ ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 ++$as_echo_n "checking for catalogs to be installed... " >&6; } ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 ++$as_echo "$LINGUAS" >&6; } ++ fi ++ ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi ++ ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ ++ ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ++ ++case `pwd` in ++ *\ * | *\ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++esac ++ ++ ++ ++macro_version='2.2.10' ++macro_revision='1.3175' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++# Make sure we can run config.sub. ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; ++esac ++build=$ac_cv_build ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; ++esac ++host=$ac_cv_host ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ++ ++ ++# Backslashify metacharacters that are still active within ++# double-quoted strings. ++sed_quote_subst='s/\(["`$\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 ++$as_echo_n "checking how to print strings... " >&6; } ++# Test print first, because it will be a builtin if present. ++if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='print -r --' ++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='printf %s\n' ++else ++ # Use this function as a fallback that always works. ++ func_fallback_echo () ++ { ++ eval 'cat <<_LTECHO_EOF ++$1 ++_LTECHO_EOF' ++ } ++ ECHO='func_fallback_echo' ++fi ++ ++# func_echo_all arg... ++# Invoke $ECHO with all args, space-separated. ++func_echo_all () ++{ ++ $ECHO "" ++} ++ ++case "$ECHO" in ++ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 ++$as_echo "printf" >&6; } ;; ++ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 ++$as_echo "print -r" >&6; } ;; ++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 ++$as_echo "cat" >&6; } ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 ++$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++if test "${ac_cv_path_SED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ { ac_script=; unset ac_script;} ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ 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_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++# Check for GNU ac_path_SED and select it if it is found. ++ # Check for GNU $ac_path_SED ++case `"$ac_path_SED" --version 2>&1` in ++*GNU*) ++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo '' >> "conftest.nl" ++ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_SED_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_SED="$ac_path_SED" ++ ac_path_SED_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_SED_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_SED"; then ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_SED=$SED ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed ++ ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 ++$as_echo_n "checking for fgrep... " >&6; } ++if test "${ac_cv_path_FGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 ++ then ac_cv_path_FGREP="$GREP -F" ++ else ++ if test -z "$FGREP"; then ++ ac_path_FGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in fgrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++# Check for GNU ac_path_FGREP and select it if it is found. ++ # Check for GNU $ac_path_FGREP ++case `"$ac_path_FGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'FGREP' >> "conftest.nl" ++ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_FGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_FGREP="$ac_path_FGREP" ++ ac_path_FGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_FGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_FGREP"; then ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_FGREP=$FGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 ++$as_echo "$ac_cv_path_FGREP" >&6; } ++ FGREP="$ac_cv_path_FGREP" ++ ++ ++test -z "$GREP" && GREP=grep ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then : ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no ++fi ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ++ ;; ++ *) ++ test "$with_gnu_ld" != yes && break ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi ++fi ++ ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ lt_cv_prog_gnu_ld=yes ++ ;; ++*) ++ lt_cv_prog_gnu_ld=no ++ ;; ++esac ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } ++if test "${lt_cv_path_NM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ if test -n "$DUMPBIN"; then : ++ # Let the user override the test. ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in dumpbin "link -dump" ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DUMPBIN"; then ++ ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DUMPBIN=$ac_cv_prog_DUMPBIN ++if test -n "$DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$DUMPBIN" && break ++ done ++fi ++if test -z "$DUMPBIN"; then ++ ac_ct_DUMPBIN=$DUMPBIN ++ for ac_prog in dumpbin "link -dump" ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DUMPBIN"; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN ++if test -n "$ac_ct_DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_DUMPBIN" && break ++done ++ ++ if test "x$ac_ct_DUMPBIN" = x; then ++ DUMPBIN=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DUMPBIN=$ac_ct_DUMPBIN ++ fi ++fi ++ ++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ *COFF*) ++ DUMPBIN="$DUMPBIN -symbols" ++ ;; ++ *) ++ DUMPBIN=: ++ ;; ++ esac ++ fi ++ ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } ++if test "${lt_cv_nm_interface+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:$LINENO: output\"" >&5) ++ cat conftest.out >&5 ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } ++ ++# find the maximum length of command line arguments ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 ++$as_echo_n "checking the maximum length of command line arguments... " >&6; } ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ ++ = "X$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++ ++fi ++ ++if test -n $lt_cv_sys_max_cmd_len ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 ++$as_echo "none" >&6; } ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 ++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 ++$as_echo "$xsi_shell" >&6; } ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 ++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 ++$as_echo "$lt_shell_append" >&6; } ++ ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++ ++ ++ ++ ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 ++$as_echo_n "checking for $LD option to reload object files... " >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_reload_flag='-r' ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 ++$as_echo "$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 ++$as_echo_n "checking how to recognize dependent libraries... " >&6; } ++if test "${lt_cv_deplibs_check_method+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. ++ ++case $host_os in ++aix[4-9]*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++bsdi[45]*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; ++ ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; ++ ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. ++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; ++ ++cegcc*) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++haiku*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; ++ ++interix[3-9]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++ fi ++ ;; ++ ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ fi ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++tpf*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 ++$as_echo "$lt_cv_deplibs_check_method" >&6; } ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++else ++ AR="$ac_cv_prog_AR" ++fi ++ ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++test -z "$STRIP" && STRIP=: ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++RANLIB=$ac_cv_prog_RANLIB ++if test -n "$RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++else ++ RANLIB="$ac_cv_prog_RANLIB" ++fi ++ ++test -z "$RANLIB" && RANLIB=: ++ ++ ++ ++ ++ ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++ ++case $host_os in ++ darwin*) ++ lock_old_archive_extraction=yes ;; ++ *) ++ lock_old_archive_extraction=no ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 ++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[BCDEGRST]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[BCDT]' ++ ;; ++cygwin* | mingw* | pw32* | cegcc*) ++ symcode='[ABCDGISTW]' ++ ;; ++hpux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[ABCDEGRST]' ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[BCDEGRST]' ++ ;; ++osf*) ++ symcode='[BCDEGQRST]' ++ ;; ++solaris*) ++ symcode='[BDRT]' ++ ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; ++sysv4) ++ symcode='[DFNSTU]' ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[ABCDGIRSTW]' ;; ++esac ++ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# Try without a prefix underscore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK '"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext <<_LT_EOF ++#ifdef __cplusplus ++extern "C" { ++#endif ++char nm_test_var; ++void nm_test_func(void); ++void nm_test_func(void){} ++#ifdef __cplusplus ++} ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++_LT_EOF ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 ++ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++_LT_EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ void *address; ++} ++lt__PROGRAM__LTX_preloaded_symbols[] = ++{ ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++_LT_EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&5 ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&5 ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 ++ fi ++ else ++ echo "$progname: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++ ++fi ++ ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 ++$as_echo "ok" >&6; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then : ++ enableval=$enable_libtool_lock; ++fi ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 ++$as_echo_n "checking whether the C compiler needs -belf... " >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ 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 ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ lt_cv_cc_needs_belf=yes ++else ++ lt_cv_cc_needs_belf=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ 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 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 ++$as_echo "$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 ++$as_echo "$DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 ++$as_echo "$ac_ct_DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 ++$as_echo "$NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 ++$as_echo "$ac_ct_NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. ++set dummy ${ac_tool_prefix}lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$LIPO"; then ++ ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ac_tool_prefix}lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++LIPO=$ac_cv_prog_LIPO ++if test -n "$LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 ++$as_echo "$LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_LIPO"; then ++ ac_ct_LIPO=$LIPO ++ # Extract the first word of "lipo", so it can be a program name with args. ++set dummy lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_LIPO"; then ++ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_LIPO="lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO ++if test -n "$ac_ct_LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 ++$as_echo "$ac_ct_LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_LIPO" = x; then ++ LIPO=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ LIPO=$ac_ct_LIPO ++ fi ++else ++ LIPO="$ac_cv_prog_LIPO" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL"; then ++ ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL=$ac_cv_prog_OTOOL ++if test -n "$OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 ++$as_echo "$OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL"; then ++ ac_ct_OTOOL=$OTOOL ++ # Extract the first word of "otool", so it can be a program name with args. ++set dummy otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL"; then ++ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL ++if test -n "$ac_ct_OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 ++$as_echo "$ac_ct_OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL" = x; then ++ OTOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL=$ac_ct_OTOOL ++ fi ++else ++ OTOOL="$ac_cv_prog_OTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL64"; then ++ ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL64=$ac_cv_prog_OTOOL64 ++if test -n "$OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 ++$as_echo "$OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL64"; then ++ ac_ct_OTOOL64=$OTOOL64 ++ # Extract the first word of "otool64", so it can be a program name with args. ++set dummy otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL64"; then ++ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 ++if test -n "$ac_ct_OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 ++$as_echo "$ac_ct_OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL64" = x; then ++ OTOOL64=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL64=$ac_ct_OTOOL64 ++ fi ++else ++ OTOOL64="$ac_cv_prog_OTOOL64" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 ++$as_echo_n "checking for -single_module linker flag... " >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&5 ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 ++$as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 ++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ lt_cv_ld_exported_symbols_list=yes ++else ++ lt_cv_ld_exported_symbols_list=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 ++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 ++$as_echo_n "checking for -force_load linker flag... " >&6; } ++if test "${lt_cv_ld_force_load+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_force_load=no ++ cat > conftest.c << _LT_EOF ++int forced_loaded() { return 2;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 ++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 ++ echo "$AR cru libconftest.a conftest.o" >&5 ++ $AR cru libconftest.a conftest.o 2>&5 ++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5 ++ cat > conftest.c << _LT_EOF ++int main() { return 0;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err ++ _lt_result=$? ++ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then ++ lt_cv_ld_force_load=yes ++ else ++ cat conftest.err >&5 ++ fi ++ rm -f conftest.err libconftest.a conftest conftest.c ++ rm -rf conftest.dSYM ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 ++$as_echo "$lt_cv_ld_force_load" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++for ac_header in dlfcn.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_DLFCN_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++# Set options ++ ++ ++ ++ enable_dlopen=no ++ ++ ++ enable_win32_dll=no ++ ++ ++ @%:@ Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then : ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ @%:@ Check whether --enable-static was given. ++if test "${enable_static+set}" = set; then : ++ enableval=$enable_static; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_static=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --with-pic was given. ++if test "${with_pic+set}" = set; then : ++ withval=$with_pic; pic_mode="$withval" ++else ++ pic_mode=default ++fi ++ ++ ++test -z "$pic_mode" && pic_mode=default ++ ++ ++ ++ ++ ++ ++ ++ @%:@ Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then : ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_fast_install=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++test -z "$LN_S" && LN_S="ln -s" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } ++if test "${lt_cv_objdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } ++objdir=$lt_cv_objdir ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define LT_OBJDIR "$lt_cv_objdir/" ++_ACEOF ++ ++ ++ ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++ ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 ++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/${ac_tool_prefix}file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++ ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ else ++ MAGIC_CMD=: ++ fi ++fi ++ ++ fi ++ ;; ++esac ++ ++# Use C for the default configuration in the libtool script ++ ++lt_save_CC="$CC" ++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 ++ ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++objext=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++ ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++ ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ ++lt_prog_compiler_no_builtin_flag= ++ ++if test "$GCC" = yes; then ++ case $cc_basename in ++ nvcc*) ++ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; ++ *) ++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; ++ esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_rtti_exceptions=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="-fno-rtti -fno-exceptions" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_rtti_exceptions=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++ ++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" ++else ++ : ++fi ++ ++fi ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl= ++lt_prog_compiler_pic= ++lt_prog_compiler_static= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_static='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ ;; ++ ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ lt_prog_compiler_static= ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared=no ++ enable_shared=no ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic=-Kconform_pic ++ fi ++ ;; ++ ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ++ case $cc_basename in ++ nvcc*) # Cuda Compiler Driver 2.2 ++ lt_prog_compiler_wl='-Xlinker ' ++ lt_prog_compiler_pic='-Xcompiler -fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ else ++ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl='-Wl,' ++ # All Alpha code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ xl* | bgxl* | bgf* | mpixl*) ++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-qpic' ++ lt_prog_compiler_static='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ F* | *Sun*Fortran*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ solaris*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ++ lt_prog_compiler_wl='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl='-Qoption ld ' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic='-Kconform_pic' ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic='-pic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ esac ++ fi ++ ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } ++ ++ ++ ++ ++ ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++ case $lt_prog_compiler_pic in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ esac ++else ++ lt_prog_compiler_pic= ++ lt_prog_compiler_can_build_shared=no ++fi ++ ++fi ++ ++ ++ ++ ++ ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++ : ++else ++ lt_prog_compiler_static= ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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 ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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 ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++ ++ ++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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ++ runpath_var= ++ allow_undefined_flag= ++ always_export_symbols=no ++ archive_cmds= ++ archive_expsym_cmds= ++ compiler_needs_object=no ++ enable_shared_with_static_runtimes=no ++ export_dynamic_flag_spec= ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ hardcode_automatic=no ++ hardcode_direct=no ++ hardcode_direct_absolute=no ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld= ++ hardcode_libdir_separator= ++ hardcode_minus_L=no ++ hardcode_shlibpath_var=unsupported ++ inherit_rpath=no ++ link_all_deplibs=unknown ++ module_cmds= ++ module_expsym_cmds= ++ old_archive_from_new_cmds= ++ old_archive_from_expsyms_cmds= ++ thread_safe_flag_spec= ++ whole_archive_flag_spec= ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ include_expsyms= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++ extract_expsyms_cmds= ++ ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ ld_shlibs=yes ++ ++ # On some targets, GNU ld is compatible enough with the native linker ++ # that we're better off using the native interface for both. ++ lt_use_gnu_ld_interface=no ++ if test "$with_gnu_ld" = yes; then ++ case $host_os in ++ aix*) ++ # The AIX port of GNU ld has always aspired to compatibility ++ # with the native linker. However, as the warning in the GNU ld ++ # block says, versions before 2.19.5* couldn't really create working ++ # shared libraries, regardless of the interface used. ++ case `$LD -v 2>&1` in ++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; ++ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; ++ *\ \(GNU\ Binutils\)\ [3-9]*) ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ fi ++ ++ if test "$lt_use_gnu_ld_interface" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[3-9]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the GNU linker, at least up to release 2.19, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to install binutils ++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. ++*** You will then need to restart the configuration process. ++ ++_LT_EOF ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec='-L$libdir' ++ export_dynamic_flag_spec='${wl}--export-all-symbols' ++ allow_undefined_flag=unsupported ++ always_export_symbols=no ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ haiku*) ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ link_all_deplibs=yes ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then ++ tmp_addflag= ++ tmp_sharedflag='-shared' ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ whole_archive_flag_spec= ++ tmp_sharedflag='--shared' ;; ++ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; ++ nvcc*) # Cuda Compiler Driver 2.2 ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object=yes ++ ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object=yes ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf* | bgf* | bgxlf* | mpixlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ++ if test "$ld_shlibs" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ hardcode_minus_L=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct=unsupported ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ # Also, AIX nm treats weak defined symbols like other global ++ # defined symbols, whereas GNU nm marks them as "W". ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds='' ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ file_list_spec='${wl}-f,' ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L=yes ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_libdir_separator= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ export_dynamic_flag_spec='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag="-z nodefs" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag=' ${wl}-bernotok' ++ allow_undefined_flag=' ${wl}-berok' ++ if test "$with_gnu_ld" = yes; then ++ # We only use this code for GNU lds that support --whole-archive. ++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ else ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec='$convenience' ++ fi ++ archive_cmds_need_lc=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac ++ ;; ++ ++ bsdi[45]*) ++ export_dynamic_flag_spec=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ ++ ++ archive_cmds_need_lc=no ++ hardcode_direct=no ++ hardcode_automatic=yes ++ hardcode_shlibpath_var=unsupported ++ if test "$lt_cv_ld_force_load" = "yes"; then ++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ else ++ whole_archive_flag_spec='' ++ fi ++ link_all_deplibs=yes ++ allow_undefined_flag="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=func_echo_all ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ ++ else ++ ld_shlibs=no ++ fi ++ ++ ;; ++ ++ dgux*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ freebsd1*) ++ ld_shlibs=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_ld='+b $libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ ++ # Older versions of the 11.00 compiler do not understand -b yet ++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 ++$as_echo_n "checking if $CC understands -b... " >&6; } ++if test "${lt_cv_prog_compiler__b+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler__b=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -b" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler__b=yes ++ fi ++ else ++ lt_cv_prog_compiler__b=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 ++$as_echo "$lt_cv_prog_compiler__b" >&6; } ++ ++if test x"$lt_cv_prog_compiler__b" = xyes; then ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++fi ++ ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ ;; ++ *) ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int foo(void) {} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ inherit_rpath=yes ++ link_all_deplibs=yes ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ newsos6) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *nto* | *qnx*) ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ hardcode_direct_absolute=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ os2*) ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ allow_undefined_flag=unsupported ++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec='-rpath $libdir' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_separator=: ++ ;; ++ ++ solaris*) ++ no_undefined_flag=' -z defs' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ else ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_shlibpath_var=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ++ fi ++ ;; ++ esac ++ link_all_deplibs=yes ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds='$CC -r -o $output$reload_objs' ++ hardcode_direct=no ++ ;; ++ motorola) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4.3*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ export_dynamic_flag_spec='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ ld_shlibs=yes ++ fi ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag='${wl}-z,text' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-R,$libdir' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ ld_shlibs=no ++ ;; ++ esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi ++ fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } ++test "$ld_shlibs" = no && can_build_shared=no ++ ++with_gnu_ld=$with_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 ++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag ++ allow_undefined_flag= ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ then ++ lt_cv_archive_cmds_need_lc=no ++ else ++ lt_cv_archive_cmds_need_lc=yes ++ fi ++ allow_undefined_flag=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 ++$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } ++ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } ++ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ case $host_os in ++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; ++ *) lt_sed_strip_eq="s,=/,/,g" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` ++ case $lt_search_path_spec in ++ *\;*) ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` ++ ;; ++ *) ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ esac ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[lt_foo]++; } ++ if (lt_freq[lt_foo] == 1) { print lt_foo; } ++}'` ++ # AWK program above erroneously prepends '/' to C:/dos/paths ++ # for these hosts. ++ case $host_os in ++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ ++ $SED 's,/\([A-Za-z]:\),\1,g'` ;; ++ esac ++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so ++ # instead of lib<name>.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++haiku*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ dynamic_linker="$host_os runtime_loader" ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ postinstall_cmds='chmod 555 $lib' ++ # or fails outright, so override atomically: ++ install_override_mode=555 ++ ;; ++ ++interix[3-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ ++ # Some binutils ld are patched to set DT_RUNPATH ++ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_shlibpath_overrides_runpath=no ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ lt_cv_shlibpath_overrides_runpath=yes ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++fi ++ ++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++hardcode_action= ++if test -n "$hardcode_libdir_flag_spec" || ++ test -n "$runpath_var" || ++ test "X$hardcode_automatic" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$hardcode_direct" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && ++ test "$hardcode_minus_L" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action=unsupported ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } ++ ++if test "$hardcode_action" = relink || ++ test "$inherit_rpath" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++ ++ ++ ++ ++ if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes ++else ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ++fi ++ ++ ;; ++ ++ *) ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes ++else ++ ac_cv_lib_dld_shl_load=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++else ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes ++else ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_svld_dlopen=yes ++else ++ ac_cv_lib_svld_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 ++$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 ++$as_echo_n "checking for dld_link in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dld_link (); ++int ++main () ++{ ++return dld_link (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_dld_link=yes ++else ++ ac_cv_lib_dld_dld_link=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 ++$as_echo "$ac_cv_lib_dld_dld_link" >&6; } ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 ++$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line $LINENO "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif ++ ++#include <stdio.h> ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++/* When -fvisbility=hidden is used, assume the code has been annotated ++ correspondingly for the symbols needed. */ ++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++void fnord () __attribute__((visibility("default"))); ++#endif ++ ++void fnord () { int i=42; } ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else ++ { ++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else puts (dlerror ()); ++ } ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 ++$as_echo "$lt_cv_dlopen_self" >&6; } ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 ++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self_static+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self_static=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line $LINENO "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif ++ ++#include <stdio.h> ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++/* When -fvisbility=hidden is used, assume the code has been annotated ++ correspondingly for the symbols needed. */ ++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++void fnord () __attribute__((visibility("default"))); ++#endif ++ ++void fnord () { int i=42; } ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else ++ { ++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else puts (dlerror ()); ++ } ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self_static=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++striplib= ++old_striplib= ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 ++$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++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" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ ;; ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ;; ++ esac ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ # Report which library types will actually be built ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 ++$as_echo_n "checking if libtool supports shared libraries... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 ++$as_echo "$can_build_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 ++$as_echo_n "checking whether to build shared libraries... " >&6; } ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 ++$as_echo_n "checking whether to build static libraries... " >&6; } ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } ++ ++ ++ ++ ++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 ++ ++CC="$lt_save_CC" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_config_commands="$ac_config_commands libtool" ++ ++ ++ ++ ++# Only expand once: ++ ++ ++if test "x$CC" != xcc; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 ++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 ++$as_echo_n "checking whether cc understands -c and -o together... " >&6; } ++fi ++set dummy $CC; ac_cc=`$as_echo "$2" | ++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++# Make sure it works both with $CC and with simple cc. ++# 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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++rm -f conftest2.* ++if { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; ++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.$ac_ext >&5' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++ rm -f conftest2.* ++ if { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; ++ then ++ # cc works too. ++ : ++ else ++ # cc exists but doesn't like -o. ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++ fi ++ fi ++ fi ++else ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++fi ++rm -f core conftest* ++ ++fi ++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++$as_echo "@%:@define NO_MINUS_C_MINUS_O 1" >>confdefs.h ++ ++fi ++ ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++ ++ ++ ++ ++have_gstprops=no ++ ++@%:@ Check whether --enable-gstprops was given. ++if test "${enable_gstprops+set}" = set; then : ++ enableval=$enable_gstprops; ++else ++ enable_gstprops=yes ++fi ++ ++ ++if test "x$have_gst" = "xyes" && test "x$enable_gstprops" = "xyes"; ++then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTPROPS" >&5 ++$as_echo_n "checking for GSTPROPS... " >&6; } ++ ++if test -n "$GSTPROPS_CFLAGS"; then ++ pkg_cv_GSTPROPS_CFLAGS="$GSTPROPS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ glib-2.0 ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_PLUGINS_BASE_REQ ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTPROPS_CFLAGS=`$PKG_CONFIG --cflags " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSTPROPS_LIBS"; then ++ pkg_cv_GSTPROPS_LIBS="$GSTPROPS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ glib-2.0 ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_PLUGINS_BASE_REQ ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTPROPS_LIBS=`$PKG_CONFIG --libs " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSTPROPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>&1` ++ else ++ GSTPROPS_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSTPROPS_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0) were not met: ++ ++$GSTPROPS_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GSTPROPS_CFLAGS ++and GSTPROPS_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GSTPROPS_CFLAGS ++and GSTPROPS_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GSTPROPS_CFLAGS=$pkg_cv_GSTPROPS_CFLAGS ++ GSTPROPS_LIBS=$pkg_cv_GSTPROPS_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gstprops=yes ++fi ++ ++ GSTPROPS_LIBS="$GSTPROPS_LIBS -lgstinterfaces-$GST_MAJORMINOR" ++ ++ GNOMECC_DESKTOP_DIR=${datadir}/control-center-2.0/capplets ++ ++ EXP_VAR=GNOMECC_DESKTOP_DIR ++ FROM_VAR=$GNOMECC_DESKTOP_DIR ++ ++ prefix_save=$prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix=/usr/local ++ fi ++ exec_prefix_save=$exec_prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=/usr/local ++ fi ++ ++ full_var="$FROM_VAR" ++ while true; do ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var"="x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ full_var=$new_full_var ++ GNOMECC_DESKTOP_DIR="$full_var" ++ ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GNOMECC_DESKTOP_DIR "$GNOMECC_DESKTOP_DIR" ++_ACEOF ++ ++ ++ ++fi ++ ++ ++ ++ if test x$have_gstprops = xyes; then ++ HAVE_GSTPROPS_TRUE= ++ HAVE_GSTPROPS_FALSE='#' ++else ++ HAVE_GSTPROPS_TRUE='#' ++ HAVE_GSTPROPS_FALSE= ++fi ++ ++ ++ ++have_gstmixer=no ++ ++@%:@ Check whether --enable-gstmix was given. ++if test "${enable_gstmix+set}" = set; then : ++ enableval=$enable_gstmix; ++else ++ enable_gstmix=auto ++fi ++ ++ ++if test "x$enable_gstmix" = "xauto" && test "x$have_pulseaudio" = "xno"; then ++ enable_gstmix=yes ++fi ++ ++if test "x$have_gst" = "xyes" && test "x$enable_gstmix" = "xyes"; ++then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTMIXER" >&5 ++$as_echo_n "checking for GSTMIXER... " >&6; } ++ ++if test -n "$GSTMIXER_CFLAGS"; then ++ pkg_cv_GSTMIXER_CFLAGS="$GSTMIXER_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTMIXER_CFLAGS=`$PKG_CONFIG --cflags " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSTMIXER_LIBS"; then ++ pkg_cv_GSTMIXER_LIBS="$GSTMIXER_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTMIXER_LIBS=`$PKG_CONFIG --libs " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSTMIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>&1` ++ else ++ GSTMIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSTMIXER_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ) were not met: ++ ++$GSTMIXER_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GSTMIXER_CFLAGS ++and GSTMIXER_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GSTMIXER_CFLAGS ++and GSTMIXER_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GSTMIXER_CFLAGS=$pkg_cv_GSTMIXER_CFLAGS ++ GSTMIXER_LIBS=$pkg_cv_GSTMIXER_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++ OLD_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $GSTMIXER_CFLAGS" ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/audio/mixerutils.h" "ac_cv_header_gst_audio_mixerutils_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_audio_mixerutils_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/interfaces/mixer.h" "ac_cv_header_gst_interfaces_mixer_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_interfaces_mixer_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/interfaces/propertyprobe.h" "ac_cv_header_gst_interfaces_propertyprobe_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_interfaces_propertyprobe_h" = x""yes; then : ++ have_gstmixer=yes ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++ ++ CPPFLAGS=$OLD_CPPFLAGS ++ GSTMIXER_LIBS="$GSTMIXER_LIBS -lgstinterfaces-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR" ++ ++fi ++fi ++ ++ ++ ++ if test x$have_gstmixer = xyes; then ++ HAVE_GSTMIXER_TRUE= ++ HAVE_GSTMIXER_FALSE='#' ++else ++ HAVE_GSTMIXER_TRUE='#' ++ HAVE_GSTMIXER_FALSE= ++fi ++ ++ ++ ++ ++@%:@ Check whether --enable-silent-rules was given. ++if test "${enable_silent_rules+set}" = set; then : ++ enableval=$enable_silent_rules; ++fi ++ ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=0;; ++esac ++AM_BACKSLASH='\' ++ ++ ++# Turn on the additional warnings last, so warnings don't affect other tests. ++@%:@ Check whether --enable-more-warnings was given. ++if test "${enable_more_warnings+set}" = set; then : ++ enableval=$enable_more_warnings; set_more_warnings="$enableval" ++else ++ ++ if test -d $srcdir/.git; then ++ set_more_warnings=yes ++ else ++ set_more_warnings=no ++ fi ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 ++$as_echo_n "checking for more warnings... " >&6; } ++if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ CFLAGS="\ ++ -Wall \ ++ -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ ++ -Wnested-externs -Wpointer-arith \ ++ -Wcast-align -Wsign-compare \ ++ $CFLAGS" ++ ++ for option in -Wno-unused-parameter -Wno-strict-aliasing -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ has_option=yes ++else ++ has_option=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ if test $has_option = no; then ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ac_config_files="$ac_config_files Makefile po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/devices/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in" ++ ++ ++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_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; 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" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_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}' ++ ++DEFS=-DHAVE_CONFIG_H ++ ++ac_libobjs= ++ac_ltlibobjs= ++U= ++for ac_i in : $LIB@&t@OBJS; 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=`$as_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. ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' ++done ++LIB@&t@OBJS=$ac_libobjs ++ ++LTLIBOBJS=$ac_ltlibobjs ++ ++ ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then ++ as_fn_error $? "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++ ++ ac_config_commands="$ac_config_commands po/stamp-it" ++ ++ ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_SOUND_THEME_TRUE}" && test -z "${HAVE_SOUND_THEME_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_SOUND_THEME\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_PULSEAUDIO_TRUE}" && test -z "${HAVE_PULSEAUDIO_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_PULSEAUDIO\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GMP_TRUE}" && test -z "${HAVE_GMP_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GMP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GLADEUI_TRUE}" && test -z "${HAVE_GLADEUI_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GLADEUI\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTREAMER_TRUE}" && test -z "${HAVE_GSTREAMER_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTREAMER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GRECORD_TRUE}" && test -z "${HAVE_GRECORD_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GRECORD\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then ++ as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTPROPS_TRUE}" && test -z "${HAVE_GSTPROPS_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTPROPS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTMIXER_TRUE}" && test -z "${HAVE_GSTMIXER_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTMIXER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++ ++: ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 ++#! $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} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## 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=: ++ # Pre-4.2 versions of Zsh do 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_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in @%:@( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++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.) ++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 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] ++@%:@ ---------------------------------------- ++@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++@%:@ script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} @%:@ as_fn_error ++ ++ ++@%:@ as_fn_set_status STATUS ++@%:@ ----------------------- ++@%:@ Set @S|@? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} @%:@ as_fn_set_status ++ ++@%:@ as_fn_exit STATUS ++@%:@ ----------------- ++@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} @%:@ as_fn_exit ++ ++@%:@ as_fn_unset VAR ++@%:@ --------------- ++@%:@ Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++@%:@ as_fn_append VAR VALUE ++@%:@ ---------------------- ++@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take ++@%:@ advantage of any shell optimizations that allow amortized linear growth over ++@%:@ repeated appends, instead of the typical quadratic growth present in naive ++@%:@ implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++@%:@ as_fn_arith ARG... ++@%:@ ------------------ ++@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the ++@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments ++@%:@ must be portable across @S|@(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++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 ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# 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 ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in @%:@((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++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 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ 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 ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++ ++@%:@ as_fn_mkdir_p ++@%:@ ------------- ++@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_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 || ++$as_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" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} @%:@ as_fn_mkdir_p ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p='mkdir -p "$as_dir"' ++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 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 gnome-media $as_me 2.32.0, which was ++generated by GNU Autoconf 2.67. 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 ++ ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ac_cs_usage="\ ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. ++ ++Usage: $0 [OPTION]... [TAG]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ 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 ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ++ac_cs_version="\\ ++gnome-media config.status 2.32.0 ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" ++ ++Copyright (C) 2010 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' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. ++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=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ 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 ) ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" ++ ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ as_fn_error $? "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; ++ --help | --hel | -h ) ++ $as_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. ++ -*) as_fn_error $? "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; ++ ++ *) as_fn_append 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 || ac_write_fail=1 ++if \$ac_cs_recheck; then ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' ++ export CONFIG_SHELL ++ exec "\$@" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX ++@%:@@%:@ Running $as_me. @%:@@%:@ ++_ASBOX ++ $as_echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# ++# INIT-COMMANDS ++# ++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" ++ ++ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' ++enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' ++SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ++ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' ++host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' ++host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' ++host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' ++build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' ++build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' ++build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' ++SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' ++Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' ++GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' ++EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' ++FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' ++LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' ++NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' ++LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' ++exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' ++AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' ++STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' ++lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' ++CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' ++compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' ++GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' ++need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' ++LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' ++libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' ++need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' ++version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' ++install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' ++striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' ++ ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# A function that is used when there is no print builtin or printf. ++func_fallback_echo () ++{ ++ eval 'cat <<_LTECHO_EOF ++\$1 ++_LTECHO_EOF' ++} ++ ++# Quote evaled strings. ++for var in SHELL \ ++ECHO \ ++SED \ ++GREP \ ++EGREP \ ++FGREP \ ++LD \ ++NM \ ++LN_S \ ++lt_SP2NL \ ++lt_NL2SP \ ++reload_flag \ ++OBJDUMP \ ++deplibs_check_method \ ++file_magic_cmd \ ++AR \ ++AR_FLAGS \ ++STRIP \ ++RANLIB \ ++CC \ ++CFLAGS \ ++compiler \ ++lt_cv_sys_global_symbol_pipe \ ++lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_c_name_address \ ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++lt_prog_compiler_no_builtin_flag \ ++lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ ++lt_prog_compiler_static \ ++lt_cv_prog_compiler_c_o \ ++need_locks \ ++DSYMUTIL \ ++NMEDIT \ ++LIPO \ ++OTOOL \ ++OTOOL64 \ ++shrext_cmds \ ++export_dynamic_flag_spec \ ++whole_archive_flag_spec \ ++compiler_needs_object \ ++with_gnu_ld \ ++allow_undefined_flag \ ++no_undefined_flag \ ++hardcode_libdir_flag_spec \ ++hardcode_libdir_flag_spec_ld \ ++hardcode_libdir_separator \ ++fix_srcfile_path \ ++exclude_expsyms \ ++include_expsyms \ ++file_list_spec \ ++variables_saved_for_relink \ ++libname_spec \ ++library_names_spec \ ++soname_spec \ ++install_override_mode \ ++finish_eval \ ++old_striplib \ ++striplib; do ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in reload_cmds \ ++old_postinstall_cmds \ ++old_postuninstall_cmds \ ++old_archive_cmds \ ++extract_expsyms_cmds \ ++old_archive_from_new_cmds \ ++old_archive_from_expsyms_cmds \ ++archive_cmds \ ++archive_expsym_cmds \ ++module_cmds \ ++module_expsym_cmds \ ++export_symbols_cmds \ ++prelink_cmds \ ++postinstall_cmds \ ++postuninstall_cmds \ ++finish_cmds \ ++sys_lib_search_path_spec \ ++sys_lib_dlsearch_path_spec; do ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++ac_aux_dir='$ac_aux_dir' ++xsi_shell='$xsi_shell' ++lt_shell_append='$lt_shell_append' ++ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile' ++ ++ ++ ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ ++# Handling of arguments. ++for ac_config_target in $ac_config_targets ++do ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; ++ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; ++ "sound-theme/Makefile") CONFIG_FILES="$CONFIG_FILES sound-theme/Makefile" ;; ++ "sound-theme/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES sound-theme/sounds/Makefile" ;; ++ "gnome-volume-control/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/Makefile" ;; ++ "gnome-volume-control/data/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/Makefile" ;; ++ "gnome-volume-control/data/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/gnome-volume-control.desktop.in" ;; ++ "gnome-volume-control/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/status/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/status/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/status/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/status/Makefile" ;; ++ "gnome-volume-control/data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/48x48/Makefile" ;; ++ "gnome-volume-control/data/icons/48x48/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/48x48/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/devices/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/devices/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/status/Makefile" ;; ++ "gnome-volume-control/src/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/src/Makefile" ;; ++ "grecord/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/Makefile" ;; ++ "grecord/gnome-sound-recorder.schemas.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.schemas.in" ;; ++ "grecord/src/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/src/Makefile" ;; ++ "grecord/icons/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/Makefile" ;; ++ "grecord/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/16x16/Makefile" ;; ++ "grecord/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/22x22/Makefile" ;; ++ "grecord/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/24x24/Makefile" ;; ++ "grecord/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/32x32/Makefile" ;; ++ "grecord/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/48x48/Makefile" ;; ++ "grecord/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/scalable/Makefile" ;; ++ "gstreamer-properties/Makefile") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/Makefile" ;; ++ "gst-mixer/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/Makefile" ;; ++ "gst-mixer/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/Makefile" ;; ++ "gst-mixer/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/Makefile" ;; ++ "gst-mixer/icons/16x16/devices/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/devices/Makefile" ;; ++ "gst-mixer/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/status/Makefile" ;; ++ "gst-mixer/src/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/src/Makefile" ;; ++ "gst-mixer/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/pixmaps/Makefile" ;; ++ "profiles/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/Makefile" ;; ++ "profiles/gnome-audio-profiles.schemas.in") CONFIG_FILES="$CONFIG_FILES profiles/gnome-audio-profiles.schemas.in" ;; ++ "profiles/gnome-media-profiles.pc") CONFIG_FILES="$CONFIG_FILES profiles/gnome-media-profiles.pc" ;; ++ "profiles/glade/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/glade/Makefile" ;; ++ "grecord/gnome-sound-recorder.desktop.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.desktop.in" ;; ++ "gst-mixer/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gst-mixer/gnome-volume-control.desktop.in" ;; ++ "gstreamer-properties/gstreamer-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/gstreamer-properties.desktop.in" ;; ++ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; ++ ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ 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 ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++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 'as_fn_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") ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. ++if test -n "$CONFIG_FILES"; then ++ ++ ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\\r' ++else ++ ac_cs_awk_cr=$ac_cr ++fi ++ ++echo 'BEGIN {' >"$tmp/subs1.awk" && ++_ACEOF ++ ++ ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ . ./conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++rm -f conf$$subs.sh ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++_ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' <conf$$subs.awk | sed ' ++/^[^""]/{ ++ N ++ s/\n// ++} ++' >>$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ ++ print line ++} ++ ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 ++_ACEOF ++ ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries 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[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// ++s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++fi # test -n "$CONFIG_FILES" ++ ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' <confdefs.h | sed ' ++s/'"$ac_delim"'/"\\\ ++"/g' >>$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 ++fi # test -n "$CONFIG_HEADERS" ++ ++ ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :[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 || ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ esac ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append 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 '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} ++ fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; ++ 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 || ++$as_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"; as_fn_mkdir_p ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_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 || ac_write_fail=1 ++# 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= ++ac_sed_dataroot=' ++/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ 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 || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s|@configure_input@|$ac_sed_conf_input|;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;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 ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ++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"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&5 ++$as_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 \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++ if test x"$ac_file" != x-; then ++ { ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 ++$as_echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f "$ac_file" ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ fi ++ else ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 ++ fi ++# Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$_am_arg" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; ++ ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac ++ ++ ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || ++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$mf" : 'X\(//\)[^/]' \| \ ++ X"$mf" : 'X\(//\)$' \| \ ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || ++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$file" : 'X\(//\)[^/]' \| \ ++ X"$file" : 'X\(//\)$' \| \ ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++ ;; ++ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac ;; ++ "libtool":C) ++ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++ ++# The names of the tagged configurations supported by this script. ++available_tags="" ++ ++# ### BEGIN LIBTOOL CONFIG ++ ++# Which release of libtool.m4 was used? ++macro_version=$macro_version ++macro_revision=$macro_revision ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# What type of objects to build. ++pic_mode=$pic_mode ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# An echo program that protects backslashes. ++ECHO=$lt_ECHO ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="\$SED -e 1s/^X//" ++ ++# A grep program that handles long lines. ++GREP=$lt_GREP ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# A literal string matcher. ++FGREP=$lt_FGREP ++ ++# A BSD- or MS-compatible name lister. ++NM=$lt_NM ++ ++# Whether we need soft or hard links. ++LN_S=$lt_LN_S ++ ++# What is the maximum length of a command? ++max_cmd_len=$max_cmd_len ++ ++# Object file suffix (normally "o"). ++objext=$ac_objext ++ ++# Executable file suffix (normally ""). ++exeext=$exeext ++ ++# whether the shell understands "unset". ++lt_unset=$lt_unset ++ ++# turn spaces into newlines. ++SP2NL=$lt_lt_SP2NL ++ ++# turn newlines into spaces. ++NL2SP=$lt_lt_NL2SP ++ ++# An object symbol dumper. ++OBJDUMP=$lt_OBJDUMP ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == "file_magic". ++file_magic_cmd=$lt_file_magic_cmd ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A symbol stripping program. ++STRIP=$lt_STRIP ++ ++# Commands used to install an old-style archive. ++RANLIB=$lt_RANLIB ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Whether to use a lock for old archive extraction. ++lock_old_archive_extraction=$lock_old_archive_extraction ++ ++# A C compiler. ++LTCC=$lt_CC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_CFLAGS ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration. ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair. ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# Transform the output of nm in a C name address pair when lib prefix is needed. ++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# Used to examine libraries when file_magic_cmd begins with "file". ++MAGIC_CMD=$MAGIC_CMD ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Tool to manipulate archived DWARF debug symbol files on Mac OS X. ++DSYMUTIL=$lt_DSYMUTIL ++ ++# Tool to change global to local symbols on Mac OS X. ++NMEDIT=$lt_NMEDIT ++ ++# Tool to manipulate fat objects and archives on Mac OS X. ++LIPO=$lt_LIPO ++ ++# ldd/readelf like tool for Mach-O binaries on Mac OS X. ++OTOOL=$lt_OTOOL ++ ++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. ++OTOOL64=$lt_OTOOL64 ++ ++# Old archive suffix (normally "a"). ++libext=$libext ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds=$lt_shrext_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at link time. ++variables_saved_for_relink=$lt_variables_saved_for_relink ++ ++# Do we need the "lib" prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# Shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Permission mode override for installation of shared libraries. ++install_override_mode=$lt_install_override_mode ++ ++# Command to use after installation of a shared archive. ++postinstall_cmds=$lt_postinstall_cmds ++ ++# Command to use after uninstallation of a shared archive. ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# As "finish_cmds", except a single script fragment to be evaled but ++# not shown. ++finish_eval=$lt_finish_eval ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Compile-time system search path for libraries. ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries. ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds ++ ++# A language specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action ++ ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} ++ ++_LT_EOF ++ ;; ++ esac ++ ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++ ++ ;; ++ "po/stamp-it":C) ++ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then ++ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 ++ fi ++ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" ++ >"po/stamp-it.tmp" ++ sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" ++ ++ sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r po/POTFILES ++ } ++ ' "po/Makefile.in" >"po/Makefile" ++ rm -f "po/Makefile.tmp" ++ mv "po/stamp-it.tmp" "po/stamp-it" ++ ;; ++ ++ esac ++done # for ac_tag ++ ++ ++as_fn_exit 0 ++_ACEOF ++ac_clean_files=$ac_clean_files_save ++ ++test $ac_write_fail = 0 || ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ ++ ++# 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 || as_fn_exit 1 ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ++fi ++ ++ ++echo " ++ ++ ${PACKAGE} ${VERSION} ++ ============ ++ ++ ++ Prefix: ${prefix} ++ Source code location: ${srcdir} ++ Compiler: ${CC} ++ CFLAGS: ${CFLAGS} ++ ++ Volume Control $have_pulseaudio ++ GStreamer properties: $have_gstprops ++ GStreamer profiles: $have_profiles (GladeUI: $have_gladeui) ++ Sound recorder: $have_grecord$grecord_reason ++ ++ *Deprecated*: ++ ++ GStreamer mixer: $have_gstmixer ++ ++" ++ +diff -Naur gnome-media-2.32.0.orig/autom4te.cache/output.1 gnome-media-2.32.0.patched/autom4te.cache/output.1 +--- gnome-media-2.32.0.orig/autom4te.cache/output.1 1969-12-31 19:00:00.000000000 -0500 ++++ gnome-media-2.32.0.patched/autom4te.cache/output.1 2011-08-24 22:23:51.000000000 -0400 +@@ -0,0 +1,17576 @@ ++@%:@! /bin/sh ++@%:@ Guess values for system-dependent variables and create Makefiles. ++@%:@ Generated by GNU Autoconf 2.67 for gnome-media 2.32.0. ++@%:@ ++@%:@ Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>. ++@%:@ ++@%:@ ++@%:@ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++@%:@ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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=: ++ # Pre-4.2 versions of Zsh do 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_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in @%:@( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++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.) ++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 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test "x$CONFIG_SHELL" = x; then ++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : ++ emulate sh ++ NULLCMD=: ++ # Pre-4.2 versions of Zsh do 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_required="as_fn_return () { (exit \$1); } ++as_fn_success () { as_fn_return 0; } ++as_fn_failure () { as_fn_return 1; } ++as_fn_ret_success () { return 0; } ++as_fn_ret_failure () { return 1; } ++ ++exitcode=0 ++as_fn_success || { exitcode=1; echo as_fn_success failed.; } ++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } ++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } ++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } ++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : ++ ++else ++ exitcode=1; echo positional parameters were not saved. ++fi ++test x\$exitcode = x0 || exit 1" ++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO ++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO ++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && ++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 ++test \$(( 1 + 1 )) = 2 || exit 1 ++ ++ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ++ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO ++ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO ++ PATH=/empty FPATH=/empty; export PATH FPATH ++ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ ++ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" ++ if (eval "$as_required") 2>/dev/null; then : ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : ++ ++else ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++as_found=false ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ as_found=: ++ case $as_dir in @%:@( ++ /*) ++ for as_base in sh bash ksh sh5; do ++ # Try only shells that exist, to save several forks. ++ as_shell=$as_dir/$as_base ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ CONFIG_SHELL=$as_shell as_have_required=yes ++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : ++ break 2 ++fi ++fi ++ done;; ++ esac ++ as_found=false ++done ++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && ++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : ++ CONFIG_SHELL=$SHELL as_have_required=yes ++fi; } ++IFS=$as_save_IFS ++ ++ ++ if test "x$CONFIG_SHELL" != x; then : ++ # We cannot yet assume a decent shell, so we have to provide a ++ # neutralization value for shells without unset; and this also ++ # works around shells that cannot unset nonexistent variables. ++ BASH_ENV=/dev/null ++ ENV=/dev/null ++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ if test x$as_have_required = xno; then : ++ $as_echo "$0: This script requires a shell more modern than all" ++ $as_echo "$0: the shells that I found on your system." ++ if test x${ZSH_VERSION+set} = xset ; then ++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" ++ $as_echo "$0: be upgraded to zsh 4.3.4 or later." ++ else ++ $as_echo "$0: Please tell bug-autoconf@gnu.org and ++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media ++$0: about your system, including any error possibly output ++$0: before this message. Then install a modern shell, or ++$0: manually run the script under such a shell if you do ++$0: have one." ++ fi ++ exit 1 ++fi ++fi ++fi ++SHELL=${CONFIG_SHELL-/bin/sh} ++export SHELL ++# Unset more variables known to interfere with behavior of common tools. ++CLICOLOR_FORCE= GREP_OPTIONS= ++unset CLICOLOR_FORCE GREP_OPTIONS ++ ++## --------------------- ## ++## M4sh Shell Functions. ## ++## --------------------- ## ++@%:@ as_fn_unset VAR ++@%:@ --------------- ++@%:@ Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++ ++@%:@ as_fn_set_status STATUS ++@%:@ ----------------------- ++@%:@ Set @S|@? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} @%:@ as_fn_set_status ++ ++@%:@ as_fn_exit STATUS ++@%:@ ----------------- ++@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} @%:@ as_fn_exit ++ ++@%:@ as_fn_mkdir_p ++@%:@ ------------- ++@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_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 || ++$as_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" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} @%:@ as_fn_mkdir_p ++@%:@ as_fn_append VAR VALUE ++@%:@ ---------------------- ++@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take ++@%:@ advantage of any shell optimizations that allow amortized linear growth over ++@%:@ repeated appends, instead of the typical quadratic growth present in naive ++@%:@ implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++@%:@ as_fn_arith ARG... ++@%:@ ------------------ ++@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the ++@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments ++@%:@ must be portable across @S|@(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] ++@%:@ ---------------------------------------- ++@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++@%:@ script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} @%:@ as_fn_error ++ ++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 ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# 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 ++ ++ ++ as_lineno_1=$LINENO as_lineno_1a=$LINENO ++ as_lineno_2=$LINENO as_lineno_2a=$LINENO ++ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && ++ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { ++ # 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" || ++ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_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 ++} ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in @%:@((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++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 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ 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 ++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='mkdir -p "$as_dir"' ++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'" ++ ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++ ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, old GNU/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=. ++LIB@&t@OBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++ ++# Identity of this package. ++PACKAGE_NAME='gnome-media' ++PACKAGE_TARNAME='gnome-media' ++PACKAGE_VERSION='2.32.0' ++PACKAGE_STRING='gnome-media 2.32.0' ++PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media' ++PACKAGE_URL='' ++ ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include <stdio.h> ++#ifdef HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++#ifdef STDC_HEADERS ++# include <stdlib.h> ++# include <stddef.h> ++#else ++# ifdef HAVE_STDLIB_H ++# include <stdlib.h> ++# endif ++#endif ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include <memory.h> ++# endif ++# include <string.h> ++#endif ++#ifdef HAVE_STRINGS_H ++# include <strings.h> ++#endif ++#ifdef HAVE_INTTYPES_H ++# include <inttypes.h> ++#endif ++#ifdef HAVE_STDINT_H ++# include <stdint.h> ++#endif ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif" ++ ++ac_header_list= ++ac_subst_vars='am__EXEEXT_FALSE ++am__EXEEXT_TRUE ++LTLIBOBJS ++LIB@&t@OBJS ++AM_BACKSLASH ++AM_DEFAULT_VERBOSITY ++HAVE_GSTMIXER_FALSE ++HAVE_GSTMIXER_TRUE ++GSTMIXER_LIBS ++GSTMIXER_CFLAGS ++HAVE_GSTPROPS_FALSE ++HAVE_GSTPROPS_TRUE ++PROGRAMS_GSTPROPS ++GNOMECC_DESKTOP_DIR ++GSTPROPS_LIBS ++GSTPROPS_CFLAGS ++OTOOL64 ++OTOOL ++LIPO ++NMEDIT ++DSYMUTIL ++RANLIB ++AR ++OBJDUMP ++NM ++ac_ct_DUMPBIN ++DUMPBIN ++LD ++FGREP ++SED ++host_os ++host_vendor ++host_cpu ++host ++build_os ++build_vendor ++build_cpu ++build ++LIBTOOL ++MKINSTALLDIRS ++POSUB ++POFILES ++PO_IN_DATADIR_FALSE ++PO_IN_DATADIR_TRUE ++INTLLIBS ++INSTOBJEXT ++GMOFILES ++CATOBJEXT ++CATALOGS ++MSGFMT_OPTS ++GETTEXT_PACKAGE ++GLIB_GENMARSHAL ++GCONF_SCHEMAS_INSTALL_FALSE ++GCONF_SCHEMAS_INSTALL_TRUE ++GCONF_SCHEMA_FILE_DIR ++GCONF_SCHEMA_CONFIG_SOURCE ++GCONFTOOL ++HAVE_GRECORD_FALSE ++HAVE_GRECORD_TRUE ++HAVE_GSTREAMER_FALSE ++HAVE_GSTREAMER_TRUE ++GSR_LIBS ++GSR_CFLAGS ++GST_MAJORMINOR ++GLADEUI_MODULE_DIR ++GLADEUI_CATALOG_DIR ++HAVE_GLADEUI_FALSE ++HAVE_GLADEUI_TRUE ++GLADEUI_LIBS ++GLADEUI_CFLAGS ++HAVE_GMP_FALSE ++HAVE_GMP_TRUE ++GMP_LIBS ++GMP_CFLAGS ++HAVE_PULSEAUDIO ++HAVE_PULSEAUDIO_FALSE ++HAVE_PULSEAUDIO_TRUE ++VOLUME_CONTROL_LIBS ++VOLUME_CONTROL_CFLAGS ++PULSEAUDIO_LIBS ++PULSEAUDIO_CFLAGS ++SOUNDTHEME_LIBS ++SOUNDTHEME_CFLAGS ++HAVE_SOUND_THEME ++HAVE_SOUND_THEME_FALSE ++HAVE_SOUND_THEME_TRUE ++SOUND_THEME_LIBS ++SOUND_THEME_CFLAGS ++PKG_CONFIG ++EGREP ++GREP ++CPP ++LN_S ++DATADIRNAME ++am__fastdepCC_FALSE ++am__fastdepCC_TRUE ++CCDEPMODE ++AMDEPBACKSLASH ++AMDEP_FALSE ++AMDEP_TRUE ++am__quote ++am__include ++DEPDIR ++OBJEXT ++EXEEXT ++ac_ct_CC ++CPPFLAGS ++LDFLAGS ++CFLAGS ++CC ++ALL_LINGUAS ++INTLTOOL_PERL ++GMSGFMT ++MSGFMT ++MSGMERGE ++XGETTEXT ++INTLTOOL_POLICY_RULE ++INTLTOOL_SERVICE_RULE ++INTLTOOL_THEME_RULE ++INTLTOOL_SCHEMAS_RULE ++INTLTOOL_CAVES_RULE ++INTLTOOL_XML_NOMERGE_RULE ++INTLTOOL_XML_RULE ++INTLTOOL_KBD_RULE ++INTLTOOL_XAM_RULE ++INTLTOOL_UI_RULE ++INTLTOOL_SOUNDLIST_RULE ++INTLTOOL_SHEET_RULE ++INTLTOOL_SERVER_RULE ++INTLTOOL_PONG_RULE ++INTLTOOL_OAF_RULE ++INTLTOOL_PROP_RULE ++INTLTOOL_KEYS_RULE ++INTLTOOL_DIRECTORY_RULE ++INTLTOOL_DESKTOP_RULE ++INTLTOOL_EXTRACT ++INTLTOOL_MERGE ++INTLTOOL_UPDATE ++USE_NLS ++MAINT ++MAINTAINER_MODE_FALSE ++MAINTAINER_MODE_TRUE ++PACKAGE_VERSION_MICRO ++PACKAGE_VERSION_MINOR ++PACKAGE_VERSION_MAJOR ++am__untar ++am__tar ++AMTAR ++am__leading_dot ++SET_MAKE ++AWK ++mkdir_p ++MKDIR_P ++INSTALL_STRIP_PROGRAM ++STRIP ++install_sh ++MAKEINFO ++AUTOHEADER ++AUTOMAKE ++AUTOCONF ++ACLOCAL ++VERSION ++PACKAGE ++CYGPATH_W ++am__isrc ++INSTALL_DATA ++INSTALL_SCRIPT ++INSTALL_PROGRAM ++target_alias ++host_alias ++build_alias ++LIBS ++ECHO_T ++ECHO_N ++ECHO_C ++DEFS ++mandir ++localedir ++libdir ++psdir ++pdfdir ++dvidir ++htmldir ++infodir ++docdir ++oldincludedir ++includedir ++localstatedir ++sharedstatedir ++sysconfdir ++datadir ++datarootdir ++libexecdir ++sbindir ++bindir ++program_transform_name ++prefix ++exec_prefix ++PACKAGE_URL ++PACKAGE_BUGREPORT ++PACKAGE_STRING ++PACKAGE_VERSION ++PACKAGE_TARNAME ++PACKAGE_NAME ++PATH_SEPARATOR ++SHELL' ++ac_subst_files='' ++ac_user_opts=' ++enable_option_checking ++enable_maintainer_mode ++enable_nls ++enable_dependency_tracking ++enable_pulseaudio ++enable_profiles ++enable_grecord ++with_gconf_source ++with_gconf_schema_file_dir ++enable_schemas_install ++enable_shared ++enable_static ++with_pic ++enable_fast_install ++with_gnu_ld ++enable_libtool_lock ++enable_gstprops ++enable_gstmix ++enable_silent_rules ++enable_more_warnings ++' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++LIBS ++CPPFLAGS ++CPP ++PKG_CONFIG ++SOUND_THEME_CFLAGS ++SOUND_THEME_LIBS ++PULSEAUDIO_CFLAGS ++PULSEAUDIO_LIBS ++VOLUME_CONTROL_CFLAGS ++VOLUME_CONTROL_LIBS ++GMP_CFLAGS ++GMP_LIBS ++GLADEUI_CFLAGS ++GLADEUI_LIBS ++GSR_CFLAGS ++GSR_LIBS ++GSTPROPS_CFLAGS ++GSTPROPS_LIBS ++GSTMIXER_CFLAGS ++GSTMIXER_LIBS' ++ ++ ++# Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false ++ac_unrecognized_opts= ++ac_unrecognized_sep= ++# 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= ;; ++ *) 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_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=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_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid feature name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"enable_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval enable_$ac_useropt=\$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_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=\$ac_optarg ;; ++ ++ -without-* | --without-*) ++ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && ++ as_fn_error $? "invalid package name: $ac_useropt" ++ ac_useropt_orig=$ac_useropt ++ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` ++ case $ac_user_opts in ++ *" ++"with_$ac_useropt" ++"*) ;; ++ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" ++ ac_unrecognized_sep=', ';; ++ esac ++ eval with_$ac_useropt=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 ;; ++ ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" ++ ;; ++ ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ case $ac_envvar in #( ++ '' | [0-9]* | *[!_$as_cr_alnum]* ) ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; ++ esac ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ ++ *) ++ # FIXME: should be removed in autoconf 3.0. ++ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ $as_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'` ++ as_fn_error $? "missing argument to $ac_option" ++fi ++ ++if test -n "$ac_unrecognized_opts"; then ++ case $enable_option_checking in ++ no) ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; ++ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; ++ esac ++fi ++ ++# Check all directory arguments for consistency. ++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 ++ # Remove trailing slashes. ++ case $ac_val in ++ */ ) ++ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` ++ eval $ac_var=\$ac_val;; ++ esac ++ # Be sure to have absolute directory names. ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" ++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 ++ $as_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 .` || ++ as_fn_error $? "working directory cannot be determined" ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ as_fn_error $? "pwd does not report name of working directory" ++ ++ ++# 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 -- "$as_myself" || ++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_myself" : 'X\(//\)[^/]' \| \ ++ X"$as_myself" : 'X\(//\)$' \| \ ++ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$as_myself" | ++ 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 .." ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" ++ 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 gnome-media 2.32.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 ++ @<:@@S|@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/gnome-media@:>@ ++ --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 ++ ++System types: ++ --build=BUILD configure for building on BUILD [guessed] ++ --host=HOST cross-compile to build programs to run on HOST [BUILD] ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ case $ac_init_help in ++ short | recursive ) echo "Configuration of gnome-media 2.32.0:";; ++ esac ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-option-checking ignore unrecognized --enable/--with options ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-maintainer-mode enable make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer ++ --disable-nls do not use Native Language Support ++ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors ++ --enable-pulseaudio Enable PulseAudio support @<:@default=auto@:>@ ++ --enable-profiles enable gnome media profiles ++ --enable-grecord enable gnome sound recorder ++ --disable-schemas-install ++ Disable the schemas installation ++ --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ ++ --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@ ++ --enable-fast-install@<:@=PKGS@:>@ ++ optimize for fast installation @<:@default=yes@:>@ ++ --disable-libtool-lock avoid locking (might break parallel builds) ++ --enable-gstprops enable gstreamer properties ++ --enable-gstmix enable gstreamer mixer ++ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0') ++ --enable-more-warnings Maximum compiler warnings ++ ++Optional Packages: ++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --with-gconf-source=sourceaddress ++ Config database for installing schema files. ++ --with-gconf-schema-file-dir=dir ++ Directory for installing schema files. ++ --with-pic try to use only PIC/non-PIC objects @<:@default=use ++ both@:>@ ++ --with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@ ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ++ nonstandard directory <lib dir> ++ LIBS libraries to pass to the linker, e.g. -l<library> ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if ++ you have headers in a nonstandard directory <include dir> ++ CPP C preprocessor ++ PKG_CONFIG path to pkg-config utility ++ SOUND_THEME_CFLAGS ++ C compiler flags for SOUND_THEME, overriding pkg-config ++ SOUND_THEME_LIBS ++ linker flags for SOUND_THEME, overriding pkg-config ++ PULSEAUDIO_CFLAGS ++ C compiler flags for PULSEAUDIO, overriding pkg-config ++ PULSEAUDIO_LIBS ++ linker flags for PULSEAUDIO, overriding pkg-config ++ VOLUME_CONTROL_CFLAGS ++ C compiler flags for VOLUME_CONTROL, overriding pkg-config ++ VOLUME_CONTROL_LIBS ++ linker flags for VOLUME_CONTROL, overriding pkg-config ++ GMP_CFLAGS C compiler flags for GMP, overriding pkg-config ++ GMP_LIBS linker flags for GMP, overriding pkg-config ++ GLADEUI_CFLAGS ++ C compiler flags for GLADEUI, overriding pkg-config ++ GLADEUI_LIBS ++ linker flags for GLADEUI, overriding pkg-config ++ GSR_CFLAGS C compiler flags for GSR, overriding pkg-config ++ GSR_LIBS linker flags for GSR, overriding pkg-config ++ GSTPROPS_CFLAGS ++ C compiler flags for GSTPROPS, overriding pkg-config ++ GSTPROPS_LIBS ++ linker flags for GSTPROPS, overriding pkg-config ++ GSTMIXER_CFLAGS ++ C compiler flags for GSTMIXER, overriding pkg-config ++ GSTMIXER_LIBS ++ linker flags for GSTMIXER, overriding pkg-config ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>. ++_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" || ++ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && 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=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_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 ++ $as_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 ++gnome-media configure 2.32.0 ++generated by GNU Autoconf 2.67 ++ ++Copyright (C) 2010 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 ++ ++## ------------------------ ## ++## Autoconf initialization. ## ++## ------------------------ ## ++ ++@%:@ ac_fn_c_try_compile LINENO ++@%:@ -------------------------- ++@%:@ Try to compile conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext ++ if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_compile ++ ++@%:@ ac_fn_c_try_link LINENO ++@%:@ ----------------------- ++@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_link ++ ++@%:@ ac_fn_c_check_func LINENO FUNC VAR ++@%:@ ---------------------------------- ++@%:@ Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case <limits.h> declares $2. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* 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_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_func ++ ++@%:@ ac_fn_c_try_cpp LINENO ++@%:@ ---------------------- ++@%:@ Try to preprocess conftest.@S|@ac_ext, and return whether this succeeded. ++ac_fn_c_try_cpp () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if { { ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } > conftest.i && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_cpp ++ ++@%:@ ac_fn_c_try_run LINENO ++@%:@ ---------------------- ++@%:@ Try to link conftest.@S|@ac_ext, and return whether this succeeded. Assumes ++@%:@ that executables *can* be run. ++ac_fn_c_try_run () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then : ++ ac_retval=0 ++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 ++ ++ ac_retval=$ac_status ++fi ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ as_fn_set_status $ac_retval ++ ++} @%:@ ac_fn_c_try_run ++ ++@%:@ ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES ++@%:@ ------------------------------------------------------- ++@%:@ Tests whether HEADER exists, giving a warning if it cannot be compiled using ++@%:@ the include files in INCLUDES and setting the cache variable VAR ++@%:@ accordingly. ++ac_fn_c_check_header_mongrel () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ if eval "test \"\${$3+set}\"" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 ++$as_echo_n "checking $2 usability... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_header_compiler=yes ++else ++ ac_header_compiler=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 ++$as_echo_n "checking $2 presence... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ac_header_preproc=yes ++else ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( ++ yes:no: ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} ++( $as_echo "## -------------------------------------------------------------------------- ## ++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media ## ++## -------------------------------------------------------------------------- ##" ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=\$ac_header_compiler" ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++fi ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_header_mongrel ++ ++@%:@ ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES ++@%:@ ------------------------------------------------------- ++@%:@ Tests whether HEADER exists and can be compiled using the include files in ++@%:@ INCLUDES, setting the cache variable VAR accordingly. ++ac_fn_c_check_header_compile () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++@%:@include <$2> ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_header_compile ++ ++@%:@ ac_fn_c_check_type LINENO TYPE VAR INCLUDES ++@%:@ ------------------------------------------- ++@%:@ Tests whether TYPE exists after having included INCLUDES, setting cache ++@%:@ variable VAR accordingly. ++ac_fn_c_check_type () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$3=no" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof ($2)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$4 ++int ++main () ++{ ++if (sizeof (($2))) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ eval "$3=yes" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} ++ ++} @%:@ ac_fn_c_check_type ++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 gnome-media $as_me 2.32.0, which was ++generated by GNU Autoconf 2.67. 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=. ++ $as_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=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; ++ 2) ++ as_fn_append 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 ++ as_fn_append ac_configure_args " '$ac_arg'" ++ ;; ++ esac ++ done ++done ++{ ac_configure_args0=; unset ac_configure_args0;} ++{ ac_configure_args1=; unset 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 ++ ++ $as_echo "## ---------------- ## ++## Cache variables. ## ++## ---------------- ##" ++ 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_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; 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 ++ ++ $as_echo "## ----------------- ## ++## Output variables. ## ++## ----------------- ##" ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ $as_echo "## ------------------- ## ++## File substitutions. ## ++## ------------------- ##" ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ $as_echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ $as_echo "## ----------- ## ++## confdefs.h. ## ++## ----------- ##" ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ $as_echo "$as_me: caught signal $ac_signal" ++ $as_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'; as_fn_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 ++ ++$as_echo "/* confdefs.h */" > 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 ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define PACKAGE_URL "$PACKAGE_URL" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer an explicitly selected file to automatically selected ones. ++ac_site_file1=NONE ++ac_site_file2=NONE ++if test -n "$CONFIG_SITE"; then ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in @%:@(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac ++elif test "x$prefix" != xNONE; then ++ ac_site_file1=$prefix/share/config.site ++ ac_site_file2=$prefix/etc/config.site ++else ++ ac_site_file1=$ac_default_prefix/share/config.site ++ ac_site_file2=$ac_default_prefix/etc/config.site ++fi ++for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++do ++ test "x$ac_site_file" = xNONE && continue ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 ++$as_echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5; } ++ 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. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 ++$as_echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac ++ fi ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 ++$as_echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++as_fn_append ac_header_list " stdlib.h" ++as_fn_append ac_header_list " unistd.h" ++as_fn_append ac_header_list " sys/param.h" ++# 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,) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 ++$as_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 ++ # differences in whitespace do not lead to failure. ++ ac_old_val_w=`echo x $ac_old_val` ++ ac_new_val_w=`echo x $ac_new_val` ++ if test "$ac_old_val_w" != "$ac_new_val_w"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 ++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ ac_cache_corrupted=: ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 ++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} ++ eval $ac_var=\$ac_old_val ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 ++$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 ++$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`$as_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. ++ *) as_fn_append ac_configure_args " '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 ++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## ++ ++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 ++ ++ ++ ++ac_aux_dir= ++for ac_dir in build-aux "$srcdir"/build-aux; 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 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 ++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. ++ ++ ++ ++am__api_version='1.11' ++ ++# 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. ++# Reject install programs that cannot install multiple files. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 ++$as_echo_n "checking for a BSD-compatible install... " >&6; } ++if test -z "$INSTALL"; then ++if test "${ac_cv_path_install+set}" = set; then : ++ $as_echo_n "(cached) " >&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 ++ rm -rf conftest.one conftest.two conftest.dir ++ echo one > conftest.one ++ echo two > conftest.two ++ mkdir conftest.dir ++ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && ++ test -s conftest.one && test -s conftest.two && ++ test -s conftest.dir/conftest.one && ++ test -s conftest.dir/conftest.two ++ then ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi ++ fi ++ done ++ done ++ ;; ++esac ++ ++ done ++IFS=$as_save_IFS ++ ++rm -rf conftest.one conftest.two conftest.dir ++ ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 ++$as_echo "$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' ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 ++$as_echo_n "checking whether build environment is sane... " >&6; } ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[\\\"\#\$\&\'\`$am_lf]*) ++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; ++esac ++case $srcdir in ++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*) ++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; ++esac ++ ++# 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". ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken ++alias in your environment" "$LINENO" 5 ++ fi ++ ++ test "$2" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ as_fn_error $? "newly created file is older than distributed files! ++Check your system clock" "$LINENO" 5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "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 $. ++# By default was `s,x,x', remove it if useless. ++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' ++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` ++ ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++ ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " ++else ++ am_missing_run= ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 ++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ++fi ++ ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++ ++# 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&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" ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 ++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } ++if test -z "$MKDIR_P"; then ++ if test "${ac_cv_path_mkdir+set}" = set; then : ++ $as_echo_n "(cached) " >&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 ++ ++ test -d ./--version && rmdir ./--version ++ 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. ++ MKDIR_P="$ac_install_sh -d" ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 ++$as_echo "$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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AWK+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 ++$as_echo "$AWK" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$AWK" && break ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ 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='gnome-media' ++ VERSION='2.32.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"} ++ ++# 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"} ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 ++$as_echo_n "checking how to create a pax tar archive... " >&6; } ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar pax cpio none' ++_am_tools=${am_cv_prog_tar_pax-$_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 ++ { echo "$as_me:$LINENO: $_am_tar --version" >&5 ++ ($_am_tar --version) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && break ++ done ++ am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=posix -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 pax -w "$$tardir"' ++ am__tar_='pax -L -x pax -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H pax -L' ++ am__tar_='find "$tardir" -print | cpio -o -H pax -L' ++ am__untar='cpio -i -H pax -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_pax}" && break ++ ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 ++ (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 ++ ($am__untar <conftest.tar) >&5 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir ++ ++if test "${am_cv_prog_tar_pax+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ am_cv_prog_tar_pax=$_am_tool ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 ++$as_echo "$am_cv_prog_tar_pax" >&6; } ++ ++ ++ ++ ++ ++ ++ ++ PACKAGE_VERSION_MAJOR=$(echo 2.32.0 | cut -d'.' -f1) ++ PACKAGE_VERSION_MINOR=$(echo 2.32.0 | cut -d'.' -f2) ++ PACKAGE_VERSION_MICRO=$(echo 2.32.0 | cut -d'.' -f3) ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 ++$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } ++ @%:@ Check whether --enable-maintainer-mode was given. ++if test "${enable_maintainer_mode+set}" = set; then : ++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval ++else ++ USE_MAINTAINER_MODE=no ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 ++$as_echo "$USE_MAINTAINER_MODE" >&6; } ++ if test $USE_MAINTAINER_MODE = yes; then ++ MAINTAINER_MODE_TRUE= ++ MAINTAINER_MODE_FALSE='#' ++else ++ MAINTAINER_MODE_TRUE='#' ++ MAINTAINER_MODE_FALSE= ++fi ++ ++ MAINT=$MAINTAINER_MODE_TRUE ++ ++ ++ ++if type -p stow > /dev/null && test -d /usr/local/stow ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE}-${VERSION} ***" >&5 ++$as_echo "$as_me: *** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE}-${VERSION} ***" >&6;} ++ ac_default_prefix="/usr/local/stow/${PACKAGE}-${VERSION}" ++fi ++ ++ac_config_headers="$ac_config_headers config.h" ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 ++$as_echo_n "checking whether NLS is requested... " >&6; } ++ @%:@ Check whether --enable-nls was given. ++if test "${enable_nls+set}" = set; then : ++ enableval=$enable_nls; USE_NLS=$enableval ++else ++ USE_NLS=yes ++fi ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 ++$as_echo "$USE_NLS" >&6; } ++ ++ ++DEPDIR="${am__leading_dot}deps" ++ ++ac_config_commands="$ac_config_commands depfiles" ++ ++ ++am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 ++$as_echo_n "checking for style of include used by $am_make... " >&6; } ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 ++$as_echo "$_am_result" >&6; } ++rm -f confinc confmf ++ ++@%:@ Check whether --enable-dependency-tracking was given. ++if test "${enable_dependency_tracking+set}" = set; then : ++ enableval=$enable_dependency_tracking; ++fi ++ ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++ if test "x$enable_dependency_tracking" != xno; then ++ AMDEP_TRUE= ++ AMDEP_FALSE='#' ++else ++ AMDEP_TRUE='#' ++ AMDEP_FALSE= ++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 ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++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 ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++ ++# The possible output files: ++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" ++ ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { { ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= ++ ++else ++ ac_file='' ++fi ++if test -z "$ac_file"; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } ++ac_exeext=$ac_cv_exeext ++ ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f conftest conftest$ac_cv_exeext ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 ++$as_echo "$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { 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:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details" "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 ++$as_echo_n "checking for suffix of object files... " >&6; } ++if test "${ac_cv_objext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { { ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then : ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5; } ++fi ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 ++$as_echo "$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++else ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++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 ++ ++depcc="$CC" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++ ++ ++ ++case "$am__api_version" in ++ 1.01234) ++ as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "0.35.0"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 ++$as_echo_n "checking for intltool >= 0.35.0... " >&6; } ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` ++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 ++$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 ++fi ++ ++# Extract the first word of "intltool-update", so it can be a program name with args. ++set dummy intltool-update; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_UPDATE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE ++if test -n "$INTLTOOL_UPDATE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 ++$as_echo "$INTLTOOL_UPDATE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "intltool-merge", so it can be a program name with args. ++set dummy intltool-merge; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_MERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE ++if test -n "$INTLTOOL_MERGE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 ++$as_echo "$INTLTOOL_MERGE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "intltool-extract", so it can be a program name with args. ++set dummy intltool-extract; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_EXTRACT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT ++if test -n "$INTLTOOL_EXTRACT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 ++$as_echo "$INTLTOOL_EXTRACT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then ++ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# Check the gettext tools to make sure they are GNU ++# Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $XGETTEXT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++XGETTEXT=$ac_cv_path_XGETTEXT ++if test -n "$XGETTEXT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgmerge", so it can be a program name with args. ++set dummy msgmerge; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGMERGE+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MSGMERGE in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGMERGE=$ac_cv_path_MSGMERGE ++if test -n "$MSGMERGE"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 ++$as_echo "$MSGMERGE" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++MSGFMT=$ac_cv_path_MSGFMT ++if test -n "$MSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++# Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GMSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT=$ac_cv_path_GMSGFMT ++if test -n "$GMSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 ++fi ++ ++# Extract the first word of "perl", so it can be a program name with args. ++set dummy perl; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $INTLTOOL_PERL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL ++if test -n "$INTLTOOL_PERL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 ++$as_echo "$INTLTOOL_PERL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++if test -z "$INTLTOOL_PERL"; then ++ as_fn_error $? "perl not found" "$LINENO" 5 ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 ++$as_echo_n "checking for perl >= 5.8.1... " >&6; } ++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 ++if test $? -ne 0; then ++ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 ++else ++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 ++$as_echo "$IT_PERL_VERSION" >&6; } ++fi ++if test "x" != "xno-xml"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 ++$as_echo_n "checking for XML::Parser... " >&6; } ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 ++$as_echo "ok" >&6; } ++ else ++ as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++ ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ DATADIRNAME=share ++else ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ DATADIRNAME=share ++else ++ DATADIRNAME=lib ++fi ++ ++ ;; ++ *) ++ DATADIRNAME=lib ++ ;; ++ esac ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++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 ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. ++set dummy gcc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ fi ++fi ++if test -z "$CC"; then ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ ac_prog_rejected=no ++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 ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++if test $ac_prog_rejected = yes; then ++ # We found a bogon in the path, so make sure we never use it. ++ set dummy $ac_cv_prog_CC ++ shift ++ if test $@%:@ != 0; then ++ # We chose a different compiler from the bogus one. ++ # However, it has the same basename, so the bogon will be chosen ++ # first if we set CC to just the basename; use the full file name. ++ shift ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" ++ fi ++fi ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 ++$as_echo "$CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 ++$as_echo "$ac_ct_CC" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++fi ++ ++fi ++ ++ ++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5; } ++ ++# Provide some information about the compiler. ++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 ++set X $ac_compile ++ac_compiler=$2 ++for ac_option in --version -v -V -qversion; do ++ { { ac_try="$ac_compiler $ac_option >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ sed '10a\ ++... rest of stderr output deleted ... ++ 10q' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ fi ++ rm -f conftest.er1 conftest.err ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 ++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_compiler_gnu=yes ++else ++ ac_compiler_gnu=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 ++$as_echo "$ac_cv_c_compiler_gnu" >&6; } ++if test $ac_compiler_gnu = yes; then ++ GCC=yes ++else ++ GCC= ++fi ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 ++$as_echo_n "checking whether $CC accepts -g... " >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++else ++ CFLAGS="" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++else ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_g=yes ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 ++$as_echo "$ac_cv_prog_cc_g" >&6; } ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS=$ac_save_CFLAGS ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-g" ++ fi ++else ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 ++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdarg.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_prog_cc_c89=$ac_arg ++fi ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 ++$as_echo "none needed" >&6; } ;; ++ xno) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 ++$as_echo "unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 ++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++if test "x$ac_cv_prog_cc_c89" != xno; then : ++ ++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 ++ ++depcc="$CC" am_compiler_list= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 ++$as_echo_n "checking dependency style of $depcc... " >&6; } ++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_CC_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` ++ fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_CC_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_CC_dependencies_compiler_type=none ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 ++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } ++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type ++ ++ if ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then ++ am__fastdepCC_TRUE= ++ am__fastdepCC_FALSE='#' ++else ++ am__fastdepCC_TRUE='#' ++ am__fastdepCC_FALSE= ++fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 ++$as_echo_n "checking for library containing strerror... " >&6; } ++if test "${ac_cv_search_strerror+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char strerror (); ++int ++main () ++{ ++return strerror (); ++ ; ++ return 0; ++} ++_ACEOF ++for ac_lib in '' cposix; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_strerror=$ac_res ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_strerror+set}" = set; then : ++ break ++fi ++done ++if test "${ac_cv_search_strerror+set}" = set; then : ++ ++else ++ ac_cv_search_strerror=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 ++$as_echo "$ac_cv_search_strerror" >&6; } ++ac_res=$ac_cv_search_strerror ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++ ++fi ++ ++ ++# Checks for programs. ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 ++$as_echo_n "checking whether ln -s works... " >&6; } ++LN_S=$as_ln_s ++if test "$LN_S" = "ln -s"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 ++$as_echo "no, using $LN_S" >&6; } ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } ++set x ${MAKE-make} ++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : ++ $as_echo_n "(cached) " >&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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ SET_MAKE= ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ SET_MAKE="MAKE=${MAKE-make}" ++fi ++ ++ ++# Checks for header files. ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 ++$as_echo_n "checking how to run the C preprocessor... " >&6; } ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++ if test "${ac_cv_prog_CPP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include <limits.h> ++@%:@else ++@%:@ include <assert.h> ++@%:@endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ break ++fi ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 ++$as_echo "$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@ifdef __STDC__ ++@%:@ include <limits.h> ++@%:@else ++@%:@ include <assert.h> ++@%:@endif ++ Syntax error ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ ++else ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++@%:@include <ac_nonexistent.h> ++_ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : ++ # Broken: success on invalid input. ++continue ++else ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.i conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.i conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then : ++ ++else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5; } ++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 ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 ++$as_echo_n "checking for grep that handles long lines and -e... " >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$GREP"; then ++ ac_path_GREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue ++# Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_GREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_GREP"; then ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 ++$as_echo "$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 ++$as_echo_n "checking for egrep... " >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ if test -z "$EGREP"; then ++ ac_path_EGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue ++# Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_EGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_EGREP"; then ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_EGREP=$EGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 ++$as_echo "$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 ++$as_echo_n "checking for ANSI C header files... " >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_stdc=yes ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then : ++ ++else ++ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then : ++ ++else ++ ac_cv_header_stdc=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 : ++ : ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <ctype.h> ++#include <stdlib.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#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)) ++ return 2; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ++else ++ ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 ++$as_echo "$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++$as_echo "@%:@define STDC_HEADERS 1" >>confdefs.h ++ ++fi ++ ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++for ac_header in fcntl.h limits.h malloc.h strings.h sys/ioctl.h unistd.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++for ac_header in sys/sockio.h sys/param.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++# Checks for typedefs, structures, and compiler characteristics. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 ++$as_echo_n "checking for an ANSI C-conforming const... " >&6; } ++if test "${ac_cv_c_const+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset cs; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *pcpcc; ++ char **ppc; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ pcpcc = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; ++ ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_const=yes ++else ++ ac_cv_c_const=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 ++$as_echo "$ac_cv_c_const" >&6; } ++if test $ac_cv_c_const = no; then ++ ++$as_echo "@%:@define const /**/" >>confdefs.h ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 ++$as_echo_n "checking for inline... " >&6; } ++if test "${ac_cv_c_inline+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_cv_c_inline=no ++for ac_kw in inline __inline__ __inline; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifndef __cplusplus ++typedef int foo_t; ++static $ac_kw foo_t static_foo () {return 0; } ++$ac_kw foo_t foo () {return 0; } ++#endif ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_c_inline=$ac_kw ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ test "$ac_cv_c_inline" != no && break ++done ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 ++$as_echo "$ac_cv_c_inline" >&6; } ++ ++case $ac_cv_c_inline in ++ inline | yes) ;; ++ *) ++ case $ac_cv_c_inline in ++ no) ac_val=;; ++ *) ac_val=$ac_cv_c_inline;; ++ esac ++ cat >>confdefs.h <<_ACEOF ++#ifndef __cplusplus ++#define inline $ac_val ++#endif ++_ACEOF ++ ;; ++esac ++ ++ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" ++if test "x$ac_cv_type_off_t" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define off_t long int ++_ACEOF ++ ++fi ++ ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = x""yes; then : ++ ++else ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define size_t unsigned int ++_ACEOF ++ ++fi ++ ++ ++# Checks for library functions. ++if test $ac_cv_c_compiler_gnu = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 ++$as_echo_n "checking whether $CC needs -traditional... " >&6; } ++if test "${ac_cv_prog_gcc_traditional+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_pattern="Autoconf.*'x'" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <sgtty.h> ++Autoconf TIOCGETP ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++else ++ ac_cv_prog_gcc_traditional=no ++fi ++rm -f conftest* ++ ++ ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <termio.h> ++Autoconf TCGETA ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++fi ++rm -f conftest* ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 ++$as_echo "$ac_cv_prog_gcc_traditional" >&6; } ++ if test $ac_cv_prog_gcc_traditional = yes; then ++ CC="$CC -traditional" ++ fi ++fi ++ ++ ++ ++ ++ for ac_header in $ac_header_list ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_func in getpagesize ++do : ++ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" ++if test "x$ac_cv_func_getpagesize" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_GETPAGESIZE 1 ++_ACEOF ++ ++fi ++done ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_mmap_fixed_mapped=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc ++ ++/* Thanks to Mike Haertel and Jim Avera for this test. ++ Here is a matrix of mmap possibilities: ++ mmap private not fixed ++ mmap private fixed at somewhere currently unmapped ++ mmap private fixed at somewhere already mapped ++ mmap shared not fixed ++ mmap shared fixed at somewhere currently unmapped ++ mmap shared fixed at somewhere already mapped ++ For private mappings, we should verify that changes cannot be read() ++ back from the file, nor mmap's back from the file at a different ++ address. (There have been systems where private was not correctly ++ implemented like the infamous i386 svr4.0, and systems where the ++ VM page cache was not coherent with the file system buffer cache ++ like early versions of FreeBSD and possibly contemporary NetBSD.) ++ For shared mappings, we should conversely verify that changes get ++ propagated back to all the places they're supposed to be. ++ ++ Grep wants private fixed already mapped. ++ The main things grep needs to know about mmap are: ++ * does it exist and is it safe to write into the mmap'd area ++ * how to use it (BSD variants) */ ++ ++#include <fcntl.h> ++#include <sys/mman.h> ++ ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H ++char *malloc (); ++#endif ++ ++/* This mess was copied from the GNU getpagesize.h. */ ++#ifndef HAVE_GETPAGESIZE ++# ifdef _SC_PAGESIZE ++# define getpagesize() sysconf(_SC_PAGESIZE) ++# else /* no _SC_PAGESIZE */ ++# ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++# ifdef EXEC_PAGESIZE ++# define getpagesize() EXEC_PAGESIZE ++# else /* no EXEC_PAGESIZE */ ++# ifdef NBPG ++# define getpagesize() NBPG * CLSIZE ++# ifndef CLSIZE ++# define CLSIZE 1 ++# endif /* no CLSIZE */ ++# else /* no NBPG */ ++# ifdef NBPC ++# define getpagesize() NBPC ++# else /* no NBPC */ ++# ifdef PAGESIZE ++# define getpagesize() PAGESIZE ++# endif /* PAGESIZE */ ++# endif /* no NBPC */ ++# endif /* no NBPG */ ++# endif /* no EXEC_PAGESIZE */ ++# else /* no HAVE_SYS_PARAM_H */ ++# define getpagesize() 8192 /* punt totally */ ++# endif /* no HAVE_SYS_PARAM_H */ ++# endif /* no _SC_PAGESIZE */ ++ ++#endif /* no HAVE_GETPAGESIZE */ ++ ++int ++main () ++{ ++ char *data, *data2, *data3; ++ const char *cdata2; ++ int i, pagesize; ++ int fd, fd2; ++ ++ pagesize = getpagesize (); ++ ++ /* First, make a file with some known garbage in it. */ ++ data = (char *) malloc (pagesize); ++ if (!data) ++ return 1; ++ for (i = 0; i < pagesize; ++i) ++ *(data + i) = rand (); ++ umask (0); ++ fd = creat ("conftest.mmap", 0600); ++ if (fd < 0) ++ return 2; ++ if (write (fd, data, pagesize) != pagesize) ++ return 3; ++ close (fd); ++ ++ /* Next, check that the tail of a page is zero-filled. File must have ++ non-zero length, otherwise we risk SIGBUS for entire page. */ ++ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); ++ if (fd2 < 0) ++ return 4; ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) ++ return 5; ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ if (data2 == MAP_FAILED) ++ return 6; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data2 + i)) ++ return 7; ++ close (fd2); ++ if (munmap (data2, pagesize)) ++ return 8; ++ ++ /* Next, try to mmap the file at a fixed address which already has ++ something else allocated at it. If we can, also make sure that ++ we see the same garbage. */ ++ fd = open ("conftest.mmap", O_RDWR); ++ if (fd < 0) ++ return 9; ++ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 10; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data2 + i)) ++ return 11; ++ ++ /* Finally, make sure that changes to the mapped area do not ++ percolate back to the file as seen by read(). (This is a bug on ++ some variants of i386 svr4.0.) */ ++ for (i = 0; i < pagesize; ++i) ++ *(data2 + i) = *(data2 + i) + 1; ++ data3 = (char *) malloc (pagesize); ++ if (!data3) ++ return 12; ++ if (read (fd, data3, pagesize) != pagesize) ++ return 13; ++ for (i = 0; i < pagesize; ++i) ++ if (*(data + i) != *(data3 + i)) ++ return 14; ++ close (fd); ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_mmap_fixed_mapped=yes ++else ++ ac_cv_func_mmap_fixed_mapped=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } ++if test $ac_cv_func_mmap_fixed_mapped = yes; then ++ ++$as_echo "@%:@define HAVE_MMAP 1" >>confdefs.h ++ ++fi ++rm -f conftest.mmap conftest.txt ++ ++ ++# CFLAGS ++GNOME_COMPILE_WARNINGS ++ ++# AS_NANO(GM_RELEASE="yes", GM_RELEASE="no") ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wall" >&5 ++$as_echo_n "checking to see if compiler understands -Wall... " >&6; } ++ ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Wall" ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ flag_ok=yes ++else ++ flag_ok=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ GM_ERROR_CFLAGS="-Wall" ++ true ++ else ++ ++ true ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 ++$as_echo "$flag_ok" >&6; } ++ ++ ++if test "x$GM_RELEASE" = "xno" ++then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Werror" >&5 ++$as_echo_n "checking to see if compiler understands -Werror... " >&6; } ++ ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ flag_ok=yes ++else ++ flag_ok=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ CFLAGS="$save_CFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ GM_ERROR_CFLAGS="$GM_ERROR_CFLAGS -Werror" ++ true ++ else ++ ++ true ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag_ok" >&5 ++$as_echo "$flag_ok" >&6; } ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: Using $GM_ERROR_CFLAGS as error checking CFLAGS" >&5 ++$as_echo "$as_me: Using $GM_ERROR_CFLAGS as error checking CFLAGS" >&6;} ++ ++GLIB_REQUIRED_VERSION=2.18.2 ++GTK_REQUIRED_VERSION=2.18.0 ++GCONF_REQUIRED_VERSION=2.6.1 ++PA_REQUIRED_VERSION=0.9.16 ++CANBERRA_REQUIRED_VERSION=0.13 ++ ++ ++ ++ ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. ++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++if test -n "$PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 ++$as_echo "$PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_path_PKG_CONFIG"; then ++ ac_pt_PKG_CONFIG=$PKG_CONFIG ++ # Extract the first word of "pkg-config", so it can be a program name with args. ++set dummy pkg-config; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $ac_pt_PKG_CONFIG in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG ++if test -n "$ac_pt_PKG_CONFIG"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 ++$as_echo "$ac_pt_PKG_CONFIG" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_pt_PKG_CONFIG" = x; then ++ PKG_CONFIG="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ PKG_CONFIG=$ac_pt_PKG_CONFIG ++ fi ++else ++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" ++fi ++ ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=0.9.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 ++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ PKG_CONFIG="" ++ fi ++ ++fi ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUND_THEME" >&5 ++$as_echo_n "checking for SOUND_THEME... " >&6; } ++ ++if test -n "$SOUND_THEME_CFLAGS"; then ++ pkg_cv_SOUND_THEME_CFLAGS="$SOUND_THEME_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_SOUND_THEME_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$SOUND_THEME_LIBS"; then ++ pkg_cv_SOUND_THEME_LIBS="$SOUND_THEME_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_SOUND_THEME_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ SOUND_THEME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>&1` ++ else ++ SOUND_THEME_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$SOUND_THEME_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_soundtheme=no ++elif test $pkg_failed = untried; then ++ have_soundtheme=no ++else ++ SOUND_THEME_CFLAGS=$pkg_cv_SOUND_THEME_CFLAGS ++ SOUND_THEME_LIBS=$pkg_cv_SOUND_THEME_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_soundtheme=yes ++fi ++ ++if test "x$have_soundtheme" = "xyes" ; then ++ ++$as_echo "@%:@define HAVE_SOUND_THEME /**/" >>confdefs.h ++ ++fi ++ if test x$have_soundtheme = xyes; then ++ HAVE_SOUND_THEME_TRUE= ++ HAVE_SOUND_THEME_FALSE='#' ++else ++ HAVE_SOUND_THEME_TRUE='#' ++ HAVE_SOUND_THEME_FALSE= ++fi ++ ++ ++ ++ ++ ++ ++GTK_REQUIRED_VERSION=2.15.1 ++ ++@%:@ Check whether --enable-pulseaudio was given. ++if test "${enable_pulseaudio+set}" = set; then : ++ enableval=$enable_pulseaudio; enable_pulseaudio=$enableval ++else ++ enable_pulseaudio=auto ++fi ++ ++ ++if test "x$enable_pulseaudio" != "xno"; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSEAUDIO" >&5 ++$as_echo_n "checking for PULSEAUDIO... " >&6; } ++ ++if test -n "$PULSEAUDIO_CFLAGS"; then ++ pkg_cv_PULSEAUDIO_CFLAGS="$PULSEAUDIO_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= \$PA_REQUIRED_VERSION libpulse-mainloop-glib >= \$PA_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_PULSEAUDIO_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$PULSEAUDIO_LIBS"; then ++ pkg_cv_PULSEAUDIO_LIBS="$PULSEAUDIO_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= \$PA_REQUIRED_VERSION libpulse-mainloop-glib >= \$PA_REQUIRED_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_PULSEAUDIO_LIBS=`$PKG_CONFIG --libs "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>&1` ++ else ++ PULSEAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$PULSEAUDIO_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_pulseaudio=no ++elif test $pkg_failed = untried; then ++ have_pulseaudio=no ++else ++ PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS ++ PULSEAUDIO_LIBS=$pkg_cv_PULSEAUDIO_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_pulseaudio=yes ++fi ++ ++ if test "x$enable_pulseaudio" = "xyes" -a "x$have_pulseaudio" = "xno"; then ++ as_fn_error $? "PulseAudio support explicitly requested but dependencies not found" "$LINENO" 5 ++ fi ++ ++ if test "x$have_pulseaudio" = "xyes" ; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_CONTROL" >&5 ++$as_echo_n "checking for VOLUME_CONTROL... " >&6; } ++ ++if test -n "$VOLUME_CONTROL_CFLAGS"; then ++ pkg_cv_VOLUME_CONTROL_CFLAGS="$VOLUME_CONTROL_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_VOLUME_CONTROL_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$VOLUME_CONTROL_LIBS"; then ++ pkg_cv_VOLUME_CONTROL_LIBS="$VOLUME_CONTROL_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= \$GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= \$CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_VOLUME_CONTROL_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ VOLUME_CONTROL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>&1` ++ else ++ VOLUME_CONTROL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$VOLUME_CONTROL_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements (gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ) were not met: ++ ++$VOLUME_CONTROL_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables VOLUME_CONTROL_CFLAGS ++and VOLUME_CONTROL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables VOLUME_CONTROL_CFLAGS ++and VOLUME_CONTROL_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ VOLUME_CONTROL_CFLAGS=$pkg_cv_VOLUME_CONTROL_CFLAGS ++ VOLUME_CONTROL_LIBS=$pkg_cv_VOLUME_CONTROL_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++ ++ ++$as_echo "@%:@define HAVE_PULSEAUDIO /**/" >>confdefs.h ++ ++ fi ++else ++ have_pulseaudio=no ++fi ++ if test x$have_pulseaudio = xyes; then ++ HAVE_PULSEAUDIO_TRUE= ++ HAVE_PULSEAUDIO_FALSE='#' ++else ++ HAVE_PULSEAUDIO_TRUE='#' ++ HAVE_PULSEAUDIO_FALSE= ++fi ++ ++ ++ ++ ++ ++ ++have_profiles=no ++ ++@%:@ Check whether --enable-profiles was given. ++if test "${enable_profiles+set}" = set; then : ++ enableval=$enable_profiles; ++else ++ enable_profiles=yes ++fi ++ ++ ++if test "x$enable_profiles" = "xyes"; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP" >&5 ++$as_echo_n "checking for GMP... " >&6; } ++ ++if test -n "$GMP_CFLAGS"; then ++ pkg_cv_GMP_CFLAGS="$GMP_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GMP_CFLAGS=`$PKG_CONFIG --cflags " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GMP_LIBS"; then ++ pkg_cv_GMP_LIBS="$GMP_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GMP_LIBS=`$PKG_CONFIG --libs " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>&1` ++ else ++ GMP_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GMP_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0) were not met: ++ ++$GMP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GMP_CFLAGS ++and GMP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GMP_CFLAGS ++and GMP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GMP_CFLAGS=$pkg_cv_GMP_CFLAGS ++ GMP_LIBS=$pkg_cv_GMP_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_profiles=yes ++fi ++fi ++ ++ ++ if test x$have_profiles = xyes; then ++ HAVE_GMP_TRUE= ++ HAVE_GMP_FALSE='#' ++else ++ HAVE_GMP_TRUE='#' ++ HAVE_GMP_FALSE= ++fi ++ ++ ++have_gladeui=no ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLADEUI" >&5 ++$as_echo_n "checking for GLADEUI... " >&6; } ++ ++if test -n "$GLADEUI_CFLAGS"; then ++ pkg_cv_GLADEUI_CFLAGS="$GLADEUI_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GLADEUI_CFLAGS=`$PKG_CONFIG --cflags "gladeui-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GLADEUI_LIBS"; then ++ pkg_cv_GLADEUI_LIBS="$GLADEUI_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gladeui-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "gladeui-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GLADEUI_LIBS=`$PKG_CONFIG --libs "gladeui-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GLADEUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gladeui-1.0" 2>&1` ++ else ++ GLADEUI_PKG_ERRORS=`$PKG_CONFIG --print-errors "gladeui-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GLADEUI_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_gladeui=no ++elif test $pkg_failed = untried; then ++ have_gladeui=no ++else ++ GLADEUI_CFLAGS=$pkg_cv_GLADEUI_CFLAGS ++ GLADEUI_LIBS=$pkg_cv_GLADEUI_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gladeui=yes ++fi ++ ++ ++ if test x$have_gladeui = xyes; then ++ HAVE_GLADEUI_TRUE= ++ HAVE_GLADEUI_FALSE='#' ++else ++ HAVE_GLADEUI_TRUE='#' ++ HAVE_GLADEUI_FALSE= ++fi ++ ++ ++GLADEUI_CATALOG_DIR="`$PKG_CONFIG --variable=catalogdir gladeui-1.0`" ++ ++ ++GLADEUI_MODULE_DIR="`$PKG_CONFIG --variable=moduledir gladeui-1.0`" ++ ++ ++ ++GST_REQ=0.10.23 ++GST_PLUGINS_BASE_REQ=0.10.23 ++GST_MAJORMINOR=0.10 ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GST_MAJORMINOR_QUOTED "$GST_MAJORMINOR" ++_ACEOF ++ ++ ++have_gst=no ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSR" >&5 ++$as_echo_n "checking for GSR... " >&6; } ++ ++if test -n "$GSR_CFLAGS"; then ++ pkg_cv_GSR_CFLAGS="$GSR_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gstreamer-\$GST_MAJORMINOR >= \$GST_REQ ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSR_CFLAGS=`$PKG_CONFIG --cflags " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSR_LIBS"; then ++ pkg_cv_GSR_LIBS="$GSR_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gstreamer-\$GST_MAJORMINOR >= \$GST_REQ ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSR_LIBS=`$PKG_CONFIG --libs " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>&1` ++ else ++ GSR_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSR_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GSR_PKG_ERRORS" >&5 ++$as_echo "$as_me: WARNING: $GSR_PKG_ERRORS" >&2;} ++ PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" ++ ++elif test $pkg_failed = untried; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $GSR_PKG_ERRORS" >&5 ++$as_echo "$as_me: WARNING: $GSR_PKG_ERRORS" >&2;} ++ PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" ++ ++else ++ GSR_CFLAGS=$pkg_cv_GSR_CFLAGS ++ GSR_LIBS=$pkg_cv_GSR_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gst=yes ++fi ++ ++have_grecord=no ++grecord_reason="" ++ ++@%:@ Check whether --enable-grecord was given. ++if test "${enable_grecord+set}" = set; then : ++ enableval=$enable_grecord; ++else ++ enable_grecord=yes ++fi ++ ++ ++if test "x$have_profiles" = "xno" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Grecord will be disabled because of disabled profiles" >&5 ++$as_echo "$as_me: WARNING: Grecord will be disabled because of disabled profiles" >&2;} ++ enable_grecord=no ++ have_grecord=no ++ grecord_reason=", gnome media profiles is disabled" ++fi ++ ++if test "x$have_gst" = "xyes" && test "x$enable_grecord" = "xyes"; then ++ have_grecord=yes ++else ++ if test "x$have_gst" = "xno"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need GStreamer installed for the mixer and recorder to work" >&5 ++$as_echo "$as_me: WARNING: You need GStreamer installed for the mixer and recorder to work" >&2;} ++ sleep 5 2>/dev/null ++ fi ++fi ++ ++ ++ ++ if test x$have_gst = xyes; then ++ HAVE_GSTREAMER_TRUE= ++ HAVE_GSTREAMER_FALSE='#' ++else ++ HAVE_GSTREAMER_TRUE='#' ++ HAVE_GSTREAMER_FALSE= ++fi ++ ++ if test x$have_grecord = xyes; then ++ HAVE_GRECORD_TRUE= ++ HAVE_GRECORD_FALSE='#' ++else ++ HAVE_GRECORD_TRUE='#' ++ HAVE_GRECORD_FALSE= ++fi ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GSR_UIDIR_UNINSTALLED "`pwd`/grecord/src" ++_ACEOF ++ ++ ++# Extract the first word of "gconftool-2", so it can be a program name with args. ++set dummy gconftool-2; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GCONFTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GCONFTOOL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GCONFTOOL=$ac_cv_path_GCONFTOOL ++if test -n "$GCONFTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 ++$as_echo "$GCONFTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ ++@%:@ Check whether --with-gconf-source was given. ++if test "${with_gconf_source+set}" = set; then : ++ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 ++$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ ++@%:@ Check whether --with-gconf-schema-file-dir was given. ++if test "${with_gconf_schema_file_dir+set}" = set; then : ++ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" ++fi ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 ++$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } ++ ++ @%:@ Check whether --enable-schemas-install was given. ++if test "${enable_schemas_install+set}" = set; then : ++ enableval=$enable_schemas_install; case ${enableval} in ++ yes|no) ;; ++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; ++ esac ++fi ++ ++ if test "$enable_schemas_install" != no; then ++ GCONF_SCHEMAS_INSTALL_TRUE= ++ GCONF_SCHEMAS_INSTALL_FALSE='#' ++else ++ GCONF_SCHEMAS_INSTALL_TRUE='#' ++ GCONF_SCHEMAS_INSTALL_FALSE= ++fi ++ ++ ++ ++# Extract the first word of "glib-genmarshal", so it can be a program name with args. ++set dummy glib-genmarshal; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GLIB_GENMARSHAL in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++fi ++GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL ++if test -n "$GLIB_GENMARSHAL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 ++$as_echo "$GLIB_GENMARSHAL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++GETTEXT_PACKAGE=gnome-media-2.0 ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" ++_ACEOF ++ ++ ++ for ac_header in locale.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" ++if test "x$ac_cv_header_locale_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_LOCALE_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ if test $ac_cv_header_locale_h = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 ++$as_echo_n "checking for LC_MESSAGES... " >&6; } ++if test "${am_cv_val_LC_MESSAGES+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <locale.h> ++int ++main () ++{ ++return LC_MESSAGES ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ am_cv_val_LC_MESSAGES=yes ++else ++ am_cv_val_LC_MESSAGES=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 ++$as_echo "$am_cv_val_LC_MESSAGES" >&6; } ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ ++$as_echo "@%:@define HAVE_LC_MESSAGES 1" >>confdefs.h ++ ++ fi ++ fi ++ USE_NLS=yes ++ ++ ++ gt_cv_have_gettext=no ++ ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" ++if test "x$ac_cv_header_libintl_h" = x""yes; then : ++ gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" ++ ++ # ++ # First check in libc ++ # ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 ++$as_echo_n "checking for ngettext in libc... " >&6; } ++if test "${gt_cv_func_ngettext_libc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <libintl.h> ++ ++int ++main () ++{ ++return !ngettext ("","", 1) ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_ngettext_libc=yes ++else ++ gt_cv_func_ngettext_libc=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 ++$as_echo "$gt_cv_func_ngettext_libc" >&6; } ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 ++$as_echo_n "checking for dgettext in libc... " >&6; } ++if test "${gt_cv_func_dgettext_libc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include <libintl.h> ++ ++int ++main () ++{ ++return !dgettext ("","") ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ gt_cv_func_dgettext_libc=yes ++else ++ gt_cv_func_dgettext_libc=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 ++$as_echo "$gt_cv_func_dgettext_libc" >&6; } ++ fi ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_BIND_TEXTDOMAIN_CODESET 1 ++_ACEOF ++ ++fi ++done ++ ++ fi ++ ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 ++$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char bindtextdomain (); ++int ++main () ++{ ++return bindtextdomain (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_bindtextdomain=yes ++else ++ ac_cv_lib_intl_bindtextdomain=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 ++$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } ++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_ngettext=yes ++else ++ ac_cv_lib_intl_ngettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 ++$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 ++$as_echo_n "checking for dgettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dgettext (); ++int ++main () ++{ ++return dgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dgettext=yes ++else ++ ac_cv_lib_intl_dgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dgettext" >&6; } ++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++fi ++ ++fi ++ ++fi ++ ++ ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 ++$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 ++$as_echo "" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 ++$as_echo_n "checking for ngettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_ngettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char ngettext (); ++int ++main () ++{ ++return ngettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_ngettext=yes ++else ++ ac_cv_lib_intl_ngettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 ++$as_echo "$ac_cv_lib_intl_ngettext" >&6; } ++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 ++$as_echo_n "checking for dcgettext in -lintl... " >&6; } ++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lintl -liconv $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dcgettext (); ++int ++main () ++{ ++return dcgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_intl_dcgettext=yes ++else ++ ac_cv_lib_intl_dcgettext=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 ++$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } ++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : ++ gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv ++else ++ : ++fi ++ ++else ++ : ++fi ++ ++ fi ++ ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ for ac_func in bind_textdomain_codeset ++do : ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_BIND_TEXTDOMAIN_CODESET 1 ++_ACEOF ++ ++fi ++done ++ ++ LIBS="$glib_save_LIBS" ++ ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi ++ ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ ++$as_echo "@%:@define HAVE_GETTEXT 1" >>confdefs.h ++ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++set dummy msgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_MSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case "$MSGFMT" in ++ /*) ++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then ++ ac_cv_path_MSGFMT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" ++ ;; ++esac ++fi ++MSGFMT="$ac_cv_path_MSGFMT" ++if test "$MSGFMT" != "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 ++$as_echo "$MSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ for ac_func in dcgettext ++do : ++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" ++if test "x$ac_cv_func_dcgettext" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_DCGETTEXT 1 ++_ACEOF ++ ++fi ++done ++ ++ MSGFMT_OPTS= ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 ++$as_echo_n "checking if msgfmt accepts -c... " >&6; } ++ cat >conftest.foo <<_ACEOF ++ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test <foo@bar.xx>\n" ++"Language-Team: C <LL@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++_ACEOF ++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++echo "$as_me: failed input was:" >&5 ++sed 's/^/| /' conftest.foo >&5 ++fi ++ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++set dummy gmsgfmt; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_GMSGFMT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GMSGFMT in ++ [\\/]* | ?:[\\/]*) ++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ++ ;; ++ *) ++ 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ++ ;; ++esac ++fi ++GMSGFMT=$ac_cv_path_GMSGFMT ++if test -n "$GMSGFMT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 ++$as_echo "$GMSGFMT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++set dummy xgettext; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_path_XGETTEXT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case "$XGETTEXT" in ++ /*) ++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then ++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" ++ ;; ++esac ++fi ++XGETTEXT="$ac_cv_path_XGETTEXT" ++if test "$XGETTEXT" != ":"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 ++$as_echo "$XGETTEXT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++else ++ case $host in ++ *-*-solaris*) ++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" ++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++else ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++fi ++ ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ++fi ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ ++$as_echo "@%:@define ENABLE_NLS 1" >>confdefs.h ++ ++ fi ++ ++ if test "$XGETTEXT" != ":"; then ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } ++ XGETTEXT=":" ++ fi ++ fi ++ ++ # We need to process the po/ directory. ++ POSUB=po ++ ++ ac_config_commands="$ac_config_commands default-1" ++ ++ ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 ++$as_echo_n "checking for catalogs to be installed... " >&6; } ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 ++$as_echo "$LINGUAS" >&6; } ++ fi ++ ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi ++ ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ ++ ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ++ ++case `pwd` in ++ *\ * | *\ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 ++$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; ++esac ++ ++ ++ ++macro_version='2.2.10' ++macro_revision='1.3175' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++# Make sure we can run config.sub. ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 ++$as_echo_n "checking build system type... " >&6; } ++if test "${ac_cv_build+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 ++$as_echo "$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; ++esac ++build=$ac_cv_build ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 ++$as_echo_n "checking host system type... " >&6; } ++if test "${ac_cv_host+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 ++$as_echo "$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; ++esac ++host=$ac_cv_host ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ++ ++ ++# Backslashify metacharacters that are still active within ++# double-quoted strings. ++sed_quote_subst='s/\(["`$\\]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\(["`\\]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 ++$as_echo_n "checking how to print strings... " >&6; } ++# Test print first, because it will be a builtin if present. ++if test "X`print -r -- -n 2>/dev/null`" = X-n && \ ++ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='print -r --' ++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then ++ ECHO='printf %s\n' ++else ++ # Use this function as a fallback that always works. ++ func_fallback_echo () ++ { ++ eval 'cat <<_LTECHO_EOF ++$1 ++_LTECHO_EOF' ++ } ++ ECHO='func_fallback_echo' ++fi ++ ++# func_echo_all arg... ++# Invoke $ECHO with all args, space-separated. ++func_echo_all () ++{ ++ $ECHO "" ++} ++ ++case "$ECHO" in ++ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 ++$as_echo "printf" >&6; } ;; ++ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 ++$as_echo "print -r" >&6; } ;; ++ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 ++$as_echo "cat" >&6; } ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 ++$as_echo_n "checking for a sed that does not truncate output... " >&6; } ++if test "${ac_cv_path_SED+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ ++ for ac_i in 1 2 3 4 5 6 7; do ++ ac_script="$ac_script$as_nl$ac_script" ++ done ++ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed ++ { ac_script=; unset ac_script;} ++ if test -z "$SED"; then ++ ac_path_SED_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ 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_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue ++# Check for GNU ac_path_SED and select it if it is found. ++ # Check for GNU $ac_path_SED ++case `"$ac_path_SED" --version 2>&1` in ++*GNU*) ++ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo '' >> "conftest.nl" ++ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_SED_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_SED="$ac_path_SED" ++ ac_path_SED_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_SED_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_SED"; then ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_SED=$SED ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 ++$as_echo "$ac_cv_path_SED" >&6; } ++ SED="$ac_cv_path_SED" ++ rm -f conftest.sed ++ ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 ++$as_echo_n "checking for fgrep... " >&6; } ++if test "${ac_cv_path_FGREP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 ++ then ac_cv_path_FGREP="$GREP -F" ++ else ++ if test -z "$FGREP"; then ++ ac_path_FGREP_found=false ++ # Loop through the user's path and test for each of PROGNAME-LIST ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in fgrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue ++# Check for GNU ac_path_FGREP and select it if it is found. ++ # Check for GNU $ac_path_FGREP ++case `"$ac_path_FGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; ++*) ++ ac_count=0 ++ $as_echo_n 0123456789 >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ $as_echo 'FGREP' >> "conftest.nl" ++ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ as_fn_arith $ac_count + 1 && ac_count=$as_val ++ if test $ac_count -gt ${ac_path_FGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_FGREP="$ac_path_FGREP" ++ ac_path_FGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ $ac_path_FGREP_found && break 3 ++ done ++ done ++ done ++IFS=$as_save_IFS ++ if test -z "$ac_cv_path_FGREP"; then ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ fi ++else ++ ac_cv_path_FGREP=$FGREP ++fi ++ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 ++$as_echo "$ac_cv_path_FGREP" >&6; } ++ FGREP="$ac_cv_path_FGREP" ++ ++ ++test -z "$GREP" && GREP=grep ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --with-gnu-ld was given. ++if test "${with_gnu_ld+set}" = set; then : ++ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes ++else ++ with_gnu_ld=no ++fi ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 ++$as_echo_n "checking for ld used by $CC... " >&6; } ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [\\/]* | ?:[\\/]*) ++ re_direlt='/[^/][^/]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 ++$as_echo_n "checking for GNU ld... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 ++$as_echo_n "checking for non-GNU ld... " >&6; } ++fi ++if test "${lt_cv_path_LD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ++ ;; ++ *) ++ test "$with_gnu_ld" != yes && break ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi ++fi ++ ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 ++$as_echo "$LD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 ++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++if test "${lt_cv_prog_gnu_ld+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ # I'd rather use --version here, but apparently some GNU lds only accept -v. ++case `$LD -v 2>&1 </dev/null` in ++*GNU* | *'with BFD'*) ++ lt_cv_prog_gnu_ld=yes ++ ;; ++*) ++ lt_cv_prog_gnu_ld=no ++ ;; ++esac ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 ++$as_echo "$lt_cv_prog_gnu_ld" >&6; } ++with_gnu_ld=$lt_cv_prog_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 ++$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } ++if test "${lt_cv_path_NM+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 ++$as_echo "$lt_cv_path_NM" >&6; } ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ if test -n "$DUMPBIN"; then : ++ # Let the user override the test. ++ else ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in dumpbin "link -dump" ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DUMPBIN"; then ++ ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DUMPBIN=$ac_cv_prog_DUMPBIN ++if test -n "$DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 ++$as_echo "$DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$DUMPBIN" && break ++ done ++fi ++if test -z "$DUMPBIN"; then ++ ac_ct_DUMPBIN=$DUMPBIN ++ for ac_prog in dumpbin "link -dump" ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DUMPBIN"; then ++ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$ac_prog" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN ++if test -n "$ac_ct_DUMPBIN"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 ++$as_echo "$ac_ct_DUMPBIN" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_DUMPBIN" && break ++done ++ ++ if test "x$ac_ct_DUMPBIN" = x; then ++ DUMPBIN=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DUMPBIN=$ac_ct_DUMPBIN ++ fi ++fi ++ ++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ *COFF*) ++ DUMPBIN="$DUMPBIN -symbols" ++ ;; ++ *) ++ DUMPBIN=: ++ ;; ++ esac ++ fi ++ ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 ++$as_echo_n "checking the name lister ($NM) interface... " >&6; } ++if test "${lt_cv_nm_interface+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&5 ++ (eval echo "\"\$as_me:$LINENO: output\"" >&5) ++ cat conftest.out >&5 ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 ++$as_echo "$lt_cv_nm_interface" >&6; } ++ ++# find the maximum length of command line arguments ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 ++$as_echo_n "checking the maximum length of command line arguments... " >&6; } ++if test "${lt_cv_sys_max_cmd_len+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ ++ = "X$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++ ++fi ++ ++if test -n $lt_cv_sys_max_cmd_len ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 ++$as_echo "$lt_cv_sys_max_cmd_len" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 ++$as_echo "none" >&6; } ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++ ++ ++ ++ ++ ++ ++: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 ++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 ++$as_echo "$xsi_shell" >&6; } ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 ++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 ++$as_echo "$lt_shell_append" >&6; } ++ ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++ ++ ++ ++ ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 ++$as_echo_n "checking for $LD option to reload object files... " >&6; } ++if test "${lt_cv_ld_reload_flag+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_reload_flag='-r' ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 ++$as_echo "$lt_cv_ld_reload_flag" >&6; } ++reload_flag=$lt_cv_ld_reload_flag ++case $reload_flag in ++"" | " "*) ;; ++*) reload_flag=" $reload_flag" ;; ++esac ++reload_cmds='$LD$reload_flag -o $output$reload_objs' ++case $host_os in ++ darwin*) ++ if test "$GCC" = yes; then ++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' ++ else ++ reload_cmds='$LD$reload_flag -o $output$reload_objs' ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. ++set dummy ${ac_tool_prefix}objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OBJDUMP"; then ++ ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OBJDUMP=$ac_cv_prog_OBJDUMP ++if test -n "$OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 ++$as_echo "$OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OBJDUMP"; then ++ ac_ct_OBJDUMP=$OBJDUMP ++ # Extract the first word of "objdump", so it can be a program name with args. ++set dummy objdump; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OBJDUMP"; then ++ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP ++if test -n "$ac_ct_OBJDUMP"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 ++$as_echo "$ac_ct_OBJDUMP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OBJDUMP" = x; then ++ OBJDUMP="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OBJDUMP=$ac_ct_OBJDUMP ++ fi ++else ++ OBJDUMP="$ac_cv_prog_OBJDUMP" ++fi ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++ ++ ++ ++ ++ ++ ++ ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 ++$as_echo_n "checking how to recognize dependent libraries... " >&6; } ++if test "${lt_cv_deplibs_check_method+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_file_magic_cmd='$MAGIC_CMD' ++lt_cv_file_magic_test_file= ++lt_cv_deplibs_check_method='unknown' ++# Need to set the preceding variable on all platforms that support ++# interlibrary dependencies. ++# 'none' -- dependencies not supported. ++# `unknown' -- same as none, but documents that we really don't know. ++# 'pass_all' -- all dependencies passed with no checks. ++# 'test_compile' -- check by making test program. ++# 'file_magic [[regex]]' -- check by looking for files in library path ++# which responds to the $file_magic_cmd with a given extended regex. ++# If you have `file' or equivalent on your system and you're not sure ++# whether `pass_all' will *always* work, you probably want this one. ++ ++case $host_os in ++aix[4-9]*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++beos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++bsdi[45]*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' ++ lt_cv_file_magic_cmd='/usr/bin/file -L' ++ lt_cv_file_magic_test_file=/shlib/libc.so ++ ;; ++ ++cygwin*) ++ # func_win32_libid is a shell function defined in ltmain.sh ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ ;; ++ ++mingw* | pw32*) ++ # Base MSYS/MinGW do not provide the 'file' command needed by ++ # func_win32_libid shell function, so use a weaker test based on 'objdump', ++ # unless we find 'file', for example because we are cross-compiling. ++ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. ++ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ # Keep this pattern in sync with the one in func_win32_libid. ++ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; ++ ++cegcc*) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++haiku*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; ++ ++interix[3-9]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' ++ fi ++ ;; ++ ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' ++ fi ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++tpf*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 ++$as_echo "$lt_cv_deplibs_check_method" >&6; } ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="false" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++else ++ AR="$ac_cv_prog_AR" ++fi ++ ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : ++ $as_echo_n "(cached) " >&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" ++ $as_echo "$as_me:${as_lineno-$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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++test -z "$STRIP" && STRIP=: ++ ++ ++ ++ ++ ++ ++if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$RANLIB"; then ++ ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++RANLIB=$ac_cv_prog_RANLIB ++if test -n "$RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 ++$as_echo "$RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 ++$as_echo "$ac_ct_RANLIB" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++else ++ RANLIB="$ac_cv_prog_RANLIB" ++fi ++ ++test -z "$RANLIB" && RANLIB=: ++ ++ ++ ++ ++ ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++ ++case $host_os in ++ darwin*) ++ lock_old_archive_extraction=yes ;; ++ *) ++ lock_old_archive_extraction=no ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++ ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 ++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } ++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[BCDEGRST]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([_A-Za-z][_A-Za-z0-9]*\)' ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[BCDT]' ++ ;; ++cygwin* | mingw* | pw32* | cegcc*) ++ symcode='[ABCDGISTW]' ++ ;; ++hpux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[ABCDEGRST]' ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[BCDEGRST]' ++ ;; ++osf*) ++ symcode='[BCDEGQRST]' ++ ;; ++solaris*) ++ symcode='[BDRT]' ++ ;; ++sco3.2v5*) ++ symcode='[DT]' ++ ;; ++sysv4.2uw2*) ++ symcode='[DT]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[ABDT]' ++ ;; ++sysv4) ++ symcode='[DFNSTU]' ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[ABCDGIRSTW]' ;; ++esac ++ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# Try without a prefix underscore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK '"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext <<_LT_EOF ++#ifdef __cplusplus ++extern "C" { ++#endif ++char nm_test_var; ++void nm_test_func(void); ++void nm_test_func(void){} ++#ifdef __cplusplus ++} ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++_LT_EOF ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 ++ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++_LT_EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ void *address; ++} ++lt__PROGRAM__LTX_preloaded_symbols[] = ++{ ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++_LT_EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&5 ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&5 ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 ++ fi ++ else ++ echo "$progname: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++ ++fi ++ ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 ++$as_echo "failed" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 ++$as_echo "ok" >&6; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --enable-libtool-lock was given. ++if test "${enable_libtool_lock+set}" = set; then : ++ enableval=$enable_libtool_lock; ++fi ++ ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '#line '$LINENO' "configure"' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 ++$as_echo_n "checking whether the C compiler needs -belf... " >&6; } ++if test "${lt_cv_cc_needs_belf+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ 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 ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ lt_cv_cc_needs_belf=yes ++else ++ lt_cv_cc_needs_belf=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ 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 ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 ++$as_echo "$lt_cv_cc_needs_belf" >&6; } ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++ ++ ++ case $host_os in ++ rhapsody* | darwin*) ++ if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$DSYMUTIL"; then ++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++DSYMUTIL=$ac_cv_prog_DSYMUTIL ++if test -n "$DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 ++$as_echo "$DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_DSYMUTIL"; then ++ ac_ct_DSYMUTIL=$DSYMUTIL ++ # Extract the first word of "dsymutil", so it can be a program name with args. ++set dummy dsymutil; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_DSYMUTIL"; then ++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL ++if test -n "$ac_ct_DSYMUTIL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 ++$as_echo "$ac_ct_DSYMUTIL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_DSYMUTIL" = x; then ++ DSYMUTIL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ DSYMUTIL=$ac_ct_DSYMUTIL ++ fi ++else ++ DSYMUTIL="$ac_cv_prog_DSYMUTIL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # 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 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$NMEDIT"; then ++ ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++NMEDIT=$ac_cv_prog_NMEDIT ++if test -n "$NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 ++$as_echo "$NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_NMEDIT"; then ++ ac_ct_NMEDIT=$NMEDIT ++ # Extract the first word of "nmedit", so it can be a program name with args. ++set dummy nmedit; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_NMEDIT"; then ++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT ++if test -n "$ac_ct_NMEDIT"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 ++$as_echo "$ac_ct_NMEDIT" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_NMEDIT" = x; then ++ NMEDIT=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ NMEDIT=$ac_ct_NMEDIT ++ fi ++else ++ NMEDIT="$ac_cv_prog_NMEDIT" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. ++set dummy ${ac_tool_prefix}lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$LIPO"; then ++ ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ac_tool_prefix}lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++LIPO=$ac_cv_prog_LIPO ++if test -n "$LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 ++$as_echo "$LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_LIPO"; then ++ ac_ct_LIPO=$LIPO ++ # Extract the first word of "lipo", so it can be a program name with args. ++set dummy lipo; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_LIPO"; then ++ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_LIPO="lipo" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO ++if test -n "$ac_ct_LIPO"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 ++$as_echo "$ac_ct_LIPO" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_LIPO" = x; then ++ LIPO=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ LIPO=$ac_ct_LIPO ++ fi ++else ++ LIPO="$ac_cv_prog_LIPO" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL"; then ++ ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL=$ac_cv_prog_OTOOL ++if test -n "$OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 ++$as_echo "$OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL"; then ++ ac_ct_OTOOL=$OTOOL ++ # Extract the first word of "otool", so it can be a program name with args. ++set dummy otool; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL"; then ++ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL ++if test -n "$ac_ct_OTOOL"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 ++$as_echo "$ac_ct_OTOOL" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL" = x; then ++ OTOOL=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL=$ac_ct_OTOOL ++ fi ++else ++ OTOOL="$ac_cv_prog_OTOOL" ++fi ++ ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. ++set dummy ${ac_tool_prefix}otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$OTOOL64"; then ++ ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++OTOOL64=$ac_cv_prog_OTOOL64 ++if test -n "$OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 ++$as_echo "$OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_OTOOL64"; then ++ ac_ct_OTOOL64=$OTOOL64 ++ # Extract the first word of "otool64", so it can be a program name with args. ++set dummy otool64; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_OTOOL64"; then ++ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 ++if test -n "$ac_ct_OTOOL64"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 ++$as_echo "$ac_ct_OTOOL64" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_OTOOL64" = x; then ++ OTOOL64=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ OTOOL64=$ac_ct_OTOOL64 ++ fi ++else ++ OTOOL64="$ac_cv_prog_OTOOL64" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 ++$as_echo_n "checking for -single_module linker flag... " >&6; } ++if test "${lt_cv_apple_cc_single_mod+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&5 ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 ++$as_echo "$lt_cv_apple_cc_single_mod" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 ++$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } ++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ lt_cv_ld_exported_symbols_list=yes ++else ++ lt_cv_ld_exported_symbols_list=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 ++$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 ++$as_echo_n "checking for -force_load linker flag... " >&6; } ++if test "${lt_cv_ld_force_load+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_ld_force_load=no ++ cat > conftest.c << _LT_EOF ++int forced_loaded() { return 2;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 ++ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 ++ echo "$AR cru libconftest.a conftest.o" >&5 ++ $AR cru libconftest.a conftest.o 2>&5 ++ echo "$RANLIB libconftest.a" >&5 ++ $RANLIB libconftest.a 2>&5 ++ cat > conftest.c << _LT_EOF ++int main() { return 0;} ++_LT_EOF ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 ++ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err ++ _lt_result=$? ++ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then ++ lt_cv_ld_force_load=yes ++ else ++ cat conftest.err >&5 ++ fi ++ rm -f conftest.err libconftest.a conftest conftest.c ++ rm -rf conftest.dSYM ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 ++$as_echo "$lt_cv_ld_force_load" >&6; } ++ case $host_os in ++ rhapsody* | darwin1.[012]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[012]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++ ++for ac_header in dlfcn.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default ++" ++if test "x$ac_cv_header_dlfcn_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++@%:@define HAVE_DLFCN_H 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++# Set options ++ ++ ++ ++ enable_dlopen=no ++ ++ ++ enable_win32_dll=no ++ ++ ++ @%:@ Check whether --enable-shared was given. ++if test "${enable_shared+set}" = set; then : ++ enableval=$enable_shared; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_shared=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ @%:@ Check whether --enable-static was given. ++if test "${enable_static+set}" = set; then : ++ enableval=$enable_static; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_static=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@%:@ Check whether --with-pic was given. ++if test "${with_pic+set}" = set; then : ++ withval=$with_pic; pic_mode="$withval" ++else ++ pic_mode=default ++fi ++ ++ ++test -z "$pic_mode" && pic_mode=default ++ ++ ++ ++ ++ ++ ++ ++ @%:@ Check whether --enable-fast-install was given. ++if test "${enable_fast_install+set}" = set; then : ++ enableval=$enable_fast_install; p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac ++else ++ enable_fast_install=yes ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++test -z "$LN_S" && LN_S="ln -s" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 ++$as_echo_n "checking for objdir... " >&6; } ++if test "${lt_cv_objdir+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 ++$as_echo "$lt_cv_objdir" >&6; } ++objdir=$lt_cv_objdir ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define LT_OBJDIR "$lt_cv_objdir/" ++_ACEOF ++ ++ ++ ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++for cc_temp in $compiler""; do ++ case $cc_temp in ++ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; ++ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` ++ ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 ++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/${ac_tool_prefix}file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++ ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 ++$as_echo_n "checking for file... " >&6; } ++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $MAGIC_CMD in ++[\\/*] | ?:[\\/]*) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/file; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/file" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac ++fi ++ ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 ++$as_echo "$MAGIC_CMD" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ else ++ MAGIC_CMD=: ++ fi ++fi ++ ++ fi ++ ;; ++esac ++ ++# Use C for the default configuration in the libtool script ++ ++lt_save_CC="$CC" ++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 ++ ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++objext=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' ++ ++ ++ ++ ++ ++ ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++ ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++ ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++ ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ ++lt_prog_compiler_no_builtin_flag= ++ ++if test "$GCC" = yes; then ++ case $cc_basename in ++ nvcc*) ++ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; ++ *) ++ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; ++ esac ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } ++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_rtti_exceptions=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="-fno-rtti -fno-exceptions" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_rtti_exceptions=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 ++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } ++ ++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then ++ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" ++else ++ : ++fi ++ ++fi ++ ++ ++ ++ ++ ++ ++ lt_prog_compiler_wl= ++lt_prog_compiler_pic= ++lt_prog_compiler_static= ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 ++$as_echo_n "checking for $compiler option to produce PIC... " >&6; } ++ ++ if test "$GCC" = yes; then ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_static='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ lt_prog_compiler_pic='-fno-common' ++ ;; ++ ++ haiku*) ++ # PIC is the default for Haiku. ++ # The "-static" flag exists, but is broken. ++ lt_prog_compiler_static= ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[3-9]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ lt_prog_compiler_can_build_shared=no ++ enable_shared=no ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ lt_prog_compiler_pic=-Kconform_pic ++ fi ++ ;; ++ ++ *) ++ lt_prog_compiler_pic='-fPIC' ++ ;; ++ esac ++ ++ case $cc_basename in ++ nvcc*) # Cuda Compiler Driver 2.2 ++ lt_prog_compiler_wl='-Xlinker ' ++ lt_prog_compiler_pic='-Xcompiler -fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ lt_prog_compiler_wl='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ lt_prog_compiler_static='-Bstatic' ++ else ++ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ lt_prog_compiler_pic='-DDLL_EXPORT' ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ lt_prog_compiler_pic='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ lt_prog_compiler_static='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ lt_prog_compiler_wl='-Wl,' ++ # PIC (with -KPIC) is the default. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fPIC' ++ lt_prog_compiler_static='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='--shared' ++ lt_prog_compiler_static='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-fpic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ccc*) ++ lt_prog_compiler_wl='-Wl,' ++ # All Alpha code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ xl* | bgxl* | bgf* | mpixl*) ++ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-qpic' ++ lt_prog_compiler_static='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ F* | *Sun*Fortran*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='' ++ ;; ++ *Sun\ C*) ++ # Sun C 5.9 ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ lt_prog_compiler_wl='-Wl,' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ newsos6) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ lt_prog_compiler_pic='-fPIC -shared' ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ lt_prog_compiler_wl='-Wl,' ++ # All OSF/1 code is PIC. ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ rdos*) ++ lt_prog_compiler_static='-non_shared' ++ ;; ++ ++ solaris*) ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) ++ lt_prog_compiler_wl='-Qoption ld ';; ++ *) ++ lt_prog_compiler_wl='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ lt_prog_compiler_wl='-Qoption ld ' ++ lt_prog_compiler_pic='-PIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ lt_prog_compiler_pic='-Kconform_pic' ++ lt_prog_compiler_static='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_pic='-KPIC' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ unicos*) ++ lt_prog_compiler_wl='-Wl,' ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ ++ uts4*) ++ lt_prog_compiler_pic='-pic' ++ lt_prog_compiler_static='-Bstatic' ++ ;; ++ ++ *) ++ lt_prog_compiler_can_build_shared=no ++ ;; ++ esac ++ fi ++ ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ lt_prog_compiler_pic= ++ ;; ++ *) ++ lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC" ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 ++$as_echo "$lt_prog_compiler_pic" >&6; } ++ ++ ++ ++ ++ ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$lt_prog_compiler_pic"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } ++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_pic_works=no ++ ac_outfile=conftest.$ac_objext ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$lt_prog_compiler_pic@&t@ -DPIC" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_pic_works=yes ++ fi ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 ++$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then ++ case $lt_prog_compiler_pic in ++ "" | " "*) ;; ++ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; ++ esac ++else ++ lt_prog_compiler_pic= ++ lt_prog_compiler_can_build_shared=no ++fi ++ ++fi ++ ++ ++ ++ ++ ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } ++if test "${lt_cv_prog_compiler_static_works+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_static_works=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ else ++ lt_cv_prog_compiler_static_works=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 ++$as_echo "$lt_cv_prog_compiler_static_works" >&6; } ++ ++if test x"$lt_cv_prog_compiler_static_works" = xyes; then ++ : ++else ++ lt_prog_compiler_static= ++fi ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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 ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 ++$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } ++if test "${lt_cv_prog_compiler_c_o+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler_c_o=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $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 ++ # So say no if there are warnings ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler_c_o=yes ++ fi ++ fi ++ chmod u+w . 2>&5 ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 ++$as_echo "$lt_cv_prog_compiler_c_o" >&6; } ++ ++ ++ ++ ++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 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 ++$as_echo_n "checking if we can lock with hard links... " >&6; } ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 ++$as_echo "$hard_links" >&6; } ++ if test "$hard_links" = no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 ++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ++ ++ runpath_var= ++ allow_undefined_flag= ++ always_export_symbols=no ++ archive_cmds= ++ archive_expsym_cmds= ++ compiler_needs_object=no ++ enable_shared_with_static_runtimes=no ++ export_dynamic_flag_spec= ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ hardcode_automatic=no ++ hardcode_direct=no ++ hardcode_direct_absolute=no ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld= ++ hardcode_libdir_separator= ++ hardcode_minus_L=no ++ hardcode_shlibpath_var=unsupported ++ inherit_rpath=no ++ link_all_deplibs=unknown ++ module_cmds= ++ module_expsym_cmds= ++ old_archive_from_new_cmds= ++ old_archive_from_expsyms_cmds= ++ thread_safe_flag_spec= ++ whole_archive_flag_spec= ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ include_expsyms= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++ extract_expsyms_cmds= ++ ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ ld_shlibs=yes ++ ++ # On some targets, GNU ld is compatible enough with the native linker ++ # that we're better off using the native interface for both. ++ lt_use_gnu_ld_interface=no ++ if test "$with_gnu_ld" = yes; then ++ case $host_os in ++ aix*) ++ # The AIX port of GNU ld has always aspired to compatibility ++ # with the native linker. However, as the warning in the GNU ld ++ # block says, versions before 2.19.5* couldn't really create working ++ # shared libraries, regardless of the interface used. ++ case `$LD -v 2>&1` in ++ *\ \(GNU\ Binutils\)\ 2.19.5*) ;; ++ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; ++ *\ \(GNU\ Binutils\)\ [3-9]*) ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ ;; ++ *) ++ lt_use_gnu_ld_interface=yes ++ ;; ++ esac ++ fi ++ ++ if test "$lt_use_gnu_ld_interface" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ export_dynamic_flag_spec='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ whole_archive_flag_spec= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[3-9]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the GNU linker, at least up to release 2.19, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to install binutils ++*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. ++*** You will then need to restart the configuration process. ++ ++_LT_EOF ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ allow_undefined_flag=unsupported ++ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, ++ # as there is no search path for DLLs. ++ hardcode_libdir_flag_spec='-L$libdir' ++ export_dynamic_flag_spec='${wl}--export-all-symbols' ++ allow_undefined_flag=unsupported ++ always_export_symbols=no ++ enable_shared_with_static_runtimes=yes ++ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ haiku*) ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ link_all_deplibs=yes ++ ;; ++ ++ interix[3-9]*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then ++ tmp_addflag= ++ tmp_sharedflag='-shared' ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95* | pgfortran*) ++ # Portland Group f77 and f90 compilers ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ whole_archive_flag_spec= ++ tmp_sharedflag='--shared' ;; ++ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; ++ nvcc*) # Cuda Compiler Driver 2.2 ++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object=yes ++ ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' ++ compiler_needs_object=yes ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ esac ++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf* | bgf* | bgxlf* | mpixlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' ++ hardcode_libdir_flag_spec= ++ hardcode_libdir_flag_spec_ld='-rpath $libdir' ++ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) ++ ld_shlibs=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ esac ++ ++ if test "$ld_shlibs" = no; then ++ runpath_var= ++ hardcode_libdir_flag_spec= ++ export_dynamic_flag_spec= ++ whole_archive_flag_spec= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ allow_undefined_flag=unsupported ++ always_export_symbols=yes ++ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ hardcode_minus_L=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ hardcode_direct=unsupported ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ # Also, AIX nm treats weak defined symbols like other global ++ # defined symbols, whereas GNU nm marks them as "W". ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ archive_cmds='' ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ file_list_spec='${wl}-f,' ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[012]|aix4.[012].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ hardcode_direct=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ hardcode_minus_L=yes ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_libdir_separator= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ export_dynamic_flag_spec='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ always_export_symbols=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ allow_undefined_flag='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' ++ allow_undefined_flag="-z nodefs" ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++ ++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ no_undefined_flag=' ${wl}-bernotok' ++ allow_undefined_flag=' ${wl}-berok' ++ if test "$with_gnu_ld" = yes; then ++ # We only use this code for GNU lds that support --whole-archive. ++ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ else ++ # Exported symbols can be pulled into shared objects from archives ++ whole_archive_flag_spec='$convenience' ++ fi ++ archive_cmds_need_lc=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ archive_expsym_cmds='' ++ ;; ++ m68k) ++ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ ;; ++ esac ++ ;; ++ ++ bsdi[45]*) ++ export_dynamic_flag_spec=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ hardcode_libdir_flag_spec=' ' ++ allow_undefined_flag=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ old_archive_from_new_cmds='true' ++ # FIXME: Should let the user specify the lib program. ++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ fix_srcfile_path='`cygpath -w "$srcfile"`' ++ enable_shared_with_static_runtimes=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ ++ ++ archive_cmds_need_lc=no ++ hardcode_direct=no ++ hardcode_automatic=yes ++ hardcode_shlibpath_var=unsupported ++ if test "$lt_cv_ld_force_load" = "yes"; then ++ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' ++ else ++ whole_archive_flag_spec='' ++ fi ++ link_all_deplibs=yes ++ allow_undefined_flag="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=func_echo_all ++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ ++ else ++ ld_shlibs=no ++ fi ++ ++ ;; ++ ++ dgux*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ freebsd1*) ++ ld_shlibs=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_flag_spec_ld='+b $libdir' ++ hardcode_libdir_separator=: ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes && test "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ ++ # Older versions of the 11.00 compiler do not understand -b yet ++ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 ++$as_echo_n "checking if $CC understands -b... " >&6; } ++if test "${lt_cv_prog_compiler__b+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_prog_compiler__b=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -b" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&5 ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ lt_cv_prog_compiler__b=yes ++ fi ++ else ++ lt_cv_prog_compiler__b=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 ++$as_echo "$lt_cv_prog_compiler__b" >&6; } ++ ++if test x"$lt_cv_prog_compiler__b" = xyes; then ++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++else ++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++fi ++ ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ hardcode_direct=no ++ hardcode_shlibpath_var=no ++ ;; ++ *) ++ hardcode_direct=yes ++ hardcode_direct_absolute=yes ++ export_dynamic_flag_spec='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ hardcode_minus_L=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++int foo(void) {} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS="$save_LDFLAGS" ++ else ++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ inherit_rpath=yes ++ link_all_deplibs=yes ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ newsos6) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *nto* | *qnx*) ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ hardcode_direct=yes ++ hardcode_shlibpath_var=no ++ hardcode_direct_absolute=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ export_dynamic_flag_spec='${wl}-E' ++ else ++ case $host_os in ++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-R$libdir' ++ ;; ++ *) ++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ ld_shlibs=no ++ fi ++ ;; ++ ++ os2*) ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_minus_L=yes ++ allow_undefined_flag=unsupported ++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ hardcode_libdir_separator=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' ++ else ++ allow_undefined_flag=' -expect_unresolved \*' ++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' ++ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ hardcode_libdir_flag_spec='-rpath $libdir' ++ fi ++ archive_cmds_need_lc='no' ++ hardcode_libdir_separator=: ++ ;; ++ ++ solaris*) ++ no_undefined_flag=' -z defs' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ else ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac ++ fi ++ hardcode_libdir_flag_spec='-R$libdir' ++ hardcode_shlibpath_var=no ++ case $host_os in ++ solaris2.[0-5] | solaris2.[0-5].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ++ fi ++ ;; ++ esac ++ link_all_deplibs=yes ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_direct=yes ++ hardcode_minus_L=yes ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ reload_cmds='$CC -r -o $output$reload_objs' ++ hardcode_direct=no ++ ;; ++ motorola) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_direct=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ sysv4.3*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ export_dynamic_flag_spec='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_shlibpath_var=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ ld_shlibs=yes ++ fi ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ++ no_undefined_flag='${wl}-z,text' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ no_undefined_flag='${wl}-z,text' ++ allow_undefined_flag='${wl}-z,nodefs' ++ archive_cmds_need_lc=no ++ hardcode_shlibpath_var=no ++ hardcode_libdir_flag_spec='${wl}-R,$libdir' ++ hardcode_libdir_separator=':' ++ link_all_deplibs=yes ++ export_dynamic_flag_spec='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ hardcode_libdir_flag_spec='-L$libdir' ++ hardcode_shlibpath_var=no ++ ;; ++ ++ *) ++ ld_shlibs=no ++ ;; ++ esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ export_dynamic_flag_spec='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi ++ fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 ++$as_echo "$ld_shlibs" >&6; } ++test "$ld_shlibs" = no && can_build_shared=no ++ ++with_gnu_ld=$with_gnu_ld ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$archive_cmds_need_lc" in ++x|xyes) ++ # Assume -lc should be added ++ archive_cmds_need_lc=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $archive_cmds in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 ++$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } ++if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$lt_prog_compiler_wl ++ pic_flag=$lt_prog_compiler_pic ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$allow_undefined_flag ++ allow_undefined_flag= ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 ++ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ then ++ lt_cv_archive_cmds_need_lc=no ++ else ++ lt_cv_archive_cmds_need_lc=yes ++ fi ++ allow_undefined_flag=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 ++$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } ++ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 ++$as_echo_n "checking dynamic linker characteristics... " >&6; } ++ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ case $host_os in ++ mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; ++ *) lt_sed_strip_eq="s,=/,/,g" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` ++ case $lt_search_path_spec in ++ *\;*) ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` ++ ;; ++ *) ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` ++ ;; ++ esac ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[lt_foo]++; } ++ if (lt_freq[lt_foo] == 1) { print lt_foo; } ++}'` ++ # AWK program above erroneously prepends '/' to C:/dos/paths ++ # for these hosts. ++ case $host_os in ++ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ ++ $SED 's,/\([A-Za-z]:\),\1,g'` ;; ++ esac ++ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[4-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[01] | aix4.[01].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib<name>.so ++ # instead of lib<name>.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[45]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[123]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[01]* | freebsdelf3.[01]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ ++ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++haiku*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ dynamic_linker="$host_os runtime_loader" ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555, ... ++ postinstall_cmds='chmod 555 $lib' ++ # or fails outright, so override atomically: ++ install_override_mode=555 ++ ;; ++ ++interix[3-9]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ ++ # Some binutils ld are patched to set DT_RUNPATH ++ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ lt_cv_shlibpath_overrides_runpath=no ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ ++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : ++ lt_cv_shlibpath_overrides_runpath=yes ++fi ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++fi ++ ++ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[89] | openbsd2.[89].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 ++$as_echo "$dynamic_linker" >&6; } ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 ++$as_echo_n "checking how to hardcode library paths into programs... " >&6; } ++hardcode_action= ++if test -n "$hardcode_libdir_flag_spec" || ++ test -n "$runpath_var" || ++ test "X$hardcode_automatic" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$hardcode_direct" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && ++ test "$hardcode_minus_L" != no; then ++ # Linking always hardcodes the temporary library directory. ++ hardcode_action=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ hardcode_action=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ hardcode_action=unsupported ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 ++$as_echo "$hardcode_action" >&6; } ++ ++if test "$hardcode_action" = relink || ++ test "$inherit_rpath" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++ ++ ++ ++ ++ ++ ++ if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes ++else ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ++fi ++ ++ ;; ++ ++ *) ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char shl_load (); ++int ++main () ++{ ++return shl_load (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes ++else ++ ac_cv_lib_dld_shl_load=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++else ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes ++else ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_svld_dlopen=yes ++else ++ ac_cv_lib_svld_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 ++$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 ++$as_echo_n "checking for dld_link in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dld_link (); ++int ++main () ++{ ++return dld_link (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_dld_link=yes ++else ++ ac_cv_lib_dld_dld_link=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 ++$as_echo "$ac_cv_lib_dld_dld_link" >&6; } ++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : ++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 ++$as_echo_n "checking whether a program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line $LINENO "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif ++ ++#include <stdio.h> ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++/* When -fvisbility=hidden is used, assume the code has been annotated ++ correspondingly for the symbols needed. */ ++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++void fnord () __attribute__((visibility("default"))); ++#endif ++ ++void fnord () { int i=42; } ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else ++ { ++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else puts (dlerror ()); ++ } ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 ++$as_echo "$lt_cv_dlopen_self" >&6; } ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 ++$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } ++if test "${lt_cv_dlopen_self_static+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ lt_cv_dlopen_self_static=cross ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++#line $LINENO "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include <dlfcn.h> ++#endif ++ ++#include <stdio.h> ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++/* When -fvisbility=hidden is used, assume the code has been annotated ++ correspondingly for the symbols needed. */ ++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) ++void fnord () __attribute__((visibility("default"))); ++#endif ++ ++void fnord () { int i=42; } ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else ++ { ++ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ else puts (dlerror ()); ++ } ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++} ++_LT_EOF ++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&5 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; ++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; ++ esac ++ else : ++ # compilation failed ++ lt_cv_dlopen_self_static=no ++ fi ++fi ++rm -fr conftest* ++ ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 ++$as_echo "$lt_cv_dlopen_self_static" >&6; } ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++striplib= ++old_striplib= ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 ++$as_echo_n "checking whether stripping libraries is possible... " >&6; } ++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" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ ;; ++ *) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ;; ++ esac ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ # Report which library types will actually be built ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 ++$as_echo_n "checking if libtool supports shared libraries... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 ++$as_echo "$can_build_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 ++$as_echo_n "checking whether to build shared libraries... " >&6; } ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++ aix[4-9]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 ++$as_echo "$enable_shared" >&6; } ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 ++$as_echo_n "checking whether to build static libraries... " >&6; } ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 ++$as_echo "$enable_static" >&6; } ++ ++ ++ ++ ++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 ++ ++CC="$lt_save_CC" ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_config_commands="$ac_config_commands libtool" ++ ++ ++ ++ ++# Only expand once: ++ ++ ++if test "x$CC" != xcc; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 ++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 ++$as_echo_n "checking whether cc understands -c and -o together... " >&6; } ++fi ++set dummy $CC; ac_cc=`$as_echo "$2" | ++ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++# Make sure it works both with $CC and with simple cc. ++# 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 -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++rm -f conftest2.* ++if { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; ++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.$ac_ext >&5' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' ++ rm -f conftest2.* ++ if { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; ++ then ++ # cc works too. ++ : ++ else ++ # cc exists but doesn't like -o. ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++ fi ++ fi ++ fi ++else ++ eval ac_cv_prog_cc_${ac_cc}_c_o=no ++fi ++rm -f core conftest* ++ ++fi ++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++$as_echo "@%:@define NO_MINUS_C_MINUS_O 1" >>confdefs.h ++ ++fi ++ ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++ ++ ++ ++ ++have_gstprops=no ++ ++@%:@ Check whether --enable-gstprops was given. ++if test "${enable_gstprops+set}" = set; then : ++ enableval=$enable_gstprops; ++else ++ enable_gstprops=yes ++fi ++ ++ ++if test "x$have_gst" = "xyes" && test "x$enable_gstprops" = "xyes"; ++then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTPROPS" >&5 ++$as_echo_n "checking for GSTPROPS... " >&6; } ++ ++if test -n "$GSTPROPS_CFLAGS"; then ++ pkg_cv_GSTPROPS_CFLAGS="$GSTPROPS_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ glib-2.0 ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_PLUGINS_BASE_REQ ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTPROPS_CFLAGS=`$PKG_CONFIG --cflags " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSTPROPS_LIBS"; then ++ pkg_cv_GSTPROPS_LIBS="$GSTPROPS_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ glib-2.0 ++ gtk+-2.0 >= \$GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR >= \$GST_PLUGINS_BASE_REQ ++ libxml-2.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTPROPS_LIBS=`$PKG_CONFIG --libs " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSTPROPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>&1` ++ else ++ GSTPROPS_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSTPROPS_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0) were not met: ++ ++$GSTPROPS_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GSTPROPS_CFLAGS ++and GSTPROPS_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GSTPROPS_CFLAGS ++and GSTPROPS_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GSTPROPS_CFLAGS=$pkg_cv_GSTPROPS_CFLAGS ++ GSTPROPS_LIBS=$pkg_cv_GSTPROPS_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_gstprops=yes ++fi ++ ++ GSTPROPS_LIBS="$GSTPROPS_LIBS -lgstinterfaces-$GST_MAJORMINOR" ++ ++ GNOMECC_DESKTOP_DIR=${datadir}/control-center-2.0/capplets ++ ++ EXP_VAR=GNOMECC_DESKTOP_DIR ++ FROM_VAR=$GNOMECC_DESKTOP_DIR ++ ++ prefix_save=$prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix=/usr/local ++ fi ++ exec_prefix_save=$exec_prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=/usr/local ++ fi ++ ++ full_var="$FROM_VAR" ++ while true; do ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var"="x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ full_var=$new_full_var ++ GNOMECC_DESKTOP_DIR="$full_var" ++ ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++ ++ ++cat >>confdefs.h <<_ACEOF ++@%:@define GNOMECC_DESKTOP_DIR "$GNOMECC_DESKTOP_DIR" ++_ACEOF ++ ++ ++ ++fi ++ ++ ++ ++ if test x$have_gstprops = xyes; then ++ HAVE_GSTPROPS_TRUE= ++ HAVE_GSTPROPS_FALSE='#' ++else ++ HAVE_GSTPROPS_TRUE='#' ++ HAVE_GSTPROPS_FALSE= ++fi ++ ++ ++ ++have_gstmixer=no ++ ++@%:@ Check whether --enable-gstmix was given. ++if test "${enable_gstmix+set}" = set; then : ++ enableval=$enable_gstmix; ++else ++ enable_gstmix=auto ++fi ++ ++ ++if test "x$enable_gstmix" = "xauto" && test "x$have_pulseaudio" = "xno"; then ++ enable_gstmix=yes ++fi ++ ++if test "x$have_gst" = "xyes" && test "x$enable_gstmix" = "xyes"; ++then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTMIXER" >&5 ++$as_echo_n "checking for GSTMIXER... " >&6; } ++ ++if test -n "$GSTMIXER_CFLAGS"; then ++ pkg_cv_GSTMIXER_CFLAGS="$GSTMIXER_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTMIXER_CFLAGS=`$PKG_CONFIG --cflags " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GSTMIXER_LIBS"; then ++ pkg_cv_GSTMIXER_LIBS="$GSTMIXER_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-\$GST_MAJORMINOR ++ gstreamer-plugins-base-\$GST_MAJORMINOR ++ \""; } >&5 ++ ($PKG_CONFIG --exists --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GSTMIXER_LIBS=`$PKG_CONFIG --libs " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GSTMIXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>&1` ++ else ++ GSTMIXER_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GSTMIXER_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements ( ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ) were not met: ++ ++$GSTMIXER_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GSTMIXER_CFLAGS ++and GSTMIXER_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GSTMIXER_CFLAGS ++and GSTMIXER_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GSTMIXER_CFLAGS=$pkg_cv_GSTMIXER_CFLAGS ++ GSTMIXER_LIBS=$pkg_cv_GSTMIXER_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++ OLD_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $GSTMIXER_CFLAGS" ++ ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/audio/mixerutils.h" "ac_cv_header_gst_audio_mixerutils_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_audio_mixerutils_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/interfaces/mixer.h" "ac_cv_header_gst_interfaces_mixer_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_interfaces_mixer_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "gst/interfaces/propertyprobe.h" "ac_cv_header_gst_interfaces_propertyprobe_h" "$ac_includes_default" ++if test "x$ac_cv_header_gst_interfaces_propertyprobe_h" = x""yes; then : ++ have_gstmixer=yes ++fi ++ ++ ++fi ++ ++ ++fi ++ ++ ++ ++ CPPFLAGS=$OLD_CPPFLAGS ++ GSTMIXER_LIBS="$GSTMIXER_LIBS -lgstinterfaces-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR" ++ ++fi ++fi ++ ++ ++ ++ if test x$have_gstmixer = xyes; then ++ HAVE_GSTMIXER_TRUE= ++ HAVE_GSTMIXER_FALSE='#' ++else ++ HAVE_GSTMIXER_TRUE='#' ++ HAVE_GSTMIXER_FALSE= ++fi ++ ++ ++ ++ ++@%:@ Check whether --enable-silent-rules was given. ++if test "${enable_silent_rules+set}" = set; then : ++ enableval=$enable_silent_rules; ++fi ++ ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=0;; ++esac ++AM_BACKSLASH='\' ++ ++ ++# Turn on the additional warnings last, so warnings don't affect other tests. ++@%:@ Check whether --enable-more-warnings was given. ++if test "${enable_more_warnings+set}" = set; then : ++ enableval=$enable_more_warnings; set_more_warnings="$enableval" ++else ++ ++ if test -d $srcdir/.git; then ++ set_more_warnings=yes ++ else ++ set_more_warnings=no ++ fi ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 ++$as_echo_n "checking for more warnings... " >&6; } ++if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ CFLAGS="\ ++ -Wall \ ++ -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ ++ -Wnested-externs -Wpointer-arith \ ++ -Wcast-align -Wsign-compare \ ++ $CFLAGS" ++ ++ for option in -Wno-unused-parameter -Wno-strict-aliasing -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 ++$as_echo_n "checking whether gcc understands $option... " >&6; } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ has_option=yes ++else ++ has_option=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ if test $has_option = no; then ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 ++$as_echo "$has_option" >&6; } ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ ++ ++ ++ ++ ++ac_config_files="$ac_config_files Makefile po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/devices/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in" ++ ++ ++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_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 ++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( ++ *) { eval $ac_var=; 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" && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 ++$as_echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 ++$as_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}' ++ ++DEFS=-DHAVE_CONFIG_H ++ ++ac_libobjs= ++ac_ltlibobjs= ++U= ++for ac_i in : $LIB@&t@OBJS; 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=`$as_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. ++ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' ++done ++LIB@&t@OBJS=$ac_libobjs ++ ++LTLIBOBJS=$ac_ltlibobjs ++ ++ ++ if test -n "$EXEEXT"; then ++ am__EXEEXT_TRUE= ++ am__EXEEXT_FALSE='#' ++else ++ am__EXEEXT_TRUE='#' ++ am__EXEEXT_FALSE= ++fi ++ ++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then ++ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then ++ as_fn_error $? "conditional \"AMDEP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++ ++ ac_config_commands="$ac_config_commands po/stamp-it" ++ ++ ++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_SOUND_THEME_TRUE}" && test -z "${HAVE_SOUND_THEME_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_SOUND_THEME\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_PULSEAUDIO_TRUE}" && test -z "${HAVE_PULSEAUDIO_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_PULSEAUDIO\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GMP_TRUE}" && test -z "${HAVE_GMP_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GMP\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GLADEUI_TRUE}" && test -z "${HAVE_GLADEUI_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GLADEUI\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTREAMER_TRUE}" && test -z "${HAVE_GSTREAMER_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTREAMER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GRECORD_TRUE}" && test -z "${HAVE_GRECORD_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GRECORD\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then ++ as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTPROPS_TRUE}" && test -z "${HAVE_GSTPROPS_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTPROPS\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++if test -z "${HAVE_GSTMIXER_TRUE}" && test -z "${HAVE_GSTMIXER_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GSTMIXER\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi ++ ++: ${CONFIG_STATUS=./config.status} ++ac_write_fail=0 ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 ++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} ++as_write_fail=0 ++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 ++#! $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} ++export SHELL ++_ASEOF ++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 ++## -------------------- ## ++## 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=: ++ # Pre-4.2 versions of Zsh do 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_nl=' ++' ++export as_nl ++# Printing a long string crashes Solaris 7 /usr/bin/printf. ++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo ++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo ++# Prefer a ksh shell builtin over an external printf program on Solaris, ++# but without wasting forks for bash or zsh. ++if test -z "$BASH_VERSION$ZSH_VERSION" \ ++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='print -r --' ++ as_echo_n='print -rn --' ++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then ++ as_echo='printf %s\n' ++ as_echo_n='printf %s' ++else ++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then ++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' ++ as_echo_n='/usr/ucb/echo -n' ++ else ++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' ++ as_echo_n_body='eval ++ arg=$1; ++ case $arg in @%:@( ++ *"$as_nl"*) ++ expr "X$arg" : "X\\(.*\\)$as_nl"; ++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; ++ esac; ++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" ++ ' ++ export as_echo_n_body ++ as_echo_n='sh -c $as_echo_n_body as_echo' ++ fi ++ export as_echo_body ++ as_echo='sh -c $as_echo_body as_echo' ++fi ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ PATH_SEPARATOR=: ++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { ++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || ++ PATH_SEPARATOR=';' ++ } ++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.) ++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 ++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ exit 1 ++fi ++ ++# Unset variables that we do not need and which cause bugs (e.g. in ++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" ++# suppresses any "Segmentation fault" message there. '((' could ++# trigger a bug in pdksh 5.2.14. ++for as_var in BASH_ENV ENV MAIL MAILPATH ++do eval test x\${$as_var+set} = xset \ ++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++LC_ALL=C ++export LC_ALL ++LANGUAGE=C ++export LANGUAGE ++ ++# CDPATH. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++ ++@%:@ as_fn_error STATUS ERROR [LINENO LOG_FD] ++@%:@ ---------------------------------------- ++@%:@ Output "`basename @S|@0`: error: ERROR" to stderr. If LINENO and LOG_FD are ++@%:@ provided, also output the error to LOG_FD, referencing LINENO. Then exit the ++@%:@ script with STATUS, using 1 if that was 0. ++as_fn_error () ++{ ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 ++ fi ++ $as_echo "$as_me: error: $2" >&2 ++ as_fn_exit $as_status ++} @%:@ as_fn_error ++ ++ ++@%:@ as_fn_set_status STATUS ++@%:@ ----------------------- ++@%:@ Set @S|@? to STATUS, without forking. ++as_fn_set_status () ++{ ++ return $1 ++} @%:@ as_fn_set_status ++ ++@%:@ as_fn_exit STATUS ++@%:@ ----------------- ++@%:@ Exit the shell with STATUS, even in a "trap 0" or "set -e" context. ++as_fn_exit () ++{ ++ set +e ++ as_fn_set_status $1 ++ exit $1 ++} @%:@ as_fn_exit ++ ++@%:@ as_fn_unset VAR ++@%:@ --------------- ++@%:@ Portably unset VAR. ++as_fn_unset () ++{ ++ { eval $1=; unset $1;} ++} ++as_unset=as_fn_unset ++@%:@ as_fn_append VAR VALUE ++@%:@ ---------------------- ++@%:@ Append the text in VALUE to the end of the definition contained in VAR. Take ++@%:@ advantage of any shell optimizations that allow amortized linear growth over ++@%:@ repeated appends, instead of the typical quadratic growth present in naive ++@%:@ implementations. ++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : ++ eval 'as_fn_append () ++ { ++ eval $1+=\$2 ++ }' ++else ++ as_fn_append () ++ { ++ eval $1=\$$1\$2 ++ } ++fi # as_fn_append ++ ++@%:@ as_fn_arith ARG... ++@%:@ ------------------ ++@%:@ Perform arithmetic evaluation on the ARGs, and store the result in the ++@%:@ global @S|@as_val. Take advantage of shells that can avoid forks. The arguments ++@%:@ must be portable across @S|@(()) and expr. ++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : ++ eval 'as_fn_arith () ++ { ++ as_val=$(( $* )) ++ }' ++else ++ as_fn_arith () ++ { ++ as_val=`expr "$@" || test $? -eq 1` ++ } ++fi # as_fn_arith ++ ++ ++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 ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# 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 ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in @%:@((((( ++-n*) ++ case `echo 'xy\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ xy) ECHO_C='\c';; ++ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null ++ ECHO_T=' ';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++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 2>/dev/null ++fi ++if (echo >conf$$.file) 2>/dev/null; then ++ 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 ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++ ++@%:@ as_fn_mkdir_p ++@%:@ ------------- ++@%:@ Create "@S|@as_dir" as a directory, including parents if necessary. ++as_fn_mkdir_p () ++{ ++ ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; ++ esac ++ test -d "$as_dir" || eval $as_mkdir_p || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`$as_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 || ++$as_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" || as_fn_error $? "cannot create directory $as_dir" ++ ++ ++} @%:@ as_fn_mkdir_p ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p='mkdir -p "$as_dir"' ++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 ++## ----------------------------------- ## ++## Main body of $CONFIG_STATUS script. ## ++## ----------------------------------- ## ++_ASEOF ++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 gnome-media $as_me 2.32.0, which was ++generated by GNU Autoconf 2.67. 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 ++ ++case $ac_config_files in *" ++"*) set x $ac_config_files; shift; ac_config_files=$*;; ++esac ++ ++case $ac_config_headers in *" ++"*) set x $ac_config_headers; shift; ac_config_headers=$*;; ++esac ++ ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ac_cs_usage="\ ++\`$as_me' instantiates files and other configuration actions ++from templates according to the current configuration. Unless the files ++and actions are specified as TAGs, all are instantiated by default. ++ ++Usage: $0 [OPTION]... [TAG]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit ++ -q, --quiet, --silent ++ 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 ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ++ac_cs_version="\\ ++gnome-media config.status 2.32.0 ++configured by $0, generated by GNU Autoconf 2.67, ++ with options \\"\$ac_cs_config\\" ++ ++Copyright (C) 2010 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' ++AWK='$AWK' ++test -n "\$AWK" || AWK=awk ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++# The default lists apply if the user does not specify any file. ++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=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ 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 ) ++ $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; ++ esac ++ as_fn_append CONFIG_FILES " '$ac_optarg'" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ case $ac_optarg in ++ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ as_fn_append CONFIG_HEADERS " '$ac_optarg'" ++ ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ as_fn_error $? "ambiguous option: \`$1' ++Try \`$0 --help' for more information.";; ++ --help | --hel | -h ) ++ $as_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. ++ -*) as_fn_error $? "unrecognized option: \`$1' ++Try \`$0 --help' for more information." ;; ++ ++ *) as_fn_append 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 || ac_write_fail=1 ++if \$ac_cs_recheck; then ++ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++ shift ++ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 ++ CONFIG_SHELL='$SHELL' ++ export CONFIG_SHELL ++ exec "\$@" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX ++@%:@@%:@ Running $as_me. @%:@@%:@ ++_ASBOX ++ $as_echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++# ++# INIT-COMMANDS ++# ++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" ++ ++ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' ++macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' ++enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' ++enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' ++pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' ++enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' ++SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ++ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' ++host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' ++host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' ++host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' ++build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' ++build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' ++build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' ++SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' ++Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' ++GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' ++EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' ++FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' ++LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' ++NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' ++LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' ++max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' ++ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' ++exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' ++lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' ++lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' ++lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' ++reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' ++reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' ++OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' ++deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' ++file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' ++AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' ++AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' ++STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' ++RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' ++old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' ++old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' ++old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' ++lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' ++CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' ++CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' ++compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' ++GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' ++objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' ++MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' ++lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' ++lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' ++need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' ++DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' ++NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' ++LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' ++OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' ++OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' ++libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' ++shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' ++extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' ++archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' ++enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' ++export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' ++whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' ++compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' ++old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' ++old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' ++archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' ++archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' ++module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' ++module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' ++with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' ++allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' ++no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' ++hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' ++hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' ++hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' ++hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' ++hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' ++hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' ++inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' ++link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' ++fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' ++always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' ++export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' ++exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' ++include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' ++prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' ++file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' ++variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' ++need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' ++need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' ++version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' ++runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' ++shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' ++shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' ++libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' ++library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' ++soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' ++install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' ++postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' ++postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' ++finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' ++finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' ++hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' ++sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' ++sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' ++hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' ++enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' ++enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' ++enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' ++old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' ++striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' ++ ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# A function that is used when there is no print builtin or printf. ++func_fallback_echo () ++{ ++ eval 'cat <<_LTECHO_EOF ++\$1 ++_LTECHO_EOF' ++} ++ ++# Quote evaled strings. ++for var in SHELL \ ++ECHO \ ++SED \ ++GREP \ ++EGREP \ ++FGREP \ ++LD \ ++NM \ ++LN_S \ ++lt_SP2NL \ ++lt_NL2SP \ ++reload_flag \ ++OBJDUMP \ ++deplibs_check_method \ ++file_magic_cmd \ ++AR \ ++AR_FLAGS \ ++STRIP \ ++RANLIB \ ++CC \ ++CFLAGS \ ++compiler \ ++lt_cv_sys_global_symbol_pipe \ ++lt_cv_sys_global_symbol_to_cdecl \ ++lt_cv_sys_global_symbol_to_c_name_address \ ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ ++lt_prog_compiler_no_builtin_flag \ ++lt_prog_compiler_wl \ ++lt_prog_compiler_pic \ ++lt_prog_compiler_static \ ++lt_cv_prog_compiler_c_o \ ++need_locks \ ++DSYMUTIL \ ++NMEDIT \ ++LIPO \ ++OTOOL \ ++OTOOL64 \ ++shrext_cmds \ ++export_dynamic_flag_spec \ ++whole_archive_flag_spec \ ++compiler_needs_object \ ++with_gnu_ld \ ++allow_undefined_flag \ ++no_undefined_flag \ ++hardcode_libdir_flag_spec \ ++hardcode_libdir_flag_spec_ld \ ++hardcode_libdir_separator \ ++fix_srcfile_path \ ++exclude_expsyms \ ++include_expsyms \ ++file_list_spec \ ++variables_saved_for_relink \ ++libname_spec \ ++library_names_spec \ ++soname_spec \ ++install_override_mode \ ++finish_eval \ ++old_striplib \ ++striplib; do ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in reload_cmds \ ++old_postinstall_cmds \ ++old_postuninstall_cmds \ ++old_archive_cmds \ ++extract_expsyms_cmds \ ++old_archive_from_new_cmds \ ++old_archive_from_expsyms_cmds \ ++archive_cmds \ ++archive_expsym_cmds \ ++module_cmds \ ++module_expsym_cmds \ ++export_symbols_cmds \ ++prelink_cmds \ ++postinstall_cmds \ ++postuninstall_cmds \ ++finish_cmds \ ++sys_lib_search_path_spec \ ++sys_lib_dlsearch_path_spec; do ++ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in ++ *[\\\\\\\`\\"\\\$]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++ac_aux_dir='$ac_aux_dir' ++xsi_shell='$xsi_shell' ++lt_shell_append='$lt_shell_append' ++ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile' ++ ++ ++ ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ ++# Handling of arguments. ++for ac_config_target in $ac_config_targets ++do ++ case $ac_config_target in ++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; ++ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; ++ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; ++ "sound-theme/Makefile") CONFIG_FILES="$CONFIG_FILES sound-theme/Makefile" ;; ++ "sound-theme/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES sound-theme/sounds/Makefile" ;; ++ "gnome-volume-control/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/Makefile" ;; ++ "gnome-volume-control/data/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/Makefile" ;; ++ "gnome-volume-control/data/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/gnome-volume-control.desktop.in" ;; ++ "gnome-volume-control/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/16x16/status/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/22x22/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/22x22/status/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/24x24/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/24x24/status/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/32x32/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/32x32/status/Makefile" ;; ++ "gnome-volume-control/data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/48x48/Makefile" ;; ++ "gnome-volume-control/data/icons/48x48/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/48x48/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/apps/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/apps/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/devices/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/devices/Makefile" ;; ++ "gnome-volume-control/data/icons/scalable/status/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/data/icons/scalable/status/Makefile" ;; ++ "gnome-volume-control/src/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-volume-control/src/Makefile" ;; ++ "grecord/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/Makefile" ;; ++ "grecord/gnome-sound-recorder.schemas.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.schemas.in" ;; ++ "grecord/src/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/src/Makefile" ;; ++ "grecord/icons/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/Makefile" ;; ++ "grecord/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/16x16/Makefile" ;; ++ "grecord/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/22x22/Makefile" ;; ++ "grecord/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/24x24/Makefile" ;; ++ "grecord/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/32x32/Makefile" ;; ++ "grecord/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/48x48/Makefile" ;; ++ "grecord/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/scalable/Makefile" ;; ++ "gstreamer-properties/Makefile") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/Makefile" ;; ++ "gst-mixer/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/Makefile" ;; ++ "gst-mixer/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/Makefile" ;; ++ "gst-mixer/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/Makefile" ;; ++ "gst-mixer/icons/16x16/devices/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/devices/Makefile" ;; ++ "gst-mixer/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/status/Makefile" ;; ++ "gst-mixer/src/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/src/Makefile" ;; ++ "gst-mixer/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/pixmaps/Makefile" ;; ++ "profiles/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/Makefile" ;; ++ "profiles/gnome-audio-profiles.schemas.in") CONFIG_FILES="$CONFIG_FILES profiles/gnome-audio-profiles.schemas.in" ;; ++ "profiles/gnome-media-profiles.pc") CONFIG_FILES="$CONFIG_FILES profiles/gnome-media-profiles.pc" ;; ++ "profiles/glade/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/glade/Makefile" ;; ++ "grecord/gnome-sound-recorder.desktop.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.desktop.in" ;; ++ "gst-mixer/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gst-mixer/gnome-volume-control.desktop.in" ;; ++ "gstreamer-properties/gstreamer-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/gstreamer-properties.desktop.in" ;; ++ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; ++ ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ 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 ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++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 'as_fn_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") ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 ++ ++# Set up the scripts for CONFIG_FILES section. ++# No need to generate them if there are no CONFIG_FILES. ++# This happens for instance with `./config.status config.h'. ++if test -n "$CONFIG_FILES"; then ++ ++ ++ac_cr=`echo X | tr X '\015'` ++# On cygwin, bash can eat \r inside `` if the user requested igncr. ++# But we know of no other shell where ac_cr would be empty at this ++# point, so we can use a bashism as a fallback. ++if test "x$ac_cr" = x; then ++ eval ac_cr=\$\'\\r\' ++fi ++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` ++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ++ ac_cs_awk_cr='\\r' ++else ++ ac_cs_awk_cr=$ac_cr ++fi ++ ++echo 'BEGIN {' >"$tmp/subs1.awk" && ++_ACEOF ++ ++ ++{ ++ echo "cat >conf$$subs.awk <<_ACEOF" && ++ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && ++ echo "_ACEOF" ++} >conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ . ./conf$$subs.sh || ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ ++ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ++ if test $ac_delim_n = $ac_delim_num; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++rm -f conf$$subs.sh ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++cat >>"\$tmp/subs1.awk" <<\\_ACAWK && ++_ACEOF ++sed -n ' ++h ++s/^/S["/; s/!.*/"]=/ ++p ++g ++s/^[^!]*!// ++:repl ++t repl ++s/'"$ac_delim"'$// ++t delim ++:nl ++h ++s/\(.\{148\}\)..*/\1/ ++t more1 ++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ ++p ++n ++b repl ++:more1 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t nl ++:delim ++h ++s/\(.\{148\}\)..*/\1/ ++t more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"/ ++p ++b ++:more2 ++s/["\\]/\\&/g; s/^/"/; s/$/"\\/ ++p ++g ++s/.\{148\}// ++t delim ++' <conf$$subs.awk | sed ' ++/^[^""]/{ ++ N ++ s/\n// ++} ++' >>$CONFIG_STATUS || ac_write_fail=1 ++rm -f conf$$subs.awk ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++_ACAWK ++cat >>"\$tmp/subs1.awk" <<_ACAWK && ++ for (key in S) S_is_set[key] = 1 ++ FS = "" ++ ++} ++{ ++ line = $ 0 ++ nfields = split(line, field, "@") ++ substed = 0 ++ len = length(field[1]) ++ for (i = 2; i < nfields; i++) { ++ key = field[i] ++ keylen = length(key) ++ if (S_is_set[key]) { ++ value = S[key] ++ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) ++ len += length(value) + length(field[++i]) ++ substed = 1 ++ } else ++ len += 1 + keylen ++ } ++ ++ print line ++} ++ ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then ++ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" ++else ++ cat ++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 ++_ACEOF ++ ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries 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[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// ++s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++fi # test -n "$CONFIG_FILES" ++ ++# Set up the scripts for CONFIG_HEADERS section. ++# No need to generate them if there are no CONFIG_HEADERS. ++# This happens for instance with `./config.status Makefile'. ++if test -n "$CONFIG_HEADERS"; then ++cat >"$tmp/defines.awk" <<\_ACAWK || ++BEGIN { ++_ACEOF ++ ++# Transform confdefs.h into an awk script `defines.awk', embedded as ++# here-document in config.status, that substitutes the proper values into ++# config.h.in to produce config.h. ++ ++# Create a delimiter string that does not exist in confdefs.h, to ease ++# handling of long lines. ++ac_delim='%!_!# ' ++for ac_last_try in false false :; do ++ ac_t=`sed -n "/$ac_delim/p" confdefs.h` ++ if test -z "$ac_t"; then ++ break ++ elif $ac_last_try; then ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ else ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++# For the awk script, D is an array of macro values keyed by name, ++# likewise P contains macro parameters if any. Preserve backslash ++# newline sequences. ++ ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++sed -n ' ++s/.\{148\}/&'"$ac_delim"'/g ++t rset ++:rset ++s/^[ ]*#[ ]*define[ ][ ]*/ / ++t def ++d ++:def ++s/\\$// ++t bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3"/p ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p ++d ++:bsnl ++s/["\\]/\\&/g ++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ ++D["\1"]=" \3\\\\\\n"\\/p ++t cont ++s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p ++t cont ++d ++:cont ++n ++s/.\{148\}/&'"$ac_delim"'/g ++t clear ++:clear ++s/\\$// ++t bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/"/p ++d ++:bsnlc ++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p ++b cont ++' <confdefs.h | sed ' ++s/'"$ac_delim"'/"\\\ ++"/g' >>$CONFIG_STATUS || ac_write_fail=1 ++ ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ for (key in D) D_is_set[key] = 1 ++ FS = "" ++} ++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { ++ line = \$ 0 ++ split(line, arg, " ") ++ if (arg[1] == "#") { ++ defundef = arg[2] ++ mac1 = arg[3] ++ } else { ++ defundef = substr(arg[1], 2) ++ mac1 = arg[2] ++ } ++ split(mac1, mac2, "(") #) ++ macro = mac2[1] ++ prefix = substr(line, 1, index(line, defundef) - 1) ++ if (D_is_set[macro]) { ++ # Preserve the white space surrounding the "#". ++ print prefix "define", macro P[macro] D[macro] ++ next ++ } else { ++ # Replace #undef with comments. This is necessary, for example, ++ # in the case of _POSIX_SOURCE, which is predefined and required ++ # on some systems where configure will not decide to define it. ++ if (defundef == "undef") { ++ print "/*", prefix defundef, macro, "*/" ++ next ++ } ++ } ++} ++{ print } ++_ACAWK ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 ++fi # test -n "$CONFIG_HEADERS" ++ ++ ++eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" ++shift ++for ac_tag ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :[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 || ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ esac ++ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac ++ as_fn_append 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 '` ++ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' ++ `' by configure.' ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 ++$as_echo "$as_me: creating $ac_file" >&6;} ++ fi ++ # Neutralize special characters interpreted by sed in replacement strings. ++ case $configure_input in #( ++ *\&* | *\|* | *\\* ) ++ ac_sed_conf_input=`$as_echo "$configure_input" | ++ sed 's/[\\\\&|]/\\\\&/g'`;; #( ++ *) ac_sed_conf_input=$configure_input;; ++ esac ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; ++ 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 || ++$as_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"; as_fn_mkdir_p ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`$as_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 || ac_write_fail=1 ++# 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= ++ac_sed_dataroot=' ++/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p' ++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ 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 || ac_write_fail=1 ++ac_sed_extra="$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s|@configure_input@|$ac_sed_conf_input|;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@top_build_prefix@&$ac_top_build_prefix&;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 ++" ++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ++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"; } && ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined" >&5 ++$as_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 \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++ if test x"$ac_file" != x-; then ++ { ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" ++ } >"$tmp/config.h" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 ++$as_echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f "$ac_file" ++ mv "$tmp/config.h" "$ac_file" \ ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ++ fi ++ else ++ $as_echo "/* $configure_input */" \ ++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ ++ || as_fn_error $? "could not create -" "$LINENO" 5 ++ fi ++# Compute "$ac_file"'s index in $config_headers. ++_am_arg="$ac_file" ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$_am_arg" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'`/stamp-h$_am_stamp_count ++ ;; ++ ++ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 ++$as_echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac ++ ++ ++ case $ac_file$ac_mode in ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || ++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$mf" : 'X\(//\)[^/]' \| \ ++ X"$mf" : 'X\(//\)$' \| \ ++ X"$mf" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$mf" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || ++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$file" : 'X\(//\)[^/]' \| \ ++ X"$file" : 'X\(//\)$' \| \ ++ X"$file" : 'X\(/\)' \| . 2>/dev/null || ++$as_echo X"$file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++ ;; ++ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac ;; ++ "libtool":C) ++ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, ++# Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool 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 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++ ++ ++# The names of the tagged configurations supported by this script. ++available_tags="" ++ ++# ### BEGIN LIBTOOL CONFIG ++ ++# Which release of libtool.m4 was used? ++macro_version=$macro_version ++macro_revision=$macro_revision ++ ++# Whether or not to build shared libraries. ++build_libtool_libs=$enable_shared ++ ++# Whether or not to build static libraries. ++build_old_libs=$enable_static ++ ++# What type of objects to build. ++pic_mode=$pic_mode ++ ++# Whether or not to optimize for fast installation. ++fast_install=$enable_fast_install ++ ++# Shell to use when invoking shell scripts. ++SHELL=$lt_SHELL ++ ++# An echo program that protects backslashes. ++ECHO=$lt_ECHO ++ ++# The host system. ++host_alias=$host_alias ++host=$host ++host_os=$host_os ++ ++# The build system. ++build_alias=$build_alias ++build=$build ++build_os=$build_os ++ ++# A sed program that does not truncate output. ++SED=$lt_SED ++ ++# Sed that helps us avoid accidentally triggering echo(1) options like -n. ++Xsed="\$SED -e 1s/^X//" ++ ++# A grep program that handles long lines. ++GREP=$lt_GREP ++ ++# An ERE matcher. ++EGREP=$lt_EGREP ++ ++# A literal string matcher. ++FGREP=$lt_FGREP ++ ++# A BSD- or MS-compatible name lister. ++NM=$lt_NM ++ ++# Whether we need soft or hard links. ++LN_S=$lt_LN_S ++ ++# What is the maximum length of a command? ++max_cmd_len=$max_cmd_len ++ ++# Object file suffix (normally "o"). ++objext=$ac_objext ++ ++# Executable file suffix (normally ""). ++exeext=$exeext ++ ++# whether the shell understands "unset". ++lt_unset=$lt_unset ++ ++# turn spaces into newlines. ++SP2NL=$lt_lt_SP2NL ++ ++# turn newlines into spaces. ++NL2SP=$lt_lt_NL2SP ++ ++# An object symbol dumper. ++OBJDUMP=$lt_OBJDUMP ++ ++# Method to check whether dependent libraries are shared objects. ++deplibs_check_method=$lt_deplibs_check_method ++ ++# Command to use when deplibs_check_method == "file_magic". ++file_magic_cmd=$lt_file_magic_cmd ++ ++# The archiver. ++AR=$lt_AR ++AR_FLAGS=$lt_AR_FLAGS ++ ++# A symbol stripping program. ++STRIP=$lt_STRIP ++ ++# Commands used to install an old-style archive. ++RANLIB=$lt_RANLIB ++old_postinstall_cmds=$lt_old_postinstall_cmds ++old_postuninstall_cmds=$lt_old_postuninstall_cmds ++ ++# Whether to use a lock for old archive extraction. ++lock_old_archive_extraction=$lock_old_archive_extraction ++ ++# A C compiler. ++LTCC=$lt_CC ++ ++# LTCC compiler flags. ++LTCFLAGS=$lt_CFLAGS ++ ++# Take the output of nm and produce a listing of raw symbols and C names. ++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe ++ ++# Transform the output of nm in a proper C declaration. ++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl ++ ++# Transform the output of nm in a C name address pair. ++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address ++ ++# Transform the output of nm in a C name address pair when lib prefix is needed. ++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix ++ ++# The name of the directory that contains temporary libtool files. ++objdir=$objdir ++ ++# Used to examine libraries when file_magic_cmd begins with "file". ++MAGIC_CMD=$MAGIC_CMD ++ ++# Must we lock files when doing compilation? ++need_locks=$lt_need_locks ++ ++# Tool to manipulate archived DWARF debug symbol files on Mac OS X. ++DSYMUTIL=$lt_DSYMUTIL ++ ++# Tool to change global to local symbols on Mac OS X. ++NMEDIT=$lt_NMEDIT ++ ++# Tool to manipulate fat objects and archives on Mac OS X. ++LIPO=$lt_LIPO ++ ++# ldd/readelf like tool for Mach-O binaries on Mac OS X. ++OTOOL=$lt_OTOOL ++ ++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. ++OTOOL64=$lt_OTOOL64 ++ ++# Old archive suffix (normally "a"). ++libext=$libext ++ ++# Shared library suffix (normally ".so"). ++shrext_cmds=$lt_shrext_cmds ++ ++# The commands to extract the exported symbol list from a shared archive. ++extract_expsyms_cmds=$lt_extract_expsyms_cmds ++ ++# Variables whose values should be saved in libtool wrapper scripts and ++# restored at link time. ++variables_saved_for_relink=$lt_variables_saved_for_relink ++ ++# Do we need the "lib" prefix for modules? ++need_lib_prefix=$need_lib_prefix ++ ++# Do we need a version for libraries? ++need_version=$need_version ++ ++# Library versioning type. ++version_type=$version_type ++ ++# Shared library runtime path variable. ++runpath_var=$runpath_var ++ ++# Shared library path variable. ++shlibpath_var=$shlibpath_var ++ ++# Is shlibpath searched before the hard-coded library search path? ++shlibpath_overrides_runpath=$shlibpath_overrides_runpath ++ ++# Format of library name prefix. ++libname_spec=$lt_libname_spec ++ ++# List of archive names. First name is the real one, the rest are links. ++# The last name is the one that the linker finds with -lNAME ++library_names_spec=$lt_library_names_spec ++ ++# The coded name of the library, if different from the real name. ++soname_spec=$lt_soname_spec ++ ++# Permission mode override for installation of shared libraries. ++install_override_mode=$lt_install_override_mode ++ ++# Command to use after installation of a shared archive. ++postinstall_cmds=$lt_postinstall_cmds ++ ++# Command to use after uninstallation of a shared archive. ++postuninstall_cmds=$lt_postuninstall_cmds ++ ++# Commands used to finish a libtool library installation in a directory. ++finish_cmds=$lt_finish_cmds ++ ++# As "finish_cmds", except a single script fragment to be evaled but ++# not shown. ++finish_eval=$lt_finish_eval ++ ++# Whether we should hardcode library paths into libraries. ++hardcode_into_libs=$hardcode_into_libs ++ ++# Compile-time system search path for libraries. ++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec ++ ++# Run-time system search path for libraries. ++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec ++ ++# Whether dlopen is supported. ++dlopen_support=$enable_dlopen ++ ++# Whether dlopen of programs is supported. ++dlopen_self=$enable_dlopen_self ++ ++# Whether dlopen of statically linked programs is supported. ++dlopen_self_static=$enable_dlopen_self_static ++ ++# Commands to strip libraries. ++old_striplib=$lt_old_striplib ++striplib=$lt_striplib ++ ++ ++# The linker used to build libraries. ++LD=$lt_LD ++ ++# How to create reloadable object files. ++reload_flag=$lt_reload_flag ++reload_cmds=$lt_reload_cmds ++ ++# Commands used to build an old-style archive. ++old_archive_cmds=$lt_old_archive_cmds ++ ++# A language specific compiler. ++CC=$lt_compiler ++ ++# Is the compiler the GNU compiler? ++with_gcc=$GCC ++ ++# Compiler flag to turn off builtin functions. ++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag ++ ++# How to pass a linker flag through the compiler. ++wl=$lt_lt_prog_compiler_wl ++ ++# Additional compiler flags for building library objects. ++pic_flag=$lt_lt_prog_compiler_pic ++ ++# Compiler flag to prevent dynamic linking. ++link_static_flag=$lt_lt_prog_compiler_static ++ ++# Does compiler simultaneously support -c and -o options? ++compiler_c_o=$lt_lt_cv_prog_compiler_c_o ++ ++# Whether or not to add -lc for building shared libraries. ++build_libtool_need_lc=$archive_cmds_need_lc ++ ++# Whether or not to disallow shared libs when runtime libs are static. ++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes ++ ++# Compiler flag to allow reflexive dlopens. ++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec ++ ++# Compiler flag to generate shared objects directly from archives. ++whole_archive_flag_spec=$lt_whole_archive_flag_spec ++ ++# Whether the compiler copes with passing no objects directly. ++compiler_needs_object=$lt_compiler_needs_object ++ ++# Create an old-style archive from a shared archive. ++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds ++ ++# Create a temporary old-style archive to link instead of a shared archive. ++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds ++ ++# Commands used to build a shared archive. ++archive_cmds=$lt_archive_cmds ++archive_expsym_cmds=$lt_archive_expsym_cmds ++ ++# Commands used to build a loadable module if different from building ++# a shared archive. ++module_cmds=$lt_module_cmds ++module_expsym_cmds=$lt_module_expsym_cmds ++ ++# Whether we are building with GNU ld or not. ++with_gnu_ld=$lt_with_gnu_ld ++ ++# Flag that allows shared libraries with undefined symbols to be built. ++allow_undefined_flag=$lt_allow_undefined_flag ++ ++# Flag that enforces no undefined symbols. ++no_undefined_flag=$lt_no_undefined_flag ++ ++# Flag to hardcode \$libdir into a binary during linking. ++# This must work even if \$libdir does not exist ++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec ++ ++# If ld is used when linking, flag to hardcode \$libdir into a binary ++# during linking. This must work even if \$libdir does not exist. ++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld ++ ++# Whether we need a single "-rpath" flag with a separated argument. ++hardcode_libdir_separator=$lt_hardcode_libdir_separator ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary. ++hardcode_direct=$hardcode_direct ++ ++# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes ++# DIR into the resulting binary and the resulting library dependency is ++# "absolute",i.e impossible to change by setting \${shlibpath_var} if the ++# library is relocated. ++hardcode_direct_absolute=$hardcode_direct_absolute ++ ++# Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++# into the resulting binary. ++hardcode_minus_L=$hardcode_minus_L ++ ++# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++# into the resulting binary. ++hardcode_shlibpath_var=$hardcode_shlibpath_var ++ ++# Set to "yes" if building a shared library automatically hardcodes DIR ++# into the library and all subsequent libraries and executables linked ++# against it. ++hardcode_automatic=$hardcode_automatic ++ ++# Set to yes if linker adds runtime paths of dependent libraries ++# to runtime path list. ++inherit_rpath=$inherit_rpath ++ ++# Whether libtool must link a program against all its dependency libraries. ++link_all_deplibs=$link_all_deplibs ++ ++# Fix the shell variable \$srcfile for the compiler. ++fix_srcfile_path=$lt_fix_srcfile_path ++ ++# Set to "yes" if exported symbols are required. ++always_export_symbols=$always_export_symbols ++ ++# The commands to list exported symbols. ++export_symbols_cmds=$lt_export_symbols_cmds ++ ++# Symbols that should not be listed in the preloaded symbols. ++exclude_expsyms=$lt_exclude_expsyms ++ ++# Symbols that must always be exported. ++include_expsyms=$lt_include_expsyms ++ ++# Commands necessary for linking programs (against libraries) with templates. ++prelink_cmds=$lt_prelink_cmds ++ ++# Specify filename containing input files. ++file_list_spec=$lt_file_list_spec ++ ++# How to hardcode a shared library path into an executable. ++hardcode_action=$hardcode_action ++ ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ ++ltmain="$ac_aux_dir/ltmain.sh" ++ ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $* )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "${1}" | $SED "$basename"` ++} ++ ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[^=]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$@"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1+=\$2" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$1=\$$1\$2" ++} ++ ++_LT_EOF ++ ;; ++ esac ++ ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++ ++ ;; ++ "po/stamp-it":C) ++ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then ++ as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 ++ fi ++ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" ++ >"po/stamp-it.tmp" ++ sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" ++ ++ sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r po/POTFILES ++ } ++ ' "po/Makefile.in" >"po/Makefile" ++ rm -f "po/Makefile.tmp" ++ mv "po/stamp-it.tmp" "po/stamp-it" ++ ;; ++ ++ esac ++done # for ac_tag ++ ++ ++as_fn_exit 0 ++_ACEOF ++ac_clean_files=$ac_clean_files_save ++ ++test $ac_write_fail = 0 || ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ ++ ++# 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 || as_fn_exit 1 ++fi ++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} ++fi ++ ++ ++echo " ++ ++ ${PACKAGE} ${VERSION} ++ ============ ++ ++ ++ Prefix: ${prefix} ++ Source code location: ${srcdir} ++ Compiler: ${CC} ++ CFLAGS: ${CFLAGS} ++ ++ Volume Control $have_pulseaudio ++ GStreamer properties: $have_gstprops ++ GStreamer profiles: $have_profiles (GladeUI: $have_gladeui) ++ Sound recorder: $have_grecord$grecord_reason ++ ++ *Deprecated*: ++ ++ GStreamer mixer: $have_gstmixer ++ ++" ++ +diff -Naur gnome-media-2.32.0.orig/autom4te.cache/requests gnome-media-2.32.0.patched/autom4te.cache/requests +--- gnome-media-2.32.0.orig/autom4te.cache/requests 1969-12-31 19:00:00.000000000 -0500 ++++ gnome-media-2.32.0.patched/autom4te.cache/requests 2011-08-24 22:23:55.000000000 -0400 +@@ -0,0 +1,311 @@ ++# This file was generated. ++# It contains the lists of macros which have been traced. ++# It can be safely removed. ++ ++@request = ( ++ bless( [ ++ '0', ++ 1, ++ [ ++ '/usr/share/autoconf' ++ ], ++ [ ++ '/usr/share/autoconf/autoconf/autoconf.m4f', ++ '/usr/share/aclocal/argz.m4', ++ '/usr/share/aclocal/gconf-2.m4', ++ '/usr/share/aclocal/glib-gettext.m4', ++ '/usr/share/aclocal/ltdl.m4', ++ '/usr/share/aclocal/nls.m4', ++ '/usr/share/aclocal/pkg.m4', ++ '/usr/share/aclocal-1.11/amversion.m4', ++ '/usr/share/aclocal-1.11/auxdir.m4', ++ '/usr/share/aclocal-1.11/cond.m4', ++ '/usr/share/aclocal-1.11/depend.m4', ++ '/usr/share/aclocal-1.11/depout.m4', ++ '/usr/share/aclocal-1.11/header.m4', ++ '/usr/share/aclocal-1.11/init.m4', ++ '/usr/share/aclocal-1.11/install-sh.m4', ++ '/usr/share/aclocal-1.11/lead-dot.m4', ++ '/usr/share/aclocal-1.11/maintainer.m4', ++ '/usr/share/aclocal-1.11/make.m4', ++ '/usr/share/aclocal-1.11/minuso.m4', ++ '/usr/share/aclocal-1.11/missing.m4', ++ '/usr/share/aclocal-1.11/mkdirp.m4', ++ '/usr/share/aclocal-1.11/options.m4', ++ '/usr/share/aclocal-1.11/runlog.m4', ++ '/usr/share/aclocal-1.11/sanity.m4', ++ '/usr/share/aclocal-1.11/silent.m4', ++ '/usr/share/aclocal-1.11/strip.m4', ++ '/usr/share/aclocal-1.11/substnot.m4', ++ '/usr/share/aclocal-1.11/tar.m4', ++ 'm4/as-ac-expand.m4', ++ 'm4/as-compiler-flag.m4', ++ 'm4/as-version.m4', ++ 'm4/intltool.m4', ++ 'm4/libtool.m4', ++ 'm4/ltoptions.m4', ++ 'm4/ltsugar.m4', ++ 'm4/ltversion.m4', ++ 'm4/lt~obsolete.m4', ++ 'configure.ac' ++ ], ++ { ++ 'AM_ENABLE_STATIC' => 1, ++ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, ++ '_LT_AC_SHELL_INIT' => 1, ++ 'AC_DEFUN' => 1, ++ '_LT_AC_LANG_CXX_CONFIG' => 1, ++ 'AC_PROG_LIBTOOL' => 1, ++ 'AM_PROG_MKDIR_P' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'AM_SUBST_NOTMAKE' => 1, ++ 'AM_MISSING_PROG' => 1, ++ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, ++ '_LT_AC_LANG_C_CONFIG' => 1, ++ 'AM_PROG_INSTALL_STRIP' => 1, ++ '_m4_warn' => 1, ++ 'AC_LIBTOOL_OBJDIR' => 1, ++ 'gl_FUNC_ARGZ' => 1, ++ 'AM_SANITY_CHECK' => 1, ++ 'LTOBSOLETE_VERSION' => 1, ++ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, ++ 'LT_LIB_M' => 1, ++ '_LT_AC_CHECK_DLFCN' => 1, ++ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, ++ 'LTSUGAR_VERSION' => 1, ++ '_LT_PROG_LTMAIN' => 1, ++ 'LT_SYS_SYMBOL_USCORE' => 1, ++ '_AM_PROG_TAR' => 1, ++ 'AC_LIBTOOL_GCJ' => 1, ++ 'LT_SYS_DLOPEN_DEPLIBS' => 1, ++ 'LT_FUNC_DLSYM_USCORE' => 1, ++ '_LT_AC_LANG_F77' => 1, ++ 'AC_LIBTOOL_CONFIG' => 1, ++ 'AC_LTDL_DLLIB' => 1, ++ '_AM_SUBST_NOTMAKE' => 1, ++ '_AM_AUTOCONF_VERSION' => 1, ++ 'AM_DISABLE_SHARED' => 1, ++ '_LT_PROG_ECHO_BACKSLASH' => 1, ++ '_LTDL_SETUP' => 1, ++ '_LT_AC_LANG_CXX' => 1, ++ 'AM_PROG_LIBTOOL' => 1, ++ 'AM_PROG_LD' => 1, ++ '_LT_AC_FILE_LTDLL_C' => 1, ++ 'AC_LIB_LTDL' => 1, ++ 'AU_DEFUN' => 1, ++ 'AC_PROG_NM' => 1, ++ 'AC_LIBTOOL_DLOPEN' => 1, ++ 'AC_PROG_LD' => 1, ++ 'IT_PROG_INTLTOOL' => 1, ++ 'AC_PROG_LD_GNU' => 1, ++ 'AC_ENABLE_FAST_INSTALL' => 1, ++ 'AM_GCONF_SOURCE_2' => 1, ++ 'AC_LIBTOOL_FC' => 1, ++ 'LTDL_CONVENIENCE' => 1, ++ '_AM_SET_OPTION' => 1, ++ 'AC_LTDL_PREOPEN' => 1, ++ '_LT_LINKER_BOILERPLATE' => 1, ++ '_LT_PREPARE_SED_QUOTE_VARS' => 1, ++ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, ++ 'AC_LIBTOOL_PROG_CC_C_O' => 1, ++ 'GLIB_RUN_PROG' => 1, ++ 'gl_PREREQ_ARGZ' => 1, ++ 'LT_SUPPORTED_TAG' => 1, ++ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'LT_SYS_MODULE_EXT' => 1, ++ 'LT_PROG_RC' => 1, ++ 'AC_DEFUN_ONCE' => 1, ++ '_LT_AC_LANG_GCJ' => 1, ++ 'AC_LTDL_OBJDIR' => 1, ++ '_LT_PATH_TOOL_PREFIX' => 1, ++ 'AC_LIBTOOL_RC' => 1, ++ '_LT_AC_PROG_ECHO_BACKSLASH' => 1, ++ 'AC_DISABLE_FAST_INSTALL' => 1, ++ 'AM_SILENT_RULES' => 1, ++ '_IT_SUBST' => 1, ++ 'include' => 1, ++ '_LT_AC_TRY_DLOPEN_SELF' => 1, ++ '_LT_AC_SYS_LIBPATH_AIX' => 1, ++ 'LT_AC_PROG_SED' => 1, ++ 'AM_ENABLE_SHARED' => 1, ++ 'LTDL_INSTALLABLE' => 1, ++ '_LT_AC_LANG_GCJ_CONFIG' => 1, ++ 'AC_ENABLE_SHARED' => 1, ++ '_LT_REQUIRED_DARWIN_CHECKS' => 1, ++ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, ++ 'AC_ENABLE_STATIC' => 1, ++ 'AM_PROG_CC_C_O' => 1, ++ '_LT_AC_TAGVAR' => 1, ++ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, ++ 'AM_CONDITIONAL' => 1, ++ 'LT_LIB_DLLOAD' => 1, ++ 'LTVERSION_VERSION' => 1, ++ '_LT_PROG_CXX' => 1, ++ '_LT_PROG_F77' => 1, ++ 'LTDL_INIT' => 1, ++ 'm4_include' => 1, ++ 'AM_PROG_INSTALL_SH' => 1, ++ 'AC_PROG_EGREP' => 1, ++ 'AC_PATH_MAGIC' => 1, ++ '_AC_AM_CONFIG_HEADER_HOOK' => 1, ++ 'AC_LTDL_SYSSEARCHPATH' => 1, ++ 'AS_AC_EXPAND' => 1, ++ 'AM_MAKE_INCLUDE' => 1, ++ 'LT_CMD_MAX_LEN' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ 'm4_pattern_forbid' => 1, ++ '_LT_LINKER_OPTION' => 1, ++ 'AC_LIBTOOL_COMPILER_OPTION' => 1, ++ 'AC_DISABLE_SHARED' => 1, ++ 'AS_NANO' => 1, ++ '_LT_COMPILER_BOILERPLATE' => 1, ++ 'AC_LIBTOOL_WIN32_DLL' => 1, ++ 'AC_LIBTOOL_SETUP' => 1, ++ 'AM_GLIB_GNU_GETTEXT' => 1, ++ 'AC_PROG_LD_RELOAD_FLAG' => 1, ++ 'AC_LTDL_DLSYM_USCORE' => 1, ++ 'AS_COMPILER_FLAG' => 1, ++ 'AM_MISSING_HAS_RUN' => 1, ++ 'LT_LANG' => 1, ++ 'LT_SYS_DLSEARCH_PATH' => 1, ++ 'LT_CONFIG_LTDL_DIR' => 1, ++ 'IT_PO_SUBDIR' => 1, ++ 'AC_LIBTOOL_DLOPEN_SELF' => 1, ++ 'LT_OUTPUT' => 1, ++ 'AM_NLS' => 1, ++ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, ++ '_PKG_SHORT_ERRORS_SUPPORTED' => 1, ++ 'AC_WITH_LTDL' => 1, ++ 'AC_LIBTOOL_LINKER_OPTION' => 1, ++ 'PKG_CHECK_EXISTS' => 1, ++ 'LT_AC_PROG_RC' => 1, ++ 'AC_LIBTOOL_CXX' => 1, ++ 'LT_INIT' => 1, ++ 'LT_AC_PROG_GCJ' => 1, ++ 'LT_SYS_DLOPEN_SELF' => 1, ++ '_LT_AC_PROG_CXXCPP' => 1, ++ 'AM_DEP_TRACK' => 1, ++ 'AM_DISABLE_STATIC' => 1, ++ 'AM_CONFIG_HEADER' => 1, ++ '_AC_PROG_LIBTOOL' => 1, ++ '_AM_IF_OPTION' => 1, ++ 'AC_PATH_TOOL_PREFIX' => 1, ++ 'm4_pattern_allow' => 1, ++ 'AC_LIBTOOL_F77' => 1, ++ 'AM_SET_LEADING_DOT' => 1, ++ '_LT_PROG_FC' => 1, ++ 'LT_AC_PROG_EGREP' => 1, ++ '_AM_DEPENDENCIES' => 1, ++ 'AC_LIBTOOL_LANG_C_CONFIG' => 1, ++ 'LTOPTIONS_VERSION' => 1, ++ '_LT_AC_SYS_COMPILER' => 1, ++ 'AM_PROG_NM' => 1, ++ 'PKG_CHECK_MODULES' => 1, ++ 'AC_LIBLTDL_CONVENIENCE' => 1, ++ 'AC_DEPLIBS_CHECK_METHOD' => 1, ++ 'AC_LIBLTDL_INSTALLABLE' => 1, ++ 'jm_MAINTAINER_MODE' => 1, ++ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, ++ 'AC_LTDL_ENABLE_INSTALL' => 1, ++ 'LT_PROG_GCJ' => 1, ++ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, ++ 'AM_GLIB_DEFINE_LOCALEDIR' => 1, ++ 'AM_INIT_AUTOMAKE' => 1, ++ 'AC_DISABLE_STATIC' => 1, ++ 'AS_VERSION' => 1, ++ 'LT_PATH_NM' => 1, ++ 'AM_MAINTAINER_MODE' => 1, ++ 'AC_LTDL_SHLIBEXT' => 1, ++ '_LT_AC_LOCK' => 1, ++ '_LT_AC_LANG_RC_CONFIG' => 1, ++ 'LT_SYS_MODULE_PATH' => 1, ++ 'LT_WITH_LTDL' => 1, ++ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, ++ 'AC_PROG_INTLTOOL' => 1, ++ 'AC_LTDL_SHLIBPATH' => 1, ++ 'AM_AUX_DIR_EXPAND' => 1, ++ '_LT_AC_LANG_F77_CONFIG' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, ++ '_LT_COMPILER_OPTION' => 1, ++ '_AM_SET_OPTIONS' => 1, ++ 'AM_RUN_LOG' => 1, ++ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'AC_LIBTOOL_PICMODE' => 1, ++ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, ++ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, ++ 'AC_CHECK_LIBM' => 1, ++ 'LT_PATH_LD' => 1, ++ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, ++ '_AM_MANGLE_OPTION' => 1, ++ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, ++ 'AC_LTDL_SYMBOL_USCORE' => 1, ++ 'AM_SET_DEPDIR' => 1, ++ 'PKG_PROG_PKG_CONFIG' => 1, ++ '_LT_CC_BASENAME' => 1, ++ '_LT_LIBOBJ' => 1 ++ } ++ ], 'Autom4te::Request' ), ++ bless( [ ++ '1', ++ 1, ++ [ ++ '/usr/share/autoconf' ++ ], ++ [ ++ '/usr/share/autoconf/autoconf/autoconf.m4f', ++ 'aclocal.m4', ++ 'configure.ac' ++ ], ++ { ++ 'AM_PROG_F77_C_O' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ 'AC_INIT' => 1, ++ 'm4_pattern_forbid' => 1, ++ 'AC_CANONICAL_TARGET' => 1, ++ '_AM_COND_IF' => 1, ++ 'AC_CONFIG_LIBOBJ_DIR' => 1, ++ 'AC_SUBST' => 1, ++ 'AC_CANONICAL_HOST' => 1, ++ 'AC_FC_SRCEXT' => 1, ++ 'AC_PROG_LIBTOOL' => 1, ++ 'AM_INIT_AUTOMAKE' => 1, ++ 'AC_CONFIG_SUBDIRS' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'LT_CONFIG_LTDL_DIR' => 1, ++ 'AC_CONFIG_LINKS' => 1, ++ 'AC_REQUIRE_AUX_FILE' => 1, ++ 'LT_SUPPORTED_TAG' => 1, ++ 'm4_sinclude' => 1, ++ 'AM_MAINTAINER_MODE' => 1, ++ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, ++ '_m4_warn' => 1, ++ 'AM_PROG_CXX_C_O' => 1, ++ '_AM_COND_ENDIF' => 1, ++ 'AM_ENABLE_MULTILIB' => 1, ++ 'AM_SILENT_RULES' => 1, ++ 'AC_CONFIG_FILES' => 1, ++ 'LT_INIT' => 1, ++ 'include' => 1, ++ 'AM_GNU_GETTEXT' => 1, ++ 'AC_LIBSOURCE' => 1, ++ 'AC_CANONICAL_BUILD' => 1, ++ 'AM_PROG_FC_C_O' => 1, ++ 'AC_FC_FREEFORM' => 1, ++ 'AH_OUTPUT' => 1, ++ 'AC_CONFIG_AUX_DIR' => 1, ++ '_AM_SUBST_NOTMAKE' => 1, ++ 'AM_PROG_CC_C_O' => 1, ++ 'm4_pattern_allow' => 1, ++ 'sinclude' => 1, ++ 'AM_CONDITIONAL' => 1, ++ 'AC_CANONICAL_SYSTEM' => 1, ++ 'AC_CONFIG_HEADERS' => 1, ++ 'AC_DEFINE_TRACE_LITERAL' => 1, ++ 'm4_include' => 1, ++ '_AM_COND_ELSE' => 1, ++ 'AC_SUBST_TRACE' => 1 ++ } ++ ], 'Autom4te::Request' ) ++ ); ++ +diff -Naur gnome-media-2.32.0.orig/autom4te.cache/traces.0 gnome-media-2.32.0.patched/autom4te.cache/traces.0 +--- gnome-media-2.32.0.orig/autom4te.cache/traces.0 1969-12-31 19:00:00.000000000 -0500 ++++ gnome-media-2.32.0.patched/autom4te.cache/traces.0 2011-08-24 22:23:49.000000000 -0400 +@@ -0,0 +1,3342 @@ ++m4trace:/usr/share/aclocal/argz.m4:12: -1- AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ ++ ++AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) ++ ++AC_CHECK_TYPES([error_t], ++ [], ++ [AC_DEFINE([error_t], [int], ++ [Define to a type to use for `error_t' if it is not otherwise available.]) ++ AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h ++ does not typedef error_t.])], ++ [#if defined(HAVE_ARGZ_H) ++# include <argz.h> ++#endif]) ++ ++ARGZ_H= ++AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ ++ argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) ++ ++dnl if have system argz functions, allow forced use of ++dnl libltdl-supplied implementation (and default to do so ++dnl on "known bad" systems). Could use a runtime check, but ++dnl (a) detecting malloc issues is notoriously unreliable ++dnl (b) only known system that declares argz functions, ++dnl provides them, yet they are broken, is cygwin ++dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) ++dnl So, it's more straightforward simply to special case ++dnl this for known bad systems. ++AS_IF([test -z "$ARGZ_H"], ++ [AC_CACHE_CHECK( ++ [if argz actually works], ++ [lt_cv_sys_argz_works], ++ [[case $host_os in #( ++ *cygwin*) ++ lt_cv_sys_argz_works=no ++ if test "$cross_compiling" != no; then ++ lt_cv_sys_argz_works="guessing no" ++ else ++ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' ++ save_IFS=$IFS ++ IFS=-. ++ set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` ++ IFS=$save_IFS ++ lt_os_major=${2-0} ++ lt_os_minor=${3-0} ++ lt_os_micro=${4-0} ++ if test "$lt_os_major" -gt 1 \ ++ || { test "$lt_os_major" -eq 1 \ ++ && { test "$lt_os_minor" -gt 5 \ ++ || { test "$lt_os_minor" -eq 5 \ ++ && test "$lt_os_micro" -gt 24; }; }; }; then ++ lt_cv_sys_argz_works=yes ++ fi ++ fi ++ ;; #( ++ *) lt_cv_sys_argz_works=yes ;; ++ esac]]) ++ AS_IF([test $lt_cv_sys_argz_works = yes], ++ [AC_DEFINE([HAVE_WORKING_ARGZ], 1, ++ [This value is set to 1 to indicate that the system argz facility works])], ++ [ARGZ_H=argz.h ++ AC_LIBOBJ([argz])])]) ++ ++AC_SUBST([ARGZ_H]) ++]) ++m4trace:/usr/share/aclocal/argz.m4:79: -1- AC_DEFUN([gl_PREREQ_ARGZ], [:]) ++m4trace:/usr/share/aclocal/gconf-2.m4:8: -1- AC_DEFUN([AM_GCONF_SOURCE_2], [ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--disable-schemas-install], ++ [Disable the schemas installation]), ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++m4trace:/usr/share/aclocal/glib-gettext.m4:412: -1- AC_DEFUN([AM_GLIB_GNU_GETTEXT], [GLIB_GNU_GETTEXT($@)]) ++m4trace:/usr/share/aclocal/glib-gettext.m4:412: -1- AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR], [GLIB_DEFINE_LOCALEDIR($@)]) ++m4trace:/usr/share/aclocal/glib-gettext.m4:422: -1- AC_DEFUN([GLIB_RUN_PROG], [cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) ++m4trace:/usr/share/aclocal/ltdl.m4:16: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT]) ++_$0($*) ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:68: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl ++dnl Although the argument is deprecated and no longer documented, ++dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one ++dnl here make sure it is the same as any other declaration of libltdl's ++dnl location! This also ensures lt_ltdl_dir is set when configure.ac is ++dnl not yet using an explicit LT_CONFIG_LTDL_DIR. ++m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl ++_$0() ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) ++_LTDL_CONVENIENCE]) ++m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_CONVENIENCE' is obsolete. ++You should run autoupdate.])dnl ++_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) ++_LTDL_CONVENIENCE]) ++m4trace:/usr/share/aclocal/ltdl.m4:124: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl ++dnl Although the argument is deprecated and no longer documented, ++dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one ++dnl here make sure it is the same as any other declaration of libltdl's ++dnl location! This also ensures lt_ltdl_dir is set when configure.ac is ++dnl not yet using an explicit LT_CONFIG_LTDL_DIR. ++m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl ++_$0() ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) ++_LTDL_INSTALLABLE]) ++m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_INSTALLABLE' is obsolete. ++You should run autoupdate.])dnl ++_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) ++_LTDL_INSTALLABLE]) ++m4trace:/usr/share/aclocal/ltdl.m4:213: -1- AC_DEFUN([_LT_LIBOBJ], [ ++ m4_pattern_allow([^_LT_LIBOBJS$]) ++ _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:226: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) ++ ++dnl We need to keep our own list of libobjs separate from our parent project, ++dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while ++dnl we look for our own LIBOBJs. ++m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) ++m4_pushdef([AC_LIBSOURCES]) ++ ++dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: ++m4_if(_LTDL_MODE, [], ++ [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) ++ m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], ++ [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) ++ ++AC_ARG_WITH([included_ltdl], ++ [AS_HELP_STRING([--with-included-ltdl], ++ [use the GNU ltdl sources included here])]) ++ ++if test "x$with_included_ltdl" != xyes; then ++ # We are not being forced to use the included libltdl sources, so ++ # decide whether there is a useful installed version we can use. ++ AC_CHECK_HEADER([ltdl.h], ++ [AC_CHECK_DECL([lt_dlinterface_register], ++ [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], ++ [with_included_ltdl=no], ++ [with_included_ltdl=yes])], ++ [with_included_ltdl=yes], ++ [AC_INCLUDES_DEFAULT ++ #include <ltdl.h>])], ++ [with_included_ltdl=yes], ++ [AC_INCLUDES_DEFAULT] ++ ) ++fi ++ ++dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE ++dnl was called yet, then for old times' sake, we assume libltdl is in an ++dnl eponymous directory: ++AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) ++ ++AC_ARG_WITH([ltdl_include], ++ [AS_HELP_STRING([--with-ltdl-include=DIR], ++ [use the ltdl headers installed in DIR])]) ++ ++if test -n "$with_ltdl_include"; then ++ if test -f "$with_ltdl_include/ltdl.h"; then : ++ else ++ AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include']) ++ fi ++else ++ with_ltdl_include=no ++fi ++ ++AC_ARG_WITH([ltdl_lib], ++ [AS_HELP_STRING([--with-ltdl-lib=DIR], ++ [use the libltdl.la installed in DIR])]) ++ ++if test -n "$with_ltdl_lib"; then ++ if test -f "$with_ltdl_lib/libltdl.la"; then : ++ else ++ AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib']) ++ fi ++else ++ with_ltdl_lib=no ++fi ++ ++case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in ++ ,yes,no,no,) ++ m4_case(m4_default(_LTDL_TYPE, [convenience]), ++ [convenience], [_LTDL_CONVENIENCE], ++ [installable], [_LTDL_INSTALLABLE], ++ [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) ++ ;; ++ ,no,no,no,) ++ # If the included ltdl is not to be used, then use the ++ # preinstalled libltdl we found. ++ AC_DEFINE([HAVE_LTDL], [1], ++ [Define this if a modern libltdl is already installed]) ++ LIBLTDL=-lltdl ++ LTDLDEPS= ++ LTDLINCL= ++ ;; ++ ,no*,no,*) ++ AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together]) ++ ;; ++ *) with_included_ltdl=no ++ LIBLTDL="-L$with_ltdl_lib -lltdl" ++ LTDLDEPS= ++ LTDLINCL="-I$with_ltdl_include" ++ ;; ++esac ++INCLTDL="$LTDLINCL" ++ ++# Report our decision... ++AC_MSG_CHECKING([where to find libltdl headers]) ++AC_MSG_RESULT([$LTDLINCL]) ++AC_MSG_CHECKING([where to find libltdl library]) ++AC_MSG_RESULT([$LIBLTDL]) ++ ++_LTDL_SETUP ++ ++dnl restore autoconf definition. ++m4_popdef([AC_LIBOBJ]) ++m4_popdef([AC_LIBSOURCES]) ++ ++AC_CONFIG_COMMANDS_PRE([ ++ _ltdl_libobjs= ++ _ltdl_ltlibobjs= ++ if test -n "$_LT_LIBOBJS"; then ++ # Remove the extension. ++ _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' ++ for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do ++ _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" ++ _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" ++ done ++ fi ++ AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) ++ AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) ++]) ++ ++# Only expand once: ++m4_define([LTDL_INIT]) ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:352: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:352: -1- AC_DEFUN([AC_LIB_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_LIB_LTDL' is obsolete. ++You should run autoupdate.])dnl ++LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_WITH_LTDL' is obsolete. ++You should run autoupdate.])dnl ++LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([LT_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `LT_WITH_LTDL' is obsolete. ++You should run autoupdate.])dnl ++LTDL_INIT($@)]) ++m4trace:/usr/share/aclocal/ltdl.m4:367: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_SYS_MODULE_EXT])dnl ++AC_REQUIRE([LT_SYS_MODULE_PATH])dnl ++AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl ++AC_REQUIRE([LT_LIB_DLLOAD])dnl ++AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl ++AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl ++AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl ++AC_REQUIRE([gl_FUNC_ARGZ])dnl ++ ++m4_require([_LT_CHECK_OBJDIR])dnl ++m4_require([_LT_HEADER_DLFCN])dnl ++m4_require([_LT_CHECK_DLPREOPEN])dnl ++m4_require([_LT_DECL_SED])dnl ++ ++dnl Don't require this, or it will be expanded earlier than the code ++dnl that sets the variables it relies on: ++_LT_ENABLE_INSTALL ++ ++dnl _LTDL_MODE specific code must be called at least once: ++_LTDL_MODE_DISPATCH ++ ++# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS ++# the user used. This is so that ltdl.h can pick up the parent projects ++# config.h file, The first file in AC_CONFIG_HEADERS must contain the ++# definitions required by ltdl.c. ++# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). ++AC_CONFIG_COMMANDS_PRE([dnl ++m4_pattern_allow([^LT_CONFIG_H$])dnl ++m4_ifset([AH_HEADER], ++ [LT_CONFIG_H=AH_HEADER], ++ [m4_ifset([AC_LIST_HEADERS], ++ [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[ ]]*,,;s,[[ :]].*$,,'`], ++ [])])]) ++AC_SUBST([LT_CONFIG_H]) ++ ++AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], ++ [], [], [AC_INCLUDES_DEFAULT]) ++ ++AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) ++AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) ++ ++m4_pattern_allow([LT_LIBEXT])dnl ++AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) ++ ++name=ltdl ++LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` ++AC_SUBST([LTDLOPEN]) ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:438: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_CACHE_CHECK([whether deplibs are loaded by dlopen], ++ [lt_cv_sys_dlopen_deplibs], ++ [# PORTME does your system automatically load deplibs for dlopen? ++ # or its logical equivalent (e.g. shl_load for HP-UX < 11) ++ # For now, we just catch OSes we know something about -- in the ++ # future, we'll try test this programmatically. ++ lt_cv_sys_dlopen_deplibs=unknown ++ case $host_os in ++ aix3*|aix4.1.*|aix4.2.*) ++ # Unknown whether this is true for these versions of AIX, but ++ # we want this `case' here to explicitly catch those versions. ++ lt_cv_sys_dlopen_deplibs=unknown ++ ;; ++ aix[[4-9]]*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ lt_cv_sys_dlopen_deplibs=no ++ ;; ++ esac ++ ;; ++ darwin*) ++ # Assuming the user has installed a libdl from somewhere, this is true ++ # If you are looking for one http://www.opendarwin.org/projects/dlcompat ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ freebsd* | dragonfly*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) ++ # GNU and its variants, using gnu ld.so (Glibc) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ hpux10*|hpux11*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ interix*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ irix[[12345]]*|irix6.[[01]]*) ++ # Catch all versions of IRIX before 6.2, and indicate that we don't ++ # know how it worked for any of those versions. ++ lt_cv_sys_dlopen_deplibs=unknown ++ ;; ++ irix*) ++ # The case above catches anything before 6.2, and it's known that ++ # at 6.2 and later dlopen does load deplibs. ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ netbsd*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ openbsd*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ osf[[1234]]*) ++ # dlopen did load deplibs (at least at 4.x), but until the 5.x series, ++ # it did *not* use an RPATH in a shared library to find objects the ++ # library depends on, so we explicitly say `no'. ++ lt_cv_sys_dlopen_deplibs=no ++ ;; ++ osf5.0|osf5.0a|osf5.1) ++ # dlopen *does* load deplibs and with the right loader patch applied ++ # it even uses RPATH in a shared library to search for shared objects ++ # that the library depends on, but there's no easy way to know if that ++ # patch is installed. Since this is the case, all we can really ++ # say is unknown -- it depends on the patch being installed. If ++ # it is, this changes to `yes'. Without it, it would be `no'. ++ lt_cv_sys_dlopen_deplibs=unknown ++ ;; ++ osf*) ++ # the two cases above should catch all versions of osf <= 5.1. Read ++ # the comments above for what we know about them. ++ # At > 5.1, deplibs are loaded *and* any RPATH in a shared library ++ # is used to find them so we can finally say `yes'. ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ qnx*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ solaris*) ++ lt_cv_sys_dlopen_deplibs=yes ++ ;; ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ libltdl_cv_sys_dlopen_deplibs=yes ++ ;; ++ esac ++ ]) ++if test "$lt_cv_sys_dlopen_deplibs" != yes; then ++ AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], ++ [Define if the OS needs help to load dependent libraries for dlopen().]) ++fi ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:537: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:537: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:544: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl ++AC_CACHE_CHECK([which extension is used for runtime loadable modules], ++ [libltdl_cv_shlibext], ++[ ++module=yes ++eval libltdl_cv_shlibext=$shrext_cmds ++ ]) ++if test -n "$libltdl_cv_shlibext"; then ++ m4_pattern_allow([LT_MODULE_EXT])dnl ++ AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], ++ [Define to the extension used for runtime loadable modules, say, ".so".]) ++fi ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:560: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:560: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBEXT' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:567: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl ++AC_CACHE_CHECK([which variable specifies run-time module search path], ++ [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"]) ++if test -n "$lt_cv_module_path_var"; then ++ m4_pattern_allow([LT_MODULE_PATH_VAR])dnl ++ AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], ++ [Define to the name of the environment variable that determines the run-time module search path.]) ++fi ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:579: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:579: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBPATH' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:586: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl ++AC_CACHE_CHECK([for the default library search path], ++ [lt_cv_sys_dlsearch_path], ++ [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"]) ++if test -n "$lt_cv_sys_dlsearch_path"; then ++ sys_dlsearch_path= ++ for dir in $lt_cv_sys_dlsearch_path; do ++ if test -z "$sys_dlsearch_path"; then ++ sys_dlsearch_path="$dir" ++ else ++ sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir" ++ fi ++ done ++ m4_pattern_allow([LT_DLSEARCH_PATH])dnl ++ AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], ++ [Define to the system default library search path.]) ++fi ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:607: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:607: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYSSEARCHPATH' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:633: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$]) ++LT_DLLOADERS= ++AC_SUBST([LT_DLLOADERS]) ++ ++AC_LANG_PUSH([C]) ++ ++LIBADD_DLOPEN= ++AC_SEARCH_LIBS([dlopen], [dl], ++ [AC_DEFINE([HAVE_LIBDL], [1], ++ [Define if you have the libdl library or equivalent.]) ++ if test "$ac_cv_search_dlopen" != "none required" ; then ++ LIBADD_DLOPEN="-ldl" ++ fi ++ libltdl_cv_lib_dl_dlopen="yes" ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], ++ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H ++# include <dlfcn.h> ++#endif ++ ]], [[dlopen(0, 0);]])], ++ [AC_DEFINE([HAVE_LIBDL], [1], ++ [Define if you have the libdl library or equivalent.]) ++ libltdl_cv_func_dlopen="yes" ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [AC_DEFINE([HAVE_LIBDL], [1], ++ [Define if you have the libdl library or equivalent.]) ++ LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes" ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) ++if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes ++then ++ lt_save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBADD_DLOPEN" ++ AC_CHECK_FUNCS([dlerror]) ++ LIBS="$lt_save_LIBS" ++fi ++AC_SUBST([LIBADD_DLOPEN]) ++ ++LIBADD_SHL_LOAD= ++AC_CHECK_FUNC([shl_load], ++ [AC_DEFINE([HAVE_SHL_LOAD], [1], ++ [Define if you have the shl_load function.]) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [AC_DEFINE([HAVE_SHL_LOAD], [1], ++ [Define if you have the shl_load function.]) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" ++ LIBADD_SHL_LOAD="-ldld"])]) ++AC_SUBST([LIBADD_SHL_LOAD]) ++ ++case $host_os in ++darwin[[1567]].*) ++# We only want this for pre-Mac OS X 10.4. ++ AC_CHECK_FUNC([_dyld_func_lookup], ++ [AC_DEFINE([HAVE_DYLD], [1], ++ [Define if you have the _dyld_func_lookup function.]) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) ++ ;; ++beos*) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" ++ ;; ++cygwin* | mingw* | os2* | pw32*) ++ AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]]) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" ++ ;; ++esac ++ ++AC_CHECK_LIB([dld], [dld_link], ++ [AC_DEFINE([HAVE_DLD], [1], ++ [Define if you have the GNU dld library.]) ++ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) ++AC_SUBST([LIBADD_DLD_LINK]) ++ ++m4_pattern_allow([^LT_DLPREOPEN$]) ++LT_DLPREOPEN= ++if test -n "$LT_DLLOADERS" ++then ++ for lt_loader in $LT_DLLOADERS; do ++ LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " ++ done ++ AC_DEFINE([HAVE_LIBDLLOADER], [1], ++ [Define if libdlloader will be built on this platform]) ++fi ++AC_SUBST([LT_DLPREOPEN]) ++ ++dnl This isn't used anymore, but set it for backwards compatibility ++LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" ++AC_SUBST([LIBADD_DL]) ++ ++AC_LANG_POP ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:726: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:726: -1- AC_DEFUN([AC_LTDL_DLLIB], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLLIB' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:734: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++AC_CACHE_CHECK([for _ prefix in compiled symbols], ++ [lt_cv_sys_symbol_underscore], ++ [lt_cv_sys_symbol_underscore=no ++ cat > conftest.$ac_ext <<_LT_EOF ++void nm_test_func(){} ++int main(){nm_test_func;return 0;} ++_LT_EOF ++ if AC_TRY_EVAL(ac_compile); then ++ # Now try to grab the symbols. ++ ac_nlist=conftest.nm ++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then ++ # See whether the symbols have a leading underscore. ++ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then ++ lt_cv_sys_symbol_underscore=yes ++ else ++ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then ++ : ++ else ++ echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ fi ++ else ++ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.c >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf conftest* ++ ]) ++ sys_symbol_underscore=$lt_cv_sys_symbol_underscore ++ AC_SUBST([sys_symbol_underscore]) ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:771: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:771: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYMBOL_USCORE' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:778: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl ++if test x"$lt_cv_sys_symbol_underscore" = xyes; then ++ if test x"$libltdl_cv_func_dlopen" = xyes || ++ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then ++ AC_CACHE_CHECK([whether we have to add an underscore for dlsym], ++ [libltdl_cv_need_uscore], ++ [libltdl_cv_need_uscore=unknown ++ save_LIBS="$LIBS" ++ LIBS="$LIBS $LIBADD_DLOPEN" ++ _LT_TRY_DLOPEN_SELF( ++ [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes], ++ [], [libltdl_cv_need_uscore=cross]) ++ LIBS="$save_LIBS" ++ ]) ++ fi ++fi ++ ++if test x"$libltdl_cv_need_uscore" = xyes; then ++ AC_DEFINE([NEED_USCORE], [1], ++ [Define if dlsym() requires a leading underscore in symbol names.]) ++fi ++]) ++m4trace:/usr/share/aclocal/ltdl.m4:803: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])]) ++m4trace:/usr/share/aclocal/ltdl.m4:803: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLSYM_USCORE' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])]) ++m4trace:/usr/share/aclocal/nls.m4:23: -1- AC_DEFUN([AM_NLS], [ ++ AC_MSG_CHECKING([whether NLS is requested]) ++ dnl Default is enabled NLS ++ AC_ARG_ENABLE([nls], ++ [ --disable-nls do not use Native Language Support], ++ USE_NLS=$enableval, USE_NLS=yes) ++ AC_MSG_RESULT([$USE_NLS]) ++ AC_SUBST([USE_NLS]) ++]) ++m4trace:/usr/share/aclocal/pkg.m4:26: -1- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl ++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then ++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) ++fi ++if test -n "$PKG_CONFIG"; then ++ _pkg_min_version=m4_default([$1], [0.9.0]) ++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) ++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ PKG_CONFIG="" ++ fi ++ ++fi[]dnl ++]) ++m4trace:/usr/share/aclocal/pkg.m4:56: -1- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++if test -n "$PKG_CONFIG" && \ ++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then ++ m4_ifval([$2], [$2], [:]) ++m4_ifvaln([$3], [else ++ $3])dnl ++fi]) ++m4trace:/usr/share/aclocal/pkg.m4:82: -1- AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi[]dnl ++]) ++m4trace:/usr/share/aclocal/pkg.m4:102: -1- AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++]) ++m4trace:/usr/share/aclocal-1.11/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' ++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.11.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++m4trace:/usr/share/aclocal-1.11/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.11.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++m4trace:/usr/share/aclocal-1.11/auxdir.m4:47: -1- 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` ++]) ++m4trace:/usr/share/aclocal-1.11/cond.m4:15: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++m4trace:/usr/share/aclocal-1.11/depend.m4:28: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl ++ ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) ++ ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub ++ ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done ++ ++ cd .. ++ rm -rf conftest.dir ++else ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) ++m4trace:/usr/share/aclocal-1.11/depend.m4:163: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) ++m4trace:/usr/share/aclocal-1.11/depend.m4:171: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) ++m4trace:/usr/share/aclocal-1.11/depout.m4:14: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++]) ++m4trace:/usr/share/aclocal-1.11/depout.m4:75: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++m4trace:/usr/share/aclocal-1.11/header.m4:12: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) ++m4trace:/usr/share/aclocal-1.11/header.m4:12: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. ++You should run autoupdate.])dnl ++AC_CONFIG_HEADERS($@)]) ++m4trace:/usr/share/aclocal-1.11/init.m4:26: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.62])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) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++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 ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++]) ++m4trace:/usr/share/aclocal-1.11/init.m4:126: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) ++m4trace:/usr/share/aclocal-1.11/install-sh.m4:11: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) ++m4trace:/usr/share/aclocal-1.11/lead-dot.m4:12: -1- 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])]) ++m4trace:/usr/share/aclocal-1.11/maintainer.m4:19: -1- AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++ ++]) ++m4trace:/usr/share/aclocal-1.11/maintainer.m4:39: -1- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) ++m4trace:/usr/share/aclocal-1.11/maintainer.m4:39: -1- AC_DEFUN([jm_MAINTAINER_MODE], [AC_DIAGNOSE([obsolete], [The macro `jm_MAINTAINER_MODE' is obsolete. ++You should run autoupdate.])dnl ++AM_MAINTAINER_MODE]) ++m4trace:/usr/share/aclocal-1.11/make.m4:14: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) ++m4trace:/usr/share/aclocal-1.11/minuso.m4:14: -1- AC_DEFUN([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC_C_O])dnl ++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++dnl Make sure AC_PROG_CC is never called again, or it will override our ++dnl setting of CC. ++m4_define([AC_PROG_CC], ++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ++]) ++m4trace:/usr/share/aclocal-1.11/missing.m4:14: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) ++m4trace:/usr/share/aclocal-1.11/missing.m4:24: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# 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 ++]) ++m4trace:/usr/share/aclocal-1.11/mkdirp.m4:11: -1- 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 ++]) ++m4trace:/usr/share/aclocal-1.11/options.m4:13: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++m4trace:/usr/share/aclocal-1.11/options.m4:19: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++m4trace:/usr/share/aclocal-1.11/options.m4:25: -1- AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++m4trace:/usr/share/aclocal-1.11/options.m4:31: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++m4trace:/usr/share/aclocal-1.11/runlog.m4:12: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) ++m4trace:/usr/share/aclocal-1.11/sanity.m4:14: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac ++ ++# 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)]) ++m4trace:/usr/share/aclocal-1.11/silent.m4:14: -1- AC_DEFUN([AM_SILENT_RULES], [AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) ++m4trace:/usr/share/aclocal-1.11/strip.m4:17: -1- 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])]) ++m4trace:/usr/share/aclocal-1.11/substnot.m4:14: -1- AC_DEFUN([_AM_SUBST_NOTMAKE]) ++m4trace:/usr/share/aclocal-1.11/substnot.m4:19: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++m4trace:/usr/share/aclocal-1.11/tar.m4:24: -1- 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 <conftest.tar]) ++ grep GrepMe conftest.dir/file >/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]) ++]) ++m4trace:m4/as-ac-expand.m4:6: -1- AC_DEFUN([AS_AC_EXPAND], [ ++ EXP_VAR=[$1] ++ FROM_VAR=[$2] ++ ++ dnl first expand prefix and exec_prefix if necessary ++ prefix_save=$prefix ++ if test "x$prefix" = "xNONE"; then ++ prefix=/usr/local ++ fi ++ exec_prefix_save=$exec_prefix ++ if test "x$exec_prefix" = "xNONE"; then ++ exec_prefix=/usr/local ++ fi ++ ++ full_var="$FROM_VAR" ++ dnl loop until it doesn't change anymore ++ while true; do ++ new_full_var="`eval echo $full_var`" ++ if test "x$new_full_var"="x$full_var"; then break; fi ++ full_var=$new_full_var ++ done ++ ++ dnl clean up ++ full_var=$new_full_var ++ AC_SUBST([$1], "$full_var") ++ prefix=$prefix_save ++ exec_prefix=$exec_prefix_save ++]) ++m4trace:m4/as-compiler-flag.m4:14: -1- AC_DEFUN([AS_COMPILER_FLAG], [ ++ AC_MSG_CHECKING([to see if compiler understands $1]) ++ ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $1" ++ ++ AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no]) ++ CFLAGS="$save_CFLAGS" ++ ++ if test "X$flag_ok" = Xyes ; then ++ $2 ++ true ++ else ++ $3 ++ true ++ fi ++ AC_MSG_RESULT([$flag_ok]) ++]) ++m4trace:m4/as-version.m4:24: -1- AC_DEFUN([AS_VERSION], [ ++ PACKAGE_VERSION_MAJOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f1) ++ PACKAGE_VERSION_MINOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f2) ++ PACKAGE_VERSION_MICRO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f3) ++ ++ AC_SUBST(PACKAGE_VERSION_MAJOR) ++ AC_SUBST(PACKAGE_VERSION_MINOR) ++ AC_SUBST(PACKAGE_VERSION_MICRO) ++]) ++m4trace:m4/as-version.m4:52: -1- AC_DEFUN([AS_NANO], [ ++ AC_MSG_CHECKING(nano version) ++ ++ NANO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f4) ++ ++ if test x"$NANO" = x || test "x$NANO" = "x0" ; then ++ AC_MSG_RESULT([0 (release)]) ++ NANO=0 ++ PACKAGE_VERSION_RELEASE=1 ++ ifelse([$1], , :, [$1]) ++ else ++ AC_MSG_RESULT($NANO) ++ PACKAGE_VERSION_RELEASE=0.`date +%Y%m%d.%H%M%S` ++ ifelse([$2], , :, [$2]) ++ fi ++ PACKAGE_VERSION_NANO=$NANO ++ AC_SUBST(PACKAGE_VERSION_NANO) ++ AC_SUBST(PACKAGE_VERSION_RELEASE) ++]) ++m4trace:m4/intltool.m4:27: -1- AC_DEFUN([IT_PROG_INTLTOOL], [ ++AC_PREREQ([2.50])dnl ++AC_REQUIRE([AM_NLS])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) ++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) ++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) ++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then ++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++_IT_SUBST(INTLTOOL_DESKTOP_RULE) ++_IT_SUBST(INTLTOOL_DIRECTORY_RULE) ++_IT_SUBST(INTLTOOL_KEYS_RULE) ++_IT_SUBST(INTLTOOL_PROP_RULE) ++_IT_SUBST(INTLTOOL_OAF_RULE) ++_IT_SUBST(INTLTOOL_PONG_RULE) ++_IT_SUBST(INTLTOOL_SERVER_RULE) ++_IT_SUBST(INTLTOOL_SHEET_RULE) ++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) ++_IT_SUBST(INTLTOOL_UI_RULE) ++_IT_SUBST(INTLTOOL_XAM_RULE) ++_IT_SUBST(INTLTOOL_KBD_RULE) ++_IT_SUBST(INTLTOOL_XML_RULE) ++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++_IT_SUBST(INTLTOOL_CAVES_RULE) ++_IT_SUBST(INTLTOOL_SCHEMAS_RULE) ++_IT_SUBST(INTLTOOL_THEME_RULE) ++_IT_SUBST(INTLTOOL_SERVICE_RULE) ++_IT_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found]) ++fi ++AC_MSG_CHECKING([for perl >= 5.8.1]) ++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 ++if test $? -ne 0; then ++ AC_MSG_ERROR([perl 5.8.1 is required for intltool]) ++else ++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" ++ AC_MSG_RESULT([$IT_PERL_VERSION]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) ++ ++IT_PO_SUBDIR([po]) ++ ++]) ++m4trace:m4/intltool.m4:172: -1- AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then ++ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) ++ fi ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.in" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) ++m4trace:m4/intltool.m4:205: -1- AC_DEFUN([_IT_SUBST], [ ++AC_SUBST([$1]) ++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) ++ ++]) ++m4trace:m4/intltool.m4:213: -1- AU_DEFUN([AC_PROG_INTLTOOL], [m4_if($#, 0, [IT_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])]) ++m4trace:m4/intltool.m4:213: -1- AC_DEFUN([AC_PROG_INTLTOOL], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_INTLTOOL' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [IT_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])]) ++m4trace:m4/libtool.m4:69: -1- AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++_LT_SETUP ++ ++# Only expand once: ++m4_define([LT_INIT]) ++]) ++m4trace:m4/libtool.m4:107: -1- AU_DEFUN([AC_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])]) ++m4trace:m4/libtool.m4:107: -1- AC_DEFUN([AC_PROG_LIBTOOL], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_INIT], [LT_INIT($@)])]) ++m4trace:m4/libtool.m4:108: -1- AU_DEFUN([AM_PROG_LIBTOOL], [m4_if($#, 0, [LT_INIT], [LT_INIT($@)])]) ++m4trace:m4/libtool.m4:108: -1- AC_DEFUN([AM_PROG_LIBTOOL], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_INIT], [LT_INIT($@)])]) ++m4trace:m4/libtool.m4:604: -1- AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], ++[# Run this file to recreate a libtool stub with the current configuration.]) ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++lt_cl_silent=false ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to <bug-libtool@gnu.org>." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2010 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++lt_cl_success=: ++test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++exec AS_MESSAGE_LOG_FD>/dev/null ++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++exec AS_MESSAGE_LOG_FD>>config.log ++$lt_cl_success || AS_EXIT(1) ++]) ++m4trace:m4/libtool.m4:788: -1- AC_DEFUN([LT_SUPPORTED_TAG], []) ++m4trace:m4/libtool.m4:799: -1- AC_DEFUN([LT_LANG], [AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++]) ++m4trace:m4/libtool.m4:861: -1- AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++m4trace:m4/libtool.m4:861: -1- AC_DEFUN([AC_LIBTOOL_CXX], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_CXX' is obsolete. ++You should run autoupdate.])dnl ++LT_LANG(C++)]) ++m4trace:m4/libtool.m4:862: -1- AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++m4trace:m4/libtool.m4:862: -1- AC_DEFUN([AC_LIBTOOL_F77], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_F77' is obsolete. ++You should run autoupdate.])dnl ++LT_LANG(Fortran 77)]) ++m4trace:m4/libtool.m4:863: -1- AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++m4trace:m4/libtool.m4:863: -1- AC_DEFUN([AC_LIBTOOL_FC], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_FC' is obsolete. ++You should run autoupdate.])dnl ++LT_LANG(Fortran)]) ++m4trace:m4/libtool.m4:864: -1- AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++m4trace:m4/libtool.m4:864: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_GCJ' is obsolete. ++You should run autoupdate.])dnl ++LT_LANG(Java)]) ++m4trace:m4/libtool.m4:865: -1- AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) ++m4trace:m4/libtool.m4:865: -1- AC_DEFUN([AC_LIBTOOL_RC], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_RC' is obsolete. ++You should run autoupdate.])dnl ++LT_LANG(Windows Resource)]) ++m4trace:m4/libtool.m4:1368: -1- AC_DEFUN([_LT_COMPILER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ 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. ++ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $RM conftest* ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$5], , :, [$5]) ++else ++ m4_if([$6], , :, [$6]) ++fi ++]) ++m4trace:m4/libtool.m4:1410: -1- AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])]) ++m4trace:m4/libtool.m4:1410: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_COMPILER_OPTION' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [_LT_COMPILER_OPTION], [_LT_COMPILER_OPTION($@)])]) ++m4trace:m4/libtool.m4:1419: -1- AC_DEFUN([_LT_LINKER_OPTION], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$4], , :, [$4]) ++else ++ m4_if([$5], , :, [$5]) ++fi ++]) ++m4trace:m4/libtool.m4:1454: -1- AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])]) ++m4trace:m4/libtool.m4:1454: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_LINKER_OPTION' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [_LT_LINKER_OPTION], [_LT_LINKER_OPTION($@)])]) ++m4trace:m4/libtool.m4:1461: -1- AC_DEFUN([LT_CMD_MAX_LEN], [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ mint*) ++ # On MiNT this can take a long time and run out of memory. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ ++ = "X$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++]) ++m4trace:m4/libtool.m4:1594: -1- AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])]) ++m4trace:m4/libtool.m4:1594: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_SYS_MAX_CMD_LEN' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_CMD_MAX_LEN], [LT_CMD_MAX_LEN($@)])]) ++m4trace:m4/libtool.m4:1705: -1- AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++]) ++m4trace:m4/libtool.m4:1822: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])]) ++m4trace:m4/libtool.m4:1822: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_DLOPEN_SELF' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_SYS_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF($@)])]) ++m4trace:m4/libtool.m4:2739: -1- AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="m4_if([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++]) ++m4trace:m4/libtool.m4:2801: -1- AU_DEFUN([AC_PATH_TOOL_PREFIX], [m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])]) ++m4trace:m4/libtool.m4:2801: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_DIAGNOSE([obsolete], [The macro `AC_PATH_TOOL_PREFIX' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [_LT_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX($@)])]) ++m4trace:m4/libtool.m4:2824: -1- AC_DEFUN([LT_PATH_LD], [AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_PROG_ECHO_BACKSLASH])dnl ++ ++AC_ARG_WITH([gnu-ld], ++ [AS_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no])dnl ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in ++ *GNU* | *'with BFD'*) ++ test "$with_gnu_ld" != no && break ++ ;; ++ *) ++ test "$with_gnu_ld" != yes && break ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++else ++ lt_cv_path_LD="$LD" # Let the user override the test with a path. ++fi]) ++LD="$lt_cv_path_LD" ++if test -n "$LD"; then ++ AC_MSG_RESULT($LD) ++else ++ AC_MSG_RESULT(no) ++fi ++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) ++_LT_PATH_LD_GNU ++AC_SUBST([LD]) ++ ++_LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) ++]) ++m4trace:m4/libtool.m4:2913: -1- AU_DEFUN([AM_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])]) ++m4trace:m4/libtool.m4:2913: -1- AC_DEFUN([AM_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_LD' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])]) ++m4trace:m4/libtool.m4:2914: -1- AU_DEFUN([AC_PROG_LD], [m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])]) ++m4trace:m4/libtool.m4:2914: -1- AC_DEFUN([AC_PROG_LD], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_LD' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PATH_LD], [LT_PATH_LD($@)])]) ++m4trace:m4/libtool.m4:3184: -1- AC_DEFUN([LT_PATH_NM], [AC_REQUIRE([AC_PROG_CC])dnl ++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi]) ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ if test -n "$DUMPBIN"; then : ++ # Let the user override the test. ++ else ++ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) ++ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in ++ *COFF*) ++ DUMPBIN="$DUMPBIN -symbols" ++ ;; ++ *) ++ DUMPBIN=: ++ ;; ++ esac ++ fi ++ AC_SUBST([DUMPBIN]) ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++AC_SUBST([NM]) ++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl ++ ++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++ [lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) ++ cat conftest.out >&AS_MESSAGE_LOG_FD ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest*]) ++]) ++m4trace:m4/libtool.m4:3274: -1- AU_DEFUN([AM_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])]) ++m4trace:m4/libtool.m4:3274: -1- AC_DEFUN([AM_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AM_PROG_NM' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])]) ++m4trace:m4/libtool.m4:3275: -1- AU_DEFUN([AC_PROG_NM], [m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])]) ++m4trace:m4/libtool.m4:3275: -1- AC_DEFUN([AC_PROG_NM], [AC_DIAGNOSE([obsolete], [The macro `AC_PROG_NM' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PATH_NM], [LT_PATH_NM($@)])]) ++m4trace:m4/libtool.m4:3284: -1- AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it ++ ;; ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ;; ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ;; ++esac ++AC_SUBST([LIBM]) ++]) ++m4trace:m4/libtool.m4:3303: -1- AU_DEFUN([AC_CHECK_LIBM], [m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])]) ++m4trace:m4/libtool.m4:3303: -1- AC_DEFUN([AC_CHECK_LIBM], [AC_DIAGNOSE([obsolete], [The macro `AC_CHECK_LIBM' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_LIB_M], [LT_LIB_M($@)])]) ++m4trace:m4/libtool.m4:7053: -1- AC_DEFUN([LT_PROG_GCJ], [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++ [AC_CHECK_TOOL(GCJ, gcj,) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS)])])[]dnl ++]) ++m4trace:m4/libtool.m4:7062: -1- AU_DEFUN([LT_AC_PROG_GCJ], [m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])]) ++m4trace:m4/libtool.m4:7062: -1- AC_DEFUN([LT_AC_PROG_GCJ], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_GCJ' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PROG_GCJ], [LT_PROG_GCJ($@)])]) ++m4trace:m4/libtool.m4:7069: -1- AC_DEFUN([LT_PROG_RC], [AC_CHECK_TOOL(RC, windres,) ++]) ++m4trace:m4/libtool.m4:7074: -1- AU_DEFUN([LT_AC_PROG_RC], [m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])]) ++m4trace:m4/libtool.m4:7074: -1- AC_DEFUN([LT_AC_PROG_RC], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_RC' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [LT_PROG_RC], [LT_PROG_RC($@)])]) ++m4trace:m4/libtool.m4:7185: -1- AU_DEFUN([LT_AC_PROG_SED], [m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])]) ++m4trace:m4/libtool.m4:7185: -1- AC_DEFUN([LT_AC_PROG_SED], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_SED' is obsolete. ++You should run autoupdate.])dnl ++m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])]) ++m4trace:m4/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++m4trace:m4/ltoptions.m4:111: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `dlopen' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:111: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_DLOPEN' is obsolete. ++You should run autoupdate.])dnl ++_LT_SET_OPTION([LT_INIT], [dlopen]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `dlopen' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:146: -1- AU_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SET_OPTION([LT_INIT], [win32-dll]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `win32-dll' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:146: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_WIN32_DLL' is obsolete. ++You should run autoupdate.])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SET_OPTION([LT_INIT], [win32-dll]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `win32-dll' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:195: -1- AC_DEFUN([AC_ENABLE_SHARED], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++]) ++m4trace:m4/ltoptions.m4:199: -1- AC_DEFUN([AC_DISABLE_SHARED], [_LT_SET_OPTION([LT_INIT], [disable-shared]) ++]) ++m4trace:m4/ltoptions.m4:203: -1- AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++m4trace:m4/ltoptions.m4:203: -1- AC_DEFUN([AM_ENABLE_SHARED], [AC_DIAGNOSE([obsolete], [The macro `AM_ENABLE_SHARED' is obsolete. ++You should run autoupdate.])dnl ++AC_ENABLE_SHARED($@)]) ++m4trace:m4/ltoptions.m4:204: -1- AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++m4trace:m4/ltoptions.m4:204: -1- AC_DEFUN([AM_DISABLE_SHARED], [AC_DIAGNOSE([obsolete], [The macro `AM_DISABLE_SHARED' is obsolete. ++You should run autoupdate.])dnl ++AC_DISABLE_SHARED($@)]) ++m4trace:m4/ltoptions.m4:249: -1- AC_DEFUN([AC_ENABLE_STATIC], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++]) ++m4trace:m4/ltoptions.m4:253: -1- AC_DEFUN([AC_DISABLE_STATIC], [_LT_SET_OPTION([LT_INIT], [disable-static]) ++]) ++m4trace:m4/ltoptions.m4:257: -1- AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++m4trace:m4/ltoptions.m4:257: -1- AC_DEFUN([AM_ENABLE_STATIC], [AC_DIAGNOSE([obsolete], [The macro `AM_ENABLE_STATIC' is obsolete. ++You should run autoupdate.])dnl ++AC_ENABLE_STATIC($@)]) ++m4trace:m4/ltoptions.m4:258: -1- AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++m4trace:m4/ltoptions.m4:258: -1- AC_DEFUN([AM_DISABLE_STATIC], [AC_DIAGNOSE([obsolete], [The macro `AM_DISABLE_STATIC' is obsolete. ++You should run autoupdate.])dnl ++AC_DISABLE_STATIC($@)]) ++m4trace:m4/ltoptions.m4:303: -1- AU_DEFUN([AC_ENABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `fast-install' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:303: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [AC_DIAGNOSE([obsolete], [The macro `AC_ENABLE_FAST_INSTALL' is obsolete. ++You should run autoupdate.])dnl ++_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `fast-install' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:310: -1- AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `disable-fast-install' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:310: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_DIAGNOSE([obsolete], [The macro `AC_DISABLE_FAST_INSTALL' is obsolete. ++You should run autoupdate.])dnl ++_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `disable-fast-install' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:343: -1- AU_DEFUN([AC_LIBTOOL_PICMODE], [_LT_SET_OPTION([LT_INIT], [pic-only]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `pic-only' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltoptions.m4:343: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBTOOL_PICMODE' is obsolete. ++You should run autoupdate.])dnl ++_LT_SET_OPTION([LT_INIT], [pic-only]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `pic-only' option into LT_INIT's first parameter.]) ++]) ++m4trace:m4/ltsugar.m4:13: -1- AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) ++m4trace:m4/ltversion.m4:18: -1- AC_DEFUN([LTVERSION_VERSION], [macro_version='2.2.10' ++macro_revision='1.3175' ++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++_LT_DECL(, macro_revision, 0) ++]) ++m4trace:m4/lt~obsolete.m4:36: -1- AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++m4trace:m4/lt~obsolete.m4:40: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH]) ++m4trace:m4/lt~obsolete.m4:41: -1- AC_DEFUN([_LT_AC_SHELL_INIT]) ++m4trace:m4/lt~obsolete.m4:42: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX]) ++m4trace:m4/lt~obsolete.m4:44: -1- AC_DEFUN([_LT_AC_TAGVAR]) ++m4trace:m4/lt~obsolete.m4:45: -1- AC_DEFUN([AC_LTDL_ENABLE_INSTALL]) ++m4trace:m4/lt~obsolete.m4:46: -1- AC_DEFUN([AC_LTDL_PREOPEN]) ++m4trace:m4/lt~obsolete.m4:47: -1- AC_DEFUN([_LT_AC_SYS_COMPILER]) ++m4trace:m4/lt~obsolete.m4:48: -1- AC_DEFUN([_LT_AC_LOCK]) ++m4trace:m4/lt~obsolete.m4:49: -1- AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE]) ++m4trace:m4/lt~obsolete.m4:50: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF]) ++m4trace:m4/lt~obsolete.m4:51: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O]) ++m4trace:m4/lt~obsolete.m4:52: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS]) ++m4trace:m4/lt~obsolete.m4:53: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR]) ++m4trace:m4/lt~obsolete.m4:54: -1- AC_DEFUN([AC_LTDL_OBJDIR]) ++m4trace:m4/lt~obsolete.m4:55: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH]) ++m4trace:m4/lt~obsolete.m4:56: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP]) ++m4trace:m4/lt~obsolete.m4:57: -1- AC_DEFUN([AC_PATH_MAGIC]) ++m4trace:m4/lt~obsolete.m4:58: -1- AC_DEFUN([AC_PROG_LD_GNU]) ++m4trace:m4/lt~obsolete.m4:59: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG]) ++m4trace:m4/lt~obsolete.m4:60: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD]) ++m4trace:m4/lt~obsolete.m4:61: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI]) ++m4trace:m4/lt~obsolete.m4:62: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE]) ++m4trace:m4/lt~obsolete.m4:63: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC]) ++m4trace:m4/lt~obsolete.m4:64: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS]) ++m4trace:m4/lt~obsolete.m4:65: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP]) ++m4trace:m4/lt~obsolete.m4:66: -1- AC_DEFUN([LT_AC_PROG_EGREP]) ++m4trace:m4/lt~obsolete.m4:71: -1- AC_DEFUN([_AC_PROG_LIBTOOL]) ++m4trace:m4/lt~obsolete.m4:72: -1- AC_DEFUN([AC_LIBTOOL_SETUP]) ++m4trace:m4/lt~obsolete.m4:73: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN]) ++m4trace:m4/lt~obsolete.m4:74: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER]) ++m4trace:m4/lt~obsolete.m4:75: -1- AC_DEFUN([_LT_AC_TAGCONFIG]) ++m4trace:m4/lt~obsolete.m4:77: -1- AC_DEFUN([_LT_AC_LANG_CXX]) ++m4trace:m4/lt~obsolete.m4:78: -1- AC_DEFUN([_LT_AC_LANG_F77]) ++m4trace:m4/lt~obsolete.m4:79: -1- AC_DEFUN([_LT_AC_LANG_GCJ]) ++m4trace:m4/lt~obsolete.m4:80: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG]) ++m4trace:m4/lt~obsolete.m4:81: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG]) ++m4trace:m4/lt~obsolete.m4:82: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG]) ++m4trace:m4/lt~obsolete.m4:83: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG]) ++m4trace:m4/lt~obsolete.m4:84: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG]) ++m4trace:m4/lt~obsolete.m4:85: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG]) ++m4trace:m4/lt~obsolete.m4:86: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG]) ++m4trace:m4/lt~obsolete.m4:87: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG]) ++m4trace:m4/lt~obsolete.m4:88: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG]) ++m4trace:m4/lt~obsolete.m4:89: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG]) ++m4trace:m4/lt~obsolete.m4:90: -1- AC_DEFUN([AC_LIBTOOL_CONFIG]) ++m4trace:m4/lt~obsolete.m4:91: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C]) ++m4trace:m4/lt~obsolete.m4:93: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP]) ++m4trace:m4/lt~obsolete.m4:96: -1- AC_DEFUN([_LT_PROG_F77]) ++m4trace:m4/lt~obsolete.m4:97: -1- AC_DEFUN([_LT_PROG_FC]) ++m4trace:m4/lt~obsolete.m4:98: -1- AC_DEFUN([_LT_PROG_CXX]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([_AC_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^AS_FLAGS$]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?m4_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^dnl$]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?AS_]) ++m4trace:configure.ac:3: -1- _m4_warn([syntax], [AC_INIT: not a literal: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media], []) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^SHELL$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PATH_SEPARATOR$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_URL$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^exec_prefix$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^prefix$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^program_transform_name$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^bindir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sbindir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^libexecdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^datarootdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^datadir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sysconfdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sharedstatedir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^localstatedir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^includedir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^oldincludedir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^docdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^infodir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^htmldir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^dvidir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^pdfdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^psdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^libdir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^localedir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^mandir$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_URL$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^DEFS$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_C$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_N$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_T$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^build_alias$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^host_alias$]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^target_alias$]) ++m4trace:configure.ac:9: -1- AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall -Wno-portability tar-pax foreign]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) ++m4trace:configure.ac:9: -1- AM_SET_CURRENT_AUTOMAKE_VERSION ++m4trace:configure.ac:9: -1- AM_AUTOMAKE_VERSION([1.11.1]) ++m4trace:configure.ac:9: -1- _AM_AUTOCONF_VERSION([2.67]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_DATA$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__isrc$]) ++m4trace:configure.ac:9: -1- _AM_SUBST_NOTMAKE([am__isrc]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^CYGPATH_W$]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTIONS([1.9 no-dist-gzip dist-bzip2 -Wall -Wno-portability tar-pax foreign]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([1.9]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([1.9]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([no-dist-gzip]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([no-dist-gzip]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([dist-bzip2]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([dist-bzip2]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([-Wall]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([-Wall]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([-Wno-portability]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([-Wno-portability]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([tar-pax]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([tar-pax]) ++m4trace:configure.ac:9: -1- _AM_SET_OPTION([foreign]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([foreign]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.ac:9: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([no-define]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.ac:9: -1- AM_SANITY_CHECK ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) ++m4trace:configure.ac:9: -1- AM_MISSING_HAS_RUN ++m4trace:configure.ac:9: -1- AM_AUX_DIR_EXPAND ++m4trace:configure.ac:9: -1- m4_pattern_allow([^ACLOCAL$]) ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOCONF], [autoconf]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOCONF$]) ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOMAKE$]) ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOHEADER$]) ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^MAKEINFO$]) ++m4trace:configure.ac:9: -1- AM_PROG_INSTALL_SH ++m4trace:configure.ac:9: -1- m4_pattern_allow([^install_sh$]) ++m4trace:configure.ac:9: -1- AM_PROG_INSTALL_STRIP ++m4trace:configure.ac:9: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) ++m4trace:configure.ac:9: -1- AM_PROG_MKDIR_P ++m4trace:configure.ac:9: -1- m4_pattern_allow([^MKDIR_P$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^mkdir_p$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AWK$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.ac:9: -1- AM_SET_LEADING_DOT ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__leading_dot$]) ++m4trace:configure.ac:9: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([tar-ustar]) ++m4trace:configure.ac:9: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([tar-pax]) ++m4trace:configure.ac:9: -1- _AM_PROG_TAR([pax]) ++m4trace:configure.ac:9: -1- AM_MISSING_PROG([AMTAR], [tar]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AMTAR$]) ++m4trace:configure.ac:9: -1- AM_RUN_LOG([$_am_tar --version]) ++m4trace:configure.ac:9: -1- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++m4trace:configure.ac:9: -1- AM_RUN_LOG([$am__untar <conftest.tar]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__tar$]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__untar$]) ++m4trace:configure.ac:9: -1- _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 ++]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([no-dependencies]) ++m4trace:configure.ac:9: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])]) ++m4trace:configure.ac:9: -2- _AM_MANGLE_OPTION([silent-rules]) ++m4trace:configure.ac:11: -1- AS_VERSION ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MAJOR$]) ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MINOR$]) ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MICRO$]) ++m4trace:configure.ac:13: -1- AM_MAINTAINER_MODE ++m4trace:configure.ac:13: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) ++m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) ++m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINT$]) ++m4trace:configure.ac:20: -1- AM_CONFIG_HEADER([config.h]) ++m4trace:configure.ac:20: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. ++You should run autoupdate.], [/usr/share/aclocal-1.11/header.m4:12: AM_CONFIG_HEADER is expanded from... ++configure.ac:20: the top level]) ++m4trace:configure.ac:23: -1- IT_PROG_INTLTOOL([0.35.0]) ++m4trace:configure.ac:23: -1- AM_NLS ++m4trace:configure.ac:23: -1- m4_pattern_allow([^USE_NLS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_UPDATE$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_MERGE$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_EXTRACT$]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_DESKTOP_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_DESKTOP_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_DESKTOP_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_DIRECTORY_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_DIRECTORY_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_DIRECTORY_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_KEYS_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_KEYS_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_KEYS_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_PROP_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PROP_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_PROP_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_OAF_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_OAF_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_OAF_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_PONG_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PONG_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_PONG_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_SERVER_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SERVER_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SERVER_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_SHEET_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SHEET_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SHEET_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_SOUNDLIST_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SOUNDLIST_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SOUNDLIST_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_UI_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_UI_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_UI_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_XAM_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XAM_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XAM_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_KBD_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_KBD_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_KBD_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_XML_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XML_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XML_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_XML_NOMERGE_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XML_NOMERGE_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XML_NOMERGE_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_CAVES_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_CAVES_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_CAVES_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_SCHEMAS_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SCHEMAS_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SCHEMAS_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_THEME_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_THEME_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_THEME_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_SERVICE_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SERVICE_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SERVICE_RULE]) ++m4trace:configure.ac:23: -1- _IT_SUBST([INTLTOOL_POLICY_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_POLICY_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_POLICY_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^XGETTEXT$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^MSGMERGE$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^MSGFMT$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^GMSGFMT$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PERL$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^ALL_LINGUAS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^EXEEXT$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^OBJEXT$]) ++m4trace:configure.ac:23: -1- _AM_DEPENDENCIES([CC]) ++m4trace:configure.ac:23: -1- AM_SET_DEPDIR ++m4trace:configure.ac:23: -1- m4_pattern_allow([^DEPDIR$]) ++m4trace:configure.ac:23: -1- AM_OUTPUT_DEPENDENCY_COMMANDS ++m4trace:configure.ac:23: -1- AM_MAKE_INCLUDE ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__include$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__quote$]) ++m4trace:configure.ac:23: -1- AM_DEP_TRACK ++m4trace:configure.ac:23: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEP_TRUE$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEP_FALSE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.ac:23: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^DATADIRNAME$]) ++m4trace:configure.ac:23: -1- IT_PO_SUBDIR([po]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.ac:25: -1- _AM_DEPENDENCIES([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:26: -1- _m4_warn([obsolete], [The macro `AC_ISC_POSIX' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/specific.m4:442: AC_ISC_POSIX is expanded from... ++configure.ac:26: the top level]) ++m4trace:configure.ac:30: -1- m4_pattern_allow([^LN_S$]) ++m4trace:configure.ac:31: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.ac:34: -1- AC_PROG_EGREP ++m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^EGREP$]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^STDC_HEADERS$]) ++m4trace:configure.ac:39: -1- m4_pattern_allow([^const$]) ++m4trace:configure.ac:41: -1- m4_pattern_allow([^off_t$]) ++m4trace:configure.ac:42: -1- m4_pattern_allow([^size_t$]) ++m4trace:configure.ac:46: -1- AC_DEFUN([_AC_Header_stdlib_h], [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_header_list], [" stdlib.h"])]) ++_AC_HEADERS_EXPANSION]) ++m4trace:configure.ac:46: -1- AC_DEFUN([_AC_Header_unistd_h], [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_header_list], [" unistd.h"])]) ++_AC_HEADERS_EXPANSION]) ++m4trace:configure.ac:46: -1- AC_DEFUN([_AC_Header_sys_param_h], [m4_divert_text([INIT_PREPARE], [AS_VAR_APPEND([ac_header_list], [" sys/param.h"])]) ++_AC_HEADERS_EXPANSION]) ++m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_GETPAGESIZE$]) ++m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_MMAP$]) ++m4trace:configure.ac:52: -1- AS_COMPILER_FLAG([-Wall], [GM_ERROR_CFLAGS="-Wall"]) ++m4trace:configure.ac:52: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++m4/as-compiler-flag.m4:14: AS_COMPILER_FLAG is expanded from... ++configure.ac:52: the top level]) ++m4trace:configure.ac:56: -1- AS_COMPILER_FLAG([-Werror], [GM_ERROR_CFLAGS="$GM_ERROR_CFLAGS -Werror"]) ++m4trace:configure.ac:56: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++m4/as-compiler-flag.m4:14: AS_COMPILER_FLAG is expanded from... ++configure.ac:56: the top level]) ++m4trace:configure.ac:70: -1- PKG_CHECK_MODULES([SOUND_THEME], [gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0], [have_soundtheme=yes], [have_soundtheme=no]) ++m4trace:configure.ac:70: -1- PKG_PROG_PKG_CONFIG ++m4trace:configure.ac:70: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^SOUND_THEME_CFLAGS$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^SOUND_THEME_LIBS$]) ++m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0], [pkg_cv_[]SOUND_THEME_CFLAGS=`$PKG_CONFIG --[]cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:70: -1- PKG_CHECK_EXISTS([gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0], [pkg_cv_[]SOUND_THEME_LIBS=`$PKG_CONFIG --[]libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ libxml-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:70: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:81: -1- m4_pattern_allow([^HAVE_SOUND_THEME$]) ++m4trace:configure.ac:83: -1- AM_CONDITIONAL([HAVE_SOUND_THEME], [test x$have_soundtheme = xyes]) ++m4trace:configure.ac:83: -1- m4_pattern_allow([^HAVE_SOUND_THEME_TRUE$]) ++m4trace:configure.ac:83: -1- m4_pattern_allow([^HAVE_SOUND_THEME_FALSE$]) ++m4trace:configure.ac:83: -1- _AM_SUBST_NOTMAKE([HAVE_SOUND_THEME_TRUE]) ++m4trace:configure.ac:83: -1- _AM_SUBST_NOTMAKE([HAVE_SOUND_THEME_FALSE]) ++m4trace:configure.ac:84: -1- m4_pattern_allow([^HAVE_SOUND_THEME$]) ++m4trace:configure.ac:85: -1- m4_pattern_allow([^SOUNDTHEME_CFLAGS$]) ++m4trace:configure.ac:86: -1- m4_pattern_allow([^SOUNDTHEME_LIBS$]) ++m4trace:configure.ac:102: -1- PKG_CHECK_MODULES([PULSEAUDIO], [libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION], [have_pulseaudio=yes], [have_pulseaudio=no]) ++m4trace:configure.ac:102: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$]) ++m4trace:configure.ac:102: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$]) ++m4trace:configure.ac:102: -1- PKG_CHECK_EXISTS([libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION], [pkg_cv_[]PULSEAUDIO_CFLAGS=`$PKG_CONFIG --[]cflags "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:102: -1- PKG_CHECK_EXISTS([libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION], [pkg_cv_[]PULSEAUDIO_LIBS=`$PKG_CONFIG --[]libs "libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:102: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:112: -1- PKG_CHECK_MODULES([VOLUME_CONTROL], [gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ]) ++m4trace:configure.ac:112: -1- m4_pattern_allow([^VOLUME_CONTROL_CFLAGS$]) ++m4trace:configure.ac:112: -1- m4_pattern_allow([^VOLUME_CONTROL_LIBS$]) ++m4trace:configure.ac:112: -1- PKG_CHECK_EXISTS([gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ], [pkg_cv_[]VOLUME_CONTROL_CFLAGS=`$PKG_CONFIG --[]cflags "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:112: -1- PKG_CHECK_EXISTS([gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ ], [pkg_cv_[]VOLUME_CONTROL_LIBS=`$PKG_CONFIG --[]libs "gobject-2.0 >= $GLIB_REQUIRED_VERSION ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gio-2.0 ++ gconf-2.0 >= $GCONF_REQUIRED_VERSION ++ libcanberra-gtk >= $CANBERRA_REQUIRED_VERSION ++ unique-1.0 ++ libxml-2.0 ++ " 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:112: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:121: -1- m4_pattern_allow([^VOLUME_CONTROL_CFLAGS$]) ++m4trace:configure.ac:122: -1- m4_pattern_allow([^VOLUME_CONTROL_LIBS$]) ++m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_PULSEAUDIO$]) ++m4trace:configure.ac:128: -1- AM_CONDITIONAL([HAVE_PULSEAUDIO], [test x$have_pulseaudio = xyes]) ++m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_PULSEAUDIO_TRUE$]) ++m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_PULSEAUDIO_FALSE$]) ++m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([HAVE_PULSEAUDIO_TRUE]) ++m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([HAVE_PULSEAUDIO_FALSE]) ++m4trace:configure.ac:129: -1- m4_pattern_allow([^HAVE_PULSEAUDIO$]) ++m4trace:configure.ac:130: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$]) ++m4trace:configure.ac:131: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$]) ++m4trace:configure.ac:144: -1- PKG_CHECK_MODULES([GMP], [ ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0], [have_profiles=yes]) ++m4trace:configure.ac:144: -1- m4_pattern_allow([^GMP_CFLAGS$]) ++m4trace:configure.ac:144: -1- m4_pattern_allow([^GMP_LIBS$]) ++m4trace:configure.ac:144: -1- PKG_CHECK_EXISTS([ ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0], [pkg_cv_[]GMP_CFLAGS=`$PKG_CONFIG --[]cflags " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:144: -1- PKG_CHECK_EXISTS([ ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0], [pkg_cv_[]GMP_LIBS=`$PKG_CONFIG --[]libs " ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gstreamer-0.10 ++ gconf-2.0 ++ gio-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:144: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:151: -1- m4_pattern_allow([^GMP_CFLAGS$]) ++m4trace:configure.ac:152: -1- m4_pattern_allow([^GMP_LIBS$]) ++m4trace:configure.ac:153: -1- AM_CONDITIONAL([HAVE_GMP], [test x$have_profiles = xyes]) ++m4trace:configure.ac:153: -1- m4_pattern_allow([^HAVE_GMP_TRUE$]) ++m4trace:configure.ac:153: -1- m4_pattern_allow([^HAVE_GMP_FALSE$]) ++m4trace:configure.ac:153: -1- _AM_SUBST_NOTMAKE([HAVE_GMP_TRUE]) ++m4trace:configure.ac:153: -1- _AM_SUBST_NOTMAKE([HAVE_GMP_FALSE]) ++m4trace:configure.ac:158: -1- PKG_CHECK_MODULES([GLADEUI], [gladeui-1.0], [have_gladeui=yes], [have_gladeui=no]) ++m4trace:configure.ac:158: -1- m4_pattern_allow([^GLADEUI_CFLAGS$]) ++m4trace:configure.ac:158: -1- m4_pattern_allow([^GLADEUI_LIBS$]) ++m4trace:configure.ac:158: -1- PKG_CHECK_EXISTS([gladeui-1.0], [pkg_cv_[]GLADEUI_CFLAGS=`$PKG_CONFIG --[]cflags "gladeui-1.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:158: -1- PKG_CHECK_EXISTS([gladeui-1.0], [pkg_cv_[]GLADEUI_LIBS=`$PKG_CONFIG --[]libs "gladeui-1.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:158: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:159: -1- m4_pattern_allow([^GLADEUI_CFLAGS$]) ++m4trace:configure.ac:160: -1- m4_pattern_allow([^GLADEUI_LIBS$]) ++m4trace:configure.ac:161: -1- AM_CONDITIONAL([HAVE_GLADEUI], [test x$have_gladeui = xyes]) ++m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_GLADEUI_TRUE$]) ++m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_GLADEUI_FALSE$]) ++m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([HAVE_GLADEUI_TRUE]) ++m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([HAVE_GLADEUI_FALSE]) ++m4trace:configure.ac:164: -1- m4_pattern_allow([^GLADEUI_CATALOG_DIR$]) ++m4trace:configure.ac:167: -1- m4_pattern_allow([^GLADEUI_MODULE_DIR$]) ++m4trace:configure.ac:178: -1- m4_pattern_allow([^GST_MAJORMINOR$]) ++m4trace:configure.ac:179: -1- m4_pattern_allow([^GST_MAJORMINOR_QUOTED$]) ++m4trace:configure.ac:184: -1- PKG_CHECK_MODULES([GSR], [ ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0], [have_gst=yes], [ ++ AC_MSG_RESULT(no) ++ AC_MSG_WARN($GSR_PKG_ERRORS) ++ PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" ++ ]) ++m4trace:configure.ac:184: -1- m4_pattern_allow([^GSR_CFLAGS$]) ++m4trace:configure.ac:184: -1- m4_pattern_allow([^GSR_LIBS$]) ++m4trace:configure.ac:184: -1- PKG_CHECK_EXISTS([ ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0], [pkg_cv_[]GSR_CFLAGS=`$PKG_CONFIG --[]cflags " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:184: -1- PKG_CHECK_EXISTS([ ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0], [pkg_cv_[]GSR_LIBS=`$PKG_CONFIG --[]libs " ++ gstreamer-$GST_MAJORMINOR >= $GST_REQ ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ ++ gtk+-2.0 >= 2.6.0 ++ gio-2.0 ++ gconf-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:184: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:220: -1- m4_pattern_allow([^GSR_CFLAGS$]) ++m4trace:configure.ac:221: -1- m4_pattern_allow([^GSR_LIBS$]) ++m4trace:configure.ac:222: -1- AM_CONDITIONAL([HAVE_GSTREAMER], [test x$have_gst = xyes]) ++m4trace:configure.ac:222: -1- m4_pattern_allow([^HAVE_GSTREAMER_TRUE$]) ++m4trace:configure.ac:222: -1- m4_pattern_allow([^HAVE_GSTREAMER_FALSE$]) ++m4trace:configure.ac:222: -1- _AM_SUBST_NOTMAKE([HAVE_GSTREAMER_TRUE]) ++m4trace:configure.ac:222: -1- _AM_SUBST_NOTMAKE([HAVE_GSTREAMER_FALSE]) ++m4trace:configure.ac:223: -1- AM_CONDITIONAL([HAVE_GRECORD], [test x$have_grecord = xyes]) ++m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_GRECORD_TRUE$]) ++m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_GRECORD_FALSE$]) ++m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([HAVE_GRECORD_TRUE]) ++m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([HAVE_GRECORD_FALSE]) ++m4trace:configure.ac:226: -1- m4_pattern_allow([^GSR_UIDIR_UNINSTALLED$]) ++m4trace:configure.ac:229: -1- m4_pattern_allow([^GCONFTOOL$]) ++m4trace:configure.ac:230: -1- AM_GCONF_SOURCE_2 ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++/usr/share/aclocal/gconf-2.m4:8: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMA_CONFIG_SOURCE$]) ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++/usr/share/aclocal/gconf-2.m4:8: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMA_FILE_DIR$]) ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++/usr/share/aclocal/gconf-2.m4:8: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMAS_INSTALL_TRUE$]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMAS_INSTALL_FALSE$]) ++m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([GCONF_SCHEMAS_INSTALL_TRUE]) ++m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([GCONF_SCHEMAS_INSTALL_FALSE]) ++m4trace:configure.ac:232: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) ++m4trace:configure.ac:239: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.ac:240: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.ac:241: -1- AM_GLIB_GNU_GETTEXT ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_LOCALE_H$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++/usr/share/aclocal/glib-gettext.m4:48: GLIB_LC_MESSAGES is expanded from... ++/usr/share/aclocal/glib-gettext.m4:312: GLIB_GNU_GETTEXT is expanded from... ++/usr/share/aclocal/glib-gettext.m4:412: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^USE_NLS$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from... ++/usr/share/aclocal/glib-gettext.m4:312: GLIB_GNU_GETTEXT is expanded from... ++/usr/share/aclocal/glib-gettext.m4:412: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from... ++/usr/share/aclocal/glib-gettext.m4:312: GLIB_GNU_GETTEXT is expanded from... ++/usr/share/aclocal/glib-gettext.m4:412: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_BIND_TEXTDOMAIN_CODESET$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_BIND_TEXTDOMAIN_CODESET$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_GETTEXT$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MSGFMT$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_DCGETTEXT$]) ++m4trace:configure.ac:241: -1- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null], [ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test <foo@bar.xx>\n" ++"Language-Team: C <LL@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MSGFMT_OPTS$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^GMSGFMT$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^XGETTEXT$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from... ++/usr/share/aclocal/glib-gettext.m4:312: GLIB_GNU_GETTEXT is expanded from... ++/usr/share/aclocal/glib-gettext.m4:412: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^ENABLE_NLS$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/status.m4:1027: AC_OUTPUT_COMMANDS is expanded from... ++/usr/share/aclocal/glib-gettext.m4:102: GLIB_WITH_NLS is expanded from... ++/usr/share/aclocal/glib-gettext.m4:312: GLIB_GNU_GETTEXT is expanded from... ++/usr/share/aclocal/glib-gettext.m4:412: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^CATALOGS$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^CATOBJEXT$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^DATADIRNAME$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^GMOFILES$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^INSTOBJEXT$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^INTLLIBS$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^PO_IN_DATADIR_TRUE$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^PO_IN_DATADIR_FALSE$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^POFILES$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^POSUB$]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MKINSTALLDIRS$]) ++m4trace:configure.ac:243: -1- AM_PROG_LIBTOOL ++m4trace:configure.ac:243: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete. ++You should run autoupdate.], [m4/libtool.m4:108: AM_PROG_LIBTOOL is expanded from... ++configure.ac:243: the top level]) ++m4trace:configure.ac:243: -1- LT_INIT ++m4trace:configure.ac:243: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$]) ++m4trace:configure.ac:243: -1- LTOPTIONS_VERSION ++m4trace:configure.ac:243: -1- LTSUGAR_VERSION ++m4trace:configure.ac:243: -1- LTVERSION_VERSION ++m4trace:configure.ac:243: -1- LTOBSOLETE_VERSION ++m4trace:configure.ac:243: -1- _LT_PROG_LTMAIN ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LIBTOOL$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_cpu$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_vendor$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_os$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_cpu$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_vendor$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_os$]) ++m4trace:configure.ac:243: -1- _LT_PREPARE_SED_QUOTE_VARS ++m4trace:configure.ac:243: -1- _LT_PROG_ECHO_BACKSLASH ++m4trace:configure.ac:243: -1- LT_PATH_LD ++m4trace:configure.ac:243: -1- m4_pattern_allow([^SED$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^FGREP$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LD$]) ++m4trace:configure.ac:243: -1- LT_PATH_NM ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DUMPBIN$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^ac_ct_DUMPBIN$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DUMPBIN$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^NM$]) ++m4trace:configure.ac:243: -1- LT_CMD_MAX_LEN ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OBJDUMP$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OBJDUMP$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^AR$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^RANLIB$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([LT_OBJDIR]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LT_OBJDIR$]) ++m4trace:configure.ac:243: -1- _LT_CC_BASENAME([$compiler]) ++m4trace:configure.ac:243: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH]) ++m4trace:configure.ac:243: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH]) ++m4trace:configure.ac:243: -1- LT_SUPPORTED_TAG([CC]) ++m4trace:configure.ac:243: -1- _LT_COMPILER_BOILERPLATE ++m4trace:configure.ac:243: -1- _LT_LINKER_BOILERPLATE ++m4trace:configure.ac:243: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"]) ++m4trace:configure.ac:243: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in ++ "" | " "*) ;; ++ *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;; ++ esac], [_LT_TAGVAR(lt_prog_compiler_pic, )= ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no]) ++m4trace:configure.ac:243: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=]) ++m4trace:configure.ac:243: -1- _LT_REQUIRED_DARWIN_CHECKS ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DSYMUTIL$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^NMEDIT$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LIPO$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OTOOL$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OTOOL64$]) ++m4trace:configure.ac:243: -1- _LT_LINKER_OPTION([if $CC understands -b], [lt_cv_prog_compiler__b], [-b], [_LT_TAGVAR(archive_cmds, )='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, )='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags']) ++m4trace:configure.ac:243: -1- LT_SYS_DLOPEN_SELF ++m4trace:configure.ac:243: -1- m4_pattern_allow([^HAVE_DLFCN_H$]) ++m4trace:configure.ac:244: -1- AM_PROG_CC_C_O ++m4trace:configure.ac:244: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$]) ++m4trace:configure.ac:258: -1- PKG_CHECK_MODULES([GSTPROPS], [ ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0], [have_gstprops=yes]) ++m4trace:configure.ac:258: -1- m4_pattern_allow([^GSTPROPS_CFLAGS$]) ++m4trace:configure.ac:258: -1- m4_pattern_allow([^GSTPROPS_LIBS$]) ++m4trace:configure.ac:258: -1- PKG_CHECK_EXISTS([ ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0], [pkg_cv_[]GSTPROPS_CFLAGS=`$PKG_CONFIG --[]cflags " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:258: -1- PKG_CHECK_EXISTS([ ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0], [pkg_cv_[]GSTPROPS_LIBS=`$PKG_CONFIG --[]libs " ++ glib-2.0 ++ gtk+-2.0 >= $GTK_REQUIRED_VERSION ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_PLUGINS_BASE_REQ ++ libxml-2.0" 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:258: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:270: -1- AS_AC_EXPAND([GNOMECC_DESKTOP_DIR], [$GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:270: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:271: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:273: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:274: -1- m4_pattern_allow([^PROGRAMS_GSTPROPS$]) ++m4trace:configure.ac:277: -1- m4_pattern_allow([^GSTPROPS_CFLAGS$]) ++m4trace:configure.ac:278: -1- m4_pattern_allow([^GSTPROPS_LIBS$]) ++m4trace:configure.ac:279: -1- AM_CONDITIONAL([HAVE_GSTPROPS], [test x$have_gstprops = xyes]) ++m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_GSTPROPS_TRUE$]) ++m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_GSTPROPS_FALSE$]) ++m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([HAVE_GSTPROPS_TRUE]) ++m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([HAVE_GSTPROPS_FALSE]) ++m4trace:configure.ac:297: -1- PKG_CHECK_MODULES([GSTMIXER], [ ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ], [ ++ OLD_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$CPPFLAGS $GSTMIXER_CFLAGS" ++ ++ AC_CHECK_HEADER(gst/audio/mixerutils.h, ++ [AC_CHECK_HEADER(gst/interfaces/mixer.h, ++ [AC_CHECK_HEADER(gst/interfaces/propertyprobe.h, have_gstmixer=yes)])]) ++ ++ CPPFLAGS=$OLD_CPPFLAGS ++ GSTMIXER_LIBS="$GSTMIXER_LIBS -lgstinterfaces-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR" ++ ]) ++m4trace:configure.ac:297: -1- m4_pattern_allow([^GSTMIXER_CFLAGS$]) ++m4trace:configure.ac:297: -1- m4_pattern_allow([^GSTMIXER_LIBS$]) ++m4trace:configure.ac:297: -1- PKG_CHECK_EXISTS([ ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ], [pkg_cv_[]GSTMIXER_CFLAGS=`$PKG_CONFIG --[]cflags " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:297: -1- PKG_CHECK_EXISTS([ ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ ], [pkg_cv_[]GSTMIXER_LIBS=`$PKG_CONFIG --[]libs " ++ gtk+-2.0 ++ gconf-2.0 ++ gstreamer-$GST_MAJORMINOR ++ gstreamer-plugins-base-$GST_MAJORMINOR ++ " 2>/dev/null`], [pkg_failed=yes]) ++m4trace:configure.ac:297: -1- _PKG_SHORT_ERRORS_SUPPORTED ++m4trace:configure.ac:316: -1- m4_pattern_allow([^GSTMIXER_CFLAGS$]) ++m4trace:configure.ac:317: -1- m4_pattern_allow([^GSTMIXER_LIBS$]) ++m4trace:configure.ac:318: -1- AM_CONDITIONAL([HAVE_GSTMIXER], [test x$have_gstmixer = xyes]) ++m4trace:configure.ac:318: -1- m4_pattern_allow([^HAVE_GSTMIXER_TRUE$]) ++m4trace:configure.ac:318: -1- m4_pattern_allow([^HAVE_GSTMIXER_FALSE$]) ++m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([HAVE_GSTMIXER_TRUE]) ++m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([HAVE_GSTMIXER_FALSE]) ++m4trace:configure.ac:325: -1- AM_SILENT_RULES([yes]) ++m4trace:configure.ac:325: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$]) ++m4trace:configure.ac:325: -1- m4_pattern_allow([^AM_BACKSLASH$]) ++m4trace:configure.ac:325: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH]) ++m4trace:configure.ac:328: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:1463: AC_ARG_ENABLE is expanded from... ++configure.ac:328: the top level]) ++m4trace:configure.ac:352: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++configure.ac:352: the top level]) ++m4trace:configure.ac:368: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:369: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:370: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:371: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^LIB@&t@OBJS$]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^LTLIBOBJS$]) ++m4trace:configure.ac:428: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) ++m4trace:configure.ac:428: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) ++m4trace:configure.ac:428: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) ++m4trace:configure.ac:428: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) ++m4trace:configure.ac:428: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS ++m4trace:configure.ac:428: -1- _LT_PROG_LTMAIN +diff -Naur gnome-media-2.32.0.orig/autom4te.cache/traces.1 gnome-media-2.32.0.patched/autom4te.cache/traces.1 +--- gnome-media-2.32.0.orig/autom4te.cache/traces.1 1969-12-31 19:00:00.000000000 -0500 ++++ gnome-media-2.32.0.patched/autom4te.cache/traces.1 2011-08-24 22:23:51.000000000 -0400 +@@ -0,0 +1,1196 @@ ++m4trace:aclocal.m4:1750: -1- m4_include([m4/as-ac-expand.m4]) ++m4trace:aclocal.m4:1751: -1- m4_include([m4/as-compiler-flag.m4]) ++m4trace:aclocal.m4:1752: -1- m4_include([m4/as-version.m4]) ++m4trace:aclocal.m4:1753: -1- m4_include([m4/intltool.m4]) ++m4trace:aclocal.m4:1754: -1- m4_include([m4/libtool.m4]) ++m4trace:aclocal.m4:1755: -1- m4_include([m4/ltoptions.m4]) ++m4trace:aclocal.m4:1756: -1- m4_include([m4/ltsugar.m4]) ++m4trace:aclocal.m4:1757: -1- m4_include([m4/ltversion.m4]) ++m4trace:aclocal.m4:1758: -1- m4_include([m4/lt~obsolete.m4]) ++m4trace:configure.ac:3: -1- AC_INIT([gnome-media], [2.32.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([_AC_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^AS_FLAGS$]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?m4_]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^dnl$]) ++m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?AS_]) ++m4trace:configure.ac:3: -1- _m4_warn([syntax], [AC_INIT: not a literal: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media], []) ++m4trace:configure.ac:3: -1- AC_SUBST([SHELL]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([SHELL]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^SHELL$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PATH_SEPARATOR]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PATH_SEPARATOR]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PATH_SEPARATOR$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_NAME]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_TARNAME]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_VERSION]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_STRING]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_BUGREPORT]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.ac:3: -1- AC_SUBST([PACKAGE_URL], [m4_ifdef([AC_PACKAGE_URL], ['AC_PACKAGE_URL'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([PACKAGE_URL]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_URL$]) ++m4trace:configure.ac:3: -1- AC_SUBST([exec_prefix], [NONE]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([exec_prefix]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^exec_prefix$]) ++m4trace:configure.ac:3: -1- AC_SUBST([prefix], [NONE]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([prefix]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^prefix$]) ++m4trace:configure.ac:3: -1- AC_SUBST([program_transform_name], [s,x,x,]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([program_transform_name]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^program_transform_name$]) ++m4trace:configure.ac:3: -1- AC_SUBST([bindir], ['${exec_prefix}/bin']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([bindir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^bindir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([sbindir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sbindir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([libexecdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^libexecdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([datarootdir], ['${prefix}/share']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([datarootdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^datarootdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([datadir], ['${datarootdir}']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([datadir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^datadir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([sysconfdir], ['${prefix}/etc']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([sysconfdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sysconfdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([sharedstatedir], ['${prefix}/com']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([sharedstatedir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^sharedstatedir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([localstatedir], ['${prefix}/var']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([localstatedir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^localstatedir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([includedir], ['${prefix}/include']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([includedir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^includedir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([oldincludedir], ['/usr/include']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([oldincludedir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^oldincludedir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], ++ ['${datarootdir}/doc/${PACKAGE_TARNAME}'], ++ ['${datarootdir}/doc/${PACKAGE}'])]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([docdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^docdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([infodir], ['${datarootdir}/info']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([infodir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^infodir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([htmldir], ['${docdir}']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([htmldir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^htmldir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([dvidir], ['${docdir}']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([dvidir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^dvidir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([pdfdir], ['${docdir}']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([pdfdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^pdfdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([psdir], ['${docdir}']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([psdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^psdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([libdir], ['${exec_prefix}/lib']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([libdir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^libdir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([localedir], ['${datarootdir}/locale']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([localedir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^localedir$]) ++m4trace:configure.ac:3: -1- AC_SUBST([mandir], ['${datarootdir}/man']) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([mandir]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^mandir$]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_NAME$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */ ++@%:@undef PACKAGE_NAME]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_TARNAME$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */ ++@%:@undef PACKAGE_TARNAME]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_VERSION$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */ ++@%:@undef PACKAGE_VERSION]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_STRING$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */ ++@%:@undef PACKAGE_STRING]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_BUGREPORT$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */ ++@%:@undef PACKAGE_BUGREPORT]) ++m4trace:configure.ac:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_URL]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^PACKAGE_URL$]) ++m4trace:configure.ac:3: -1- AH_OUTPUT([PACKAGE_URL], [/* Define to the home page for this package. */ ++@%:@undef PACKAGE_URL]) ++m4trace:configure.ac:3: -1- AC_SUBST([DEFS]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([DEFS]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^DEFS$]) ++m4trace:configure.ac:3: -1- AC_SUBST([ECHO_C]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([ECHO_C]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_C$]) ++m4trace:configure.ac:3: -1- AC_SUBST([ECHO_N]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([ECHO_N]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_N$]) ++m4trace:configure.ac:3: -1- AC_SUBST([ECHO_T]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([ECHO_T]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^ECHO_T$]) ++m4trace:configure.ac:3: -1- AC_SUBST([LIBS]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:3: -1- AC_SUBST([build_alias]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([build_alias]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^build_alias$]) ++m4trace:configure.ac:3: -1- AC_SUBST([host_alias]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([host_alias]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^host_alias$]) ++m4trace:configure.ac:3: -1- AC_SUBST([target_alias]) ++m4trace:configure.ac:3: -1- AC_SUBST_TRACE([target_alias]) ++m4trace:configure.ac:3: -1- m4_pattern_allow([^target_alias$]) ++m4trace:configure.ac:7: -1- AC_CONFIG_AUX_DIR([build-aux]) ++m4trace:configure.ac:9: -1- AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall -Wno-portability tar-pax foreign]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) ++m4trace:configure.ac:9: -1- AM_AUTOMAKE_VERSION([1.11.1]) ++m4trace:configure.ac:9: -1- AC_REQUIRE_AUX_FILE([install-sh]) ++m4trace:configure.ac:9: -1- AC_SUBST([INSTALL_PROGRAM]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_PROGRAM$]) ++m4trace:configure.ac:9: -1- AC_SUBST([INSTALL_SCRIPT]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([INSTALL_SCRIPT]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_SCRIPT$]) ++m4trace:configure.ac:9: -1- AC_SUBST([INSTALL_DATA]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([INSTALL_DATA]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_DATA$]) ++m4trace:configure.ac:9: -1- AC_SUBST([am__isrc], [' -I$(srcdir)']) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([am__isrc]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__isrc$]) ++m4trace:configure.ac:9: -1- _AM_SUBST_NOTMAKE([am__isrc]) ++m4trace:configure.ac:9: -1- AC_SUBST([CYGPATH_W]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([CYGPATH_W]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^CYGPATH_W$]) ++m4trace:configure.ac:9: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME']) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([PACKAGE]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$]) ++m4trace:configure.ac:9: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION']) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([VERSION]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^PACKAGE$]) ++m4trace:configure.ac:9: -1- AH_OUTPUT([PACKAGE], [/* Name of package */ ++@%:@undef PACKAGE]) ++m4trace:configure.ac:9: -1- AC_DEFINE_TRACE_LITERAL([VERSION]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^VERSION$]) ++m4trace:configure.ac:9: -1- AH_OUTPUT([VERSION], [/* Version number of package */ ++@%:@undef VERSION]) ++m4trace:configure.ac:9: -1- AC_REQUIRE_AUX_FILE([missing]) ++m4trace:configure.ac:9: -1- AC_SUBST([ACLOCAL]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([ACLOCAL]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^ACLOCAL$]) ++m4trace:configure.ac:9: -1- AC_SUBST([AUTOCONF]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([AUTOCONF]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOCONF$]) ++m4trace:configure.ac:9: -1- AC_SUBST([AUTOMAKE]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([AUTOMAKE]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOMAKE$]) ++m4trace:configure.ac:9: -1- AC_SUBST([AUTOHEADER]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([AUTOHEADER]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AUTOHEADER$]) ++m4trace:configure.ac:9: -1- AC_SUBST([MAKEINFO]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([MAKEINFO]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^MAKEINFO$]) ++m4trace:configure.ac:9: -1- AC_SUBST([install_sh]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([install_sh]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^install_sh$]) ++m4trace:configure.ac:9: -1- AC_SUBST([STRIP]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([STRIP]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.ac:9: -1- AC_SUBST([INSTALL_STRIP_PROGRAM]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$]) ++m4trace:configure.ac:9: -1- AC_REQUIRE_AUX_FILE([install-sh]) ++m4trace:configure.ac:9: -1- AC_SUBST([MKDIR_P]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([MKDIR_P]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^MKDIR_P$]) ++m4trace:configure.ac:9: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([mkdir_p]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^mkdir_p$]) ++m4trace:configure.ac:9: -1- AC_SUBST([AWK]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([AWK]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AWK$]) ++m4trace:configure.ac:9: -1- AC_SUBST([SET_MAKE]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([SET_MAKE]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.ac:9: -1- AC_SUBST([am__leading_dot]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([am__leading_dot]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__leading_dot$]) ++m4trace:configure.ac:9: -1- AC_SUBST([AMTAR]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([AMTAR]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^AMTAR$]) ++m4trace:configure.ac:9: -1- AC_SUBST([am__tar]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([am__tar]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__tar$]) ++m4trace:configure.ac:9: -1- AC_SUBST([am__untar]) ++m4trace:configure.ac:9: -1- AC_SUBST_TRACE([am__untar]) ++m4trace:configure.ac:9: -1- m4_pattern_allow([^am__untar$]) ++m4trace:configure.ac:11: -1- AC_SUBST([PACKAGE_VERSION_MAJOR]) ++m4trace:configure.ac:11: -1- AC_SUBST_TRACE([PACKAGE_VERSION_MAJOR]) ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MAJOR$]) ++m4trace:configure.ac:11: -1- AC_SUBST([PACKAGE_VERSION_MINOR]) ++m4trace:configure.ac:11: -1- AC_SUBST_TRACE([PACKAGE_VERSION_MINOR]) ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MINOR$]) ++m4trace:configure.ac:11: -1- AC_SUBST([PACKAGE_VERSION_MICRO]) ++m4trace:configure.ac:11: -1- AC_SUBST_TRACE([PACKAGE_VERSION_MICRO]) ++m4trace:configure.ac:11: -1- m4_pattern_allow([^PACKAGE_VERSION_MICRO$]) ++m4trace:configure.ac:13: -1- AM_MAINTAINER_MODE ++m4trace:configure.ac:13: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++m4trace:configure.ac:13: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) ++m4trace:configure.ac:13: -1- AC_SUBST_TRACE([MAINTAINER_MODE_TRUE]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINTAINER_MODE_TRUE$]) ++m4trace:configure.ac:13: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) ++m4trace:configure.ac:13: -1- AC_SUBST_TRACE([MAINTAINER_MODE_FALSE]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINTAINER_MODE_FALSE$]) ++m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_TRUE]) ++m4trace:configure.ac:13: -1- _AM_SUBST_NOTMAKE([MAINTAINER_MODE_FALSE]) ++m4trace:configure.ac:13: -1- AC_SUBST([MAINT]) ++m4trace:configure.ac:13: -1- AC_SUBST_TRACE([MAINT]) ++m4trace:configure.ac:13: -1- m4_pattern_allow([^MAINT$]) ++m4trace:configure.ac:20: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete. ++You should run autoupdate.], [aclocal.m4:1086: AM_CONFIG_HEADER is expanded from... ++configure.ac:20: the top level]) ++m4trace:configure.ac:20: -1- AC_CONFIG_HEADERS([config.h]) ++m4trace:configure.ac:23: -1- AC_SUBST([USE_NLS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([USE_NLS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^USE_NLS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_UPDATE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_UPDATE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_UPDATE$]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_MERGE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_MERGE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_MERGE$]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_EXTRACT]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_EXTRACT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_EXTRACT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_DESKTOP_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_DESKTOP_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_DESKTOP_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_DESKTOP_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_DIRECTORY_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_DIRECTORY_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_DIRECTORY_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_DIRECTORY_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_KEYS_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_KEYS_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_KEYS_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_KEYS_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_PROP_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_PROP_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PROP_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_PROP_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_OAF_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_OAF_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_OAF_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_OAF_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_PONG_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_PONG_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PONG_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_PONG_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_SERVER_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_SERVER_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SERVER_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SERVER_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_SHEET_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_SHEET_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SHEET_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SHEET_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_SOUNDLIST_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_SOUNDLIST_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SOUNDLIST_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SOUNDLIST_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_UI_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_UI_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_UI_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_UI_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_XAM_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_XAM_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XAM_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XAM_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_KBD_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_KBD_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_KBD_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_KBD_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_XML_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_XML_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XML_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XML_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_XML_NOMERGE_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_XML_NOMERGE_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_XML_NOMERGE_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_XML_NOMERGE_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_CAVES_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_CAVES_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_CAVES_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_CAVES_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_SCHEMAS_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_SCHEMAS_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SCHEMAS_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SCHEMAS_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_THEME_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_THEME_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_THEME_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_THEME_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_SERVICE_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_SERVICE_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_SERVICE_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_SERVICE_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_POLICY_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_POLICY_RULE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_POLICY_RULE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([INTLTOOL_POLICY_RULE]) ++m4trace:configure.ac:23: -1- AC_SUBST([XGETTEXT]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([XGETTEXT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^XGETTEXT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([MSGMERGE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([MSGMERGE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^MSGMERGE$]) ++m4trace:configure.ac:23: -1- AC_SUBST([MSGFMT]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([MSGFMT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^MSGFMT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([GMSGFMT]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([GMSGFMT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^GMSGFMT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([INTLTOOL_PERL]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([INTLTOOL_PERL]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^INTLTOOL_PERL$]) ++m4trace:configure.ac:23: -1- AC_SUBST([ALL_LINGUAS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([ALL_LINGUAS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^ALL_LINGUAS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CFLAGS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CFLAGS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([LIBS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([ac_ct_CC]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([ac_ct_CC]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.ac:23: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([EXEEXT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^EXEEXT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([OBJEXT], [$ac_cv_objext]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([OBJEXT]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^OBJEXT$]) ++m4trace:configure.ac:23: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([DEPDIR]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^DEPDIR$]) ++m4trace:configure.ac:23: -1- AC_SUBST([am__include]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__include]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__include$]) ++m4trace:configure.ac:23: -1- AC_SUBST([am__quote]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__quote]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__quote$]) ++m4trace:configure.ac:23: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++m4trace:configure.ac:23: -1- AC_SUBST([AMDEP_TRUE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([AMDEP_TRUE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEP_TRUE$]) ++m4trace:configure.ac:23: -1- AC_SUBST([AMDEP_FALSE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([AMDEP_FALSE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEP_FALSE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE]) ++m4trace:configure.ac:23: -1- AC_SUBST([AMDEPBACKSLASH]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([AMDEPBACKSLASH]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^AMDEPBACKSLASH$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH]) ++m4trace:configure.ac:23: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([CCDEPMODE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.ac:23: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.ac:23: -1- AC_SUBST([am__fastdepCC_TRUE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.ac:23: -1- AC_SUBST([am__fastdepCC_FALSE]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:23: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:23: -1- AC_SUBST([DATADIRNAME]) ++m4trace:configure.ac:23: -1- AC_SUBST_TRACE([DATADIRNAME]) ++m4trace:configure.ac:23: -1- m4_pattern_allow([^DATADIRNAME$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CFLAGS]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CFLAGS]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:25: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:25: -1- AC_SUBST([LIBS]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([ac_ct_CC]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([ac_ct_CC]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^ac_ct_CC$]) ++m4trace:configure.ac:25: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CCDEPMODE]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^CCDEPMODE$]) ++m4trace:configure.ac:25: -1- AM_CONDITIONAL([am__fastdepCC], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_CC_dependencies_compiler_type" = gcc3]) ++m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCC_TRUE]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_TRUE$]) ++m4trace:configure.ac:25: -1- AC_SUBST([am__fastdepCC_FALSE]) ++m4trace:configure.ac:25: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:25: -1- m4_pattern_allow([^am__fastdepCC_FALSE$]) ++m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE]) ++m4trace:configure.ac:25: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE]) ++m4trace:configure.ac:26: -1- _m4_warn([obsolete], [The macro `AC_ISC_POSIX' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/specific.m4:442: AC_ISC_POSIX is expanded from... ++configure.ac:26: the top level]) ++m4trace:configure.ac:30: -1- AC_SUBST([LN_S], [$as_ln_s]) ++m4trace:configure.ac:30: -1- AC_SUBST_TRACE([LN_S]) ++m4trace:configure.ac:30: -1- m4_pattern_allow([^LN_S$]) ++m4trace:configure.ac:31: -1- AC_SUBST([SET_MAKE]) ++m4trace:configure.ac:31: -1- AC_SUBST_TRACE([SET_MAKE]) ++m4trace:configure.ac:31: -1- m4_pattern_allow([^SET_MAKE$]) ++m4trace:configure.ac:34: -1- AC_SUBST([CPP]) ++m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPP]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.ac:34: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:34: -1- AC_SUBST([CPP]) ++m4trace:configure.ac:34: -1- AC_SUBST_TRACE([CPP]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^CPP$]) ++m4trace:configure.ac:34: -1- AC_SUBST([GREP]) ++m4trace:configure.ac:34: -1- AC_SUBST_TRACE([GREP]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.ac:34: -1- AC_SUBST([EGREP]) ++m4trace:configure.ac:34: -1- AC_SUBST_TRACE([EGREP]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^EGREP$]) ++m4trace:configure.ac:34: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) ++m4trace:configure.ac:34: -1- m4_pattern_allow([^STDC_HEADERS$]) ++m4trace:configure.ac:34: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ ++@%:@undef STDC_HEADERS]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */ ++@%:@undef HAVE_FCNTL_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */ ++@%:@undef HAVE_LIMITS_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_MALLOC_H], [/* Define to 1 if you have the <malloc.h> header file. */ ++@%:@undef HAVE_MALLOC_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */ ++@%:@undef HAVE_STRINGS_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_SYS_IOCTL_H], [/* Define to 1 if you have the <sys/ioctl.h> header file. */ ++@%:@undef HAVE_SYS_IOCTL_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ ++@%:@undef HAVE_UNISTD_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */ ++@%:@undef HAVE_SYS_TYPES_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */ ++@%:@undef HAVE_SYS_STAT_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */ ++@%:@undef HAVE_STDLIB_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */ ++@%:@undef HAVE_STRING_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */ ++@%:@undef HAVE_MEMORY_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */ ++@%:@undef HAVE_STRINGS_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */ ++@%:@undef HAVE_INTTYPES_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */ ++@%:@undef HAVE_STDINT_H]) ++m4trace:configure.ac:35: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ ++@%:@undef HAVE_UNISTD_H]) ++m4trace:configure.ac:36: -1- AH_OUTPUT([HAVE_SYS_SOCKIO_H], [/* Define to 1 if you have the <sys/sockio.h> header file. */ ++@%:@undef HAVE_SYS_SOCKIO_H]) ++m4trace:configure.ac:36: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */ ++@%:@undef HAVE_SYS_PARAM_H]) ++m4trace:configure.ac:39: -1- AC_DEFINE_TRACE_LITERAL([const]) ++m4trace:configure.ac:39: -1- m4_pattern_allow([^const$]) ++m4trace:configure.ac:39: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ ++@%:@undef const]) ++m4trace:configure.ac:40: -1- AH_OUTPUT([inline], [/* 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]) ++m4trace:configure.ac:41: -1- AC_DEFINE_TRACE_LITERAL([off_t]) ++m4trace:configure.ac:41: -1- m4_pattern_allow([^off_t$]) ++m4trace:configure.ac:41: -1- AH_OUTPUT([off_t], [/* Define to `long int\' if <sys/types.h> does not define. */ ++@%:@undef off_t]) ++m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([size_t]) ++m4trace:configure.ac:42: -1- m4_pattern_allow([^size_t$]) ++m4trace:configure.ac:42: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */ ++@%:@undef size_t]) ++m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */ ++@%:@undef HAVE_STDLIB_H]) ++m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */ ++@%:@undef HAVE_UNISTD_H]) ++m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */ ++@%:@undef HAVE_SYS_PARAM_H]) ++m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */ ++@%:@undef HAVE_GETPAGESIZE]) ++m4trace:configure.ac:46: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPAGESIZE]) ++m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_GETPAGESIZE$]) ++m4trace:configure.ac:46: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP]) ++m4trace:configure.ac:46: -1- m4_pattern_allow([^HAVE_MMAP$]) ++m4trace:configure.ac:46: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working `mmap\' system call. */ ++@%:@undef HAVE_MMAP]) ++m4trace:configure.ac:52: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++m4/as-compiler-flag.m4:14: AS_COMPILER_FLAG is expanded from... ++configure.ac:52: the top level]) ++m4trace:configure.ac:56: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++m4/as-compiler-flag.m4:14: AS_COMPILER_FLAG is expanded from... ++configure.ac:56: the top level]) ++m4trace:configure.ac:70: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) ++m4trace:configure.ac:70: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.ac:70: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.ac:70: -1- AC_SUBST([PKG_CONFIG]) ++m4trace:configure.ac:70: -1- AC_SUBST_TRACE([PKG_CONFIG]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^PKG_CONFIG$]) ++m4trace:configure.ac:70: -1- AC_SUBST([SOUND_THEME_CFLAGS]) ++m4trace:configure.ac:70: -1- AC_SUBST_TRACE([SOUND_THEME_CFLAGS]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^SOUND_THEME_CFLAGS$]) ++m4trace:configure.ac:70: -1- AC_SUBST([SOUND_THEME_LIBS]) ++m4trace:configure.ac:70: -1- AC_SUBST_TRACE([SOUND_THEME_LIBS]) ++m4trace:configure.ac:70: -1- m4_pattern_allow([^SOUND_THEME_LIBS$]) ++m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOUND_THEME]) ++m4trace:configure.ac:81: -1- m4_pattern_allow([^HAVE_SOUND_THEME$]) ++m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SOUND_THEME], [/* Define if we can build sound theme */ ++@%:@undef HAVE_SOUND_THEME]) ++m4trace:configure.ac:83: -1- AM_CONDITIONAL([HAVE_SOUND_THEME], [test x$have_soundtheme = xyes]) ++m4trace:configure.ac:83: -1- AC_SUBST([HAVE_SOUND_THEME_TRUE]) ++m4trace:configure.ac:83: -1- AC_SUBST_TRACE([HAVE_SOUND_THEME_TRUE]) ++m4trace:configure.ac:83: -1- m4_pattern_allow([^HAVE_SOUND_THEME_TRUE$]) ++m4trace:configure.ac:83: -1- AC_SUBST([HAVE_SOUND_THEME_FALSE]) ++m4trace:configure.ac:83: -1- AC_SUBST_TRACE([HAVE_SOUND_THEME_FALSE]) ++m4trace:configure.ac:83: -1- m4_pattern_allow([^HAVE_SOUND_THEME_FALSE$]) ++m4trace:configure.ac:83: -1- _AM_SUBST_NOTMAKE([HAVE_SOUND_THEME_TRUE]) ++m4trace:configure.ac:83: -1- _AM_SUBST_NOTMAKE([HAVE_SOUND_THEME_FALSE]) ++m4trace:configure.ac:84: -1- AC_SUBST([HAVE_SOUND_THEME]) ++m4trace:configure.ac:84: -1- AC_SUBST_TRACE([HAVE_SOUND_THEME]) ++m4trace:configure.ac:84: -1- m4_pattern_allow([^HAVE_SOUND_THEME$]) ++m4trace:configure.ac:85: -1- AC_SUBST([SOUNDTHEME_CFLAGS]) ++m4trace:configure.ac:85: -1- AC_SUBST_TRACE([SOUNDTHEME_CFLAGS]) ++m4trace:configure.ac:85: -1- m4_pattern_allow([^SOUNDTHEME_CFLAGS$]) ++m4trace:configure.ac:86: -1- AC_SUBST([SOUNDTHEME_LIBS]) ++m4trace:configure.ac:86: -1- AC_SUBST_TRACE([SOUNDTHEME_LIBS]) ++m4trace:configure.ac:86: -1- m4_pattern_allow([^SOUNDTHEME_LIBS$]) ++m4trace:configure.ac:102: -1- AC_SUBST([PULSEAUDIO_CFLAGS]) ++m4trace:configure.ac:102: -1- AC_SUBST_TRACE([PULSEAUDIO_CFLAGS]) ++m4trace:configure.ac:102: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$]) ++m4trace:configure.ac:102: -1- AC_SUBST([PULSEAUDIO_LIBS]) ++m4trace:configure.ac:102: -1- AC_SUBST_TRACE([PULSEAUDIO_LIBS]) ++m4trace:configure.ac:102: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$]) ++m4trace:configure.ac:112: -1- AC_SUBST([VOLUME_CONTROL_CFLAGS]) ++m4trace:configure.ac:112: -1- AC_SUBST_TRACE([VOLUME_CONTROL_CFLAGS]) ++m4trace:configure.ac:112: -1- m4_pattern_allow([^VOLUME_CONTROL_CFLAGS$]) ++m4trace:configure.ac:112: -1- AC_SUBST([VOLUME_CONTROL_LIBS]) ++m4trace:configure.ac:112: -1- AC_SUBST_TRACE([VOLUME_CONTROL_LIBS]) ++m4trace:configure.ac:112: -1- m4_pattern_allow([^VOLUME_CONTROL_LIBS$]) ++m4trace:configure.ac:121: -1- AC_SUBST([VOLUME_CONTROL_CFLAGS]) ++m4trace:configure.ac:121: -1- AC_SUBST_TRACE([VOLUME_CONTROL_CFLAGS]) ++m4trace:configure.ac:121: -1- m4_pattern_allow([^VOLUME_CONTROL_CFLAGS$]) ++m4trace:configure.ac:122: -1- AC_SUBST([VOLUME_CONTROL_LIBS]) ++m4trace:configure.ac:122: -1- AC_SUBST_TRACE([VOLUME_CONTROL_LIBS]) ++m4trace:configure.ac:122: -1- m4_pattern_allow([^VOLUME_CONTROL_LIBS$]) ++m4trace:configure.ac:123: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PULSEAUDIO]) ++m4trace:configure.ac:123: -1- m4_pattern_allow([^HAVE_PULSEAUDIO$]) ++m4trace:configure.ac:123: -1- AH_OUTPUT([HAVE_PULSEAUDIO], [/* Define if we have pulseaudio */ ++@%:@undef HAVE_PULSEAUDIO]) ++m4trace:configure.ac:128: -1- AM_CONDITIONAL([HAVE_PULSEAUDIO], [test x$have_pulseaudio = xyes]) ++m4trace:configure.ac:128: -1- AC_SUBST([HAVE_PULSEAUDIO_TRUE]) ++m4trace:configure.ac:128: -1- AC_SUBST_TRACE([HAVE_PULSEAUDIO_TRUE]) ++m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_PULSEAUDIO_TRUE$]) ++m4trace:configure.ac:128: -1- AC_SUBST([HAVE_PULSEAUDIO_FALSE]) ++m4trace:configure.ac:128: -1- AC_SUBST_TRACE([HAVE_PULSEAUDIO_FALSE]) ++m4trace:configure.ac:128: -1- m4_pattern_allow([^HAVE_PULSEAUDIO_FALSE$]) ++m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([HAVE_PULSEAUDIO_TRUE]) ++m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([HAVE_PULSEAUDIO_FALSE]) ++m4trace:configure.ac:129: -1- AC_SUBST([HAVE_PULSEAUDIO]) ++m4trace:configure.ac:129: -1- AC_SUBST_TRACE([HAVE_PULSEAUDIO]) ++m4trace:configure.ac:129: -1- m4_pattern_allow([^HAVE_PULSEAUDIO$]) ++m4trace:configure.ac:130: -1- AC_SUBST([PULSEAUDIO_CFLAGS]) ++m4trace:configure.ac:130: -1- AC_SUBST_TRACE([PULSEAUDIO_CFLAGS]) ++m4trace:configure.ac:130: -1- m4_pattern_allow([^PULSEAUDIO_CFLAGS$]) ++m4trace:configure.ac:131: -1- AC_SUBST([PULSEAUDIO_LIBS]) ++m4trace:configure.ac:131: -1- AC_SUBST_TRACE([PULSEAUDIO_LIBS]) ++m4trace:configure.ac:131: -1- m4_pattern_allow([^PULSEAUDIO_LIBS$]) ++m4trace:configure.ac:144: -1- AC_SUBST([GMP_CFLAGS]) ++m4trace:configure.ac:144: -1- AC_SUBST_TRACE([GMP_CFLAGS]) ++m4trace:configure.ac:144: -1- m4_pattern_allow([^GMP_CFLAGS$]) ++m4trace:configure.ac:144: -1- AC_SUBST([GMP_LIBS]) ++m4trace:configure.ac:144: -1- AC_SUBST_TRACE([GMP_LIBS]) ++m4trace:configure.ac:144: -1- m4_pattern_allow([^GMP_LIBS$]) ++m4trace:configure.ac:151: -1- AC_SUBST([GMP_CFLAGS]) ++m4trace:configure.ac:151: -1- AC_SUBST_TRACE([GMP_CFLAGS]) ++m4trace:configure.ac:151: -1- m4_pattern_allow([^GMP_CFLAGS$]) ++m4trace:configure.ac:152: -1- AC_SUBST([GMP_LIBS]) ++m4trace:configure.ac:152: -1- AC_SUBST_TRACE([GMP_LIBS]) ++m4trace:configure.ac:152: -1- m4_pattern_allow([^GMP_LIBS$]) ++m4trace:configure.ac:153: -1- AM_CONDITIONAL([HAVE_GMP], [test x$have_profiles = xyes]) ++m4trace:configure.ac:153: -1- AC_SUBST([HAVE_GMP_TRUE]) ++m4trace:configure.ac:153: -1- AC_SUBST_TRACE([HAVE_GMP_TRUE]) ++m4trace:configure.ac:153: -1- m4_pattern_allow([^HAVE_GMP_TRUE$]) ++m4trace:configure.ac:153: -1- AC_SUBST([HAVE_GMP_FALSE]) ++m4trace:configure.ac:153: -1- AC_SUBST_TRACE([HAVE_GMP_FALSE]) ++m4trace:configure.ac:153: -1- m4_pattern_allow([^HAVE_GMP_FALSE$]) ++m4trace:configure.ac:153: -1- _AM_SUBST_NOTMAKE([HAVE_GMP_TRUE]) ++m4trace:configure.ac:153: -1- _AM_SUBST_NOTMAKE([HAVE_GMP_FALSE]) ++m4trace:configure.ac:158: -1- AC_SUBST([GLADEUI_CFLAGS]) ++m4trace:configure.ac:158: -1- AC_SUBST_TRACE([GLADEUI_CFLAGS]) ++m4trace:configure.ac:158: -1- m4_pattern_allow([^GLADEUI_CFLAGS$]) ++m4trace:configure.ac:158: -1- AC_SUBST([GLADEUI_LIBS]) ++m4trace:configure.ac:158: -1- AC_SUBST_TRACE([GLADEUI_LIBS]) ++m4trace:configure.ac:158: -1- m4_pattern_allow([^GLADEUI_LIBS$]) ++m4trace:configure.ac:159: -1- AC_SUBST([GLADEUI_CFLAGS]) ++m4trace:configure.ac:159: -1- AC_SUBST_TRACE([GLADEUI_CFLAGS]) ++m4trace:configure.ac:159: -1- m4_pattern_allow([^GLADEUI_CFLAGS$]) ++m4trace:configure.ac:160: -1- AC_SUBST([GLADEUI_LIBS]) ++m4trace:configure.ac:160: -1- AC_SUBST_TRACE([GLADEUI_LIBS]) ++m4trace:configure.ac:160: -1- m4_pattern_allow([^GLADEUI_LIBS$]) ++m4trace:configure.ac:161: -1- AM_CONDITIONAL([HAVE_GLADEUI], [test x$have_gladeui = xyes]) ++m4trace:configure.ac:161: -1- AC_SUBST([HAVE_GLADEUI_TRUE]) ++m4trace:configure.ac:161: -1- AC_SUBST_TRACE([HAVE_GLADEUI_TRUE]) ++m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_GLADEUI_TRUE$]) ++m4trace:configure.ac:161: -1- AC_SUBST([HAVE_GLADEUI_FALSE]) ++m4trace:configure.ac:161: -1- AC_SUBST_TRACE([HAVE_GLADEUI_FALSE]) ++m4trace:configure.ac:161: -1- m4_pattern_allow([^HAVE_GLADEUI_FALSE$]) ++m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([HAVE_GLADEUI_TRUE]) ++m4trace:configure.ac:161: -1- _AM_SUBST_NOTMAKE([HAVE_GLADEUI_FALSE]) ++m4trace:configure.ac:164: -1- AC_SUBST([GLADEUI_CATALOG_DIR]) ++m4trace:configure.ac:164: -1- AC_SUBST_TRACE([GLADEUI_CATALOG_DIR]) ++m4trace:configure.ac:164: -1- m4_pattern_allow([^GLADEUI_CATALOG_DIR$]) ++m4trace:configure.ac:167: -1- AC_SUBST([GLADEUI_MODULE_DIR]) ++m4trace:configure.ac:167: -1- AC_SUBST_TRACE([GLADEUI_MODULE_DIR]) ++m4trace:configure.ac:167: -1- m4_pattern_allow([^GLADEUI_MODULE_DIR$]) ++m4trace:configure.ac:178: -1- AC_SUBST([GST_MAJORMINOR]) ++m4trace:configure.ac:178: -1- AC_SUBST_TRACE([GST_MAJORMINOR]) ++m4trace:configure.ac:178: -1- m4_pattern_allow([^GST_MAJORMINOR$]) ++m4trace:configure.ac:179: -1- AC_DEFINE_TRACE_LITERAL([GST_MAJORMINOR_QUOTED]) ++m4trace:configure.ac:179: -1- m4_pattern_allow([^GST_MAJORMINOR_QUOTED$]) ++m4trace:configure.ac:179: -1- AH_OUTPUT([GST_MAJORMINOR_QUOTED], [/* major/minor of GStreamer as a string constant */ ++@%:@undef GST_MAJORMINOR_QUOTED]) ++m4trace:configure.ac:184: -1- AC_SUBST([GSR_CFLAGS]) ++m4trace:configure.ac:184: -1- AC_SUBST_TRACE([GSR_CFLAGS]) ++m4trace:configure.ac:184: -1- m4_pattern_allow([^GSR_CFLAGS$]) ++m4trace:configure.ac:184: -1- AC_SUBST([GSR_LIBS]) ++m4trace:configure.ac:184: -1- AC_SUBST_TRACE([GSR_LIBS]) ++m4trace:configure.ac:184: -1- m4_pattern_allow([^GSR_LIBS$]) ++m4trace:configure.ac:220: -1- AC_SUBST([GSR_CFLAGS]) ++m4trace:configure.ac:220: -1- AC_SUBST_TRACE([GSR_CFLAGS]) ++m4trace:configure.ac:220: -1- m4_pattern_allow([^GSR_CFLAGS$]) ++m4trace:configure.ac:221: -1- AC_SUBST([GSR_LIBS]) ++m4trace:configure.ac:221: -1- AC_SUBST_TRACE([GSR_LIBS]) ++m4trace:configure.ac:221: -1- m4_pattern_allow([^GSR_LIBS$]) ++m4trace:configure.ac:222: -1- AM_CONDITIONAL([HAVE_GSTREAMER], [test x$have_gst = xyes]) ++m4trace:configure.ac:222: -1- AC_SUBST([HAVE_GSTREAMER_TRUE]) ++m4trace:configure.ac:222: -1- AC_SUBST_TRACE([HAVE_GSTREAMER_TRUE]) ++m4trace:configure.ac:222: -1- m4_pattern_allow([^HAVE_GSTREAMER_TRUE$]) ++m4trace:configure.ac:222: -1- AC_SUBST([HAVE_GSTREAMER_FALSE]) ++m4trace:configure.ac:222: -1- AC_SUBST_TRACE([HAVE_GSTREAMER_FALSE]) ++m4trace:configure.ac:222: -1- m4_pattern_allow([^HAVE_GSTREAMER_FALSE$]) ++m4trace:configure.ac:222: -1- _AM_SUBST_NOTMAKE([HAVE_GSTREAMER_TRUE]) ++m4trace:configure.ac:222: -1- _AM_SUBST_NOTMAKE([HAVE_GSTREAMER_FALSE]) ++m4trace:configure.ac:223: -1- AM_CONDITIONAL([HAVE_GRECORD], [test x$have_grecord = xyes]) ++m4trace:configure.ac:223: -1- AC_SUBST([HAVE_GRECORD_TRUE]) ++m4trace:configure.ac:223: -1- AC_SUBST_TRACE([HAVE_GRECORD_TRUE]) ++m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_GRECORD_TRUE$]) ++m4trace:configure.ac:223: -1- AC_SUBST([HAVE_GRECORD_FALSE]) ++m4trace:configure.ac:223: -1- AC_SUBST_TRACE([HAVE_GRECORD_FALSE]) ++m4trace:configure.ac:223: -1- m4_pattern_allow([^HAVE_GRECORD_FALSE$]) ++m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([HAVE_GRECORD_TRUE]) ++m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([HAVE_GRECORD_FALSE]) ++m4trace:configure.ac:226: -1- AC_DEFINE_TRACE_LITERAL([GSR_UIDIR_UNINSTALLED]) ++m4trace:configure.ac:226: -1- m4_pattern_allow([^GSR_UIDIR_UNINSTALLED$]) ++m4trace:configure.ac:226: -1- AH_OUTPUT([GSR_UIDIR_UNINSTALLED], [/* path to uninstalled gnome-sound-recorder UI dir */ ++@%:@undef GSR_UIDIR_UNINSTALLED]) ++m4trace:configure.ac:229: -1- AC_SUBST([GCONFTOOL]) ++m4trace:configure.ac:229: -1- AC_SUBST_TRACE([GCONFTOOL]) ++m4trace:configure.ac:229: -1- m4_pattern_allow([^GCONFTOOL$]) ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++aclocal.m4:29: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- AC_SUBST([GCONF_SCHEMA_CONFIG_SOURCE]) ++m4trace:configure.ac:230: -1- AC_SUBST_TRACE([GCONF_SCHEMA_CONFIG_SOURCE]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMA_CONFIG_SOURCE$]) ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++aclocal.m4:29: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- AC_SUBST([GCONF_SCHEMA_FILE_DIR]) ++m4trace:configure.ac:230: -1- AC_SUBST_TRACE([GCONF_SCHEMA_FILE_DIR]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMA_FILE_DIR$]) ++m4trace:configure.ac:230: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++aclocal.m4:29: AM_GCONF_SOURCE_2 is expanded from... ++configure.ac:230: the top level]) ++m4trace:configure.ac:230: -1- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++m4trace:configure.ac:230: -1- AC_SUBST([GCONF_SCHEMAS_INSTALL_TRUE]) ++m4trace:configure.ac:230: -1- AC_SUBST_TRACE([GCONF_SCHEMAS_INSTALL_TRUE]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMAS_INSTALL_TRUE$]) ++m4trace:configure.ac:230: -1- AC_SUBST([GCONF_SCHEMAS_INSTALL_FALSE]) ++m4trace:configure.ac:230: -1- AC_SUBST_TRACE([GCONF_SCHEMAS_INSTALL_FALSE]) ++m4trace:configure.ac:230: -1- m4_pattern_allow([^GCONF_SCHEMAS_INSTALL_FALSE$]) ++m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([GCONF_SCHEMAS_INSTALL_TRUE]) ++m4trace:configure.ac:230: -1- _AM_SUBST_NOTMAKE([GCONF_SCHEMAS_INSTALL_FALSE]) ++m4trace:configure.ac:232: -1- AC_SUBST([GLIB_GENMARSHAL]) ++m4trace:configure.ac:232: -1- AC_SUBST_TRACE([GLIB_GENMARSHAL]) ++m4trace:configure.ac:232: -1- m4_pattern_allow([^GLIB_GENMARSHAL$]) ++m4trace:configure.ac:239: -1- AC_SUBST([GETTEXT_PACKAGE]) ++m4trace:configure.ac:239: -1- AC_SUBST_TRACE([GETTEXT_PACKAGE]) ++m4trace:configure.ac:239: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.ac:240: -1- AC_DEFINE_TRACE_LITERAL([GETTEXT_PACKAGE]) ++m4trace:configure.ac:240: -1- m4_pattern_allow([^GETTEXT_PACKAGE$]) ++m4trace:configure.ac:240: -1- AH_OUTPUT([GETTEXT_PACKAGE], [/* Define to the Gettext package name */ ++@%:@undef GETTEXT_PACKAGE]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */ ++@%:@undef HAVE_LOCALE_H]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LOCALE_H]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_LOCALE_H$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++aclocal.m4:114: GLIB_LC_MESSAGES is expanded from... ++aclocal.m4:378: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:478: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LC_MESSAGES]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_LC_MESSAGES$]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_LC_MESSAGES], [/* Define if your <locale.h> file defines LC_MESSAGES. */ ++@%:@undef HAVE_LC_MESSAGES]) ++m4trace:configure.ac:241: -1- AC_SUBST([USE_NLS]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([USE_NLS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^USE_NLS$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++aclocal.m4:168: GLIB_WITH_NLS is expanded from... ++aclocal.m4:378: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:478: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2019: AC_CACHE_VAL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:2040: AC_CACHE_CHECK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++aclocal.m4:168: GLIB_WITH_NLS is expanded from... ++aclocal.m4:378: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:478: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ ++@%:@undef HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_BIND_TEXTDOMAIN_CODESET$]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_BIND_TEXTDOMAIN_CODESET], [/* Define to 1 if you have the `bind_textdomain_codeset\' function. */ ++@%:@undef HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BIND_TEXTDOMAIN_CODESET]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_BIND_TEXTDOMAIN_CODESET$]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_GETTEXT$]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */ ++@%:@undef HAVE_GETTEXT]) ++m4trace:configure.ac:241: -1- AC_SUBST([MSGFMT]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([MSGFMT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MSGFMT$]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define to 1 if you have the `dcgettext\' function. */ ++@%:@undef HAVE_DCGETTEXT]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DCGETTEXT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^HAVE_DCGETTEXT$]) ++m4trace:configure.ac:241: -1- AC_SUBST([MSGFMT_OPTS]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([MSGFMT_OPTS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MSGFMT_OPTS$]) ++m4trace:configure.ac:241: -1- AC_SUBST([GMSGFMT]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([GMSGFMT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^GMSGFMT$]) ++m4trace:configure.ac:241: -1- AC_SUBST([XGETTEXT]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([XGETTEXT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^XGETTEXT$]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2675: AC_TRY_LINK is expanded from... ++/tmp/autoconf-2.67/lib/m4sugar/m4sh.m4:598: AS_IF is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from... ++aclocal.m4:168: GLIB_WITH_NLS is expanded from... ++aclocal.m4:378: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:478: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^ENABLE_NLS$]) ++m4trace:configure.ac:241: -1- AH_OUTPUT([ENABLE_NLS], [/* always defined to indicate that i18n is enabled */ ++@%:@undef ENABLE_NLS]) ++m4trace:configure.ac:241: -1- _m4_warn([obsolete], [The macro `AC_OUTPUT_COMMANDS' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/status.m4:1027: AC_OUTPUT_COMMANDS is expanded from... ++aclocal.m4:168: GLIB_WITH_NLS is expanded from... ++aclocal.m4:378: GLIB_GNU_GETTEXT is expanded from... ++aclocal.m4:478: AM_GLIB_GNU_GETTEXT is expanded from... ++configure.ac:241: the top level]) ++m4trace:configure.ac:241: -1- AC_SUBST([CATALOGS]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([CATALOGS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^CATALOGS$]) ++m4trace:configure.ac:241: -1- AC_SUBST([CATOBJEXT]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([CATOBJEXT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^CATOBJEXT$]) ++m4trace:configure.ac:241: -1- AC_SUBST([DATADIRNAME]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([DATADIRNAME]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^DATADIRNAME$]) ++m4trace:configure.ac:241: -1- AC_SUBST([GMOFILES]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([GMOFILES]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^GMOFILES$]) ++m4trace:configure.ac:241: -1- AC_SUBST([INSTOBJEXT]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([INSTOBJEXT]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^INSTOBJEXT$]) ++m4trace:configure.ac:241: -1- AC_SUBST([INTLLIBS]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([INTLLIBS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^INTLLIBS$]) ++m4trace:configure.ac:241: -1- AC_SUBST([PO_IN_DATADIR_TRUE]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([PO_IN_DATADIR_TRUE]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^PO_IN_DATADIR_TRUE$]) ++m4trace:configure.ac:241: -1- AC_SUBST([PO_IN_DATADIR_FALSE]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([PO_IN_DATADIR_FALSE]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^PO_IN_DATADIR_FALSE$]) ++m4trace:configure.ac:241: -1- AC_SUBST([POFILES]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([POFILES]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^POFILES$]) ++m4trace:configure.ac:241: -1- AC_SUBST([POSUB]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([POSUB]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^POSUB$]) ++m4trace:configure.ac:241: -1- AC_SUBST([MKINSTALLDIRS]) ++m4trace:configure.ac:241: -1- AC_SUBST_TRACE([MKINSTALLDIRS]) ++m4trace:configure.ac:241: -1- m4_pattern_allow([^MKINSTALLDIRS$]) ++m4trace:configure.ac:243: -1- _m4_warn([obsolete], [The macro `AM_PROG_LIBTOOL' is obsolete. ++You should run autoupdate.], [m4/libtool.m4:108: AM_PROG_LIBTOOL is expanded from... ++configure.ac:243: the top level]) ++m4trace:configure.ac:243: -1- LT_INIT ++m4trace:configure.ac:243: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$]) ++m4trace:configure.ac:243: -1- AC_REQUIRE_AUX_FILE([ltmain.sh]) ++m4trace:configure.ac:243: -1- AC_SUBST([LIBTOOL]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([LIBTOOL]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LIBTOOL$]) ++m4trace:configure.ac:243: -1- AC_CANONICAL_HOST ++m4trace:configure.ac:243: -1- AC_CANONICAL_BUILD ++m4trace:configure.ac:243: -1- AC_REQUIRE_AUX_FILE([config.sub]) ++m4trace:configure.ac:243: -1- AC_REQUIRE_AUX_FILE([config.guess]) ++m4trace:configure.ac:243: -1- AC_SUBST([build], [$ac_cv_build]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([build]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build$]) ++m4trace:configure.ac:243: -1- AC_SUBST([build_cpu], [$[1]]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([build_cpu]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_cpu$]) ++m4trace:configure.ac:243: -1- AC_SUBST([build_vendor], [$[2]]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([build_vendor]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_vendor$]) ++m4trace:configure.ac:243: -1- AC_SUBST([build_os]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([build_os]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^build_os$]) ++m4trace:configure.ac:243: -1- AC_SUBST([host], [$ac_cv_host]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([host]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host$]) ++m4trace:configure.ac:243: -1- AC_SUBST([host_cpu], [$[1]]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([host_cpu]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_cpu$]) ++m4trace:configure.ac:243: -1- AC_SUBST([host_vendor], [$[2]]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([host_vendor]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_vendor$]) ++m4trace:configure.ac:243: -1- AC_SUBST([host_os]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([host_os]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^host_os$]) ++m4trace:configure.ac:243: -1- AC_SUBST([SED]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([SED]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^SED$]) ++m4trace:configure.ac:243: -1- AC_SUBST([FGREP]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([FGREP]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^FGREP$]) ++m4trace:configure.ac:243: -1- AC_SUBST([GREP]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([GREP]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^GREP$]) ++m4trace:configure.ac:243: -1- AC_SUBST([LD]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([LD]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LD$]) ++m4trace:configure.ac:243: -1- AC_SUBST([DUMPBIN]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([DUMPBIN]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DUMPBIN$]) ++m4trace:configure.ac:243: -1- AC_SUBST([ac_ct_DUMPBIN]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([ac_ct_DUMPBIN]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^ac_ct_DUMPBIN$]) ++m4trace:configure.ac:243: -1- AC_SUBST([DUMPBIN]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([DUMPBIN]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DUMPBIN$]) ++m4trace:configure.ac:243: -1- AC_SUBST([NM]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([NM]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^NM$]) ++m4trace:configure.ac:243: -1- AC_SUBST([OBJDUMP]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([OBJDUMP]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OBJDUMP$]) ++m4trace:configure.ac:243: -1- AC_SUBST([OBJDUMP]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([OBJDUMP]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OBJDUMP$]) ++m4trace:configure.ac:243: -1- AC_SUBST([AR]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([AR]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^AR$]) ++m4trace:configure.ac:243: -1- AC_SUBST([STRIP]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([STRIP]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^STRIP$]) ++m4trace:configure.ac:243: -1- AC_SUBST([RANLIB]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([RANLIB]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^RANLIB$]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([LT_OBJDIR]) ++m4trace:configure.ac:243: -1- AC_DEFINE_TRACE_LITERAL([LT_OBJDIR]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LT_OBJDIR$]) ++m4trace:configure.ac:243: -1- AH_OUTPUT([LT_OBJDIR], [/* Define to the sub-directory in which libtool stores uninstalled libraries. ++ */ ++@%:@undef LT_OBJDIR]) ++m4trace:configure.ac:243: -1- LT_SUPPORTED_TAG([CC]) ++m4trace:configure.ac:243: -1- AC_SUBST([DSYMUTIL]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([DSYMUTIL]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^DSYMUTIL$]) ++m4trace:configure.ac:243: -1- AC_SUBST([NMEDIT]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([NMEDIT]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^NMEDIT$]) ++m4trace:configure.ac:243: -1- AC_SUBST([LIPO]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([LIPO]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^LIPO$]) ++m4trace:configure.ac:243: -1- AC_SUBST([OTOOL]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([OTOOL]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OTOOL$]) ++m4trace:configure.ac:243: -1- AC_SUBST([OTOOL64]) ++m4trace:configure.ac:243: -1- AC_SUBST_TRACE([OTOOL64]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^OTOOL64$]) ++m4trace:configure.ac:243: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */ ++@%:@undef HAVE_DLFCN_H]) ++m4trace:configure.ac:243: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H]) ++m4trace:configure.ac:243: -1- m4_pattern_allow([^HAVE_DLFCN_H$]) ++m4trace:configure.ac:244: -1- AM_PROG_CC_C_O ++m4trace:configure.ac:244: -1- AC_DEFINE_TRACE_LITERAL([NO_MINUS_C_MINUS_O]) ++m4trace:configure.ac:244: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$]) ++m4trace:configure.ac:244: -1- AH_OUTPUT([NO_MINUS_C_MINUS_O], [/* Define to 1 if your C compiler doesn\'t accept -c and -o together. */ ++@%:@undef NO_MINUS_C_MINUS_O]) ++m4trace:configure.ac:244: -1- AC_REQUIRE_AUX_FILE([compile]) ++m4trace:configure.ac:258: -1- AC_SUBST([GSTPROPS_CFLAGS]) ++m4trace:configure.ac:258: -1- AC_SUBST_TRACE([GSTPROPS_CFLAGS]) ++m4trace:configure.ac:258: -1- m4_pattern_allow([^GSTPROPS_CFLAGS$]) ++m4trace:configure.ac:258: -1- AC_SUBST([GSTPROPS_LIBS]) ++m4trace:configure.ac:258: -1- AC_SUBST_TRACE([GSTPROPS_LIBS]) ++m4trace:configure.ac:258: -1- m4_pattern_allow([^GSTPROPS_LIBS$]) ++m4trace:configure.ac:270: -1- AC_SUBST([GNOMECC_DESKTOP_DIR], ["$full_var"]) ++m4trace:configure.ac:270: -1- AC_SUBST_TRACE([GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:270: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:271: -1- AC_DEFINE_TRACE_LITERAL([GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:271: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:271: -1- AH_OUTPUT([GNOMECC_DESKTOP_DIR], [/* Install path for Gnome control-center integration */ ++@%:@undef GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:273: -1- AC_SUBST([GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:273: -1- AC_SUBST_TRACE([GNOMECC_DESKTOP_DIR]) ++m4trace:configure.ac:273: -1- m4_pattern_allow([^GNOMECC_DESKTOP_DIR$]) ++m4trace:configure.ac:274: -1- AC_SUBST([PROGRAMS_GSTPROPS]) ++m4trace:configure.ac:274: -1- AC_SUBST_TRACE([PROGRAMS_GSTPROPS]) ++m4trace:configure.ac:274: -1- m4_pattern_allow([^PROGRAMS_GSTPROPS$]) ++m4trace:configure.ac:277: -1- AC_SUBST([GSTPROPS_CFLAGS]) ++m4trace:configure.ac:277: -1- AC_SUBST_TRACE([GSTPROPS_CFLAGS]) ++m4trace:configure.ac:277: -1- m4_pattern_allow([^GSTPROPS_CFLAGS$]) ++m4trace:configure.ac:278: -1- AC_SUBST([GSTPROPS_LIBS]) ++m4trace:configure.ac:278: -1- AC_SUBST_TRACE([GSTPROPS_LIBS]) ++m4trace:configure.ac:278: -1- m4_pattern_allow([^GSTPROPS_LIBS$]) ++m4trace:configure.ac:279: -1- AM_CONDITIONAL([HAVE_GSTPROPS], [test x$have_gstprops = xyes]) ++m4trace:configure.ac:279: -1- AC_SUBST([HAVE_GSTPROPS_TRUE]) ++m4trace:configure.ac:279: -1- AC_SUBST_TRACE([HAVE_GSTPROPS_TRUE]) ++m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_GSTPROPS_TRUE$]) ++m4trace:configure.ac:279: -1- AC_SUBST([HAVE_GSTPROPS_FALSE]) ++m4trace:configure.ac:279: -1- AC_SUBST_TRACE([HAVE_GSTPROPS_FALSE]) ++m4trace:configure.ac:279: -1- m4_pattern_allow([^HAVE_GSTPROPS_FALSE$]) ++m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([HAVE_GSTPROPS_TRUE]) ++m4trace:configure.ac:279: -1- _AM_SUBST_NOTMAKE([HAVE_GSTPROPS_FALSE]) ++m4trace:configure.ac:297: -1- AC_SUBST([GSTMIXER_CFLAGS]) ++m4trace:configure.ac:297: -1- AC_SUBST_TRACE([GSTMIXER_CFLAGS]) ++m4trace:configure.ac:297: -1- m4_pattern_allow([^GSTMIXER_CFLAGS$]) ++m4trace:configure.ac:297: -1- AC_SUBST([GSTMIXER_LIBS]) ++m4trace:configure.ac:297: -1- AC_SUBST_TRACE([GSTMIXER_LIBS]) ++m4trace:configure.ac:297: -1- m4_pattern_allow([^GSTMIXER_LIBS$]) ++m4trace:configure.ac:316: -1- AC_SUBST([GSTMIXER_CFLAGS]) ++m4trace:configure.ac:316: -1- AC_SUBST_TRACE([GSTMIXER_CFLAGS]) ++m4trace:configure.ac:316: -1- m4_pattern_allow([^GSTMIXER_CFLAGS$]) ++m4trace:configure.ac:317: -1- AC_SUBST([GSTMIXER_LIBS]) ++m4trace:configure.ac:317: -1- AC_SUBST_TRACE([GSTMIXER_LIBS]) ++m4trace:configure.ac:317: -1- m4_pattern_allow([^GSTMIXER_LIBS$]) ++m4trace:configure.ac:318: -1- AM_CONDITIONAL([HAVE_GSTMIXER], [test x$have_gstmixer = xyes]) ++m4trace:configure.ac:318: -1- AC_SUBST([HAVE_GSTMIXER_TRUE]) ++m4trace:configure.ac:318: -1- AC_SUBST_TRACE([HAVE_GSTMIXER_TRUE]) ++m4trace:configure.ac:318: -1- m4_pattern_allow([^HAVE_GSTMIXER_TRUE$]) ++m4trace:configure.ac:318: -1- AC_SUBST([HAVE_GSTMIXER_FALSE]) ++m4trace:configure.ac:318: -1- AC_SUBST_TRACE([HAVE_GSTMIXER_FALSE]) ++m4trace:configure.ac:318: -1- m4_pattern_allow([^HAVE_GSTMIXER_FALSE$]) ++m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([HAVE_GSTMIXER_TRUE]) ++m4trace:configure.ac:318: -1- _AM_SUBST_NOTMAKE([HAVE_GSTMIXER_FALSE]) ++m4trace:configure.ac:325: -1- AM_SILENT_RULES([yes]) ++m4trace:configure.ac:325: -1- AC_SUBST([AM_DEFAULT_VERBOSITY]) ++m4trace:configure.ac:325: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY]) ++m4trace:configure.ac:325: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$]) ++m4trace:configure.ac:325: -1- AC_SUBST([AM_BACKSLASH]) ++m4trace:configure.ac:325: -1- AC_SUBST_TRACE([AM_BACKSLASH]) ++m4trace:configure.ac:325: -1- m4_pattern_allow([^AM_BACKSLASH$]) ++m4trace:configure.ac:325: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH]) ++m4trace:configure.ac:328: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from... ++/tmp/autoconf-2.67/lib/autoconf/general.m4:1463: AC_ARG_ENABLE is expanded from... ++configure.ac:328: the top level]) ++m4trace:configure.ac:352: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete. ++You should run autoupdate.], [/tmp/autoconf-2.67/lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from... ++configure.ac:352: the top level]) ++m4trace:configure.ac:368: -1- AC_SUBST([CFLAGS]) ++m4trace:configure.ac:368: -1- AC_SUBST_TRACE([CFLAGS]) ++m4trace:configure.ac:368: -1- m4_pattern_allow([^CFLAGS$]) ++m4trace:configure.ac:369: -1- AC_SUBST([CPPFLAGS]) ++m4trace:configure.ac:369: -1- AC_SUBST_TRACE([CPPFLAGS]) ++m4trace:configure.ac:369: -1- m4_pattern_allow([^CPPFLAGS$]) ++m4trace:configure.ac:370: -1- AC_SUBST([LIBS]) ++m4trace:configure.ac:370: -1- AC_SUBST_TRACE([LIBS]) ++m4trace:configure.ac:370: -1- m4_pattern_allow([^LIBS$]) ++m4trace:configure.ac:371: -1- AC_SUBST([LDFLAGS]) ++m4trace:configure.ac:371: -1- AC_SUBST_TRACE([LDFLAGS]) ++m4trace:configure.ac:371: -1- m4_pattern_allow([^LDFLAGS$]) ++m4trace:configure.ac:373: -1- AC_CONFIG_FILES([ ++Makefile ++po/Makefile.in ++sound-theme/Makefile ++sound-theme/sounds/Makefile ++gnome-volume-control/Makefile ++gnome-volume-control/data/Makefile ++gnome-volume-control/data/gnome-volume-control.desktop.in ++gnome-volume-control/data/icons/Makefile ++gnome-volume-control/data/icons/16x16/Makefile ++gnome-volume-control/data/icons/16x16/apps/Makefile ++gnome-volume-control/data/icons/16x16/status/Makefile ++gnome-volume-control/data/icons/22x22/Makefile ++gnome-volume-control/data/icons/22x22/apps/Makefile ++gnome-volume-control/data/icons/22x22/status/Makefile ++gnome-volume-control/data/icons/24x24/Makefile ++gnome-volume-control/data/icons/24x24/apps/Makefile ++gnome-volume-control/data/icons/24x24/status/Makefile ++gnome-volume-control/data/icons/32x32/Makefile ++gnome-volume-control/data/icons/32x32/apps/Makefile ++gnome-volume-control/data/icons/32x32/status/Makefile ++gnome-volume-control/data/icons/48x48/Makefile ++gnome-volume-control/data/icons/48x48/apps/Makefile ++gnome-volume-control/data/icons/scalable/Makefile ++gnome-volume-control/data/icons/scalable/apps/Makefile ++gnome-volume-control/data/icons/scalable/devices/Makefile ++gnome-volume-control/data/icons/scalable/status/Makefile ++gnome-volume-control/src/Makefile ++grecord/Makefile ++grecord/gnome-sound-recorder.schemas.in ++grecord/src/Makefile ++grecord/icons/Makefile ++grecord/icons/16x16/Makefile ++grecord/icons/22x22/Makefile ++grecord/icons/24x24/Makefile ++grecord/icons/32x32/Makefile ++grecord/icons/48x48/Makefile ++grecord/icons/scalable/Makefile ++gstreamer-properties/Makefile ++gst-mixer/Makefile ++gst-mixer/icons/Makefile ++gst-mixer/icons/16x16/Makefile ++gst-mixer/icons/16x16/devices/Makefile ++gst-mixer/icons/16x16/status/Makefile ++gst-mixer/src/Makefile ++gst-mixer/pixmaps/Makefile ++profiles/Makefile ++profiles/gnome-audio-profiles.schemas.in ++profiles/gnome-media-profiles.pc ++profiles/glade/Makefile ++grecord/gnome-sound-recorder.desktop.in ++gst-mixer/gnome-volume-control.desktop.in ++gstreamer-properties/gstreamer-properties.desktop.in ++]) ++m4trace:configure.ac:428: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^LIB@&t@OBJS$]) ++m4trace:configure.ac:428: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([LTLIBOBJS]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^LTLIBOBJS$]) ++m4trace:configure.ac:428: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) ++m4trace:configure.ac:428: -1- AC_SUBST([am__EXEEXT_TRUE]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) ++m4trace:configure.ac:428: -1- AC_SUBST([am__EXEEXT_FALSE]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) ++m4trace:configure.ac:428: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) ++m4trace:configure.ac:428: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) ++m4trace:configure.ac:428: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([top_builddir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([top_build_prefix]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([srcdir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([abs_srcdir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([top_srcdir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([abs_top_srcdir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([builddir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([abs_builddir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([abs_top_builddir]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([INSTALL]) ++m4trace:configure.ac:428: -1- AC_SUBST_TRACE([MKDIR_P]) ++m4trace:configure.ac:428: -1- AC_REQUIRE_AUX_FILE([ltmain.sh]) +diff -Naur gnome-media-2.32.0.orig/configure gnome-media-2.32.0.patched/configure +--- gnome-media-2.32.0.orig/configure 2010-09-28 10:49:17.000000000 -0400 ++++ gnome-media-2.32.0.patched/configure 2011-08-24 22:23:53.000000000 -0400 +@@ -1,6 +1,6 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.66 for gnome-media 2.32.0. ++# Generated by GNU Autoconf 2.67 for gnome-media 2.32.0. + # + # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-media>. + # +@@ -609,8 +609,6 @@ + am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS +-WARN_CXXFLAGS +-DISABLE_DEPRECATED + AM_BACKSLASH + AM_DEFAULT_VERBOSITY + HAVE_GSTMIXER_FALSE +@@ -646,14 +644,6 @@ + build_cpu + build + LIBTOOL +-HAVE_GNOME_DOC_UTILS_FALSE +-HAVE_GNOME_DOC_UTILS_TRUE +-DISTCHECK_CONFIGURE_FLAGS +-ENABLE_SK_FALSE +-ENABLE_SK_TRUE +-DOC_USER_FORMATS +-OMF_DIR +-HELP_DIR + MKINSTALLDIRS + POSUB + POFILES +@@ -703,10 +693,7 @@ + HAVE_SOUND_THEME_TRUE + SOUND_THEME_LIBS + SOUND_THEME_CFLAGS +-PKG_CONFIG_LIBDIR +-PKG_CONFIG_PATH + PKG_CONFIG +-WARN_CFLAGS + EGREP + GREP + CPP +@@ -830,18 +817,12 @@ + enable_maintainer_mode + enable_nls + enable_dependency_tracking +-enable_compile_warnings +-enable_iso_c + enable_pulseaudio + enable_profiles + enable_grecord + with_gconf_source + with_gconf_schema_file_dir + enable_schemas_install +-with_help_dir +-with_omf_dir +-with_help_formats +-enable_scrollkeeper + enable_shared + enable_static + with_pic +@@ -851,8 +832,6 @@ + enable_gstprops + enable_gstmix + enable_silent_rules +-enable_cxx_warnings +-enable_iso_cxx + enable_more_warnings + ' + ac_precious_vars='build_alias +@@ -865,8 +844,6 @@ + CPPFLAGS + CPP + PKG_CONFIG +-PKG_CONFIG_PATH +-PKG_CONFIG_LIBDIR + SOUND_THEME_CFLAGS + SOUND_THEME_LIBS + PULSEAUDIO_CFLAGS +@@ -945,8 +922,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -1507,15 +1485,11 @@ + --disable-nls do not use Native Language Support + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors +- --enable-compile-warnings=[no/minimum/yes/maximum/error] +- Turn on compiler warnings +- --enable-iso-c Try to warn if code is not ISO C + --enable-pulseaudio Enable PulseAudio support [default=auto] + --enable-profiles enable gnome media profiles + --enable-grecord enable gnome sound recorder + --disable-schemas-install + Disable the schemas installation +- --disable-scrollkeeper do not make updates to the scrollkeeper database + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] +@@ -1525,10 +1499,6 @@ + --enable-gstmix enable gstreamer mixer + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') +- --enable-cxx-warnings=[no/minimum/yes] +- Turn on compiler warnings. +- +- --enable-iso-cxx Try to warn if code is not ISO C++ + --enable-more-warnings Maximum compiler warnings + + Optional Packages: +@@ -1538,10 +1508,6 @@ + Config database for installing schema files. + --with-gconf-schema-file-dir=dir + Directory for installing schema files. +- --with-help-dir=DIR path to help docs +- --with-omf-dir=DIR path to OMF files +- --with-help-formats=FORMATS +- list of formats + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +@@ -1556,10 +1522,6 @@ + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + PKG_CONFIG path to pkg-config utility +- PKG_CONFIG_PATH +- directories to add to pkg-config's search path +- PKG_CONFIG_LIBDIR +- path overriding pkg-config's built-in search path + SOUND_THEME_CFLAGS + C compiler flags for SOUND_THEME, overriding pkg-config + SOUND_THEME_LIBS +@@ -1656,7 +1618,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + gnome-media configure 2.32.0 +-generated by GNU Autoconf 2.66 ++generated by GNU Autoconf 2.67 + + Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -1841,7 +1803,7 @@ + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : +@@ -1946,7 +1908,7 @@ + else + ac_header_preproc=no + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 + $as_echo "$ac_header_preproc" >&6; } + +@@ -2079,7 +2041,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-media $as_me 2.32.0, which was +-generated by GNU Autoconf 2.66. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + $ $0 $@ + +@@ -5415,7 +5377,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5431,11 +5393,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + break + fi +@@ -5474,7 +5436,7 @@ + # Broken: fails on valid input. + continue + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. +@@ -5490,11 +5452,11 @@ + ac_preproc_ok=: + break + fi +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext + + done + # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.i conftest.err conftest.$ac_ext + if $ac_preproc_ok; then : + + else +@@ -6189,112 +6151,7 @@ + + + # CFLAGS +- +- +- # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then : +- enableval=$enable_compile_warnings; +-else +- enable_compile_warnings="yes" +-fi +- +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 +-$as_echo_n "checking whether gcc understands $option... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- has_option=yes +-else +- has_option=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 +-$as_echo "$has_option" >&6; } +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 +-$as_echo "$warning_flags" >&6; } +- +- # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then : +- enableval=$enable_iso_c; +-else +- enable_iso_c=no +-fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 +-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 +-$as_echo "$complCFLAGS" >&6; } +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- ++GNOME_COMPILE_WARNINGS + + # AS_NANO(GM_RELEASE="yes", GM_RELEASE="no") + +@@ -6385,10 +6242,6 @@ + + + +- +- +- +- + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +@@ -6501,6 +6354,7 @@ + $as_echo "no" >&6; } + PKG_CONFIG="" + fi ++ + fi + + pkg_failed=no +@@ -6573,8 +6427,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -6599,10 +6451,10 @@ + # Put the nasty error message in config.log where it belongs + echo "$SOUND_THEME_PKG_ERRORS" >&5 + +- have_soundtheme=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } ++ have_soundtheme=no ++elif test $pkg_failed = untried; then + have_soundtheme=no + else + SOUND_THEME_CFLAGS=$pkg_cv_SOUND_THEME_CFLAGS +@@ -6683,8 +6535,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -6699,10 +6549,10 @@ + # Put the nasty error message in config.log where it belongs + echo "$PULSEAUDIO_PKG_ERRORS" >&5 + +- have_pulseaudio=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } ++ have_pulseaudio=no ++elif test $pkg_failed = untried; then + have_pulseaudio=no + else + PULSEAUDIO_CFLAGS=$pkg_cv_PULSEAUDIO_CFLAGS +@@ -6800,8 +6650,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -6846,11 +6694,9 @@ + + Alternatively, you may set the environment variables VOLUME_CONTROL_CFLAGS + and VOLUME_CONTROL_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +- ++See the pkg-config man page for more details. ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +@@ -6863,13 +6709,12 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + VOLUME_CONTROL_CFLAGS=$pkg_cv_VOLUME_CONTROL_CFLAGS + VOLUME_CONTROL_LIBS=$pkg_cv_VOLUME_CONTROL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- ++ : + fi + + +@@ -6969,8 +6814,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -7006,11 +6849,9 @@ + + Alternatively, you may set the environment variables GMP_CFLAGS + and GMP_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +- ++See the pkg-config man page for more details. ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +@@ -7023,7 +6864,6 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + GMP_CFLAGS=$pkg_cv_GMP_CFLAGS + GMP_LIBS=$pkg_cv_GMP_LIBS +@@ -7086,8 +6926,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -7102,10 +6940,10 @@ + # Put the nasty error message in config.log where it belongs + echo "$GLADEUI_PKG_ERRORS" >&5 + +- have_gladeui=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } ++ have_gladeui=no ++elif test $pkg_failed = untried; then + have_gladeui=no + else + GLADEUI_CFLAGS=$pkg_cv_GLADEUI_CFLAGS +@@ -7216,8 +7054,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -7242,6 +7078,8 @@ + # Put the nasty error message in config.log where it belongs + echo "$GSR_PKG_ERRORS" >&5 + ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -7250,8 +7088,6 @@ + PROGRAMS_GRECORD_ERROR="$GSR_PKG_ERRORS" + + elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -8166,96 +8002,6 @@ + < $srcdir/po/POTFILES.in > po/POTFILES + + +- +-gdu_cv_version_required=0.3.2 +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 +-$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; } +-if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- gdu_cv_have_gdu=yes +-else +- gdu_cv_have_gdu=no +-fi +- +-if test "$gdu_cv_have_gdu" = "yes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- : +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 +-fi +- +- +- +-# Check whether --with-help-dir was given. +-if test "${with_help_dir+set}" = set; then : +- withval=$with_help_dir; +-else +- with_help_dir='${datadir}/gnome/help' +-fi +- +-HELP_DIR="$with_help_dir" +- +- +- +-# Check whether --with-omf-dir was given. +-if test "${with_omf_dir+set}" = set; then : +- withval=$with_omf_dir; +-else +- with_omf_dir='${datadir}/omf' +-fi +- +-OMF_DIR="$with_omf_dir" +- +- +- +-# Check whether --with-help-formats was given. +-if test "${with_help_formats+set}" = set; then : +- withval=$with_help_formats; +-else +- with_help_formats='' +-fi +- +-DOC_USER_FORMATS="$with_help_formats" +- +- +-# Check whether --enable-scrollkeeper was given. +-if test "${enable_scrollkeeper+set}" = set; then : +- enableval=$enable_scrollkeeper; +-else +- enable_scrollkeeper=yes +-fi +- +- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then +- ENABLE_SK_TRUE= +- ENABLE_SK_FALSE='#' +-else +- ENABLE_SK_TRUE='#' +- ENABLE_SK_FALSE= +-fi +- +- +-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +- +- +- if test "$gdu_cv_have_gdu" = "yes"; then +- HAVE_GNOME_DOC_UTILS_TRUE= +- HAVE_GNOME_DOC_UTILS_FALSE='#' +-else +- HAVE_GNOME_DOC_UTILS_TRUE='#' +- HAVE_GNOME_DOC_UTILS_FALSE= +-fi +- +- +- +- + case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +@@ -14951,8 +14697,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -14994,11 +14738,9 @@ + + Alternatively, you may set the environment variables GSTPROPS_CFLAGS + and GSTPROPS_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +- ++See the pkg-config man page for more details. ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +@@ -15011,7 +14753,6 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + GSTPROPS_CFLAGS=$pkg_cv_GSTPROPS_CFLAGS + GSTPROPS_LIBS=$pkg_cv_GSTPROPS_LIBS +@@ -15157,8 +14898,6 @@ + + + if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +@@ -15197,11 +14936,9 @@ + + Alternatively, you may set the environment variables GSTMIXER_CFLAGS + and GSTMIXER_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +- ++See the pkg-config man page for more details. ++" "$LINENO" 5 + elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +@@ -15214,7 +14951,6 @@ + + To get pkg-config, see <http://pkg-config.freedesktop.org/>. + See \`config.log' for more details" "$LINENO" 5; } +- + else + GSTMIXER_CFLAGS=$pkg_cv_GSTMIXER_CFLAGS + GSTMIXER_LIBS=$pkg_cv_GSTMIXER_LIBS +@@ -15273,188 +15009,6 @@ + AM_BACKSLASH='\' + + +- +- +- +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi +- +- +- +- +- +- # Check whether --enable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then : +- enableval=$enable_compile_warnings; +-else +- enable_compile_warnings="maximum" +-fi +- +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 +-$as_echo_n "checking whether gcc understands $option... " >&6; } +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- has_option=yes +-else +- has_option=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 +-$as_echo "$has_option" >&6; } +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 +-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5 +-$as_echo "$warning_flags" >&6; } +- +- # Check whether --enable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then : +- enableval=$enable_iso_c; +-else +- enable_iso_c=no +-fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 +-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 +-$as_echo "$complCFLAGS" >&6; } +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- +- +- # Check whether --enable-cxx-warnings was given. +-if test "${enable_cxx_warnings+set}" = set; then : +- enableval=$enable_cxx_warnings; +-else +- enable_cxx_warnings="minimum" +-fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C++ compiler" >&5 +-$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; } +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *\ \ -Wall\ \ *) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac +- +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warnCXXFLAGS" >&5 +-$as_echo "$warnCXXFLAGS" >&6; } +- +- # Check whether --enable-iso-cxx was given. +-if test "${enable_iso_cxx+set}" = set; then : +- enableval=$enable_iso_cxx; +-else +- enable_iso_cxx=no +-fi +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C++ compiler" >&5 +-$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; } +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac +- +- case " $CXXFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCXXFLAGS" >&5 +-$as_echo "$complCXXFLAGS" >&6; } +- +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- +- +- + # Turn on the additional warnings last, so warnings don't affect other tests. + # Check whether --enable-more-warnings was given. + if test "${enable_more_warnings+set}" = set; then : +@@ -15523,7 +15077,7 @@ + + + +-ac_config_files="$ac_config_files Makefile po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/devices/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/doc/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gstreamer-properties/help/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile gst-mixer/doc/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile profiles/help/Makefile grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in" ++ac_config_files="$ac_config_files Makefile po/Makefile.in sound-theme/Makefile sound-theme/sounds/Makefile gnome-volume-control/Makefile gnome-volume-control/data/Makefile gnome-volume-control/data/gnome-volume-control.desktop.in gnome-volume-control/data/icons/Makefile gnome-volume-control/data/icons/16x16/Makefile gnome-volume-control/data/icons/16x16/apps/Makefile gnome-volume-control/data/icons/16x16/status/Makefile gnome-volume-control/data/icons/22x22/Makefile gnome-volume-control/data/icons/22x22/apps/Makefile gnome-volume-control/data/icons/22x22/status/Makefile gnome-volume-control/data/icons/24x24/Makefile gnome-volume-control/data/icons/24x24/apps/Makefile gnome-volume-control/data/icons/24x24/status/Makefile gnome-volume-control/data/icons/32x32/Makefile gnome-volume-control/data/icons/32x32/apps/Makefile gnome-volume-control/data/icons/32x32/status/Makefile gnome-volume-control/data/icons/48x48/Makefile gnome-volume-control/data/icons/48x48/apps/Makefile gnome-volume-control/data/icons/scalable/Makefile gnome-volume-control/data/icons/scalable/apps/Makefile gnome-volume-control/data/icons/scalable/devices/Makefile gnome-volume-control/data/icons/scalable/status/Makefile gnome-volume-control/src/Makefile grecord/Makefile grecord/gnome-sound-recorder.schemas.in grecord/src/Makefile grecord/icons/Makefile grecord/icons/16x16/Makefile grecord/icons/22x22/Makefile grecord/icons/24x24/Makefile grecord/icons/32x32/Makefile grecord/icons/48x48/Makefile grecord/icons/scalable/Makefile gstreamer-properties/Makefile gst-mixer/Makefile gst-mixer/icons/Makefile gst-mixer/icons/16x16/Makefile gst-mixer/icons/16x16/devices/Makefile gst-mixer/icons/16x16/status/Makefile gst-mixer/src/Makefile gst-mixer/pixmaps/Makefile profiles/Makefile profiles/gnome-audio-profiles.schemas.in profiles/gnome-media-profiles.pc profiles/glade/Makefile grecord/gnome-sound-recorder.desktop.in gst-mixer/gnome-volume-control.desktop.in gstreamer-properties/gstreamer-properties.desktop.in" + + + cat >confcache <<\_ACEOF +@@ -15680,14 +15234,6 @@ + as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then +- as_fn_error $? "conditional \"ENABLE_SK\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then +- as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${HAVE_GSTPROPS_TRUE}" && test -z "${HAVE_GSTPROPS_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GSTPROPS\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -16105,7 +15651,7 @@ + # values after options handling. + ac_log=" + This file was extended by gnome-media $as_me 2.32.0, which was +-generated by GNU Autoconf 2.66. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -16171,7 +15717,7 @@ + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + gnome-media config.status 2.32.0 +-configured by $0, generated by GNU Autoconf 2.66, ++configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" + + Copyright (C) 2010 Free Software Foundation, Inc. +@@ -16192,11 +15738,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -16218,6 +15769,7 @@ + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; +@@ -16588,7 +16140,6 @@ + "grecord/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/Makefile" ;; + "grecord/gnome-sound-recorder.schemas.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.schemas.in" ;; + "grecord/src/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/src/Makefile" ;; +- "grecord/doc/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/doc/Makefile" ;; + "grecord/icons/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/Makefile" ;; + "grecord/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/16x16/Makefile" ;; + "grecord/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/22x22/Makefile" ;; +@@ -16597,7 +16148,6 @@ + "grecord/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/48x48/Makefile" ;; + "grecord/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES grecord/icons/scalable/Makefile" ;; + "gstreamer-properties/Makefile") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/Makefile" ;; +- "gstreamer-properties/help/Makefile") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/help/Makefile" ;; + "gst-mixer/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/Makefile" ;; + "gst-mixer/icons/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/Makefile" ;; + "gst-mixer/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/Makefile" ;; +@@ -16605,12 +16155,10 @@ + "gst-mixer/icons/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/icons/16x16/status/Makefile" ;; + "gst-mixer/src/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/src/Makefile" ;; + "gst-mixer/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/pixmaps/Makefile" ;; +- "gst-mixer/doc/Makefile") CONFIG_FILES="$CONFIG_FILES gst-mixer/doc/Makefile" ;; + "profiles/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/Makefile" ;; + "profiles/gnome-audio-profiles.schemas.in") CONFIG_FILES="$CONFIG_FILES profiles/gnome-audio-profiles.schemas.in" ;; + "profiles/gnome-media-profiles.pc") CONFIG_FILES="$CONFIG_FILES profiles/gnome-media-profiles.pc" ;; + "profiles/glade/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/glade/Makefile" ;; +- "profiles/help/Makefile") CONFIG_FILES="$CONFIG_FILES profiles/help/Makefile" ;; + "grecord/gnome-sound-recorder.desktop.in") CONFIG_FILES="$CONFIG_FILES grecord/gnome-sound-recorder.desktop.in" ;; + "gst-mixer/gnome-volume-control.desktop.in") CONFIG_FILES="$CONFIG_FILES gst-mixer/gnome-volume-control.desktop.in" ;; + "gstreamer-properties/gstreamer-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES gstreamer-properties/gstreamer-properties.desktop.in" ;; +diff -Naur gnome-media-2.32.0.orig/configure.ac gnome-media-2.32.0.patched/configure.ac +--- gnome-media-2.32.0.orig/configure.ac 2010-09-28 10:48:03.000000000 -0400 ++++ gnome-media-2.32.0.patched/configure.ac 2011-08-24 22:20:07.000000000 -0400 +@@ -240,8 +240,6 @@ + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name]) + AM_GLIB_GNU_GETTEXT + +-GNOME_DOC_INIT +- + AM_PROG_LIBTOOL + AM_PROG_CC_C_O + +@@ -326,10 +324,6 @@ + + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +-GNOME_MAINTAINER_MODE_DEFINES +-GNOME_COMPILE_WARNINGS([maximum]) +-GNOME_CXX_WARNINGS +- + # Turn on the additional warnings last, so warnings don't affect other tests. + AC_ARG_ENABLE(more-warnings, + [AC_HELP_STRING([--enable-more-warnings], +@@ -407,7 +401,6 @@ + grecord/Makefile + grecord/gnome-sound-recorder.schemas.in + grecord/src/Makefile +-grecord/doc/Makefile + grecord/icons/Makefile + grecord/icons/16x16/Makefile + grecord/icons/22x22/Makefile +@@ -416,7 +409,6 @@ + grecord/icons/48x48/Makefile + grecord/icons/scalable/Makefile + gstreamer-properties/Makefile +-gstreamer-properties/help/Makefile + gst-mixer/Makefile + gst-mixer/icons/Makefile + gst-mixer/icons/16x16/Makefile +@@ -424,12 +416,10 @@ + gst-mixer/icons/16x16/status/Makefile + gst-mixer/src/Makefile + gst-mixer/pixmaps/Makefile +-gst-mixer/doc/Makefile + profiles/Makefile + profiles/gnome-audio-profiles.schemas.in + profiles/gnome-media-profiles.pc + profiles/glade/Makefile +-profiles/help/Makefile + grecord/gnome-sound-recorder.desktop.in + gst-mixer/gnome-volume-control.desktop.in + gstreamer-properties/gstreamer-properties.desktop.in +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/Makefile.in 2010-09-28 10:49:08.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/Makefile.in 2011-08-24 22:23:55.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/Makefile.in 2010-09-28 10:49:08.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/Makefile.in 2011-08-24 22:23:55.000000000 -0400 +@@ -40,12 +40,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -144,9 +142,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -179,7 +174,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -210,7 +204,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -225,8 +218,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -247,8 +238,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/Makefile.in 2011-08-24 22:23:55.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/apps/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/apps/Makefile.in 2011-08-24 22:23:55.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/status/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/status/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/16x16/status/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/16x16/status/Makefile.in 2011-08-24 22:23:55.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/apps/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/apps/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/status/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/status/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/22x22/status/Makefile.in 2010-09-28 10:49:09.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/22x22/status/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/apps/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/apps/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/status/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/status/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/24x24/status/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/24x24/status/Makefile.in 2011-08-24 22:23:56.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/apps/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/apps/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/status/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/status/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/32x32/status/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/32x32/status/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/48x48/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/48x48/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/48x48/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/48x48/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/48x48/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/48x48/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/48x48/apps/Makefile.in 2010-09-28 10:49:10.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/48x48/apps/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/Makefile.in 2011-08-24 22:23:57.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/apps/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/apps/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/apps/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/apps/Makefile.in 2011-08-24 22:23:58.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/devices/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/devices/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/devices/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/devices/Makefile.in 2011-08-24 22:23:58.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/status/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/status/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/data/icons/scalable/status/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/data/icons/scalable/status/Makefile.in 2011-08-24 22:23:58.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/gnome-volume-control/src/Makefile.in gnome-media-2.32.0.patched/gnome-volume-control/src/Makefile.in +--- gnome-media-2.32.0.orig/gnome-volume-control/src/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/gnome-volume-control/src/Makefile.in 2011-08-24 22:23:58.000000000 -0400 +@@ -42,12 +42,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -144,9 +142,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -179,7 +174,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -210,7 +204,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -225,8 +218,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -247,8 +238,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/Makefile.am gnome-media-2.32.0.patched/grecord/Makefile.am +--- gnome-media-2.32.0.orig/grecord/Makefile.am 2009-09-07 09:20:13.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/Makefile.am 2011-08-24 22:20:07.000000000 -0400 +@@ -1,4 +1,4 @@ +-SUBDIRS = src doc icons ++SUBDIRS = src icons + + EXTRA_DIST = \ + README AUTHORS INSTALL ChangeLog.pre-2-26 \ +diff -Naur gnome-media-2.32.0.orig/grecord/Makefile.in gnome-media-2.32.0.patched/grecord/Makefile.in +--- gnome-media-2.32.0.orig/grecord/Makefile.in 2010-09-28 10:49:11.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/Makefile.in 2011-08-24 22:23:58.000000000 -0400 +@@ -42,12 +42,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -148,9 +146,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -183,7 +178,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -214,7 +208,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -229,8 +222,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -251,8 +242,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +@@ -305,7 +294,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src doc icons ++SUBDIRS = src icons + EXTRA_DIST = \ + README AUTHORS INSTALL ChangeLog.pre-2-26 \ + gnome-sound-recorder.desktop.in.in \ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/16x16/Makefile.in gnome-media-2.32.0.patched/grecord/icons/16x16/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/16x16/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/16x16/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/22x22/Makefile.in gnome-media-2.32.0.patched/grecord/icons/22x22/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/22x22/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/22x22/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/24x24/Makefile.in gnome-media-2.32.0.patched/grecord/icons/24x24/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/24x24/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/24x24/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/32x32/Makefile.in gnome-media-2.32.0.patched/grecord/icons/32x32/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/32x32/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/32x32/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/48x48/Makefile.in gnome-media-2.32.0.patched/grecord/icons/48x48/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/48x48/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/48x48/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -103,9 +101,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -138,7 +133,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -169,7 +163,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -184,8 +177,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -206,8 +197,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/Makefile.in gnome-media-2.32.0.patched/grecord/icons/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/Makefile.in 2010-09-28 10:49:12.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/Makefile.in 2011-08-24 22:23:59.000000000 -0400 +@@ -38,12 +38,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs +@@ -119,9 +117,6 @@ + DATADIRNAME = @DATADIRNAME@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ +-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +-DOC_USER_FORMATS = @DOC_USER_FORMATS@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ + ECHO_C = @ECHO_C@ +@@ -154,7 +149,6 @@ + GST_MAJORMINOR = @GST_MAJORMINOR@ + HAVE_PULSEAUDIO = @HAVE_PULSEAUDIO@ + HAVE_SOUND_THEME = @HAVE_SOUND_THEME@ +-HELP_DIR = @HELP_DIR@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -185,7 +179,6 @@ + NMEDIT = @NMEDIT@ + OBJDUMP = @OBJDUMP@ + OBJEXT = @OBJEXT@ +-OMF_DIR = @OMF_DIR@ + OTOOL = @OTOOL@ + OTOOL64 = @OTOOL64@ + PACKAGE = @PACKAGE@ +@@ -200,8 +193,6 @@ + PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ + POFILES = @POFILES@ + POSUB = @POSUB@ + PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +@@ -222,8 +213,6 @@ + VERSION = @VERSION@ + VOLUME_CONTROL_CFLAGS = @VOLUME_CONTROL_CFLAGS@ + VOLUME_CONTROL_LIBS = @VOLUME_CONTROL_LIBS@ +-WARN_CFLAGS = @WARN_CFLAGS@ +-WARN_CXXFLAGS = @WARN_CXXFLAGS@ + XGETTEXT = @XGETTEXT@ + abs_builddir = @abs_builddir@ + abs_srcdir = @abs_srcdir@ +diff -Naur gnome-media-2.32.0.orig/grecord/icons/scalable/Makefile.in gnome-media-2.32.0.patched/grecord/icons/scalable/Makefile.in +--- gnome-media-2.32.0.orig/grecord/icons/scalable/Makefile.in 2010-09-28 10:49:13.000000000 -0400 ++++ gnome-media-2.32.0.patched/grecord/icons/scalable/Makefile.in 2011-08-24 22:24:00.000000000 -0400 +@@ -39,12 +39,10 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expand.m4 \ + $(top_srcdir)/m4/as-compiler-flag.m4 \ +- $(top_srcdir)/m4/as-version.m4 \ +- $(top_srcdir)/m4/gnome-doc-utils.m4 \ +- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ +- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ +- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ +- $(top_srcdir)/configure.ac ++ $(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/intltool.m4 \ ++ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ ++ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ ++ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + am__configure_d